veryfront 0.1.734 → 0.1.736

package/esm/deno.js

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

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;AAO5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAexD,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;AAoSD;;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;AAO5E,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;AAiRD;;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

@@ -18,18 +18,17 @@ import { loadImportMap } from "../../../../modules/import-map/index.js";
 import { getHttpBundleCacheDir } from "../../../../utils/cache-dir.js";
 import { REACT_DEFAULT_VERSION } from "../../../../utils/constants/cdn.js";
 import { LOG_PREFIX_MDX_LOADER } from "../constants.js";
-import { getLocalFs, getModulePathCache } from "../cache/index.js";
+import { getModulePathCache } from "../cache/index.js";
 import { hashString } from "../utils/hash.js";
 import { resolveModuleFile } from "../resolution/file-finder.js";
 import { buildMissingModuleError } from "../missing-module.js";
 import { getTransformCacheKey, getVersionedPathCacheKey } from "./cache-keys.js";
 import { rewriteDntImports, rewriteVeryfrontImports } from "./import-rewriter.js";
 import { findNestedImports, processNestedImports } from "./nested-imports.js";
-import { validateCachedModule } from "./framework-validator.js";
-import { recordModuleToSession } from "./render-sessions.js";
 import { readDistributedCache, writeDistributedCache } from "./distributed-cache.js";
 import { fetchModuleViaHTTP } from "./http-fetcher.js";
 import { cacheModule, normalizePath } from "./module-cache.js";
+import { readValidCachedModulePath } from "./path-cache-lookup.js";
 // Re-export extracted modules for backward compatibility
 export { rewriteDntImports } from "./import-rewriter.js";
 export { endRenderSession, hasRenderSession, startRenderSession } from "./render-sessions.js";
@@ -153,28 +152,20 @@ async function doFetchAndCacheModule(normalizedPath, context, fetchAndCacheModul
     const effectiveReactVersion = context.reactVersion ?? REACT_DEFAULT_VERSION;
     const pathCache = await getModulePathCache(esmCacheDir);
     const versionedKey = getVersionedPathCacheKey(normalizedPath, effectiveReactVersion);
-    const cachedPath = pathCache.get(versionedKey);
-    if (cachedPath) {
-        try {
-            const stat = await getLocalFs().stat(cachedPath);
-            if (stat?.isFile) {
-                const cachedCode = await getLocalFs().readTextFile(cachedPath);
-                if (await validateCachedModule(normalizedPath, cachedPath, cachedCode, log, pathCache, versionedKey, context.contentSourceId
-                    ? {
-                        projectId: context.projectId,
-                        contentSourceId: context.contentSourceId,
-                    }
-                    : undefined)) {
-                    recordModuleToSession(normalizedPath);
-                    return cachedPath;
-                }
+    const cachedPath = await readValidCachedModulePath({
+        normalizedPath,
+        pathCache,
+        versionedKey,
+        log,
+        recoveryOptions: context.contentSourceId
+            ? {
+                projectId: context.projectId,
+                contentSourceId: context.contentSourceId,
             }
-        }
-        catch (_) {
-            /* expected: cached file may no longer exist on disk */
-            pathCache.delete(versionedKey);
-        }
-    }
+            : undefined,
+    });
+    if (cachedPath)
+        return cachedPath;
     try {
         const resolved = await resolveModuleFile(normalizedPath, adapter, projectDir);
         if (!resolved) {

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

@@ -0,0 +1,24 @@
+/**
+ * Validated path-cache lookups for MDX ESM module fetching.
+ *
+ * @module transforms/mdx/esm-module-loader/module-fetcher/path-cache-lookup
+ */
+import type { Logger } from "../../../../utils/logger/logger.js";
+interface MdxRecoveryOptions {
+    projectId: string;
+    contentSourceId: string;
+}
+export interface ReadValidCachedModulePathInput {
+    normalizedPath: string;
+    pathCache: Map<string, string>;
+    versionedKey: string;
+    log: Logger;
+    recoveryOptions?: MdxRecoveryOptions;
+}
+/**
+ * Return a cached module path only when the path-cache entry points to an
+ * existing file whose contents pass the full cached-module validator.
+ */
+export declare function readValidCachedModulePath(input: ReadValidCachedModulePathInput): Promise<string | null>;
+export {};
+//# sourceMappingURL=path-cache-lookup.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,32 @@
+/**
+ * Validated path-cache lookups for MDX ESM module fetching.
+ *
+ * @module transforms/mdx/esm-module-loader/module-fetcher/path-cache-lookup
+ */
+import { getLocalFs } from "../cache/index.js";
+import { validateCachedModule } from "./framework-validator.js";
+import { recordModuleToSession } from "./render-sessions.js";
+/**
+ * Return a cached module path only when the path-cache entry points to an
+ * existing file whose contents pass the full cached-module validator.
+ */
+export async function readValidCachedModulePath(input) {
+    const cachedPath = input.pathCache.get(input.versionedKey);
+    if (!cachedPath)
+        return null;
+    try {
+        const stat = await getLocalFs().stat(cachedPath);
+        if (!stat?.isFile)
+            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);
+            return cachedPath;
+        }
+    }
+    catch (_) {
+        /* expected: cached file may no longer exist on disk */
+        input.pathCache.delete(input.versionedKey);
+    }
+    return null;
+}

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.734";
+export declare const VERSION = "0.1.736";
 //# 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.734";
+export const VERSION = "0.1.736";

package/package.json

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