fix for ng-html-bind directive handling

src/index.js

@@ -58,6 +58,9 @@ var extractor
         keyAsText         = this.data.keyAsText || false,
         adapter           = this.data.adapter || 'json'
 
+    var escapedInterpolationStartRegex = new RegExp(_utils.escapeRegExpInterpolation(interpolation.startDelimiter), 'g'),
+        escapedInterpolationEndRegex   = new RegExp(_utils.escapeRegExpInterpolation(interpolation.endDelimiter), 'g')
+
     // Extract regex strings from content and feed results object
     var _extractTranslation = (regexName, regex, content, results) => {
       var r
@@ -104,20 +107,31 @@ var extractor
 
           switch (regexName) {
             case "commentSimpleQuote":
-            case "HtmlFilterSimpleQuote":
             case "JavascriptServiceSimpleQuote":
             case "JavascriptServiceInstantSimpleQuote":
             case "JavascriptFilterSimpleQuote":
+              translationKey = translationKey.replace(/\\\'/g, "'");
+              break;
+            case "HtmlFilterSimpleQuote":
+              translationKey = translationKey.replace(/\\\'/g, "'");
+              translationKey = translationKey.replace(escapedInterpolationStartRegex, interpolation.startDelimiter);
+              translationKey = translationKey.replace(escapedInterpolationEndRegex, interpolation.endDelimiter);
+              break;
             case "HtmlNgBindHtml":
-              translationKey = translationKey.replace(/\\\'/g, "'")
-              break
+              translationKey = translationKey.replace(/\\\'/g, "'");
+              translationKey = translationKey.replace(/"/g, '"');
+              break;
             case "commentDoubleQuote":
-            case "HtmlFilterDoubleQuote":
             case "JavascriptServiceDoubleQuote":
             case "JavascriptServiceInstantDoubleQuote":
             case "JavascriptFilterDoubleQuote":
               translationKey = translationKey.replace(/\\\"/g, '"')
               break
+            case "HtmlFilterDoubleQuote":
+              translationKey = translationKey.replace(/\\\"/g, '"')
+              translationKey = translationKey.replace(escapedInterpolationStartRegex, interpolation.startDelimiter);
+              translationKey = translationKey.replace(escapedInterpolationEndRegex, interpolation.endDelimiter);
+              break
             case "JavascriptServiceArraySimpleQuote":
             case "JavascriptServiceArrayDoubleQuote":
               var key
@@ -185,7 +199,7 @@ var extractor
       HtmlDirectivePluralLast: 'translate="((?:\\\\.|[^"\\\\])*)".*angular-plural-extract="((?:\\\\.|[^"\\\\])*)"',
       HtmlDirectivePluralFirst: 'angular-plural-extract="((?:\\\\.|[^"\\\\])*)".*translate="((?:\\\\.|[^"\\\\])*)"',
       HtmlNgBindHtml: 'ng-bind-html="\\s*\'((?:\\\\.|[^\'\\\\])*)\'\\s*\\|\\s*translate(:.*?)?\\s*"',
-      HtmlNgBindHtmlTernary: 'ng-bind-html="\\s*([^?]*?[^:]*:[^|}]*)\\s*\\|\\s*translate(:.*?)?\\s*"',
+      HtmlNgBindHtmlTernary: 'ng-bind-html="\\s*([^\\"?]*?[^\\":]*:[^\\"|}]*)\\s*\\|\\s*translate(:.*?)?\\s*"',
       JavascriptServiceSimpleQuote: '\\$translate\\(\\s*\'((?:\\\\.|[^\'\\\\])*)\'[^\\)]*\\)',
       JavascriptServiceDoubleQuote: '\\$translate\\(\\s*"((?:\\\\.|[^"\\\\])*)"[^\\)]*\\)',
       JavascriptServiceArraySimpleQuote: '\\$translate\\((?:\\s*(\\[\\s*(?:(?:\'(?:(?:\\.|[^.*\'\\\\])*)\')\\s*,*\\s*)+\\s*\\])\\s*)\\)',

src/utils.js

@@ -58,6 +58,15 @@ export class Utils {
     return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&")
   }
 
+  /**
+   * Escape interpolation characters in the given str
+   * @param str
+   * @returns {void|string|XML}
+   */
+  escapeRegExpInterpolation(str) {
+    return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\\\\\$&")
+  }
+
   /**
    * Extract different part from a ternary operation
    * eg: myVar ? 'myFirst result' : 'mySecond result'
@@ -83,4 +92,4 @@ export class Utils {
   }
 }
 
-Utils.BASE_PATH_NAME = "basePath"
+Utils.BASE_PATH_NAME = "basePath"

tests/expected/00_fr_FR.json

@@ -10,8 +10,10 @@
     "HtmlFilterDoubleQuote{} interp\"olation {{xx}}": "",
     "HtmlFilterDoubleQuote{} on same line 2/2": "",
     "HtmlFilterDoubleQuote{} {{var}}on same line 1/2": "",
+    "HtmlFilterSimpleQuote with {{varName}}": "",
     "HtmlFilterSimpleQuoteOneTimeBinding": "",
-    "HtmlNgBindHtml Key ' 1/1": "",
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": "",
+    "HtmlNgBindHtml Key ' 1/2": "",
     "JavascriptFilter 1/2 with var \"{name}\"": "",
     "JavascriptFilter 2/2 without var": "",
     "JavascriptServiceArrayDoubleQuote 1/2 without var.": "",

tests/expected/01_fr_FR.json

@@ -10,8 +10,10 @@
     "HtmlFilterDoubleQuote{} interp\"olation {{xx}}": null,
     "HtmlFilterDoubleQuote{} on same line 2/2": null,
     "HtmlFilterDoubleQuote{} {{var}}on same line 1/2": null,
+    "HtmlFilterSimpleQuote with {{varName}}": null,
     "HtmlFilterSimpleQuoteOneTimeBinding": null,
-    "HtmlNgBindHtml Key ' 1/1": null,
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": null,
+    "HtmlNgBindHtml Key ' 1/2": null,
     "JavascriptFilter 1/2 with var \"{name}\"": "my {name} javascript filter",
     "JavascriptFilter 2/2 without var": null,
     "JavascriptServiceArrayDoubleQuote 1/2 without var.": null,

tests/expected/02_fr_FR.json

@@ -10,8 +10,10 @@
     "HtmlFilterDoubleQuote{} interp\"olation {{xx}}": "",
     "HtmlFilterDoubleQuote{} on same line 2/2": "",
     "HtmlFilterDoubleQuote{} {{var}}on same line 1/2": "",
+    "HtmlFilterSimpleQuote with {{varName}}": "",
     "HtmlFilterSimpleQuoteOneTimeBinding": "",
-    "HtmlNgBindHtml Key ' 1/1": "",
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": "",
+    "HtmlNgBindHtml Key ' 1/2": "",
     "JavascriptFilter 1/2 with var \"{name}\"": "my {name} javascript filter",
     "JavascriptFilter 2/2 without var": "",
     "JavascriptServiceArrayDoubleQuote 1/2 without var.": "",

tests/expected/03_fr_FR.json

@@ -10,7 +10,8 @@
     "HtmlFilterSimpleQuote[] interp'olation [[xx]]": "",
     "HtmlFilterSimpleQuote[] on same line 1/2": "",
     "HtmlFilterSimpleQuote[] on same line 2/2": "",
-    "HtmlNgBindHtml Key ' 1/1": "",
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": "",
+    "HtmlNgBindHtml Key ' 1/2": "",
     "JavascriptFilter 1/2 with var \"{name}\"": "",
     "JavascriptFilter 2/2 without var": "",
     "JavascriptServiceArrayDoubleQuote 1/2 without var.": "",

tests/expected/04_en_US.json

@@ -11,6 +11,7 @@
     "HtmlFilterDoubleQuote{} on same line 2/2": "HtmlFilterDoubleQuote{} on same line 2/2",
     "HtmlFilterDoubleQuote{} {{var}}on same line 1/2": "HtmlFilterDoubleQuote{} {{var}}on same line 1/2",
     "HtmlFilterSimpleQuoteOneTimeBinding": "HtmlFilterSimpleQuoteOneTimeBinding",
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>",
     "HtmlNgBindHtml Key ' 1/1": "HtmlNgBindHtml Key ' 1/1",
     "JavascriptFilter 1/2 with var \"{name}\"": "JavascriptFilter 1/2 with var \"{name}\"",
     "JavascriptFilter 2/2 without var": "JavascriptFilter 2/2 without var",

tests/expected/04_fr_FR.json

@@ -10,8 +10,10 @@
     "HtmlFilterDoubleQuote{} interp\"olation {{xx}}": "",
     "HtmlFilterDoubleQuote{} on same line 2/2": "",
     "HtmlFilterDoubleQuote{} {{var}}on same line 1/2": "",
+    "HtmlFilterSimpleQuote with {{varName}}": "",
     "HtmlFilterSimpleQuoteOneTimeBinding": "",
-    "HtmlNgBindHtml Key ' 1/1": "",
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": "",
+    "HtmlNgBindHtml Key ' 1/2": "",
     "JavascriptFilter 1/2 with var \"{name}\"": "",
     "JavascriptFilter 2/2 without var": "",
     "JavascriptServiceArrayDoubleQuote 1/2 without var.": "",

tests/expected/05_en_US.json

@@ -10,8 +10,10 @@
     "HtmlFilterDoubleQuote{} interp\"olation {{xx}}": "HtmlFilterDoubleQuote{} interp\"olation {{xx}}",
     "HtmlFilterDoubleQuote{} on same line 2/2": "HtmlFilterDoubleQuote{} on same line 2/2",
     "HtmlFilterDoubleQuote{} {{var}}on same line 1/2": "HtmlFilterDoubleQuote{} {{var}}on same line 1/2",
+    "HtmlFilterSimpleQuote with {{varName}}": "HtmlFilterSimpleQuote with {{varName}}",
     "HtmlFilterSimpleQuoteOneTimeBinding": "HtmlFilterSimpleQuoteOneTimeBinding",
-    "HtmlNgBindHtml Key ' 1/1": "HtmlNgBindHtml Key ' 1/1",
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>",
+    "HtmlNgBindHtml Key ' 1/2": "HtmlNgBindHtml Key ' 1/2",
     "JavascriptFilter 1/2 with var \"{name}\"": "JavascriptFilter 1/2 with var \"{name}\"",
     "JavascriptFilter 2/2 without var": "JavascriptFilter 2/2 without var",
     "JavascriptServiceArrayDoubleQuote 1/2 without var.": "JavascriptServiceArrayDoubleQuote 1/2 without var.",

tests/expected/10_1_fr_FR.json

@@ -10,8 +10,10 @@
     "HtmlFilterDoubleQuote{} interp\"olation {{xx}}": "",
     "HtmlFilterDoubleQuote{} on same line 2/2": "",
     "HtmlFilterDoubleQuote{} {{var}}on same line 1/2": "",
+    "HtmlFilterSimpleQuote with {{varName}}": "",
     "HtmlFilterSimpleQuoteOneTimeBinding": "",
-    "HtmlNgBindHtml Key ' 1/1": "",
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": "",
+    "HtmlNgBindHtml Key ' 1/2": "",
     "JavascriptFilter 1/2 with var \"{name}\"": "",
     "JavascriptFilter 2/2 without var": "",
     "JavascriptServiceArrayDoubleQuote 1/2 without var.": "",

tests/expected/10_fr_FR.json

@@ -10,8 +10,10 @@
     "HtmlFilterDoubleQuote{} interp\"olation {{xx}}": "",
     "HtmlFilterDoubleQuote{} on same line 2/2": "",
     "HtmlFilterDoubleQuote{} {{var}}on same line 1/2": "",
+    "HtmlFilterSimpleQuote with {{varName}}": "",
     "HtmlFilterSimpleQuoteOneTimeBinding": "",
-    "HtmlNgBindHtml Key ' 1/1": "",
+    "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>": "",
+    "HtmlNgBindHtml Key ' 1/2": "",
     "JavascriptFilter 1/2 with var \"{name}\"": "",
     "JavascriptFilter 2/2 without var": "",
     "JavascriptServiceArrayDoubleQuote 1/2 without var.": "",

tests/expected/template.pot

@@ -76,12 +76,20 @@ msgctxt ""
 msgid "HtmlFilterDoubleQuote{} on same line 2/2"
 msgstr ""
 
+msgctxt ""
+msgid "HtmlFilterSimpleQuote with {{varName}}"
+msgstr ""
+
 msgctxt ""
 msgid "HtmlFilterSimpleQuoteOneTimeBinding"
 msgstr ""
 
 msgctxt ""
-msgid "HtmlNgBindHtml Key ' 1/1"
+msgid "HtmlNgBindHtml 2/2 Created with <i class=\"ion-heart\"></i>"
+msgstr ""
+
+msgctxt ""
+msgid "HtmlNgBindHtml Key ' 1/2"
 msgstr ""
 
 msgctxt ""

tests/fixtures/index.html

@@ -32,6 +32,16 @@ <h2>[['HtmlFilterSimpleQuote[] on same line 1/2'| translate:'{var : 1}']] - [['H
   <h1 style="color:red">{{ ::'HtmlFilterSimpleQuoteOneTimeBinding' | translate }}</h1>
 </header>
 
+<!--
+  TEST CASE - Filter HTML
+  Interpolation: {{ }}
+  Simple quote
+  Variables
+-->
+<header style="font-family:'Helvetica Neue'">
+  <h1 description="{{ 'HtmlFilterSimpleQuote with \{\{varName\}\}' | translate:{varName: 'Variables'} }}">Inspect 'description' attribute</h1>
+</header>
+
 <!--
   TEST CASE - Filter HTML
   Interpolation: {{ }}
@@ -69,7 +79,11 @@ <h1>Our title text</h1>
   TEST CASE - ng-bind-html
 -->
 <p>
-  <span style="text-align:center" ng-bind-html="'HtmlNgBindHtml Key \' 1/1'|translate"></span>
+  <span style="text-align:center" ng-bind-html="'HtmlNgBindHtml Key \' 1/2'|translate"></span>
+</p>
+
+<p>
+  <span style="text-align:center" ng-bind-html="'HtmlNgBindHtml 2/2 Created with <i class=&quot;ion-heart&quot;></i>' | translate"></span>
 </p>
 
 <!--
@@ -88,4 +102,4 @@ <h1>Our title text</h1>
 
 </body>
 
-</html>
+</html>