veryfront 0.1.733 → 0.1.735

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.733",
+    "version": "0.1.735",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": "P2D",

package/esm/src/rendering/orchestrator/module-loader/dependency-resolver.d.ts

@@ -0,0 +1,25 @@
+import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
+/** Resolved local module dependency discovered in a source module. */
+export type ResolvedModuleDependency = {
+    full: string;
+    path: string;
+    relativePath: string;
+    depFilePath: string | null;
+    isLocalLib: boolean;
+};
+/** Resolved dependency after its source module has been transformed to a temp file. */
+export type TransformedModuleDependency = ResolvedModuleDependency & {
+    depTempPath: string;
+};
+/** Input for resolving local module dependencies from source code. */
+export interface ResolveModuleDependenciesInput {
+    fileContent: string;
+    filePath: string;
+    projectDir: string;
+    adapter: RuntimeAdapter;
+}
+/** Resolves @/ alias and relative local imports from a source module. */
+export declare function resolveModuleDependencies(input: ResolveModuleDependenciesInput): Promise<ResolvedModuleDependency[]>;
+/** Rewrites resolved local imports to their transformed temp file URLs. */
+export declare function rewriteResolvedDependencyImports(fileContent: string, transformedDeps: TransformedModuleDependency[]): string;
+//# sourceMappingURL=dependency-resolver.d.ts.map

package/esm/src/rendering/orchestrator/module-loader/dependency-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependency-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/dependency-resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AASzE,sEAAsE;AACtE,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,uFAAuF;AACvF,MAAM,MAAM,2BAA2B,GAAG,wBAAwB,GAAG;IACnE,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,sEAAsE;AACtE,MAAM,WAAW,8BAA8B;IAC7C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;CACzB;AAgFD,yEAAyE;AACzE,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAuBrC;AAED,2EAA2E;AAC3E,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,2BAA2B,EAAE,GAC7C,MAAM,CAMR"}

package/esm/src/rendering/orchestrator/module-loader/dependency-resolver.js

@@ -0,0 +1,87 @@
+import { dirname, join, normalize } from "../../../platform/compat/path/index.js";
+import { parallelMap, rendererLogger } from "../../../utils/index.js";
+import { findSourceFile } from "../file-resolver/index.js";
+const logger = rendererLogger.component("module-loader");
+function collectAliasImports(fileContent) {
+    return [...fileContent.matchAll(/from\s+["'](@\/[^"']+)["']/g)].map((m) => ({
+        full: m[0],
+        path: m[1] ?? "",
+    }));
+}
+function collectRelativeImports(fileContent, fileDir) {
+    return [...fileContent.matchAll(/from\s+["'](\.\.?\/[^"']+)["']/g)]
+        .map((m) => ({ full: m[0], path: m[1] ?? "", fromDir: fileDir }))
+        // Ignore already-transformed file:// imports.
+        .filter((imp) => !imp.path.includes("file://"));
+}
+async function resolveAliasImport(imp, projectDir, adapter) {
+    const relativePath = imp.path.substring(2); // Remove @/ prefix.
+    const depFilePath = (await findSourceFile(relativePath, projectDir, adapter)) ??
+        (await findSourceFile(`components/${relativePath}`, projectDir, adapter));
+    return { ...imp, relativePath, depFilePath, isLocalLib: false };
+}
+async function resolveRelativeImport(imp, adapter) {
+    const basePath = normalize(join(imp.fromDir, imp.path));
+    logger.debug("Resolving relative import:", {
+        path: imp.path,
+        fromDir: imp.fromDir,
+        basePath,
+    });
+    const extensions = [".tsx", ".ts", ".jsx", ".js", ".mdx"];
+    let depFilePath = null;
+    if (await adapter.fs.exists(basePath)) {
+        const stat = await adapter.fs.stat(basePath);
+        if (!stat.isDirectory) {
+            depFilePath = basePath;
+        }
+    }
+    if (!depFilePath) {
+        for (const ext of extensions) {
+            const pathWithExt = basePath + ext;
+            if (await adapter.fs.exists(pathWithExt)) {
+                depFilePath = pathWithExt;
+                break;
+            }
+        }
+    }
+    if (!depFilePath) {
+        for (const ext of extensions) {
+            const indexPath = join(basePath, `index${ext}`);
+            if (await adapter.fs.exists(indexPath)) {
+                depFilePath = indexPath;
+                break;
+            }
+        }
+    }
+    return {
+        full: imp.full,
+        path: imp.path,
+        relativePath: imp.path,
+        depFilePath,
+        isLocalLib: false,
+    };
+}
+/** Resolves @/ alias and relative local imports from a source module. */
+export async function resolveModuleDependencies(input) {
+    const fileDir = dirname(input.filePath);
+    const aliasImports = collectAliasImports(input.fileContent);
+    const relativeImports = collectRelativeImports(input.fileContent, fileDir);
+    logger.debug("Processing file:", {
+        filePath: input.filePath,
+        aliasImportsCount: aliasImports.length,
+        relativeImportsCount: relativeImports.length,
+        aliasImports: aliasImports.map((i) => i.path),
+        relativeImports: relativeImports.map((i) => i.path),
+    });
+    const resolvedAliasDeps = await parallelMap(aliasImports, (imp) => resolveAliasImport(imp, input.projectDir, input.adapter));
+    const resolvedRelativeDeps = await parallelMap(relativeImports, (imp) => resolveRelativeImport(imp, input.adapter));
+    return [...resolvedAliasDeps, ...resolvedRelativeDeps];
+}
+/** Rewrites resolved local imports to their transformed temp file URLs. */
+export function rewriteResolvedDependencyImports(fileContent, transformedDeps) {
+    let rewritten = fileContent;
+    for (const dep of transformedDeps) {
+        rewritten = rewritten.replace(dep.full, `from "file://${dep.depTempPath}"`);
+    }
+    return rewritten;
+}

