primate 0.12.0 → 0.13.1

package/README.md

@@ -22,6 +22,7 @@ Add `{"type": "module"}` to your `package.json` and run `npx -y primate@latest`.
   - [JSON](#json)
   - [Streams](#streams)
   - [Response](#response)
+  - [HTML](#html)
 - [Routing](#routing)
   - [Basic](#basic)
   - [The request object](#the-request-object)
@@ -30,13 +31,7 @@ Add `{"type": "module"}` to your `package.json` and run `npx -y primate@latest`.
   - [Named groups](#named-groups)
   - [Aliasing](#aliasing)
   - [Sharing logic across requests](#sharing-logic-across-requests)
-- [Extensions](#extensions)
-- [Handlers](#handlers)
-  - [HTML](#html)
-  - [Redirect](#redirect)
-  - [HTMX](#htmx)
-- [Modules](#modules)
-  - [Data persistance](#data-persistance)
+  - [Explicit handlers](#explicit-handlers)
 
 ## Serving content
 
@@ -46,7 +41,7 @@ Create a file in `routes` that exports a default function.
 
 ```js
 export default router => {
-  // strings will be served as plain text
+  // Serve strings as plain text
   router.get("/user", () => "Donald");
 };
 
@@ -58,13 +53,13 @@ export default router => {
 import {File} from "runtime-compat/filesystem";
 
 export default router => {
-  // any proper JavaScript object will be served as JSON
+  // Serve proper JavaScript objects as JSON
   router.get("/users", () => [
     {name: "Donald"},
     {name: "Ryan"},
   ]);
 
-  // load from a file and serve as JSON
+  // Load from file and serve as JSON
   router.get("/users-from-file", () => File.json("users.json"));
 };
 
@@ -88,12 +83,30 @@ export default router => {
 import {Response} from "runtime-compat/http";
 
 export default router => {
-  // use a generic response instance for a custom response status
+  // Use a Response object for custom response status
   router.get("/create", () => new Response("created!", {status: 201}));
 };
 
 ```
 
+### HTML
+
+```js
+// Use an explicit handler as we can't detect HTML by the return value type
+export default (router, {html}) => {
+  // Embed components/hello-world.html into static/index.html and serve it. In
+  // case a user-provided index.html doesn't exist, use a fallback index.html
+  router.get("/hello", () => html("hello-world"));
+
+  // Same as above, but without embedding
+  router.get("/hello-partial", () => html("hello-world", {partial: true}));
+
+  // Serve directly from string instead of loading a component
+  router.get("/hello-adhoc", () => html("<p>Hello, world!</p>", {adhoc: true}));
+};
+
+```
+
 ## Routing
 
 Routes map requests to responses. They are loaded from `routes`.
@@ -177,206 +190,38 @@ export default router => {
 ### Sharing logic across requests
 
 ```js
-import html from "@primate/html";
-import redirect from "@primate/redirect";
-
 export default router => {
-  // declare `"edit-user"` as alias of `"/user/edit/([0-9])+"`
+  // Declare `"edit-user"` as alias of `"/user/edit/([0-9])+"`
   router.alias("edit-user", "/user/edit/([0-9])+");
 
-  // pass user instead of request to all verbs with this route
-  router.map("edit-user", () => ({name: "Donald"}));
+  // Pass user instead of request to all verbs on this route
+  router.map("edit-user", ({body}) => body?.name ?? "Donald");
 
-  // show user edit form
-  router.get("edit-user", user => html`<user-edit user="${user}" />`);
+  // Show user as plain text
+  router.get("edit-user", user => user);
 
-  // verify form and save, or show errors
-  router.post("edit-user", async user => await user.save()
-    ? redirect`/users`
-    : html`<user-edit user="${user}" />`);
+  // Verify or show error
+  router.post("edit-user", user => user === "Donald"
+    ? "Hi Donald!"
+    : {message: "Error saving user"});
 };
 
 ```
 
-## Extensions
-
-There are two ways to extend Primate's core functionality. Handlers are used
-per route to serve new types of content not supported by core. Modules extend
-an app's entire scope.
-
-Handlers and modules listed here are officially developed and supported by
-Primate.
-
-### Handlers
-
-#### HTML
+### Explicit handlers
 
-*[`@primate/html`][primate-html]*
-
-Serve HTML tagged templates. This handler reads HTML component files from
-`components`.
-
-Create an HTML component in `components/user-index.html`
-
-```html
-<div for="${users}">
-  User ${name}.
-  Email ${email}.
-</div>
-
-```
-
-Create a route in `route/user.js` and serve the component in your route
+Most often we can figure out the content type to respond with based on the
+return type from the handler. To handle content not automatically detected, use
+the second argument of the exported function.
 
 ```js
-import html from "@primate/html";
-
-export default router => {
-  // the HTML tagged template handler loads a component from the `components`
-  // directory and serves it as HTML, passing any given data as attributes
-  router.get("/users", () => {
-    const users = [
-      {name: "Donald", email: "donald@the.duck"},
-      {name: "Joe", email: "joe@was.absent"},
-    ];
-    return html`<user-index users="${users}" />`;
-  });
+export default (router, {redirect}) => {
+  // redirect from source to target
+  router.get("/source", () => redirect("/target"));
 };
 
 ```
 
-#### Redirect
-
-*[`@primate/redirect`][primate-redirect]*
-
-Redirect the request.
-
-Create a route in `route/user.js`
-
-```js
-import redirect from "@primate/html";
-
-export default router => {
-  // redirect the request
-  router.get("/user", () => redirect`/users`);
-};
-
-```
-
-#### HTMX
-
-*[`@primate/htmx`][primate-htmx]*
-
-Serve HTML tagged templates with HTMX support. This handler reads HTML component
-files from `components`.
-
-Create an HTML component in `components/user-index.html`
-
-```html
-<div for="${users}" hx-get="/other-users" hx-swap="outerHTML">
-  User ${name}.
-  Email ${email}.
-</div>
-
-```
-
-Create a route in `route/user.js` and serve the component in your route
-
-```js
-import {default as htmx, partial} from "@primate/htmx";
-
-export default router => {
-  // the HTML tagged template handler loads a component from the `components`
-  // directory and serves it as HTML, passing any given data as attributes
-  router.get("/users", () => {
-    const users = [
-      {name: "Donald", email: "donald@the.duck"},
-      {name: "Joe", email: "joe@was.absent"},
-    ];
-    return htmx`<user-index users="${users}" />`;
-  });
-
-  // this is the same as above, with support for partial rendering (without
-  // index.html)
-  router.get("/other-users", () => {
-    const users = [
-      {name: "Other Donald", email: "donald@the.goose"},
-      {name: "Other Joe", email: "joe@was.around"},
-    ];
-    return partial`<user-index users="${users}" />`;
-  });
-};
-
-```
-
-### Modules
-
-To add modules, create a `primate.config.js` configuration file in your
-project's root. This file should export a default object with the property
-`modules` used for extending your app.
-
-```js
-export default {
-  modules: [],
-};
-
-```
-
-#### Data persistance
-
-*[`@primate/domains`][primate-domains]*
-
-Add data persistance in the form of ORM backed up by various drivers.
-
-Import and initialize this module in your configuration file
-
-```js
-import domains from "@primate/domains";
-
-export default {
-  modules: [domains()],
-};
-
-```
-
-A domain represents a collection in a store using the static `fields` property
-
-```js
-import {Domain} from "@primate/domains";
-
-// A basic domain with two properies
-export default class User extends Domain {
-  static fields = {
-    // a user's name is a string
-    name: String,
-    // a user's age is a number
-    age: Number,
-  };
-}
-
-```
-
-Field types may also be specified as an array with additional predicates
-aside from the type
-
-```js
-import {Domain} from "@primate/domains";
-import House from "./House.js";
-
-export default class User extends Domain {
-  static fields = {
-    // a user's name is a string unique across the user collection
-    name: [String, "unique"],
-    // a user's age is a positive integer
-    age: [Number, "integer", "positive"],
-    // a user's house has the foreign id of a house record and no two
-    // users may have the same house
-    house_id: [House, "unique"],
-  };
-}
-
-```
-
 ## Resources
 
 * Website: https://primatejs.com
@@ -385,9 +230,3 @@ export default class User extends Domain {
 ## License
 
 MIT
-
-[primate-html]: https://github.com/primatejs/primate-html
-[primate-redirect]: https://github.com/primatejs/primate-redirect
-[primate-htmx]: https://github.com/primatejs/primate-htmx
-[primate-domains]: https://github.com/primatejs/primate-domains
-[primate-sessions]: https://github.com/primatejs/primate-sessions

package/eslint.config.js

@@ -0,0 +1 @@
+export {default} from "maximin";

package/module.json

@@ -1,10 +1,15 @@
 {
   "name": "primate",
-  "version": "0.11.0",
+  "version": "0.13.0",
+  "description": "Expressive, minimal and extensible framework for JavaScript",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
-  "repository": "https://github.com/primatejs/primate",
-  "description": "Expressive, minimal and extensible framework for JavaScript",
   "license": "MIT",
-  "bin": "src/bin.js"
+  "bin": "src/bin.js",
+  "repository": "https://github.com/primatejs/primate",
+  "scripts": {
+    "docs": "scripts/docs.sh",
+    "test": "npx debris",
+    "lint": "npx eslint ."
+  }
 }

package/package.json

@@ -1,29 +1,26 @@
 {
   "name": "primate",
-  "version": "0.12.0",
+  "version": "0.13.1",
+  "description": "Expressive, minimal and extensible framework for JavaScript",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
-  "repository": "https://github.com/primatejs/primate",
-  "description": "Expressive, minimal and extensible framework for JavaScript",
   "license": "MIT",
   "bin": "src/bin.js",
+  "repository": "https://github.com/primatejs/primate",
+  "scripts": {
+    "docs": "scripts/docs.sh",
+    "test": "npx debris",
+    "lint": "npx eslint ."
+  },
   "dependencies": {
     "runtime-compat": "^0.14.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.4",
-    "@babel/eslint-parser": "^7.21.3",
-    "@babel/plugin-syntax-import-assertions": "^7.20.0",
-    "eslint": "^8.37.0",
-    "eslint-plugin-json": "^3.1.0"
+    "maximin": "^0.1.2"
   },
-  "scripts": {
-    "docs": "scripts/docs.sh",
-    "test": "npx debris"
-  },
-  "type": "module",
-  "exports": "./exports.js",
   "engines": {
     "node": ">=17.9.0"
-  }
+  },
+  "type": "module",
+  "exports": "./exports.js"
 }

package/readme/extensions/handlers/html/user.js

@@ -8,6 +8,6 @@ export default router => {
       {name: "Donald", email: "donald@the.duck"},
       {name: "Joe", email: "joe@was.absent"},
     ];
-    return html`<user-index users="${users}" />`;
+    return html("user-index", {users});
   });
 };

package/readme/extensions/handlers/htmx/user.js

@@ -8,7 +8,7 @@ export default router => {
       {name: "Donald", email: "donald@the.duck"},
       {name: "Joe", email: "joe@was.absent"},
     ];
-    return htmx`<user-index users="${users}" />`;
+    return htmx("user-index", {users});
   });
 
   // this is the same as above, with support for partial rendering (without
@@ -18,6 +18,6 @@ export default router => {
       {name: "Other Donald", email: "donald@the.goose"},
       {name: "Other Joe", email: "joe@was.around"},
     ];
-    return partial`<user-index users="${users}" />`;
+    return partial("user-index", {users});
   });
 };

package/readme/extensions/handlers/redirect/user.js

@@ -2,5 +2,5 @@ import redirect from "@primate/html";
 
 export default router => {
   // redirect the request
-  router.get("/user", () => redirect`/users`);
+  router.get("/user", () => redirect("/users"));
 };

package/readme/routing/explicit-handlers.js

@@ -0,0 +1,4 @@
+export default (router, {redirect}) => {
+  // redirect from source to target
+  router.get("/source", () => redirect("/target"));
+};

package/readme/routing/sharing-logic-across-requests.js

@@ -1,18 +1,15 @@
-import html from "@primate/html";
-import redirect from "@primate/redirect";
-
 export default router => {
-  // declare `"edit-user"` as alias of `"/user/edit/([0-9])+"`
+  // Declare `"edit-user"` as alias of `"/user/edit/([0-9])+"`
   router.alias("edit-user", "/user/edit/([0-9])+");
 
-  // pass user instead of request to all verbs with this route
-  router.map("edit-user", () => ({name: "Donald"}));
+  // Pass user instead of request to all verbs on this route
+  router.map("edit-user", ({body}) => body?.name ?? "Donald");
 
-  // show user edit form
-  router.get("edit-user", user => html`<user-edit user="${user}" />`);
+  // Show user as plain text
+  router.get("edit-user", user => user);
 
-  // verify form and save, or show errors
-  router.post("edit-user", async user => await user.save()
-    ? redirect`/users`
-    : html`<user-edit user="${user}" />`);
+  // Verify or show error
+  router.post("edit-user", user => user === "Donald"
+    ? "Hi Donald!"
+    : {message: "Error saving user"});
 };

package/readme/serving-content/html.js

@@ -0,0 +1,12 @@
+// Use an explicit handler as we can't detect HTML by the return value type
+export default (router, {html}) => {
+  // Embed components/hello-world.html into static/index.html and serve it. In
+  // case a user-provided index.html doesn't exist, use a fallback index.html
+  router.get("/hello", () => html("hello-world"));
+
+  // Same as above, but without embedding
+  router.get("/hello-partial", () => html("hello-world", {partial: true}));
+
+  // Serve directly from string instead of loading a component
+  router.get("/hello-adhoc", () => html("<p>Hello, world!</p>", {adhoc: true}));
+};

package/readme/serving-content/json.js

@@ -1,12 +1,12 @@
 import {File} from "runtime-compat/filesystem";
 
 export default router => {
-  // any proper JavaScript object will be served as JSON
+  // Serve proper JavaScript objects as JSON
   router.get("/users", () => [
     {name: "Donald"},
     {name: "Ryan"},
   ]);
 
-  // load from a file and serve as JSON
+  // Load from file and serve as JSON
   router.get("/users-from-file", () => File.json("users.json"));
 };

package/readme/serving-content/plain-text.js

@@ -1,4 +1,4 @@
 export default router => {
-  // strings will be served as plain text
+  // Serve strings as plain text
   router.get("/user", () => "Donald");
 };

package/readme/serving-content/response.js

@@ -1,6 +1,6 @@
 import {Response} from "runtime-compat/http";
 
 export default router => {
-  // use a generic response instance for a custom response status
+  // Use a Response object for custom response status
   router.get("/create", () => new Response("created!", {status: 201}));
 };

package/readme/template.md

@@ -7,7 +7,7 @@ Expressive, minimal and extensible framework for JavaScript.
 Create a route in `routes/hello.js`
 
 ```js
-// getting-started/hello.js
+// getting-started.js
 ```
 
 Add `{"type": "module"}` to your `package.json` and run `npx -y primate@latest`.
@@ -19,6 +19,7 @@ Add `{"type": "module"}` to your `package.json` and run `npx -y primate@latest`.
   - [JSON](#json)
   - [Streams](#streams)
   - [Response](#response)
+  - [HTML](#html)
 - [Routing](#routing)
   - [Basic](#basic)
   - [The request object](#the-request-object)
@@ -27,13 +28,7 @@ Add `{"type": "module"}` to your `package.json` and run `npx -y primate@latest`.
   - [Named groups](#named-groups)
   - [Aliasing](#aliasing)
   - [Sharing logic across requests](#sharing-logic-across-requests)
-- [Extensions](#extensions)
-- [Handlers](#handlers)
-  - [HTML](#html)
-  - [Redirect](#redirect)
-  - [HTMX](#htmx)
-- [Modules](#modules)
-  - [Data persistance](#data-persistance)
+  - [Explicit handlers](#explicit-handlers)
 
 ## Serving content
 
@@ -63,6 +58,12 @@ Create a file in `routes` that exports a default function.
 // serving-content/response.js
 ```
 
+### HTML
+
+```js
+// serving-content/html.js
+```
+
 ## Routing
 
 Routes map requests to responses. They are loaded from `routes`.
@@ -114,100 +115,14 @@ to the content type sent along the request. Currently supported are
 // routing/sharing-logic-across-requests.js
 ```
 
-## Extensions
-
-There are two ways to extend Primate's core functionality. Handlers are used
-per route to serve new types of content not supported by core. Modules extend
-an app's entire scope.
+### Explicit handlers
 
-Handlers and modules listed here are officially developed and supported by
-Primate.
-
-### Handlers
-
-#### HTML
-
-*[`@primate/html`][primate-html]*
-
-Serve HTML tagged templates. This handler reads HTML component files from
-`components`.
-
-Create an HTML component in `components/user-index.html`
-
-```html
-<!-- extensions/handlers/html/user-index.html -->
-```
-
-Create a route in `route/user.js` and serve the component in your route
+Most often we can figure out the content type to respond with based on the
+return type from the handler. To handle content not automatically detected, use
+the second argument of the exported function.
 
 ```js
-// extensions/handlers/html/user.js
-```
-
-#### Redirect
-
-*[`@primate/redirect`][primate-redirect]*
-
-Redirect the request.
-
-Create a route in `route/user.js`
-
-```js
-// extensions/handlers/redirect/user.js
-```
-
-#### HTMX
-
-*[`@primate/htmx`][primate-htmx]*
-
-Serve HTML tagged templates with HTMX support. This handler reads HTML component
-files from `components`.
-
-Create an HTML component in `components/user-index.html`
-
-```html
-<!-- extensions/handlers/htmx/user-index.html -->
-```
-
-Create a route in `route/user.js` and serve the component in your route
-
-```js
-// extensions/handlers/htmx/user.js
-```
-
-### Modules
-
-To add modules, create a `primate.config.js` configuration file in your
-project's root. This file should export a default object with the property
-`modules` used for extending your app.
-
-```js
-// extensions/modules/configure.js
-```
-
-#### Data persistance
-
-*[`@primate/domains`][primate-domains]*
-
-Add data persistance in the form of ORM backed up by various drivers.
-
-Import and initialize this module in your configuration file
-
-```js
-// extensions/modules/domains/configure.js
-```
-
-A domain represents a collection in a store using the static `fields` property
-
-```js
-// extensions/modules/domains/fields.js
-```
-
-Field types may also be specified as an array with additional predicates
-aside from the type
-
-```js
-// extensions/modules/domains/predicates.js
+// routing/explicit-handlers.js
 ```
 
 ## Resources
@@ -218,9 +133,3 @@ aside from the type
 ## License
 
 MIT
-
-[primate-html]: https://github.com/primatejs/primate-html
-[primate-redirect]: https://github.com/primatejs/primate-redirect
-[primate-htmx]: https://github.com/primatejs/primate-htmx
-[primate-domains]: https://github.com/primatejs/primate-domains
-[primate-sessions]: https://github.com/primatejs/primate-sessions

package/src/bundle.js

@@ -1,14 +1,23 @@
 import {File} from "runtime-compat/fs";
+const filter = (key, array) => array?.flatMap(m => m[key] ?? []) ?? [];
 
-export default async env => {
+const makePublic = async env => {
   const {paths} = env;
+
+  // remove public directory in case exists
+  if (await paths.public.exists) {
+    await paths.public.file.remove();
+  }
+  await paths.public.file.create();
+
   if (await paths.static.exists) {
-    // remove public directory in case exists
-    if (await paths.public.exists) {
-      await paths.public.file.remove();
-    }
-    await paths.public.file.create();
     // copy static files to public
     await File.copy(paths.static, paths.public);
   }
 };
+
+export default async env => {
+  await makePublic(env);
+  [...filter("bundle", env.modules), _ => _].reduceRight((acc, handler) =>
+    input => handler(input, acc))(env);
+};

package/src/compile.js

@@ -0,0 +1,5 @@
+const filter = (key, array) => array?.flatMap(m => m[key] ?? []) ?? [];
+
+export default async env =>
+  [...filter("compile", env.modules), _ => _].reduceRight((acc, handler) =>
+    input => handler(input, acc))(env);

package/src/config.js

@@ -1,9 +1,10 @@
-import {Path} from "runtime-compat/fs";
+import {File, Path} from "runtime-compat/fs";
 import {is} from "runtime-compat/dyndef";
 import cache from "./cache.js";
 import extend from "./extend.js";
 import defaults from "./primate.config.js";
 import * as log from "./log.js";
+import * as handlers from "./handlers/exports.js";
 import package_json from "../package.json" assert {type: "json"};
 
 const qualify = (root, paths) =>
@@ -23,26 +24,53 @@ const getConfig = async (root, filename) => {
   }
 };
 
-export default async (filename = "primate.config.js") => {
-  is(filename).string();
-  let root;
+const getRoot = async () => {
   try {
     // use module root if possible
-    root = await Path.root();
+    return await Path.root();
   } catch (error) {
     // fall back to current directory
-    root = Path.resolve();
+    return Path.resolve();
+  }
+};
+
+const index = async env => {
+  const name = "index.html";
+  try {
+    // user-provided file
+    return await File.read(`${env.paths.static.join(name)}`);
+  } catch (error) {
+    // fallback
+    return new Path(import.meta.url).directory.join(name).file.read();
   }
+};
+
+export default async (filename = "primate.config.js") => {
+  is(filename).string();
+  const root = await getRoot();
   const config = await getConfig(root, filename);
 
   const env = {
     ...config,
     paths: qualify(root, config.paths),
     root,
-    log: {...log, error: error => log.error(error, config),
+    log: {...log, error: error => log.error(error, config)},
+    register: (name, handler) => {
+      env.handlers[name] = handler;
+    },
+    handlers: {...handlers},
+    render: async ({body = "", head = ""} = {}) => {
+      const html = await index(env);
+      return html.replace("%body%", () => body).replace("%head%", () => head);
     },
   };
   env.log.info(`${package_json.name} \x1b[34m${package_json.version}\x1b[0m`);
   const modules = await Promise.all(config.modules.map(module => module(env)));
-  return cache("config", filename, () => ({...env, modules}));
+  // modules may load other modules
+  const loads = await Promise.all(modules
+    .filter(module => module.load !== undefined)
+    .map(module => module.load()(env)));
+
+  return cache("config", filename, () => ({...env,
+    modules: modules.concat(loads)}));
 };

package/src/handlers/exports.js

@@ -0,0 +1,5 @@
+export {default as text} from "./text.js";
+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";

package/src/handlers/html.js

@@ -0,0 +1,18 @@
+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} = {}) =>
+  async (env, headers) => {
+    const body = adhoc ? content : await getContent(env, content);
+    return [
+      partial ? body : await env.render({body}), {
+        status,
+        headers: {...headers, "Content-Type": "text/html"},
+      },
+    ];
+  };

package/src/handlers/http404.js

@@ -1,4 +1,6 @@
-export default () => () => ["Page not found", {
-  status: 404,
-  headers: {"Content-Type": "text/html"},
-}];
+export default (body = "Not found") => (_, headers) => [
+  body, {
+    status: 404,
+    headers: {...headers, "Content-Type": "text/html"},
+  },
+];

package/src/handlers/json.js

@@ -1,4 +1,6 @@
-export default (_, ...keys) => async () => [JSON.stringify(await keys[0]), {
-  status: 200,
-  headers: {"Content-Type": "application/json"},
-}];
+export default (body, {status = 200} = {}) => (_, headers) => [
+  JSON.stringify(body), {
+    status,
+    headers: {...headers, "Content-Type": "application/json"},
+  },
+];

package/src/handlers/redirect.js

@@ -0,0 +1,7 @@
+export default (Location, {status = 302} = {}) => (_, headers) => [
+  /* no body */
+  null, {
+    status,
+    headers: {...headers, Location},
+  },
+];

package/src/handlers/stream.js

@@ -1,4 +1,6 @@
-export default (_, ...keys) => async () => [await keys[0], {
-  status: 200,
-  headers: {"Content-Type": "application/octet-stream"},
-}];
+export default (body, {status = 200} = {}) => (_, headers) => [
+  body, {
+    status,
+    headers: {...headers, "Content-Type": "application/octet-stream"},
+  },
+];

package/src/handlers/text.js

@@ -1,11 +1,6 @@
-const last = -1;
-
-export default (strings, ...keys) => async () => {
-  const awaitedKeys = await Promise.all(keys);
-  const body = strings
-    .slice(0, last)
-    .map((string, i) => string + awaitedKeys[i])
-    .join("") + strings[strings.length + last];
-
-  return [body, {status: 200, headers: {"Content-Type": "text/plain"}}];
-};
+export default (body, {status = 200} = {}) => (_, headers) => [
+  body, {
+    status,
+    headers: {...headers, "Content-Type": "text/plain"},
+  },
+];

package/src/index.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Primate app</title>
+    <meta charset="utf-8" />
+    %head%
+  </head>
+  <body>%body%</body>
+</html>

package/src/log.js

@@ -23,7 +23,7 @@ export const info = (...args) => log.green("[info]").reset(...args).nl();
 
 export const warn = (...args) => log.yellow("[warn]").reset(...args).nl();
 
-export const error = (error, env) => {
-  log.red("[error]").reset(error.message).nl();
-  env.debug && console.log(error);
+export const error = (originalError, env) => {
+  log.red("[error]").reset(originalError.message).nl();
+  env.debug && console.log(originalError);
 };

package/src/register.js

@@ -0,0 +1,5 @@
+const filter = (key, array) => array?.flatMap(m => m[key] ?? []) ?? [];
+
+export default async env =>
+  [...filter("register", env.modules), _ => _].reduceRight((acc, handler) =>
+    input => handler(input, acc))(env);

package/src/respond.js

@@ -1,24 +1,24 @@
 import {Blob} from "runtime-compat/fs";
-import text from "./handlers/text.js";
-import json from "./handlers/json.js";
-import stream from "./handlers/stream.js";
+import {text, json, stream} from "./handlers/exports.js";
 import {isResponse as isResponseDuck} from "./duck.js";
 import RouteError from "./errors/Route.js";
 
 const isText = value => {
   if (typeof value === "string") {
-    return text`${value}`;
+    return text(value);
   }
   throw new RouteError(`no handler found for ${value}`);
 };
-const isObject = value => typeof value === "object" && value !== null
-  ? json`${value}` : isText(value);
+
+const isNonNullObject = value => typeof value === "object" && value !== null;
+const isObject = value => isNonNullObject(value)
+  ? json(value) : isText(value);
 const isResponse = value => isResponseDuck(value)
   ? () => value : isObject(value);
 const isStream = value => value instanceof ReadableStream
-  ? stream`${value}` : isResponse(value);
+  ? stream(value) : isResponse(value);
 const isBlob = value => value instanceof Blob
-  ? stream`${value}` : isStream(value);
+  ? stream(value) : isStream(value);
 const guess = value => isBlob(value);
 
 export default result => typeof result === "function" ? result : guess(result);

package/src/route.js

@@ -4,8 +4,14 @@ import RouteError from "./errors/Route.js";
 
 // insensitive-case equal
 const ieq = (left, right) => left.toLowerCase() === right.toLowerCase();
-
-export default async definitions => {
+// HTTP verbs
+const verbs = [
+  // CRUD
+  "post", "get", "put", "delete",
+  // extended
+  "delete", "connect", "options", "trace", "patch",
+];
+export default async (definitions, handlers) => {
   const aliases = [];
   const routes = [];
   const expand = path => aliases.reduce((expanded, {key, value}) =>
@@ -25,9 +31,9 @@ export default async definitions => {
       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),
-    get: (path, callback) => add("get", path, callback),
-    post: (path, callback) => add("post", path, callback),
     alias: (key, value) => aliases.push({key, value}),
     route: async request => {
       const {method} = request.original;
@@ -46,7 +52,8 @@ export default async definitions => {
   };
   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)));
+    await Promise.all(files.map(async route =>
+      (await route).default(router, handlers)));
   }
   return router;
 };

package/src/run.js

@@ -1,13 +1,14 @@
-import bundle from "./bundle.js";
 import config from "./config.js";
-import serve from "./serve.js";
+import register from "./register.js";
+import compile from "./compile.js";
+import bundle from "./bundle.js";
 import route from "./route.js";
+import serve from "./serve.js";
 
 export default async () => {
   const env = await config();
-  const {paths} = env;
-  const router = await route(paths.routes);
+  await register(env);
+  await compile(env);
   await bundle(env);
-
-  serve({router, ...env});
+  serve({router: await route(env.paths.routes, env.handlers), ...env});
 };

package/src/serve.js

@@ -36,7 +36,7 @@ export default env => {
       return await respond(await handlers(request))(env, headers);
     } catch (error) {
       env.log.error(error);
-      return http404(env, headers)``;
+      return http404()(env, headers);
     }
   };
 
@@ -67,11 +67,20 @@ export default env => {
     }
   };
 
-  const parseContent = (request, body) => {
-    const type = contents[request.headers.get("content-type")];
+  const parseContentType = (contentType, body) => {
+    const type = contents[contentType];
     return type === undefined ? body : type(body);
   };
 
+  const parseContent = (request, body) => {
+    try {
+      return parseContentType(request.headers.get("content-type"), body);
+    } catch (error) {
+      env.log.warn(error);
+      return body;
+    }
+  };
+
   const {http} = env;
   const modules = filter("serve", env.modules);
 

package/readme/getting-started/generate-ssl.sh

@@ -1 +0,0 @@
-openssl req -x509 -out ssl/default.crt -keyout ssl/default.key -newkey rsa:2048 -nodes -sha256 -batch

package/readme/getting-started/lay-out-app.sh

@@ -1 +0,0 @@
-mkdir -p app/{routes,components,ssl} && cd app

package/readme/getting-started/site-index.html

@@ -1 +0,0 @@
-Today's date is ${date}.

package/readme/getting-started/site.js

@@ -1,3 +0,0 @@
-export default router => {
-  router.get("/", () => "Hello, world!");
-};