ghtml 1.2.0 → 1.2.1

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.2.0",
+  "version": "1.2.1",
   "type": "module",
   "main": "./src/index.js",
   "exports": {
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@fastify/pre-commit": "^2.1.0",
-    "grules": "^0.13.0"
+    "grules": "^0.14.1"
   },
   "repository": {
     "type": "git",

package/src/html.js

@@ -24,7 +24,7 @@ const html = (literals, ...expressions) => {
   let accumulator = "";
   let index = 0;
 
-  while (index < expressions.length) {
+  for (; index < expressions.length; ++index) {
     let literal = literals.raw[index];
     let expression =
       typeof expressions[index] === "string"
@@ -42,12 +42,9 @@ const html = (literals, ...expressions) => {
     }
 
     accumulator += literal + expression;
-    ++index;
   }
 
-  accumulator += literals.raw[index];
-
-  return accumulator;
+  return (accumulator += literals.raw[index]);
 };
 
 /**
@@ -58,7 +55,7 @@ const html = (literals, ...expressions) => {
 const htmlGenerator = function* (literals, ...expressions) {
   let index = 0;
 
-  while (index < expressions.length) {
+  for (; index < expressions.length; ++index) {
     let literal = literals.raw[index];
     let expression;
 
@@ -100,7 +97,6 @@ const htmlGenerator = function* (literals, ...expressions) {
           }
         }
 
-        ++index;
         continue;
       }
 
@@ -116,8 +112,6 @@ const htmlGenerator = function* (literals, ...expressions) {
     if (literal.length || expression.length) {
       yield literal + expression;
     }
-
-    ++index;
   }
 
   if (literals.raw[index].length) {

package/test/index.js

@@ -1,15 +1,15 @@
+// eslint-disable-next-line n/no-missing-import
 import test from "node:test";
 import assert from "node:assert";
 import { html, htmlGenerator } from "../src/index.js";
 
+const conditionTrue = true;
+const conditionFalse = false;
 const username = "Paul";
 const descriptionSafe = "This is a safe description.";
 const descriptionUnsafe =
   "<script>alert('This is an unsafe description.')</script>";
 const array1 = [1, 2, 3, 4, 5];
-const conditionTrue = true;
-const conditionFalse = false;
-const emptyString = "";
 
 const generatorExample = function* () {
   yield "<p>";
@@ -26,7 +26,7 @@ test("renders empty input", () => {
 });
 
 test("renders empty input", () => {
-  assert.strictEqual(html`${emptyString}`, "");
+  assert.strictEqual(html`${""}`, "");
 });
 
 test("renders normal input", () => {
@@ -40,7 +40,7 @@ test("renders safe content", () => {
   );
 });
 
-test("escapes unsafe content", () => {
+test("renders unsafe content", () => {
   assert.strictEqual(
     html`<p>${descriptionUnsafe}</p>`,
     `<p>&lt;script&gt;alert(&apos;This is an unsafe description.&apos;)&lt;/script&gt;</p>`,
@@ -54,14 +54,14 @@ test("renders arrays", () => {
   );
 });
 
-test("bypass escaping", () => {
+test("bypasses escaping", () => {
   assert.strictEqual(
     html`<p>!${[descriptionSafe, descriptionUnsafe]}</p>`,
     "<p>This is a safe description.<script>alert('This is an unsafe description.')</script></p>",
   );
 });
 
-test("renders wrapped html calls", () => {
+test("renders nested html calls", () => {
   // prettier-ignore
   assert.strictEqual(
     html`<p>!${conditionTrue ? html`<strong>${descriptionUnsafe}</strong>` : ""}</p>`,
@@ -117,17 +117,20 @@ test("renders multiple html calls with different expression types", () => {
 });
 
 test("htmlGenerator renders safe content", () => {
-  const generator = htmlGenerator`<p>${descriptionSafe}!${descriptionSafe}G!${htmlGenerator`${array1}`}!${null}${255}</p>`;
-  assert.strictEqual(generator.next().value, "<p>This is a safe description.");
-  assert.strictEqual(generator.next().value, "This is a safe description.");
-  assert.strictEqual(generator.next().value, "G");
-  assert.strictEqual(generator.next().value, "12345");
-  assert.strictEqual(generator.next().value, "255");
-  assert.strictEqual(generator.next().value, "</p>");
-  assert.strictEqual(generator.next().done, true);
+  const generator = htmlGenerator`<p>${descriptionSafe}!${descriptionUnsafe}G!${htmlGenerator`${array1}`}!${null}${255}</p>`;
+  let accumulator = "";
+
+  for (const value of generator) {
+    accumulator += value;
+  }
+
+  assert.strictEqual(
+    accumulator,
+    "<p>This is a safe description.<script>alert('This is an unsafe description.')</script>G12345255</p>",
+  );
 });
 
-test("htmlGenerator escapes unsafe content", () => {
+test("htmlGenerator renders unsafe content", () => {
   const generator = htmlGenerator`<p>${descriptionUnsafe}${descriptionUnsafe}${htmlGenerator`${array1}`}${null}${255}</p>`;
   assert.strictEqual(
     generator.next().value,