primate 0.16.3 → 0.18.0

package/src/run.js

@@ -1,4 +1,55 @@
+import {Path} from "runtime-compat/fs";
 import app from "./app.js";
+import {default as Logger, bye} from "./Logger.js";
+import extend from "./extend.js";
+import errors from "./errors.js";
 import command from "./commands/exports.js";
+import defaults from "./defaults/primate.config.js";
 
-export default async name => command(name)(await app());
+const getRoot = async () => {
+  try {
+    // use module root if possible
+    return await Path.root();
+  } catch (error) {
+    // fall back to current directory
+    return Path.resolve();
+  }
+};
+
+const protologger = new Logger({level: Logger.Warn});
+
+const getConfig = async root => {
+  const name = "primate.config.js";
+  const config = root.join(name);
+  if (await config.exists) {
+    try {
+      const imported = (await import(config)).default;
+
+      (imported === undefined || Object.keys(imported).length === 0) &&
+        errors.EmptyConfigFile.warn(protologger, {config});
+
+      return extend(defaults, imported);
+    } catch ({message}) {
+      return errors.ErrorInConfigFile.throw({message, config});
+    }
+  } else {
+    return defaults;
+  }
+};
+
+export default async name => {
+  const root = await getRoot();
+  let logger = protologger;
+  try {
+    const config = await getConfig(root);
+    logger = new Logger(config.logger);
+    await command(name)(await app(config, root, new Logger(config.logger)));
+  } catch (error) {
+    if (error.level === Logger.Error) {
+      logger.auto(error);
+      bye();
+    } else {
+      throw error;
+    }
+  }
+};

package/src/start.js

@@ -1,4 +1,6 @@
-import {register, compile, publish, bundle, route, handle}
+import {serve, Response} from "runtime-compat/http";
+import {InternalServerError} from "./http-statuses.js";
+import {register, compile, publish, bundle, route, handle, parse}
   from "./hooks/exports.js";
 
 export default async (app, operations = {}) => {
@@ -15,6 +17,15 @@ export default async (app, operations = {}) => {
   // bundle client-side code
   await bundle(app, operations?.bundle);
 
-  // handle
-  await handle({router: await route(app), ...app});
+  const _route = route(app);
+
+  serve(async request => {
+    try {
+      // parse, handle
+      return await handle({...app, route: _route})(await parse(request));
+    } catch(error) {
+      app.log.auto(error);
+      return new Response(null, {status: InternalServerError});
+    }
+  }, app.config.http);
 };

package/src/commands/build.js

@@ -1 +0,0 @@
-export {default} from "./serve.js";

package/src/commands/create.js

@@ -1,42 +0,0 @@
-import {Path} from "runtime-compat/fs";
-
-const createModule = async app => {
-  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: `^${app.version}`,
-      },
-      scripts: {
-        start: "npx primate",
-        dev: "npx primate dev",
-        serve: "npx primate serve",
-      },
-      type: "module",
-    }, null, space);
-    await Path.resolve().join("package.json").file.write(rootConfig);
-  }
-};
-
-const createConfig = async app => {
-  const name = "primate.config.js";
-  const template = "export default {};";
-  const root = (await Path.root()).join(name);
-  if (await root.exists) {
-    app.log.warn(`${root} already exists`);
-  } else {
-    await root.file.write(template);
-    app.log.info(`created config at ${root}`);
-  }
-};
-
-export default async app => {
-  await createModule(app);
-  await createConfig(app);
-};
-

package/src/commands/help.js

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

package/src/handlers/http.js

@@ -1 +0,0 @@
-export {default as http404} from "./http404.js";

package/src/handlers/http404.js

@@ -1,6 +0,0 @@
-export default (body = "Not found") => (_, headers) => [
-  body, {
-    status: 404,
-    headers: {...headers, "Content-Type": "text/html"},
-  },
-];

package/src/hooks/handle/http-statuses.js

@@ -1,5 +0,0 @@
-export default {
-  OK: 200,
-  Found: 302,
-  InternalServerError: 500,
-};