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

package/dist/cli/index.js

@@ -170608,16 +170608,39 @@ ${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) => {
+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;
@@ -170673,24 +170696,6 @@ var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_
     }
     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;
@@ -170728,8 +170733,6 @@ var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_
 `)
         i++;
       mask(src.slice(s, i));
-      prevChar = "";
-      prevWord = "";
       continue;
     }
     if (c === "/" && c2 === "*") {
@@ -170747,16 +170750,20 @@ var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_
       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);
+      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;
-      prevChar = '"';
-      prevWord = "";
       continue;
     }
     if (c === "/" && (prevChar === "" || REGEX_OK_AFTER_CHAR.has(prevChar) || REGEX_OK_AFTER_WORD.has(prevWord))) {
@@ -170764,25 +170771,36 @@ var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_
       if (end > 0) {
         out += src.slice(i, end);
         i = end;
-        prevChar = "/";
+        prevChar = ")";
         prevWord = "";
+        prevWasSpace = false;
         continue;
       }
     }
     out += c;
     i++;
     if (c === " " || c === "\t" || c === "\r" || c === `
-`)
+`) {
+      prevWasSpace = true;
       continue;
-    const wasIdent = isIdentChar(prevChar);
+    }
+    if (isIdentChar(c)) {
+      const contiguous = isIdentChar(prevChar) && !prevWasSpace;
+      prevWord = contiguous ? prevWord + c : c;
+    } else {
+      if (c === "(")
+        wordBeforeParen = prevWord;
+      prevWord = "";
+    }
     prevChar = c;
-    prevWord = isIdentChar(c) ? wasIdent ? prevWord + c : 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([
     "(",
     ",",
@@ -177252,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;
@@ -177268,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);
     }
@@ -177930,6 +177950,7 @@ console.log(\`
 };
 var init_compile = __esm(() => {
   init_externalAssetPlugin();
+  init_maskLiterals();
   init_islandEntries();
   init_islandRegistryTransform();
   init_constants();

package/dist/index.js

@@ -7238,16 +7238,39 @@ var init_islandSsr = __esm(() => {
 });
 
 // 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) => {
+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;
@@ -7303,24 +7326,6 @@ var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_
     }
     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;
@@ -7358,8 +7363,6 @@ var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_
 `)
         i++;
       mask(src.slice(s2, i));
-      prevChar = "";
-      prevWord = "";
       continue;
     }
     if (c === "/" && c2 === "*") {
@@ -7377,16 +7380,20 @@ var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_
       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);
+      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;
-      prevChar = '"';
-      prevWord = "";
       continue;
     }
     if (c === "/" && (prevChar === "" || REGEX_OK_AFTER_CHAR.has(prevChar) || REGEX_OK_AFTER_WORD.has(prevWord))) {
@@ -7394,25 +7401,36 @@ var SENTINEL = "\uE000", isIdentChar = (c) => /[A-Za-z0-9_$]/.test(c), REGEX_OK_
       if (end > 0) {
         out += src.slice(i, end);
         i = end;
-        prevChar = "/";
+        prevChar = ")";
         prevWord = "";
+        prevWasSpace = false;
         continue;
       }
     }
     out += c;
     i++;
     if (c === " " || c === "\t" || c === "\r" || c === `
-`)
+`) {
+      prevWasSpace = true;
       continue;
-    const wasIdent = isIdentChar(prevChar);
+    }
+    if (isIdentChar(c)) {
+      const contiguous = isIdentChar(prevChar) && !prevWasSpace;
+      prevWord = contiguous ? prevWord + c : c;
+    } else {
+      if (c === "(")
+        wordBeforeParen = prevWord;
+      prevWord = "";
+    }
     prevChar = c;
-    prevWord = isIdentChar(c) ? wasIdent ? prevWord + c : 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([
     "(",
     ",",
@@ -46957,5 +46975,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=C3D862B3C898113964756E2164756E21
+//# debugId=8D7748D6ECBDDF8764756E2164756E21
 //# sourceMappingURL=index.js.map