primate 0.22.3 → 0.23.0

package/README.md

@@ -1,7 +1,14 @@
-# Primate core framework
+# Primate
 
-This package contains the core framework code.
+Expressive, minimal and extensible web framework. To start [read guide].
 
-See the [Getting started][getting-started] guide for documentation.
+## Resources
 
-[getting-started]: https://primatejs.com/guide/getting-started
+* Website: https://primatejs.com
+* IRC: Join the `#primate` channel on `irc.libera.chat`
+
+## License
+
+MIT
+
+[read guide]: https://primatejs.com/guide/getting-started

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.22.3",
+  "version": "0.23.0",
   "description": "Expressive, minimal and extensible web framework",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -18,10 +18,10 @@
     "directory": "packages/primate"
   },
   "dependencies": {
-    "runtime-compat": "^0.25.8"
+    "runtime-compat": "^0.27.1"
   },
   "engines": {
-    "node": ">=18.16"
+    "node": ">=18"
   },
   "type": "module",
   "exports": "./src/exports.js"

package/src/app.js

@@ -3,8 +3,10 @@ import {tryreturn} from "runtime-compat/async";
 import {File, Path} from "runtime-compat/fs";
 import {bold, blue} from "runtime-compat/colors";
 import {is} from "runtime-compat/dyndef";
-import {transform, valmap} from "runtime-compat/object";
+import {transform, valmap, to} from "runtime-compat/object";
 import {globify} from "runtime-compat/string";
+import * as runtime from "runtime-compat/meta";
+
 import errors from "./errors.js";
 import {print} from "./Logger.js";
 import dispatch from "./dispatch.js";
@@ -14,10 +16,6 @@ import * as loaders from "./loaders/exports.js";
 
 const {DoubleFileExtension} = errors;
 
-// do not hard-depend on node
-const packager = import.meta.runtime?.packager ?? "package.json";
-const library = import.meta.runtime?.library ?? "node_modules";
-
 // use user-provided file or fall back to default
 const index = (base, page, fallback) =>
   tryreturn(_ => File.read(`${base.join(page)}`))
@@ -32,12 +30,12 @@ const attribute = attributes => Object.keys(attributes).length > 0
 const tag = ({name, attributes = {}, code = "", close = true}) =>
   `<${name}${attribute(attributes)}${close ? `>${code}</${name}>` : "/>"}`;
 
-const base = new Path(import.meta.url).up(1);
+const {name, version} = await new Path(import.meta.url).up(2)
+  .join(runtime.manifest).json();
 
 export default async (log, root, config) => {
   const {http} = config;
   const secure = http?.ssl !== undefined;
-  const {name, version} = await base.up(1).join(packager).json();
   const path = valmap(config.location, value => root.join(value));
 
   const at = `at http${secure ? "s" : ""}://${http.host}:${http.port}\n`;
@@ -52,7 +50,6 @@ export default async (log, root, config) => {
   const types = await loaders.types(log, path.types);
   const error = await path.routes.join("+error.js");
   const routes = await loaders.routes(log, path.routes);
-  const modules = await loaders.modules(log, root, config);
 
   return {
     config,
@@ -75,9 +72,8 @@ export default async (log, root, config) => {
       depth: Math.max(...routes.map(({layouts}) => layouts.length)) + 1,
     },
     dispatch: dispatch(types),
-    modules,
-    packager,
-    library,
+    modules: await loaders.modules(log, root, config),
+    ...runtime,
     // copy files to build folder, potentially transforming them
     async stage(source, directory, filter) {
       const {paths, mapper} = this.config.build.transform;
@@ -182,7 +178,7 @@ export default async (log, root, config) => {
 
       const parts = module.split("/");
       const path = [this.library, ...parts];
-      const pkg = await Path.resolve().join(...path, this.packager).json();
+      const pkg = await Path.resolve().join(...path, this.manifest).json();
       const exports = pkg.exports === undefined
         ? {[module]: `/${module}/${pkg.main}`}
         : transform(pkg.exports, entry => entry

package/src/errors.json

@@ -1,5 +1,3 @@
-
-
 {
   "module": "primate",
   "errors": {

package/src/hooks/bundle.js

@@ -1,3 +1,3 @@
 import {cascade} from "runtime-compat/async";
 
-export default app => cascade(app.modules.bundle)(app);
+export default async app => (await cascade(app.modules.bundle))(app);

package/src/hooks/compile.js

@@ -30,10 +30,16 @@ const pre = async app => {
     await app.stage(path.components, to, /^.*.js$/u);
   }
 
+  if (await path.static.exists) {
+    // copy static files to build/server/static
+    await app.stage(path.static, new Path(location.server, location.static));
+  }
+
   // copy additional subdirectories to build/server
   await copy_includes(app, location.server);
 
   return app;
 };
 
-export default async app => cascade(app.modules.compile)(await pre(app));
+export default async app =>
+  (await cascade(app.modules.compile))(await pre(app));

package/src/hooks/handle.js

@@ -43,7 +43,7 @@ export default app => {
       }
 
       // handle request
-      const response = cascade(app.modules.route, handler)({...request, path});
+      const response = (await cascade(app.modules.route, handler))({...request, path});
       return (await respond(await response))(app, {
         layouts: await Promise.all(layouts.map(layout => layout(request))),
       }, request);

package/src/hooks/init.js

@@ -1,3 +1,3 @@
 import {cascade} from "runtime-compat/async";
 
-export default app => cascade(app.modules.init)(app);
+export default async app => (await cascade(app.modules.init))(app);

package/src/hooks/publish.js

@@ -59,4 +59,5 @@ const post = async app => {
   return app;
 };
 
-export default async app => post(await cascade(app.modules.publish)(app));
+export default async app =>
+  post(await (await cascade(app.modules.publish))(app));

package/src/hooks/register.js

@@ -1,3 +1,3 @@
 import {cascade} from "runtime-compat/async";
 
-export default app => cascade(app.modules.register)(app);
+export default async app => (await cascade(app.modules.register))(app);

package/src/hooks/serve.js

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

package/src/start.js

@@ -4,23 +4,25 @@ import * as hooks from "./hooks/exports.js";
 
 export default async (app$, deactivated = []) => {
   // run one-time hooks
-  const app = await cascade(["init", "register", "compile", "publish", "bundle"]
-    .filter(hook => !deactivated.includes(hook))
-    .map(hook => async (input, next) => {
-      app$.log.info(`running ${hook} hooks`, {module: "primate"});
-      return next(await hooks[hook](input));
-    }))(app$);
+  let app = app$;
+  for (const hook of ["init", "register", "compile", "publish", "bundle"]) {
+    if (deactivated.includes(hook)) {
+      continue;
+    }
+    app.log.info(`running ${hook} hooks`, {module: "primate"});
+    app = await hooks[hook](app);
+  }
 
   app.route = hooks.route(app);
   app.parse = hooks.parse(app.dispatch);
 
   const server = await serve(async request =>
-    tryreturn(async _ => hooks.handle(app)(await app.parse(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 cascade(app.modules.serve)({...app, server});
+  await (await cascade(app.modules.serve))({...app, server});
 };