feat: prefix

.eslintrc.json

@@ -1,4 +1,8 @@
 {
   "root": true,
-  "extends": ["plugin:grules/all"]
+  "extends": ["plugin:grules/all"],
+  "rules": {
+    "no-await-in-loop": "off",
+    "require-unicode-regexp": "off"
+  }
 }

bench/index.js

@@ -1,5 +1,4 @@
 /* eslint-disable no-unused-vars */
-/* eslint-disable no-unused-expressions */
 import { html } from "../src/index.js";
 import { Bench } from "tinybench";
 import { writeFileSync } from "node:fs";
@@ -8,7 +7,6 @@ import { Buffer } from "node:buffer";
 let result = "";
 const bench = new Bench({ time: 500 });
 
-// Simple cases
 bench.add("simple HTML formatting", () => {
   result = html`<div>Hello, world!</div>`;
 });
@@ -17,7 +15,6 @@ bench.add("null and undefined expressions", () => {
   result = html`<p>${null} and ${undefined}</p>`;
 });
 
-// String expressions
 const username = "User";
 bench.add("single string expression", () => {
   result = html`<p>${username}</p>`;
@@ -27,7 +24,6 @@ bench.add("multiple string expressions", () => {
   result = html`<p>${username} and ${username}</p>`;
 });
 
-// Array expressions
 const items1 = ["Item 1", undefined, "Item 2", null, 2000, 1500.5];
 bench.add("array expressions", () => {
   result = html`<ul>
@@ -46,7 +42,6 @@ bench.add("array expressions with escapable chars", () => {
   </ul>`;
 });
 
-// Object expressions
 const user = { id: 1, name: "John Doe" };
 bench.add("object expressions", () => {
   result = html`
@@ -55,7 +50,6 @@ bench.add("object expressions", () => {
   `;
 });
 
-// Mixed expressions
 bench.add("multiple types of expressions", () => {
   result = html`
     ${undefined}
@@ -70,17 +64,15 @@ bench.add("multiple types of expressions", () => {
   `;
 });
 
-// Large strings
 const largeString = Array.from({ length: 1000 }).join("Lorem ipsum ");
 bench.add("large strings", () => {
   result = html`<p>${largeString}${largeString}</p>`;
 });
 
-// Escaped and unescaped expressions
 const rawHTML = "<em>Italic</em> and <strong>bold</strong>";
 const markup = "<mark>Highlighted</mark>";
 bench.add("unescaped expressions", () => {
-  html`
+  result = html`
     <div>!${rawHTML}</div>
     <div>!${rawHTML}</div>
     <div>!${markup}</div>
@@ -91,7 +83,7 @@ bench.add("unescaped expressions", () => {
 });
 
 bench.add("escaped expressions", () => {
-  html`
+  result = html`
     <div>${rawHTML}</div>
     <div>${rawHTML}</div>
     <div>${markup}</div>
@@ -102,7 +94,7 @@ bench.add("escaped expressions", () => {
 });
 
 bench.add("mixed escaped and unescaped expressions", () => {
-  html`
+  result = html`
     <div>!${rawHTML}</div>
     <div>!${rawHTML}</div>
     <div>${markup}</div>

bin/README.md

@@ -1,4 +1,4 @@
-Lets you append unique hashes to assets referenced in your views to aggressively cache them while guaranteeing that clients receive the most recent versions.
+Append unique hashes to assets referenced in your views to aggressively cache them while guaranteeing that clients receive the most recent versions.
 
 ## Usage
 
@@ -14,8 +14,8 @@ Register `@fastify/static`:
 
 ```js
 await fastify.register(import("@fastify/static"), {
-  root: new URL("assets/", import.meta.url).pathname,
   prefix: "/p/assets/",
+  root: new URL("assets/", import.meta.url).pathname,
   wildcard: false,
   index: false,
   immutable: true,
@@ -27,7 +27,7 @@ Add the `ghtml` command to the build script:
 
 ```json
 "scripts": {
-  "build": "npx ghtml --roots=assets/ --refs=views/,routes/",
+  "build": "npx ghtml --prefix=/p/assets/ --roots=assets/ --refs=views/,routes/",
 },
 ```
 

bin/example/.eslintrc.json

@@ -0,0 +1,6 @@
+{
+  "rules": {
+    "require-await": "off",
+    "n/no-missing-import": "off"
+  }
+}

bin/example/package.json

@@ -3,7 +3,7 @@
   "main": "./server.js",
   "scripts": {
     "start": "node server.js",
-    "build": "ghtml --roots=assets/ --refs=routes/"
+    "build": "ghtml --prefix=/p/assets/ --roots=assets/ --refs=routes/"
   },
   "dependencies": {
     "@fastify/static": "^7.0.1",

bin/example/routes/index.js

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

bin/example/server.js

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

bin/src/index.js

@@ -1,41 +1,45 @@
 #!/usr/bin/env node
-
 import { generateHashesAndReplace } from "./utils.js";
 import process from "node:process";
 
 const parseArguments = (args) => {
   let roots = null;
   let refs = null;
+  let prefix = "/";
 
   for (const arg of args) {
     if (arg.startsWith("--roots=")) {
       roots = arg.split("=", 2)[1].split(",");
     } else if (arg.startsWith("--refs=")) {
       refs = arg.split("=", 2)[1].split(",");
+    } else if (arg.startsWith("--prefix=")) {
+      prefix = arg.split("=", 2)[1];
     }
   }
 
   if (!roots || !refs) {
     console.error(
-      'Usage: npx ghtml --roots="path/to/scan/assets1/,path/to/scan/assets2/" --refs="views/path/to/append/hashes1/,views/path/to/append/hashes2/"',
+      'Usage: npx ghtml --roots="path/to/scan/assets1/,path/to/scan/assets2/" --refs="views/path/to/append/hashes1/,views/path/to/append/hashes2/" [--prefix="optional/prefix/"]',
     );
     process.exit(1);
   }
 
-  return { roots, refs };
+  return { roots, refs, prefix };
 };
 
 const main = async () => {
-  const { roots, refs } = parseArguments(process.argv.slice(2));
+  const { roots, refs, prefix } = parseArguments(process.argv.slice(2));
 
   try {
     console.warn(`Generating hashes and updating file paths...`);
     console.warn(`Scanning files in: ${roots}`);
     console.warn(`Updating files in: ${refs}`);
+    console.warn(`Using prefix: ${prefix}`);
 
     await generateHashesAndReplace({
       roots,
       refs,
+      prefix,
     });
 
     console.warn("Hash generation and file updates completed successfully.");

bin/src/utils.js

@@ -18,6 +18,7 @@ const generateFileHash = async (filePath) => {
 const updateFilePathsWithHashes = async (
   fileHashes,
   refs,
+  prefix,
   includeDotFiles,
   skipPatterns,
 ) => {
@@ -40,14 +41,15 @@ const updateFilePathsWithHashes = async (
       let content = await readFile(filePath, "utf8");
       let found = false;
 
-      for (const [originalPath, hash] of fileHashes) {
-        const escapedPath = originalPath.replace(
+      for (const [path, hash] of fileHashes) {
+        const fullPath = prefix + path;
+        const escapedPath = fullPath.replace(
           /[$()*+.?[\\\]^{|}]/gu,
-          "\\$&",
+          String.raw`\$&`,
         );
         const regex = new RegExp(
           `(?<path>${escapedPath})(\\?(?<queryString>[^#"'\`]*))?`,
-          "gu",
+          "g",
         );
 
         content = content.replace(
@@ -75,6 +77,7 @@ const updateFilePathsWithHashes = async (
 const generateHashesAndReplace = async ({
   roots,
   refs,
+  prefix,
   includeDotFiles = false,
   skipPatterns = ["**/node_modules/**"],
 }) => {
@@ -116,6 +119,7 @@ const generateHashesAndReplace = async ({
   await updateFilePathsWithHashes(
     fileHashes,
     refs,
+    prefix,
     includeDotFiles,
     skipPatterns,
   );

package.json

@@ -26,7 +26,7 @@
   "devDependencies": {
     "@fastify/pre-commit": "^2.1.0",
     "c8": "^10.1.2",
-    "grules": "^0.17.3",
+    "grules": "^0.21.0",
     "tinybench": "^2.8.0"
   },
   "repository": {