stx-router 0.2.97 → 0.2.98

package/dist/client.js

@@ -1,6 +1,4 @@
-// @bun
-// src/client.ts
-function getRouterScript() {
+export function getRouterScript() {
   return `
 ;(function(){
   'use strict';
@@ -876,8 +874,3 @@ else {
 })();
 `;
 }
-export {
-  getRouterScript
-};
-
-//# debugId=557E80E21BC18D0D64756E2164756E21

package/dist/codegen.js

@@ -1,8 +1,6 @@
-// @bun
-// src/codegen.ts
-import fs from "fs";
-import path from "path";
-function generateRouteTypes(routes, outputDir) {
+import fs from "node:fs";
+import path from "node:path";
+export function generateRouteTypes(routes, outputDir) {
   const lines = [
     "// Auto-generated by STX - do not edit",
     'declare module "stx/routes" {',
@@ -18,36 +16,24 @@ function generateRouteTypes(routes, outputDir) {
     lines.push(`    '${route.pattern}': { ${paramsStr} }`);
   }
   lines.push("  }", "}", "");
-  fs.mkdirSync(outputDir, { recursive: true });
+  fs.mkdirSync(outputDir, { recursive: !0 });
   fs.writeFileSync(path.join(outputDir, "route-types.d.ts"), lines.join(`
 `));
 }
-function generateRouteManifest(routes, outputDir, pagesDir) {
-  const cwd = process.cwd();
-  const relativePages = path.relative(cwd, pagesDir);
-  const excludeDirs = ["components", "layouts", "partials"];
-  const pageRoutes = routes.filter((r) => !excludeDirs.some((dir) => r.pattern.startsWith(`/${dir}/`) || r.pattern === `/${dir}`));
-  const lines = [
+export function generateRouteManifest(routes, outputDir, pagesDir) {
+  const cwd = process.cwd(), relativePages = path.relative(cwd, pagesDir), excludeDirs = ["components", "layouts", "partials"], pageRoutes = routes.filter((r) => !excludeDirs.some((dir) => r.pattern.startsWith(`/${dir}/`) || r.pattern === `/${dir}`)), lines = [
     "// Auto-generated by stx \u2014 do not edit",
     `// Source: ${relativePages || "pages"}/`,
     "",
     "export const routes = ["
   ];
   for (const route of pageRoutes) {
-    const relFile = path.relative(cwd, route.filePath).replace(/\\/g, "/");
-    const params = JSON.stringify(route.params);
-    const layoutStr = route.layout ? `, layout: '${path.relative(cwd, route.layout).replace(/\\/g, "/")}'` : "";
+    const relFile = path.relative(cwd, route.filePath).replace(/\\/g, "/"), params = JSON.stringify(route.params), layoutStr = route.layout ? `, layout: '${path.relative(cwd, route.layout).replace(/\\/g, "/")}'` : "";
     lines.push(`  { pattern: '${route.pattern}', filePath: '${relFile}', isDynamic: ${route.isDynamic}, params: ${params}${layoutStr} },`);
   }
   lines.push("] as const", "");
   lines.push("export type RouteName = typeof routes[number]['pattern']", "");
-  fs.mkdirSync(outputDir, { recursive: true });
+  fs.mkdirSync(outputDir, { recursive: !0 });
   fs.writeFileSync(path.join(outputDir, "routes.ts"), lines.join(`
 `));
 }
-export {
-  generateRouteTypes,
-  generateRouteManifest
-};
-
-//# debugId=C5615717ED79810164756E2164756E21

package/dist/file-router.js

@@ -1,144 +1,26 @@
-// @bun
-// src/codegen.ts
-import fs from "fs";
-import path from "path";
-function generateRouteTypes(routes, outputDir) {
-  const lines = [
-    "// Auto-generated by STX - do not edit",
-    'declare module "stx/routes" {',
-    "  interface RouteMap {"
-  ];
-  for (const route of routes) {
-    const paramEntries = [];
-    for (const p of route.params) {
-      const type = route.pattern.includes(`:${p}*`) ? "string[]" : "string";
-      paramEntries.push(`${p}: ${type}`);
-    }
-    const paramsStr = paramEntries.join("; ");
-    lines.push(`    '${route.pattern}': { ${paramsStr} }`);
-  }
-  lines.push("  }", "}", "");
-  fs.mkdirSync(outputDir, { recursive: true });
-  fs.writeFileSync(path.join(outputDir, "route-types.d.ts"), lines.join(`
-`));
-}
-function generateRouteManifest(routes, outputDir, pagesDir) {
-  const cwd = process.cwd();
-  const relativePages = path.relative(cwd, pagesDir);
-  const excludeDirs = ["components", "layouts", "partials"];
-  const pageRoutes = routes.filter((r) => !excludeDirs.some((dir) => r.pattern.startsWith(`/${dir}/`) || r.pattern === `/${dir}`));
-  const lines = [
-    "// Auto-generated by stx \u2014 do not edit",
-    `// Source: ${relativePages || "pages"}/`,
-    "",
-    "export const routes = ["
-  ];
-  for (const route of pageRoutes) {
-    const relFile = path.relative(cwd, route.filePath).replace(/\\/g, "/");
-    const params = JSON.stringify(route.params);
-    const layoutStr = route.layout ? `, layout: '${path.relative(cwd, route.layout).replace(/\\/g, "/")}'` : "";
-    lines.push(`  { pattern: '${route.pattern}', filePath: '${relFile}', isDynamic: ${route.isDynamic}, params: ${params}${layoutStr} },`);
-  }
-  lines.push("] as const", "");
-  lines.push("export type RouteName = typeof routes[number]['pattern']", "");
-  fs.mkdirSync(outputDir, { recursive: true });
-  fs.writeFileSync(path.join(outputDir, "routes.ts"), lines.join(`
-`));
-}
-
-// src/matcher.ts
-import path2 from "path";
-function filePathToPattern(filePath, pagesDir) {
-  const relativePath = path2.relative(pagesDir, filePath);
-  let route = relativePath.replace(/\.(stx|md)$/, "");
-  route = route.split(path2.sep).join("/");
-  if (route === "index") {
-    return "/";
-  }
-  if (route.endsWith("/index")) {
-    route = route.slice(0, -6);
-  }
-  route = route.replace(/\[\[([^\]]+)\]\]/g, ":$1?");
-  route = route.replace(/\[([^\]]+)\]/g, ":$1");
-  route = route.replace(/:\.\.\.([^/]+)/g, ":$1*");
-  return `/${route}`;
-}
-function patternToRegex(pattern) {
-  const params = [];
-  let regexStr = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&");
-  regexStr = regexStr.replace(/\/:([^/]+)\?/g, (_, name) => {
-    params.push(name);
-    return "(?:/([^/]+))?";
-  });
-  regexStr = regexStr.replace(/:([^/]+)\*/g, (_, name) => {
-    params.push(name);
-    return "(.+)";
-  });
-  regexStr = regexStr.replace(/:([^/]+)/g, (_, name) => {
-    params.push(name);
-    return "([^/]+)";
-  });
-  regexStr = `^${regexStr}$`;
-  return { regex: new RegExp(regexStr), params };
-}
-function matchRoute(pathname, routes) {
-  const normalizedPath = pathname === "" ? "/" : pathname;
-  for (const route of routes) {
-    const match = normalizedPath.match(route.regex);
-    if (match) {
-      const params = {};
-      route.params.forEach((name, index) => {
-        params[name] = match[index + 1];
-      });
-      return { route, params };
-    }
-  }
-  return null;
-}
-
-// src/nested-layouts.ts
-import fs2 from "fs";
-import path3 from "path";
-function resolveLayoutChain(routeFilePath, pagesDir) {
-  const layouts = [];
-  let dir = path3.dirname(routeFilePath);
-  while (dir.startsWith(pagesDir) || dir === pagesDir) {
-    const layoutFile = path3.join(dir, "_layout.stx");
-    if (fs2.existsSync(layoutFile)) {
-      layouts.unshift(layoutFile);
-    }
-    if (dir === pagesDir)
-      break;
-    dir = path3.dirname(dir);
-  }
-  return layouts;
-}
-
-// src/file-router.ts
-import fs3 from "fs";
-import path4 from "path";
+import fs from "node:fs";
+import path from "node:path";
+import { generateRouteManifest, generateRouteTypes } from "./codegen.js";
+import { filePathToPattern, patternToRegex } from "./matcher.js";
+import { resolveLayoutChain } from "./nested-layouts.js";
 function scanDirectory(dir, extensions) {
   const files = [];
-  if (!fs3.existsSync(dir)) {
+  if (!fs.existsSync(dir))
     return files;
-  }
-  const entries = fs3.readdirSync(dir, { withFileTypes: true });
+  const entries = fs.readdirSync(dir, { withFileTypes: !0 });
   for (const entry of entries) {
-    const fullPath = path4.join(dir, entry.name);
+    const fullPath = path.join(dir, entry.name);
     if (entry.isDirectory()) {
-      if (entry.name.startsWith(".")) {
+      if (entry.name.startsWith("."))
         continue;
-      }
       files.push(...scanDirectory(fullPath, extensions));
     } else if (entry.isFile()) {
-      const ext = path4.extname(entry.name);
+      const ext = path.extname(entry.name);
       if (extensions.includes(ext)) {
-        if (entry.name.startsWith("_") && entry.name !== "_layout.stx") {
+        if (entry.name.startsWith("_") && entry.name !== "_layout.stx")
           continue;
-        }
-        if (entry.name === "_layout.stx") {
+        if (entry.name === "_layout.stx")
           continue;
-        }
         files.push(fullPath);
       }
     }
@@ -146,7 +28,7 @@ function scanDirectory(dir, extensions) {
   return files;
 }
 
-class Router {
+export class Router {
   routes;
   pagesDir;
   pagesDirs;
@@ -154,10 +36,9 @@ class Router {
   constructor(baseDir, config = {}) {
     this.config = config;
     const rawDirs = config.pagesDirs && config.pagesDirs.length > 0 ? config.pagesDirs : [config.pagesDir || "pages"];
-    this.pagesDirs = rawDirs.map((d) => path4.resolve(baseDir, d));
+    this.pagesDirs = rawDirs.map((d) => path.resolve(baseDir, d));
     this.pagesDir = this.pagesDirs[0];
-    const extensions = config.extensions || [".stx"];
-    const seenPatterns = new Set;
+    const extensions = config.extensions || [".stx"], seenPatterns = new Set;
     this.routes = [];
     for (const dir of this.pagesDirs) {
       const files = scanDirectory(dir, extensions);
@@ -166,15 +47,14 @@ class Router {
         if (seenPatterns.has(pattern))
           continue;
         seenPatterns.add(pattern);
-        const { regex, params } = patternToRegex(pattern);
-        const layouts = config.layouts !== false ? resolveLayoutChain(filePath, dir) : [];
+        const { regex, params } = patternToRegex(pattern), layouts = config.layouts !== !1 ? resolveLayoutChain(filePath, dir) : [];
         this.routes.push({
           pattern,
           regex,
           params,
           filePath,
           isDynamic: params.length > 0,
-          layout: layouts.length > 0 ? layouts[layouts.length - 1] : undefined
+          layout: layouts.length > 0 ? layouts[layouts.length - 1] : void 0
         });
       }
     }
@@ -183,13 +63,12 @@ class Router {
         return -1;
       if (a.isDynamic && !b.isDynamic)
         return 1;
-      const aSegments = a.pattern.split("/").length;
-      const bSegments = b.pattern.split("/").length;
+      const aSegments = a.pattern.split("/").length, bSegments = b.pattern.split("/").length;
       if (aSegments !== bSegments)
         return bSegments - aSegments;
       return a.pattern.localeCompare(b.pattern);
     });
-    const stxDir = path4.join(baseDir, ".stx");
+    const stxDir = path.join(baseDir, ".stx");
     generateRouteTypes(this.routes, stxDir);
     generateRouteManifest(this.routes, stxDir, this.pagesDir);
   }
@@ -212,11 +91,9 @@ class Router {
     if (!route)
       return "#not-found";
     let resolved = route.pattern;
-    if (params) {
-      for (const [key, value] of Object.entries(params)) {
+    if (params)
+      for (const [key, value] of Object.entries(params))
         resolved = resolved.replace(`:${key}`, encodeURIComponent(value));
-      }
-    }
     return resolved;
   }
   addRoute(route) {
@@ -233,30 +110,21 @@ class Router {
     return route.layout ?? null;
   }
 }
-function createRouter(baseDir, config) {
+export function createRouter(baseDir, config) {
   return new Router(baseDir, config);
 }
-function findErrorPage(pagesDir, statusCode) {
+export function findErrorPage(pagesDir, statusCode) {
   const candidates = [`${statusCode}.stx`, "error.stx"];
   for (const candidate of candidates) {
-    const filePath = path4.join(pagesDir, candidate);
-    if (fs3.existsSync(filePath))
+    const filePath = path.join(pagesDir, candidate);
+    if (fs.existsSync(filePath))
       return filePath;
   }
   return null;
 }
-function formatRoutes(routes, baseDir) {
+export function formatRoutes(routes, baseDir) {
   return routes.map((route) => {
-    const relativePath = path4.relative(baseDir, route.filePath);
-    const dynamicLabel = route.isDynamic ? " (dynamic)" : "";
+    const relativePath = path.relative(baseDir, route.filePath), dynamicLabel = route.isDynamic ? " (dynamic)" : "";
     return `${route.pattern} \u2192 ${relativePath}${dynamicLabel}`;
   });
 }
-export {
-  formatRoutes,
-  findErrorPage,
-  createRouter,
-  Router
-};
-
-//# debugId=288E1FC95396709A64756E2164756E21