@primate/core 0.5.0 → 0.6.0

package/lib/private/app/Facade.d.ts

@@ -1,10 +1,12 @@
+import type EnvSchema from "#app/EnvSchema";
+import type ServerView from "#client/ServerView";
 import type Config from "#config/Config";
-import type ServerView from "#frontend/ServerView";
 import type ServeApp from "#serve/App";
+import type { ObjectType } from "pema";
 declare const s_attach: unique symbol;
 declare const s_config: unique symbol;
 export { s_attach, s_config };
-export default class AppFacade {
+export default class AppFacade<T extends EnvSchema = EnvSchema> {
     #private;
     constructor(config: Config);
     [s_attach](app: ServeApp): void;
@@ -27,14 +29,25 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
             };
         };
     };
-    config<P extends string>(path: P): P extends `${infer P1}.${infer Rest}` ? P1 extends "http" | "livereload" | "request" | "modules" ? (Rest extends `${infer P1}.${infer Rest}` ? P1 extends keyof Exclude<{
+    config<P extends string>(path: P): P extends `${infer P1}.${infer Rest}` ? P1 extends "http" | "livereload" | "db" | "env" | "request" | "modules" ? (Rest extends `${infer P1}.${infer Rest}` ? P1 extends keyof Exclude<{
         http: {
             csp: Record<string, string[]> | undefined;
             headers: Record<string, string> | undefined;
@@ -53,7 +66,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -78,7 +102,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -103,7 +138,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -128,7 +174,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -153,7 +210,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -178,7 +246,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -203,7 +282,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -228,7 +318,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -253,7 +354,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -278,7 +390,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -303,7 +426,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -328,7 +462,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -353,7 +498,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -378,7 +534,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -403,7 +570,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -428,7 +606,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -453,7 +642,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -478,7 +678,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -503,7 +714,18 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
@@ -528,13 +750,24 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
             };
         };
-    }[P1] & undefined) : undefined : P extends "http" | "livereload" | "request" | "modules" ? {
+    }[P1] & undefined) : undefined : P extends "http" | "livereload" | "db" | "env" | "request" | "modules" ? {
         http: {
             csp: Record<string, string[]> | undefined;
             headers: Record<string, string> | undefined;
@@ -553,14 +786,26 @@ export default class AppFacade {
             host: string | undefined;
             port: number | undefined;
         };
-        modules: import("../Module.js").default[] | undefined;
+        db: {
+            migrations: {
+                table: string;
+                db: import("../db/DB.js").default;
+            } | undefined;
+        };
+        env: {
+            schema: ObjectType<import("@rcompat/dict").Dict<import("pema").Parsed<unknown>>, {
+                [x: string]: unknown;
+            }> | undefined;
+        };
+        modules: import("../Module.js").default[];
         request: {
             body: {
                 parse: boolean;
             };
         };
     }[P] : undefined;
-    view<T = ServerView>(name: string): T;
+    env<K extends keyof T>(key: K): T[K]["infer"];
+    view<SV = ServerView>(name: string): SV;
     get root(): import("@rcompat/fs").FileRef;
 }
 //# sourceMappingURL=Facade.d.ts.map

package/lib/private/app/Facade.js

@@ -1,15 +1,30 @@
+import E from "#errors";
 import dict from "@rcompat/dict";
