veryfront 0.1.827 → 0.1.829

package/esm/src/modules/react-loader/ssr-module-loader/vf-module-resolver.js

@@ -7,24 +7,29 @@ import { join } from "../../../platform/compat/path/index.js";
 import { hashCodeHex } from "../../../utils/hash-utils.js";
 import { rendererLogger } from "../../../utils/index.js";
 import { getMdxEsmCacheDir } from "../../../utils/cache-dir.js";
+import { parseImports, replaceSpecifiers } from "../../../transforms/esm/lexer.js";
 import { createModuleFetcherContext, fetchAndCacheModule, } from "../../../transforms/mdx/esm-module-loader/module-fetcher/index.js";
-import { VF_MODULE_IMPORT_PATTERN } from "../../../transforms/mdx/esm-module-loader/constants.js";
 const logger = rendererLogger.component("ssr-module-loader");
 /**
  * Find /_vf_modules/ imports in transformed code.
  * Matches both /_vf_modules/... and file:///_vf_modules/... forms.
  */
-export function findVfModuleImports(code) {
+export async function findVfModuleImports(code) {
     const imports = [];
-    const pattern = new RegExp(VF_MODULE_IMPORT_PATTERN.source, "g");
-    let match;
-    while ((match = pattern.exec(code)) !== null) {
-        const rawPath = match[1];
+    const parsedImports = await parseImports(code);
+    for (const importSpecifier of parsedImports) {
+        const rawPath = importSpecifier.n;
         if (!rawPath)
             continue;
         // Normalize "file:///_vf_modules/..." and "/_vf_modules/..." to "_vf_modules/..."
         const path = rawPath.replace(/^(?:file:\/\/)?\/+/, "");
-        imports.push({ original: match[0], path });
+        if (!path.startsWith("_vf_modules/"))
+            continue;
+        const queryStart = path.indexOf("?");
+        imports.push({
+            specifier: rawPath,
+            path: queryStart === -1 ? path : path.slice(0, queryStart),
+        });
     }
     return imports;
 }
@@ -32,7 +37,7 @@ export function findVfModuleImports(code) {
  * Resolve /_vf_modules/ imports to local cached modules and rewrite code.
  */
 export async function resolveVfModuleImports(code, options) {
-    const imports = findVfModuleImports(code);
+    const imports = await findVfModuleImports(code);
     if (imports.length === 0)
         return code;
     logger.debug("Processing _vf_modules imports", {
@@ -49,10 +54,10 @@ export async function resolveVfModuleImports(code, options) {
         projectSlug: options.projectId,
         strictMissingModules: false,
     });
-    const results = await Promise.all(imports.map(async ({ original, path }) => {
+    const results = await Promise.all(imports.map(async ({ specifier, path }) => {
         try {
             const cachedFilePath = await fetchAndCacheModule(path, fetcherContext);
-            return { original, path, cachedFilePath };
+            return { specifier, path, cachedFilePath };
         }
         catch (error) {
             logger.warn("Failed to fetch _vf_modules import", {
@@ -60,13 +65,13 @@ export async function resolveVfModuleImports(code, options) {
                 path,
                 error: error instanceof Error ? error.message : String(error),
             });
-            return { original, path, cachedFilePath: null };
+            return { specifier, path, cachedFilePath: null };
         }
     }));
-    let transformed = code;
-    for (const { original, path, cachedFilePath } of results) {
+    const replacements = new Map();
+    for (const { specifier, path, cachedFilePath } of results) {
         if (cachedFilePath) {
-            transformed = transformed.replace(original, `from "file://${cachedFilePath}"`);
+            replacements.set(specifier, `file://${cachedFilePath}`);
         }
         else {
             logger.warn("Failed to resolve _vf_modules import", {
@@ -75,5 +80,7 @@ export async function resolveVfModuleImports(code, options) {
             });
         }
     }
-    return transformed;
+    if (replacements.size === 0)
+        return code;
+    return await replaceSpecifiers(code, (specifier) => replacements.get(specifier) ?? null);
 }

package/esm/src/release-assets/build-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-executor.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/build-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-executor.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/build-executor.ts"],"names":[],"mappings":"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"}

package/esm/src/release-assets/build-executor.js

@@ -16,6 +16,7 @@
  */
 import { serverLogger } from "../utils/index.js";
 import { VERSION } from "../utils/version.js";
+import { resolve } from "../extensions/contracts.js";
 import { createFileSystem } from "../platform/compat/fs.js";
 import { getHostEnv } from "../platform/compat/process.js";
 import { dirname, join, normalize } from "../platform/compat/path/index.js";
@@ -88,66 +89,44 @@ function isBrowserModule(path) {
     return BROWSER_MODULE_DIRS.some((dir) => path.startsWith(dir));
 }
 /**
- * Statically resolve relative imports in a source file to logical paths.
- *
- * Parses `import/export ... from "..."` and bare `import "..."` statements.
- * Only relative specifiers (`./` or `../`) are resolved; package imports and
- * absolute URLs are skipped. Extension-less specifiers try each browser module
- * extension in order.
+ * Statically resolve runtime imports in a TS/JSX source file to logical paths.
+ * Uses the CodeParser AST contract so type-only imports do not enter route
+ * preload closure.
  */
-function resolveStaticImports(source, moduleLogicalPath, knownPaths) {
-    const importRe = /(?:^|;|\n)\s*(?:import|export)\s+(?:[^'"]+\s+from\s+)?['"]([^'"]+)['"]/gm;
-    const results = [];
-    let m;
-    while ((m = importRe.exec(source)) !== null) {
-        const specifier = m[1];
-        const isAlias = specifier.startsWith("@/");
-        if (!isAlias && !specifier.startsWith("./") && !specifier.startsWith("../"))
-            continue;
-        const dir = moduleLogicalPath.includes("/")
-            ? moduleLogicalPath.slice(0, moduleLogicalPath.lastIndexOf("/"))
-            : ".";
-        // `@/x` is a project-root alias (mirrors transforms/esm/path-resolver.ts).
-        // Resolve the path segments manually (no path library needed for simple cases).
-        const segments = (isAlias ? specifier.substring(2) : `${dir}/${specifier}`)
-            .split("/").filter((s) => s !== "");
-        const resolved = [];
-        for (const seg of segments) {
-            if (seg === "..") {
-                resolved.pop();
-            }
-            else if (seg !== ".") {
-                resolved.push(seg);
-            }
-        }
-        const candidate = resolved.join("/");
-        // If the specifier already has a known extension and exists, use it.
-        if (knownPaths.has(candidate)) {
-            results.push(candidate);
-            continue;
-        }
-        // Try appending each browser module extension.
-        let found = false;
-        for (const ext of BROWSER_MODULE_EXTENSIONS) {
-            const withExt = `${candidate}${ext}`;
-            if (knownPaths.has(withExt)) {
-                results.push(withExt);
-                found = true;
-                break;
-            }
-        }
-        // Also try /index variants for directory imports.
-        if (!found) {
-            for (const ext of BROWSER_MODULE_EXTENSIONS) {
-                const indexPath = `${candidate}/index${ext}`;
-                if (knownPaths.has(indexPath)) {
-                    results.push(indexPath);
-                    break;
-                }
-            }
-        }
-    }
-    return results;
+async function collectStaticProjectModuleImports(source, moduleLogicalPath, knownPaths) {
+    return await collectAstStaticProjectModuleImports(source, moduleLogicalPath, knownPaths);
+}
+function readModuleSource(node) {
+    return typeof node.source?.value === "string" ? node.source.value : null;
+}
+function isTypeOnlyModuleDeclaration(node) {
+    if (node.importKind === "type" || node.exportKind === "type")
+        return true;
+    if (!node.specifiers?.length)
+        return false;
+    return node.specifiers.every((specifier) => specifier.importKind === "type" || specifier.exportKind === "type");
+}
+async function collectAstStaticProjectModuleImports(source, moduleLogicalPath, knownPaths) {
+    const parser = resolve("CodeParser");
+    const ast = await parser.parse({ code: source, filePath: moduleLogicalPath });
+    const results = new Set();
+    const visit = (path) => {
+        const node = path.node;
+        if (isTypeOnlyModuleDeclaration(node))
+            return;
+        const specifier = readModuleSource(node);
+        if (!specifier)
+            return;
+        const importedPath = resolveProjectModuleSpecifier(specifier, moduleLogicalPath, knownPaths);
+        if (importedPath)
+            results.add(importedPath);
+    };
+    parser.traverse(ast, {
+        ImportDeclaration: visit,
+        ExportNamedDeclaration: visit,
+        ExportAllDeclaration: visit,
+    });
+    return [...results];
 }
 function resolveKnownModulePath(path, knownPaths) {
     const normalized = normalizeLogicalPath(path
@@ -193,6 +172,8 @@ function normalizeProjectSpecifier(specifier, logicalPath) {
         return specifier;
     if (specifier.startsWith("_veryfront/"))
         return null;
+    if (specifier.startsWith("@/"))
+        return specifier.slice(2);
     if (specifier.startsWith("./") || specifier.startsWith("../")) {
         const dir = logicalPath.includes("/")
             ? logicalPath.slice(0, logicalPath.lastIndexOf("/"))
@@ -949,7 +930,7 @@ function addFrameworkDependencyUrlAliases(urls, dependencies) {
  * Returns all reachable logical paths (entries included).
  * Modules not in `sourceByPath` are recorded as closure gaps.
  */
-function collectClosure(entrypoints, sourceByPath, knownPaths) {
+async function collectClosure(entrypoints, sourceByPath, knownPaths) {
     const visited = new Set();
     const queue = [...entrypoints];
     const gaps = [];
@@ -964,7 +945,7 @@ function collectClosure(entrypoints, sourceByPath, knownPaths) {
             gaps.push(`closure-missing:${current}`);
             continue;
         }
-        const imports = resolveStaticImports(source, current, knownPaths);
+        const imports = await collectStaticProjectModuleImports(source, current, knownPaths);
         for (const imp of imports) {
             if (!visited.has(imp))
                 queue.push(imp);
@@ -1261,7 +1242,7 @@ async function runBuildInner(input, tempDir, client, transform) {
         const route = routeForPage(logicalPath);
         if (!route)
             continue;
-        const { modules: closureModules, gaps: closureGaps } = collectClosure([logicalPath], sourceByPath, knownPaths);
+        const { modules: closureModules, gaps: closureGaps } = await collectClosure([logicalPath], sourceByPath, knownPaths);
         // Include only modules we actually have in the manifest (transformed +
         // within size limit). Framework lib/* modules are excluded per contract
         // (they are embedded by the runtime, not shipped as release assets).

package/esm/src/release-assets/html-consumption.d.ts

@@ -15,7 +15,8 @@ import type { ReleaseAssetManifest } from "./manifest-schema.js";
  * The HTML shell works with relative source paths like `pages/index.tsx` and
  * `/_vf_modules/pages/index.js` URLs. Manifest module keys use the logical
  * source path (e.g. `pages/index.tsx`). This strips a leading `/_vf_modules/`
- * and any `.js` URL extension so both forms resolve.
+ * prefix and URL query/hash data before the resolver compares source
+ * extensions.
  */
 export declare function normalizeManifestModuleKey(path: string): string;
 /**

package/esm/src/release-assets/html-consumption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html-consumption.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/html-consumption.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIjE;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI/D;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,oBAAoB,EAC9B,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,MAAM,GACZ,MAAM,EAAE,CAcV"}
+{"version":3,"file":"html-consumption.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/html-consumption.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIjE;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,oBAAoB,EAC9B,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,MAAM,GACZ,MAAM,EAAE,CAcV"}

package/esm/src/release-assets/html-consumption.js

@@ -17,11 +17,13 @@ const logger = serverLogger.component("release-asset-consume");
  * The HTML shell works with relative source paths like `pages/index.tsx` and
  * `/_vf_modules/pages/index.js` URLs. Manifest module keys use the logical
  * source path (e.g. `pages/index.tsx`). This strips a leading `/_vf_modules/`
- * and any `.js` URL extension so both forms resolve.
+ * prefix and URL query/hash data before the resolver compares source
+ * extensions.
  */
 export function normalizeManifestModuleKey(path) {
-    let key = path.replace(/^\/?_vf_modules\//, "");
+    let key = String(path || "").replace(/^\/?_vf_modules\//, "");
     key = key.replace(/^\/+/, "");
+    key = key.replace(/[?#].*$/, "");
     return key;
 }
 /**

package/esm/src/rendering/rsc/component-analyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-analyzer.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/component-analyzer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAiB,MAAM,YAAY,CAAC;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIzE,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,iBAAiB,GACpB,OAAO,CAAC,iBAAiB,CAAC,CAiB5B;AAuBD,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAc,EACtB,EAAE,CAAC,EAAE,iBAAiB,GACrB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAiC3C"}
+{"version":3,"file":"component-analyzer.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/component-analyzer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAiB,MAAM,YAAY,CAAC;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIzE,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,iBAAiB,GACpB,OAAO,CAAC,iBAAiB,CAAC,CAkB5B;AAuBD,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAc,EACtB,EAAE,CAAC,EAAE,iBAAiB,GACrB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAiC3C"}

package/esm/src/rendering/rsc/component-analyzer.js

@@ -12,10 +12,11 @@ export async function analyzeComponent(filePath, fs) {
     const hasUseServer = detectDirective(content, "use server");
     // Determine component type: directive takes precedence over file naming convention
     const type = hasUseClient || filePath.includes(".client.") ? "client" : "server";
+    const exports = await extractExportNames(content, filePath);
     return {
         type,
         filePath,
-        exports: extractExportNames(content),
+        exports,
         id: generateComponentId(filePath),
         hasUseClient,
         hasUseServer,

package/esm/src/rendering/rsc/export-extractor.d.ts

@@ -1,6 +1,8 @@
 /**
- * Extract all export names from source code.
- * Handles export function/class/const, named exports, and default exports.
+ * Extract runtime export names from source code.
+ *
+ * Uses the CodeParser AST contract so export-looking strings, comments, and
+ * type-only exports do not enter RSC manifests.
  */
-export declare function extractExportNames(source: string): string[];
+export declare function extractExportNames(source: string, filePath?: string): Promise<string[]>;
 //# sourceMappingURL=export-extractor.d.ts.map

package/esm/src/rendering/rsc/export-extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export-extractor.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/export-extractor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAuC3D"}
+{"version":3,"file":"export-extractor.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/export-extractor.ts"],"names":[],"mappings":"AAiEA;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,SAAkB,GACzB,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBnB"}

package/esm/src/rendering/rsc/export-extractor.js

@@ -1,42 +1,65 @@
+import { resolve } from "../../extensions/contracts.js";
+function readName(node) {
+    if (typeof node?.name === "string")
+        return node.name;
+    if (typeof node?.value === "string")
+        return node.value;
+    return null;
+}
+function isTypeOnlyDeclaration(declaration) {
+    if (!declaration)
+        return false;
+    if (declaration.declare === true)
+        return true;
+    return declaration.type === "TSInterfaceDeclaration" ||
+        declaration.type === "TSTypeAliasDeclaration";
+}
+function addDeclarationNames(names, declaration) {
+    if (!declaration || isTypeOnlyDeclaration(declaration))
+        return;
+    if (declaration.type === "FunctionDeclaration" ||
+        declaration.type === "ClassDeclaration" ||
+        declaration.type === "TSEnumDeclaration") {
+        const name = readName(declaration.id);
+        if (name)
+            names.add(name);
+        return;
+    }
+    if (declaration.type !== "VariableDeclaration")
+        return;
+    for (const declarator of declaration.declarations ?? []) {
+        const name = readName(declarator.id);
+        if (name)
+            names.add(name);
+    }
+}
 /**
- * Extract all export names from source code.
- * Handles export function/class/const, named exports, and default exports.
+ * Extract runtime export names from source code.
+ *
+ * Uses the CodeParser AST contract so export-looking strings, comments, and
+ * type-only exports do not enter RSC manifests.
  */
-export function extractExportNames(source) {
+export async function extractExportNames(source, filePath = "component.tsx") {
+    const parser = resolve("CodeParser");
+    const ast = await parser.parse({ code: source, filePath });
     const names = new Set();
-    if (/export\s+default\s+/m.test(source)) {
-        names.add("default");
-    }
-    for (const match of source.matchAll(/export\s+function\s+([A-Za-z0-9_]+)/g)) {
-        if (match[1])
-            names.add(match[1]);
-    }
-    for (const match of source.matchAll(/export\s+class\s+([A-Za-z0-9_]+)/g)) {
-        if (match[1])
-            names.add(match[1]);
-    }
-    for (const match of source.matchAll(/export\s+(?:const|let|var)\s+([A-Za-z0-9_]+)/g)) {
-        if (match[1])
-            names.add(match[1]);
-    }
-    for (const match of source.matchAll(/export\s*\{([^}]+)\}/g)) {
-        const innerRaw = match[1];
-        if (!innerRaw)
-            continue;
-        const inner = innerRaw.split(",");
-        for (const seg of inner) {
-            const part = seg.trim();
-            if (!part)
-                continue;
-            const asMatch = part.match(/([A-Za-z0-9_]+)\s+as\s+([A-Za-z0-9_]+)/i);
-            if (asMatch?.[2]) {
-                names.add(asMatch[2]);
-                continue;
+    parser.traverse(ast, {
+        ExportDefaultDeclaration() {
+            names.add("default");
+        },
+        ExportNamedDeclaration(path) {
+            const node = path.node;
+            if (node.exportKind === "type")
+                return;
+            addDeclarationNames(names, node.declaration);
+            for (const specifier of node.specifiers ?? []) {
+                if (specifier.exportKind === "type")
+                    continue;
+                const name = readName(specifier.exported) ?? readName(specifier.local);
+                if (name)
+                    names.add(name);
             }
-            const plain = part.match(/^([A-Za-z0-9_]+)/);
-            if (plain?.[1])
-                names.add(plain[1]);
-        }
-    }
+        },
+    });
     return [...names];
 }

package/esm/src/routing/client/page-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page-loader.d.ts","sourceRoot":"","sources":["../../../../src/src/routing/client/page-loader.ts"],"names":[],"mappings":"AAIA,YAAY,EACV,YAAY,EACZ,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMzD,qBAAa,UAAU;IACrB,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,eAAe,CAAyC;IAChE,OAAO,CAAC,kBAAkB,CAA2C;IAErE,OAAO,CAAC,WAAW;IAOnB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI9C,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI/B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAK7C,UAAU,IAAI,IAAI;IAOlB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAInD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAItC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI;IAK5C,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;YAIvC,YAAY;YAcZ,iBAAiB;IAmB/B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAsBpC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBrC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAqB1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAsB7C,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBtD,OAAO,CAAC,oBAAoB;CAgB7B"}
+{"version":3,"file":"page-loader.d.ts","sourceRoot":"","sources":["../../../../src/src/routing/client/page-loader.ts"],"names":[],"mappings":"AAIA,YAAY,EACV,YAAY,EACZ,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMzD,qBAAa,UAAU;IACrB,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,eAAe,CAAyC;IAChE,OAAO,CAAC,kBAAkB,CAA2C;IAErE,OAAO,CAAC,WAAW;IAOnB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI9C,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI/B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAK7C,UAAU,IAAI,IAAI;IAOlB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAInD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAItC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI;IAK5C,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;YAIvC,YAAY;YAcZ,iBAAiB;IAmB/B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAsBpC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAerC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAqB1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAsB7C,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAetD,OAAO,CAAC,oBAAoB;CAgB7B"}

package/esm/src/routing/client/page-loader.js

@@ -96,8 +96,7 @@ export class PageLoader {
             return;
         logger.debug(`Prefetching ${path}`);
         try {
-            const data = await this.fetchPageData(path);
-            this.setCache(path, data);
+            await this.loadPage(path);
         }
         catch (error) {
             logger.warn(`[Veryfront] Failed to prefetch ${path}`, error instanceof Error ? error : new Error(String(error)));
@@ -142,8 +141,7 @@ export class PageLoader {
             return;
         logger.debug(`Prefetching SPA page data for ${path}`);
         try {
-            const data = await this.fetchSpaPageData(path);
-            this.setSpaCache(path, data);
+            await this.loadSpaPageData(path);
         }
         catch (error) {
             logger.warn(`[Veryfront] Failed to prefetch SPA data for ${path}`, error instanceof Error ? error : new Error(String(error)));

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/cache/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAYH,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAI5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAK9D,eAAO,MAAM,kBAAkB,wBAE7B,CAAC;AA6IH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsBvF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAK3C;AAQD,2DAA2D;AAC3D,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAElD;AAuBD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CA0ElE;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,SAAwB,GACnC,IAAI,CAgBN;AAOD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevD;AAED,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAwCf;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAc1D;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIzD;AAmBD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EAAE,oDAAoD;AAC3E,eAAe,CAAC,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,EAChE,YAAY,SAAwB,GACnC,OAAO,CAAC,iBAAiB,CAAC,CA+J5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/cache/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAYH,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAK5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAK9D,eAAO,MAAM,kBAAkB,wBAE7B,CAAC;AAsIH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsBvF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAK3C;AAQD,2DAA2D;AAC3D,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAElD;AAuBD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CA0ElE;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,SAAwB,GACnC,IAAI,CAgBN;AAOD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevD;AAED,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAwCf;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAc1D;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIzD;AAmBD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EAAE,oDAAoD;AAC3E,eAAe,CAAC,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,EAChE,YAAY,SAAwB,GACnC,OAAO,CAAC,iBAAiB,CAAC,CA+J5B"}

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

@@ -15,6 +15,7 @@ import { LRUCache } from "../../../../utils/lru-wrapper.js";
 import { registerCache } from "../../../../utils/memory/index.js";
 import { buildMdxEsmPathCacheKey, MDX_ESM_ALL_FILE_URL_PATTERN_SOURCE } from "../cache-format.js";
 import { ensureMdxModuleDependencies } from "../module-fetcher/dependency-recovery.js";
+import { findStaticImportFromSpans } from "../utils/source-spans.js";
 export { getLocalFs } from "./local-fs.js";
 import { getLocalFs } from "./local-fs.js";
 const MAX_VERIFIED_MODULE_DEPS = 2_000;
@@ -105,27 +106,20 @@ async function findMissingFileDependencies(code) {
     }
     return missing;
 }
-/**
- * Pattern to match unresolved /_vf_modules/ imports that weren't converted to proper file:// paths.
- * Matches both:
- * - `from "/_vf_modules/..."` or `from "_vf_modules/..."` (unresolved)
- * - `from "file:///_vf_modules/..."` (malformed - points to non-existent root /_vf_modules/)
- * Note: Uses \s* instead of \s+ because minified code may have no space after `from`.
- * These imports will fail at runtime because they can't be resolved by Deno's dynamic import.
- */
-const UNRESOLVED_VF_MODULES_PATTERN = /from\s*["']((?:file:\/\/)?\/?\/?_vf_modules\/[^"']+)["']/g;
+function matchUnresolvedVfModuleSpecifier(specifier) {
+    return specifier.match(/^((?:file:\/\/)?\/?\/?_vf_modules\/[^?]+)(?:\?.*)?$/)?.[1] ?? null;
+}
 /**
  * Check if cached code has unresolved or malformed /_vf_modules/ imports.
  * These should have been resolved to proper file:// paths (e.g., file:///Users/.cache/...).
  * Returns true if any unresolved or malformed imports are found.
  */
 function hasUnresolvedVfModules(code) {
-    const pattern = new RegExp(UNRESOLVED_VF_MODULES_PATTERN.source, "g");
-    let match;
-    while ((match = pattern.exec(code)) !== null) {
-        const importPath = match[1];
+    const matches = findStaticImportFromSpans(code, matchUnresolvedVfModuleSpecifier);
+    const first = matches[0];
+    if (first) {
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Cached module has unresolved _vf_modules import`, {
-            importPath,
+            importPath: first.path,
         });
         return true;
     }

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

@@ -11,7 +11,7 @@ import type { ESMLoaderContext } from "./types.js";
 /**
  * Rewrite @/ aliased imports to /_vf_modules/ paths.
  */
-export declare function rewriteProjectAliasImports(code: string): string;
+export declare function rewriteProjectAliasImports(code: string): Promise<string>;
 /**
  * Transform bare React specifiers to local file:// paths for Bun/Node.
  * This ensures the same React instance as react-dom-server.

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

@@ -1 +1 @@
-{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/import-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAe5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK9E;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,CAIjF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA6HjB"}
+{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/import-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAa5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO9E;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK9E;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,CAIjF;AAOD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAwHjB"}