ghtml 2.1.1 → 2.1.3

package/.eslintrc.json

@@ -1,7 +1,4 @@
 {
   "root": true,
-  "extends": ["plugin:grules/all"],
-  "rules": {
-    "prefer-template": "off"
-  }
+  "extends": ["plugin:grules/all"]
 }

package/bin/README.md

@@ -5,7 +5,7 @@ Append unique hashes to assets referenced in your views to aggressively cache th
 Running the following command will scan asset files found in the `roots` path(s) and replace their references with hashed versions in the `refs` path(s):
 
 ```sh
-npx ghtml --roots="path/to/scan/assets1/,path/to/scan/assets2/" --refs="views/path/to/append/hashes1/,views/path/to/append/hashes2/"
+npx ghtml --roots="path/to/scan/assets/1/,path/to/scan/assets/2/" --refs="views/path/to/append/hashes/1/,views/path/to/append/hashes/2/"
 ```
 
 ## Example (Fastify)

package/bin/src/utils.js

@@ -1,10 +1,7 @@
 import { createHash } from "node:crypto";
 import { readFile, writeFile } from "node:fs/promises";
 import { win32, posix } from "node:path";
-import { cpus } from "node:os";
 import { Glob } from "glob";
-import { promise as fastq } from "fastq";
-const fastqConcurrency = Math.max(1, cpus().length - 1);
 
 const generateFileHash = async (filePath) => {
   try {
@@ -91,10 +88,8 @@ const generateHashesAndReplace = async ({
       rootPath += "/";
     }
 
-    const queue = fastq(generateFileHash, fastqConcurrency);
-    const queuePromises = [];
+    const queue = [];
     const files = [];
-
     const filesIterable = new Glob("**/**", {
       nodir: true,
       follow: true,
@@ -104,13 +99,13 @@ const generateHashesAndReplace = async ({
       ignore: skipPatterns,
     });
 
-    for await (let file of filesIterable) {
-      file = file.split(win32.sep).join(posix.sep);
-      files.push(file);
-      queuePromises.push(queue.push(file));
+    for await (let filePath of filesIterable) {
+      filePath = filePath.split(win32.sep).join(posix.sep);
+      queue.push(generateFileHash(filePath));
+      files.push(filePath);
     }
 
-    const hashes = await Promise.all(queuePromises);
+    const hashes = await Promise.all(queue);
 
     for (let i = 0; i < files.length; i++) {
       const fileRelativePath = posix.relative(rootPath, files[i]);

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": "2.1.1",
+  "version": "2.1.3",
   "type": "module",
   "bin": "./bin/src/index.js",
   "main": "./src/index.js",
@@ -21,13 +21,12 @@
     "lint:fix": "eslint --fix . && prettier --write ."
   },
   "dependencies": {
-    "fastq": "^1.17.1",
-    "glob": "^10.4.2"
+    "glob": "^10.4.5"
   },
   "devDependencies": {
     "@fastify/pre-commit": "^2.1.0",
     "c8": "^10.1.2",
-    "grules": "^0.17.2",
+    "grules": "^0.17.3",
     "tinybench": "^2.8.0"
   },
   "repository": {

package/src/html.js

@@ -1,11 +1,11 @@
 const escapeRegExp = /["&'<>`]/;
 
 const escapeFunction = (string) => {
-  const stringLength = string.length;
-  let start = 0;
   let escaped = "";
+  let start = 0;
+  let end = 0;
 
-  for (let end = 0; end !== stringLength; ++end) {
+  for (; end !== string.length; ++end) {
     switch (string.charCodeAt(end)) {
       case 34: // "
         escaped += string.slice(start, end) + "&#34;";
@@ -34,7 +34,7 @@ const escapeFunction = (string) => {
     }
   }
 
-  escaped += string.slice(start, stringLength);
+  escaped += string.slice(start, end);
 
   return escaped;
 };
@@ -45,10 +45,10 @@ const escapeFunction = (string) => {
  * @returns {string} The HTML string.
  */
 const html = ({ raw: literals }, ...expressions) => {
-  const expressionsLength = expressions.length;
   let accumulator = "";
+  let index = 0;
 
-  for (let index = 0; index !== expressionsLength; ++index) {
+  for (; index !== expressions.length; ++index) {
     const expression = expressions[index];
     let literal = literals[index];
     let string =
@@ -69,7 +69,7 @@ const html = ({ raw: literals }, ...expressions) => {
     accumulator += literal + string;
   }
 
-  accumulator += literals[expressionsLength];
+  accumulator += literals[index];
 
   return accumulator;
 };
@@ -80,9 +80,9 @@ const html = ({ raw: literals }, ...expressions) => {
  * @yields {string} The HTML strings.
  */
 const htmlGenerator = function* ({ raw: literals }, ...expressions) {
-  const expressionsLength = expressions.length;
+  let index = 0;
 
-  for (let index = 0; index !== expressionsLength; ++index) {
+  for (; index !== expressions.length; ++index) {
     let expression = expressions[index];
     let literal = literals[index];
     let string;
@@ -165,8 +165,8 @@ const htmlGenerator = function* ({ raw: literals }, ...expressions) {
     }
   }
 
-  if (literals[expressionsLength]) {
-    yield literals[expressionsLength];
+  if (literals[index]) {
+    yield literals[index];
   }
 };
 
@@ -176,9 +176,9 @@ 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 (let index = 0; index !== expressionsLength; ++index) {
+  for (; index !== expressions.length; ++index) {
     let expression = await expressions[index];
     let literal = literals[index];
     let string;
@@ -264,8 +264,8 @@ const htmlAsyncGenerator = async function* ({ raw: literals }, ...expressions) {
     }
   }
 
-  if (literals[expressionsLength]) {
-    yield literals[expressionsLength];
+  if (literals[index]) {
+    yield literals[index];
   }
 };