primate 0.14.2 → 0.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.14.2",
+  "version": "0.15.0",
   "description": "Expressive, minimal and extensible framework for JavaScript",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -13,7 +13,7 @@
     "lint": "npx eslint ."
   },
   "dependencies": {
-    "runtime-compat": "^0.14.1"
+    "runtime-compat": "^0.15.0"
   },
   "devDependencies": {
     "maximin": "^0.1.2"

package/src/commands/start.js

@@ -15,5 +15,5 @@ export default async env => {
   // bundle client-side code
   await bundle(env);
   // serve
-  serve({router: await route(env.paths.routes, env.handlers), ...env});
+  serve({router: await route(env), ...env});
 };

package/src/exports.js

@@ -1,4 +1,5 @@
 import {start} from "./commands/exports.js";
 import run from "./run.js";
 
+export * from "./handlers/exports.js";
 export default () => run(start);

package/src/handlers/exports.js

@@ -3,3 +3,4 @@ export {default as json} from "./json.js";
 export {default as stream} from "./stream.js";
 export {default as redirect} from "./redirect.js";
 export {default as html} from "./html.js";
+export {default as view} from "./view.js";

package/src/handlers/html.js

@@ -1,14 +1,5 @@
-const getContent = async (env, name) => {
-  try {
-    return await env.paths.components.join(`${name}.html`).file.read();
-  } catch (error) {
-    throw new Error(`cannot load component at ${name}.html`);
-  }
-};
-
-export default (content, {status = 200, partial = false, adhoc = false} = {}) =>
+export default (body, {status = 200, partial = false} = {}) =>
   async (env, headers) => {
-    const body = adhoc ? content : await getContent(env, content);
     return [
       partial ? body : await env.render({body}), {
         status,

package/src/handlers/view.js

@@ -0,0 +1,9 @@
+export default (name, props, options) =>
+  async (env, headers) => {
+    const ending = name.slice(name.lastIndexOf(".") + 1);
+    const handler = env.handlers[ending];
+    if (handler === undefined) {
+      return env.log.error(new Error(`no handler for ${ending} components`));
+    }
+    return handler(name, props, options)(env, headers);
+  };

package/src/route.js

@@ -1,5 +1,4 @@
 import {Path} from "runtime-compat/fs";
-import {is} from "runtime-compat/dyndef";
 import RouteError from "./errors/Route.js";
 
 // insensitive-case equal
@@ -11,30 +10,13 @@ const verbs = [
   // extended
   "delete", "connect", "options", "trace", "patch",
 ];
-export default async (definitions, handlers) => {
-  const aliases = [];
+export default async env => {
   const routes = [];
-  const expand = path => aliases.reduce((expanded, {key, value}) =>
-    expanded.replace(key, () => value), path);
-  const exists = (method, path) =>
-    routes.some(route => route.method === method && route.path === path);
-  const add = (method, path, handler) => {
-    is(path).string();
-    is(handler).function();
-    if (exists(method, path)) {
-      throw new RouteError(`a ${method} route for ${path} already exists`);
-    }
-    routes.push({method, path: new RegExp(`^${expand(path)}$`, "u"), handler});
-  };
   const find = (method, path, fallback = {handler: r => r}) =>
     routes.find(route =>
       ieq(route.method, method) && route.path.test(path)) ?? fallback;
 
   const router = {
-    ...Object.fromEntries(verbs.map(verb =>
-      [verb, (path, callback) => add(verb, path, callback)])),
-    map: (path, callback) => add("map", path, callback),
-    alias: (key, value) => aliases.push({key, value}),
     route: async ({request}) => {
       const {method} = request.original;
       const url = new URL(`https://primatejs.com${request.pathname}`);
@@ -50,10 +32,32 @@ export default async (definitions, handlers) => {
         .handler({...request, pathname, params, path, named}));
     },
   };
-  if (await definitions.exists) {
-    const files = (await Path.list(definitions)).map(route => import(route));
-    await Promise.all(files.map(async route =>
-      (await route).default(router, handlers)));
+  const toRoute = file => {
+    const ending = -3;
+    const route = file
+      // remove ending
+      .slice(0, ending)
+      // transform /index -> ""
+      .replace("/index", "")
+      // transform index -> ""
+      .replace("index", "")
+      // prepare for regex
+      .replaceAll(/\{(?<named>.*)\}/gu, (_, name) => `(?<${name}>.*?)`)
+    ;
+    return new RegExp(`^/${route}$`, "u");
+  };
+  for (const route of await Path.collect(env.paths.routes, /^.*.js$/u)) {
+    const imported = (await import(route)).default;
+    const file = `${route}`.replace(env.paths.routes, "").slice(1);
+    if (imported === undefined) {
+      env.log.warn(`empty route file at ${file}`);
+    } else {
+      const valids = Object.entries(imported)
+        .filter(([verb]) => verbs.includes(verb));
+      for (const [method, handler] of valids) {
+        routes.push({method, path: toRoute(file), handler});
+      }
+    }
   }
   return router;
 };