primate 0.13.0 → 0.13.1

package/README.md

@@ -190,32 +190,29 @@ 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}));
+  // 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"});
 };
 
 ```
 
 ### Explicit handlers
 
-Most often we can figure 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.
+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
 export default (router, {redirect}) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Expressive, minimal and extensible framework for JavaScript",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",

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}));
+  // 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/template.md

@@ -117,9 +117,9 @@ to the content type sent along the request. Currently supported are
 
 ### Explicit handlers
 
-Most often we can figure 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.
+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
 // routing/explicit-handlers.js

package/src/bundle.js

@@ -16,6 +16,8 @@ const makePublic = async env => {
   }
 };
 
-export default async env => await makePublic(env) &&
+export default async env => {
+  await makePublic(env);
   [...filter("bundle", env.modules), _ => _].reduceRight((acc, handler) =>
     input => handler(input, acc))(env);
+};

package/src/config.js

@@ -59,7 +59,10 @@ export default async (filename = "primate.config.js") => {
       env.handlers[name] = handler;
     },
     handlers: {...handlers},
-    render: async html => (await index(env)).replace("%body%", () => html),
+    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)));

package/src/handlers/html.js

@@ -8,9 +8,9 @@ const getContent = async (env, name) => {
 
 export default (content, {status = 200, partial = false, adhoc = false} = {}) =>
   async (env, headers) => {
-    const html = adhoc ? content : await getContent(env, content);
+    const body = adhoc ? content : await getContent(env, content);
     return [
-      partial ? html : await env.render(html), {
+      partial ? body : await env.render({body}), {
         status,
         headers: {...headers, "Content-Type": "text/html"},
       },

package/src/index.html

@@ -3,6 +3,7 @@
   <head>
     <title>Primate app</title>
     <meta charset="utf-8" />
+    %head%
   </head>
   <body>%body%</body>
 </html>

package/src/serve.js

@@ -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);