primate 0.28.0 → 0.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "Polymorphic development platform",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",

package/src/app.js

@@ -5,16 +5,17 @@ import { is } from "rcompat/invariant";
 import { transform, valmap, to } from "rcompat/object";
 import { globify } from "rcompat/string";
 import * as runtime from "rcompat/meta";
+import { Response, Status, MediaType } from "rcompat/http";
 
 import errors from "./errors.js";
 import to_sorted from "./to_sorted.js";
-import * as handlers from "./handlers/exports.js";
+import * as handlers from "./handlers.js";
 import * as loaders from "./loaders/exports.js";
 
 const { DoubleFileExtension } = errors;
 
 // use user-provided file or fall back to default
-const index = (base, page, fallback) =>
+const get_index = (base, page, fallback) =>
   tryreturn(_ => File.text(`${base.join(page)}`))
     .orelse(_ => File.text(`${base.join(fallback)}`));
 
@@ -112,7 +113,7 @@ export default async (log, root, config) => {
       const { location: { server, client, components } } = this.config;
 
       const source = this.path.components;
-      const compile = this.extensions[component.extension]?.compile;
+      const compile = this.extensions[component.fullExtension]?.compile;
       if (compile === undefined) {
         const debased = `${component.path}`.replace(source, "");
 
@@ -134,15 +135,13 @@ export default async (log, root, config) => {
     headers({ script = "", style = "" } = {}) {
       const csp = Object.keys(http.csp).reduce((policy, key) =>
         `${policy}${key} ${http.csp[key]};`, "")
-        .replace("script-src 'self'", `script-src 'self' ${script} ${
-          this.assets
-            .filter(({ type }) => type !== "style")
-            .map(asset => `'${asset.integrity}'`).join(" ")
+        .replace("script-src 'self'", `script-src 'self' ${script} ${this.assets
+          .filter(({ type }) => type !== "style")
+          .map(asset => `'${asset.integrity}'`).join(" ")
         }`)
-        .replace("style-src 'self'", `style-src 'self' ${style} ${
-          this.assets
-            .filter(({ type }) => type === "style")
-            .map(asset => `'${asset.integrity}'`).join(" ")
+        .replace("style-src 'self'", `style-src 'self' ${style} ${this.assets
+          .filter(({ type }) => type === "style")
+          .map(asset => `'${asset.integrity}'`).join(" ")
         }`);
 
       return { "Content-Security-Policy": csp, "Referrer-Policy": "same-origin" };
@@ -150,18 +149,33 @@ export default async (log, root, config) => {
     runpath(...directories) {
       return this.path.build.join(...directories);
     },
-    async render({ body, head }, page = config.pages.index, placeholders = {}) {
+    async render(content) {
+      const { assets, config: { location, pages: { index } } } = this;
+      const { body, head, partial, placeholders = {}, page = index } = content;
       ["body", "head"].every(used => is(placeholders[used]).undefined());
-      const { assets, config: { location, pages } } = this;
 
-      return to(placeholders)
+      return partial ? body : to(placeholders)
         // replace given placeholders, defaulting to ""
         .reduce((html, [key, value]) => html.replace(`%${key}%`, value ?? ""),
-          await index(this.runpath(location.pages), page, pages.index))
+          await get_index(this.runpath(location.pages), page, index))
         // replace non-given placeholders, aside from %body% / %head%
         .replaceAll(/(?<keep>%(?:head|body)%)|%.*?%/gus, "$1")
         // replace body and head
-        .replace("%body%", body).replace("%head%", render_head(assets, head));
+        .replace("%body%", body)
+        .replace("%head%", render_head(assets, head));
+    },
+    respond(body, { status = Status.OK, headers = {} } = {}) {
+      return new Response(body, { status, headers: {
+        ...this.headers(), "Content-Type": MediaType.TEXT_HTML, ...headers },
+      });
+    },
+    async view(options) {
+      // split render and respond options
+      const { status, headers, ...rest } = options;
+      return this.respond(await this.render(rest), { status, headers });
+    },
+    media(type, { status, headers } = {}) {
+      return { status, headers: { ...headers, "Content-Type": type } };
     },
     async inline(code, type) {
       const integrity = await this.hash(code);

package/src/exports.js

@@ -1,6 +1,6 @@
 import run from "./run.js";
 
-export * from "./handlers/exports.js";
+export * from "./handlers.js";
 
 export { default as Logger } from "./Logger.js";
 

package/src/handlers.js

@@ -0,0 +1,77 @@
+import { File } from "rcompat/fs";
+import { MediaType, Status } from "rcompat/http";
+import { identity } from "rcompat/function";
+import errors from "./errors.js";
+
+const handle = (mediatype, mapper = identity) => (body, options) => app =>
+  app.respond(mapper(body), app.media(mediatype, options));
+
+// {{{ text
+const text = handle(MediaType.TEXT_PLAIN);
+// }}}
+// {{{ json
+const json = handle(MediaType.APPLICATION_JSON, JSON.stringify);
+// }}}
+// {{{ stream
+const stream = handle(MediaType.APPLICATION_OCTET_STREAM);
+// }}}
+// {{{ ws
+const ws = implementation => ({ server }, _, { original }) =>
+  server.upgrade(original, implementation);
+// }}}
+// {{{ sse
+const sse = handle(MediaType.TEXT_EVENT_STREAM, implementation =>
+  new ReadableStream({
+    start(controller) {
+      implementation.open({
+        send(name, data) {
+          const event = data === undefined ? "" : `event: ${name}\n`;
+          const $data = data === undefined ? name : data;
+          controller.enqueue(`${event}data:${JSON.stringify($data)}\n\n`);
+        },
+      });
+    },
+    cancel() {
+      implementation.close?.();
+    },
+  }));
+// }}}
+// {{{ redirect
+const redirect = (Location, { status = Status.FOUND } = {}) => app =>
+  /* no body */
+  app.respond(null, { status, headers: { Location } });
+// }}}
+// {{{ error
+const error = (body = "Not Found", { status = Status.NOT_FOUND, page } = {}) =>
+  app => app.view({ body, status, page: page ?? app.config.pages.error });
+// }}}
+// {{{ html
+const script_re = /(?<=<script)>(?<code>.*?)(?=<\/script>)/gus;
+const style_re = /(?<=<style)>(?<code>.*?)(?=<\/style>)/gus;
+const remove = /<(?<tag>script|style)>.*?<\/\k<tag>>/gus;
+const html = (name, options) => async app => {
+  const component = await app.path.components.join(name).text();
+  const scripts = await Promise.all([...component.matchAll(script_re)]
+    .map(({ groups: { code } }) => app.inline(code, "module")));
+  const styles = await Promise.all([...component.matchAll(style_re)]
+    .map(({ groups: { code } }) => app.inline(code, "style")));
+  const assets = [...scripts, ...styles];
+
+  const body = component.replaceAll(remove, _ => "");
+  const head = assets.map(asset => asset.head).join("\n");
+  const script = scripts.map(asset => asset.csp).join(" ");
+  const style = styles.map(asset => asset.csp).join(" ");
+  const headers = app.headers({ script, style });
+
+  return app.view({ body, head, headers, ...options });
+};
+// }}}
+// {{{ view
+const view = (name, props, options) => async (app, ...rest) => {
+  const { fullExtension: extension } = new File(name);
+  return app.extensions[extension]?.handle(name, props, options)(app, ...rest)
+    ?? errors.NoHandlerForExtension.throw(extension, name);
+};
+// }}}
+
+export { text, json, stream, redirect, error, html, view, ws, sse };

package/src/hooks/exports.js

@@ -6,4 +6,3 @@ export { default as bundle } from "./bundle.js";
 export { default as route } from "./route.js";
 export { default as handle } from "./handle.js";
 export { default as parse } from "./parse.js";
-export { default as serve } from "./serve.js";

package/src/hooks/handle.js

@@ -1,7 +1,7 @@
 import { Response, Status, MediaType } from "rcompat/http";
 import { cascade, tryreturn } from "rcompat/async";
 import { respond } from "./respond/exports.js";
-import { error as clientError } from "../handlers/exports.js";
+import { error as clientError } from "../handlers.js";
 
 const guard_error = Symbol("guard_error");
 const guard = (app, guards) => async (request, next) => {
@@ -44,6 +44,7 @@ export default app => {
 
     return tryreturn(async _ => {
       const { path, guards, errors, layouts, handler } = await route(request);
+
       error_handler = errors?.at(-1);
 
       const pathed = { ...request, path };
@@ -52,6 +53,7 @@ export default app => {
 
       // handle request
       const response = await (await cascade(hooks, handler))(pathed);
+
       const $layouts = { layouts: await get_layouts(layouts, request) };
       return (await respond(response))(app, $layouts, pathed);
     }).orelse(async error => {

package/src/hooks/respond/respond.js

@@ -18,7 +18,7 @@ const is_response = value => is_response_duck(value)
 const is_stream = value => value instanceof ReadableStream
   ? stream(value) : is_response(value);
 const is_blob = value => value instanceof Blob
- ? stream(value.stream()) : is_stream(value);
+  ? stream(value.stream()) : is_stream(value);
 const is_URL = value => value instanceof URL
   ? redirect(value.href) : is_blob(value);
 const guess = value => is_URL(value);

package/src/hooks/route.js

@@ -21,8 +21,7 @@ export default app => {
       [name, type === undefined ? value : validate(types[type], value, name)],
     )));
 
-  const is_type = (groups, pathname) => Object
-    .entries(groups ?? {})
+  const is_type = (groups, pathname) => Object.entries(groups ?? {})
     .map(([name, value]) =>
       [types[name] === undefined || explicit ? name : `${name}$${name}`, value])
     .filter(([name]) => name.includes("$"))

package/src/run.js

@@ -1,6 +1,7 @@
 import { tryreturn } from "rcompat/async";
 import { File } from "rcompat/fs";
 import { extend } from "rcompat/object";
+import { runtime } from "rcompat/meta";
 import app from "./app.js";
 import { default as Logger, bye } from "./Logger.js";
 import errors from "./errors.js";
@@ -8,7 +9,6 @@ import command from "./commands/exports.js";
 import defaults from "./defaults/primate.config.js";
 
 let logger = new Logger({ level: Logger.Warn });
-const { runtime = "node" } = import.meta;
 
 const get_config = async root => {
   const name = "primate.config.js";

package/src/start.js

@@ -1,5 +1,5 @@
 import { serve, Response, Status } from "rcompat/http";
-import { cascade, tryreturn } from "rcompat/async";
+import { tryreturn } from "rcompat/async";
 import { bold, blue } from "rcompat/colors";
 import * as hooks from "./hooks/exports.js";
 import { print } from "./Logger.js";
@@ -24,14 +24,11 @@ export default async (app$, mode = "development") => {
 
   app.route = hooks.route(app);
   app.parse = hooks.parse(app.dispatch);
-
-  const server = await serve(async request =>
+  app.server = await serve(async request =>
     tryreturn(async _ => (await hooks.handle(app))(await app.parse(request)))
       .orelse(error => {
         app.log.auto(error);
         return new Response(null, { status: Status.INTERNAL_SERVER_ERROR });
       }),
   app.config.http);
-
-  await (await cascade(app.modules.serve))({ ...app, server });
 };

package/types/index.d.ts

@@ -3,6 +3,7 @@ declare module "primate" {
 
   interface MinOptions {
     status: number,
+    headers: Headers | {},
   }
   
   interface ErrorOptions extends MinOptions {
@@ -11,7 +12,6 @@ declare module "primate" {
 
   interface Options extends ErrorOptions {
     placeholders: {},
-    headers: Headers | {},
   }
 
   type Dispatcher = {
@@ -61,4 +61,9 @@ declare module "primate" {
   export function view(name: string, props: {}, options?: Options): ResponseFn;
 
   export function error(body: string, options?: ErrorOptions): ResponseFn;
+
+  export function sse(implementation: {
+    open?: () => void,
+    close?: () => void,
+  }, options?: MinOptions): ResponseFn;
 }

package/src/handlers/error.js

@@ -1,8 +0,0 @@
-import { Response, Status, MediaType } from "rcompat/http";
-
-export default (body = "Not Found", { status = Status.NOT_FOUND, page } = {}) =>
-  async app =>
-    new Response(await app.render({ body }, page ?? app.config.pages.error), {
-      status,
-      headers: { ...app.headers(), "Content-Type": MediaType.TEXT_HTML },
-    });

package/src/handlers/exports.js

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

package/src/handlers/html.js

@@ -1,28 +0,0 @@
-import { Response, Status, MediaType } from "rcompat/http";
-
-const script_re = /(?<=<script)>(?<code>.*?)(?=<\/script>)/gus;
-const style_re = /(?<=<style)>(?<code>.*?)(?=<\/style>)/gus;
-const remove = /<(?<tag>script|style)>.*?<\/\k<tag>>/gus;
-
-const render = (body, head, { partial = false, app, page, placeholders }) =>
-  partial ? body : app.render({ body, head }, page, placeholders);
-
-export default (name, options = {}) => async app => {
-  const component = await app.path.components.join(name).text();
-  const scripts = await Promise.all([...component.matchAll(script_re)]
-    .map(({ groups: { code } }) => app.inline(code, "module")));
-  const styles = await Promise.all([...component.matchAll(style_re)]
-    .map(({ groups: { code } }) => app.inline(code, "style")));
-  const assets = [...scripts, ...styles];
-
-  const body = component.replaceAll(remove, _ => "");
-  const head = assets.map(asset => asset.head).join("\n");
-  const script = scripts.map(asset => asset.csp).join(" ");
-  const style = styles.map(asset => asset.csp).join(" ");
-  const headers = { script, style };
-
-  return new Response(await render(body, head, { app, ...options }), {
-      status: options.status ?? Status.OK,
-      headers: { ...app.headers(headers), "Content-Type": MediaType.TEXT_HTML },
-    });
-};

package/src/handlers/json.js

@@ -1,7 +0,0 @@
-import { Response, Status, MediaType } from "rcompat/http";
-
-export default (body, { status = Status.OK } = {}) => app =>
-  new Response(JSON.stringify(body), {
-    status,
-    headers: { ...app.headers(), "Content-Type": MediaType.APPLICATION_JSON },
-  });

package/src/handlers/redirect.js

@@ -1,8 +0,0 @@
-import { Response, Status } from "rcompat/http";
-
-export default (Location, { status = Status.FOUND } = {}) => app =>
-  /* no body */
-  new Response(null, {
-    status,
-    headers: { ...app.headers(), Location },
-  });

package/src/handlers/stream.js

@@ -1,8 +0,0 @@
-import { Response, Status, MediaType } from "rcompat/http";
-
-export default (body, { status = Status.OK } = {}) => app =>
-  new Response(body, {
-    status,
-    headers: { ...app.headers(), "Content-Type":
-      MediaType.APPLICATION_OCTET_STREAM },
-  });

package/src/handlers/text.js

@@ -1,7 +0,0 @@
-import { Response, Status, MediaType } from "rcompat/http";
-
-export default (body, { status = Status.OK } = {}) => app =>
-  new Response(body, {
-    status,
-    headers: { ...app.headers(), "Content-Type": MediaType.TEXT_PLAIN },
-  });

package/src/handlers/view.js

@@ -1,7 +0,0 @@
-import errors from "../errors.js";
-
-export default (name, props, options) => async (app, ...rest) => {
-  const extension = name.slice(name.lastIndexOf("."));
-  return app.extensions[extension]?.handle(name, props, options)(app, ...rest)
-    ?? errors.NoHandlerForExtension.throw(extension, name);
-};

package/src/hooks/serve.js

@@ -1,6 +0,0 @@
-import { cascade } from "rcompat/async";
-
-export default async (app, server) => {
-  app.log.info("running serve hooks", { module: "primate" });
-  await (await cascade(app.modules.serve))({ ...app, server });
-};