package/esm/src/rendering/orchestrator/module-loader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AA4BzE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAkJpE,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,UAAQ,GACtB,OAAO,CAAC,MAAM,CAAC,CAsSjB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAyBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI5D;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA6DlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AA+BzE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAmEpE,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,UAAQ,GACtB,OAAO,CAAC,MAAM,CAAC,CAsQjB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAyBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI5D;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA6DlC"}

package/esm/src/rendering/orchestrator/module-loader/index.js

@@ -6,9 +6,8 @@
  *
  * @module rendering/orchestrator/module-loader
  */
-import { parallelMap, rendererLogger } from "../../../utils/index.js";
+import { rendererLogger } from "../../../utils/index.js";
 import { getLocalAdapter } from "../../../platform/adapters/registry.js";
-import { findSourceFile } from "../file-resolver/index.js";
 import { transformToESM } from "../../../transforms/esm-transform.js";
 import { createFileSystem } from "../../../platform/compat/fs.js";
 import { getProjectTmpDir } from "../../../modules/react-loader/index.js";
@@ -16,10 +15,11 @@ import { generateCacheKey as generateTransformCacheKey, getOrComputeTransform, i
 import { TRANSFORM_DISTRIBUTED_TTL_SEC } from "../../../utils/constants/cache.js";
 import { validateCachedBundlesByManifestOrCode } from "../../../transforms/esm/cached-bundle-validation.js";
 import { getHttpBundleCacheDir, getMdxEsmCacheDir } from "../../../utils/cache-dir.js";
-import { dirname, join, normalize } from "../../../platform/compat/path/index.js";
+import { join } from "../../../platform/compat/path/index.js";
 import { hashCodeHex } from "../../../utils/hash-utils.js";
 import { getModulePathCache, invalidateMdxEsmModule, lookupMdxEsmCache, saveModulePathCache, } from "../../../transforms/mdx/esm-module-loader/cache/index.js";
 import { buildMdxEsmPathCacheKey } from "../../../transforms/mdx/esm-module-loader/cache-format.js";
+import { resolveModuleDependencies, rewriteResolvedDependencyImports, } from "./dependency-resolver.js";
 const logger = rendererLogger.component("module-loader");
 // Re-export utilities
 export { createEsmCache, createModuleCache, generateHash } from "./cache.js";
@@ -67,58 +67,6 @@ async function ensureDir(adapter, dir) {
         pruneCreatedDirs();
     }
 }
