ghtml 3.0.3 → 3.0.5

package/bench/index.js

@@ -104,6 +104,10 @@ bench.add("mixed escaped and unescaped expressions", () => {
   `;
 });
 
+bench.add("sparse escape", () => {
+  result = html`<p>${`${"noescape".repeat(250)}<>`.repeat(5)}</p>`;
+});
+
 await bench.warmup();
 await bench.run();
 

package/package.json

@@ -3,7 +3,7 @@
   "description": "Replace your template engine with fast JavaScript by leveraging the power of tagged templates.",
   "author": "Gürgün Dayıoğlu",
   "license": "MIT",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "type": "module",
   "bin": "./bin/src/index.js",
   "main": "./src/index.js",

package/src/html.js

@@ -1,41 +1,45 @@
-const escapeRegExp = /["&'<=>]/;
+const escapeRegExp = /["&'<=>]/g;
 
 const escapeFunction = (string) => {
+  if (!string || !escapeRegExp.test(string)) {
+    return string;
+  }
+
   let escaped = "";
   let start = 0;
 
-  for (let end = 0; end !== string.length; ++end) {
-    switch (string.charCodeAt(end)) {
+  do {
+    const i = escapeRegExp.lastIndex - 1;
+
+    switch (string.charCodeAt(i)) {
       case 34: // "
-        escaped += string.slice(start, end) + "&#34;";
-        start = end + 1;
+        escaped += string.slice(start, i) + "&#34;";
+        start = escapeRegExp.lastIndex;
         continue;
       case 38: // &
-        escaped += string.slice(start, end) + "&#38;";
-        start = end + 1;
+        escaped += string.slice(start, i) + "&#38;";
+        start = escapeRegExp.lastIndex;
         continue;
       case 39: // '
-        escaped += string.slice(start, end) + "&#39;";
-        start = end + 1;
+        escaped += string.slice(start, i) + "&#39;";
+        start = escapeRegExp.lastIndex;
         continue;
       case 60: // <
-        escaped += string.slice(start, end) + "&#60;";
-        start = end + 1;
+        escaped += string.slice(start, i) + "&#60;";
+        start = escapeRegExp.lastIndex;
         continue;
       case 61: // =
-        escaped += string.slice(start, end) + "&#61;";
-        start = end + 1;
+        escaped += string.slice(start, i) + "&#61;";
+        start = escapeRegExp.lastIndex;
         continue;
       case 62: // >
-        escaped += string.slice(start, end) + "&#62;";
-        start = end + 1;
+        escaped += string.slice(start, i) + "&#62;";
+        start = escapeRegExp.lastIndex;
         continue;
     }
-  }
+  } while (escapeRegExp.test(string));
 
-  escaped += string.slice(start);
-
-  return escaped;
+  return escaped + string.slice(start);
 };
 
 /**
@@ -59,16 +63,14 @@ export const html = ({ raw: literals }, ...expressions) => {
 
     if (literal && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else if (string && escapeRegExp.test(string)) {
+    } else {
       string = escapeFunction(string);
     }
 
     accumulator += literal + string;
   }
 
-  accumulator += literals[expressions.length];
-
-  return accumulator;
+  return accumulator + literals[expressions.length];
 };
 
 /**
@@ -120,11 +122,11 @@ export const htmlGenerator = function* ({ raw: literals }, ...expressions) {
                   string = `${expression}`;
                 }
 
-                if (string) {
-                  if (!isRaw && escapeRegExp.test(string)) {
-                    string = escapeFunction(string);
-                  }
+                if (!isRaw) {
+                  string = escapeFunction(string);
+                }
 
+                if (string) {
                   yield string;
                 }
               }
@@ -135,11 +137,11 @@ export const htmlGenerator = function* ({ raw: literals }, ...expressions) {
             string = `${expression}`;
           }
 
-          if (string) {
-            if (!isRaw && escapeRegExp.test(string)) {
-              string = escapeFunction(string);
-            }
+          if (!isRaw) {
+            string = escapeFunction(string);
+          }
 
+          if (string) {
             yield string;
           }
         }
@@ -152,7 +154,7 @@ export const htmlGenerator = function* ({ raw: literals }, ...expressions) {
 
     if (literal && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else if (string && escapeRegExp.test(string)) {
+    } else {
       string = escapeFunction(string);
     }
 
@@ -221,11 +223,11 @@ export const htmlAsyncGenerator = async function* (
                   string = `${expression}`;
                 }
 
-                if (string) {
-                  if (!isRaw && escapeRegExp.test(string)) {
-                    string = escapeFunction(string);
-                  }
+                if (!isRaw) {
+                  string = escapeFunction(string);
+                }
 
+                if (string) {
                   yield string;
                 }
               }
@@ -236,11 +238,11 @@ export const htmlAsyncGenerator = async function* (
             string = `${expression}`;
           }
 
-          if (string) {
-            if (!isRaw && escapeRegExp.test(string)) {
-              string = escapeFunction(string);
-            }
+          if (!isRaw) {
+            string = escapeFunction(string);
+          }
 
+          if (string) {
             yield string;
           }
         }
@@ -253,7 +255,7 @@ export const htmlAsyncGenerator = async function* (
 
     if (literal && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else if (string && escapeRegExp.test(string)) {
+    } else {
       string = escapeFunction(string);
     }