@primate/core 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Primate core",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -21,14 +21,14 @@
     "@rcompat/build": "^0.4.0",
     "@rcompat/cli": "^0.5.1",
     "@rcompat/crypto": "^0.5.0",
-    "@rcompat/fs": "^0.4.0",
+    "@rcompat/fs": "^0.4.1",
     "@rcompat/function": "^0.4.0",
-    "@rcompat/http": "^0.5.1",
+    "@rcompat/http": "^0.5.2",
     "@rcompat/invariant": "^0.5.0",
     "@rcompat/object": "^0.5.0",
     "@rcompat/package": "^0.7.0",
     "@rcompat/platform": "^0.3.0",
-    "@rcompat/stdio": "^0.4.0",
+    "@rcompat/stdio": "^0.5.0",
     "@rcompat/sync": "^0.3.0"
   },
   "type": "module",

package/src/build/hook/build.js

@@ -8,6 +8,7 @@ import join from "@rcompat/fs/join";
 import exclude from "@rcompat/object/exclude";
 import stringify from "@rcompat/object/stringify";
 import manifest from "@rcompat/package/manifest";
+import root from "@rcompat/package/root";
 import copy_includes from "./copy_includes.js";
 import $router from "./router.js";
 
@@ -163,7 +164,12 @@ const post = async (app, mode, target) => {
   await write_bootstrap(build_number, app, mode);
 
   // copy config file
-  await app.root.join(config_filename).copy(app.path.build.join(config_filename));
+  const local_config = app.root.join(config_filename);
+  const build_config = app.path.build.join(config_filename);
+  const root_base = await root(import.meta.url);
+  const default_config = root_base.join("/src/private/config.js");
+  (await local_config.exists() ? local_config : default_config)
+    .copy(build_config);
 
   const manifest_data = await manifest();
   // create package.json

package/src/build/index.js

@@ -12,18 +12,27 @@ import platform from "@rcompat/platform";
 import app from "./app.js";
 import { build, init } from "./hook/exports.js";
 
+const empty_config = config => config === undefined || empty(config);
+
 const get_config = async project_root => {
   const local_config = project_root.join(config_filename);
-  return await local_config.exists()
-    ? tryreturn(async _ => {
+  const exists = await local_config.exists()
+  if (exists) {
+    try {
       const imported = await local_config.import("default");
 
-      empty(imported) && empty_config_file(local_config);
+      empty_config(imported) && empty_config_file(local_config);
 
       return imported;
-    }).orelse(({ message }) =>
-      error_in_config_file(message, `${platform} ${local_config}`))
-    : config;
+    } catch (error) {
+      if (error.level === undefined) {
+        error_in_config_file(error.message, `${platform} ${local_config}`);
+      } else {
+        throw error;
+      }
+    }
+  }
+  return config;
 };
 
 export default async (mode, target) => tryreturn(async _ => {

package/src/build/targets/web.js

@@ -22,13 +22,15 @@ export default async app => {
   const pages = await Promise.all((await collect(d, html, { recursive: true }))
     .map(async file => `${file}`.replace(`${d}/`, _ => "")));
   const pages_str = pages.map(page =>
-    `"${page}": await file("./${location.pages}/${page}").text(),`).join("\n");
+    `"${page}": await join(import.meta.url, "../${location.pages}/${page}").text(),`).join("\n");
 
   const assets_scripts = `
   import file from "@rcompat/fs/file";
   import join from "@rcompat/fs/join";
   import stringify from "@rcompat/object/stringify";
   import crypto from "@rcompat/crypto";
+  import { OK } from "@rcompat/http/status";
+  import { resolve } from "@rcompat/http/mime";
 
   const encoder = new TextEncoder();
   const hash = async (data, algorithm = "sha-384") => {
@@ -63,13 +65,28 @@ export default async app => {
   const pages = {
     ${pages_str}
   };
+  const buildroot = file(import.meta.url).join("..");
+
+  const serve_asset = asset => new Response(asset.stream(), {
+    status: OK,
+    headers: {
+      "Content-Type": resolve(asset.name),
+    },
+  });
 
   const loader = {
     page(name) {
       return pages[name] ?? pages["${app.get("pages.app")}"];
     },
-    asset(pathname) {
-      return assets.find(asset => asset.src === pathname);
+    async asset(pathname) {
+      const root_asset = buildroot.join(\`client/\${pathname}\`);
+      if (await await root_asset.isFile) {
+        return serve_asset(asset);
+      }
+      const static_asset = buildroot.join(\`client/static/\${pathname}\`);
+      if (await static_asset.isFile) {
+        return serve_asset(static_asset);
+      }
     },
   };
   const target = "web";

package/src/serve/hook/handle.js

@@ -1,4 +1,3 @@
-import log from "#log";
 import client_error from "@primate/core/handler/error";
 import cascade from "@rcompat/async/cascade";
 import tryreturn from "@rcompat/async/tryreturn";
@@ -71,21 +70,8 @@ export default app => {
     });
   };
 
-  const as_asset = async (pathname, code) => new Response(code, {
-    status: OK,
-    headers: {
-      "Content-Type": resolve(pathname),
-//      Etag: await path.modified(),
-    },
-  });
-
-  const handle = async request => {
-    const { pathname } = request.url;
-
-    const asset = app.loader.asset(pathname)?.code;
-
-    return asset === undefined ? as_route(request) : as_asset(pathname, asset);
-  };
+  const handle = async request =>
+    (await app.loader.asset(request.url.pathname)) ?? as_route(request);
   // first hook
   const pass = (request, next) => next({
     ...request,