veryfront 0.1.81 → 0.1.83

package/src/src/transforms/mdx/esm-module-loader/module-fetcher/distributed-cache.ts

@@ -9,14 +9,11 @@
 
 import type { Logger } from "../../../../utils/logger/logger.js";
 import { detokenizeAllCachePaths, tokenizeAllVeryFrontPaths } from "../../../../cache/index.js";
-import { cacheHttpImportsToLocal, ensureHttpBundlesExist } from "../../../esm/http-cache.js";
+import { cacheHttpImportsToLocal } from "../../../esm/http-cache.js";
 import { loadImportMap } from "../../../../modules/import-map/index.js";
 import { extractHttpBundlePaths } from "../../../../modules/react-loader/ssr-module-loader/http-bundle-helpers.js";
-import {
-  createBundleManifest,
-  storeBundleManifest,
-  validateBundleGroup,
-} from "../../../esm/bundle-manifest.js";
+import { createBundleManifest, storeBundleManifest } from "../../../esm/bundle-manifest.js";
+import { validateCachedBundlesByManifestOrCode } from "../../../esm/cached-bundle-validation.js";
 import { getHttpBundleCacheDir } from "../../../../utils/cache-dir.js";
 import { FRAMEWORK_ROOT, LOG_PREFIX_MDX_LOADER } from "../constants.js";
 import { getDistributedTransformBackend } from "../../../esm/transform-cache.js";
