ghtml 3.0.12 → 3.1.0

package/bench/index.js

@@ -1,10 +1,12 @@
-/* eslint-disable no-unused-vars */
-import { html } from "ghtml";
-import { Bench } from "tinybench";
-import { writeFileSync } from "node:fs";
-import { Buffer } from "node:buffer";
+"use strict";
+
+const { html } = require("..");
+const { Bench } = require("tinybench");
+const { writeFileSync } = require("node:fs");
 
 const bench = new Bench({ time: 500 });
+
+// eslint-disable-next-line no-unused-vars
 let result = "";
 
 bench.add("simple HTML formatting", () => {
@@ -108,13 +110,15 @@ bench.add("sparse escape", () => {
   result = html`<p>${`${"noescape".repeat(250)}<>`.repeat(5)}</p>`;
 });
 
-await bench.warmup();
-await bench.run();
+(async () => {
+  await bench.warmup();
+  await bench.run();
 
-const table = bench.table();
-globalThis.console.table(table);
+  const table = bench.table();
+  globalThis.console.table(table);
 
-writeFileSync(
-  "bench/results.json",
-  Buffer.from(JSON.stringify(table), "utf8").toString("base64"),
-);
+  writeFileSync(
+    "bench/results.json",
+    Buffer.from(JSON.stringify(table), "utf8").toString("base64"),
+  );
+})();

package/bin/src/index.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
-import { generateHashesAndReplace } from "./utils.js";
-import process from "node:process";
+
+"use strict";
+
+const { generateHashesAndReplace } = require("./utils.js");
 
 const parseArguments = (args) => {
   let roots = null;

package/bin/src/utils.js

@@ -1,7 +1,9 @@
-import { Glob } from "glob";
-import { createHash } from "node:crypto";
-import { readFile, writeFile } from "node:fs/promises";
-import { win32, posix } from "node:path";
+"use strict";
+
+const { Glob } = require("glob");
+const { createHash } = require("node:crypto");
+const { readFile, writeFile } = require("node:fs/promises");
+const { win32, posix } = require("node:path");
 
 const generateFileHash = async (filePath) => {
   try {
@@ -77,7 +79,7 @@ const updateFilePathsWithHashes = async (
   }
 };
 
-export const generateHashesAndReplace = async ({
+const generateHashesAndReplace = async ({
   roots,
   refs,
   prefix,
@@ -130,3 +132,5 @@ export const generateHashesAndReplace = async ({
     skipPatterns,
   );
 };
+
+module.exports.generateHashesAndReplace = generateHashesAndReplace;

package/{eslint.config.js → eslint.config.mjs}

@@ -1,7 +1,15 @@
 import grules from "grules";
+import globals from "globals";
 
 export default [
   ...grules,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
   {
     rules: {
       "no-await-in-loop": "off",

package/package.json

@@ -3,8 +3,8 @@
   "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.12",
-  "type": "module",
+  "version": "3.1.0",
+  "type": "commonjs",
   "bin": "./bin/src/index.js",
   "main": "./src/index.js",
   "exports": {
@@ -27,6 +27,7 @@
   "devDependencies": {
     "@fastify/pre-commit": "^2.1.0",
     "c8": "^10.1.2",
+    "globals": "^15.11.0",
     "grules": "^0.25.10",
     "tinybench": "^2.9.0",
     "typescript": ">=5.6.2"

package/src/includeFile.d.ts

@@ -1 +1,5 @@
+/**
+ * @param {string} path path
+ * @returns {string} string
+ */
 export function includeFile(path: string): string;

package/src/includeFile.js

@@ -1,4 +1,6 @@
-import { readFileSync } from "node:fs";
+"use strict";
+
+const { readFileSync } = require("node:fs");
 
 const cache = new Map();
 
@@ -6,7 +8,7 @@ const cache = new Map();
  * @param {string} path path
  * @returns {string} string
  */
-export const includeFile = (path) => {
+const includeFile = (path) => {
   let file = cache.get(path);
 
   if (file === undefined) {
@@ -16,3 +18,5 @@ export const includeFile = (path) => {
 
   return file;
 };
+
+module.exports.includeFile = includeFile;

package/src/index.d.ts

@@ -1,3 +1,20 @@
+/**
+ * @param {TemplateStringsArray} literals literals
+ * @param {...any} expressions expressions
+ * @returns {string} string
+ */
 export function html(literals: TemplateStringsArray, ...expressions: any[]): string;
+/**
+ * @param {TemplateStringsArray} literals literals
+ * @param {...any} expressions expressions
+ * @yields {string} string
+ * @returns {Generator<string, void, void>} Generator<string, void, void>
+ */
 export function htmlGenerator(literals: TemplateStringsArray, ...expressions: any[]): Generator<string, void, void>;
+/**
+ * @param {TemplateStringsArray} literals literals
+ * @param {...any} expressions expressions
+ * @yields {string} string
+ * @returns {AsyncGenerator<string, void, void>} AsyncGenerator<string, void, void>
+ */
 export function htmlAsyncGenerator(literals: TemplateStringsArray, ...expressions: any[]): AsyncGenerator<string, void, void>;

package/src/index.js

@@ -1,3 +1,10 @@
+"use strict";
+
+const _isArray = Array.isArray;
+
+const _iterator = Symbol.iterator;
+const _asyncIterator = Symbol.asyncIterator;
+
 const escapeRegExp = /["&'<=>]/g;
 
 const escapeFunction = (string) => {
@@ -51,19 +58,19 @@ const escapeFunction = (string) => {
  * @param {...any} expressions expressions
  * @returns {string} string
  */
-export const html = (literals, ...expressions) => {
+const html = (literals, ...expressions) => {
   let accumulator = "";
 
   for (let i = 0; i !== expressions.length; ++i) {
     let literal = literals.raw[i];
-    let string = Array.isArray(expressions[i])
+    let string = _isArray(expressions[i])
       ? expressions[i].join("")
       : `${expressions[i] ?? ""}`;
 
-    if (literal && literal.charCodeAt(literal.length - 1) === 33) {
+    if (literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else {
-      string &&= escapeFunction(string);
+    } else if (string.length !== 0) {
+      string = escapeFunction(string);
     }
 
     accumulator += literal + string;
@@ -78,7 +85,7 @@ export const html = (literals, ...expressions) => {
  * @yields {string} string
  * @returns {Generator<string, void, void>} Generator<string, void, void>
  */
-export const htmlGenerator = function* (literals, ...expressions) {
+const htmlGenerator = function* (literals, ...expressions) {
   for (let i = 0; i !== expressions.length; ++i) {
     let expression = expressions[i];
     let literal = literals.raw[i];
@@ -89,15 +96,15 @@ export const htmlGenerator = function* (literals, ...expressions) {
     } else if (expression === undefined || expression === null) {
       string = "";
     } else {
-      if (expression[Symbol.iterator]) {
+      if (typeof expression[_iterator] === "function") {
         const isRaw =
-          Boolean(literal) && literal.charCodeAt(literal.length - 1) === 33;
+          literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33;
 
         if (isRaw) {
           literal = literal.slice(0, -1);
         }
 
-        if (literal) {
+        if (literal.length !== 0) {
           yield literal;
         }
 
@@ -109,15 +116,15 @@ export const htmlGenerator = function* (literals, ...expressions) {
               continue;
             }
 
-            if (expression[Symbol.iterator]) {
+            if (typeof expression[_iterator] === "function") {
               for (expression of expression) {
                 if (expression === undefined || expression === null) {
                   continue;
                 }
 
-                string = String(expression);
+                string = `${expression}`;
 
-                if (string) {
+                if (string.length !== 0) {
                   if (!isRaw) {
                     string = escapeFunction(string);
                   }
@@ -129,10 +136,10 @@ export const htmlGenerator = function* (literals, ...expressions) {
               continue;
             }
 
-            string = String(expression);
+            string = `${expression}`;
           }
 
-          if (string) {
+          if (string.length !== 0) {
             if (!isRaw) {
               string = escapeFunction(string);
             }
@@ -144,21 +151,21 @@ export const htmlGenerator = function* (literals, ...expressions) {
         continue;
       }
 
-      string = String(expression);
+      string = `${expression}`;
     }
 
-    if (literal && literal.charCodeAt(literal.length - 1) === 33) {
+    if (literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else {
-      string &&= escapeFunction(string);
+    } else if (string.length !== 0) {
+      string = escapeFunction(string);
     }
 
-    if (literal || string) {
+    if (literal.length !== 0 || string.length !== 0) {
       yield literal + string;
     }
   }
 
-  if (literals.raw[expressions.length]) {
+  if (literals.raw[expressions.length].length !== 0) {
     yield literals.raw[expressions.length];
   }
 };
@@ -169,7 +176,7 @@ export const htmlGenerator = function* (literals, ...expressions) {
  * @yields {string} string
  * @returns {AsyncGenerator<string, void, void>} AsyncGenerator<string, void, void>
  */
-export const htmlAsyncGenerator = async function* (literals, ...expressions) {
+const htmlAsyncGenerator = async function* (literals, ...expressions) {
   for (let i = 0; i !== expressions.length; ++i) {
     let expression = await expressions[i];
     let literal = literals.raw[i];
@@ -180,15 +187,18 @@ export const htmlAsyncGenerator = async function* (literals, ...expressions) {
     } else if (expression === undefined || expression === null) {
       string = "";
     } else {
-      if (expression[Symbol.iterator] || expression[Symbol.asyncIterator]) {
+      if (
+        typeof expression[_iterator] === "function" ||
+        typeof expression[_asyncIterator] === "function"
+      ) {
         const isRaw =
-          Boolean(literal) && literal.charCodeAt(literal.length - 1) === 33;
+          literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33;
 
         if (isRaw) {
           literal = literal.slice(0, -1);
         }
 
-        if (literal) {
+        if (literal.length !== 0) {
           yield literal;
         }
 
@@ -201,17 +211,17 @@ export const htmlAsyncGenerator = async function* (literals, ...expressions) {
             }
 
             if (
-              expression[Symbol.iterator] ||
-              expression[Symbol.asyncIterator]
+              typeof expression[_iterator] === "function" ||
+              typeof expression[_asyncIterator] === "function"
             ) {
               for await (expression of expression) {
                 if (expression === undefined || expression === null) {
                   continue;
                 }
 
-                string = String(expression);
+                string = `${expression}`;
 
-                if (string) {
+                if (string.length !== 0) {
                   if (!isRaw) {
                     string = escapeFunction(string);
                   }
@@ -223,10 +233,10 @@ export const htmlAsyncGenerator = async function* (literals, ...expressions) {
               continue;
             }
 
-            string = String(expression);
+            string = `${expression}`;
           }
 
-          if (string) {
+          if (string.length !== 0) {
             if (!isRaw) {
               string = escapeFunction(string);
             }
@@ -238,21 +248,25 @@ export const htmlAsyncGenerator = async function* (literals, ...expressions) {
         continue;
       }
 
-      string = String(expression);
+      string = `${expression}`;
     }
 
-    if (literal && literal.charCodeAt(literal.length - 1) === 33) {
+    if (literal.length !== 0 && literal.charCodeAt(literal.length - 1) === 33) {
       literal = literal.slice(0, -1);
-    } else {
-      string &&= escapeFunction(string);
+    } else if (string.length !== 0) {
+      string = escapeFunction(string);
     }
 
-    if (literal || string) {
+    if (literal.length !== 0 || string.length !== 0) {
       yield literal + string;
     }
   }
 
-  if (literals.raw[expressions.length]) {
+  if (literals.raw[expressions.length].length !== 0) {
     yield literals.raw[expressions.length];
   }
 };
+
+module.exports.html = html;
+module.exports.htmlGenerator = htmlGenerator;
+module.exports.htmlAsyncGenerator = htmlAsyncGenerator;

package/test/index.js

@@ -1,8 +1,10 @@
-import { html, htmlGenerator, htmlAsyncGenerator } from "../src/index.js";
-import { readFile } from "node:fs/promises";
-import { readFileSync } from "node:fs";
-import test from "node:test";
-import assert from "node:assert";
+"use strict";
+
+const { html, htmlGenerator, htmlAsyncGenerator } = require("..");
+const { readFile } = require("node:fs/promises");
+const { readFileSync } = require("node:fs");
+const test = require("node:test");
+const assert = require("node:assert/strict");
 
 const conditionTrue = true;
 const conditionFalse = false;