ghtml 3.1.0 → 3.1.2

package/bench/index.js

@@ -29,18 +29,14 @@ bench.add("multiple string expressions", () => {
 const items1 = ["Item 1", undefined, "Item 2", null, 2000, 1500.5];
 bench.add("array expressions", () => {
   result = html`<ul>
-    ${items1.map((item) => {
-      return html`<li>${item}</li>`;
-    })}
+    ${items1.map((item) => html`<li>${item}</li>`)}
   </ul>`;
 });
 
 const items2 = ["Item 1", "Item <1.5>", "Item 2", "Item <2.5>", "Item 3"];
 bench.add("array expressions with escapable chars", () => {
   result = html`<ul>
-    ${items2.map((item) => {
-      return html`<li>"${item}" & '${item}'</li>`;
-    })}
+    ${items2.map((item) => html`<li>"${item}" & '${item}'</li>`)}
   </ul>`;
 });
 
@@ -59,9 +55,7 @@ bench.add("multiple types of expressions", () => {
     <div>Id: <span>${user.id}</span></div>
     ${null}${123}${456n}
     <ul>
-      !${items2.map((item) => {
-        return html`<li>${item}</li>`;
-      })}
+      !${items2.map((item) => html`<li>${item}</li>`)}
     </ul>
   `;
 });

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.0",
+  "version": "3.1.2",
   "type": "commonjs",
   "bin": "./bin/src/index.js",
   "main": "./src/index.js",
@@ -25,12 +25,12 @@
     "glob": "^10.4.5"
   },
   "devDependencies": {
-    "@fastify/pre-commit": "^2.1.0",
+    "@fastify/pre-commit": "^2.2.0",
     "c8": "^10.1.2",
-    "globals": "^15.11.0",
-    "grules": "^0.25.10",
-    "tinybench": "^2.9.0",
-    "typescript": ">=5.6.2"
+    "globals": "^16.0.0",
+    "grules": "^0.26.1",
+    "tinybench": "^3.0.7",
+    "typescript": ">=5.7.2"
   },
   "repository": {
     "type": "git",

package/src/index.js

@@ -1,10 +1,5 @@
 "use strict";
 
-const _isArray = Array.isArray;
-
-const _iterator = Symbol.iterator;
-const _asyncIterator = Symbol.asyncIterator;
-
 const escapeRegExp = /["&'<=>]/g;
 
 const escapeFunction = (string) => {
@@ -60,16 +55,17 @@ const escapeFunction = (string) => {
  */
 const html = (literals, ...expressions) => {
   let accumulator = "";
+  let i = 0;
 
-  for (let i = 0; i !== expressions.length; ++i) {
+  for (; i !== expressions.length; ++i) {
     let literal = literals.raw[i];
-    let string = _isArray(expressions[i])
+    let string = Array.isArray(expressions[i])
       ? expressions[i].join("")
       : `${expressions[i] ?? ""}`;
 
-    if (literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33) {
+    if (literal.length && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else if (string.length !== 0) {
+    } else if (string.length) {
       string = escapeFunction(string);
     }
 
@@ -96,15 +92,15 @@ const htmlGenerator = function* (literals, ...expressions) {
     } else if (expression === undefined || expression === null) {
       string = "";
     } else {
-      if (typeof expression[_iterator] === "function") {
+      if (typeof expression[Symbol.iterator] === "function") {
         const isRaw =
-          literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33;
+          literal.length && literal.charCodeAt(literal.length - 1) === 33;
 
         if (isRaw) {
           literal = literal.slice(0, -1);
         }
 
-        if (literal.length !== 0) {
+        if (literal.length) {
           yield literal;
         }
 
@@ -116,7 +112,7 @@ const htmlGenerator = function* (literals, ...expressions) {
               continue;
             }
 
-            if (typeof expression[_iterator] === "function") {
+            if (typeof expression[Symbol.iterator] === "function") {
               for (expression of expression) {
                 if (expression === undefined || expression === null) {
                   continue;
@@ -124,7 +120,7 @@ const htmlGenerator = function* (literals, ...expressions) {
 
                 string = `${expression}`;
 
-                if (string.length !== 0) {
+                if (string.length) {
                   if (!isRaw) {
                     string = escapeFunction(string);
                   }
@@ -139,7 +135,7 @@ const htmlGenerator = function* (literals, ...expressions) {
             string = `${expression}`;
           }
 
-          if (string.length !== 0) {
+          if (string.length) {
             if (!isRaw) {
               string = escapeFunction(string);
             }
@@ -154,18 +150,18 @@ const htmlGenerator = function* (literals, ...expressions) {
       string = `${expression}`;
     }
 
-    if (literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33) {
+    if (literal.length && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else if (string.length !== 0) {
+    } else if (string.length) {
       string = escapeFunction(string);
     }
 
-    if (literal.length !== 0 || string.length !== 0) {
+    if (literal.length || string.length) {
       yield literal + string;
     }
   }
 
-  if (literals.raw[expressions.length].length !== 0) {
+  if (literals.raw[expressions.length].length) {
     yield literals.raw[expressions.length];
   }
 };
@@ -188,17 +184,17 @@ const htmlAsyncGenerator = async function* (literals, ...expressions) {
       string = "";
     } else {
       if (
-        typeof expression[_iterator] === "function" ||
-        typeof expression[_asyncIterator] === "function"
+        typeof expression[Symbol.iterator] === "function" ||
+        typeof expression[Symbol.asyncIterator] === "function"
       ) {
         const isRaw =
-          literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33;
+          literal.length && literal.charCodeAt(literal.length - 1) === 33;
 
         if (isRaw) {
           literal = literal.slice(0, -1);
         }
 
-        if (literal.length !== 0) {
+        if (literal.length) {
           yield literal;
         }
 
@@ -211,8 +207,8 @@ const htmlAsyncGenerator = async function* (literals, ...expressions) {
             }
 
             if (
-              typeof expression[_iterator] === "function" ||
-              typeof expression[_asyncIterator] === "function"
+              typeof expression[Symbol.iterator] === "function" ||
+              typeof expression[Symbol.asyncIterator] === "function"
             ) {
               for await (expression of expression) {
                 if (expression === undefined || expression === null) {
@@ -221,7 +217,7 @@ const htmlAsyncGenerator = async function* (literals, ...expressions) {
 
                 string = `${expression}`;
 
-                if (string.length !== 0) {
+                if (string.length) {
                   if (!isRaw) {
                     string = escapeFunction(string);
                   }
@@ -236,7 +232,7 @@ const htmlAsyncGenerator = async function* (literals, ...expressions) {
             string = `${expression}`;
           }
 
-          if (string.length !== 0) {
+          if (string.length) {
             if (!isRaw) {
               string = escapeFunction(string);
             }
@@ -251,18 +247,18 @@ const htmlAsyncGenerator = async function* (literals, ...expressions) {
       string = `${expression}`;
     }
 
-    if (literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33) {
+    if (literal.length && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else if (string.length !== 0) {
+    } else if (string.length) {
       string = escapeFunction(string);
     }
 
-    if (literal.length !== 0 || string.length !== 0) {
+    if (literal.length || string.length) {
       yield literal + string;
     }
   }
 
-  if (literals.raw[expressions.length].length !== 0) {
+  if (literals.raw[expressions.length].length) {
     yield literals.raw[expressions.length];
   }
 };

package/test/index.js

@@ -139,9 +139,7 @@ test("renders multiple html calls", () => {
 
 test("renders multiple html calls with different expression types", () => {
   const obj = {};
-  obj.toString = () => {
-    return "description of the object";
-  };
+  obj.toString = () => "description of the object";
 
   // prettier-ignore
   assert.strictEqual(
@@ -151,7 +149,7 @@ test("renders multiple html calls with different expression types", () => {
         !${conditionFalse
           ? ""
           :
-            html`<em> ${array1.map((i) => {return i + 1;})} </em>`}<br />
+            html`<em> ${array1.map((i) => i + 1)} </em>`}<br />
         And also, ${false} ${null}${undefined}${obj} is ${true}
       </p>
     `,
@@ -194,9 +192,7 @@ test("htmlGenerator renders unsafe content", () => {
 });
 
 test("htmlGenerator works with nested htmlGenerator calls in an array", () => {
-  const generator = htmlGenerator`<ul>!${[1, 2, 3].map((index) => {
-    return htmlGenerator`<li>${index}</li>`;
-  })}</ul>`;
+  const generator = htmlGenerator`<ul>!${[1, 2, 3].map((index) => htmlGenerator`<li>${index}</li>`)}</ul>`;
   let accumulator = "";
 
   for (const value of generator) {
@@ -347,9 +343,7 @@ test("htmlAsyncGenerator works with other generators (escaped)", async () => {
 });
 
 test("htmlAsyncGenerator works with nested htmlAsyncGenerator calls in an array", async () => {
-  const generator = htmlAsyncGenerator`!${[1, 2, 3].map((i) => {
-    return htmlAsyncGenerator`${i}: <p>${readFile("test/test.md", "utf8")}</p>`;
-  })}`;
+  const generator = htmlAsyncGenerator`!${[1, 2, 3].map((i) => htmlAsyncGenerator`${i}: <p>${readFile("test/test.md", "utf8")}</p>`)}`;
   let accumulator = "";
 
   for await (const value of generator) {
@@ -363,9 +357,7 @@ test("htmlAsyncGenerator works with nested htmlAsyncGenerator calls in an array"
 });
 
 test("htmlAsyncGenerator renders chunks with promises (escaped)", async () => {
-  const generator = htmlAsyncGenerator`<ul>!${[1, 2].map((i) => {
-    return htmlAsyncGenerator`${i}: ${readFile("test/test.md", "utf8")}`;
-  })}</ul>`;
+  const generator = htmlAsyncGenerator`<ul>!${[1, 2].map((i) => htmlAsyncGenerator`${i}: ${readFile("test/test.md", "utf8")}`)}</ul>`;
   const fileContent = readFileSync("test/test.md", "utf8").replaceAll(
     ">",
     "&#62;",
@@ -394,9 +386,7 @@ test("htmlAsyncGenerator renders chunks with promises (escaped)", async () => {
 });
 
 test("htmlAsyncGenerator renders chunks with promises (raw)", async () => {
-  const generator = htmlAsyncGenerator`<ul>!${[1, 2].map((i) => {
-    return htmlAsyncGenerator`${i}: !${readFile("test/test.md", "utf8")}`;
-  })}</ul>`;
+  const generator = htmlAsyncGenerator`<ul>!${[1, 2].map((i) => htmlAsyncGenerator`${i}: !${readFile("test/test.md", "utf8")}`)}</ul>`;
   const fileContent = readFileSync("test/test.md", "utf8");
 
   let value = await generator.next();