primate 0.15.2 → 0.15.4

package/package.json

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

package/src/bin.js

@@ -1,8 +1,5 @@
 #!/usr/bin/env node
 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]));
+await run(args[0]);

package/src/commands/create.js

@@ -15,6 +15,8 @@ const createModule = async () => {
       },
       scripts: {
         start: "npx primate",
+        dev: "npx primate dev",
+        serve: "npx primate serve",
       },
       type: "module",
     }, null, space);

package/src/commands/dev.js

@@ -0,0 +1,3 @@
+import start from "../start.js";
+
+export default async env => start(env);

package/src/commands/exports.js

@@ -1,3 +1,10 @@
-export {default as start} from "./start.js";
-export {default as create} from "./create.js";
-export {default as help} from "./help.js";
+import {default as dev} from "./dev.js";
+import {default as serve} from "./serve.js";
+import {default as create} from "./create.js";
+import {default as help} from "./help.js";
+
+const commands = {dev, serve, create, help};
+
+const run = name => commands[name] ?? help;
+
+export default name => name === undefined ? dev : run(name);

package/src/commands/serve.js

@@ -0,0 +1,3 @@
+import start from "../start.js";
+
+export default async env => start(env, {bundle: true});

package/src/config.js

@@ -58,9 +58,10 @@ export default async (filename = "primate.config.js") => {
   const root = await getRoot();
   const config = await getConfig(root, filename);
 
-  const resources = [];
   const env = {
     ...config,
+    resources: [],
+    entrypoints: [],
     paths: qualify(root, config.paths),
     root,
     log: {...log, error: error => log.error(error, config)},
@@ -70,21 +71,29 @@ export default async (filename = "primate.config.js") => {
     handlers: {...handlers},
     render: async ({body = "", head = ""} = {}) => {
       const html = await index(env);
-      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}`;
+      const heads = env.resources.map(({src, code, type, inline, integrity}) => {
+        const tag = type === "style" ? "link" : "script";
+        const pre = type === "style"
+          ? `<${tag} rel="stylesheet" integrity="${integrity}"`
+          : `<${tag} type="${type}" integrity="${integrity}"`;
+        const middle = type === "style"
+          ? ` href="${src}">`
+          : ` src="${src}">`;
+        const post = type === "style" ? "" : `</${tag}>`;
+        return inline ? `${pre}>${code}${post}` : `${pre}${middle}${post}`;
       }).join("\n");
       return html
         .replace("%body%", () => body)
         .replace("%head%", () => `${head}${heads}`);
     },
-    publish: async ({src, code, type = "", inline = false}) => {
+    publish: async ({src, code, type = "", inline = false, main}) => {
       const integrity = await hash(code);
-      resources.push({src, code, type, inline, integrity});
+      env.resources.push({src, code, type, inline, integrity, main});
       return integrity;
     },
+    bootstrap: ({type, code}) => {
+      env.entrypoints.push({type, code});
+    },
   };
   env.log.info(`${package_json.name} \x1b[34m${package_json.version}\x1b[0m`);
   const {modules} = config;
@@ -93,6 +102,6 @@ export default async (filename = "primate.config.js") => {
     .filter(module => module.load !== undefined)
     .map(module => module.load()));
 
-  return cache("config", filename, () => ({...env, resources,
+  return cache("config", filename, () => ({...env,
     modules: modules.concat(loads.flat())}));
 };

package/src/exports.js

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

package/src/primate.config.js

@@ -19,4 +19,5 @@ export default {
     components: "components",
   },
   modules: [],
+  dist: "app",
 };

package/src/run.js

@@ -1,6 +1,4 @@
 import config from "./config.js";
+import command from "./commands/exports.js";
 
-export default async command => {
-  // env should initialised before any commands run
-  await command(await config());
-};
+export default async name => command(name)(await config());

package/src/start.js

@@ -0,0 +1,27 @@
+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, operations = {}) => {
+  // register handlers
+  await register(env);
+  // compile server-side code
+  await compile(env);
+  // publish client-side code
+  await publish(env);
+
+  // after publish hook, publish a zero assumptions app.js (no css imports)
+  const code = env.entrypoints.filter(({type}) => type === "script")
+    .map(({code}) => code).join("");
+  await env.publish({src: `${env.dist}.js`, code, type: "module"});
+
+  if (operations?.bundle) {
+    // bundle client-side code
+    await bundle(env);
+  }
+  // serve
+  serve({router: await route(env), ...env});
+};

package/src/commands/start.js

@@ -1,19 +0,0 @@
-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), ...env});
-};