primate 0.21.1 → 0.21.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "description": "Expressive, minimal and extensible web framework",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",

package/src/app.js

@@ -21,7 +21,7 @@ const fallback = (app, page) =>
 
 // use user-provided file or fall back to default
 const index = (app, page) =>
-  tryreturn(_ => File.read(`${app.paths.pages.join(name)}`))
+  tryreturn(_ => File.read(`${app.paths.pages.join(page)}`))
     .orelse(_ => fallback(app, page));
 
 const encoder = new TextEncoder();
@@ -83,8 +83,8 @@ export default async (config, root, log) => {
       }));
     },
     headers() {
-      const csp = Object.keys(http.csp).reduce((policy_string, key) =>
-        `${policy_string}${key} ${http.csp[key]};`, "")
+      const csp = Object.keys(http.csp).reduce((policy, key) =>
+        `${policy}${key} ${http.csp[key]};`, "")
         .replace("script-src 'self'", `script-src 'self' ${
           app.assets
             .filter(({type}) => type !== "style")
@@ -141,16 +141,16 @@ export default async (config, root, log) => {
       this.entrypoints.push({type, code});
     },
     async import(module) {
-      const {build} = config;
-      const {root} = http.static;
-      const path = [library, ...module.split("/")];
+      const {build: {modules}, http: {static: {root}}} = this.config;
+      const parts = module.split("/");
+      const path = [library, ...parts];
       const pkg = await Path.resolve().join(...path, packager).json();
       const exports = pkg.exports === undefined
         ? {[module]: `/${module}/${pkg.main}`}
         : transform(pkg.exports, entry => entry
-          .filter(([, _export]) => _export.browser?.default !== undefined
-            || _export.import !== undefined
-            || _export.default !== undefined)
+          .filter(([, export$]) => export$.browser?.default !== undefined
+            || export$.import !== undefined
+            || export$.default !== undefined)
           .map(([key, value]) => [
             key.replace(".", module),
             value.browser?.default.replace(".", `./${module}`)
@@ -158,10 +158,10 @@ export default async (config, root, log) => {
               ?? value.import?.replace(".", `./${module}`),
           ]));
       const dependency = Path.resolve().join(...path);
-      const to = new Path(this.build.paths.client, build.modules, ...module.split("/"));
+      const to = new Path(this.build.paths.client, modules, ...parts);
       await dependency.file.copy(to);
       this.importmaps = {
-        ...valmap(exports, value => new Path(root, build.modules, value).path),
+        ...valmap(exports, value => new Path(root, modules, value).path),
         ...this.importmaps};
     },
     types,
@@ -169,10 +169,14 @@ export default async (config, root, log) => {
     dispatch: dispatch(types),
   };
 
+  const error = await app.paths.routes.join("+error.js");
   const modules = await loaders.modules(app, root, config);
 
   return {...app,
     modules,
+    error: {
+      default: await error.exists ? (await import(error)).default : undefined,
+    },
     layoutDepth: Math.max(...app.routes.map(({layouts}) => layouts.length)) + 1,
     route: hooks.route({...app, modules}),
     parse: hooks.parse(dispatch(types)),

package/src/hooks/handle.js

@@ -14,7 +14,7 @@ export default app => {
   const route = async request => {
     const {pathname} = request.url;
     // if NoFileForPath is thrown, this will remain undefined
-    let errorHandler = undefined;
+    let errorHandler = app.error.default;
 
     return tryreturn(async _ => {
       const {path, guards, errors, layouts, handler} = invalid(pathname)
@@ -50,9 +50,9 @@ export default app => {
       }, request);
     }).orelse(async error => {
       app.log.auto(error);
-      console.log("HI")
+
       // the +error.js page itself could fail
-      return tryreturn(_ => respond(errorHandler())(app, {}, request))
+      return tryreturn(_ => respond(errorHandler(request))(app, {}, request))
         .orelse(_ => clientError()(app, {}, request));
     });
   };

package/src/loaders/routes.js

@@ -26,7 +26,7 @@ const make = path => {
 const specials = ["guards", "errors", "layouts"];
 export default async (log, directory, load = fs) => {
   const routes = await get.routes(log, directory, load);
-  const $routes = from(await Promise.all(specials.map(async extra =>
+  const routes$ = from(await Promise.all(specials.map(async extra =>
     [extra, await get[extra](log, directory, load)])));
   const filter = path => ([name]) => path.includes(name);
 
@@ -40,9 +40,9 @@ export default async (log, directory, load = fs) => {
       method,
       handler,
       pathname: make(path.endsWith("/") ? path.slice(0, -1) : path),
-      guards: $routes.guards.filter(filter(path)).map(([, guard]) => guard),
-      errors: $routes.errors.filter(filter(path)).map(([, error]) => error),
-      layouts: $routes.layouts.filter(filter(path)).map(([, layout]) => layout),
+      guards: routes$.guards.filter(filter(path)).map(([, guard]) => guard),
+      errors: routes$.errors.filter(filter(path)).map(([, error]) => error),
+      layouts: routes$.layouts.filter(filter(path)).map(([, layout]) => layout),
     }));
   }).flat();
 };