@absolutejs/absolute 0.19.0-beta.1076 → 0.19.0-beta.1078

package/dist/cli/index.js

@@ -759,6 +759,14 @@ var COMPOSE_PATH = "db/docker-compose.db.yml", DEFAULT_SERVER_ENTRY = "src/backe
   try {
     process.kill(pid, "SIGTERM");
   } catch {}
+}, findFreePort = () => {
+  const server2 = Bun.serve({ fetch: () => new Response, port: 0 });
+  const { port } = server2;
+  server2.stop(true);
+  if (port === undefined) {
+    throw new Error("Failed to allocate a free port");
+  }
+  return port;
 }, killStaleProcesses = (port, logMessage) => {
   let output;
   try {
@@ -170571,7 +170579,14 @@ ${serverOutput}` : "Server failed to start for pre-rendering";
   const serverOutput = [];
   const serverProcess = Bun.spawn(["bun", "run", serverBundlePath], {
     cwd: process.cwd(),
-    env: { ...process.env, ...env2, PORT: String(port) },
+    env: {
+      ...process.env,
+      ...env2,
+      ABSOLUTE_HOST: "localhost",
+      ABSOLUTE_PORT: String(port),
+      HOST: "localhost",
+      PORT: String(port)
+    },
     stderr: "pipe",
     stdout: "pipe"
   });
@@ -170592,6 +170607,222 @@ ${serverOutput}` : "Server failed to start for pre-rendering";
 };
 var init_prerender = () => {};
 
+// src/build/maskLiterals.ts
+var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR, REGEX_OK_AFTER_WORD, maskLiterals = (src) => {
+  const n = src.length;
+  const pieces = [];
+  let out = "";
+  let i = 0;
+  let prevChar = "";
+  let prevWord = "";
+  const mask = (text) => {
+    out += SENTINEL + pieces.length + SENTINEL;
+    pieces.push(text);
+  };
+  const endOfInterp = (start) => {
+    let j = start;
+    let depth = 1;
+    while (j < n && depth > 0) {
+      const c = src[j];
+      if (c === "\\") {
+        j += 2;
+        continue;
+      }
+      if (c === "`") {
+        j = endOfTemplate(j);
+        continue;
+      }
+      if (c === '"' || c === "'") {
+        j = endOfString(j);
+        continue;
+      }
+      if (c === "/" && src[j + 1] === "/") {
+        const nl = src.indexOf(`
+`, j);
+        j = nl < 0 ? n : nl;
+        continue;
+      }
+      if (c === "/" && src[j + 1] === "*") {
+        const e = src.indexOf("*/", j + 2);
+        j = e < 0 ? n : e + 2;
+        continue;
+      }
+      if (c === "{")
+        depth++;
+      else if (c === "}")
+        depth--;
+      j++;
+    }
+    return j;
+  };
+  function endOfTemplate(start) {
+    let j = start + 1;
+    while (j < n) {
+      const c = src[j];
+      if (c === "\\") {
+        j += 2;
+        continue;
+      }
+      if (c === "`")
+        return j + 1;
+      if (c === "$" && src[j + 1] === "{") {
+        j = endOfInterp(j + 2);
+        continue;
+      }
+      j++;
+    }
+    return j;
+  }
+  function endOfString(start) {
+    const q = src[start];
+    let j = start + 1;
+    while (j < n) {
+      const c = src[j];
+      if (c === "\\") {
+        j += 2;
+        continue;
+      }
+      if (c === q)
+        return j + 1;
+      if (c === `
+`)
+        return j;
+      j++;
+    }
+    return j;
+  }
+  const endOfRegex = (start) => {
+    let j = start + 1;
+    let inClass = false;
+    while (j < n) {
+      const c = src[j];
+      if (c === "\\") {
+        j += 2;
+        continue;
+      }
+      if (c === `
+`)
+        return -1;
+      if (c === "[")
+        inClass = true;
+      else if (c === "]")
+        inClass = false;
+      else if (c === "/" && !inClass) {
+        j++;
+        break;
+      }
+      j++;
+    }
+    while (j < n && /[a-z]/i.test(src[j] ?? ""))
+      j++;
+    return j;
+  };
+  while (i < n) {
+    const c = src[i];
+    const c2 = src[i + 1];
+    if (c === "/" && c2 === "/") {
+      out += "//";
+      i += 2;
+      const s = i;
+      while (i < n && src[i] !== `
+`)
+        i++;
+      mask(src.slice(s, i));
+      prevChar = "";
+      prevWord = "";
+      continue;
+    }
+    if (c === "/" && c2 === "*") {
+      out += "/*";
+      i += 2;
+      const e = src.indexOf("*/", i);
+      const end = e < 0 ? n : e;
+      mask(src.slice(i, end));
+      i = end < n ? end + 2 : n;
+      if (end < n)
+        out += "*/";
+      continue;
+    }
+    if (c === "`") {
+      const end = endOfTemplate(i);
+      mask(src.slice(i, end));
+      i = end;
+      prevChar = "`";
+      prevWord = "";
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      const end = endOfString(i);
+      out += src.slice(i, end);
+      i = end;
+      prevChar = '"';
+      prevWord = "";
+      continue;
+    }
+    if (c === "/" && (prevChar === "" || REGEX_OK_AFTER_CHAR.has(prevChar) || REGEX_OK_AFTER_WORD.has(prevWord))) {
+      const end = endOfRegex(i);
+      if (end > 0) {
+        out += src.slice(i, end);
+        i = end;
+        prevChar = "/";
+        prevWord = "";
+        continue;
+      }
+    }
+    out += c;
+    i++;
+    if (c === " " || c === "\t" || c === "\r" || c === `
+`)
+      continue;
+    const wasIdent = isIdentChar(prevChar);
+    prevChar = c;
+    prevWord = isIdentChar(c) ? wasIdent ? prevWord + c : c : "";
+  }
+  const restoreRegex = new RegExp(`${SENTINEL}(\\d+)${SENTINEL}`, "g");
+  const restore = (rewritten) => rewritten.replace(restoreRegex, (_m, d) => pieces[Number(d)] ?? "");
+  return { masked: out, restore };
+};
+var init_maskLiterals = __esm(() => {
+  REGEX_OK_AFTER_CHAR = new Set([
+    "(",
+    ",",
+    "=",
+    ":",
+    "[",
+    "!",
+    "&",
+    "|",
+    "?",
+    "{",
+    "}",
+    ";",
+    "+",
+    "-",
+    "*",
+    "/",
+    "%",
+    "^",
+    "~",
+    "<",
+    ">"
+  ]);
+  REGEX_OK_AFTER_WORD = new Set([
+    "return",
+    "typeof",
+    "instanceof",
+    "in",
+    "of",
+    "new",
+    "delete",
+    "void",
+    "do",
+    "else",
+    "yield",
+    "await",
+    "case"
+  ]);
+});
+
 // src/build/nativeRewrite.ts
 import { dlopen, FFIType, ptr } from "bun:ffi";
 import { platform as platform4, arch as arch3 } from "os";
@@ -170672,8 +170903,9 @@ var escapeRegex = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), jsRewrite
   if (Object.keys(vendorPaths).length === 0)
     return content;
   const replacements = Object.entries(vendorPaths).sort(([keyA], [keyB]) => keyB.length - keyA.length);
