@primate/native 0.3.0 → 0.5.0

package/lib/private/Module.d.ts

@@ -6,8 +6,8 @@ import type NextBuild from "@primate/core/NextBuild";
 import type NextServe from "@primate/core/NextServe";
 import type ServeApp from "@primate/core/ServeApp";
 declare const schema: import("pema").ObjectType<{
-    debug: import("pema").DefaultType<import("pema/boolean").BooleanType, false>;
-    start: import("pema").DefaultType<import("pema/string").StringType, "/">;
+    debug: import("pema").DefaultType<import("pema").BooleanType, false>;
+    start: import("pema").DefaultType<import("pema").StringType, "/">;
 }>;
 export default class NativeModule extends Module {
     #private;
@@ -17,9 +17,9 @@ export default class NativeModule extends Module {
         start?: string | undefined;
     } | undefined;
     constructor(config: typeof schema.input);
-    init<T extends App>(app: T, next: Next<T>): import("@rcompat/type/MaybePromise").default<T>;
-    build(app: BuildApp, next: NextBuild): import("@rcompat/type/MaybePromise").default<BuildApp>;
-    serve(app: ServeApp, next: NextServe): import("@rcompat/type/MaybePromise").default<ServeApp>;
+    init<T extends App>(app: T, next: Next<T>): import("@rcompat/type").MaybePromise<T>;
+    build(app: BuildApp, next: NextBuild): import("@rcompat/type").MaybePromise<BuildApp>;
+    serve(app: ServeApp, next: NextServe): import("@rcompat/type").MaybePromise<ServeApp>;
 }
 export {};
 //# sourceMappingURL=Module.d.ts.map

package/lib/private/Module.js

@@ -2,15 +2,13 @@ import command from "#command";
 import targets from "#targets";
 import log from "@primate/core/log";
 import Module from "@primate/core/Module";
-import dim from "@rcompat/cli/color/dim";
-import execute from "@rcompat/stdio/execute";
-import pema from "pema";
-import boolean from "pema/boolean";
-import string from "pema/string";
+import color from "@rcompat/cli/color";
+import io from "@rcompat/io";
+import p from "pema";
 const names = targets.map(t => t.name);
