veryfront 0.1.738 → 0.1.742

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/http-fetcher.js

@@ -11,6 +11,7 @@ import { SpanNames } from "../../../../observability/tracing/span-names.js";
 import { LOG_PREFIX_MDX_LOADER } from "../constants.js";
 import { rewriteVeryfrontImports } from "./import-rewriter.js";
 import { findNestedImports } from "./nested-imports.js";
+import { replaceSourceSpans } from "../utils/source-spans.js";
 /**
  * Fetch module via HTTP as a fallback (local development only).
  *
@@ -38,20 +39,38 @@ export async function fetchModuleViaHTTP(normalizedPath, adapter, fetchAndCacheM
         log.warn(`${LOG_PREFIX_MDX_LOADER} HTTP fetch also failed: ${moduleUrl} (${response.status})`);
         return null;
     }
-    let moduleCode = rewriteVeryfrontImports(await response.text());
+    const moduleCode = rewriteVeryfrontImports(await response.text());
     const { vfModules, relative } = findNestedImports(moduleCode);
     const allImports = [
-        ...vfModules.map(({ original, path }) => ({ original, path, key: "nestedPath" })),
-        ...relative.map(({ original, path }) => ({ original, path, key: "relativePath" })),
+        ...vfModules.map(({ original, path, start, end }) => ({
+            original,
+            path,
+            start,
+            end,
+            key: "nestedPath",
+        })),
+        ...relative.map(({ original, path, start, end }) => ({
+            original,
+            path,
+            start,
+            end,
+            key: "relativePath",
+        })),
     ];
-    const results = await Promise.all(allImports.map(async ({ original, path, key }) => {
+    const results = await Promise.all(allImports.map(async ({ original, path, start, end, key }) => {
         const nestedFilePath = await fetchAndCacheModuleFn(path, normalizedPath);
-        return { original, nestedFilePath, [key]: path };
+        return { original, start, end, nestedFilePath, [key]: path };
     }));
-    for (const { original, nestedFilePath } of results) {
+    const replacements = [];
+    for (const { original, start, end, nestedFilePath } of results) {
         if (nestedFilePath) {
-            moduleCode = moduleCode.replace(original, `from "file://${nestedFilePath}"`);
+            replacements.push({
+                start,
+                end,
+                expected: original,
+                replacement: `from "file://${nestedFilePath}"`,
+            });
         }
     }
-    return moduleCode;
+    return replaceSourceSpans(moduleCode, replacements);
 }

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/import-rewriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-rewriter.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/import-rewriter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM5D;AAwCD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA8C7F"}
+{"version":3,"file":"import-rewriter.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/import-rewriter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgB5D;AAwCD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA0D7F"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/import-rewriter.js

@@ -7,17 +7,24 @@ import { dirname, join, resolve } from "../../../../platform/compat/path/index.j
 import { FRAMEWORK_ROOT } from "../constants.js";
 import { resolveVeryfrontModuleUrl } from "../../../veryfront-module-urls.js";
 import { getLocalFs } from "../cache/index.js";
+import { findStaticImportFromSpans, findStaticSideEffectImportSpans, replaceSourceSpans, } from "../utils/source-spans.js";
 /**
  * Rewrite veryfront/* imports to /_vf_modules/_veryfront/ paths for MDX module loading.
  * Uses deno.json exports/imports as the source of truth and appends ?ssr=true.
  */
 export function rewriteVeryfrontImports(code) {
-    return code.replace(/from\s*["'](veryfront\/[^"']+)["']/g, (_match, specifier) => {
-        const mapped = resolveVeryfrontModuleUrl(specifier);
+    const replacements = findStaticImportFromSpans(code, (specifier) => specifier.startsWith("veryfront/") ? specifier : null).flatMap(({ original, path, start, end }) => {
+        const mapped = resolveVeryfrontModuleUrl(path);
         if (!mapped)
-            return `from "${specifier}"`;
-        return `from "${mapped}?ssr=true"`;
+            return [];
+        return [{
+                start,
+                end,
+                expected: original,
+                replacement: `from "${mapped}?ssr=true"`,
+            }];
     });
+    return replaceSourceSpans(code, replacements);
 }
 /**
  * Rewrite relative imports in framework files to absolute file:// paths.
@@ -72,27 +79,30 @@ export async function rewriteDntImports(code, sourceFilePath) {
     let rewritten = code;
     const patterns = [
         {
-            regex: /from\s*["'](\.\.?\/[^"']+)["']/g,
+            findMatches: (source) => findStaticImportFromSpans(source, (specifier) => specifier.match(/^(\.\.?\/[^?]+)(?:\?.*)?$/)?.[1]),
             buildReplacement: (path) => `from "file://${path}"`,
         },
         {
-            regex: /import\s*["'](\.\.?\/[^"']+)["']/g,
+            findMatches: (source) => findStaticSideEffectImportSpans(source, (specifier) => specifier.match(/^(\.\.?\/[^?]+)(?:\?.*)?$/)?.[1]),
             buildReplacement: (path) => `import "file://${path}"`,
         },
     ];
-    for (const { regex, buildReplacement } of patterns) {
-        const matches = [...rewritten.matchAll(regex)];
-        for (const match of matches) {
-            const original = match[0];
-            const relativePath = match[1];
-            if (!relativePath)
-                continue;
+    for (const { findMatches, buildReplacement } of patterns) {
+        const matches = findMatches(rewritten);
+        const replacements = [];
+        for (const { original, path: relativePath, start, end } of matches) {
             const absolutePath = resolve(sourceDir, relativePath);
             const resolvedPath = needsFrameworkSourceFallback
                 ? await findExistingFrameworkRelativeTarget(absolutePath) ?? absolutePath
                 : absolutePath;
-            rewritten = rewritten.replace(original, buildReplacement(resolvedPath));
+            replacements.push({
+                start,
+                end,
+                expected: original,
+                replacement: buildReplacement(resolvedPath),
+            });
         }
+        rewritten = replaceSourceSpans(rewritten, replacements);
     }
     return rewritten;
 }

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/index.d.ts

@@ -15,7 +15,7 @@ import type { Logger } from "../../../../utils/logger/logger.js";
 import type { RuntimeAdapter } from "../../../../platform/adapters/base.js";
 import type { ModuleFetcherContext } from "../types.js";
 export { rewriteDntImports } from "./import-rewriter.js";
-export { endRenderSession, hasRenderSession, startRenderSession } from "./render-sessions.js";
+export { endRenderSession, hasRenderSession, runInRenderSession, startRenderSession, } from "./render-sessions.js";
 /**
  * Error thrown when transform tree exceeds the timeout.
  */

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAG5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAcxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAS9F;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAOtD;AAED;;GAEG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,SAAS,EAAE,MAAM;CAI9B;AAcD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,OAAO,GAAE,GAAG,CAAC,MAAM,CAAa,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwFxB;AA6KD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IACR,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,GACA,oBAAoB,CAUtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAG5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAcxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAS9B;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAOtD;AAED;;GAEG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,SAAS,EAAE,MAAM;CAI9B;AAcD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,OAAO,GAAE,GAAG,CAAC,MAAM,CAAa,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwFxB;AA6KD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IACR,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,GACA,oBAAoB,CAUtB"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/index.js

@@ -27,7 +27,7 @@ import { readValidCachedModulePath } from "./path-cache-lookup.js";
 import { transformResolvedModuleSource } from "./source-transform.js";
 // Re-export extracted modules for backward compatibility
 export { rewriteDntImports } from "./import-rewriter.js";
-export { endRenderSession, hasRenderSession, startRenderSession } from "./render-sessions.js";
+export { endRenderSession, hasRenderSession, runInRenderSession, startRenderSession, } from "./render-sessions.js";
 /**
  * Maximum time allowed for the entire transform tree (recursive module resolution).
  * If the cumulative time exceeds this, we fail fast instead of hanging indefinitely.

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/nested-imports.d.ts

@@ -13,10 +13,14 @@ export declare function findNestedImports(moduleCode: string): {
     vfModules: Array<{
         original: string;
         path: string;
+        start: number;
+        end: number;
     }>;
     relative: Array<{
         original: string;
         path: string;
+        start: number;
+        end: number;
     }>;
 };
 /**

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/nested-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nested-imports.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/nested-imports.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAEjE;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GACjB;IACD,SAAS,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrD,QAAQ,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrD,CAqBA;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAO3F;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,kBAAkB,EAAE,EAC7B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAyBjB;AAED,MAAM,WAAW,+BAA+B;IAC9C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/E,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,+BAA+B,GACrC,OAAO,CAAC,MAAM,CAAC,CAwEjB"}
+{"version":3,"file":"nested-imports.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/nested-imports.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAQtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAEjE;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GACjB;IACD,SAAS,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjF,QAAQ,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjF,CAkCA;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAO3F;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,kBAAkB,EAAE,EAC7B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAED,MAAM,WAAW,+BAA+B;IAC9C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/E,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,+BAA+B,GACrC,OAAO,CAAC,MAAM,CAAC,CAuDjB"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/nested-imports.js

@@ -3,8 +3,9 @@
  *
  * @module transforms/mdx/esm-module-loader/module-fetcher/nested-imports
  */
-import { LOG_PREFIX_MDX_LOADER, RELATIVE_IMPORT_PATTERN, UNRESOLVED_VF_MODULES_PATTERN, VF_MODULE_IMPORT_PATTERN, } from "../constants.js";
+import { LOG_PREFIX_MDX_LOADER, UNRESOLVED_VF_MODULES_PATTERN } from "../constants.js";
 import { createStubModule } from "../utils/stub-module.js";
+import { findStaticImportFromSpans, replaceSourceSpans, } from "../utils/source-spans.js";
 import { buildMissingModuleError } from "../missing-module.js";
 /**
  * Find nested module imports in code.
@@ -13,20 +14,22 @@ import { buildMissingModuleError } from "../missing-module.js";
 export function findNestedImports(moduleCode) {
     const vfModules = [];
     const relative = [];
-    const vfPattern = new RegExp(VF_MODULE_IMPORT_PATTERN.source, "g");
-    let match;
-    while ((match = vfPattern.exec(moduleCode)) !== null) {
-        const rawPath = match[1];
+    for (const { original, path: rawPath, start, end } of findStaticImportFromSpans(moduleCode, (specifier) => specifier.match(/^((?:file:\/\/)?\/?\/?_vf_modules\/[^?]+)(?:\?.*)?$/)?.[1])) {
         // Strip file:// prefix and leading slashes to get clean _vf_modules/... path
-        if (rawPath) {
-            vfModules.push({ original: match[0], path: rawPath.replace(/^(?:file:\/\/)?\/+/, "") });
-        }
+        vfModules.push({
+            original,
+            path: rawPath.replace(/^(?:file:\/\/)?\/+/, ""),
+            start,
+            end,
+        });
     }
-    const relativePattern = new RegExp(RELATIVE_IMPORT_PATTERN.source, "g");
-    while ((match = relativePattern.exec(moduleCode)) !== null) {
-        const path = match[1];
-        if (path)
-            relative.push({ original: match[0], path });
+    for (const { original, path, start, end } of findStaticImportFromSpans(moduleCode, (specifier) => specifier.match(/^(\.\.?\/[^?]+)(?:\?.*)?$/)?.[1])) {
+        relative.push({
+            original,
+            path,
+            start,
+            end,
+        });
     }
     return { vfModules, relative };
 }
@@ -45,10 +48,15 @@ export function hasUnresolvedImports(moduleCode) {
  * Process nested imports by replacing them with file:// paths or stub modules.
  */
 export async function processNestedImports(moduleCode, results, esmCacheDir, strictMissingModules, parentModulePath, projectSlug) {
-    let result = moduleCode;
-    for (const { original, nestedFilePath, nestedPath, relativePath } of results) {
+    const replacements = [];
+    for (const { original, start, end, nestedFilePath, nestedPath, relativePath } of results) {
         if (nestedFilePath) {
-            result = result.replace(original, `from "file://${nestedFilePath}"`);
+            replacements.push({
+                start,
+                end,
+                expected: original,
+                replacement: `from "file://${nestedFilePath}"`,
+            });
             continue;
         }
         const modulePath = nestedPath || relativePath || "";
@@ -61,17 +69,23 @@ export async function processNestedImports(moduleCode, results, esmCacheDir, str
                 projectSlug,
             });
         }
-        const stubPath = await createStubModule(modulePath, result, original, esmCacheDir);
-        if (stubPath)
-            result = result.replace(original, `from "file://${stubPath}"`);
+        const stubPath = await createStubModule(modulePath, moduleCode, original, esmCacheDir);
+        if (stubPath) {
+            replacements.push({
+                start,
+                end,
+                expected: original,
+                replacement: `from "file://${stubPath}"`,
+            });
+        }
     }
-    return result;
+    return replaceSourceSpans(moduleCode, replacements);
 }
 /**
  * Resolve nested /_vf_modules and relative imports into local file:// cache paths.
  */
 export async function resolveNestedModuleImports(input) {
-    let moduleCode = input.moduleCode;
+    const moduleCode = input.moduleCode;
     const { vfModules, relative } = findNestedImports(moduleCode);
     input.log?.debug(`${LOG_PREFIX_MDX_LOADER} [fetchAndCacheModule] found nested imports`, {
         projectSlug: input.projectSlug,
@@ -87,32 +101,26 @@ export async function resolveNestedModuleImports(input) {
         count: vfModules.length,
     });
     const vfStart = performance.now();
-    const nestedResults = await Promise.all(vfModules.map(async ({ original, path }) => ({
+    const allImports = [
+        ...vfModules.map((module) => ({ ...module, key: "nestedPath" })),
+        ...relative.map((module) => ({ ...module, key: "relativePath" })),
+    ];
+    const nestedResults = await Promise.all(allImports.map(async ({ original, path, start, end, key }) => ({
         original,
+        start,
+        end,
         nestedFilePath: await input.fetchAndCacheModule(path, input.normalizedPath),
-        nestedPath: path,
+        [key]: path,
     })));
     input.log?.debug(`${LOG_PREFIX_MDX_LOADER} [fetchAndCacheModule] processing vfModules DONE`, {
         projectSlug: input.projectSlug,
         normalizedPath: input.normalizedPath,
         vfMs: (performance.now() - vfStart).toFixed(1),
     });
-    moduleCode = await processNestedImports(moduleCode, nestedResults, input.esmCacheDir, input.strictMissingModules, input.normalizedPath, input.projectSlug);
-    input.log?.debug(`${LOG_PREFIX_MDX_LOADER} [fetchAndCacheModule] processing relative imports START`, {
+    input.log?.debug(`${LOG_PREFIX_MDX_LOADER} [fetchAndCacheModule] processing relative imports`, {
         projectSlug: input.projectSlug,
         normalizedPath: input.normalizedPath,
         count: relative.length,
     });
-    const relStart = performance.now();
-    const relativeResults = await Promise.all(relative.map(async ({ original, path }) => ({
-        original,
-        nestedFilePath: await input.fetchAndCacheModule(path, input.normalizedPath),
-        relativePath: path,
-    })));
-    input.log?.debug(`${LOG_PREFIX_MDX_LOADER} [fetchAndCacheModule] processing relative imports DONE`, {
-        projectSlug: input.projectSlug,
-        normalizedPath: input.normalizedPath,
-        relMs: (performance.now() - relStart).toFixed(1),
-    });
-    return await processNestedImports(moduleCode, relativeResults, input.esmCacheDir, input.strictMissingModules, input.normalizedPath, input.projectSlug);
+    return await processNestedImports(moduleCode, nestedResults, input.esmCacheDir, input.strictMissingModules, input.normalizedPath, input.projectSlug);
 }

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/path-cache-lookup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path-cache-lookup.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/path-cache-lookup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAKjE,UAAU,kBAAkB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,8BAA8B;IAC7C,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACtC;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6BxB"}
+{"version":3,"file":"path-cache-lookup.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/path-cache-lookup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAKjE,UAAU,kBAAkB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,8BAA8B;IAC7C,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACtC;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmCxB"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/path-cache-lookup.js

@@ -16,8 +16,13 @@ export async function readValidCachedModulePath(input) {
         return null;
     try {
         const stat = await getLocalFs().stat(cachedPath);
-        if (!stat?.isFile)
+        if (!stat?.isFile) {
+            // The cached path exists but is no longer a regular file (e.g. replaced
+            // by a directory). Drop the stale entry so we don't re-stat it on every
+            // future lookup.
+            input.pathCache.delete(input.versionedKey);
             return null;
+        }
         const cachedCode = await getLocalFs().readTextFile(cachedPath);
         if (await validateCachedModule(input.normalizedPath, cachedPath, cachedCode, input.log, input.pathCache, input.versionedKey, input.recoveryOptions)) {
             recordModuleToSession(input.normalizedPath);

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/render-sessions.d.ts

@@ -5,6 +5,11 @@
  *
  * @module transforms/mdx/esm-module-loader/module-fetcher/render-sessions
  */
+/**
+ * Run `fn` with `sessionId` bound as the active render session for all async
+ * work it spawns. Modules fetched inside are attributed to this session.
+ */
+export declare function runInRenderSession<T>(sessionId: string, fn: () => T): T;
 /**
  * Start a render session to track module loading.
  * Call this before rendering a page.

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/render-sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-sessions.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/render-sessions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqBH;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAOhG;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAiCxD;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE3D;AAWD,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAQlE"}
+{"version":3,"file":"render-sessions.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/render-sessions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AA6BH;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAEvE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAOhG;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAiCxD;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE3D;AAuBD,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAQlE"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/render-sessions.js

@@ -5,6 +5,7 @@
  *
  * @module transforms/mdx/esm-module-loader/module-fetcher/render-sessions
  */
+import { AsyncLocalStorage } from "node:async_hooks";
 import { rendererLogger as globalLogger } from "../../../../utils/index.js";
 import { LOG_PREFIX_MDX_LOADER } from "../constants.js";
 import { recordSSRModules } from "../../../../modules/manifest/route-module-manifest.js";
@@ -13,6 +14,19 @@ import { recordSSRModules } from "../../../../modules/manifest/route-module-mani
  * Key: renderSessionId, Value: RenderSession
  */
 const renderSessions = new Map();
+/**
+ * The render session id active on the current async execution context.
+ * Set via {@link runInRenderSession} so concurrent SSR renders each resolve
+ * their own session instead of sharing whichever one started first.
+ */
+const currentSessionIdStorage = new AsyncLocalStorage();
+/**
+ * Run `fn` with `sessionId` bound as the active render session for all async
+ * work it spawns. Modules fetched inside are attributed to this session.
+ */
+export function runInRenderSession(sessionId, fn) {
+    return currentSessionIdStorage.run(sessionId, fn);
+}
 /**
  * Start a render session to track module loading.
  * Call this before rendering a page.
@@ -66,8 +80,19 @@ export function hasRenderSession(sessionId) {
  * Used to record modules during fetch and for per-session in-flight deduplication.
  */
 function getCurrentSession() {
-    const firstSession = renderSessions.values().next();
-    return firstSession.done ? null : firstSession.value;
+    const activeId = currentSessionIdStorage.getStore();
+    if (activeId !== undefined) {
+        return renderSessions.get(activeId) ?? null;
+    }
+    // No session bound on the async context (caller not wrapped in
+    // runInRenderSession). Fall back to the single-session heuristic only when
+    // it is unambiguous; with multiple concurrent sessions, decline rather than
+    // mis-attribute modules to the wrong render.
+    if (renderSessions.size === 1) {
+        const firstSession = renderSessions.values().next();
+        return firstSession.done ? null : firstSession.value;
+    }
+    return null;
 }
 export function recordModuleToSession(normalizedPath) {
     const session = getCurrentSession();

package/esm/src/transforms/mdx/esm-module-loader/types.d.ts

@@ -31,6 +31,8 @@ export interface FSAdapter {
 }
 export interface NestedImportResult {
     original: string;
+    start: number;
+    end: number;
     nestedFilePath: string | null;
     nestedPath?: string;
     relativePath?: string;

package/esm/src/transforms/mdx/esm-module-loader/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;IACrD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACzD,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C;AAaD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IACtD,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;IACrD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACzD,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C;AAeD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IACtD,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B"}

package/esm/src/transforms/mdx/esm-module-loader/utils/source-spans.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Source-span replacement helpers for import rewrites.
+ *
+ * @module transforms/mdx/esm-module-loader/utils/source-spans
+ */
+export interface SourceSpanReplacement {
+    start: number;
+    end: number;
+    replacement: string;
+    expected?: string;
+}
+export interface StaticImportSpan {
+    original: string;
+    path: string;
+    start: number;
+    end: number;
+}
+type SpecifierMatcher = (specifier: string) => string | null | undefined;
+export declare function replaceSourceSpans(source: string, replacements: SourceSpanReplacement[]): string;
+export declare function findStaticImportFromSpans(source: string, matcher: SpecifierMatcher): StaticImportSpan[];
+export declare function findStaticSideEffectImportSpans(source: string, matcher: SpecifierMatcher): StaticImportSpan[];
+export {};
+//# sourceMappingURL=source-spans.d.ts.map

package/esm/src/transforms/mdx/esm-module-loader/utils/source-spans.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-spans.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/utils/source-spans.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,KAAK,gBAAgB,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAEzE,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,qBAAqB,EAAE,GACpC,MAAM,CAiBR;AAqID,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GACxB,gBAAgB,EAAE,CAoCpB;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GACxB,gBAAgB,EAAE,CAqCpB"}