@absolutejs/absolute 0.19.0-beta.1104 → 0.19.0-beta.1105

package/dist/cli/index.js

@@ -170608,7 +170608,7 @@ ${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) => {
+var SENTINEL, RISKY_STRING_CONTENT, 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 = "";
@@ -170616,7 +170616,6 @@ var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR,
   let prevChar = "";
   let prevWord = "";
   let prevWasSpace = false;
-  let wordBeforeParen = "";
   const mask = (text) => {
     out += SENTINEL + pieces.length + SENTINEL;
     pieces.push(text);
@@ -170754,14 +170753,14 @@ var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR,
     }
     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);
+      const text = src.slice(i, end);
+      if (RISKY_STRING_CONTENT.test(text)) {
+        mask(text);
+      } else {
+        out += text;
         prevChar = '"';
         prevWord = "";
         prevWasSpace = false;
-      } else {
-        mask(src.slice(i, end));
       }
       i = end;
       continue;
@@ -170788,8 +170787,6 @@ var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR,
       const contiguous = isIdentChar(prevChar) && !prevWasSpace;
       prevWord = contiguous ? prevWord + c : c;
     } else {
-      if (c === "(")
-        wordBeforeParen = prevWord;
       prevWord = "";
     }
     prevChar = c;
@@ -170801,6 +170798,7 @@ var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR,
 };
 var init_maskLiterals = __esm(() => {
   SENTINEL = String.fromCharCode(57344);
+  RISKY_STRING_CONTENT = /\b(?:from|import|require)\s*\(?\s*["'`]/;
   REGEX_OK_AFTER_CHAR = new Set([
     "(",
     ",",

package/dist/index.js

@@ -7825,7 +7825,7 @@ var init_islandSsr = __esm(() => {
 });
 
 // src/build/maskLiterals.ts
-var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR, REGEX_OK_AFTER_WORD, maskLiterals = (src) => {
+var SENTINEL, RISKY_STRING_CONTENT, 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 = "";
@@ -7833,7 +7833,6 @@ var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR,
   let prevChar = "";
   let prevWord = "";
   let prevWasSpace = false;
-  let wordBeforeParen = "";
   const mask = (text) => {
     out += SENTINEL + pieces.length + SENTINEL;
     pieces.push(text);
@@ -7971,14 +7970,14 @@ var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR,
     }
     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);
+      const text = src.slice(i, end);
+      if (RISKY_STRING_CONTENT.test(text)) {
+        mask(text);
+      } else {
+        out += text;
         prevChar = '"';
         prevWord = "";
         prevWasSpace = false;
-      } else {
-        mask(src.slice(i, end));
       }
       i = end;
       continue;
@@ -8005,8 +8004,6 @@ var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR,
       const contiguous = isIdentChar(prevChar) && !prevWasSpace;
       prevWord = contiguous ? prevWord + c : c;
     } else {
-      if (c === "(")
-        wordBeforeParen = prevWord;
       prevWord = "";
     }
     prevChar = c;
@@ -8018,6 +8015,7 @@ var SENTINEL, isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_AFTER_CHAR,
 };
 var init_maskLiterals = __esm(() => {
   SENTINEL = String.fromCharCode(57344);
+  RISKY_STRING_CONTENT = /\b(?:from|import|require)\s*\(?\s*["'`]/;
   REGEX_OK_AFTER_CHAR = new Set([
     "(",
     ",",
@@ -22578,21 +22576,29 @@ var escapeRegex3 = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), rewriter
   const fromRegex = new RegExp(`(from\\s*["'])(${alt})(["'])`, "g");
   const sideEffectRegex = new RegExp(`(import\\s*["'])(${alt})(["']\\s*;?)`, "g");
   const dynamicRegex = new RegExp(`(import\\s*\\(\\s*["'])(${alt})(["']\\s*\\))`, "g");
+  const ph = `${SENTINEL}\\d+${SENTINEL}`;
+  const gap = `(?:\\s|${ph}|/\\*${ph}\\*/|//${ph})*`;
+  const sweepFromRegex = new RegExp(`(\\bfrom${gap}["'])(${alt})(["'])`, "g");
+  const sweepSideEffectRegex = new RegExp(`(\\bimport${gap}["'])(${alt})(["'])`, "g");
+  const sweepDynamicRegex = new RegExp(`(\\b(?:import|require)${gap}\\(${gap}["'])(${alt})(["'])`, "g");
   const rewriter = {
     dynamicRegex,
     fromRegex,
     lookup,
-    sideEffectRegex
+    sideEffectRegex,
+    sweepDynamicRegex,
+    sweepFromRegex,
+    sweepSideEffectRegex
   };
   rewriterCache.set(key, rewriter);
   return rewriter;
+}, makeReplacer = (rewriter) => (_match, prefix, specifier, suffix) => {
+  const webPath = rewriter.lookup.get(specifier);
+  if (!webPath)
+    return _match;
+  return `${prefix}${webPath}${suffix}`;
 }, applyAllReplacements = (content, rewriter) => {
-  const replacer = (_match, prefix, specifier, suffix) => {
-    const webPath = rewriter.lookup.get(specifier);
-    if (!webPath)
-      return _match;
-    return `${prefix}${webPath}${suffix}`;
-  };
+  const replacer = makeReplacer(rewriter);
   rewriter.fromRegex.lastIndex = 0;
   rewriter.sideEffectRegex.lastIndex = 0;
   rewriter.dynamicRegex.lastIndex = 0;
@@ -22601,6 +22607,16 @@ var escapeRegex3 = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), rewriter
   result = result.replace(rewriter.sideEffectRegex, replacer);
   result = result.replace(rewriter.dynamicRegex, replacer);
   return result;
+}, applySweep = (content, rewriter) => {
+  const replacer = makeReplacer(rewriter);
+  rewriter.sweepFromRegex.lastIndex = 0;
+  rewriter.sweepSideEffectRegex.lastIndex = 0;
+  rewriter.sweepDynamicRegex.lastIndex = 0;
+  let result = content;
+  result = result.replace(rewriter.sweepFromRegex, replacer);
+  result = result.replace(rewriter.sweepSideEffectRegex, replacer);
+  result = result.replace(rewriter.sweepDynamicRegex, replacer);
+  return result;
 }, REFRESH_STUBS, patchRefreshGlobals = async (outputPaths) => {
   const jsFiles = outputPaths.filter((path) => path.endsWith(".js"));
   await Promise.all(jsFiles.map(async (filePath) => {
@@ -22621,7 +22637,8 @@ var escapeRegex3 = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), rewriter
     const original = await Bun.file(filePath).text();
     const { masked, restore } = maskLiterals(original);
     const native = nativeRewriteImports(masked, replacements);
-    const content = restore(native ?? applyAllReplacements(masked, rewriter));
+    const rewritten = native ?? applyAllReplacements(masked, rewriter);
+    const content = restore(applySweep(rewritten, rewriter));
     if (content !== original) {
       await Bun.write(filePath, content);
     }
@@ -48326,5 +48343,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=76B5B89ABE03384164756E2164756E21
+//# debugId=149F14089B95BC6964756E2164756E21
 //# sourceMappingURL=index.js.map