veryfront 0.1.927 → 0.1.928

package/esm/cli/commands/routes/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/routes/command.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GAC/B,OAAO,CAAC,IAAI,CAAC,CA8Cf"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/routes/command.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GAC/B,OAAO,CAAC,IAAI,CAAC,CA4Df"}

package/esm/cli/commands/routes/command.js

@@ -1,38 +1,51 @@
-import { join } from "../../../deps/jsr.io/@std/path/1.1.4/mod.js";
+import { join, relative } from "../../../deps/jsr.io/@std/path/1.1.4/mod.js";
 import { runtime } from "../../../src/platform/index.js";
-import { APIRouteHandler } from "../../../src/routing/index.js";
 import { getConfig } from "../../../src/config/index.js";
 import { cliLogger } from "../../utils/index.js";
-import { createFileSystem } from "../../../src/platform/index.js";
+import { ApiRouteMatcher } from "../../../src/routing/api/api-route-matcher.js";
+import { discoverAppRoutes, discoverPagesRoutes } from "../../../src/routing/api/route-discovery.js";
+import { RouteDiscovery } from "../../../src/server/dev-server/route-discovery.js";
 export async function routesCommand(projectDir, options = {}) {
-    const fs = createFileSystem();
     const adapter = await runtime.get();
-    await getConfig(projectDir, adapter);
-    const apiHandler = new APIRouteHandler(projectDir, adapter);
-    await apiHandler.initialize();
-    const pages = [];
-    const pagesDir = join(projectDir, "pages");
+    const config = await getConfig(projectDir, adapter);
+    const pageRouter = new ApiRouteMatcher();
+    let pageRoutes = [];
     try {
-        const entries = fs.readDir(pagesDir);
-        for await (const entry of entries) {
-            if (!entry.isFile)
-                continue;
-            if (!entry.name.endsWith(".mdx") && !entry.name.endsWith(".tsx"))
-                continue;
-            const slug = entry.name.replace(/\.(mdx|tsx)$/i, "");
-            const path = slug === "index" ? "/" : `/${slug}`;
-            pages.push({ pattern: path, file: `pages/${entry.name}` });
-        }
+        await new RouteDiscovery(projectDir, adapter, pageRouter, config).discoverRoutes();
+        pageRoutes = pageRouter.listRoutes();
     }
-    catch (error) {
-        // Pages directory might not exist, which is okay for app router projects
-        cliLogger.debug("Could not read pages directory:", error);
+    finally {
+        pageRouter.destroy();
     }
-    const apis = [];
-    const apiDir = join(projectDir, "pages", "api");
-    if (await fs.exists(apiDir)) {
-        await collectApiPatterns(fs, apiDir, "/api", apis);
+    const pages = pageRoutes
+        .map((route) => ({
+        pattern: route.pattern,
+        file: toProjectRelativePath(projectDir, route.page),
+    }))
+        .sort((a, b) => a.pattern.localeCompare(b.pattern));
+    const apiRouter = new ApiRouteMatcher();
+    let apiRoutes = [];
+    try {
+        const pagesDir = config.directories?.pages ?? "pages";
+        const apiDir = join(projectDir, pagesDir, "api");
+        if (await adapter.fs.exists(apiDir)) {
+            await discoverPagesRoutes(apiRouter, apiDir, "/api", adapter);
+        }
+        const appDir = join(projectDir, config.directories?.app ?? "app");
+        if (await adapter.fs.exists(appDir)) {
+            await discoverAppRoutes(apiRouter, appDir, "", adapter);
+        }
+        apiRoutes = apiRouter.listRoutes();
     }
+    finally {
+        apiRouter.destroy();
+    }
+    const apis = apiRoutes
+        .map((route) => ({
+        pattern: route.pattern,
+        file: toProjectRelativePath(projectDir, route.page),
+    }))
+        .sort((a, b) => a.pattern.localeCompare(b.pattern));
     if (options.json) {
         console.log(JSON.stringify({ pages, apis }, null, 2));
         return;
@@ -43,22 +56,9 @@ export async function routesCommand(projectDir, options = {}) {
     }
     cliLogger.info("\nAPI:");
     for (const a of apis) {
-        cliLogger.info(`  ${a}`);
+        cliLogger.info(`  ${a.pattern} -> ${a.file}`);
     }
 }
-async function collectApiPatterns(fs, dir, prefix, out) {
-    const entries = fs.readDir(dir);
-    for await (const entry of entries) {
-        const fullPath = join(dir, entry.name);
-        if (entry.isDirectory) {
-            await collectApiPatterns(fs, fullPath, `${prefix}/${entry.name}`, out);
-            continue;
-        }
-        if (!entry.isFile || !/\.(ts|js|tsx|jsx)$/i.test(entry.name))
-            continue;
-        const nameWithoutExt = entry.name.replace(/\.(ts|js|tsx|jsx)$/i, "");
-        const routePath = `${prefix}/${nameWithoutExt}`;
-        const pattern = routePath.replace(/\/index$/, "");
-        out.push(pattern);
-    }
+function toProjectRelativePath(projectDir, path) {
+    return path.startsWith(projectDir) ? relative(projectDir, path) : path;
 }

package/esm/deno.js

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

package/esm/src/build/production-build/build/output-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/build/production-build/build/output-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAe1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACpD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAwBf;AAED;;GAEG;AACH,wBAAsB,gCAAgC,CACpD,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAEhD;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBvF"}
+{"version":3,"file":"output-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/build/production-build/build/output-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAe1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACpD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAgCf;AAWD;;GAEG;AACH,wBAAsB,gCAAgC,CACpD,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAEhD;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBvF"}

package/esm/src/build/production-build/build/output-generator.js

@@ -9,7 +9,7 @@
  * - Static asset copying
  */
 import { serverLogger as logger } from "../../../utils/index.js";
-import { join } from "../../../platform/compat/path/index.js";
+import { dirname, join } from "../../../platform/compat/path/index.js";
 import { generateServiceWorker } from "../../../server/build-service-worker.js";
 import { generateProdHydrationModule, getProdHydrationModulePath, } from "../../../html/hydration-script-builder/prod-scripts.js";
 import { copyStaticAssets } from "../asset-generation.js";
@@ -23,13 +23,17 @@ export async function generateClientScripts(adapter, outputDir, dryRun) {
     logger.info("Copying client scripts...");
     if (dryRun)
         return;
-    await adapter.fs.writeFile(join(outputDir, "_veryfront/app.js"), generateAppModule());
-    await adapter.fs.writeFile(join(outputDir, "_veryfront/client.js"), await generateClientModule());
-    await adapter.fs.writeFile(join(outputDir, "_veryfront/router.js"), await generateRouterScript(adapter));
-    await adapter.fs.writeFile(join(outputDir, "_veryfront/prefetch.js"), await generatePrefetchScript(adapter));
+    await writeOutputFile(adapter, join(outputDir, "_veryfront/app.js"), generateAppModule());
+    await writeOutputFile(adapter, join(outputDir, "_veryfront/client.js"), await generateClientModule());
+    await writeOutputFile(adapter, join(outputDir, "_veryfront/router.js"), await generateRouterScript(adapter));
+    await writeOutputFile(adapter, join(outputDir, "_veryfront/prefetch.js"), await generatePrefetchScript(adapter));
     const hydrationRuntime = generateProdHydrationModule();
-    await adapter.fs.writeFile(join(outputDir, "_veryfront/hydration-runtime.js"), hydrationRuntime);
-    await adapter.fs.writeFile(join(outputDir, getProdHydrationModulePath().slice(1)), hydrationRuntime);
+    await writeOutputFile(adapter, join(outputDir, "_veryfront/hydration-runtime.js"), hydrationRuntime);
+    await writeOutputFile(adapter, join(outputDir, getProdHydrationModulePath().slice(1)), hydrationRuntime);
+}
+async function writeOutputFile(adapter, path, content) {
+    await adapter.fs.mkdir(dirname(path), { recursive: true });
+    await adapter.fs.writeFile(path, content);
 }
 /**
  * Generate manifest and service worker

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

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

package/package.json

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