ghtml 3.1.2 → 3.1.4

package/bench/index.js

@@ -105,7 +105,6 @@ bench.add("sparse escape", () => {
 });
 
 (async () => {
-  await bench.warmup();
   await bench.run();
 
   const table = bench.table();

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.1.2",
+  "version": "3.1.4",
   "type": "commonjs",
   "bin": "./bin/src/index.js",
   "main": "./src/index.js",
@@ -29,7 +29,7 @@
     "c8": "^10.1.2",
     "globals": "^16.0.0",
     "grules": "^0.26.1",
-    "tinybench": "^3.0.7",
+    "tinybench": "^5.0.1",
     "typescript": ">=5.7.2"
   },
   "repository": {

package/src/index.js

@@ -3,10 +3,14 @@
 const escapeRegExp = /["&'<=>]/g;
 
 const escapeFunction = (string) => {
+  if (!escapeRegExp.test(string)) {
+    return string;
+  }
+
   let escaped = "";
   let start = 0;
 
-  while (escapeRegExp.test(string)) {
+  do {
     const i = escapeRegExp.lastIndex - 1;
 
     switch (string.charCodeAt(i)) {
@@ -43,7 +47,7 @@ const escapeFunction = (string) => {
     }
 
     start = escapeRegExp.lastIndex;
-  }
+  } while (escapeRegExp.test(string));
 
   return escaped + string.slice(start);
 };
@@ -55,13 +59,18 @@ const escapeFunction = (string) => {
  */
 const html = (literals, ...expressions) => {
   let accumulator = "";
-  let i = 0;
+  const expressionsLength = expressions.length;
 
-  for (; i !== expressions.length; ++i) {
+  for (let i = 0; i < expressionsLength; ++i) {
     let literal = literals.raw[i];
-    let string = Array.isArray(expressions[i])
-      ? expressions[i].join("")
-      : `${expressions[i] ?? ""}`;
+    let string =
+      typeof expressions[i] === "string"
+        ? expressions[i]
+        : expressions[i] == null
+          ? ""
+          : Array.isArray(expressions[i])
+            ? expressions[i].join("")
+            : `${expressions[i]}`;
 
     if (literal.length && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
@@ -72,7 +81,7 @@ const html = (literals, ...expressions) => {
     accumulator += literal + string;
   }
 
-  return accumulator + literals.raw[expressions.length];
+  return accumulator + literals.raw[expressionsLength];
 };
 
 /**
@@ -82,14 +91,16 @@ const html = (literals, ...expressions) => {
  * @returns {Generator<string, void, void>} Generator<string, void, void>
  */
 const htmlGenerator = function* (literals, ...expressions) {
-  for (let i = 0; i !== expressions.length; ++i) {
+  const expressionsLength = expressions.length;
+
+  for (let i = 0; i < expressionsLength; ++i) {
     let expression = expressions[i];
     let literal = literals.raw[i];
     let string;
 
     if (typeof expression === "string") {
       string = expression;
-    } else if (expression === undefined || expression === null) {
+    } else if (expression == null) {
       string = "";
     } else {
       if (typeof expression[Symbol.iterator] === "function") {
@@ -108,13 +119,13 @@ const htmlGenerator = function* (literals, ...expressions) {
           if (typeof expression === "string") {
             string = expression;
           } else {
-            if (expression === undefined || expression === null) {
+            if (expression == null) {
               continue;
             }
 
             if (typeof expression[Symbol.iterator] === "function") {
               for (expression of expression) {
-                if (expression === undefined || expression === null) {
+                if (expression == null) {
                   continue;
                 }
 
@@ -161,8 +172,8 @@ const htmlGenerator = function* (literals, ...expressions) {
     }
   }
 
-  if (literals.raw[expressions.length].length) {
-    yield literals.raw[expressions.length];
+  if (literals.raw[expressionsLength].length) {
+    yield literals.raw[expressionsLength];
   }
 };
 
@@ -173,14 +184,16 @@ const htmlGenerator = function* (literals, ...expressions) {
  * @returns {AsyncGenerator<string, void, void>} AsyncGenerator<string, void, void>
  */
 const htmlAsyncGenerator = async function* (literals, ...expressions) {
-  for (let i = 0; i !== expressions.length; ++i) {
+  const expressionsLength = expressions.length;
+
+  for (let i = 0; i < expressionsLength; ++i) {
     let expression = await expressions[i];
     let literal = literals.raw[i];
     let string;
 
     if (typeof expression === "string") {
       string = expression;
-    } else if (expression === undefined || expression === null) {
+    } else if (expression == null) {
       string = "";
     } else {
       if (
@@ -202,7 +215,7 @@ const htmlAsyncGenerator = async function* (literals, ...expressions) {
           if (typeof expression === "string") {
             string = expression;
           } else {
-            if (expression === undefined || expression === null) {
+            if (expression == null) {
               continue;
             }
 
@@ -211,7 +224,7 @@ const htmlAsyncGenerator = async function* (literals, ...expressions) {
               typeof expression[Symbol.asyncIterator] === "function"
             ) {
               for await (expression of expression) {
-                if (expression === undefined || expression === null) {
+                if (expression == null) {
                   continue;
                 }
 
@@ -258,8 +271,8 @@ const htmlAsyncGenerator = async function* (literals, ...expressions) {
     }
   }
 
-  if (literals.raw[expressions.length].length) {
-    yield literals.raw[expressions.length];
+  if (literals.raw[expressionsLength].length) {
+    yield literals.raw[expressionsLength];
   }
 };