+import env from "@rcompat/env";
+import ParseError from "pema/ParseError";
 const s_attach = Symbol("attach");
 const s_config = Symbol("config");
 export { s_attach, s_config };
 export default class AppFacade {
     #config;
     #app;
+    #env;
     constructor(config) {
         this.#config = config;
     }
     [s_attach](app) {
         this.#app = app;
+        const schema = this.#config.env.schema;
+        if (schema !== undefined) {
+            try {
+                this.#env = schema.coerce(env.toJSON());
+            }
+            catch (error) {
+                if (ParseError.is(error))
+                    throw E.env_invalid_schema(error);
+                throw error;
+            }
+        }
     }
     get [s_config]() {
         return this.#config;
@@ -17,6 +32,14 @@ export default class AppFacade {
     config(path) {
         return dict.get(this.#config, path);
     }
+    env(key) {
+        if (this.#env !== undefined) {
+            if (!(key in this.#env))
+                throw E.env_missing_key(key);
+            return this.#env[key];
+        }
+        return env.get(key);
+    }
     get #with() {
         if (!this.#app)
             throw new Error("ServeApp not bound yet (used too early)");

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

@@ -2,6 +2,8 @@ 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 plugin_view from "#build/client/plugin/view";
+import plugin_app_request from "#build/shared/plugin/app-request";
 import location from "#location";
 import * as esbuild from "esbuild";
 const write_bootstrap = async (app, mode) => {
@@ -34,8 +36,8 @@ const write_bootstrap = async (app, mode) => {
       views,
       pages,
       mode: "${mode}",
-      session_config,
-      i18n_config,
+      session: session_config,
+      i18n: i18n_config,
       target: "${app.target.name}",
     });
 
@@ -46,6 +48,8 @@ const write_bootstrap = async (app, mode) => {
 export default async function build_client(app) {
     app.plugin("client", plugin_frontend(app));
     app.plugin("client", plugin_alias(app));
+    app.plugin("client", plugin_view(app));
+    app.plugin("client", plugin_app_request(app));
     app.plugin("client", plugin_server_stamp(app));
     app.plugin("client", plugin_entrypoint(app));
     const imports = await app.path.static.files({
@@ -57,6 +61,7 @@ export default async function build_client(app) {
         app.entrypoint(`import "./${location.static}${src}";`);
     });
     app.entrypoint("import \"primate/client/app\";");
+    const tsconfig = app.root.join("tsconfig.json");
     const conditions = app.conditions.values();
     const build_options = {
         plugins: app.plugins("client"),
@@ -64,7 +69,7 @@ export default async function build_client(app) {
         entryPoints: ["app:client"],
         conditions: ["style", "browser", "default", "module", ...conditions],
         resolveExtensions: [".ts", ".js", ...app.frontendExtensions],
-        tsconfig: app.root.join("tsconfig.json").path,
+        ...await tsconfig.exists() ? { tsconfig: tsconfig.path } : {},
         bundle: true,
         format: "esm",
     };

package/lib/private/build/client/plugin/app-request.d.ts

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

package/lib/private/build/client/plugin/app-request.js

@@ -0,0 +1,19 @@
+export default function plugin_client_request(app) {
+    return {
+        name: "primate/client/app/request",
+        setup(build) {
+            build.onResolve({ filter: /^app:request$/ }, ({ importer }) => {
+                const frontend = [...app.frontends.entries()]
+                    .find(([, exts]) => exts.some(ext => importer.endsWith(ext)));
+                return frontend !== undefined
+                    ? { namespace: "request", path: frontend[0] }
+                    : undefined;
+            });
+            build.onLoad({ filter: /.*/, namespace: "request" }, async ({ path }) => {
+                const contents = `export { default } from "@primate/${path}/request";`;
+                return { contents, resolveDir: app.root.path };
+            });
+        },
+    };
+}
+//# sourceMappingURL=app-request.js.map

package/lib/private/build/client/plugin/view.d.ts

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

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

@@ -0,0 +1,13 @@
+import location from "#location";
+export default function plugin_client_view(app) {
+    return {
+        name: "primate/client/view",
+        setup(build) {
+            build.onResolve({ filter: /^view:/ }, args => {
+                const name = args.path.slice("view:".length);
+                return { path: app.root.join(location.views, name).path };
+            });
+        },
+    };
+}
+//# sourceMappingURL=view.js.map

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

@@ -1,4 +1,3 @@
 import type BuildApp from "#build/App";
-declare const _default: (app: BuildApp) => Promise<BuildApp>;
-export default _default;
+export default function run_build_hooks(app: BuildApp): Promise<BuildApp>;
 //# sourceMappingURL=hook.d.ts.map

package/lib/private/build/hook.js

@@ -1,9 +1,8 @@
 import build_client from "#build/client/index";
 import build_server from "#build/server/index";
-import fail from "#fail";
+import E from "#errors";
 import location from "#location";
 import log from "#log";
-import reducer from "#reducer";
 import $router from "#request/router";
 import s_layout_depth from "#symbol/layout-depth";
 import c from "@rcompat/cli/color";
@@ -11,22 +10,16 @@ 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");
-    if (await app.path.build.exists() && !await dot_primate.exists()) {
-        const message = "{0} exists but does not contain a previous build";
-        throw fail(message, app.path.build.path);
+    const build_json = app.path.build.join("build.json");
+    const build_path = app.path.build;
+    if (await build_path.exists() && !await build_json.exists()) {
+        throw E.build_previous_build_exists(build_path);
     }
-    // remove build directory if exists
     await app.path.build.remove();
     await app.path.build.create();
-    // touch a .primate file to indicate this is a Primate build directory
-    await dot_primate.write(version);
     await app.runpath(location.client).create();
     const stamp = app.runpath("client", "server-stamp.js");
     await stamp.write("export default 0;\n");
-    // this has to occur before post, so that layout depth is available for
-    // compiling root views
-    // bindings should have been registered during `init`
     const router = await $router(app.path.routes, app.extensions);
     app.set(s_layout_depth, router.depth("layout"));
     const i18n_ts = app.path.config.join("i18n.ts");
@@ -35,16 +28,28 @@ async function pre(app) {
     const session_ts = app.path.config.join("session.ts");
     const session_js = app.path.config.join("session.js");
     app.session_active = await session_ts.exists() || await session_js.exists();
-    return app;
 }
-;
 async function post(app) {
     await build_client(app);
     await build_server(app);
+    // write build.json with version and migration_version
+    const migrations_dir = app.root.join("migrations");
+    let migration_version = 0;
+    if (await migrations_dir.exists()) {
+        const files = await migrations_dir.files({ filter: /\d+-.*\.[jt]s$/ });
+        migration_version = files.length === 0 ? 0 : Math.max(...files.map(f => parseInt(f.name.split("-")[0])));
+    }
+    await app.path.build.join("build.json").writeJSON({
+        version,
+        migration_version,
+    });
     log.print(`✓ build path  ${c.dim(app.path.build.path)}\n`);
     app.cleanup();
     return app;
 }
-;
-export default async (app) => post(await reducer(app.modules, await pre(app), "build"));
+export default async function run_build_hooks(app) {
+    await pre(app);
+    await app.build_hooks(app);
+    return post(app);
+}
 //# sourceMappingURL=hook.js.map