@arponascension/express-inertia 1.5.1 → 1.6.0

package/dist/index.mjs

@@ -724,93 +724,44 @@ function requestIdMiddleware() {
 function generateRequestId() {
   return randomUUID();
 }
-
-// src/directives.ts
-var customDirectives = {};
-function escapeJsString(str) {
-  return str.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
-}
-function registerDirective(name, handler) {
-  customDirectives[name] = handler;
-}
-function clearCustomDirectives() {
-  for (const name of Object.keys(customDirectives)) {
-    delete customDirectives[name];
-  }
-}
-function compileBladeDirectives(templateSource, localDirectives) {
-  let compiled = templateSource;
-  compiled = compiled.replace(
-    /<x-inertia(\s[^>]*)?\s*(\/|><\/x-inertia>)/gi,
-    (_match, attrs) => {
-      const idMatch = attrs?.match(/id=(?:"([^"]*)"|'([^']*)')/);
-      const id = idMatch ? idMatch[1] || idMatch[2] : void 0;
-      return id ? `<%- inertia('${escapeJsString(id)}') %>` : `<%- inertia() %>`;
-    }
-  );
-  compiled = compiled.replace(
-    /<x-inertia-(?:script|data)(\s[^>]*)?\s*(\/|><\/x-inertia-(?:script|data)>)/gi,
-    (_match, attrs) => {
-      const idMatch = attrs?.match(/id=(?:"([^"]*)"|'([^']*)')/);
-      const id = idMatch ? idMatch[1] || idMatch[2] : void 0;
-      return id ? `<%- inertiaScript('${escapeJsString(id)}') %>` : `<%- inertiaScript() %>`;
-    }
-  );
-  compiled = compiled.replace(
-    /<x-inertia-head\s*(?:\/>|><\/x-inertia-head>)|<x-inertiaHead\s*(?:\/>|><\/x-inertiaHead>)/gi,
-    "<%- inertiaHead() %>"
-  );
-  compiled = compiled.replace(
-    /<x-vite(\s[^>]*)?\s*(?:\/>|><\/x-vite>)/gi,
-    (_match, attrs) => {
-      const srcMatch = attrs?.match(/(?:src|entries)=(?:"([^"]*)"|'([^']*)')/);
-      const val = srcMatch ? srcMatch[1] || srcMatch[2] : "";
-      if (val.startsWith("[") && val.endsWith("]")) {
-        return `<%- vite(${val}) %>`;
+function globToRegExp(glob) {
+  const normalized = glob.replace(/\\/g, "/");
+  let source = "";
+  let i = 0;
+  const escape = (ch) => ch.replace(/[.+^${}()|[\]\\]/g, "\\$&");
+  while (i < normalized.length) {
+    const ch = normalized[i];
+    if (ch === "*") {
+      if (normalized[i + 1] === "*") {
+        if (normalized[i + 2] === "/") {
+          source += "(?:.*/)?";
+          i += 3;
+        } else {
+          source += ".*";
+          i += 2;
+        }
+      } else {
+        source += "[^/]*";
+        i += 1;
       }
-      return `<%- vite('${escapeJsString(val)}') %>`;
-    }
-  );
-  compiled = compiled.replace(
-    /<x-vite-react-refresh\s*(?:\/>|><\/x-vite-react-refresh>)|<x-viteReactRefresh\s*(?:\/>|><\/x-viteReactRefresh>)/gi,
-    "<%- viteReactRefresh() %>"
-  );
-  compiled = compiled.replace(/<x-csrf\s*(?:\/>|><\/x-csrf>)/gi, "<%- csrf() %>");
-  compiled = compiled.replace(
-    /<x-routes(\s[^>]*)?\s*(?:\/>|><\/x-routes>)/gi,
-    (_match, attrs) => {
-      const groupMatch = attrs?.match(/group=(?:"([^"]*)"|'([^']*)')/);
-      const group = groupMatch ? groupMatch[1] || groupMatch[2] : void 0;
-      return group ? `<%- routes('${escapeJsString(group)}') %>` : `<%- routes() %>`;
+    } else if (ch === "?") {
+      source += "[^/]";
+      i += 1;
+    } else {
+      source += escape(ch);
+      i += 1;
     }
-  );
-  compiled = compiled.replace(/@inertiaHead\b/g, "<%- inertiaHead() %>");
-  compiled = compiled.replace(/@(inertiaScript|inertiaData)(\([^)]*\))?(?!\w)/g, (_match, _d, args) => {
-    return args ? `<%- inertiaScript${args} %>` : `<%- inertiaScript() %>`;
-  });
-  compiled = compiled.replace(/@inertia(\([^)]*\))?(?!\w)/g, (_match, args) => {
-    return args ? `<%- inertia${args} %>` : `<%- inertia() %>`;
-  });
-  compiled = compiled.replace(/@viteReactRefresh\b/g, "<%- viteReactRefresh() %>");
-  compiled = compiled.replace(/@vite\(([^)]*(?:\([^)]*\)[^)]*)*)\)/g, (_match, args) => {
-    return `<%- vite(${args.trim()}) %>`;
-  });
-  compiled = compiled.replace(/@csrf\b/g, "<%- csrf() %>");
-  compiled = compiled.replace(/@routes(\([^)]*\))?(?!\w)/g, (_match, args) => {
-    return args ? `<%- routes${args} %>` : `<%- routes() %>`;
-  });
-  compiled = compiled.replace(/@json\(([^)]*(?:\([^)]*\)[^)]*)*)\)/g, (_match, args) => {
-    return `<%- json(${args.trim()}) %>`;
-  });
-  const allDirectives = { ...customDirectives, ...localDirectives || {} };
-  for (const [name, handler] of Object.entries(allDirectives)) {
-    const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const pattern = new RegExp(`@${escapedName}(\\([^)]*(?:\\([^)]*\\)[^)]*)*\\))?(?!\\w)`, "g");
-    compiled = compiled.replace(pattern, (_match, args) => {
-      return handler(args ? args.slice(1, -1).trim() : "", {});
-    });
   }