@@ -86,31 +83,23 @@ export async function readDistributedCache(
     const bundleManifestKey = `${transformCacheKey}:bm`;
     const manifestId = await distributedCache.get(bundleManifestKey).catch(() => null);
 
-    if (manifestId) {
+    if (moduleCode) {
       const cacheDir = getHttpBundleCacheDir();
-      const validation = await validateBundleGroup(manifestId, cacheDir);
+      const validation = await validateCachedBundlesByManifestOrCode(
+        moduleCode,
+        manifestId ?? undefined,
+        cacheDir,
+      );
       if (!validation.valid) {
-        log.warn(`${LOG_PREFIX_MDX_LOADER} Bundle manifest validation failed`, {
+        log.warn(`${LOG_PREFIX_MDX_LOADER} Cached HTTP bundle validation failed`, {
           normalizedPath,
-          manifestId: manifestId.slice(0, 12),
+          manifestId: manifestId?.slice(0, 12),
           failedHashes: validation.failedHashes,
+          reason: validation.reason,
+          source: validation.source,
         });
         moduleCode = null;
       }
-    } else {
-      // Use detokenized code for bundle path extraction
-      const bundlePaths = extractHttpBundlePaths(moduleCode);
-      if (bundlePaths.length > 0) {
-        const cacheDir = getHttpBundleCacheDir();
-        const failed = await ensureHttpBundlesExist(bundlePaths, cacheDir);
-        if (failed.length > 0) {
-          log.warn(`${LOG_PREFIX_MDX_LOADER} Some HTTP bundles could not be recovered`, {
-            normalizedPath,
-            failed,
-          });
-          moduleCode = null;
-        }
-      }
     }
 
     // Use detokenized code for framework path checks

package/src/src/transforms/pipeline/index.ts

@@ -31,10 +31,8 @@ import {
   ssrVfModulesPlugin,
 } from "./stages/index.js";
 import { createFileSystem, exists } from "../../platform/compat/fs.js";
-import { ensureHttpBundlesExist } from "../esm/http-cache.js";
-import { extractHttpBundlePaths } from "../../modules/react-loader/ssr-module-loader/http-bundle-helpers.js";
 import { getHttpBundleCacheDir } from "../../utils/cache-dir.js";
-import { validateBundleGroup } from "../esm/bundle-manifest.js";
+import { validateCachedBundlesByManifestOrCode } from "../esm/cached-bundle-validation.js";
 import { extractFrameworkBundlePaths } from "../shared/framework-bundle-paths.js";
 
 const SSR_PIPELINE: TransformPlugin[] = [
@@ -130,31 +128,15 @@ async function validateCachedBundles(
   cacheKey: string,
 ): Promise<boolean> {
   const cacheDir = getHttpBundleCacheDir();
+  const validation = await validateCachedBundlesByManifestOrCode(code, bundleManifestId, cacheDir);
+  if (validation.valid) return true;
 
-  // If we have a manifest ID, use the faster manifest-based validation
-  if (bundleManifestId) {
-    const validation = await validateBundleGroup(bundleManifestId, cacheDir);
-    if (validation.valid) return true;
-
-    logger.debug("Bundle manifest validation failed", {
-      cacheKey: cacheKey.slice(-40),
-      manifestId: bundleManifestId.slice(0, 12),
-      failedCount: validation.failedHashes.length,
-    });
-    return false;
-  }
-
-  // Fall back to extracting bundle paths from code and validating each
-  const bundlePaths = extractHttpBundlePaths(code);
-  if (bundlePaths.length === 0) return true;
-
-  const failed = await ensureHttpBundlesExist(bundlePaths, cacheDir);
-  if (failed.length === 0) return true;
-
-  logger.debug("HTTP bundle validation failed", {
+  logger.debug("Cached HTTP bundle validation failed", {
     cacheKey: cacheKey.slice(-40),
-    failedCount: failed.length,
-    totalBundles: bundlePaths.length,
+    manifestId: bundleManifestId?.slice(0, 12),
+    failedCount: validation.failedHashes.length,
+    reason: validation.reason,
+    source: validation.source,
   });
   return false;
 }

package/src/src/types/entities/getEntityInfo.ts

@@ -43,49 +43,55 @@ export async function getEntityInfo(
       }
 
       try {
+        const shouldReadDirectly = adapter
+          ? isExtendedFSAdapter(adapter.fs) && adapter.fs.isVeryfrontAdapter()
+          : false;
+
+        let content: string;
         if (adapter) {
-          try {
-            const stat = await withFallback(
-              () => adapter.fs.stat(normalizedPath),
-              async () => {
-                const exists = await fs.exists(filePath);
-                if (!exists) {
-                  throw toError(
-                    createError({
-                      type: "file",
-                      message: "File not found",
-                      context: { path: filePath, operation: "read" },
-                    }),
-                  );
-                }
-                return await fs.stat(filePath);
-              },
-              { operationName: "stat:getEntityInfo", logError: false },
-            );
+          if (!shouldReadDirectly) {
+            try {
+              const stat = await withFallback(
+                () => adapter.fs.stat(normalizedPath),
+                async () => {
+                  const exists = await fs.exists(filePath);
+                  if (!exists) {
+                    throw toError(
+                      createError({
+                        type: "file",
+                        message: "File not found",
+                        context: { path: filePath, operation: "read" },
+                      }),
+                    );
+                  }
+                  return await fs.stat(filePath);
+                },
+                { operationName: "stat:getEntityInfo", logError: false },
+              );
 
-            if (!stat.isFile) return null;
-          } catch (error) {
-            entityInfoScope.runSync(
-              () => {
-                throw error;
-              },
-              { path: filePath, details: { reason: "stat-failed" } },
-              undefined,
-            );
-            return null;
+              if (!stat.isFile) return null;
+            } catch (error) {
+              entityInfoScope.runSync(
+                () => {
+                  throw error;
+                },
+                { path: filePath, details: { reason: "stat-failed" } },
+                undefined,
+              );
+              return null;
+            }
           }
-        } else {
-          const exists = await fs.exists(filePath);
-          if (!exists) return null;
-        }
 
-        const content = adapter
-          ? await withFallback(
+          content = await withFallback(
             () => adapter.fs.readFile(normalizedPath),
             () => fs.readTextFile(filePath),
             { operationName: "readFile:getEntityInfo", logError: false },
-          )
-          : await fs.readTextFile(filePath);
+          );
+        } else {
+          const exists = await fs.exists(filePath);
+          if (!exists) return null;
+          content = await fs.readTextFile(filePath);
+        }
 
         const ext = pathHelper.extname(filePath).toLowerCase();
 
@@ -171,26 +177,30 @@ export async function getEntityBySlug(
   return await withSpan(
     "types.getEntityBySlug",
     async () => {
-      const isVeryfrontRoute = slug.startsWith(".veryfront/") || slug === ".veryfront";
+      const normalizedSlug = normalizeSlug(slug);
+      const isVeryfrontRoute = normalizedSlug.startsWith(".veryfront/") ||
+        normalizedSlug === ".veryfront";
       const resolveFile = adapter?.fs.resolveFile;
 
       logger.debug("START", {
         slug,
+        normalizedSlug,
         projectDir,
         isVeryfrontRoute,
         hasResolveFile: !!resolveFile,
       });
 
       if (resolveFile) {
-        const basePaths = [pathHelper.join(projectDir, "pages", slug)];
+        const basePaths = [pathHelper.join(projectDir, "pages", normalizedSlug)];
 
-        if (isVeryfrontRoute) basePaths.unshift(pathHelper.join(projectDir, slug));
-        if (slug === "index" || slug === "") {
+        if (isVeryfrontRoute) basePaths.unshift(pathHelper.join(projectDir, normalizedSlug));
+        if (normalizedSlug === "index" || normalizedSlug === "") {
           basePaths.unshift(pathHelper.join(projectDir, "pages", "index"));
         }
 
         logger.debug("Checking paths (resolveFile branch)", {
           slug,
+          normalizedSlug,
           basePaths,
         });
 
@@ -208,13 +218,14 @@ export async function getEntityBySlug(
           if (info?.entity.isPage) {
             logger.debug("Found page via resolveFile", {
               slug,
+              normalizedSlug,
               path: info.entity.path,
             });
             return info;
           }
         }
 
-        const slugParts = slug.split("/");
+        const slugParts = normalizedSlug === "" ? [] : normalizedSlug.split("/");
         for (let depth = slugParts.length - 1; depth >= 0; depth--) {
           const parentPath = slugParts.slice(0, depth).join("/");
           const pagesDir = parentPath
@@ -259,33 +270,33 @@ export async function getEntityBySlug(
           }
         }
 
-        logger.debug("No page found via resolveFile branch", { slug });
+        logger.debug("No page found via resolveFile branch", { slug, normalizedSlug });
         return null;
       }
 
       const possiblePaths = [
-        pathHelper.join(projectDir, "pages", `${slug}.mdx`),
-        pathHelper.join(projectDir, "pages", `${slug}.md`),
-        pathHelper.join(projectDir, "pages", `${slug}.tsx`),
-        pathHelper.join(projectDir, "pages", `${slug}.jsx`),
-        pathHelper.join(projectDir, "pages", `${slug}.ts`),
-        pathHelper.join(projectDir, "pages", `${slug}/index.mdx`),
-        pathHelper.join(projectDir, "pages", `${slug}/index.md`),
-        pathHelper.join(projectDir, "pages", `${slug}/index.tsx`),
-        pathHelper.join(projectDir, "pages", `${slug}/index.jsx`),
-        pathHelper.join(projectDir, "pages", `${slug}/index.ts`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}.mdx`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}.md`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}.tsx`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}.jsx`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}.ts`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}/index.mdx`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}/index.md`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}/index.tsx`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}/index.jsx`),
+        pathHelper.join(projectDir, "pages", `${normalizedSlug}/index.ts`),
       ];
 
       if (isVeryfrontRoute) {
         possiblePaths.unshift(
-          pathHelper.join(projectDir, `${slug}.mdx`),
-          pathHelper.join(projectDir, `${slug}.md`),
-          pathHelper.join(projectDir, `${slug}.tsx`),
-          pathHelper.join(projectDir, `${slug}.ts`),
+          pathHelper.join(projectDir, `${normalizedSlug}.mdx`),
+          pathHelper.join(projectDir, `${normalizedSlug}.md`),
+          pathHelper.join(projectDir, `${normalizedSlug}.tsx`),
+          pathHelper.join(projectDir, `${normalizedSlug}.ts`),
         );
       }
 
-      if (slug === "index" || slug === "") {
+      if (normalizedSlug === "index" || normalizedSlug === "") {
         possiblePaths.unshift(
           pathHelper.join(projectDir, "pages", "index.mdx"),
           pathHelper.join(projectDir, "pages", "index.md"),
@@ -302,7 +313,7 @@ export async function getEntityBySlug(
         if (info?.entity.isPage) return info;
       }
 
-      const slugParts = slug.split("/");
+      const slugParts = normalizedSlug === "" ? [] : normalizedSlug.split("/");
       for (let depth = slugParts.length - 1; depth >= 0; depth--) {
         const parentPath = slugParts.slice(0, depth).join("/");
         const pagesDir = parentPath
@@ -356,7 +367,11 @@ export async function getEntityBySlug(
 
       return null;
     },
-    { "entity.slug": slug, "entity.projectDir": projectDir },
+    {
+      "entity.slug": slug,
+      "entity.normalized_slug": normalizeSlug(slug),
+      "entity.projectDir": projectDir,
+    },
   );
 }
 
@@ -448,3 +463,7 @@ function getSlugFromPath(filePath: string): string {
   const parentDir = parts[parts.length - 2];
   return parentDir === "pages" ? "" : parentDir ?? "";
 }
+
+function normalizeSlug(slug: string): string {
+  return slug === "/" ? "" : slug.replace(/^\/+/, "").replace(/\/+$/, "");
+}