-const schema = pema({
-    debug: boolean.default(false),
-    start: string.default("/"),
+const schema = p({
+    debug: p.boolean.default(false),
+    start: p.string.default("/"),
 });
 export default class NativeModule extends Module {
     name = "native";
@@ -28,7 +26,7 @@ export default class NativeModule extends Module {
         if (names.includes(app.target.name)) {
             app.done(async () => {
                 const { exe, flags } = app.target.get();
-                const executable_path = dim(`${app.path.build}/${exe}`);
+                const executable_path = color.dim(`${app.path.build}/${exe}`);
                 const { host, port } = app.config("http");
                 await app.runpath("worker.js").write(`
           import target from "@primate/native/target/${app.target.target}";
@@ -37,9 +35,9 @@ export default class NativeModule extends Module {
           webview.navigate("http://${host}:${port}/${this.#config.start}");
           webview.run();
         `);
-                await execute(command({
+                await io.run(command({
                     exe,
-                    files: ["serve.js", "worker.js"],
+                    files: ["server.js", "worker.js"],
                     flags,
                 }));
                 log.system("executable written to {0}", executable_path);

package/lib/private/targets.js

@@ -1,4 +1,4 @@
-import runner from "#desktop";
+const runner = () => { };
 const targets = [
     {
         exe: "app",

package/package.json

@@ -1,32 +1,32 @@
 {
   "name": "@primate/native",
-  "version": "0.3.0",
-  "description": "Primate native",
+  "version": "0.5.0",
+  "description": "Primate native applications",
   "homepage": "https://primate.run/docs/native",
   "bugs": "https://github.com/primate-run/primate/issues",
+  "type": "module",
   "license": "MIT",
-  "files": [
-    "/lib/**/*.js",
-    "/lib/**/*.d.ts",
-    "!/**/*.spec.*"
-  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/primate-run/primate",
     "directory": "packages/native"
   },
+  "files": [
+    "/lib/**/*.js",
+    "/lib/**/*.d.ts",
+    "!/**/*.spec.*"
+  ],
   "dependencies": {
-    "@rcompat/cli": "^0.11.3",
-    "@rcompat/fs": "^0.21.1",
-    "@rcompat/record": "^0.9.1",
-    "@rcompat/runtime": "^0.6.0",
-    "@rcompat/stdio": "^0.12.2",
-    "@rcompat/string": "^0.10.0",
-    "@rcompat/webview": "^0.14.0",
-    "@primate/core": "^0.3.0",
-    "pema": "^0.3.0"
+    "@rcompat/cli": "^0.14.0",
+    "@rcompat/io": "^0.3.0",
+    "@rcompat/runtime": "^0.9.0",
+    "@rcompat/webview": "^0.18.0",
+    "@primate/core": "^0.5.0",
+    "pema": "^0.5.0"
+  },
+  "peerDependencies": {
+    "primate": "^0.36.0"
   },
-  "type": "module",
   "imports": {
     "#*": {
       "apekit": "./src/private/*.ts",

package/lib/private/Loader.d.ts

@@ -1,17 +0,0 @@
-import Loader from "@primate/core/Loader";
-import type Dict from "@rcompat/type/Dict";
-type Init = {
-    client_imports: Dict<string>;
-    pages: Dict<string>;
-    pages_app: string;
-    rootfile: string;
-    static_imports: Dict<string>;
-    static_root: string;
-};
-export default class NativeLoader extends Loader {
-    #private;
-    constructor(init: Init);
-    serve(pathname: string): Promise<Response | undefined>;
-}
-export {};
-//# sourceMappingURL=Loader.d.ts.map

package/lib/private/Loader.js

@@ -1,28 +0,0 @@
-import Loader from "@primate/core/Loader";
-import FileRef from "@rcompat/fs/FileRef";
-import entries from "@rcompat/record/entries";
-export default class NativeLoader extends Loader {
-    #clients = {};
-    #statics = {};
-    constructor(init) {
-        super(init);
-        this.#clients = entries(init.client_imports)
-            .valmap(([, url]) => new FileRef(url)).get();
-        this.#statics = entries(init.static_imports)
-            .valmap(([, url]) => new FileRef(url)).get();
-    }
-    async serve(pathname) {
-        const client_file = this.#clients[pathname];
-        if (client_file !== undefined) {
-            return this.asset(client_file);
-        }
-        if (pathname.startsWith(this.static_root)) {
-            const assetname = pathname.slice(this.static_root.length);
-            const static_file = this.#statics[assetname];
-            if (static_file !== undefined) {
-                return this.asset(static_file);
-            }
-        }
-    }
-}
-//# sourceMappingURL=Loader.js.map

package/lib/private/desktop.d.ts

@@ -1,4 +0,0 @@
-import type App from "@primate/core/App";
-declare const _default: (app: App) => Promise<void>;
-export default _default;
-//# sourceMappingURL=desktop.d.ts.map

package/lib/private/desktop.js

@@ -1,82 +0,0 @@
-import location from "@primate/core/location";
-import FileRef from "@rcompat/fs/FileRef";
-import dedent from "@rcompat/string/dedent";
-const html = /^.*.html$/u;
-export default async (app) => {
-    const server_static = app.runpath(location.server, location.static);
-    // explicitly import static assets as files
-    const static_imports = (await server_static.collect()).map((path, i) => dedent `
-      import static${i} from
-        "${FileRef.webpath(`./server/static${path.debase(server_static)}`)}"
-        with { type: "file" };
-       static_imports["${FileRef
-        .webpath(path.debase(server_static))}"] = static${i};
-    `)
-        .join("\n");
-    const client = app.runpath(location.client);
-    // explicitly import client assets as files
-    const client_imports = (await Promise.all((await client.collect())
-        .map(async (file, i) => {
-        const type = file.extension === ".css" ? "style" : "js";
-        const src = `/${file.debase(client).name}`;
-        const path = `./${file.debase(`${app.path.build}/`)}`;
-        return {
-            code: `await FileRef.text(asset${i})`,
-            empty: (await file.text()).length === 0,
-            path,
-            src,
-            type,
-        };
-    }))).filter(file => !file.empty);
-    const d = app.runpath(location.server, location.pages);
-    const pages = await Promise.all((await FileRef.collect(d, file => html.test(file.path)))
-        .map(async (file) => `${file}`.replace(`${d}/`, _ => "")));
-    const app_js = client_imports.find($import => $import.src.endsWith(".js"));
-    const assets_scripts = dedent `
-    import Webview from "@primate/native/target/${app.target.target}";
-    import Loader from "@primate/native/Loader";
-    import FileRef from "@primate/native/FileRef";
-
-    const static_imports = {};
-    ${static_imports}
-
-    const client_imports = {};
-    ${client_imports.map(({ path, src }, i) => dedent `
-      import client${i} from "${path}" with { type: "file" };
-      client_imports["${FileRef.webpath(src)}"] = client${i};
-      const file${i} = await FileRef.text(client${i});
-    `).join("\n  ")}
-
-    const assets = [${client_imports.map(($import, i) => dedent `{
-    src: "${$import.src}",
-    code: file${i},
-    type: "${$import.type}",
-    inline: false,
-    }`).join(",\n  ")}];
-
-    const page_imports = {};
-    ${pages.map((page, i) => dedent `
-      import page${i} from "${FileRef.webpath(`./${location.server}/${location.pages}/${page}`)}" with { type: "file" };
-      page_imports["${page}"] = page${i};`).join("\n  ")}
-
-    const load = async resource_map =>
-      Object.fromEntries(await Promise.all(Object.entries(resource_map).map(
-        async ([key, url]) => [key, await FileRef.text(url)])));
-    const pages = await load(page_imports);
-
-    export default {
-      assets,
-      loader: new Loader({
-        pages,
-        rootfile: import.meta.url,
-        static_root: "${app.config("http.static.root")}",
-        client_imports,
-        static_imports,
-        Webview,
-      }),
-      target: "${app.target.name}",
-    };
-  `;
-    await app.path.build.join("target.js").write(assets_scripts);
-};
-//# sourceMappingURL=desktop.js.map

package/lib/public/FileRef.d.ts

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

package/lib/public/FileRef.js

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

package/lib/public/Loader.d.ts

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

package/lib/public/Loader.js

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