-  return compiled;
+  return new RegExp(`^${source}$`);
+}
+function normalizeRefreshGlobs(refresh) {
+  if (refresh === void 0 || refresh === false) {
+    return null;
+  }
+  if (refresh === true) {
+    return ["views/**/*.ejs"];
+  }
+  return Array.isArray(refresh) ? refresh : [refresh];
 }
 function resolveDevServerUrl(config, override) {
   if (override) return override.replace(/\/$/, "");
@@ -833,6 +784,7 @@ function inertiaVitePlugin(options = {}) {
   const logger2 = createLogger({ prefix: "express-inertia:vite" });
   let cleanupRegistered = false;
   let exitConfig = null;
+  const buildDirectory = options.buildDirectory || "build";
   const write = (config, server) => {
     try {
       const hotFile = path.resolve(config.root, options.hotFile || "public/hot");
@@ -856,8 +808,56 @@ function inertiaVitePlugin(options = {}) {
       remove(exitConfig);
     }
   };
+  const installRefresh = (server) => {
+    const refreshGlobs = normalizeRefreshGlobs(options.refresh);
+    if (!refreshGlobs) {
+      return;
+    }
+    const root = server.config.root;
+    const matchers = refreshGlobs.map(globToRegExp);
+    const matches = (file) => {
+      const rel = path.relative(root, file).split(path.sep).join("/");
+      return matchers.some((re) => re.test(rel));
+    };
+    const onFileEvent = (file) => {
+      if (file && matches(file)) {
+        server.ws.send({ type: "full-reload" });
+      }
+    };
+    try {
+      server.watcher.add(refreshGlobs);
+    } catch (err) {
+      logger2.warn("Failed to watch refresh paths", { error: err.message });
+    }
+    server.watcher.on("change", onFileEvent);
+    server.watcher.on("add", onFileEvent);
+    server.watcher.on("unlink", onFileEvent);
+  };
   return {
     name: "express-inertia-hot-file",
+    config(config, env) {
+      if (options.input) {
+        if (config.base === void 0) {
+          config.base = env.command === "build" ? `/${buildDirectory}/` : "/";
+        }
+        if (env.command === "build") {
+          if (config.publicDir === void 0 || config.publicDir === "public") {
+            config.publicDir = false;
+          }
+          if (config.build === void 0) {
+            config.build = {};
+          }
+          if (config.build.manifest !== false) {
+            config.build.manifest = true;
+          }
+          if (config.build.outDir === void 0) {
+            config.build.outDir = path.resolve(config.root || process.cwd(), "public", buildDirectory);
+          }
+          config.build.rollupOptions = config.build.rollupOptions || {};
+          config.build.rollupOptions.input = config.build.rollupOptions.input || options.input;
+        }
+      }
+    },
     configResolved(config) {
       if (config.command === "build") {
         remove(config);
@@ -874,6 +874,7 @@ function inertiaVitePlugin(options = {}) {
         process.once("exit", removeOnExit);
         cleanupRegistered = true;
       }
+      installRefresh(server);
     },
     buildStart() {
     }
@@ -1108,7 +1109,7 @@ function createInertiaEngine(options) {
   const templateTimestamps = /* @__PURE__ */ new Map();
   engineCaches.add(templateCache);
   engineTimestamps.add(templateTimestamps);
-  return function inertiaBladeEngine(filePath, rawOptions, callback) {
+  return function inertiaEjsEngine(filePath, rawOptions, callback) {
     try {
       const template = options?.templateSource;
       const hasTemplateSource = template !== void 0;
@@ -1131,7 +1132,7 @@ function createInertiaEngine(options) {
       }
       if (!compiledTemplate) {
         const templateSource = template !== void 0 ? template : fs.readFileSync(filePath, "utf-8");
-        const compiledSource = options?.compileTemplate ? options.compileTemplate(templateSource) : compileBladeDirectives(templateSource, options?.directives);
+        const compiledSource = options?.compileTemplate ? options.compileTemplate(templateSource) : templateSource;
         compiledTemplate = ejs.compile(compiledSource, {
           filename: filePath,
           cache: false,
@@ -1300,6 +1301,6 @@ function createPrefetchHelper(viteHelper) {
 // src/index.ts
 var src_default = createInertia;
 
-export { CircuitBreaker, DEFAULT_COMPONENT_NAME_PATTERN, DEFAULT_SECURITY_OPTIONS, PrefetchHelper, ViteHelper, always, calculateBackoff, clearCustomDirectives, clearEngineCache, compileBladeDirectives, createInertia, createInertiaEngine, createLogger, createPrefetchHelper, createViteHelper, src_default as default, defaultViteHelper, defer, escapeHtmlAttr, generateSriHash, getGlobalLogger, createInertia as inertia, inertiaEngine, inertiaVitePlugin, isAlways, isDeferred, isLazy, isMerge, isOptional, lazy, merge, optional, registerDirective, renderSSR, requestIdMiddleware, resetAllCircuitBreakers, resolveProps, safeStringify, sanitizeViewData, serializePage, setGlobalLogger, shouldRetry, validateComponentName };
+export { CircuitBreaker, DEFAULT_COMPONENT_NAME_PATTERN, DEFAULT_SECURITY_OPTIONS, PrefetchHelper, ViteHelper, always, calculateBackoff, clearEngineCache, createInertia, createInertiaEngine, createLogger, createPrefetchHelper, createViteHelper, src_default as default, defaultViteHelper, defer, escapeHtmlAttr, generateSriHash, getGlobalLogger, createInertia as inertia, inertiaEngine, inertiaVitePlugin, isAlways, isDeferred, isLazy, isMerge, isOptional, lazy, merge, optional, renderSSR, requestIdMiddleware, resetAllCircuitBreakers, resolveProps, safeStringify, sanitizeViewData, serializePage, setGlobalLogger, shouldRetry, validateComponentName };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map