@primate/core 0.4.6 → 0.5.0

package/lib/private/build/client/index.js

@@ -2,7 +2,6 @@ import plugin_alias from "#build/client/plugin/alias";
 import plugin_entrypoint from "#build/client/plugin/entrypoint";
 import plugin_frontend from "#build/client/plugin/frontend";
 import plugin_server_stamp from "#build/client/plugin/server-stamp";
-import reload from "#build/client/reload";
 import location from "#location";
 import * as esbuild from "esbuild";
 const write_bootstrap = async (app, mode) => {
@@ -19,7 +18,7 @@ const write_bootstrap = async (app, mode) => {
     ` : `
     const session_config = undefined;
     `}
-    import config from "app:config";
+    import facade from "$:app";
 
     ${app.i18n_active ? `
     import i18n from "app:config:i18n";
@@ -30,7 +29,7 @@ const write_bootstrap = async (app, mode) => {
 
     const app = await serve(import.meta.url, {
       assets,
-      config,
+      facade,
       routes,
       views,
       pages,
@@ -49,7 +48,10 @@ export default async function build_client(app) {
     app.plugin("client", plugin_alias(app));
     app.plugin("client", plugin_server_stamp(app));
     app.plugin("client", plugin_entrypoint(app));
-    const imports = await app.path.static.collect(file => /\.(?:js|ts|css)$/.test(file.path));
+    const imports = await app.path.static.files({
+        recursive: true,
+        filter: file => /\.(?:js|ts|css)$/.test(file.path),
+    });
     imports.forEach(file => {
         const src = file.debase(app.path.static);
         app.entrypoint(`import "./${location.static}${src}";`);
@@ -66,11 +68,13 @@ export default async function build_client(app) {
         bundle: true,
         format: "esm",
     };
+    const NO_HR = app.config("livereload.exclude") ?? [];
     const mode_options = app.mode === "development"
         ? {
             banner: {
-                js: `new EventSource("${reload.path}").addEventListener("change",
-      () => globalThis.location.reload());`,
+                js: `const NO_HR=${JSON.stringify(NO_HR)};
+          new EventSource("/esbuild").addEventListener("change",
+          () => !NO_HR.includes(location.pathname) && location.reload());`,
             },
             entryNames: "app",
             minify: false,
@@ -86,7 +90,7 @@ export default async function build_client(app) {
         const context = await esbuild.context(options);
         await context.watch();
         await context.rebuild();
-        await context.serve({ host: reload.host, port: reload.port });
+        await context.serve(app.livereload);
     }
     else {
         await esbuild.build(options);

package/lib/private/build/hook.js

@@ -6,8 +6,9 @@ import log from "#log";
 import reducer from "#reducer";
 import $router from "#request/router";
 import s_layout_depth from "#symbol/layout-depth";
-import pkg from "@rcompat/fs/project/package";
-const core_pkg = await pkg(import.meta.url);
+import c from "@rcompat/cli/color";
+import fs from "@rcompat/fs";
+const core_pkg = await fs.project.package(import.meta.dirname);
 const { version } = await core_pkg.json();
 async function pre(app) {
     const dot_primate = app.path.build.join(".primate");
@@ -40,7 +41,7 @@ async function pre(app) {
 async function post(app) {
     await build_client(app);
     await build_server(app);
-    log.system("build written to {0}", app.path.build);
+    log.print(`✓ build path  ${c.dim(app.path.build.path)}\n`);
     app.cleanup();
     return app;
 }

package/lib/private/build/index.js

@@ -2,24 +2,25 @@ import BuildApp from "#build/App";
 import bye from "#bye";
 import default_config from "#config/index";
 import fail from "#fail";
-import log from "#log";
-import root from "@rcompat/fs/project/root";
-import empty from "@rcompat/record/empty";
 import Flags from "#Flags";
-const no_config = (config) => config === undefined || empty(config);
-const find_config = async (project_root) => {
-    const ts_config = project_root.join("config/app.ts");
+import log from "#log";
+import dict from "@rcompat/dict";
+import fs from "@rcompat/fs";
+import { s_config } from "#app/Facade";
+const no_config = (config) => config === undefined || dict.empty(config);
+const find_config = async (root) => {
+    const ts_config = root.join("config/app.ts");
     if (await ts_config.exists())
         return ts_config;
-    const js_config = project_root.join("config/app.js");
+    const js_config = root.join("config/app.js");
     if (await js_config.exists())
         return js_config;
 };
-const get_config = async (project_root) => {
-    const config = await find_config(project_root);
+const get_config = async (root) => {
+    const config = await find_config(root);
     if (config !== undefined) {
         try {
-            const imported = await config.import("default");
+            const imported = (await config.import("default"))[s_config];
             if (no_config(imported))
                 throw fail("empty config file at {0}", config);
             return imported;
@@ -32,10 +33,10 @@ const get_config = async (project_root) => {
 };
 export default async (input) => {
     try {
-        const package_root = await root();
+        const root = await fs.project.root();
         const flags = Flags.parse(input);
-        const config = await get_config(package_root);
-        const app = await new BuildApp(package_root, config, flags).init();
+        const config = await get_config(root);
+        const app = await new BuildApp(root, config, flags).init();
         await app.buildInit();
         return true;
     }

package/lib/private/build/presets.d.ts

@@ -0,0 +1,10 @@
+import type { TransformOptions } from "esbuild";
+declare const _default: {
+    readonly angular: TransformOptions;
+    readonly react: TransformOptions;
+    readonly solid: TransformOptions;
+    readonly typescript: TransformOptions;
+    readonly voby: TransformOptions;
+};
+export default _default;
+//# sourceMappingURL=presets.d.ts.map

package/lib/private/build/presets.js

@@ -0,0 +1,39 @@
+const angular = {
+    loader: "ts",
+    tsconfigRaw: {
+        compilerOptions: {
+            experimentalDecorators: true,
+        },
+    },
+};
+const react = {
+    jsx: "automatic",
+    loader: "tsx",
+};
+const solid = {
+    format: "esm",
+    jsx: "preserve",
+    loader: "tsx",
+    target: "esnext",
+};
+const typescript = {
+    loader: "ts",
+};
+const voby = {
+    jsx: "automatic",
+    loader: "tsx",
+    tsconfigRaw: {
+        compilerOptions: {
+            jsx: "react-jsx",
+            jsxImportSource: "voby",
+        },
+    },
+};
+export default {
+    angular,
+    react,
+    solid,
+    typescript,
+    voby,
+};
+//# sourceMappingURL=presets.js.map

package/lib/private/build/server/index.js

@@ -1,8 +1,8 @@
 import plugin_assets from "#build/server/plugin/assets";
 import plugin_config from "#build/server/plugin/config";
-import plugin_database_default from "#build/server/plugin/database-default";
+import plugin_db_default from "#build/server/plugin/db-default";
 import plugin_frontend from "#build/server/plugin/frontend";
-import plugin_hot_reload from "#build/server/plugin/hot-reload";
+import plugin_live_reload from "#build/server/plugin/live-reload";
 import plugin_native_addons from "#build/server/plugin/native-addons";
 import plugin_node_imports from "#build/server/plugin/node-imports";
 import plugin_requires from "#build/server/plugin/requires";
@@ -29,16 +29,14 @@ const conditions = {
     deno: ["deno", "node"],
 };
 export default async function build_server(app) {
-    const extensions = app.frontendExtensions;
     app.plugin("server", plugin_node_imports(app));
-    if (extensions.length > 0)
-        app.plugin("server", plugin_frontend(app));
+    app.plugin("server", plugin_frontend(app));
     app.plugin("server", plugin_view(app));
     app.plugin("server", plugin_store(app));
     app.plugin("server", plugin_store_wrap(app));
-    app.plugin("server", plugin_database_default(app));
+    app.plugin("server", plugin_db_default(app));
     if (app.mode === "development")
-        app.plugin("server", plugin_hot_reload(app));
+        app.plugin("server", plugin_live_reload(app));
     app.plugin("server", plugin_virtual_pages(app));
     app.plugin("server", plugin_virtual_routes(app));
     app.plugin("server", plugin_route(app));

package/lib/private/build/server/plugin/assets.js

@@ -1,5 +1,5 @@
 import location from "#location";
-import resolve from "@rcompat/http/mime/extension/resolve";
+import MIME from "@rcompat/http/mime";
 function bytes2base64(bytes) {
     const chunk_size = 0x8000;
     let result = "";
@@ -18,28 +18,30 @@ export default function plugin_server_assets(app) {
             });
             build.onLoad({ filter: /.*/, namespace: "primate-assets" }, async () => {
                 if (app.mode === "production") {
-                    const client_files = await app.runpath(location.client).collect();
+                    const client_files = await app.runpath(location.client).files({
+                        recursive: true,
+                    });
                     const client_assets = {};
                     for (const file of client_files) {
                         const pathname = `/${file.name}`;
                         const bytes = await file.bytes();
                         const base64 = bytes2base64(bytes);
                         client_assets[pathname] = {
-                            mime: resolve(file.name),
+                            mime: MIME.resolve(file.name),
                             data: base64,
                         };
                     }
                     const static_dir = app.root.join(location.static);
-                    const static_files = await static_dir.exists()
-                        ? await static_dir.collect()
-                        : [];
+                    const static_files = await static_dir.files({
+                        recursive: true,
+                    });
                     const static_assets = {};
                     for (const file of static_files) {
                         const pathname = file.debase(static_dir).path;
                         const bytes = await file.bytes();
                         const base64 = bytes2base64(bytes);
                         static_assets[pathname] = {
-                            mime: resolve(file.name),
+                            mime: MIME.resolve(file.name),
                             data: base64,
                         };
                     }

package/lib/private/build/server/plugin/config.js

@@ -1,9 +1,8 @@
-import fail from "#fail";
 export default function plugin_server_config(app) {
     return {
         name: "primate/server/config",
         setup(build) {
-            build.onResolve({ filter: /^app:config$/ }, async () => {
+            build.onResolve({ filter: /^(\$:app)$/ }, async () => {
                 const ts = app.path.config.join("app.ts");
                 if (await ts.exists())
                     return { path: ts.path };
@@ -34,8 +33,16 @@ export default function plugin_server_config(app) {
                 const js = app.path.config.join(`${name}.js`);
                 if (await js.exists())
                     return { path: js.path };
-                // should never happen as we only import when session_active is true
-                throw fail(`missing config for ${name} in app/config`);
+                return {
+                    path: `app-config-${name}-default`,
+                    namespace: "primate-config-default",
+                };
+            });
+            build.onLoad({ filter: /^app-config-.+-default$/, namespace: "primate-config-default" }, () => {
+                return {
+                    contents: "export default null;",
+                    loader: "js",
+                };
             });
         },
     };

package/lib/private/build/server/plugin/db-default.d.ts

@@ -0,0 +1,4 @@
+import type BuildApp from "#build/App";
+import type { Plugin } from "esbuild";
+export default function plugin_server_db_default(app: BuildApp): Plugin;
+//# sourceMappingURL=db-default.d.ts.map

package/lib/private/build/server/plugin/db-default.js

@@ -0,0 +1,45 @@
+import fail from "#fail";
+export default function plugin_server_db_default(app) {
+    const resolveDir = app.root.path;
+    const base = app.path.config.join("db");
+    const default_db = {
+        contents: "import db from \"primate/db\"; export default db();",
+        loader: "js",
+        resolveDir,
+    };
+    return {
+        name: "primate/server/db-default",
+        setup(build) {
+            build.onResolve({ filter: /^app:db/ }, () => {
+                return { path: "db-default", namespace: "primate-db" };
+            });
+            build.onLoad({ filter: /.*/, namespace: "primate-db" }, async () => {
+                if (!await base.exists())
+                    return default_db;
+                const dbs = await base.files({
+                    recursive: true,
+                    filter: f => f.name.endsWith(".ts") || f.name.endsWith(".js"),
+                });
+                if (dbs.length === 0)
+                    return default_db;
+                const by_name = {};
+                for (const d of dbs)
+                    by_name[d.name] = d;
+                const pick = (stem) => by_name[`${stem}.ts`] ?? by_name[`${stem}.js`];
+                let db = pick("index") ?? pick("default");
+                if (db === undefined) {
+                    if (dbs.length === 1)
+                        db = dbs[0];
+                    else
+                        throw fail("multiple database drivers, add index or default.(t|j)s; found {0}", dbs.map(f => f.name).join(", "));
+                }
+                return {
+                    contents: `export { default } from ${JSON.stringify(db.path)};`,
+                    loader: "js",
+                    resolveDir,
+                };
+            });
+        },
+    };
+}
+//# sourceMappingURL=db-default.js.map

package/lib/private/build/server/plugin/frontend.js

@@ -1,11 +1,13 @@
-import FileRef from "@rcompat/fs/FileRef";
+import fs from "@rcompat/fs";
 export default function plugin_server_frontend(app) {
     const filter = new RegExp(`(${app.frontendExtensions.map(e => e.replace(".", "\\.")).join("|")})$`);
     return {
         name: "primate/server/frontend",
         setup(build) {
+            if (app.frontendExtensions.length === 0)
+                return;
             build.onLoad({ filter, namespace: "file" }, async (args) => {
-                const file = new FileRef(args.path);
+                const file = fs.ref(args.path);
                 const binder = app.binder(file);
                 if (!binder)
                     return null;

package/lib/private/build/server/plugin/live-reload.d.ts

@@ -0,0 +1,4 @@
+import type BuildApp from "#build/App";
+import type { Plugin } from "esbuild";
+export default function plugin_server_live_reload(app: BuildApp): Plugin;
+//# sourceMappingURL=live-reload.d.ts.map

package/lib/private/build/server/plugin/{hot-reload.js → live-reload.js}

@@ -1,9 +1,9 @@
 import fail from "#fail";
-export default function plugin_server_hot_reload(app) {
+export default function plugin_server_live_reload(app) {
     let build_n = 0;
     let serve_app;
     return {
-        name: "primate/server/hot-reload",
+        name: "primate/server/live-reload",
         setup(build) {
             build.onEnd(async (result) => {
                 // don't do anything on errors
@@ -26,11 +26,11 @@ export default function plugin_server_hot_reload(app) {
                     build_n++;
                 }
                 catch (err) {
-                    fail("[primate/server/hot-reload] failed to import {0}", filename);
+                    fail("[primate/server/live-reload] failed to import {0}", filename);
                     console.error(err);
                 }
             });
         },
     };
 }
-//# sourceMappingURL=hot-reload.js.map
+//# sourceMappingURL=live-reload.js.map

package/lib/private/build/server/plugin/native-addons.js

@@ -1,6 +1,6 @@
 import fail from "#fail";
 import log from "#log";
-import FileRef from "@rcompat/fs/FileRef";
+import fs from "@rcompat/fs";
 import { createRequire } from "node:module";
 const requirer = createRequire(import.meta.url);
 export default function plugin_server_store(app) {
@@ -17,13 +17,15 @@ export default function plugin_server_store(app) {
                         const module_path = requirer.resolve(args.path, {
                             paths: [args.resolveDir],
                         });
-                        const module_dir = new FileRef(module_path).directory;
+                        const module_dir = fs.ref(module_path).directory;
                         // built-ins have no .node and would otherwise cause global search
                         if (module_dir.path === ".")
                             return null;
                         // check if this module has .node files
-                        const node_files = await module_dir
-                            .collect(f => f.path.endsWith(".node"));
+                        const node_files = await module_dir.files({
+                            recursive: true,
+                            filter: info => info.path.endsWith(".node"),
+                        });
                         if (node_files.length > 0) {
                             const platform = process.platform;
                             const arch = process.arch;

package/lib/private/build/server/plugin/node-imports.js

@@ -1,6 +1,6 @@
-import pkg from "@rcompat/fs/project/package";
+import fs from "@rcompat/fs";
 import { createRequire } from "node:module";
-const core_pkg = await pkg(import.meta.url);
+const core_pkg = await fs.project.package(import.meta.dirname);
 const core_root = core_pkg.directory.path;
 const requirer = createRequire(import.meta.url);
 export default function plugin_server_node_imports(_app) {

package/lib/private/build/server/plugin/route.js

@@ -1,6 +1,6 @@
 import fail from "#fail";
 import wrap from "#route/wrap";
-import FileRef from "@rcompat/fs/FileRef";
+import fs from "@rcompat/fs";
 const contents = "export default {};";
 export default function plugin_server_route(app) {
     const path_routes = app.path.routes;
@@ -18,7 +18,7 @@ export default function plugin_server_route(app) {
                 let file;
                 let extension;
                 for (const e of extensions) {
-                    const candidate = new FileRef(base.path + e);
+                    const candidate = fs.ref(base.path + e);
                     if (await candidate.exists()) {
                         file = candidate;
                         extension = e;

package/lib/private/build/server/plugin/store-wrap.js

@@ -1,4 +1,4 @@
-import FileRef from "@rcompat/fs/FileRef";
+import fs from "@rcompat/fs";
 export default function plugin_server_store_wrap(app) {
     return {
         name: "primate/server/store-wrap",
@@ -10,7 +10,7 @@ export default function plugin_server_store_wrap(app) {
                 // only TS/JS
                 if (!/\.([tj]s)$/.test(args.path))
                     return null;
-                const file = new FileRef(args.path);
+                const file = fs.ref(args.path);
                 const storesRoot = app.path.stores.path;
                 // only files under app/stores
                 if (!file.path.startsWith(storesRoot + "/"))

package/lib/private/build/server/plugin/store.js

@@ -1,4 +1,4 @@
-import FileRef from "@rcompat/fs/FileRef";
+import fs from "@rcompat/fs";
 export default function plugin_server_store(app) {
     return {
         name: "primate/server/store",
@@ -11,10 +11,10 @@ export default function plugin_server_store(app) {
                 const name = args.path;
                 return {
                     contents: `
-            import database from "app:database";
-            import wrap from "primate/database/wrap";
+            import db from "app:db";
+            import wrap from "primate/orm/wrap";
             import schema from "store:${name}";
-            export default wrap("${name}", schema, database);
+            export default wrap("${name}", schema, db);
           `,
                     loader: "js",
                     resolveDir: app.path.stores.path,
@@ -23,7 +23,7 @@ export default function plugin_server_store(app) {
             build.onResolve({ filter: /^store:/ }, async (args) => {
                 const name = args.path.slice("store:".length);
                 for (const ext of app.extensions) {
-                    const file = new FileRef(`${app.path.stores.path}/${name}${ext}`);
+                    const file = fs.ref(`${app.path.stores.path}/${name}${ext}`);
                     if (await file.exists()) {
                         // special namespace to bypass auto-wrap
                         return { path: file.path, namespace: "primate-store-raw" };
@@ -32,7 +32,7 @@ export default function plugin_server_store(app) {
                 return null;
             });
             build.onLoad({ filter: /.*/, namespace: "primate-store-raw" }, async (args) => {
-                const file = new FileRef(args.path);
+                const file = fs.ref(args.path);
                 const source = await file.text();
                 return {
                     contents: source,

package/lib/private/build/server/plugin/stores.js

@@ -1,5 +1,4 @@
-import FileRef from "@rcompat/fs/FileRef";
-const jts_re = /\.[jt]s$/;
+import fs from "@rcompat/fs";
 export default function plugin_server_stores(app) {
     const base = app.path.stores;
     return {
@@ -9,12 +8,12 @@ export default function plugin_server_stores(app) {
                 return { path: "stores-virtual", namespace: "primate-stores" };
             });
             build.onLoad({ filter: /.*/, namespace: "primate-stores" }, async () => {
-                const stores = await Promise.all((await base.collect(file => jts_re.test(file.path)))
+                const stores = await Promise.all((await base.files({ recursive: true, filter: /\.[jt]s$/ }))
                     .map(async (path) => `${path}`.replace(base.toString(), _ => "")));
                 const contents = `
         const stores = {};
-        ${stores.map(path => path.slice(1, -".js".length)).map((bare, i) => `import * as store${i} from "${FileRef.webpath(`app:store/${bare}`)}";
-           stores["${FileRef.webpath(bare)}"] = store${i}.default;`).join("\n")}
+        ${stores.map(path => path.slice(1, -".js".length)).map((bare, i) => `import * as store${i} from "${fs.webpath(`app:store/${bare}`)}";
+           stores["${fs.webpath(bare)}"] = store${i}.default;`).join("\n")}
         export default stores;
       `;
                 return { contents, loader: "js", resolveDir: app.root.path };

package/lib/private/build/server/plugin/view.js

@@ -1,4 +1,4 @@
-import FileRef from "@rcompat/fs/FileRef";
+import fs from "@rcompat/fs";
 export default function plugin_server_view(app) {
     return {
         name: "primate/server/view",
@@ -19,7 +19,7 @@ export default function plugin_server_view(app) {
                 // couldn't resolve, don't interfere
                 if (result.errors.length > 0 || !result.path)
                     return null;
-                const resolved = new FileRef(result.path);
+                const resolved = fs.ref(result.path);
                 // must live under app.path.views (e.g. app/views/...)
                 const views_root = app.path.views.path;
                 if (!resolved.path.startsWith(views_root + "/"))
@@ -40,7 +40,7 @@ export default function plugin_server_view(app) {
             build.onResolve({ filter: /^view:/ }, async (args) => {
                 const name = args.path.slice("view:".length);
                 for (const ext of app.extensions) {
-                    const file = new FileRef(`${app.path.views.path}/${name}${ext}`);
+                    const file = app.path.views.join(`${name}${ext}`);
                     if (await file.exists()) {
                         return { path: file.path, namespace: "primate-view-original" };
                     }
@@ -48,7 +48,7 @@ export default function plugin_server_view(app) {
                 return null;
             });
             build.onLoad({ filter: /.*/, namespace: "primate-view-original" }, async (args) => {
-                const file = new FileRef(args.path);
+                const file = fs.ref(args.path);
                 const binder = app.binder(file);
                 if (!binder)
                     return null;

package/lib/private/build/server/plugin/views.js

@@ -1,4 +1,4 @@
-import FileRef from "@rcompat/fs/FileRef";
+import fs from "@rcompat/fs";
 export default function plugin_server_views(app) {
     return {
         name: "primate/server/views",
@@ -7,15 +7,15 @@ export default function plugin_server_views(app) {
                 return { path: "views-virtual", namespace: "primate-views" };
             });
             build.onLoad({ filter: /.*/, namespace: "primate-views" }, async () => {
-                const files = await app.path.views.collect();
+                const files = await app.path.views.files({ recursive: true });
                 const roots = Object.keys(app.roots);
                 const contents = `
         const view = [];
         ${files.map((file, i) => {
                     const path = app.basename(file, app.path.views);
                     return `
-            import * as view${i} from "${FileRef.webpath(`view:${path}`)}";
-            view.push(["${FileRef.webpath(path)}", view${i}]);`;
+            import * as view${i} from "${fs.webpath(`view:${path}`)}";
+            view.push(["${fs.webpath(path)}", view${i}]);`;
                 }).join("\n")}
 
         ${roots.map((filename, i) => `

package/lib/private/build/server/plugin/virtual-pages.js

@@ -1,6 +1,5 @@
-import pkg from "@rcompat/fs/project/package";
-const core_pkg = await pkg(import.meta.url);
-const core_root = core_pkg.directory;
+import fs from "@rcompat/fs";
+const core_pkg = await fs.project.root(import.meta.dirname);
 export default function plugin_server_virtual_pages(app) {
     return {
         name: "primate/server/virtual/pages",
@@ -9,15 +8,16 @@ export default function plugin_server_virtual_pages(app) {
                 return { path: "pages-virtual", namespace: "primate-pages" };
             });
             build.onLoad({ filter: /.*/, namespace: "primate-pages" }, async () => {
-                const html = /^.*\.html$/ui;
-                const is_html = (file) => html.test(file.path);
-                const defaults = core_root.join("lib", "private", "defaults");
+                const filter = /^.*\.html$/ui;
+                const defaults = core_pkg.join("lib", "private", "defaults");
                 const pages = {};
-                for (const file of await defaults.collect(is_html))
+                for (const file of await defaults.files({ filter })) {
                     pages[file.name] = file;
+                }
                 if (await app.path.pages.exists()) {
-                    for (const file of await app.path.pages.collect(is_html))
+                    for (const file of await app.path.pages.files({ filter })) {
                         pages[file.name] = file;
+                    }
                 }
                 const entries = await Promise.all(Object.entries(pages).map(async ([name, file]) => {
                     const text = await file.text();