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

package/dist/src/build/maskLiterals.d.ts

@@ -1,17 +1,19 @@
 /** Shields non-code spans from the regex/text-based import rewriters.
  *
- *  The import rewriters (rewriteReactImports, rewriteImportsPlugin, and the
- *  native Zig scanner) replace `from "X"` / `import "X"` / `import("X")` across
- *  the whole file text. That text scan can't tell a real import from the *text*
- *  `from 'X'` sitting inside a TEMPLATE LITERAL (an example-code snippet a page
- *  renders) or a comment — so it rewrites the snippet's specifier too. The
- *  server pre-render keeps the snippet verbatim while the browser bundle gets it
- *  rewritten, so the two diverge → React hydration mismatch on the code block.
+ *  The import rewriters (rewriteReactImports, rewriteImportsPlugin, the native
+ *  Zig scanner, and compile's runtime-specifier rewrite) replace `from "X"` /
+ *  `import "X"` / `import("X")` / `require("X")` across the whole file text. That
+ *  text scan can't tell a real import from the *text* `from 'X'` sitting inside a
+ *  template literal / data string (an example-code snippet a page renders) or a
+ *  comment — so it rewrites the snippet's specifier too. The browser bundle then
+ *  diverges from the SSR pre-render → React hydration mismatch on the code block.
  *
- *  Fix: before rewriting, replace template literals and comment bodies with
- *  opaque placeholders; rewrite; then restore them verbatim. Regular string
- *  literals (where real import specifiers live) and regex literals pass through
- *  untouched, so real import rewriting is completely unaffected.
+ *  Fix: before rewriting, replace template literals, comments, and non-specifier
+ *  string literals with opaque placeholders; rewrite; then restore them verbatim.
+ *  String literals that ARE real import specifiers (those right after
+ *  `from`/`import`, or inside `import(`/`require(`) are left untouched, so real
+ *  import rewriting is unaffected. Regex literals are skipped (copied verbatim)
+ *  so their contents can't be misread as strings/templates.
  *
  *  Usage: `const { masked, restore } = maskLiterals(src)`, run the existing
  *  rewriter on `masked`, then `restore(rewritten)`.

package/dist/svelte/index.js

@@ -2761,16 +2761,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 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;
@@ -2826,24 +2849,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;
@@ -2881,8 +2886,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 === "*") {
@@ -2900,16 +2903,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))) {
@@ -2917,25 +2924,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([
     "(",
     ",",
@@ -4631,5 +4649,5 @@ export {
   createTypedIsland
 };
 
-//# debugId=7AC08283E912BA6564756E2164756E21
+//# debugId=60861DEB9D7F3C6864756E2164756E21
 //# sourceMappingURL=index.js.map