primate 0.13.1 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.13.1",
+  "version": "0.14.0",
   "description": "Expressive, minimal and extensible framework for JavaScript",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -22,5 +22,5 @@
     "node": ">=17.9.0"
   },
   "type": "module",
-  "exports": "./exports.js"
+  "exports": "./src/exports.js"
 }

package/src/bin.js

@@ -1,2 +1,8 @@
 #!/usr/bin/env node
-(await import("./run.js")).default();
+import args from "runtime-compat/args";
+import * as commands from "./commands/exports.js";
+import run from "./run.js";
+
+const command = name => commands[name] ?? commands.help;
+
+await run(args[0] === undefined ? commands.start : command(args[0]));

package/src/commands/create.js

@@ -0,0 +1,19 @@
+import {Path} from "runtime-compat/fs";
+const name = "primate.config.js";
+
+const template = "export default {};";
+
+const createConfig = async env => {
+  const root = (await Path.root()).join(name);
+  if (await root.exists) {
+    env.log.warn(`${root} already exists`);
+  } else {
+    await root.file.write(template);
+    env.log.info(`created config at ${root}`);
+  }
+};
+
+export default async env => {
+  await createConfig(env);
+};
+

package/src/commands/exports.js

@@ -0,0 +1,3 @@
+export {default as start} from "./start.js";
+export {default as create} from "./create.js";
+export {default as help} from "./help.js";

package/src/commands/help.js

@@ -0,0 +1,3 @@
+export default env => {
+  env.log.info("available commands: create start");
+};

package/src/commands/start.js

@@ -0,0 +1,19 @@
+import register from "../register.js";
+import compile from "../compile.js";
+import publish from "../publish.js";
+import bundle from "../bundle.js";
+import route from "../route.js";
+import serve from "../serve.js";
+
+export default async env => {
+  // register handlers
+  await register(env);
+  // compile server-side code
+  await compile(env);
+  // publish client-side code
+  await publish(env);
+  // bundle client-side code
+  await bundle(env);
+  // serve
+  serve({router: await route(env.paths.routes, env.handlers), ...env});
+};

package/src/config.js

@@ -1,5 +1,6 @@
-import {File, Path} from "runtime-compat/fs";
+import crypto from "runtime-compat/crypto";
 import {is} from "runtime-compat/dyndef";
+import {File, Path} from "runtime-compat/fs";
 import cache from "./cache.js";
 import extend from "./extend.js";
 import defaults from "./primate.config.js";
@@ -45,11 +46,19 @@ const index = async env => {
   }
 };
 
+const hash = async (string, algorithm = "sha-384") => {
+  const encoder = new TextEncoder();
+  const bytes = await crypto.subtle.digest(algorithm, encoder.encode(string));
+  const algo = algorithm.replace("-", () => "");
+  return `${algo}-${btoa(String.fromCharCode(...new Uint8Array(bytes)))}`;
+};
+
 export default async (filename = "primate.config.js") => {
   is(filename).string();
   const root = await getRoot();
   const config = await getConfig(root, filename);
 
+  const resources = [];
   const env = {
     ...config,
     paths: qualify(root, config.paths),
@@ -61,16 +70,29 @@ export default async (filename = "primate.config.js") => {
     handlers: {...handlers},
     render: async ({body = "", head = ""} = {}) => {
       const html = await index(env);
-      return html.replace("%body%", () => body).replace("%head%", () => head);
+      const heads = resources.map(({src, code, type, inline, integrity}) => {
+        const tag = "script";
+        const pre = `<${tag} type="${type}" integrity="${integrity}"`;
+        const post = `</${tag}>`;
+        return inline ? `${pre}>${code}${post}` : `${pre} src="${src}">${post}`;
+      }).join("\n");
+      return html
+        .replace("%body%", () => body)
+        .replace("%head%", () => `${head}${heads}`);
+    },
+    publish: async ({src, code, type = "", inline = false}) => {
+      const integrity = await hash(code);
+      resources.push({src, code, type, inline, integrity});
+      return integrity;
     },
   };
   env.log.info(`${package_json.name} \x1b[34m${package_json.version}\x1b[0m`);
-  const modules = await Promise.all(config.modules.map(module => module(env)));
+  const {modules} = config;
   // modules may load other modules
   const loads = await Promise.all(modules
     .filter(module => module.load !== undefined)
-    .map(module => module.load()(env)));
+    .map(module => module.load()));
 
-  return cache("config", filename, () => ({...env,
-    modules: modules.concat(loads)}));
+  return cache("config", filename, () => ({...env, resources,
+    modules: modules.concat(loads.flat())}));
 };

package/src/exports.js

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

package/src/publish.js

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

package/src/route.js

@@ -35,7 +35,7 @@ export default async (definitions, handlers) => {
       [verb, (path, callback) => add(verb, path, callback)])),
     map: (path, callback) => add("map", path, callback),
     alias: (key, value) => aliases.push({key, value}),
-    route: async request => {
+    route: async ({request}) => {
       const {method} = request.original;
       const url = new URL(`https://primatejs.com${request.pathname}`);
       const {pathname, searchParams} = url;

package/src/run.js

@@ -1,14 +1,6 @@
 import config from "./config.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();
-  await register(env);
-  await compile(env);
-  await bundle(env);
-  serve({router: await route(env.paths.routes, env.handlers), ...env});
+export default async command => {
+  // env should initialised before any commands run
+  await command(await config());
 };

package/src/serve.js

@@ -22,8 +22,19 @@ export default env => {
   const _respond = async request => {
     const csp = Object.keys(env.http.csp).reduce((policy_string, key) =>
       `${policy_string}${key} ${env.http.csp[key]};`, "");
+    const scripts = env.resources
+      .map(resource => `'${resource.integrity}'`).join(" ");
+    const _csp = scripts === "" ? csp : `${csp}script-src 'self' ${scripts};`;
+    // remove inline resources
+    for (let i = env.resources.length - 1; i >= 0; i--) {
+      const resource = env.resources[i];
+      if (resource.inline) {
+        env.resources.splice(i, 1);
+      }
+    }
+
     const headers = {
-      "Content-Security-Policy": csp,
+      "Content-Security-Policy": _csp,
       "Referrer-Policy": "same-origin",
     };
 
@@ -33,7 +44,7 @@ export default env => {
       // handle is the last module to be executed
       const handlers = [...modules, router.route].reduceRight((acc, handler) =>
         input => handler(input, acc));
-      return await respond(await handlers(request))(env, headers);
+      return await respond(await handlers({request, env}))(env, headers);
     } catch (error) {
       env.log.error(error);
       return http404()(env, headers);
@@ -53,9 +64,25 @@ export default env => {
     },
   });
 
+  const publishedResource = request => {
+    const published = env.resources.find(resource =>
+      `/${resource.src}` === request.pathname);
+    if (published !== undefined) {
+      return new Response(published.code, {
+        status: statuses.OK,
+        headers: {
+          "Content-Type": mime(published.src),
+          Etag: published.integrity,
+        },
+      });
+    }
+
+    return route(request);
+  };
+
   const _serve = async request => {
     const path = new Path(env.paths.public, request.pathname);
-    return await path.isFile ? resource(path.file) : route(request);
+    return await path.isFile ? resource(path.file) : publishedResource(request);
   };
 
   const handle = async request => {

package/exports.js

@@ -1,3 +0,0 @@
-export * from "./src/errors.js";
-
-export {default} from "./src/run.js";