veryfront 0.1.82 → 0.1.84

package/esm/src/transforms/import-rewriter/strategies/bare-strategy.js

@@ -6,14 +6,12 @@
  */
 import { rendererLogger } from "../../../utils/index.js";
 import { buildEsmShUrl, TAILWIND_VERSION } from "../url-builder.js";
+import { parseBarePackageSpecifier } from "../../shared/package-specifier.js";
 const logger = rendererLogger.component("esm");
 const unversionedImportsWarned = new Set();
 function hasVersionSpecifier(specifier) {
     return /@[\d^~x][\d.x^~-]*(?=\/|$)/.test(specifier);
 }
-function normalizeVersionedSpecifier(specifier) {
-    return specifier.replace(/@[\d^~x][\d.x^~-]*(?=\/|$)/, "");
-}
 function warnUnversionedImport(specifier, projectId) {
     const key = `${projectId}:${specifier}`;
     if (unversionedImportsWarned.has(key))
@@ -53,15 +51,20 @@ export class BareStrategy {
     rewrite(info, ctx) {
         if (ctx.target === "ssr")
             return { specifier: null };
-        const normalized = normalizeVersionedSpecifier(info.specifier);
-        let finalSpecifier = normalized;
-        if (normalized === "tailwindcss" || normalized.startsWith("tailwindcss/")) {
-            finalSpecifier = normalized.replace(/^tailwindcss/, `tailwindcss@${TAILWIND_VERSION}`);
+        const parsed = parseBarePackageSpecifier(info.specifier);
+        if (parsed == null) {
+            return { specifier: null };
+        }
+        const packageName = parsed.packageName;
+        let version = parsed.version ?? undefined;
+        const subpath = parsed.subpath ?? undefined;
+        if (packageName === "tailwindcss") {
+            version = TAILWIND_VERSION;
         }
         else if (!hasVersionSpecifier(info.specifier)) {
             warnUnversionedImport(info.specifier, ctx.projectId);
         }
-        const url = buildEsmShUrl(finalSpecifier, undefined, undefined, {
+        const url = buildEsmShUrl(packageName, version, subpath, {
             external: ["react"],
         });
         return { specifier: url };

package/esm/src/transforms/shared/package-specifier.d.ts

@@ -0,0 +1,7 @@
+export interface ParsedBarePackageSpecifier {
+    packageName: string;
+    version: string | null;
+    subpath: string | null;
+}
+export declare function parseBarePackageSpecifier(specifier: string): ParsedBarePackageSpecifier | null;
+//# sourceMappingURL=package-specifier.d.ts.map

package/esm/src/transforms/shared/package-specifier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-specifier.d.ts","sourceRoot":"","sources":["../../../../src/src/transforms/shared/package-specifier.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,GAChB,0BAA0B,GAAG,IAAI,CAoBnC"}

package/esm/src/transforms/shared/package-specifier.js

@@ -0,0 +1,19 @@
+export function parseBarePackageSpecifier(specifier) {
+    const scopedMatch = specifier.match(/^(@[^/]+\/[^/@]+)(?:@([^/]+))?(\/.*)?$/);
+    if (scopedMatch?.[1]) {
+        return {
+            packageName: scopedMatch[1],
+            version: scopedMatch[2] ?? null,
+            subpath: scopedMatch[3] ?? null,
+        };
+    }
+    const unscopedMatch = specifier.match(/^([^/@][^/@]*?)(?:@([^/]+))?(\/.*)?$/);
+    if (unscopedMatch?.[1]) {
+        return {
+            packageName: unscopedMatch[1],
+            version: unscopedMatch[2] ?? null,
+            subpath: unscopedMatch[3] ?? null,
+        };
+    }
+    return null;
+}

package/esm/src/types/entities/getEntityInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getEntityInfo.d.ts","sourceRoot":"","sources":["../../../../src/src/types/entities/getEntityInfo.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAU,UAAU,EAAe,MAAM,gBAAgB,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAWtE,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CA6I5B;AAED,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CA+L5B;AAED,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAyE5B"}
+{"version":3,"file":"getEntityInfo.d.ts","sourceRoot":"","sources":["../../../../src/src/types/entities/getEntityInfo.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAU,UAAU,EAAe,MAAM,gBAAgB,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAWtE,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAmJ5B;AAED,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAwM5B;AAED,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAyE5B"}

package/esm/src/types/entities/getEntityInfo.js

@@ -29,37 +29,42 @@ export async function getEntityInfo(filePath, adapter) {
             }
         }
         try {
+            const shouldReadDirectly = adapter
+                ? isExtendedFSAdapter(adapter.fs) && adapter.fs.isVeryfrontAdapter()
+                : false;
+            let content;
             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 (!stat.isFile)
+                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;
+                    }
                 }
-                catch (error) {
-                    entityInfoScope.runSync(() => {
-                        throw error;
-                    }, { path: filePath, details: { reason: "stat-failed" } }, undefined);
-                    return null;
-                }
+                content = await withFallback(() => adapter.fs.readFile(normalizedPath), () => fs.readTextFile(filePath), { operationName: "readFile:getEntityInfo", logError: false });
             }
             else {
                 const exists = await fs.exists(filePath);
                 if (!exists)
                     return null;
+                content = await fs.readTextFile(filePath);
             }
-            const content = adapter
-                ? await withFallback(() => adapter.fs.readFile(normalizedPath), () => fs.readTextFile(filePath), { operationName: "readFile:getEntityInfo", logError: false })
-                : await fs.readTextFile(filePath);
             const ext = pathHelper.extname(filePath).toLowerCase();
             let frontmatter = {};
             let body = content;
@@ -120,23 +125,27 @@ export async function getEntityInfo(filePath, adapter) {
 }
 export async function getEntityBySlug(projectDir, slug, adapter) {
     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 === "") {
+                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,
             });
             const pathResults = await parallelMap(basePaths, async (basePath) => {
@@ -153,12 +162,13 @@ export async function getEntityBySlug(projectDir, slug, adapter) {
                 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
@@ -194,25 +204,25 @@ export async function getEntityBySlug(projectDir, slug, adapter) {
                     /* expected: directory may not exist or readDir may fail */
                 }
             }
-            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`));
+            possiblePaths.unshift(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"), pathHelper.join(projectDir, "pages", "index.tsx"), pathHelper.join(projectDir, "pages", "index.ts"));
         }
         const pathResults = await parallelMap(possiblePaths, async (p) => {
@@ -222,7 +232,7 @@ export async function getEntityBySlug(projectDir, slug, adapter) {
             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
@@ -267,7 +277,11 @@ export async function getEntityBySlug(projectDir, slug, adapter) {
             }
         }
         return null;
-    }, { "entity.slug": slug, "entity.projectDir": projectDir });
+    }, {
+        "entity.slug": slug,
+        "entity.normalized_slug": normalizeSlug(slug),
+        "entity.projectDir": projectDir,
+    });
 }
 export async function getLayoutEntity(projectDir, layoutName, adapter) {
     return await withSpan("types.getLayoutEntity", async () => {
@@ -345,3 +359,6 @@ function getSlugFromPath(filePath) {
     const parentDir = parts[parts.length - 2];
     return parentDir === "pages" ? "" : parentDir ?? "";
 }
+function normalizeSlug(slug) {
+    return slug === "/" ? "" : slug.replace(/^\/+/, "").replace(/\/+$/, "");
+}

package/package.json

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