@absolutejs/absolute 0.19.0-beta.1077 → 0.19.0-beta.1079

package/dist/cli/index.js

@@ -170607,6 +170607,240 @@ ${serverOutput}` : "Server failed to start for pre-rendering";
 };
 var init_prerender = () => {};
 
+// src/build/maskLiterals.ts
+var SENTINEL, 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 = "";
+  let prevWasSpace = false;
+  let wordBeforeParen = "";
+  const mask = (text) => {
+    out += SENTINEL + pieces.length + SENTINEL;
+    pieces.push(text);
+    prevChar = ")";
+    prevWord = "";
+    prevWasSpace = false;
+  };
+  const 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 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;
+  }
+  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));
+      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;
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      const end = endOfString(i);
+      const isSpecifier = prevWord === "from" || prevWord === "import" || prevChar === "(" && (wordBeforeParen === "import" || wordBeforeParen === "require");
+      if (isSpecifier) {
+        out += src.slice(i, end);
+        prevChar = '"';
+        prevWord = "";
+        prevWasSpace = false;
+      } else {
+        mask(src.slice(i, end));
+      }
+      i = end;
+      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 = "";
+        prevWasSpace = false;
+        continue;
+      }
+    }
+    out += c;
+    i++;
+    if (c === " " || c === "\t" || c === "\r" || c === `
+`) {
+      prevWasSpace = true;
+      continue;
+    }
+    if (isIdentChar(c)) {
+      const contiguous = isIdentChar(prevChar) && !prevWasSpace;
+      prevWord = contiguous ? prevWord + c : c;
+    } else {
+      if (c === "(")
+        wordBeforeParen = prevWord;
+      prevWord = "";
+    }
+    prevChar = c;
+    prevWasSpace = false;
+  }
+  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(() => {
+  SENTINEL = String.fromCharCode(57344);
+  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";
@@ -170687,8 +170921,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;
@@ -170777,6 +171012,7 @@ ${content}`;
   }));
 };
 var init_rewriteImportsPlugin = __esm(() => {
+  init_maskLiterals();
   init_nativeRewrite();
 });
 
@@ -177034,7 +177270,8 @@ var cliTag4 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
       continue;
     seen.add(filePath);
     const source = readFileSync33(filePath, "utf-8");
-    const rewritten = source.replace(MODULE_SPECIFIER_RE, (match, prefix, quote, specifier) => {
+    const { masked, restore } = maskLiterals(source);
+    const rewrittenMasked = masked.replace(MODULE_SPECIFIER_RE, (match, prefix, quote, specifier) => {
       if (typeof specifier === "string" && specifier.startsWith(".")) {
         enqueue(resolveRuntimeJsFile(resolve21(dirname14(filePath), specifier)));
         return match;
@@ -177050,6 +177287,7 @@ var cliTag4 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
       enqueue(target);
       return `${prefix}${quote}${ensureRelativeModuleSpecifier(filePath, target)}${quote}`;
     });
+    const rewritten = restore(rewrittenMasked);
     if (rewritten !== source) {
       writeFileSync18(filePath, rewritten);
     }
@@ -177712,6 +177950,7 @@ console.log(\`
 };
 var init_compile = __esm(() => {
   init_externalAssetPlugin();
+  init_maskLiterals();
   init_islandEntries();
   init_islandRegistryTransform();
   init_constants();

package/dist/index.js

@@ -7237,6 +7237,240 @@ 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, 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 = "";
+  let prevWasSpace = false;
+  let wordBeforeParen = "";
+  const mask = (text) => {
+    out += SENTINEL + pieces.length + SENTINEL;
+    pieces.push(text);
+    prevChar = ")";
+    prevWord = "";
+    prevWasSpace = false;
+  };
+  const 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 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;
+  }
+  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));
+      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;
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      const end = endOfString(i);
+      const isSpecifier = prevWord === "from" || prevWord === "import" || prevChar === "(" && (wordBeforeParen === "import" || wordBeforeParen === "require");
+      if (isSpecifier) {
+        out += src.slice(i, end);
+        prevChar = '"';
+        prevWord = "";
+        prevWasSpace = false;
+      } else {
+        mask(src.slice(i, end));
+      }
+      i = end;
+      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 = "";
+        prevWasSpace = false;
+        continue;
+      }
+    }
+    out += c;
+    i++;
+    if (c === " " || c === "\t" || c === "\r" || c === `
+`) {
+      prevWasSpace = true;
+      continue;
+    }
+    if (isIdentChar(c)) {
+      const contiguous = isIdentChar(prevChar) && !prevWasSpace;
+      prevWord = contiguous ? prevWord + c : c;
+    } else {
+      if (c === "(")
+        wordBeforeParen = prevWord;
+      prevWord = "";
+    }
+    prevChar = c;
+    prevWasSpace = false;
+  }
+  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(() => {
+  SENTINEL = String.fromCharCode(57344);
+  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 +7561,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 +7709,7 @@ ${content}`;
   return result;
 };
 var init_rewriteImportsPlugin = __esm(() => {
+  init_maskLiterals();
   init_nativeRewrite();
 });
 
@@ -21369,14 +21605,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 +23735,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 +23744,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 {
@@ -46737,5 +46975,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=0728DC41DA5C84B964756E2164756E21
+//# debugId=8D7748D6ECBDDF8764756E2164756E21
 //# sourceMappingURL=index.js.map