-  const native = nativeRewriteImports(content, replacements);
-  return native ?? jsRewriteImports(content, replacements);
+  const { masked, restore } = maskLiterals(content);
+  const native = nativeRewriteImports(masked, replacements);
+  return restore(native ?? jsRewriteImports(masked, replacements));
 }, fixMissingReExportNamespacesInContent = (content) => {
   const REEXPORT_PATTERN = /__reExport\(\s*[A-Za-z_$][\w$]*\s*,\s*([A-Za-z_$][\w$]*)\s*\)/g;
   REEXPORT_PATTERN.lastIndex = 0;
@@ -170762,6 +170994,7 @@ ${content}`;
   }));
 };
 var init_rewriteImportsPlugin = __esm(() => {
+  init_maskLiterals();
   init_nativeRewrite();
 });
 
@@ -177546,7 +177779,7 @@ console.log(\`
   const resolvedOutdir = resolve21(outdir ?? "dist");
   await withBuildDirectoryLock(resolvedOutdir, () => compileUnlocked(serverEntry, resolvedOutdir, outfile, configPath2));
 }, compileUnlocked = async (serverEntry, resolvedOutdir, outfile, configPath2) => {
-  const prerenderPort = Number(env5.COMPILE_PORT) || Number(env5.PORT) || DEFAULT_PORT + 1;
+  const prerenderPort = Number(env5.COMPILE_PORT) || Number(env5.PORT) || findFreePort();
   killStaleProcesses(prerenderPort);
   const entryName = basename7(serverEntry).replace(/\.[^.]+$/, "");
   const resolvedOutfile = resolve21(outfile ?? "compiled-server");

package/dist/index.js

@@ -7237,6 +7237,222 @@ var init_islandSsr = __esm(() => {
   LEADING_HOISTED_RESOURCE_RE = /^\s*(?:<link\b[^>]*\/?>|<meta\b[^>]*\/?>|<title\b[^>]*>[\s\S]*?<\/title>|<style\b[^>]*>[\s\S]*?<\/style>|<script\b[^>]*>[\s\S]*?<\/script>)/i;
 });
 
+// src/build/maskLiterals.ts
+var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR, REGEX_OK_AFTER_WORD, maskLiterals = (src) => {
+  const n = src.length;
+  const pieces = [];
+  let out = "";
+  let i = 0;
+  let prevChar = "";
+  let prevWord = "";
+  const mask = (text) => {
+    out += SENTINEL + pieces.length + SENTINEL;
+    pieces.push(text);
+  };
+  const endOfInterp = (start) => {
+    let j2 = start;
+    let depth = 1;
+    while (j2 < n && depth > 0) {
+      const c = src[j2];
+      if (c === "\\") {
+        j2 += 2;
+        continue;
+      }
+      if (c === "`") {
+        j2 = endOfTemplate(j2);
+        continue;
+      }
+      if (c === '"' || c === "'") {
+        j2 = endOfString(j2);
+        continue;
+      }
+      if (c === "/" && src[j2 + 1] === "/") {
+        const nl = src.indexOf(`
+`, j2);
+        j2 = nl < 0 ? n : nl;
+        continue;
+      }
+      if (c === "/" && src[j2 + 1] === "*") {
+        const e = src.indexOf("*/", j2 + 2);
+        j2 = e < 0 ? n : e + 2;
+        continue;
+      }
+      if (c === "{")
+        depth++;
+      else if (c === "}")
+        depth--;
+      j2++;
+    }
+    return j2;
+  };
+  function endOfTemplate(start) {
+    let j2 = start + 1;
+    while (j2 < n) {
+      const c = src[j2];
+      if (c === "\\") {
+        j2 += 2;
+        continue;
+      }
+      if (c === "`")
+        return j2 + 1;
+      if (c === "$" && src[j2 + 1] === "{") {
+        j2 = endOfInterp(j2 + 2);
+        continue;
+      }
+      j2++;
+    }
+    return j2;
+  }
+  function endOfString(start) {
+    const q2 = src[start];
+    let j2 = start + 1;
+    while (j2 < n) {
+      const c = src[j2];
+      if (c === "\\") {
+        j2 += 2;
+        continue;
+      }
+      if (c === q2)
+        return j2 + 1;
+      if (c === `
+`)
+        return j2;
+      j2++;
+    }
+    return j2;
+  }
+  const endOfRegex = (start) => {
+    let j2 = start + 1;
+    let inClass = false;
+    while (j2 < n) {
+      const c = src[j2];
+      if (c === "\\") {
+        j2 += 2;
+        continue;
+      }
+      if (c === `
+`)
+        return -1;
+      if (c === "[")
+        inClass = true;
+      else if (c === "]")
+        inClass = false;
+      else if (c === "/" && !inClass) {
+        j2++;
+        break;
+      }
+      j2++;
+    }
+    while (j2 < n && /[a-z]/i.test(src[j2] ?? ""))
+      j2++;
+    return j2;
+  };
+  while (i < n) {
+    const c = src[i];
+    const c2 = src[i + 1];
+    if (c === "/" && c2 === "/") {
+      out += "//";
+      i += 2;
+      const s2 = i;
+      while (i < n && src[i] !== `
+`)
+        i++;
+      mask(src.slice(s2, i));
+      prevChar = "";
+      prevWord = "";
+      continue;
+    }
+    if (c === "/" && c2 === "*") {
+      out += "/*";
+      i += 2;
+      const e = src.indexOf("*/", i);
+      const end = e < 0 ? n : e;
+      mask(src.slice(i, end));
+      i = end < n ? end + 2 : n;
+      if (end < n)
+        out += "*/";
+      continue;
+    }
+    if (c === "`") {
+      const end = endOfTemplate(i);
+      mask(src.slice(i, end));
+      i = end;
+      prevChar = "`";
+      prevWord = "";
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      const end = endOfString(i);
+      out += src.slice(i, end);
+      i = end;
+      prevChar = '"';
+      prevWord = "";
+      continue;
+    }
+    if (c === "/" && (prevChar === "" || REGEX_OK_AFTER_CHAR.has(prevChar) || REGEX_OK_AFTER_WORD.has(prevWord))) {
+      const end = endOfRegex(i);
+      if (end > 0) {
+        out += src.slice(i, end);
+        i = end;
+        prevChar = "/";
+        prevWord = "";
+        continue;
+      }
+    }
+    out += c;
+    i++;
+    if (c === " " || c === "\t" || c === "\r" || c === `
+`)
+      continue;
+    const wasIdent = isIdentChar(prevChar);
+    prevChar = c;
+    prevWord = isIdentChar(c) ? wasIdent ? prevWord + c : c : "";
+  }
+  const restoreRegex = new RegExp(`${SENTINEL}(\\d+)${SENTINEL}`, "g");
+  const restore = (rewritten) => rewritten.replace(restoreRegex, (_m, d2) => pieces[Number(d2)] ?? "");
+  return { masked: out, restore };
+};
+var init_maskLiterals = __esm(() => {
+  REGEX_OK_AFTER_CHAR = new Set([
+    "(",
+    ",",
+    "=",
+    ":",
+    "[",
+    "!",
+    "&",
+    "|",
+    "?",
+    "{",
+    "}",
+    ";",
+    "+",
+    "-",
+    "*",
+    "/",
+    "%",
+    "^",
+    "~",
+    "<",
+    ">"
+  ]);
+  REGEX_OK_AFTER_WORD = new Set([
+    "return",
+    "typeof",
+    "instanceof",
+    "in",
+    "of",
+    "new",
+    "delete",
+    "void",
+    "do",
+    "else",
+    "yield",
+    "await",
+    "case"
+  ]);
+});
+
 // src/build/nativeRewrite.ts
 import { dlopen, FFIType, ptr } from "bun:ffi";
 import { platform, arch } from "os";
