ghtml 1.7.0 → 1.7.2

package/README.md

@@ -78,7 +78,7 @@ const htmlString = html`
             )}
           </ul>
         `
-      : "<p>No data...</p>"}
+      : html`<p>No data...</p>`}
   </div>
 `;
 ```

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": "1.7.0",
+  "version": "1.7.2",
   "type": "module",
   "main": "./src/index.js",
   "exports": {
@@ -22,8 +22,8 @@
   "devDependencies": {
     "@fastify/pre-commit": "^2.1.0",
     "c8": "^9.1.0",
-    "grules": "^0.16.2",
-    "tinybench": "^2.6.0"
+    "grules": "^0.17.1",
+    "tinybench": "^2.8.0"
   },
   "repository": {
     "type": "git",

package/src/html.js

@@ -19,7 +19,6 @@ const escapeFunction = (string) => {
 
   do {
     const escapedCharacter = escapeDictionary[string[end++]];
-
     if (escapedCharacter) {
       escaped += string.slice(start, end - 1) + escapedCharacter;
       start = end;
@@ -37,17 +36,18 @@ const arrayIsArray = Array.isArray;
  * @returns {string} The HTML string.
  */
 const html = ({ raw: literals }, ...expressions) => {
+  const expressionsLength = expressions.length;
   let index = 0;
   let accumulator = "";
 
-  for (; index !== expressions.length; ++index) {
+  for (; index !== expressionsLength; ++index) {
     const expression = expressions[index];
     let literal = literals[index];
     let string =
-      expression === undefined || expression === null
-        ? ""
-        : typeof expression === "string"
-          ? expression
+      typeof expression === "string"
+        ? expression
+        : expression === undefined || expression === null
+          ? ""
           : arrayIsArray(expression)
             ? expression.join("")
             : `${expression}`;
@@ -70,17 +70,18 @@ const html = ({ raw: literals }, ...expressions) => {
  * @yields {string} The HTML strings.
  */
 const htmlGenerator = function* ({ raw: literals }, ...expressions) {
+  const expressionsLength = expressions.length;
   let index = 0;
 
-  for (; index !== expressions.length; ++index) {
+  for (; index !== expressionsLength; ++index) {
     let expression = expressions[index];
     let literal = literals[index];
     let string;
 
-    if (expression === undefined || expression === null) {
-      string = "";
-    } else if (typeof expression === "string") {
+    if (typeof expression === "string") {
       string = expression;
+    } else if (expression === undefined || expression === null) {
+      string = "";
     } else {
       if (expression[Symbol.iterator]) {
         const isRaw =
@@ -95,13 +96,13 @@ const htmlGenerator = function* ({ raw: literals }, ...expressions) {
         }
 
         for (expression of expression) {
-          if (expression === undefined || expression === null) {
-            continue;
-          }
-
           if (typeof expression === "string") {
             string = expression;
           } else {
+            if (expression === undefined || expression === null) {
+              continue;
+            }
+
             if (expression[Symbol.iterator]) {
               for (expression of expression) {
                 if (expression === undefined || expression === null) {
@@ -162,17 +163,18 @@ const htmlGenerator = function* ({ raw: literals }, ...expressions) {
  * @yields {string} The HTML strings.
  */
 const htmlAsyncGenerator = async function* ({ raw: literals }, ...expressions) {
+  const expressionsLength = expressions.length;
   let index = 0;
 
-  for (; index !== expressions.length; ++index) {
+  for (; index !== expressionsLength; ++index) {
     let expression = await expressions[index];
     let literal = literals[index];
     let string;
 
-    if (expression === undefined || expression === null) {
-      string = "";
-    } else if (typeof expression === "string") {
+    if (typeof expression === "string") {
       string = expression;
+    } else if (expression === undefined || expression === null) {
+      string = "";
     } else {
       if (expression[Symbol.iterator] || expression[Symbol.asyncIterator]) {
         const isRaw =
@@ -187,13 +189,13 @@ const htmlAsyncGenerator = async function* ({ raw: literals }, ...expressions) {
         }
 
         for await (expression of expression) {
-          if (expression === undefined || expression === null) {
-            continue;
-          }
-
           if (typeof expression === "string") {
             string = expression;
           } else {
+            if (expression === undefined || expression === null) {
+              continue;
+            }
+
             if (
               expression[Symbol.iterator] ||
               expression[Symbol.asyncIterator]