-async function resolveAliasImport(imp, projectDir, adapter) {
-    const relativePath = imp.path.substring(2); // Remove @/ prefix
-    const depFilePath = (await findSourceFile(relativePath, projectDir, adapter)) ??
-        (await findSourceFile(`components/${relativePath}`, projectDir, adapter));
-    return { ...imp, relativePath, depFilePath, isLocalLib: false };
-}
-async function resolveRelativeImport(imp, adapter) {
-    // Resolve the path relative to the file's directory and normalize to resolve ..
-    const basePath = normalize(join(imp.fromDir, imp.path));
-    logger.debug("Resolving relative import:", {
-        path: imp.path,
-        fromDir: imp.fromDir,
-        basePath,
-    });
-    // Try to find the source file with various extensions
-    const extensions = [".tsx", ".ts", ".jsx", ".js", ".mdx"];
-    let depFilePath = null;
-    // First try the exact path (in case it already has an extension)
-    if (await adapter.fs.exists(basePath)) {
-        const stat = await adapter.fs.stat(basePath);
-        if (!stat.isDirectory) {
-            depFilePath = basePath;
-        }
-    }
-    // Try with extensions
-    if (!depFilePath) {
-        for (const ext of extensions) {
-            const pathWithExt = basePath + ext;
-            if (await adapter.fs.exists(pathWithExt)) {
-                depFilePath = pathWithExt;
-                break;
-            }
-        }
-    }
-    // Try index files if path is a directory
-    if (!depFilePath) {
-        for (const ext of extensions) {
-            const indexPath = join(basePath, `index${ext}`);
-            if (await adapter.fs.exists(indexPath)) {
-                depFilePath = indexPath;
-                break;
-            }
-        }
-    }
-    return {
-        full: imp.full,
-        path: imp.path,
-        relativePath: imp.path,
-        depFilePath,
-        isLocalLib: false,
-    };
-}
 /**
  * Transform a module and all its local dependencies (@/ alias and relative imports).
  *
@@ -179,30 +127,13 @@ export async function transformModuleWithDeps(filePath, tmpDir, localAdapter, co
     }
     const readAdapter = useLocalAdapter ? localAdapter : adapter;
     let fileContent = decodeFileContent(await readAdapter.fs.readFile(filePath));
-    const fileDir = dirname(filePath);
-    // Match @/ alias imports
-    const aliasImports = [...fileContent.matchAll(/from\s+["'](@\/[^"']+)["']/g)].map((m) => ({ full: m[0], path: m[1] ?? "" }));
-    // Match relative imports (./ and ../) - exclude npm:, http://, https://, file://
-    const relativeImports = [
-        ...fileContent.matchAll(/from\s+["'](\.\.?\/[^"']+)["']/g),
-    ]
-        .map((m) => ({ full: m[0], path: m[1] ?? "", fromDir: fileDir }))
-        // Filter out already-transformed file:// imports
-        .filter((imp) => !imp.path.includes("file://"));
-    logger.debug("Processing file:", {
+    const resolvedDeps = await resolveModuleDependencies({
+        adapter,
+        fileContent,
         filePath,
-        aliasImportsCount: aliasImports.length,
-        relativeImportsCount: relativeImports.length,
-        aliasImports: aliasImports.map((i) => i.path),
-        relativeImports: relativeImports.map((i) => i.path),
+        projectDir,
     });
-    // Resolve alias imports
-    const resolvedAliasDeps = await parallelMap(aliasImports, (imp) => resolveAliasImport(imp, projectDir, adapter));
-    // Resolve relative imports
-    const resolvedRelativeDeps = await parallelMap(relativeImports, (imp) => resolveRelativeImport(imp, adapter));
-    // Combine all resolved dependencies
-    const resolvedDeps = [...resolvedAliasDeps, ...resolvedRelativeDeps];
-    const transformedDeps = await parallelMap(resolvedDeps.filter((d) => d.depFilePath), async (dep) => {
+    const transformedDeps = await Promise.all(resolvedDeps.filter((d) => d.depFilePath).map(async (dep) => {
         logger.debug("Found dependency:", {
             path: dep.path,
             depFilePath: dep.depFilePath,
@@ -210,9 +141,9 @@ export async function transformModuleWithDeps(filePath, tmpDir, localAdapter, co
         });
         const depTempPath = await transformModuleWithDeps(dep.depFilePath, tmpDir, localAdapter, config, dep.isLocalLib);
         return { ...dep, depTempPath };
-    });
+    }));
+    fileContent = rewriteResolvedDependencyImports(fileContent, transformedDeps);
     for (const dep of transformedDeps) {
-        fileContent = fileContent.replace(dep.full, `from "file://${dep.depTempPath}"`);
         logger.debug("Replaced import:", {
             path: dep.path,
             depTempPath: dep.depTempPath,

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/specifier-resolver.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Specifier resolution helpers for the SSR VF Modules stage.
+ *
+ * @module transforms/pipeline/stages/ssr-vf-modules/specifier-resolver
+ */
+export interface FrameworkSpecifierResolverInput {
+    denoConfigStubUrl: string | null;
+    veryfrontReplacements: ReadonlyMap<string, string>;
+    relativeReplacements: ReadonlyMap<string, string>;
+    reactVersion: string;
+    reactImportMap?: Record<string, string>;
+}
+/**
+ * Resolve a bare `react` / `react-dom` (or subpath) specifier to its esm.sh
+ * URL for the given React version. Returns `null` for anything that is not a
+ * React specifier.
+ */
+export declare function resolveReactSpecifier(specifier: string, reactVersion: string, reactImportMap?: Record<string, string>): string | null;
+/**
+ * If `resolvedPath` is one of veryfront's React re-export modules
+ * (`FRAMEWORK_ROOT/react/*.js`), return the esm.sh URL it should be rewritten
+ * to for the given React version. Returns `null` for anything else.
+ */
+export declare function reactReExportToEsmUrl(resolvedPath: string, reactVersion: string, reactImportMap?: Record<string, string>): string | null;
+/**
+ * Build the final specifier resolver for transformed framework code.
+ */
+export declare function createFrameworkSpecifierResolver(input: FrameworkSpecifierResolverInput): (specifier: string) => string | null;
+//# sourceMappingURL=specifier-resolver.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"specifier-resolver.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/specifier-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,WAAW,+BAA+B;IAC9C,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,qBAAqB,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,oBAAoB,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,cAAc,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAmC,GACvE,MAAM,GAAG,IAAI,CAef;AAkBD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,MAAM,GAAG,IAAI,CAKf;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,+BAA+B,GACrC,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAkBtC"}

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

