@primate/core 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Primate core",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -18,27 +18,27 @@
   "dependencies": {
     "@rcompat/array": "^0.3.0",
     "@rcompat/async": "^0.3.0",
-    "@rcompat/build": "^0.4.0",
+    "@rcompat/build": "^0.5.0",
     "@rcompat/cli": "^0.5.1",
     "@rcompat/crypto": "^0.5.0",
-    "@rcompat/fs": "^0.5.0",
+    "@rcompat/fs": "^0.6.0",
     "@rcompat/function": "^0.4.0",
-    "@rcompat/http": "^0.5.3",
+    "@rcompat/http": "^0.6.0",
     "@rcompat/invariant": "^0.5.0",
     "@rcompat/object": "^0.5.0",
-    "@rcompat/package": "^0.7.0",
-    "@rcompat/platform": "^0.3.0",
+    "@rcompat/package": "^0.8.0",
+    "@rcompat/runtime": "^0.1.0",
     "@rcompat/stdio": "^0.5.0",
     "@rcompat/sync": "^0.3.0"
   },
   "type": "module",
   "imports": {
     "#*": {
-      "@primate/lt": "./src/private/*.js",
+      "livetypes": "./src/private/*.js",
       "default": "./src/private/*.js"
     },
     "#error/*": {
-      "@primate/lt": "./src/private/error/*.js",
+      "livetypes": "./src/private/error/*.js",
       "default": "./src/private/error/*.js"
     }
   },
@@ -48,6 +48,7 @@
     "./error": "./src/error/index.js",
     "./log": "./src/log/index.js",
     "./dispatch": "./src/dispatch/index.js",
+    "./http/verbs": "./src/http/verbs.js",
     "./handler/*": "./src/serve/handler/*.js"
   }
 }

package/src/build/hook/build.js