@@ -7327,8 +7543,9 @@ var escapeRegex = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), jsRewrite
   if (Object.keys(vendorPaths).length === 0)
     return content;
   const replacements = Object.entries(vendorPaths).sort(([keyA], [keyB]) => keyB.length - keyA.length);
-  const native = nativeRewriteImports(content, replacements);
-  return native ?? jsRewriteImports(content, replacements);
+  const { masked, restore } = maskLiterals(content);
+  const native = nativeRewriteImports(masked, replacements);
+  return restore(native ?? jsRewriteImports(masked, replacements));
 }, fixMissingReExportNamespacesInContent = (content) => {
   const REEXPORT_PATTERN = /__reExport\(\s*[A-Za-z_$][\w$]*\s*,\s*([A-Za-z_$][\w$]*)\s*\)/g;
   REEXPORT_PATTERN.lastIndex = 0;
@@ -7474,6 +7691,7 @@ ${content}`;
   return result;
 };
 var init_rewriteImportsPlugin = __esm(() => {
+  init_maskLiterals();
   init_nativeRewrite();
 });
 
@@ -21369,14 +21587,16 @@ var escapeRegex3 = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), rewriter
   const replacements = Object.entries(vendorPaths).sort(([keyA], [keyB]) => keyB.length - keyA.length);
   await Promise.all(jsFiles.map(async (filePath) => {
     const original = await Bun.file(filePath).text();
-    const native = nativeRewriteImports(original, replacements);
-    const content = native ?? applyAllReplacements(original, rewriter);
+    const { masked, restore } = maskLiterals(original);
+    const native = nativeRewriteImports(masked, replacements);
+    const content = restore(native ?? applyAllReplacements(masked, rewriter));
     if (content !== original) {
       await Bun.write(filePath, content);
     }
   }));
 };
 var init_rewriteReactImports = __esm(() => {
+  init_maskLiterals();
   init_nativeRewrite();
   rewriterCache = new Map;
   REFRESH_STUBS = "window.$RefreshReg$||(window.$RefreshReg$=function(){});" + `window.$RefreshSig$||(window.$RefreshSig$=function(){return function(t){return t}});
@@ -23497,7 +23717,7 @@ var init_chainInlineSourcemaps = __esm(() => {
 });
 
 // src/build/vueAutoRouterTransform.ts
-var SCRIPT_REGEX, ROUTES_EXPORT_REGEX, SENTINEL = "__ABSOLUTE_AUTO_ROUTER__", SETUP_APP_DECLARATION_REGEX, SETUP_APP_FUNCTION_REGEX, addAutoRouterSetupApp = (sourceContent) => {
+var SCRIPT_REGEX, ROUTES_EXPORT_REGEX, SENTINEL2 = "__ABSOLUTE_AUTO_ROUTER__", SETUP_APP_DECLARATION_REGEX, SETUP_APP_FUNCTION_REGEX, addAutoRouterSetupApp = (sourceContent) => {
   if (!ROUTES_EXPORT_REGEX.test(sourceContent))
     return sourceContent;
   const match = SCRIPT_REGEX.exec(sourceContent);
@@ -23506,13 +23726,13 @@ var SCRIPT_REGEX, ROUTES_EXPORT_REGEX, SENTINEL = "__ABSOLUTE_AUTO_ROUTER__", SE
   const [, openTag, scriptBody, closeTag] = match;
   if (!openTag || scriptBody === undefined || !closeTag)
     return sourceContent;
-  if (scriptBody.includes(SENTINEL))
+  if (scriptBody.includes(SENTINEL2))
     return sourceContent;
   let rewrittenScript = scriptBody.replace(SETUP_APP_DECLARATION_REGEX, "const __absoluteUserSetupApp__");
   rewrittenScript = rewrittenScript.replace(SETUP_APP_FUNCTION_REGEX, "$1 __absoluteUserSetupApp__");
   const userHadSetupApp = rewrittenScript !== scriptBody;
   const autoWrapper = `
-// ${SENTINEL} \u2014 generated by AbsoluteJS because this page exports
+// ${SENTINEL2} \u2014 generated by AbsoluteJS because this page exports
 // \`routes\`. Owns the vue-router lifecycle (history pick, app.use,
 // push, isReady) so user code stays declarative.
 import {
@@ -38396,7 +38616,14 @@ ${serverOutput}` : "Server failed to start for pre-rendering";
   const serverOutput = [];
   const serverProcess = Bun.spawn(["bun", "run", serverBundlePath], {
     cwd: process.cwd(),
-    env: { ...process.env, ...env4, PORT: String(port) },
+    env: {
+      ...process.env,
+      ...env4,
+      ABSOLUTE_HOST: "localhost",
+      ABSOLUTE_PORT: String(port),
+      HOST: "localhost",
+      PORT: String(port)
+    },
     stderr: "pipe",
     stdout: "pipe"
   });
@@ -46730,5 +46957,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=EC9A975400DDE1A164756E2164756E21
+//# debugId=C3D862B3C898113964756E2164756E21
 //# sourceMappingURL=index.js.map