primate 0.13.2 → 0.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.13.2",
+  "version": "0.14.1",
   "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,41 @@
+import {Path} from "runtime-compat/fs";
+import package_json from "../../package.json" assert {type: "json"};
+
+const createModule = async () => {
+  const space = 2;
+  try {
+    // will throw if cannot find a package.json up the filesystem hierarchy
+    await Path.root();
+  } catch (error) {
+    const rootConfig = JSON.stringify({
+      name: "primate-app",
+      private: true,
+      dependencies: {
+        primate: `^${package_json.version}`,
+      },
+      scripts: {
+        run: "npx primate",
+      },
+      type: "module",
+    }, null, space);
+    await Path.resolve().join("package.json").file.write(rootConfig);
+  }
+};
+
+const createConfig = async env => {
+  const name = "primate.config.js";
+  const template = "export default {};";
+  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 createModule();
+  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

@@ -87,12 +87,12 @@ export default async (filename = "primate.config.js") => {
     },
   };
   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, resources,
-    modules: modules.concat(loads)}));
+    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/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,21 +1,6 @@
 import config from "./config.js";
-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 () => {
-  const env = await config();
-  // 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});
+export default async command => {
+  // env should initialised before any commands run
+  await command(await config());
 };

package/src/serve.js

@@ -44,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);
@@ -72,6 +72,7 @@ export default env => {
         status: statuses.OK,
         headers: {
           "Content-Type": mime(published.src),
+          Etag: published.integrity,
         },
       });
     }

package/exports.js

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