@@ -38,7 +38,7 @@ const pre = async (app, mode, target) => {
   await app.path.build.remove();
   await app.path.build.create();
 
-  await Promise.all(["server", "client", "pages", "components"]
+  await Promise.all(["server", "client", "components"]
     .map(directory => app.runpath(directory).create()));
 
   const router = await $router(app.path.routes);
@@ -50,14 +50,15 @@ const pre = async (app, mode, target) => {
 
 const js_re = /^.*.js$/u;
 const write_directories = async (build_directory, app) => {
+  const location = app.get("location");
   for (const name of app.server_build) {
-    const d = app.runpath(name);
+    const d = app.runpath(location.server, name);
     const e = await Promise.all((await collect(d, js_re, { recursive: true }))
       .map(async path => `${path}`.replace(d, _ => "")));
     const files_js = `
     const ${name} = [];
     ${e.map((path, i) =>
-    `import * as ${name}${i} from "${webpath(`../${name}${path}`)}";
+    `import * as ${name}${i} from "${webpath(`../server/${name}${path}`)}";
     ${name}.push(["${webpath(path.slice(1, -".js".length))}", ${name}${i}]);`,
   ).join("\n")}
     export default ${name};`;
@@ -110,33 +111,30 @@ await serve(import.meta.url, {
 
 const post = async (app, mode, target) => {
   const location = app.get("location");
-  const defaults = join(import.meta.dirname, "../defaults");
+  const defaults = join(import.meta.url, "../../defaults");
 
   // stage routes
-  await app.stage(app.path.routes, location.routes);
+  await app.stage(app.path.routes, join(location.server, location.routes));
 
   // stage types
-  await app.stage(app.path.types, location.types);
+  await app.stage(app.path.types, join(location.server, location.types));
 
   // stage components, transforming defines
   await app.stage(app.path.components, location.components, true);
 
-  const directory = app.runpath(location.routes);
+  const directory = app.runpath(location.server, location.routes);
   for (const path of await directory.collect()) {
     await app.bindings[path.extension]
       ?.(directory, path.debase(`${directory}/`));
   }
   // copy framework pages
-  await app.stage(defaults, location.pages);
+  await app.stage(defaults, join(location.server, location.pages));
   // overwrite transformed pages to build
-  await app.stage(app.path.pages, location.pages);
+  await app.stage(app.path.pages, join(location.server, location.pages));
 
   // copy static files to build/server/static
   await app.stage(app.path.static, join(location.server, location.static));
 
-  // copy static files to build/client/static
-  await app.stage(app.path.static, join(location.client, location.static));
-
   // publish JavaScript and CSS files
   const imports = await collect(app.path.static, /\.(?:css)$/u);
   await Promise.all(imports.map(async file => {

package/src/build/index.js

@@ -7,7 +7,7 @@ import tryreturn from "@rcompat/async/tryreturn";
 import empty from "@rcompat/object/empty";
 import override from "@rcompat/object/override";
 import root from "@rcompat/package/root";
-import platform from "@rcompat/platform";
+import runtime from "@rcompat/runtime";
 import app from "./app.js";
 import { build, init } from "./hook/exports.js";
 
@@ -25,7 +25,7 @@ const get_config = async project_root => {
       return imported;
     } catch (error) {
       if (error.level === undefined) {
-        error_in_config_file(error.message, `${platform} ${local_config}`);
+        error_in_config_file(error.message, `${runtime} ${local_config}`);
       } else {
         throw error;
       }

package/src/build/targets/web.js

@@ -1,40 +1,38 @@
 import collect from "@rcompat/fs/collect";
-import join from "@rcompat/fs/join";
 import webpath from "@rcompat/fs/webpath";
 
 const html = /^.*.html$/u;
 
 export default async app => {
   const location = app.get("location");
-  const http = app.get("http");
   const client = app.runpath(location.client);
-  const re = /app..*(?:js|css)$/u;
-  const $imports = (await client.collect(re, { recursive: false })).map((file, i) => {
-    const type = file.extension === ".css" ? "style" : "js";
-    const src = `${http.static.root}${file.debase(client).name}`;
-    const path = `./${file.debase(`${app.path.build}/`)}`;
-    return {
-      src,
-      path,
-      code: `await load_text(asset${i})`,
-      type,
-    };
-  });
-  const d = app.runpath(location.pages);
+  const client_imports = (await client.collect())
+    .map((file, i) => {
+      const type = file.extension === ".css" ? "style" : "js";
+      const src = `/${file.debase(client).name}`;
+      const path = `./${file.debase(`${app.path.build}/`)}`;
+      return {
+        src,
+        path,
+        code: `await load_text(asset${i})`,
+        type,
+      };
+    });
+  const d = app.runpath(location.server, location.pages);
   const pages = await Promise.all((await collect(d, html, { recursive: true }))
     .map(async file => `${file.debase(d)}`.slice(1)));
   const pages_str = pages.map(page =>
     `"${page}": await load_text(import.meta.url,
-    "${webpath(`../${location.pages}/${page}`)}"),`).join("\n");
+    "${webpath(`../${location.server}/${location.pages}/${page}`)}"),`).join("\n");
 
   const assets_scripts = `
   import loader from "primate/loader";
   import load_text from "primate/load-text";
 
-  ${$imports.map(({ path }, i) =>
-    `const asset${i} = await load_text(import.meta.dirname, "${path}");`)
+  ${client_imports.map(({ path }, i) =>
+    `const asset${i} = await load_text(import.meta.url, "../${path}");`)
     .join("\n  ")}
-  const assets = [${$imports.map(($import, i) => `{
+  const assets = [${client_imports.map(($import, i) => `{
   src: "${$import.src}",
   code: asset${i},
   type: "${$import.type}",
@@ -42,8 +40,8 @@ export default async app => {
   }`).join(",\n  ")}];
 
   const imports = {
-     app: "${join(http.static.root, $imports.find($import =>
-    $import.src.includes("app") && $import.src.endsWith(".js")).src).webpath()}"
+    app: "${client_imports.find(({ src }) =>
+    src.includes("app") && src.endsWith(".js")).src}"
   };
   // importmap
   assets.push({
@@ -61,7 +59,8 @@ export default async app => {
     loader: loader({
       pages,
       rootfile: import.meta.url,
-      pages_app: "${app.get("pages.app")}"
+      pages_app: "${app.get("pages.app")}",
+      static_root: "${app.get("http.static.root")}",
     }),
     target: "web",
   };

package/src/http/verbs.js

@@ -0,0 +1,11 @@
+export default [
+  "get",
+  "post",
+  "put",
+  "delete",
+  "head",
+  "connect",
+  "options",
+  "trace",
+  "patch",
+];