veryfront 0.1.827 → 0.1.829

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

@@ -9,9 +9,9 @@
 import { join } from "../../../platform/compat/path/index.js";
 import { rendererLogger as logger } from "../../../utils/index.js";
 import { transformImportsWithMap } from "../../../modules/import-map/index.js";
-import { replaceSpecifiers } from "../../esm/lexer.js";
+import { parseImports, replaceSpecifiers } from "../../esm/lexer.js";
 import { getLocalReactPaths, isReactSpecifier } from "../../../platform/compat/react-paths.js";
-import { ESBUILD_JSX_FACTORY, ESBUILD_JSX_FRAGMENT, FRAMEWORK_ROOT, JSX_IMPORT_PATTERN, LOG_PREFIX_MDX_LOADER, REACT_IMPORT_PATTERN, } from "./constants.js";
+import { ESBUILD_JSX_FACTORY, ESBUILD_JSX_FRAGMENT, FRAMEWORK_ROOT, LOG_PREFIX_MDX_LOADER, } from "./constants.js";
 import { getLocalFs } from "./cache/index.js";
 import { buildMdxJsxCacheFileName } from "./cache-format.js";
 import { rewriteDntImports } from "./module-fetcher/index.js";
@@ -19,10 +19,13 @@ import { ensureCachedJsxModulePatched } from "./jsx-cache.js";
 /**
  * Rewrite @/ aliased imports to /_vf_modules/ paths.
  */