@@ -0,0 +1,70 @@
+/**
+ * Specifier resolution helpers for the SSR VF Modules stage.
+ *
+ * @module transforms/pipeline/stages/ssr-vf-modules/specifier-resolver
+ */
+import { join } from "../../../../platform/compat/path/index.js";
+import { buildReactUrl, getReactImportMap } from "../../../import-rewriter/url-builder.js";
+import { FRAMEWORK_ROOT } from "./constants.js";
+/**
+ * Resolve a bare `react` / `react-dom` (or subpath) specifier to its esm.sh
+ * URL for the given React version. Returns `null` for anything that is not a
+ * React specifier.
+ */
+export function resolveReactSpecifier(specifier, reactVersion, reactImportMap = getReactImportMap(reactVersion)) {
+    const mapped = reactImportMap[specifier];
+    if (mapped)
+        return mapped;
+    if (specifier.startsWith("react/")) {
+        return buildReactUrl("react", reactVersion, "/" + specifier.slice("react/".length), true);
+    }
+    if (specifier.startsWith("react-dom/")) {
+        return buildReactUrl("react-dom", reactVersion, "/" + specifier.slice("react-dom/".length), true);
+    }
+    return null;
+}
+/**
+ * veryfront's own React re-export modules under `FRAMEWORK_ROOT/react/`
+ * mapped to the bare specifier they stand in for.
+ */
+const REACT_REEXPORT_SPECIFIERS = {
+    "react.js": "react",
+    "react-dom.js": "react-dom",
+    "react-dom-client.js": "react-dom/client",
+    "react-dom-server.js": "react-dom/server",
+    "jsx-runtime.js": "react/jsx-runtime",
+    "jsx-dev-runtime.js": "react/jsx-dev-runtime",
+};
+/** `FRAMEWORK_ROOT/react/` prefix, precomputed (invariant per process). */
+const REACT_REEXPORT_DIR = join(FRAMEWORK_ROOT, "react") + "/";
+/**
+ * If `resolvedPath` is one of veryfront's React re-export modules
+ * (`FRAMEWORK_ROOT/react/*.js`), return the esm.sh URL it should be rewritten
+ * to for the given React version. Returns `null` for anything else.
+ */
+export function reactReExportToEsmUrl(resolvedPath, reactVersion, reactImportMap) {
+    if (!resolvedPath.startsWith(REACT_REEXPORT_DIR))
+        return null;
+    const specifier = REACT_REEXPORT_SPECIFIERS[resolvedPath.slice(REACT_REEXPORT_DIR.length)];
+    if (!specifier)
+        return null;
+    return resolveReactSpecifier(specifier, reactVersion, reactImportMap);
+}
+/**
+ * Build the final specifier resolver for transformed framework code.
+ */
+export function createFrameworkSpecifierResolver(input) {
+    const reactImportMap = input.reactImportMap ?? getReactImportMap(input.reactVersion);
+    return (specifier) => {
+        if (specifier === "#deno-config") {
+            return input.denoConfigStubUrl;
+        }
+        if (specifier.startsWith("#veryfront/")) {
+            return input.veryfrontReplacements.get(specifier) ?? null;
+        }
+        if (specifier.startsWith("./") || specifier.startsWith("../")) {
+            return input.relativeReplacements.get(specifier) ?? null;
+        }
+        return resolveReactSpecifier(specifier, input.reactVersion, reactImportMap);
+    };
+}

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

