primate 0.35.0 → 0.36.0

package/lib/app.tsconfig.json

@@ -9,6 +9,9 @@
     "skipLibCheck": true,
     "erasableSyntaxOnly": true,
     "exactOptionalPropertyTypes": true,
-    "allowImportingTsExtensions": true
+    "allowImportingTsExtensions": true,
+    "types": [
+      "primate"
+    ]
   }
 }

package/lib/commands/init.js

@@ -1,3 +1,4 @@
+import color from "@rcompat/cli/color";
 import cancel from "@rcompat/cli/prompts/cancel";
 import intro from "@rcompat/cli/prompts/intro";
 import is_cancel from "@rcompat/cli/prompts/is-cancel";
@@ -5,8 +6,7 @@ import multiselect from "@rcompat/cli/prompts/multiselect";
 import outro from "@rcompat/cli/prompts/outro";
 import select from "@rcompat/cli/prompts/select";
 import text from "@rcompat/cli/prompts/text";
-import FileRef from "@rcompat/fs/FileRef";
-import dedent from "@rcompat/string/dedent";
+import fs from "@rcompat/fs";
 function abort() {
     return cancel("Aborted");
 }
@@ -36,7 +36,6 @@ const DATABASE_OPTIONS = [
     { label: "PostgreSQL", value: "postgresql" },
     { label: "MySQL", value: "mysql" },
     { label: "MongoDB", value: "mongodb" },
-    { label: "SurrealDB", value: "surrealdb" },
 ];
 // peer deps per frontend (npm names)
 const FRONTEND_PEER_DEPS = {
@@ -64,7 +63,7 @@ export default async function init() {
         });
         if (typeof ans === "symbol" || is_cancel(ans))
             return abort();