-export function rewriteProjectAliasImports(code) {
-    return code.replace(/from\s*["']@\/([^"']+)["']/g, (_match, path) => {
+export async function rewriteProjectAliasImports(code) {
+    return await replaceSpecifiers(code, (specifier) => {
+        if (!specifier.startsWith("@/"))
+            return null;
+        const path = specifier.slice(2);
         const jsPath = path.endsWith(".js") ? path : `${path}.js`;
-        return `from "/_vf_modules/${jsPath}"`;
+        return `/_vf_modules/${jsPath}`;
     });
 }
 /**
@@ -65,6 +68,10 @@ export function transformImports(code, importMap) {
         resolveBare: true,
     });
 }
+async function hasReactImport(code) {
+    const imports = await parseImports(code);
+    return imports.some((importSpecifier) => importSpecifier.n === "react");
+}
 /**
  * Transform JSX/TSX imports using esbuild.
  * Optimized to process all imports in parallel batches for better performance.
@@ -72,25 +79,22 @@ export function transformImports(code, importMap) {
 export async function transformJsxImports(code, adapter, esmCacheDir) {
     const { transform } = await import("../../../extensions/bundler/index.js");
     const importsToProcess = [];
-    let jsxMatch;
-    while ((jsxMatch = JSX_IMPORT_PATTERN.exec(code)) !== null) {
-        const [fullMatch, importClause, filePath, ext] = jsxMatch;
-        if (!filePath || !importClause || !ext) {
-            logger.warn(`${LOG_PREFIX_MDX_LOADER} Skipping JSX import with undefined fields`, {
-                fullMatch,
-                hasFilePath: !!filePath,
-                hasImportClause: !!importClause,
-                hasExt: !!ext,
-            });
+    const imports = await parseImports(code);
+    for (const importSpecifier of imports) {
+        const specifier = importSpecifier.n;
+        if (!specifier?.startsWith("file://"))
             continue;
-        }
-        importsToProcess.push({ fullMatch, importClause, filePath, ext });
+        const filePath = specifier.slice("file://".length);
+        const ext = filePath.match(/\.(tsx?|jsx?)$/)?.[1];
+        if (!ext)
+            continue;
+        importsToProcess.push({ specifier, filePath, ext });
     }
     if (importsToProcess.length === 0)
         return code;
     const transformStart = performance.now();
     logger.debug(`${LOG_PREFIX_MDX_LOADER} Transforming ${importsToProcess.length} JSX imports in parallel`);
-    const transformResults = await Promise.all(importsToProcess.map(async ({ fullMatch, importClause, filePath, ext }) => {
+    const transformResults = await Promise.all(importsToProcess.map(async ({ specifier, filePath, ext }) => {
         try {
             const isFrameworkFile = filePath.startsWith(FRAMEWORK_ROOT);
             let jsxCode;
@@ -115,8 +119,8 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
                     const useCached = await ensureCachedJsxModulePatched(transformedPath, filePath);
                     if (useCached) {
                         return {
-                            original: fullMatch,
-                            transformed: `import ${importClause} from "file://${transformedPath}";`,
+                            specifier,
+                            replacement: `file://${transformedPath}`,
                             cached: true,
                         };
                     }
@@ -140,7 +144,7 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
                 format: "esm",
             });
             let transformed = result.code;
-            if (!REACT_IMPORT_PATTERN.test(transformed)) {
+            if (!(await hasReactImport(transformed))) {
                 transformed = `import React from 'react';\n${transformed}`;
             }
             // Rewrite _dnt.polyfills.js / _dnt.shims.js relative imports to absolute file:// paths.
@@ -149,8 +153,8 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
             transformed = await rewriteDntImports(transformed, filePath);
             await getLocalFs().writeTextFile(transformedPath, transformed);
             return {
-                original: fullMatch,
-                transformed: `import ${importClause} from "file://${transformedPath}";`,
+                specifier,
+                replacement: `file://${transformedPath}`,
                 cached: false,
             };
         }
@@ -165,10 +169,12 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
         cached: transformResults.filter((r) => r?.cached).length,
         durationMs: (performance.now() - transformStart).toFixed(1),
     });
-    let result = code;
+    const replacements = new Map();
     for (const t of transformResults) {
         if (t)
-            result = result.replace(t.original, t.transformed);
+            replacements.set(t.specifier, t.replacement);
     }
-    return result;
+    if (replacements.size === 0)
+        return code;
+    return await replaceSpecifiers(code, (specifier) => replacements.get(specifier) ?? null);
 }

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;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"}
+{"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;AAMjE;;;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,CAM3F;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,10 +3,13 @@
  *
  * @module transforms/mdx/esm-module-loader/module-fetcher/nested-imports
  */
-import { LOG_PREFIX_MDX_LOADER, UNRESOLVED_VF_MODULES_PATTERN } from "../constants.js";
+import { LOG_PREFIX_MDX_LOADER } from "../constants.js";
 import { createStubModule } from "../utils/stub-module.js";
 import { findStaticImportFromSpans, replaceSourceSpans, } from "../utils/source-spans.js";
 import { buildMissingModuleError } from "../missing-module.js";
+function matchUnresolvedVfModuleSpecifier(specifier) {
+    return specifier.match(/^((?:file:\/\/)?\/?\/?_vf_modules\/[^?]+)(?:\?.*)?$/)?.[1] ?? null;
+}
 /**
  * Find nested module imports in code.
  * Matches both /_vf_modules/... and file:///_vf_modules/... patterns.
@@ -14,7 +17,7 @@ import { buildMissingModuleError } from "../missing-module.js";
 export function findNestedImports(moduleCode) {
     const vfModules = [];
     const relative = [];
-    for (const { original, path: rawPath, start, end } of findStaticImportFromSpans(moduleCode, (specifier) => specifier.match(/^((?:file:\/\/)?\/?\/?_vf_modules\/[^?]+)(?:\?.*)?$/)?.[1])) {
+    for (const { original, path: rawPath, start, end } of findStaticImportFromSpans(moduleCode, matchUnresolvedVfModuleSpecifier)) {
         // Strip file:// prefix and leading slashes to get clean _vf_modules/... path
         vfModules.push({
             original,
@@ -37,11 +40,10 @@ export function findNestedImports(moduleCode) {
  * Check for unresolved /_vf_modules/ imports.
  */
 export function hasUnresolvedImports(moduleCode) {
-    const pattern = new RegExp(UNRESOLVED_VF_MODULES_PATTERN.source, "g");
-    const matches = [...moduleCode.matchAll(pattern)];
+    const matches = findStaticImportFromSpans(moduleCode, matchUnresolvedVfModuleSpecifier);
     return {
         count: matches.length,
-        paths: matches.map((m) => m[1]).filter((p) => p !== undefined).slice(0, 5),
+        paths: matches.map((match) => match.path).slice(0, 5),
     };
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"module-writer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/module-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAyBH,OAAO,KAAK,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAiDnD,wBAAsB,eAAe,CACnC,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,CAAC,CA4VpB"}
+{"version":3,"file":"module-writer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/module-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAyBH,OAAO,KAAK,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA8CnD,wBAAsB,eAAe,CACnC,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,CAAC,CA2VpB"}

package/esm/src/transforms/mdx/esm-module-loader/module-writer.js

@@ -20,7 +20,7 @@ import { loadImportMap } from "../../../modules/import-map/index.js";
 import { cacheHttpImportsToLocal, ensureHttpBundlesExist } from "../../esm/http-cache.js";
 import { extractAllHttpBundlePathsRecursive, extractHttpBundlePaths, } from "../../../modules/react-loader/ssr-module-loader/http-bundle-helpers.js";
 import { setupSSRGlobals } from "../../../rendering/ssr-globals.js";
-import { LOG_PREFIX_MDX_LOADER, LOG_PREFIX_MDX_RENDERER, UNRESOLVED_VF_MODULES_PATTERN, } from "./constants.js";
+import { LOG_PREFIX_MDX_LOADER, LOG_PREFIX_MDX_RENDERER } from "./constants.js";
 import { getLocalFs } from "./cache/index.js";
 import { hashString } from "./utils/hash.js";
 import { ssrVfModulesPlugin } from "../../pipeline/stages/ssr-vf-modules.js";
@@ -28,6 +28,7 @@ import { REACT_DEFAULT_VERSION } from "../../../utils/constants/cdn.js";
 import { extractFrameworkBundlePaths } from "../../shared/framework-bundle-paths.js";
 import { rewriteProjectAliasImports, transformImports, transformJsxImports, transformReactToLocalPaths, } from "./import-transformer.js";
 import { findMissingFrameworkBundles, findVfModuleImports, initializeCacheDir, processVfModuleImports, resolveProjectDir, } from "./loader-helpers.js";
+import { hasUnresolvedImports } from "./module-fetcher/nested-imports.js";
 /** Singleflight for MDX module file writes to prevent race conditions */
 const mdxWriteFlight = new Singleflight();
 /**
@@ -64,7 +65,7 @@ export async function doLoadModuleESM(compiledProgramCode, context) {
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Step: initializeCacheDir START`, { projectSlug });
         const esmCacheDir = await initializeCacheDir(context);
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Step: initializeCacheDir DONE`, { projectSlug });
-        let rewritten = rewriteProjectAliasImports(compiledProgramCode);
+        let rewritten = await rewriteProjectAliasImports(compiledProgramCode);
         const projectDir = resolveProjectDir(context);
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Step: loadImportMap START`, { projectSlug });
         const importMap = await loadImportMap(projectDir, adapter);
@@ -103,12 +104,11 @@ export async function doLoadModuleESM(compiledProgramCode, context) {
             return cached;
         }
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Module cache miss`, { projectSlug, compositeKey });
-        const unresolvedMatches = [
-            ...rewritten.matchAll(new RegExp(UNRESOLVED_VF_MODULES_PATTERN.source, "g")),
-        ];
-        if (unresolvedMatches.length > 0) {
-            const unresolvedPaths = unresolvedMatches.map((m) => m[1]).slice(0, 5);
-            const errorMsg = `MDX has ${unresolvedMatches.length} unresolved module imports: ${unresolvedPaths.join(", ")}`;
+        const unresolved = hasUnresolvedImports(rewritten);
+        if (unresolved.count > 0) {
+            const errorMsg = `MDX has ${unresolved.count} unresolved module imports: ${unresolved.paths
+                .slice(0, 5)
+                .join(", ")}`;
             logger.error(`${LOG_PREFIX_MDX_RENDERER} ${errorMsg}`);
             throw IMPORT_RESOLUTION_ERROR.create({ detail: errorMsg });
         }

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.d.ts

@@ -5,10 +5,10 @@
  * Find all /_vf_modules/_veryfront/ imports in the code.
  * Only matches framework modules, not user project files.
  */
-export declare function findVfModuleImports(code: string): string[];
+export declare function findVfModuleImports(code: string): Promise<string[]>;
 /**
  * Find all relative imports (./foo, ../bar) in the code.
  * Returns array of specifiers.
  */
-export declare function findRelativeImports(code: string): string[];
+export declare function findRelativeImports(code: string): Promise<string[]>;
 //# sourceMappingURL=import-finder.d.ts.map

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-finder.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAc1D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAiB1D"}
+{"version":3,"file":"import-finder.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAUzE;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAUzE"}

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.js

@@ -1,39 +1,29 @@
 /**
  * Import discovery functions for the SSR VF Modules stage.
  */
+import { parseImports } from "../../../esm/lexer.js";
+function unique(values) {
+    return [...new Set(values)];
+}
 /**
  * Find all /_vf_modules/_veryfront/ imports in the code.
  * Only matches framework modules, not user project files.
  */
-export function findVfModuleImports(code) {
-    const imports = [];
-    // Note: \s* allows zero whitespace (minified code: from"..." has no space)
-    // Only match _veryfront/ framework modules, not user project files.
-    // Handle both raw "/_vf_modules/..." specifiers and malformed
-    // "file:///_vf_modules/..." variants that can leak out of stale caches.
-    const pattern = /from\s*["']((?:file:\/\/)?\/_vf_modules\/_veryfront\/[^"']+)["']/g;
-    let match;
-    while ((match = pattern.exec(code)) !== null) {
-        imports.push(match[1]);
-    }
-    return [...new Set(imports)];
+export async function findVfModuleImports(code) {
+    const imports = await parseImports(code);
+    return unique(imports
+        .map((imp) => imp.n)
+        .filter((specifier) => specifier?.startsWith("/_vf_modules/_veryfront/") === true ||
+        specifier?.startsWith("file:///_vf_modules/_veryfront/") === true));
 }
 /**
  * Find all relative imports (./foo, ../bar) in the code.
  * Returns array of specifiers.
  */
-export function findRelativeImports(code) {
-    const imports = [];
-    // Match: from "./foo" or from "../bar"
-    const fromPattern = /from\s*["'](\.\.?\/[^"']+)["']/g;
-    // Match side-effect imports: import "./foo" or import "../bar" (no `from`)
-    const sideEffectPattern = /import\s*["'](\.\.?\/[^"']+)["']/g;
-    let match;
-    while ((match = fromPattern.exec(code)) !== null) {
-        imports.push(match[1]);
-    }
-    while ((match = sideEffectPattern.exec(code)) !== null) {
-        imports.push(match[1]);
-    }
-    return [...new Set(imports)];
+export async function findRelativeImports(code) {
+    const imports = await parseImports(code);
+    return unique(imports
+        .map((imp) => imp.n)
+        .filter((specifier) => specifier?.startsWith("./") === true ||
+        specifier?.startsWith("../") === true));
 }

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/index.js

@@ -52,7 +52,7 @@ export const ssrVfModulesPlugin = {
     condition: (ctx) => ctx.target === "ssr",
     async transform(ctx) {
         logInitOnce();
-        const vfModuleImports = findVfModuleImports(ctx.code);
+        const vfModuleImports = await findVfModuleImports(ctx.code);
         logger.debug(`${LOG_PREFIX} Transform called`, {
             file: ctx.filePath?.slice(-60) ?? "<unknown>",
             count: vfModuleImports.length,

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/transform.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAmBrE,OAAO,EAOL,KAAK,gBAAgB,EAGtB,MAAM,gBAAgB,CAAC;AAKxB;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CA2BjB;AAgBD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAwMhE;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,gBAAgB,EACrB,oBAAoB,UAAQ,EAC5B,KAAK,SAAI,GACR,OAAO,CAAC,MAAM,CAAC,CA8OjB;AAED;;;GAGG;AACH,wBAAsB,kCAAkC,CACtD,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4CxB;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CAEjB"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/transform.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAmBrE,OAAO,EAOL,KAAK,gBAAgB,EAGtB,MAAM,gBAAgB,CAAC;AAKxB;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CA2BjB;AAgBD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAwMhE;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,gBAAgB,EACrB,oBAAoB,UAAQ,EAC5B,KAAK,SAAI,GACR,OAAO,CAAC,MAAM,CAAC,CAgPjB;AAED;;;GAGG;AACH,wBAAsB,kCAAkC,CACtD,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4CxB;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CAEjB"}

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/transform.js

@@ -8,7 +8,7 @@ import { join } from "../../../../platform/compat/path/index.js";
 import denoConfig from "../../../../../deno.js";
 import { rendererLogger as logger } from "../../../../utils/index.js";
 import { IMPORT_RESOLUTION_ERROR } from "../../../../errors/index.js";
-import { replaceSpecifiers } from "../../../esm/lexer.js";
+import { parseImports, replaceSpecifiers } from "../../../esm/lexer.js";
 import { hashCodeHex } from "../../../../utils/hash-utils.js";
 import { LRUCache } from "../../../../utils/lru-wrapper.js";
 import { getHttpBundleCacheDir, getMdxEsmCacheDir } from "../../../../utils/cache-dir.js";
@@ -187,7 +187,7 @@ async function rewriteFallbackRelativeImports(code, sourcePath, ctx, visited = n
     visited.add(sourcePath);
     // Note: we do not early-return when there are no relative imports, because
     // react/react-dom specifiers still need rewriting below.
-    const relativeImports = findRelativeImports(code);
+    const relativeImports = await findRelativeImports(code);
     // Built once and reused for both the relative-import loop (React re-export
     // rewriting) and the final specifier pass below.
     const reactImportMap = getReactImportMap(ctx.reactVersion);
@@ -312,8 +312,11 @@ export async function transformFrameworkCode(content, sourcePath, ctx, throwOnMi
         let transformed = result.code;
         // Collect and recursively resolve all #veryfront/ imports
         const veryfrontReplacements = new Map();
-        for (const match of transformed.matchAll(/from\s+["'](#veryfront\/[^"']+)["']/g)) {
-            const specifier = match[1];
+        const transformedImports = await parseImports(transformed);
+        for (const importSpecifier of transformedImports) {
+            const specifier = importSpecifier.n;
+            if (!specifier?.startsWith("#veryfront/"))
+                continue;
             if (veryfrontReplacements.has(specifier))
                 continue;
             const resolved = await resolveAndTransformVeryfrontImport(specifier, ctx);
@@ -344,7 +347,7 @@ export async function transformFrameworkCode(content, sourcePath, ctx, throwOnMi
         const frameworkSrcDir = join(FRAMEWORK_ROOT, "src") + "/";
         const embeddedSrcDirPrefix = EMBEDDED_SRC_DIR + "/";
         {
-            const relativeImports = findRelativeImports(transformed);
+            const relativeImports = await findRelativeImports(transformed);
             for (const specifier of relativeImports) {
                 // Skip non-code imports (like deno.json, package.json, etc.)
                 if (/\.(json|css|svg|png|jpg|jpeg|gif|ico|woff2?|ttf|eot)$/.test(specifier)) {

package/esm/src/utils/version-constant.d.ts

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.827";
+export declare const VERSION = "0.1.829";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,4 +1,4 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
 /** Shared version value. */
-export const VERSION = "0.1.827";
+export const VERSION = "0.1.829";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.827",
+  "version": "0.1.829",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",