primate 0.24.0 → 0.26.0

package/src/loaders/types.js

@@ -1,15 +1,22 @@
-import {Path} from "runtime-compat/fs";
+import { Path } from "rcompat/fs";
+import { is } from "rcompat/invariant";
+import { tryreturn } from "rcompat/sync";
 import errors from "../errors.js";
 import fs from "./common.js";
 
 const filter = path => /^[a-z]/u.test(path.name);
 
 export default async (log, directory, load = fs) => {
-  const types = await load({log, directory, name: "types", filter});
+  const types = await fs({ log, directory, name: "types", filter });
 
   const resolve = name => new Path(directory, name);
-  types.some(([name, type]) => typeof type !== "function"
-    && errors.InvalidDefaultExport.throw(resolve(`${name}.js`)));
+  types.every(([name, type]) => tryreturn(_ => {
+    is(type).object();
+    is(type.base).string();
+    is(type.validate).function();
+    return true;
+  }).orelse(_ => errors.InvalidTypeExport.throw(resolve(`${name}.js`))),
+  );
 
   types.every(([name]) =>
     /^(?:[a-z][^\W_]*)$/u.test(name) || errors.InvalidTypeName.throw(name));

package/src/run.js

@@ -1,19 +1,19 @@
-import {tryreturn} from "runtime-compat/async";
-import {Path} from "runtime-compat/fs";
-import {extend} from "runtime-compat/object";
+import { tryreturn } from "rcompat/async";
+import { Path } from "rcompat/fs";
+import { extend } from "rcompat/object";
 import app from "./app.js";
-import {default as Logger, bye} from "./Logger.js";
+import { default as Logger, bye } from "./Logger.js";
 import errors from "./errors.js";
 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;
+let logger = new Logger({ level: Logger.Warn });
+const { runtime = "node" } = import.meta;
 
 const get_config = async root => {
   const name = "primate.config.js";
   const config = root.join(name);
-  return await config.exists
+  return await config.exists()
     ? tryreturn(async _ => {
       const imported = (await import(config)).default;
 
@@ -21,7 +21,7 @@ const get_config = async root => {
         errors.EmptyConfigFile.warn(logger, config);
 
       return extend(defaults, imported);
-    }).orelse(({message}) =>
+    }).orelse(({ message }) =>
       errors.ErrorInConfigFile.throw(message, `${runtime} ${config}`))
     : defaults;
 };

package/src/start.js

@@ -1,15 +1,24 @@
-import {serve, Response, Status} from "runtime-compat/http";
-import {cascade, tryreturn} from "runtime-compat/async";
+import { serve, Response, Status } from "rcompat/http";
+import { cascade, tryreturn } from "rcompat/async";
+import { bold, blue } from "rcompat/colors";
 import * as hooks from "./hooks/exports.js";
+import { print } from "./Logger.js";
 
-export default async (app$, deactivated = []) => {
+const base_hooks = ["init", "stage", "register", "publish", "bundle"];
+
+export default async (app$, mode = "development") => {
+  app$.mode = mode;
   // run one-time hooks
   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"});
+
+  const { http } = app.config;
+  const address = `http${app.secure ? "s" : ""}://${http.host}:${http.port}`;
+  print(blue(bold(app.name)), blue(app.version), `at ${address}\n`);
+
+  app.log.info(`in ${bold(mode)} mode`, { module: "primate" });
+
+  for (const hook of base_hooks) {
+    app.log.info(`running ${bold(hook)} hooks`, { module: "primate" });
     app = await hooks[hook](app);
   }
 
@@ -20,9 +29,9 @@ export default async (app$, deactivated = []) => {
     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});
+        return new Response(null, { status: Status.INTERNAL_SERVER_ERROR });
       }),
   app.config.http);
 
-  await (await cascade(app.modules.serve))({...app, server});
+  await (await cascade(app.modules.serve))({ ...app, server });
 };

package/src/validate.js

@@ -1,4 +1,4 @@
-import {is, maybe} from "runtime-compat/invariant";
+import { is, maybe } from "rcompat/invariant";
 
 export default (type, value, name) => {
   maybe(type.validate).function();

package/src/hooks/compile.js

@@ -1,45 +0,0 @@
-import {Path} from "runtime-compat/fs";
-import {cascade} from "runtime-compat/async";
-import copy_includes from "./copy_includes.js";
-import cwd from "../cwd.js";
-
-const html = /^.*.html$/u;
-const defaults = cwd(import.meta, 2).join("defaults");
-
-const pre = async app => {
-  const {config: {location}, path} = app;
-
-  // remove build directory in case exists
-  if (await path.build.exists) {
-    await path.build.file.remove();
-  }
-  await Promise.all(["server", "client", "components", "pages"]
-    .map(directory => app.runpath(directory).file.create()));
-
-  // copy framework pages
-  await app.stage(defaults, location.pages, html);
-  // overwrite transformed pages to build
-  await path.pages.exists && await app.stage(path.pages, location.pages, html);
-
-  if (await path.components.exists) {
-    // copy all files to build/components
-    await app.stage(path.components, location.components);
-    // copy .js files from components to build/server, since frontend
-    // frameworks handle non-js files
-    const to = Path.join(location.server, location.components);
-    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 =>
-  (await cascade(app.modules.compile))(await pre(app));

package/src/loaders/routes/errors.js

@@ -1,3 +0,0 @@
-import load from "./load.js";
-
-export default load("error");

package/src/loaders/routes/guards.js

@@ -1,3 +0,0 @@
-import load from "./load.js";
-
-export default load("guard");

package/src/loaders/routes/layouts.js

@@ -1,3 +0,0 @@
-import load from "./load.js";
-
-export default load("layout");