@@ -25,12 +25,7 @@ export declare function isCyclePlaceholder(code: string): boolean;
  * - contentHash: Content-based invalidation
  */
 export declare function cacheTransformedCode(transformed: string, vfModulePath: string, fs: ReturnType<typeof createFileSystem>): Promise<string>;
-/**
- * If `resolvedPath` is one of veryfront's React re-export modules
- * (`FRAMEWORK_ROOT/react/*.js`), return the esm.sh URL it should be rewritten
- * to for the given React version. Returns `null` for anything else.
- */
-export declare function reactReExportToEsmUrl(resolvedPath: string, reactVersion: string, reactImportMap?: Record<string, string>): string | null;
+export { reactReExportToEsmUrl } from "./specifier-resolver.js";
 /**
  * Core transformation logic for framework TypeScript/TSX files.
  * Compiles to JavaScript and recursively resolves all imports:

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;AAcrE,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;AA8ED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,MAAM,GAAG,IAAI,CAKf;AAwMD;;;;;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,CAsPjB;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,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"}

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

@@ -14,9 +14,10 @@ import { LRUCache } from "../../../../utils/lru-wrapper.js";
 import { getHttpBundleCacheDir, getMdxEsmCacheDir } from "../../../../utils/cache-dir.js";
 import { cacheHttpImportsToLocal } from "../../../esm/http-cache.js";
 import { loadImportMap } from "../../../../modules/import-map/index.js";
-import { buildReactUrl, getReactImportMap } from "../../../import-rewriter/url-builder.js";
+import { getReactImportMap } from "../../../import-rewriter/url-builder.js";
 import { findRelativeImports } from "./import-finder.js";
 import { resolveRelativeFrameworkImport, resolveVeryfrontSourcePath } from "./path-resolver.js";
+import { createFrameworkSpecifierResolver, reactReExportToEsmUrl, resolveReactSpecifier, } from "./specifier-resolver.js";
 import { EMBEDDED_SRC_DIR, FRAMEWORK_ROOT, frameworkFileCache, frameworkWriteFlight, LOG_PREFIX, MAX_RELATIVE_IMPORT_DEPTH, transformingFiles, veryfrontTransformCache, } from "./constants.js";
 import { buildFrameworkVfModuleCacheFileName } from "../../../mdx/esm-module-loader/cache-format.js";
 const DENO_CONFIG_STUB_CODE = `export default ${JSON.stringify(denoConfig)};`;
@@ -77,70 +78,7 @@ const FALLBACK_TRANSFORM_CACHE_MAX_ENTRIES = 2000;
 const fallbackTransformCache = new LRUCache({
     maxEntries: FALLBACK_TRANSFORM_CACHE_MAX_ENTRIES,
 });
-/**
- * Resolve a bare `react` / `react-dom` (or subpath) specifier to its esm.sh
- * URL for the given React version. Returns `null` for anything that is not a
- * React specifier.
- *
- * Both the main transform path and the depth-limit fallback use this so a
- * framework module always links against the single esm.sh React bundle used
- * during SSR. Leaving `react` bare would resolve it to the project's own
- * React copy — a second React instance whose dispatcher is null, which makes
- * the first hook throw "Cannot read properties of null (reading 'useEffect')".
- */
-function resolveReactSpecifier(specifier, reactVersion, reactImportMap = getReactImportMap(reactVersion)) {
-    const mapped = reactImportMap[specifier];
-    if (mapped)
-        return mapped;
-    if (specifier.startsWith("react/")) {
-        return buildReactUrl("react", reactVersion, "/" + specifier.slice("react/".length), true);
-    }
-    if (specifier.startsWith("react-dom/")) {
-        return buildReactUrl("react-dom", reactVersion, "/" + specifier.slice("react-dom/".length), true);
-    }
-    return null;
-}
-/**
- * veryfront's own React re-export modules under `FRAMEWORK_ROOT/react/`
- * mapped to the bare specifier they stand in for. Each re-export bridges to
- * project React via `export * from "react"` (etc.), which during SSR resolves
- * to the project's `node_modules` copy — a *different* React instance than
- * the esm.sh react-dom bundle uses. The dnt build rewrites framework
- * `import ... from "react"` to a relative import of these files, so a
- * framework module that does `useEffect` ends up reading a null dispatcher.
- * Rewriting these imports straight to the esm.sh bundle keeps every SSR
- * module on a single React instance.
- *
- * Keys must match the compiled re-export filenames under
- * `FRAMEWORK_ROOT/react/`, which the build emits from the `react/*.ts` source
- * modules (`react.ts`, `react-dom.ts`, `react-dom-client.ts`,
- * `react-dom-server.ts`, `jsx-runtime.ts`, `jsx-dev-runtime.ts`). If one is
- * renamed or added, update this map too: a stale key silently reintroduces
- * the dual-React-instance bug.
- */
-const REACT_REEXPORT_SPECIFIERS = {
-    "react.js": "react",
-    "react-dom.js": "react-dom",
-    "react-dom-client.js": "react-dom/client",
-    "react-dom-server.js": "react-dom/server",
-    "jsx-runtime.js": "react/jsx-runtime",
-    "jsx-dev-runtime.js": "react/jsx-dev-runtime",
-};
-/** `FRAMEWORK_ROOT/react/` prefix, precomputed (invariant per process). */
-const REACT_REEXPORT_DIR = join(FRAMEWORK_ROOT, "react") + "/";
-/**
- * If `resolvedPath` is one of veryfront's React re-export modules
- * (`FRAMEWORK_ROOT/react/*.js`), return the esm.sh URL it should be rewritten
- * to for the given React version. Returns `null` for anything else.
- */
-export function reactReExportToEsmUrl(resolvedPath, reactVersion, reactImportMap) {
-    if (!resolvedPath.startsWith(REACT_REEXPORT_DIR))
-        return null;
-    const specifier = REACT_REEXPORT_SPECIFIERS[resolvedPath.slice(REACT_REEXPORT_DIR.length)];
-    if (!specifier)
-        return null;
-    return resolveReactSpecifier(specifier, reactVersion, reactImportMap);
-}
+export { reactReExportToEsmUrl } from "./specifier-resolver.js";
 /**
  * Pick an esbuild loader for a file path, honoring the embedded `.src`
  * suffix used in compiled binaries (`foo.ts.src` → `ts`). Recognizes
@@ -490,21 +428,13 @@ export async function transformFrameworkCode(content, sourcePath, ctx, throwOnMi
             const stubPath = await cacheTransformedCode(DENO_CONFIG_STUB_CODE, "#deno-config-stub", ctx.fs);
             denoConfigStubUrl = `file://${stubPath}`;
         }
-        transformed = await replaceSpecifiers(transformed, (specifier) => {
-            // Handle Deno import-map aliases
-            if (specifier === "#deno-config") {
-                return denoConfigStubUrl;
-            }
-            // Handle #veryfront/ imports
-            if (specifier.startsWith("#veryfront/")) {
-                return veryfrontReplacements.get(specifier) ?? null;
-            }
-            // Handle relative imports
-            if (specifier.startsWith("./") || specifier.startsWith("../")) {
-                return relativeReplacements.get(specifier) ?? null;
-            }
-            return resolveReactSpecifier(specifier, ctx.reactVersion, reactImportMap);
-        });
+        transformed = await replaceSpecifiers(transformed, createFrameworkSpecifierResolver({
+            denoConfigStubUrl,
+            veryfrontReplacements,
+            relativeReplacements,
+            reactVersion: ctx.reactVersion,
+            reactImportMap,
+        }));
         // Cache HTTP imports to local filesystem
         const importMap = await loadImportMap(ctx.projectDir);
         const cacheResult = await cacheHttpImportsToLocal(transformed, {

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

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.733";
+export declare const VERSION = "0.1.735";
 //# 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.733";
+export const VERSION = "0.1.735";

package/package.json

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