ghtml 2.2.0 → 2.2.1

package/bin/README.md

@@ -1,4 +1,4 @@
-This executable lets you append unique hashes to assets referenced in your views to aggressively cache them while guaranteeing that clients receive the most recent versions.
+Lets you append unique hashes to assets referenced in your views to aggressively cache them while guaranteeing that clients receive the most recent versions.
 
 ## Usage
 

package/bin/example/routes/index.js

@@ -1,3 +1,5 @@
+/* eslint-disable n/no-missing-import */
+
 import { html } from "ghtml";
 
 export default async (fastify) => {

package/bin/example/server.js

@@ -1,3 +1,5 @@
+/* eslint-disable n/no-missing-import */
+
 import Fastify from "fastify";
 
 const fastify = Fastify();

package/bin/src/utils.js

@@ -38,42 +38,34 @@ const updateFilePathsWithHashes = async (
 
     for await (const filePath of filesIterable) {
       let content = await readFile(filePath, "utf8");
-      let hasChanges = false;
+      let found = false;
 
       for (const [originalPath, hash] of fileHashes) {
-        const pathIndex = content.indexOf(originalPath);
-        if (pathIndex !== -1) {
-          hasChanges = true;
-          const beforePath = content.slice(0, pathIndex);
-          const afterPath = content.slice(pathIndex + originalPath.length);
-
-          const queryStart = afterPath.indexOf("?");
-          if (queryStart === -1) {
-            content = `${beforePath}${originalPath}?hash=${hash}${afterPath}`;
-            continue;
-          }
-
-          const queryEnd = afterPath.slice(queryStart).search(/[#"'`]/u);
-          const queryString =
-            queryEnd !== -1
-              ? afterPath.slice(queryStart + 1, queryEnd)
-              : afterPath.slice(queryStart + 1);
-
-          const hashRegex = /(?<=(?:^|&))hash=[^&]*/u;
-          if (hashRegex.test(queryString)) {
-            const newQueryString = queryString.replace(
-              hashRegex,
-              `hash=${hash}`,
-            );
-            content = `${beforePath}${originalPath}?${newQueryString}${afterPath.slice(queryStart + queryString.length + 1)}`;
-            continue;
-          }
-
-          content = `${beforePath}${originalPath}?hash=${hash}&${afterPath.slice(queryStart + 1)}`;
-        }
+        const escapedPath = originalPath.replace(
+          /[$()*+.?[\\\]^{|}]/gu,
+          "\\$&",
+        );
+        const regex = new RegExp(
+          `(?<path>${escapedPath})(\\?(?<queryString>[^#"'\`]*))?`,
+          "gu",
+        );
+
+        content = content.replace(
+          regex,
+          (match, p1, p2, p3, offset, string, groups) => {
+            found = true;
+            const { path, queryString } = groups;
+
+            return !queryString
+              ? `${path}?hash=${hash}`
+              : queryString.includes("hash=")
+                ? `${path}?${queryString.replace(/(?<hash>hash=)[\dA-Fa-f]*/u, `$1${hash}`)}`
+                : `${path}?hash=${hash}&${queryString}`;
+          },
+        );
       }
 
-      if (hasChanges) {
+      if (found) {
         await writeFile(filePath, content);
       }
     }

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.2.0",
+  "version": "2.2.1",
   "type": "module",
   "bin": "./bin/src/index.js",
   "main": "./src/index.js",