veryfront 0.1.755 → 0.1.757

package/esm/src/proxy/handler.js

@@ -1,23 +1,11 @@
 import { TokenManager } from "./token-manager.js";
 import { parseProjectDomain } from "../server/utils/domain-parser.js";
-import { createFileSystem } from "../platform/compat/fs.js";
-import { cwd, getEnv } from "../platform/compat/process.js";
-import { join } from "../platform/compat/path/index.js";
+import { getEnv } from "../platform/compat/process.js";
 import { injectContext, ProxySpanNames, withSpan } from "./tracing.js";
 import { computeContentSourceId } from "../cache/keys.js";
 import { resolve as resolveContract } from "../extensions/contracts.js";
-import { LRUCache } from "../utils/lru-wrapper.js";
-import { registerLRUCache } from "../cache/index.js";
-/**
- * Bounded cache for project paths discovered dynamically at request time
- * (slug → absolute path). Previously these were written into the per-handler
- * `localProjects` config map, which grew without bound. Using a registered
- * LRU keeps the working set capped and exposes it to cache monitoring, while
- * the static `config.localProjects` map continues to reflect *configured*
- * projects for the public `ProxyHandler.localProjects` surface.
- */
-const discoveredLocalProjects = new LRUCache({ maxEntries: 100 });
-registerLRUCache("proxy-discovered-local-projects", discoveredLocalProjects);
+import { createLocalProjectResolver } from "./local-project-resolver.js";
+import { isMissingCustomDomainProjectError, resolveProxyRequestToken, } from "./proxy-token-resolution.js";
 /**
  * Cache the resolved AuthProvider at module scope so the proxy does not pay
  * the registry lookup on every request. The cache is cleared implicitly when
@@ -148,23 +136,11 @@ function getRequestHost(req, url) {
 function getScope(environment) {
     return environment === "preview" ? "preview" : "production";
 }
-function extractUserToken(cookieHeader) {
-    const match = cookieHeader.match(/(?:^|;\s*)authToken=([^;]+)/);
-    return match?.[1] ? decodeURIComponent(match[1]) : undefined;
-}
 function parseStatusFromError(error) {
     const message = error instanceof Error ? error.message : String(error);
     const match = message.match(/failed: (\d+)/);
     return match ? Number(match[1]) : null;
 }
-// Brittle on purpose: we string-match the API's OAuth error body. Source of truth is
-// veryfront-api/src/api/http/rest/auth/routes.ts — `oauthError(c, 'Project not found
-// for domain', ...)`. If that string is renamed, this regex silently regresses to 502.
-// Durable fix is a typed error code from the token-mint helper; tracked separately.
-function isMissingCustomDomainProjectError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return /project not found for domain/i.test(message);
-}
 async function extractUserIdFromToken(token, apiBaseUrl, log) {
     const auth = getAuthProvider();
     const header = auth.decode(token);
@@ -221,52 +197,7 @@ function isProjectMember(users, userId) {
 export function createProxyHandler(options) {
     const { config, cache, logger } = options;
     const localProjects = config.localProjects ?? {};
-    const fs = createFileSystem();
-    async function findLocalProject(slug) {
-        const mapped = localProjects[slug];
-        if (mapped)
-            return mapped;
-        const projectDirs = ["projects", "data/projects", "examples"];
-        const basePath = cwd();
-        // Key the discovery cache by the filesystem root as well as the slug: the
-        // cache is process-wide, so the same slug can resolve to different paths
-        // across handlers/workspaces or after a cwd change. Keying by basePath
-        // prevents a stale entry from one root being proxied for another.
-        const cacheKey = `${basePath}${slug}`;
-        const cached = discoveredLocalProjects.get(cacheKey);
-        if (cached)
-            return cached;
-        const candidatePaths = projectDirs.map((dir) => join(basePath, dir, slug));
-        const existingPaths = await Promise.all(candidatePaths.map(async (projectPath) => {
-            try {
-                return (await fs.exists(projectPath)) ? projectPath : null;
-            }
-            catch (_) {
-                /* expected: filesystem check may fail */
-                return null;
-            }
-        }));
-        for (const projectPath of existingPaths) {
-            if (!projectPath)
-                continue;
-            try {
-                const [hasApp, hasPages, hasComponents] = await Promise.all([
-                    fs.exists(join(projectPath, "app")),
-                    fs.exists(join(projectPath, "pages")),
-                    fs.exists(join(projectPath, "components")),
-                ]);
-                if (!hasApp && !hasPages && !hasComponents)
-                    continue;
-                discoveredLocalProjects.set(cacheKey, projectPath);
-                logger?.debug("Dynamically discovered local project", { slug, projectPath });
-                return projectPath;
-            }
-            catch (_) {
-                // expected: filesystem check may fail
-            }
-        }
-        return undefined;
-    }
+    const localProjectResolver = createLocalProjectResolver({ localProjects, logger });
     const tokenManager = new TokenManager({
         apiBaseUrl: config.apiBaseUrl,
         apiClientId: config.apiClientId,
@@ -315,46 +246,6 @@ export function createProxyHandler(options) {
     function makeProjectNotFoundContext(base, message, token) {
         return makeErrorContext(base, 404, message, token, undefined, "project-not-found");
     }
-    async function resolveRequestToken(req, url, scope, host, projectSlug, options) {
-        const userToken = extractUserToken(req.headers.get("cookie") ?? "");
-        const useSignedInternalControlPlaneToken = options.allowSignedInternalControlPlaneToken &&
-            isSignedInternalControlPlaneRequest(req, url);
-        let token;
-        let tokenFetchError;
-        if (useSignedInternalControlPlaneToken) {
-            token = req.headers.get("x-token") ?? undefined;
-            logger?.debug("Using signed control-plane token for internal request", {
-                pathname: url.pathname,
-                scope,
-            });
-        }
-        else if (scope === "preview" && userToken) {
-            token = userToken;
-            logger?.debug("Using user auth token for preview");
-        }
-        if (!token && config.apiClientId && config.apiClientSecret) {
-            const customDomain = projectSlug ? undefined : host;
-            if (projectSlug || customDomain) {
-                try {
-                    token = await tokenManager.getToken(scope, projectSlug, customDomain);
-                }
-                catch (error) {
-                    tokenFetchError = error;
-                    if (!(customDomain && isMissingCustomDomainProjectError(error))) {
-                        logger?.error(options.tokenFetchErrorMessage, error, {
-                            projectSlug,
-                            customDomain,
-                        });
-                    }
-                }
-            }
-        }
-        if (!token && config.apiToken) {
-            token = config.apiToken;
-            logger?.debug("Using static API token fallback");
-        }
-        return { token, userToken, tokenFetchError };
-    }
     async function checkProtectedAccess(req, url, matchingEnv, userToken, users, logContext) {
         if (!matchingEnv?.protected)
             return null;
@@ -434,7 +325,7 @@ export function createProxyHandler(options) {
                 isLocalProject: false,
             };
         }
-        const localPath = projectSlug ? await findLocalProject(projectSlug) : undefined;
+        const localPath = projectSlug ? await localProjectResolver.find(projectSlug) : undefined;
         const isLocalProject = !!localPath;
         logger?.debug("Processing request", {
             host,
@@ -450,8 +341,17 @@ export function createProxyHandler(options) {
             logger?.debug("Local project, skipping token fetch", { localPath });
         }
         else {
-            ({ token, userToken, tokenFetchError } = await resolveRequestToken(req, url, scope, host, projectSlug, {
+            ({ token, userToken, tokenFetchError } = await resolveProxyRequestToken({
+                req,
+                url,
+                scope,
+                host,
+                projectSlug,
+                config,
+                tokenManager,
+                logger,
                 allowSignedInternalControlPlaneToken: true,
+                signedInternalControlPlaneRequest: isSignedInternalControlPlaneRequest(req, url),
                 tokenFetchErrorMessage: "Token fetch failed",
             }));
             if (projectSlug && !token) {
@@ -589,7 +489,16 @@ export function createProxyHandler(options) {
         const parsedDomain = parseProjectDomain(host);
         const scope = getScope(parsedDomain.environment);
         const projectSlug = parsedDomain.slug ?? undefined;
-        const { token } = await resolveRequestToken(req, url, scope, host, projectSlug, {
+        const { token } = await resolveProxyRequestToken({
+            req,
+            url,
+            scope,
+            host,
+            projectSlug,
+            config,
+            tokenManager,
+            logger,
+            signedInternalControlPlaneRequest: isSignedInternalControlPlaneRequest(req, url),
             tokenFetchErrorMessage: "Token fetch failed for API",
         });
         return token;

package/esm/src/proxy/local-project-resolver.d.ts

@@ -0,0 +1,18 @@
+interface LocalProjectFileSystem {
+    exists(path: string): Promise<boolean> | boolean;
+}
+interface LocalProjectLogger {
+    debug(message: string, extra?: Record<string, unknown>): void;
+}
+export interface LocalProjectResolverOptions {
+    localProjects?: Record<string, string>;
+    fs?: LocalProjectFileSystem;
+    basePath?: () => string;
+    logger?: LocalProjectLogger;
+}
+export interface LocalProjectResolver {
+    find(slug: string): Promise<string | undefined>;
+}
+export declare function createLocalProjectResolver(options: LocalProjectResolverOptions): LocalProjectResolver;
+export {};
+//# sourceMappingURL=local-project-resolver.d.ts.map

package/esm/src/proxy/local-project-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-project-resolver.d.ts","sourceRoot":"","sources":["../../../src/src/proxy/local-project-resolver.ts"],"names":[],"mappings":"AAMA,UAAU,sBAAsB;IAC9B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAClD;AAED,UAAU,kBAAkB;IAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC/D;AAED,MAAM,WAAW,2BAA2B;IAC1C,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,EAAE,CAAC,EAAE,sBAAsB,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACjD;AAUD,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,2BAA2B,GACnC,oBAAoB,CAyDtB"}

package/esm/src/proxy/local-project-resolver.js

@@ -0,0 +1,63 @@
+import { registerLRUCache } from "../cache/index.js";
+import { createFileSystem } from "../platform/compat/fs.js";
+import { join } from "../platform/compat/path/index.js";
+import { cwd } from "../platform/compat/process.js";
+import { LRUCache } from "../utils/lru-wrapper.js";
+/**
+ * Bounded cache for project paths discovered dynamically at request time
+ * (slug -> absolute path). Configured `localProjects` are never written here,
+ * so `ProxyHandler.localProjects` continues to expose only configured projects.
+ */
+const discoveredLocalProjects = new LRUCache({ maxEntries: 100 });
+registerLRUCache("proxy-discovered-local-projects", discoveredLocalProjects);
+export function createLocalProjectResolver(options) {
+    const localProjects = options.localProjects ?? {};
+    const fs = options.fs ?? createFileSystem();
+    const getBasePath = options.basePath ?? cwd;
+    const logger = options.logger;
+    async function find(slug) {
+        const mapped = localProjects[slug];
+        if (mapped)
+            return mapped;
+        const projectDirs = ["projects", "data/projects", "examples"];
+        const basePath = getBasePath();
+        // Key the discovery cache by the filesystem root as well as the slug: the
+        // cache is process-wide, so the same slug can resolve to different paths
+        // across handlers/workspaces or after a cwd change. Keying by basePath
+        // prevents a stale entry from one root being proxied for another.
+        const cacheKey = `${basePath}\0${slug}`;
+        const cached = discoveredLocalProjects.get(cacheKey);
+        if (cached)
+            return cached;
+        const candidatePaths = projectDirs.map((dir) => join(basePath, dir, slug));
+        const existingPaths = await Promise.all(candidatePaths.map(async (projectPath) => {
+            try {
+                return (await fs.exists(projectPath)) ? projectPath : null;
+            }
+            catch (_) {
+                return null;
+            }
+        }));
+        for (const projectPath of existingPaths) {
+            if (!projectPath)
+                continue;
+            try {
+                const [hasApp, hasPages, hasComponents] = await Promise.all([
+                    fs.exists(join(projectPath, "app")),
+                    fs.exists(join(projectPath, "pages")),
+                    fs.exists(join(projectPath, "components")),
+                ]);
+                if (!hasApp && !hasPages && !hasComponents)
+                    continue;
+                discoveredLocalProjects.set(cacheKey, projectPath);
+                logger?.debug("Dynamically discovered local project", { slug, projectPath });
+                return projectPath;
+            }
+            catch (_) {
+                // expected: filesystem check may fail
+            }
+        }
+        return undefined;
+    }
+    return { find };
+}

package/esm/src/proxy/proxy-token-resolution.d.ts

@@ -0,0 +1,37 @@
+import type { TokenScope } from "./token-manager.js";
+export interface ProxyTokenResolutionConfig {
+    apiClientId: string;
+    apiClientSecret: string;
+    apiToken?: string;
+}
+export interface ProxyTokenManager {
+    getToken(scope: TokenScope, projectSlug?: string, customDomain?: string): Promise<string>;
+}
+export interface ProxyTokenResolutionLogger {
+    debug: (msg: string, extra?: Record<string, unknown>) => void;
+    info: (msg: string, extra?: Record<string, unknown>) => void;
+    warn: (msg: string, extra?: Record<string, unknown>) => void;
+    error: (msg: string, error?: Error, extra?: Record<string, unknown>) => void;
+}
+export interface ResolveProxyRequestTokenOptions {
+    req: Request;
+    url: URL;
+    scope: TokenScope;
+    host: string;
+    projectSlug: string | undefined;
+    config: ProxyTokenResolutionConfig;
+    tokenManager: ProxyTokenManager;
+    logger?: ProxyTokenResolutionLogger;
+    allowSignedInternalControlPlaneToken?: boolean;
+    signedInternalControlPlaneRequest?: boolean;
+    tokenFetchErrorMessage: string;
+}
+export interface ResolvedProxyRequestToken {
+    token?: string;
+    userToken?: string;
+    tokenFetchError?: unknown;
+}
+export declare function extractUserToken(cookieHeader: string): string | undefined;
+export declare function isMissingCustomDomainProjectError(error: unknown): boolean;
+export declare function resolveProxyRequestToken(options: ResolveProxyRequestTokenOptions): Promise<ResolvedProxyRequestToken>;
+//# sourceMappingURL=proxy-token-resolution.d.ts.map

package/esm/src/proxy/proxy-token-resolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-token-resolution.d.ts","sourceRoot":"","sources":["../../../src/src/proxy/proxy-token-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CACN,KAAK,EAAE,UAAU,EACjB,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC9D,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC7D,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC7D,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAC9E;AAED,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,0BAA0B,CAAC;IACnC,YAAY,EAAE,iBAAiB,CAAC;IAChC,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,oCAAoC,CAAC,EAAE,OAAO,CAAC;IAC/C,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGzE;AAID,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGzE;AAED,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,yBAAyB,CAAC,CAqDpC"}

package/esm/src/proxy/proxy-token-resolution.js

@@ -0,0 +1,51 @@
+export function extractUserToken(cookieHeader) {
+    const match = cookieHeader.match(/(?:^|;\s*)authToken=([^;]+)/);
+    return match?.[1] ? decodeURIComponent(match[1]) : undefined;
+}
+// Brittle on purpose: the API currently returns this text when token minting
+// cannot map a custom domain. Tracked in #2217 until a typed error code exists.
+export function isMissingCustomDomainProjectError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return /project not found for domain/i.test(message);
+}
+export async function resolveProxyRequestToken(options) {
+    const { config, host, logger, projectSlug, req, scope, tokenFetchErrorMessage, tokenManager, url, } = options;
+    const userToken = extractUserToken(req.headers.get("cookie") ?? "");
+    const useSignedInternalControlPlaneToken = options.allowSignedInternalControlPlaneToken &&
+        options.signedInternalControlPlaneRequest;
+    let token;
+    let tokenFetchError;
+    if (useSignedInternalControlPlaneToken) {
+        token = req.headers.get("x-token") ?? undefined;
+        logger?.debug("Using signed control-plane token for internal request", {
+            pathname: url.pathname,
+            scope,
+        });
+    }
+    else if (scope === "preview" && userToken) {
+        token = userToken;
+        logger?.debug("Using user auth token for preview");
+    }
+    if (!token && config.apiClientId && config.apiClientSecret) {
+        const customDomain = projectSlug ? undefined : host;
+        if (projectSlug || customDomain) {
+            try {
+                token = await tokenManager.getToken(scope, projectSlug, customDomain);
+            }
+            catch (error) {
+                tokenFetchError = error;
+                if (!(customDomain && isMissingCustomDomainProjectError(error))) {
+                    logger?.error(tokenFetchErrorMessage, error, {
+                        projectSlug,
+                        customDomain,
+                    });
+                }
+            }
+        }
+    }
+    if (!token && config.apiToken) {
+        token = config.apiToken;
+        logger?.debug("Using static API token fallback");
+    }
+    return { token, userToken, tokenFetchError };
+}

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

@@ -9,6 +9,16 @@
 import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
 export { createEsmCache, createModuleCache, generateHash } from "./cache.js";
 export { fetchEsmModule, rewriteEsmPaths } from "./esm-rewriter.js";
+/**
+ * Transform a module and all its local dependencies (@/ alias and relative imports).
+ *
+ * @param filePath - Path to the module
+ * @param tmpDir - Temp directory for caching
+ * @param localAdapter - Local file system adapter
+ * @param config - Module loader configuration
+ * @param useLocalAdapter - Whether to use local adapter for reading
+ * @returns Path to the transformed module file
+ */
 export declare function transformModuleWithDeps(filePath: string, tmpDir: string, localAdapter: RuntimeAdapter, config: ModuleLoaderConfig, useLocalAdapter?: boolean): Promise<string>;
 export interface ModuleLoaderConfig {
     projectDir: string;

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;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"}
+{"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;AAuBzE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAkBpE;;;;;;;;;GASG;AACH,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,CAgIjB;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

@@ -8,41 +8,18 @@
  */
 import { rendererLogger } from "../../../utils/index.js";
 import { getLocalAdapter } from "../../../platform/adapters/registry.js";
-import { transformToESM } from "../../../transforms/esm-transform.js";
 import { createFileSystem } from "../../../platform/compat/fs.js";
 import { getProjectTmpDir } from "../../../modules/react-loader/index.js";
-import { generateCacheKey as generateTransformCacheKey, getOrComputeTransform, initializeTransformCache, setCachedTransformAsync, } from "../../../transforms/esm/transform-cache.js";
-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 { 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 { invalidateMdxEsmModule, lookupMdxEsmCache, } from "../../../transforms/mdx/esm-module-loader/cache/index.js";
 import { resolveModuleDependencies, rewriteResolvedDependencyImports, } from "./dependency-resolver.js";
+import { persistTransformedModule } from "./module-persistence.js";
+import { transformModuleCodeWithCache, UNRESOLVED_VF_MODULES_RE, } from "./module-transform-cache.js";
 const logger = rendererLogger.component("module-loader");
 // Re-export utilities
 export { createEsmCache, createModuleCache, generateHash } from "./cache.js";
 export { fetchEsmModule, rewriteEsmPaths } from "./esm-rewriter.js";
-/** Maximum number of directories to track to prevent memory leaks */
-const MAX_CREATED_DIRS = 5_000;
-/** Cache for created directories to avoid repeated mkdir calls (LRU-style) */
-const createdDirs = new Set();
-/** TTL for cached transforms (uses centralized config) */
-const TRANSFORM_CACHE_TTL_SECONDS = TRANSFORM_DISTRIBUTED_TTL_SEC;
-/** Prune oldest entries when cache exceeds limit */
-function pruneCreatedDirs() {
-    if (createdDirs.size <= MAX_CREATED_DIRS)
-        return;
-    const toDelete = createdDirs.size - MAX_CREATED_DIRS;
-    let deleted = 0;
-    for (const dir of createdDirs) {
-        if (deleted >= toDelete)
-            break;
-        createdDirs.delete(dir);
-        deleted++;
-    }
-}
 function getModuleCacheKey(filePath, projectId, projectDir, contentSourceId) {
     const base = projectId ?? projectDir ?? "default";
     const source = contentSourceId ?? "default";
@@ -53,20 +30,6 @@ function decodeFileContent(fileContent) {
         return fileContent;
     return new TextDecoder().decode(fileContent);
 }
-async function ensureDir(adapter, dir) {
-    if (createdDirs.has(dir))
-        return;
-    try {
-        await adapter.fs.mkdir(dir, { recursive: true });
-    }
-    catch (_) {
-        /* expected: directory might already exist */
-    }
-    finally {
-        createdDirs.add(dir);
-        pruneCreatedDirs();
-    }
-}
 /**
  * Transform a module and all its local dependencies (@/ alias and relative imports).
  *
@@ -77,8 +40,6 @@ async function ensureDir(adapter, dir) {
  * @param useLocalAdapter - Whether to use local adapter for reading
  * @returns Path to the transformed module file
  */
-/** Pattern to detect unresolved /_vf_modules/ imports that will fail at runtime */
-const UNRESOLVED_VF_MODULES_RE = /from\s*["']((?:file:\/\/)?\/?\/?_vf_modules\/[^"']+)["']/;
 export async function transformModuleWithDeps(filePath, tmpDir, localAdapter, config, useLocalAdapter = false) {
     const { moduleCache, projectDir, projectId, contentSourceId, adapter, mode } = config;
     const cacheKey = getModuleCacheKey(filePath, projectId, projectDir, contentSourceId);
@@ -158,123 +119,27 @@ export async function transformModuleWithDeps(filePath, tmpDir, localAdapter, co
             projectDir,
         });
     }
-    const contentHash = hashCodeHex(fileContent);
     const effectiveProjectId = projectId ?? projectDir;
-    const scopedPath = `${effectiveProjectId}:${filePath}`;
-    const transformCacheKey = generateTransformCacheKey(scopedPath, contentHash, true);
-    await initializeTransformCache();
-    const transformResult = await getOrComputeTransform(transformCacheKey, () => {
-        logger.debug("Transform cache miss, transforming", { filePath });
-        return transformToESM(fileContent, filePath, projectDir, adapter, {
-            projectId: effectiveProjectId,
-            dev: mode === "development",
-            ssr: true,
-            reactVersion: config.reactVersion,
-        });
-    }, TRANSFORM_CACHE_TTL_SECONDS);
-    let transformedCode = transformResult.code;
-    const cacheDir = getHttpBundleCacheDir();
-    let bundlesValid = true;
-    if (transformResult.cacheHit) {
-        const validation = await validateCachedBundlesByManifestOrCode(transformedCode, transformResult.bundleManifestId, cacheDir);
-        if (!validation.valid) {
-            logger.warn("Cached HTTP bundle validation failed, re-transforming", {
-                filePath,
-                manifestId: transformResult.bundleManifestId?.slice(0, 12),
-                failedHashes: validation.failedHashes,
-                reason: validation.reason,
-                source: validation.source,
-            });
-            bundlesValid = false;
-        }
-    }
-    if (!bundlesValid) {
-        transformedCode = await transformToESM(fileContent, filePath, projectDir, adapter, {
-            projectId: effectiveProjectId,
-            dev: mode === "development",
-            ssr: true,
-            reactVersion: config.reactVersion,
-        });
-        setCachedTransformAsync(transformCacheKey, transformedCode, contentHash, TRANSFORM_CACHE_TTL_SECONDS).catch((error) => {
-            logger.debug("Failed to update transform cache after re-transform", {
-                filePath,
-                error,
-            });
-        });
-    }
-    // CRITICAL: Validate that no unresolved /_vf_modules/ imports remain after transform.
-    // These imports should have been resolved to file:// paths by ssrVfModulesPlugin.
-    // If they're still present, retry the transform bypassing all caches.
-    if (UNRESOLVED_VF_MODULES_RE.test(transformedCode)) {
-        const match = transformedCode.match(UNRESOLVED_VF_MODULES_RE);
-        const unresolvedImport = match?.[1] || "unknown";
-        logger.warn("[ModuleLoader] Transform has unresolved _vf_modules import, retrying without cache", {
-            filePath: filePath.slice(-60),
-            unresolvedImport: unresolvedImport.slice(0, 80),
-            cacheHit: transformResult.cacheHit,
-        });
-        // Force a fresh transform bypassing all caches
-        // Import runPipeline directly to bypass getOrComputeTransform cache
-        const { runPipeline } = await import("../../../transforms/pipeline/index.js");
-        const pipelineResult = await runPipeline(fileContent, filePath, projectDir, {
-            projectId: effectiveProjectId,
-            dev: mode === "development",
-            ssr: true,
-            reactVersion: config.reactVersion,
-        });
-        transformedCode = pipelineResult.code;
-        // Check again after retry
-        if (UNRESOLVED_VF_MODULES_RE.test(transformedCode)) {
-            const retryMatch = transformedCode.match(UNRESOLVED_VF_MODULES_RE);
-            logger.error("Transform still has unresolved _vf_modules after retry", {
-                filePath: filePath.slice(-60),
-                unresolvedImport: retryMatch?.[1]?.slice(0, 80) || "unknown",
-                hint: "Check that framework sources exist in dist/framework-src/ and ssrVfModulesPlugin is running",
-            });
-            // Continue anyway - let it fail at import time for better error context
-        }
-        else {
-            // Retry succeeded - update the cache
-            setCachedTransformAsync(transformCacheKey, transformedCode, hashCodeHex(transformedCode).slice(0, 16), TRANSFORM_CACHE_TTL_SECONDS).catch((error) => {
-                logger.debug("Failed to update cache after retry", { filePath, error });
-            });
-        }
-    }
-    const transformedHash = hashCodeHex(transformedCode).slice(0, 8);
-    const relativePath = filePath.startsWith(projectDir)
-        ? filePath.slice(projectDir.length).replace(/^\/+/, "")
-        : filePath.replace(/^\/+/, "");
-    const jsPath = relativePath.replace(/\.(tsx?|jsx|mdx)$/, `.${transformedHash}.js`);
-    const tempFilePath = join(tmpDir, jsPath);
-    const tempDir = tempFilePath.substring(0, tempFilePath.lastIndexOf("/"));
-    await ensureDir(localAdapter, tempDir);
-    try {
-        await localAdapter.fs.writeFile(tempFilePath, transformedCode);
-    }
-    catch (error) {
-        logger.error("Failed to write module:", {
-            filePath,
-            tempFilePath,
-            error: error instanceof Error ? error.message : String(error),
-        });
-        throw error;
-    }
-    if (contentSourceId) {
-        const normalizedPath = `_vf_modules/${relativePath.replace(/\.(tsx?|jsx|mdx)$/, ".js")}`;
-        const mdxCacheKey = buildMdxEsmPathCacheKey(normalizedPath, config.reactVersion);
-        const cache = await getModulePathCache(tmpDir);
-        cache.set(mdxCacheKey, tempFilePath);
-        saveModulePathCache(tmpDir).catch((err) => {
-            logger.debug("Failed to save module cache", { error: String(err) });
-        });
-        logger.debug("Registered module in MDX-ESM cache", {
-            file: filePath.slice(-40),
-            mdxCacheKey,
-            tempFilePath: tempFilePath.slice(-60),
-        });
-    }
-    moduleCache.set(cacheKey, tempFilePath);
-    return tempFilePath;
+    const { code: transformedCode } = await transformModuleCodeWithCache({
+        fileContent,
+        filePath,
+        projectDir,
+        effectiveProjectId,
+        mode,
+        adapter,
+        reactVersion: config.reactVersion,
+    });
+    return await persistTransformedModule({
+        filePath,
+        projectDir,
+        tmpDir,
+        transformedCode,
+        localAdapter,
+        moduleCache,
+        cacheKey,
+        contentSourceId,
+        reactVersion: config.reactVersion,
+    });
 }
 /**
  * Get the cache directory for module transforms.

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

@@ -0,0 +1,20 @@
+/**
+ * Final module-loader persistence phase.
+ *
+ * @module rendering/orchestrator/module-loader/module-persistence
+ */
+import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
+export interface PersistTransformedModuleInput {
+    filePath: string;
+    projectDir: string;
+    tmpDir: string;
+    transformedCode: string;
+    localAdapter: RuntimeAdapter;
+    moduleCache: Map<string, string>;
+    cacheKey: string;
+    contentSourceId?: string;
+    reactVersion?: string;
+}
+/** Write a transformed module artifact and register cache pointers. */
+export declare function persistTransformedModule(input: PersistTransformedModuleInput): Promise<string>;
+//# sourceMappingURL=module-persistence.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"module-persistence.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/module-persistence.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AA6CzE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,cAAc,CAAC;IAC7B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,uEAAuE;AACvE,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC,MAAM,CAAC,CA2CjB"}