-        target = new FileRef(ans);
+        target = fs.ref(ans);
         if (await empty(target)) {
             directory = ans;
             break; // valid directory found, exit loop
@@ -127,11 +126,11 @@ export default async function init() {
     if (typeof sessions === "symbol" || is_cancel(sessions))
         return abort();
     const withSessions = sessions === "yes";
-    await target.create({ recursive: true });
-    await target.join("routes").create({ recursive: true });
-    await target.join("views").create({ recursive: true });
+    await target.create();
+    await target.join("routes").create();
+    await target.join("views").create();
     if (db !== undefined)
-        await target.join("stores").create({ recursive: true });
+        await target.join("stores").create();
     // files
     await gitignore(target);
     await tsconfig_json(target, { frontends });
@@ -145,10 +144,7 @@ export default async function init() {
     await package_json(target, { directory, runtime });
     const packages = compute_packages({ frontends: frontends, backends: backends, db });
     const install = build_install_command(runtime, packages, directory);
-    outro([
-        "Done, now run",
-        `\n  ${install.print}`,
-    ].join("\n"));
+    outro(`${color.green("done, now run")} ${color.dim(install.print)}`);
     process.exit();
 }
 async function empty(directory) {
@@ -164,7 +160,7 @@ async function empty(directory) {
 }
 async function gitignore(root) {
     const gi = root.join(".gitignore");
-    await gi.directory.create({ recursive: true });
+    await gi.directory.create();
     const content = [
         "node_modules",
         "build",
@@ -181,7 +177,7 @@ async function gitignore(root) {
 }
 async function app_config(root, c) {
     const config = root.join("config").join("app.ts");
-    await config.directory.create({ recursive: true });
+    await config.directory.create();
     const frontend_imports = c.frontends
         .map((f) => `import ${to_ident(f)} from "@primate/${f}";`)
         .join("\n");
@@ -192,16 +188,15 @@ async function app_config(root, c) {
         ...c.frontends.map((f) => `${to_ident(f)}()`),
         ...c.backends.map((b) => `${to_ident(b)}()`),
     ];
-    const body = dedent `import config from "primate/config";
-    ${frontend_imports}
-    ${backend_imports}
+    const body = `import config from "primate/config";
+${frontend_imports}
+${backend_imports}
 
-    export default config({
-      modules: [
-        ${modules.join(",\n    ")}
-      ],
-    });
-  `;
+export default config({
+  modules: [
+    ${modules.join(",\n    ")}
+  ],
+});`;
     await config.write(body);
 }
 // i18n scaffold: config + a default locale file
@@ -209,42 +204,38 @@ async function i18n_config(root) {
     const locales = root.join("locales");
     const en_us = locales.join("en-US.ts");
     const i18i = root.join("config").join("i18n.ts");
-    await en_us.directory.create({ recursive: true });
-    await i18i.directory.create({ recursive: true });
-    const locale = dedent `import locale from "primate/i18n/locale";
-    export default locale({
-      hi: "Hello",
-      placeheld: "Hello, {name}",
-    });
-  `;
+    await en_us.directory.create();
+    await i18i.directory.create();
+    const locale = `import locale from "primate/i18n/locale";
+export default locale({
+  hi: "Hello",
+  placeheld: "Hello, {name}",
+});`;
     await en_us.write(locale);
-    const config = dedent `import en from "#locale/en-US";
-    import i18n from "primate/config/i18n";
+    const config = `import en from "#locale/en-US";
+import i18n from "primate/config/i18n";
 
-    export default i18n({
-      defaultLocale: "en-US",
-      locales: {
-        "en-US": en,
-      },
-    });
-  `;
+export default i18n({
+  defaultLocale: "en-US",
+  locales: {
+    "en-US": en,
+  },
+});`;
     await i18i.write(config);
 }
 async function session_config(root) {
     const file = root.join("config").join("session.ts");
-    await file.directory.create({ recursive: true });
-    const body = dedent `import session from "primate/config/session";
-    export default session({});
-  `;
+    await file.directory.create();
+    const body = `import session from "primate/config/session";
+export default session({});`;
     await file.write(body);
 }
 async function database_config(root, db) {
     const file = root.join("config").join("database").join("index.ts");
-    await file.directory.create({ recursive: true });
+    await file.directory.create();
     const ident = to_ident(db);
-    const body = dedent `import ${ident} from "@primate/${db}";
-    export default ${ident}();
-  `;
+    const body = `import ${ident} from "@primate/${db}";
+export default ${ident}();`;
     await file.write(body);
 }
 async function package_json(root, c) {
@@ -355,6 +346,7 @@ async function tsconfig_json(root, opts) {
     const tsconfig = {
         extends: "primate/tsconfig",
         compilerOptions: {
+            baseUrl: "${configDir}",
             paths: {
                 "#config/*": ["config/*"],
                 "#session": ["config/session"],

package/lib/commands/serve.js

@@ -1,12 +1,11 @@
-import FileRef from "@rcompat/fs/FileRef";
-import root from "@rcompat/fs/project/root";
+import fs from "@rcompat/fs";
 import get_flag from "./get-flag.js";
 const load = async () => {
     try {
-        return await root();
+        return await fs.project.root();
     }
     catch {
-        return FileRef.resolve();
+        return fs.resolve();
     }
 };
 // serve from build directory

package/lib/commands/test.js

@@ -1,9 +1,8 @@
 import { tests } from "#test";
 import build from "@primate/core/build";
-import green from "@rcompat/cli/color/green";
-import red from "@rcompat/cli/color/red";
-import root from "@rcompat/fs/project/root";
-import entries from "@rcompat/record/entries";
+import color from "@rcompat/cli/color";
+import entries from "@rcompat/dict/entries";
+import fs from "@rcompat/fs";
 import equals from "@rcompat/test/equals";
 import includes from "@rcompat/test/includes";
 import serve from "./serve.js";
@@ -20,8 +19,8 @@ const first_error = (left, right) => {
 export default async () => {
     await build({ mode: "testing" });
     const app = (await serve()).default;
-    const files = await (await root()).join(directory)
-        .list(({ path }) => path.endsWith(".ts") || path.endsWith(".js"));
+    const files = await (await fs.project.root()).join(directory)
+        .list({ filter: f => f.path.endsWith(".ts") || f.path.endsWith(".js") });
     // side effects
     await Promise.all(files.map(file => file.import()));
     for (const test of tests) {
@@ -114,18 +113,18 @@ export default async () => {
         const failed = results.find(result => !result[0]);
         const verb = test.verb.toUpperCase();
         if (failed !== undefined) {
-            const routeText = typeof test.route === "string"
+            const route_text = typeof test.route === "string"
                 ? test.route
                 : new URL(test.route.url).pathname;
-            console.log(red(`${verb} ${routeText}`));
+            console.log(color.red(`${verb} ${route_text}`));
             const expected = JSON.stringify(failed[1]);
             const actual = JSON.stringify(failed[2]);
             const n = first_error(expected, actual);
-            console.log(`expected: ${expected.slice(0, n)}${green(expected[n])}${expected.slice(n + 1)}`);
-            console.log(`actual:   ${actual.slice(0, n)}${red(actual[n])}${actual.slice(n + 1)}`);
+            console.log(`expected: ${expected.slice(0, n)}${color.green(expected[n])}${expected.slice(n + 1)}`);
+            console.log(`actual:   ${actual.slice(0, n)}${color.red(actual[n])}${actual.slice(n + 1)}`);
         }
         else {
-            console.log(green(`${verb} ${path}`));
+            console.log(color.green(`${verb} ${path}`));
         }
     }
     await app.stop();

package/lib/index.d.ts

@@ -0,0 +1,10 @@
+declare module "app:views" {
+  const views: [string, Record<string, unknown>][];
+  export default views;
+}
+
+declare module "$:app" {
+  import type AppFacade from "primate/AppFacade";
+  const facade: AppFacade;
+  export default facade;
+}

package/lib/init.js

@@ -1,12 +1,14 @@
-import blue from "@rcompat/cli/color/blue";
-import bold from "@rcompat/cli/color/bold";
+import c from "@rcompat/cli/color";
 import print from "@rcompat/cli/print";
-import pkg from "@rcompat/fs/project/package";
+import fs from "@rcompat/fs";
 import find from "./commands/index.js";
+function orange(x) {
+    return `\x1b[38;2;255;165;0m${x}\x1b[0m`;
+}
 export default async (...args) => {
     const [command, ...flags] = args;
-    const { name, version, } = await (await pkg(import.meta.url)).json();
-    print(blue(bold(name)), blue(version), "\n");
+    const { name, version, } = await (await fs.project.package(import.meta.dirname)).json();
+    print(c.bold(orange((name.toUpperCase()))), orange(version), "\n\n");
     find(command)(flags);
 };
 //# sourceMappingURL=init.js.map

package/lib/private/test.d.ts

@@ -1,6 +1,5 @@
 import verbs from "@primate/core/request/verbs";
-import type Dict from "@rcompat/type/Dict";
-import type JSONValue from "@rcompat/type/JSONValue";
+import type { Dict, JSONValue } from "@rcompat/type";
 export type Body = JSONValue;
 export type MockedResponse = {
     body: {

package/lib/public/AppFacade.d.ts

@@ -0,0 +1,2 @@
+export type { default } from "@primate/core/AppFacade";
+//# sourceMappingURL=AppFacade.d.ts.map

package/lib/public/AppFacade.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=AppFacade.js.map

package/lib/public/db.d.ts

@@ -0,0 +1,4 @@
+import MemoryDB from "@primate/core/db/MemoryDB";
+declare const _default: () => MemoryDB;
+export default _default;
+//# sourceMappingURL=db.d.ts.map

package/lib/public/db.js

@@ -0,0 +1,3 @@
+import MemoryDB from "@primate/core/db/MemoryDB";
+export default () => new MemoryDB();
+//# sourceMappingURL=db.js.map

package/lib/public/orm/key.d.ts

@@ -0,0 +1,2 @@
+export { default } from "@primate/core/orm/key";
+//# sourceMappingURL=key.d.ts.map

package/lib/public/orm/key.js

@@ -0,0 +1,2 @@
+export { default } from "@primate/core/orm/key";
+//# sourceMappingURL=key.js.map

package/lib/public/orm/relation.d.ts

@@ -0,0 +1,2 @@
+export { default } from "@primate/core/orm/relation";
+//# sourceMappingURL=relation.d.ts.map

package/lib/public/orm/relation.js

@@ -0,0 +1,2 @@
+export { default } from "@primate/core/orm/relation";
+//# sourceMappingURL=relation.js.map

package/lib/public/orm/store.d.ts

@@ -0,0 +1,4 @@
+import Store from "@primate/core/orm/Store";
+declare const _default: typeof Store.new;
+export default _default;
+//# sourceMappingURL=store.d.ts.map

package/lib/public/orm/store.js

@@ -0,0 +1,3 @@
+import Store from "@primate/core/orm/Store";
+export default Store.new;
+//# sourceMappingURL=store.js.map

package/lib/public/orm/wrap.d.ts

@@ -0,0 +1,2 @@
+export { default } from "@primate/core/orm/wrap";
+//# sourceMappingURL=wrap.d.ts.map

package/lib/public/orm/wrap.js

@@ -0,0 +1,2 @@
+export { default } from "@primate/core/orm/wrap";
+//# sourceMappingURL=wrap.js.map

package/lib/public/request.d.ts

@@ -0,0 +1,2 @@
+export { type RequestFacade } from "@primate/core/request";
+//# sourceMappingURL=request.d.ts.map

package/lib/public/request.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=request.js.map

package/lib/public/response.d.ts

@@ -1,23 +1,4 @@
-import binary from "@primate/core/response/binary";
-import error from "@primate/core/response/error";
-import view from "@primate/core/response/view";
-export type { default as ViewResponse } from "@primate/core/frontend/ViewResponse";
-export type { default as ResponseFunction } from "@primate/core/response/ResponseFunction";
+export type { default as ViewResponse, } from "@primate/core/frontend/ViewResponse";
 export type { default as ServeApp } from "@primate/core/ServeApp";
-declare const _default: {
-    binary: typeof binary;
-    error: typeof error;
-    json: (body: unknown, init?: ResponseInit) => (app: import("@primate/core/ServeApp").default) => import("@rcompat/type/MaybePromise").default<Response>;
-    redirect: (location: string, status?: 302 | 301 | 300 | 304 | 308 | 303 | 307) => import("@primate/core/response/ResponseFunction").default;
-    sse: (body: {
-        close?(): undefined;
-        open(events: {
-            send(name: string, data: unknown): undefined;
-        }): undefined;
-    }, init?: ResponseInit) => (app: import("@primate/core/ServeApp").default) => import("@rcompat/type/MaybePromise").default<Response>;
-    text: (body: string, init?: ResponseInit) => (app: import("@primate/core/ServeApp").default) => import("@rcompat/type/MaybePromise").default<Response>;
-    view: typeof view;
-    ws: (actions: import("@rcompat/http/Actions").default) => import("@primate/core/response/ResponseFunction").default;
-};
-export default _default;
+export { default, type ResponseFunction } from "@primate/core/response";
 //# sourceMappingURL=response.d.ts.map

package/lib/public/response.js

@@ -1,19 +1,2 @@
-import binary from "@primate/core/response/binary";
-import error from "@primate/core/response/error";
-import json from "@primate/core/response/json";
-import redirect from "@primate/core/response/redirect";
-import sse from "@primate/core/response/sse";
-import text from "@primate/core/response/text";
-import view from "@primate/core/response/view";
-import ws from "@primate/core/response/ws";
-export default {
-    binary,
-    error,
-    json,
-    redirect,
-    sse,
-    text,
-    view,
-    ws,
-};
+export { default } from "@primate/core/response";
 //# sourceMappingURL=response.js.map

package/lib/public/route/hook.d.ts

@@ -0,0 +1,2 @@
+export { default } from "@primate/core/route/hook";
+//# sourceMappingURL=hook.d.ts.map

package/lib/public/route/hook.js

@@ -0,0 +1,2 @@
+export { default } from "@primate/core/route/hook";
+//# sourceMappingURL=hook.js.map

package/lib/runtime/FileRef.d.ts

@@ -1,2 +1,3 @@
-export { default } from "#runtime/FileRef";
+declare const FileRef: typeof import("@rcompat/fs").FileRef;
+export { FileRef as default };
 //# sourceMappingURL=FileRef.d.ts.map

package/lib/runtime/FileRef.js

@@ -1,2 +1,4 @@
-export { default } from "#runtime/FileRef";
+import fs from "@rcompat/fs";
+const FileRef = fs.FileRef;
+export { FileRef as default };
 //# sourceMappingURL=FileRef.js.map

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "primate",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",
+  "type": "module",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/primate-run/primate",
+    "directory": "packages/primate"
+  },
   "files": [
     "/lib/app.tsconfig.json",
     "/lib/**/*.js",
@@ -12,37 +18,32 @@
     "!/**/*.spec.*"
   ],
   "bin": "lib/bin.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/primate-run/primate",
-    "directory": "packages/primate"
+  "types": "lib/index.d.ts",
+  "dependencies": {
+    "@rcompat/args": "^0.11.0",
+    "@rcompat/cli": "^0.14.0",
+    "@rcompat/dict": "^0.3.1",
+    "@rcompat/fs": "^0.25.2",
+    "@rcompat/http": "~0.21.0",
+    "@rcompat/test": "^0.8.3",
+    "@primate/core": "^0.5.0"
   },
   "devDependencies": {
-    "@rcompat/record": "^0.9.1",
-    "pema": "^0.4.0"
-  },
-  "dependencies": {
-    "@rcompat/args": "^0.8.0",
-    "@rcompat/cli": "^0.11.3",
-    "@rcompat/fs": "^0.22.3",
-    "@rcompat/http": "~0.16.0",
-    "@rcompat/runtime": "^0.6.0",
-    "@rcompat/string": "^0.10.0",
-    "@rcompat/test": "^0.5.0",
-    "@primate/core": "^0.4.0"
+    "@rcompat/type": "^0.9.0"
   },
   "engines": {
     "node": ">=20"
   },
-  "type": "module",
   "imports": {
     "#*": {
       "apekit": "./src/private/*.ts",
       "default": "./lib/private/*.js"
-    },
-    "#runtime/FileRef": "@rcompat/fs/FileRef"
+    }
   },
   "exports": {
+    ".": {
+      "types": "./lib/index.d.ts"
+    },
     "./tsconfig": "./lib/app.tsconfig.json",
     "./runtime/*": {
       "apekit": "./src/runtime/*.ts",
@@ -58,7 +59,7 @@
     }
   },
   "scripts": {
-    "build": "npm run clean && tsc && cp src/app.tsconfig.json lib",
+    "build": "npm run clean && tsc && cp src/{app.tsconfig.json,index.d.ts} lib",
     "clean": "rm -rf ./lib",
     "lint": "eslint ."
   }

package/lib/public/RequestFacade.d.ts

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/request/RequestFacade";
-//# sourceMappingURL=RequestFacade.d.ts.map

package/lib/public/RequestFacade.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=RequestFacade.js.map

package/lib/public/database/Store.d.ts

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/database/Store";
-//# sourceMappingURL=Store.d.ts.map

package/lib/public/database/Store.js

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/database/Store";
-//# sourceMappingURL=Store.js.map

package/lib/public/database/default.d.ts

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/database/InMemoryDatabase";
-//# sourceMappingURL=default.d.ts.map

package/lib/public/database/default.js

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/database/InMemoryDatabase";
-//# sourceMappingURL=default.js.map

package/lib/public/database/wrap.d.ts

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/database/wrap";
-//# sourceMappingURL=wrap.d.ts.map

package/lib/public/database/wrap.js

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/database/wrap";
-//# sourceMappingURL=wrap.js.map

package/lib/public/fs/FileRef.d.ts

@@ -1,2 +0,0 @@
-export { default } from "@rcompat/fs/FileRef";
-//# sourceMappingURL=FileRef.d.ts.map

package/lib/public/fs/FileRef.js

@@ -1,2 +0,0 @@
-export { default } from "@rcompat/fs/FileRef";
-//# sourceMappingURL=FileRef.js.map

package/lib/public/pema.d.ts

@@ -1,2 +0,0 @@
-export { default } from "pema";
-//# sourceMappingURL=pema.d.ts.map

package/lib/public/pema.js

@@ -1,2 +0,0 @@
-export { default } from "pema";
-//# sourceMappingURL=pema.js.map

package/lib/public/request/Facade.d.ts

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/request/RequestFacade";
-//# sourceMappingURL=Facade.d.ts.map

package/lib/public/request/Facade.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Facade.js.map

package/lib/public/store.d.ts

@@ -1,4 +0,0 @@
-import Store from "@primate/core/database/Store";
-declare const _default: typeof Store.new;
-export default _default;
-//# sourceMappingURL=store.d.ts.map

package/lib/public/store.js

@@ -1,3 +0,0 @@
-import Store from "@primate/core/database/Store";
-export default Store.new;
-//# sourceMappingURL=store.js.map

package/lib/public/wasm/instantiate.d.ts

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/wasm/instantiate";
-//# sourceMappingURL=instantiate.d.ts.map

package/lib/public/wasm/instantiate.js

@@ -1,2 +0,0 @@
-export { default } from "@primate/core/wasm/instantiate";
-//# sourceMappingURL=instantiate.js.map