@primate/core 0.2.4 → 0.3.1

package/lib/private/request/RequestBody.js

@@ -1,19 +1,26 @@
 import fail from "#fail";
 import json from "@rcompat/http/mime/application/json";
 import binary from "@rcompat/http/mime/application/octet-stream";
-import form from "@rcompat/http/mime/application/x-www-form-urlencoded";
-import formData from "@rcompat/http/mime/multipart/form-data";
+import www_form from "@rcompat/http/mime/application/x-www-form-urlencoded";
+import form_data from "@rcompat/http/mime/multipart/form-data";
 import text from "@rcompat/http/mime/text/plain";
-async function fromForm(request) {
-    const fields = Object.create(null);
+async function anyform(request) {
+    const form = Object.create(null);
+    const files = Object.create(null);
     for (const [key, value] of (await request.formData()).entries()) {
-        fields[key] = value;
+        if (typeof value === "string") {
+            form[key] = value;
+        }
+        else {
+            files[key] = value;
+        }
     }
-    return fields;
+    return { form, files };
 }
 ;
 export default class RequestBody {
     #parsed;
+    #files;
     static async parse(request, url) {
         const raw = request.headers.get("content-type") ?? "none";
         const type = raw.split(";")[0].trim().toLowerCase();
@@ -22,9 +29,11 @@ export default class RequestBody {
             switch (type) {
                 case binary:
                     return new RequestBody({ type: "binary", value: await request.blob() });
-                case form:
-                case formData:
-                    return new RequestBody({ type: "fields", value: await fromForm(request) });
+                case www_form:
+                case form_data: {
+                    const { form, files } = await anyform(request);
+                    return new RequestBody({ type: "form", value: form }, files);
+                }
                 case json:
                     return new RequestBody({ type: "json", value: await request.json() });
                 case text:
@@ -43,8 +52,9 @@ export default class RequestBody {
     static none() {
         return new RequestBody({ type: "none", value: null });
     }
-    constructor(p) {
-        this.#parsed = p;
+    constructor(parsed, files = {}) {
+        this.#parsed = parsed;
+        this.#files = files;
     }
     get type() {
         return this.#parsed.type;
@@ -62,13 +72,19 @@ export default class RequestBody {
         const value = this.#value();
         return schema ? schema.parse(value) : value;
     }
-    fields(schema) {
-        if (this.type !== "fields") {
-            this.#throw("form fields");
+    form(schema) {
+        if (this.type !== "form") {
+            this.#throw("form");
         }
         const value = this.#value();
         return schema ? schema.parse(value) : value;
     }
+    files() {
+        if (this.type !== "form") {
+            this.#throw("form");
+        }
+        return this.#files;
+    }
     text() {
         if (this.type !== "text") {
             this.#throw("plaintext");

package/lib/private/response/ResponseFunction.d.ts

@@ -1,8 +1,8 @@
-import type Component from "#frontend/Component";
+import type View from "#frontend/View";
 import type RequestFacade from "#request/RequestFacade";
 import type ServeApp from "#ServeApp";
 import type Dict from "@rcompat/type/Dict";
 import type MaybePromise from "@rcompat/type/MaybePromise";
-type ResponseFunction = (app: ServeApp, transfer: Dict, request: RequestFacade) => MaybePromise<Component | null | Response | undefined>;
+type ResponseFunction = (app: ServeApp, transfer: Dict, request: RequestFacade) => MaybePromise<View | null | Response | undefined>;
 export { ResponseFunction as default };
 //# sourceMappingURL=ResponseFunction.d.ts.map

package/lib/private/response/redirect.js

@@ -56,7 +56,11 @@ function toNormalized(relative, base) {
 export default (location, status) => 
 // no body
 app => app.respond(null, {
-    headers: { Location: location },
+    headers: {
+        "Content-Length": String(0),
+        Location: location,
+        "Cache-Control": 'no-cache',
+    },
     status: status ?? Status.FOUND,
 });
 //# sourceMappingURL=redirect.js.map

package/lib/private/response/view.d.ts

@@ -1,8 +1,8 @@
 import type ViewResponse from "#frontend/ViewResponse";
 /**
- * Render a component using a frontend for the given filename extension
- * @param component path to component
- * @param props props for component
+ * Render a view component using a frontend for the given filename extension
+ * @param view path to view
+ * @param props props for view
  * @param options rendering options
  * @return Response rendering function
  */

package/lib/private/response/view.js

@@ -15,27 +15,29 @@ const backmap = {
     voby: "voby",
     vue: "vue",
     webc: "webc",
+    tsx: "react",
+    jsx: "react",
 };
-function no_frontend(component) {
-    const extension = new FileRef(component).fullExtension.slice(1);
+function no_frontend(view) {
+    const extension = new FileRef(view).fullExtension.slice(1);
     const hasPkg = extension in backmap;
     const error = "No frontend for {0}";
-    const fix = hasPkg ? "" : ", did you configure {1}?";
-    const pkgname = hasPkg ? "" : `@primate/${backmap[extension]}`;
-    throw fail(`${error}${fix}`, component, pkgname);
+    const fix = hasPkg ? ", did you configure {1}?" : "";
+    const pkgname = hasPkg ? `@primate/${backmap[extension]}` : "";
+    throw fail(`${error}${fix}`, view, pkgname);
 }
 /**
- * Render a component using a frontend for the given filename extension
- * @param component path to component
- * @param props props for component
+ * Render a view component using a frontend for the given filename extension
+ * @param view path to view
+ * @param props props for view
  * @param options rendering options
  * @return Response rendering function
  */
-const view = (function viewResponse(component, props, options) {
+const view = (function viewResponse(name, props, options) {
     return (app, transfer, request) => extensions
-        .map(extension => app.frontends[new FileRef(component)[extension]])
-        .find(extension => extension !== undefined)?.(component, props, options)(app, transfer, request)
-        ?? no_frontend(component);
+        .map(extension => app.frontends[new FileRef(name)[extension]])
+        .find(extension => extension !== undefined)?.(name, props, options)(app, transfer, request)
+        ?? no_frontend(name);
 });
 export default view;
 //# sourceMappingURL=view.js.map

package/lib/private/route/wrap.d.ts

@@ -1,6 +1,2 @@
-import type FileRef from "@rcompat/fs/FileRef";
-export default function wrap(code: string, file: FileRef, build: {
-    id: string;
-    stage: FileRef;
-}): string;
+export default function wrap(code: string, path: string, build_id: string): string;
 //# sourceMappingURL=wrap.d.ts.map

package/lib/private/route/wrap.js

@@ -1,16 +1,11 @@
-import location from "#location";
 import dedent from "@rcompat/string/dedent";
-export default function wrap(code, file, build) {
-    const router = `ROUTER_${build.id}`;
-    const debased = file.debase(build.stage.join(location.routes)).path
-        .slice(1, -file.extension.length);
+export default function wrap(code, path, build_id) {
+    const router = `ROUTER_${build_id}`;
     const prelude = dedent `
     import ${router} from "primate/router";
-    ${router}.push("${debased}");
+    ${router}.push("${path}");
   `;
-    const postlude = `
-${router}.pop();
-`;
+    const postlude = `\n${router}.pop();\n`;
     return `${prelude}${code}${postlude}`;
 }
 ;

package/lib/private/target/Manager.js

@@ -33,7 +33,7 @@ export default class TargetManager {
     }
     add(target) {
         if (this.has(target.name)) {
-            throw fail("Cannot add target {0} twice", target.name);
+            throw fail("cannot add target {0} twice", target.name);
         }
         this.#targets.push(target);
     }

package/lib/private/target/web.js

@@ -36,16 +36,6 @@ const web = {
   inline: false,
   }`).join(",\n  ")}];
 
-  const imports = {
-    app: "${client_imports.find(({ src }) => src.includes("app") && src.endsWith(".js")).src}"
-  };
-  // importmap
-  assets.push({
-    inline: true,
-    code: { imports },
-    type: "importmap",
-  });
-
   const pages = {
     ${pages_str}
   };

package/lib/private/wasm/encode-request.js

@@ -16,7 +16,7 @@ const HEADERS_SECTION = 4;
 const COOKIES_SECTION = 5;
 const BODY_KIND_NULL = 0;
 const BODY_KIND_TEXT = 1;
-const BODY_KIND_FIELDS = 2;
+const BODY_KIND_FORM = 2;
 const BODY_KIND_BINARY = 3;
 const BODY_KIND_JSON = 4;
 const BODY_KIND_MAP_VALUE_STRING = 0;
@@ -28,15 +28,17 @@ const sizeOfBodySection = (body) => {
         return size; // 0 kind null
     if (body.type === "text")
         return size + stringSize(body.text());
-    if (body.type === "fields") {
+    if (body.type === "form") {
         size += I32_SIZE; // entry count
-        const fields = body.fields();
-        for (const [key, value] of Object.entries(fields)) {
+        for (const [key, value] of Object.entries(body.form())) {
             size += stringSize(key);
-            size += I32_SIZE // value kind
-                + (typeof value === "string"
-                    ? stringSize(value)
-                    : filesize(value));
+            size += I32_SIZE; // value kind
+            size += stringSize(value);
+        }
+        for (const [key, value] of Object.entries(body.files())) {
+            size += stringSize(key);
+            size += I32_SIZE; // value kind
+            size += filesize(value);
         }
         return size;
     }
@@ -46,11 +48,9 @@ const sizeOfBodySection = (body) => {
         size += I32_SIZE + bin.size;
         return size;
     }
-    if (body.type === "json") {
-        const json = body.json();
-        size += stringSize(JSON.stringify(json));
-        return size;
-    }
+    const json = body.json();
+    size += stringSize(JSON.stringify(json));
+    return size;
     throw new Error("Invalid RequestLike body");
 };
 const sizeOfMapSection = (map) => {
@@ -137,22 +137,19 @@ const encodeSectionBody = async (body, view) => {
         view.writeU32(BODY_KIND_TEXT);
         encodeString(text, view);
     }
-    else if (body.type === "fields") {
-        const fields = body.fields();
-        const entries = Object.entries(body.fields());
-        const entryCount = entries.length;
-        view.writeU32(BODY_KIND_FIELDS);
-        view.writeU32(entryCount);
-        for (const [key, value] of Object.entries(fields)) {
+    else if (body.type === "form") {
+        const entries = Object.entries(body.form());
+        view.writeU32(BODY_KIND_FORM);
+        view.writeU32(entries.length);
+        for (const [key, value] of entries) {
+            encodeString(key, view);
+            view.writeU32(BODY_KIND_MAP_VALUE_STRING);
+            encodeString(value, view);
+        }
+        for (const [key, value] of Object.entries(body.files())) {
             encodeString(key, view);
-            if (typeof value === "string") {
-                view.writeU32(BODY_KIND_MAP_VALUE_STRING);
-                encodeString(value, view);
-            }
-            else {
-                view.writeU32(BODY_KIND_MAP_VALUE_BLOB);
-                await encodeFile(value, view);
-            }
+            view.writeU32(BODY_KIND_MAP_VALUE_BLOB);
+            await encodeFile(value, view);
         }
     }
     else if (body.type === "binary") {

package/lib/public/backend/TAG.d.ts

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

package/lib/public/backend/TAG.js

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

package/lib/public/client/app.d.ts

@@ -0,0 +1,2 @@
+import "#client/app";
+//# sourceMappingURL=app.d.ts.map

package/lib/public/client/app.js

@@ -0,0 +1,2 @@
+import "#client/app";
+//# sourceMappingURL=app.js.map

package/lib/public/fail.d.ts

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

package/lib/public/fail.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.2.4",
+  "version": "0.3.1",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -24,15 +24,15 @@
     "@rcompat/build": "^0.14.0",
     "@rcompat/cli": "^0.11.3",
     "@rcompat/crypto": "^0.10.0",
-    "@rcompat/fs": "^0.21.1",
+    "@rcompat/fs": "^0.21.2",
     "@rcompat/function": "^0.9.0",
     "@rcompat/http": "^0.15.1",
     "@rcompat/kv": "^0.3.0",
     "@rcompat/package": "^0.22.0",
     "@rcompat/record": "^0.9.1",
-    "@rcompat/string": "^0.10.0",
+    "@rcompat/string": "^0.10.1",
     "@rcompat/type": "^0.6.1",
-    "pema": "^0.2.0"
+    "pema": "^0.3.0"
   },
   "type": "module",
   "imports": {

package/lib/private/client/App.d.ts

@@ -1,4 +0,0 @@
-export default class ClientApp {
-    start(): void;
-}
-//# sourceMappingURL=App.d.ts.map

package/lib/private/database/DataRecord.js

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

package/lib/private/frontend/Component.d.ts

@@ -1,8 +0,0 @@
-import type Dict from "@rcompat/type/Dict";
-type Component = {
-    component: unknown;
-    name: string;
-    props: Dict;
-};
-export type { Component as default };
-//# sourceMappingURL=Component.d.ts.map

package/lib/private/frontend/Component.js

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

package/lib/private/frontend/ServerComponent.d.ts

@@ -1,5 +0,0 @@
-import type Dict from "@rcompat/type/Dict";
-import type MaybePromise from "@rcompat/type/MaybePromise";
-type ServerComponent = (props: Dict) => MaybePromise<string>;
-export { ServerComponent as default };
-//# sourceMappingURL=ServerComponent.d.ts.map

package/lib/private/frontend/ServerComponent.js

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

package/lib/public/client/App.d.ts

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

package/lib/public/client/App.js

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

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

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

package/lib/public/route/wrap.js

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