@primate/native 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/native",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Primate native applications",
   "homepage": "https://primatejs.com/modules/native",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -16,10 +16,10 @@
   },
   "dependencies": {
     "@rcompat/cli": "^0.5.1",
-    "@rcompat/fs": "^0.4.1",
+    "@rcompat/fs": "^0.5.0",
     "@rcompat/stdio": "^0.5.0",
     "@rcompat/webview": "^0.7.0",
-    "@primate/core": "^0.1.1"
+    "@primate/core": "^0.1.5"
   },
   "type": "module",
   "exports": {

package/src/desktop.js

@@ -1,4 +1,6 @@
 import collect from "@rcompat/fs/collect";
+import webpath from "@rcompat/fs/webpath";
+
 const html = /^.*.html$/u;
 
 export default async app => {
@@ -6,6 +8,12 @@ export default async app => {
   const http = app.get("http");
   const client = app.runpath(location.client);
   const re = /app..*(?:js|css)$/u;
+
+  const import_statics = (await client.collect()).map((path, i) => `
+    import static${i} from "${webpath(`./client${path.debase(client)}`)}" with { type: "file" };
+    statics["${webpath(path.debase(client))}"] = await file(static${i});`)
+    .join("\n");
+
   const $imports = (await Promise.all((await client.collect(re, { recursive: false }))
     .map(async (file, i) => {
       const type = file.extension === ".css" ? "style" : "js";
@@ -30,6 +38,8 @@ export default async app => {
   import file from "@rcompat/fs/file";
   import stringify from "@rcompat/object/stringify";
   import crypto from "@rcompat/crypto";
+  import { OK } from "@rcompat/http/status";
+  import { resolve } from "@rcompat/http/mime";
 
   const encoder = new TextEncoder();
   const hash = async (data, algorithm = "sha-384") => {
@@ -38,6 +48,9 @@ export default async app => {
     return \`\${prefix}-\${btoa(String.fromCharCode(...new Uint8Array(bytes)))}\`;
   };
 
+  const statics = {};
+  ${import_statics}
+
   ${$imports.map(({ path }, i) =>
     `import asset${i} from "${path}" with { type: "file" };
     const file${i} = await file(asset${i}).text();`).join("\n  ")}
@@ -63,19 +76,32 @@ export default async app => {
     });`}
 
   ${pages.map((page, i) =>
-    `import i_page${i} from "./${location.pages}/${page}" with { type: "file" };
+    `import i_page${i} from "${webpath(`./${location.pages}/${page}`)}" with { type: "file" };
     const page${i} = await file(i_page${i}).text();`).join("\n  ")}
 
   const pages = {
   ${pages.map((page, i) => `"${page}": page${i},`).join("\n  ")}
   };
+  const serve_asset = asset => new Response(asset.stream(), {
+    status: OK,
+    headers: {
+      "Content-Type": resolve(asset.name),
+    },
+  });
 
   const loader = {
     page(name) {
       return pages[name] ?? pages["${app.get("pages.app")}"];
     },
     asset(pathname) {
-      return assets.find(asset => asset.src === pathname);
+      const root_asset = statics[pathname];
+      if (root_asset !== undefined) {
+        return serve_asset(root_asset);
+      }
+      const static_asset = statics[\`/static\${pathname}\`];
+      if (static_asset !== undefined) {
+        return serve_asset(static_asset);
+      }
     },
     webview() {
       return Webview;

package/src/index.js

@@ -8,6 +8,7 @@ const command = "bun build build/serve.js --conditions=runtime --compile --minif
 
 export default ({
   start = "/",
+  debug = false,
 } = {}) => {
   return {
     name: "primate:native",
@@ -29,7 +30,7 @@ export default ({
     async serve(app, next) {
       if (target_keys.includes(app.build_target)) {
         const Webview = app.loader.webview();
-        const webview = new Webview();
+        const webview = new Webview(debug);
         const { host, port } = app.get("http");
         webview.navigate(`http://${host}:${port}${start}`);
         webview.run();