@primate/python 0.5.0 → 0.7.0

package/lib/private/default.d.ts

@@ -0,0 +1,4 @@
+import type { Input } from "#module";
+import type { Module } from "@primate/core";
+export default function default_module(input?: Input): Module;
+//# sourceMappingURL=default.d.ts.map

package/lib/private/default.js

@@ -0,0 +1,81 @@
+import E from "#errors";
+import module from "#module";
+import server from "@primate/core/server";
+import assert from "@rcompat/assert";
+import fs from "@rcompat/fs";
+import io from "@rcompat/io";
+const PACKAGE = "primate-run";
+const [MAJOR, MINOR] = server.TAG.split(".").map(Number);
+async function show_package(app) {
+    function run(command) {
+        return io.run(command, { cwd: app.root.path })
+            .then(out => out.trim())
+            .catch(() => "");
+    }
+    let out = await run(`pip show ${PACKAGE} 2>/dev/null`);
+    if (out.length > 0)
+        return out;
+    out = await run(`uv pip show ${PACKAGE} 2>/dev/null`);
+    if (out.length > 0)
+        return out;
+    out = await run(`python -m pip show ${PACKAGE} 2>/dev/null`);
+    if (out.length > 0)
+        return out;
+    return null;
+}
+async function check_version(app) {
+    const output = await show_package(app);
+    if (output === null)
+        throw E.pkg_not_found();
+    const version_match = output.match(/Version:\s*(\d+)\.(\d+)\.(\d+)/);
+    if (version_match === null)
+        throw E.pkg_not_found();
+    const [major, minor] = version_match.slice(1).map(Number);
+    if (major !== MAJOR || minor !== MINOR)
+        throw E.pkg_mismatch(major, minor);
+    app.log.info `using ${PACKAGE} package ${major}.${minor}.x`;
+}
+function wrap(source, id, packages_str, primate_run) {
+    return `
+    import route from "primate/route";
+    import wrapper from "@primate/python/wrapper";
+    import i18n from "app:config:i18n";
+    import session from "app:config:session";
+    const handlers = await wrapper(
+      ${JSON.stringify(source)},
+      ${packages_str},
+      ${JSON.stringify(primate_run)},
+      ${JSON.stringify(id)},
+      { i18n, session }
+    );
+    export default route(handlers);
+  `;
+}
+export default function default_module(input = {}) {
+    const { extension = module.extension } = module.schema.parse(input);
+    return {
+        name: module.name,
+        setup({ onBuild }) {
+            onBuild(async (app) => {
+                await check_version(app);
+                const requirements_txt = app.root.join("requirements.txt");
+                let packages = [];
+                if (await requirements_txt.exists()) {
+                    const requirements = await fs.text(requirements_txt);
+                    packages = requirements
+                        .split("\n")
+                        .filter(line => line.trim().length > 0 && !line.startsWith("#"))
+                        .map(p => p.trim());
+                }
+                const packages_str = JSON.stringify(packages);
+                app.bind(extension, async (file, { context }) => {
+                    assert.true(context === "routes", E.only_route_files());
+                    const relative = file.debase(app.path.routes).path.replace(/^\//, "");
+                    const source = await file.text();
+                    return wrap(source, relative, packages_str, `${PACKAGE}~=${server.TAG}.0`);
+                });
+            });
+        },
+    };
+}
+//# sourceMappingURL=default.js.map

package/lib/private/errors.d.ts

@@ -0,0 +1,12 @@
+declare function only_route_files(): import("@rcompat/error").TemplateError;
+declare function pkg_not_found(): import("@rcompat/error").TemplateError;
+declare function pkg_mismatch(major: number, minor: number): import("@rcompat/error").TemplateError;
+declare const errors: {
+    only_route_files: typeof only_route_files;
+    pkg_not_found: typeof pkg_not_found;
+    pkg_mismatch: typeof pkg_mismatch;
+};
+export type Code = keyof typeof errors;
+export declare const Code: { [K in Code]: K; };
+export default errors;
+//# sourceMappingURL=errors.d.ts.map

package/lib/private/errors.js

@@ -0,0 +1,24 @@
+import server from "@primate/core/server";
+import error from "@rcompat/error";
+const PACKAGE = "primate-run";
+const t = error.template;
+function only_route_files() {
+    return t `python: only route files are supported`;
+}
+function pkg_not_found() {
+    const command = `pip install ${PACKAGE}~=${server.TAG}.0`;
+    return t `package not found, run ${command}`;
+}
+function pkg_mismatch(major, minor) {
+    const range = `~> ${server.TAG}.x`;
+    const version = `${major}.${minor}.x`;
+    return t `${PACKAGE} package version ${version} not in range ${range}`;
+}
+const errors = error.coded({
+    only_route_files,
+    pkg_not_found,
+    pkg_mismatch,
+});
+export const Code = Object.fromEntries(Object.keys(errors).map(k => [k, k]));
+export default errors;
+//# sourceMappingURL=errors.js.map

package/lib/private/module.d.ts

@@ -0,0 +1,13 @@
+declare const module: {
+    schema: import("pema").ObjectType<import("pema").NormalizeSchemaObject<{
+        readonly extension: import("pema").OptionalType<import("pema").StringType>;
+    }>, {
+        extension: string | undefined;
+    }>;
+    name: string;
+    extension: string;
+};
+type Input = typeof module.schema.input;
+export type { Input };
+export default module;
+//# sourceMappingURL=module.d.ts.map

package/lib/private/module.js

@@ -0,0 +1,11 @@
+import p from "pema";
+const schema = p({
+    extension: p.string.optional(),
+});
+const module = {
+    schema,
+    name: "python",
+    extension: ".py",
+};
+export default module;
+//# sourceMappingURL=module.js.map

package/lib/private/runtime.d.ts

@@ -0,0 +1,4 @@
+import type { Input } from "#module";
+import type { Module } from "@primate/core";
+export default function runtime_module(input?: Input): Module;
+//# sourceMappingURL=runtime.d.ts.map

package/lib/private/runtime.js

@@ -0,0 +1,10 @@
+import module from "#module";
+export default function runtime_module(input = {}) {
+    const options = module.schema.parse(input);
+    void options;
+    return {
+        name: module.name,
+        setup() { },
+    };
+}
+//# sourceMappingURL=runtime.js.map

package/lib/private/to-request.d.ts

@@ -1,5 +1,4 @@
-import type { RequestFacade } from "@primate/core/request";
-import type { Dict } from "@rcompat/type";
+import type { RequestContentType, RequestFacade } from "@primate/core";
 type FileEntry = {
     bytes: Uint8Array;
     field: string;
@@ -7,35 +6,33 @@ type FileEntry = {
     size: number;
     type: string;
 };
-export default function to_request(request: RequestFacade): Promise<{
-    url: {
-        href: string;
-        origin: string;
-        protocol: string;
-        username: string;
-        password: string;
-        host: string;
-        hostname: string;
-        port: string;
-        pathname: string;
-        search: string;
-        hash: string;
-    };
-    body: {
-        text: () => string;
-        json: () => string;
-        form: () => Dict<string>;
-        files: () => FileEntry[];
-        binary: () => {
-            buffer: Uint8Array<ArrayBuffer>;
-            mime: string;
-        };
-        none: () => null;
-    };
-    path: Dict;
-    query: Dict;
-    headers: Dict;
-    cookies: Dict;
+type BridgedBody = {
+    type: "json";
+    jsonSync: () => string;
+} | {
+    type: "text";
+    textSync: () => string;
+} | {
+    type: "form";
+    formSync: () => string;
+} | {
+    type: "multipart";
+    formSync: () => string;
+    filesSync: () => FileEntry[];
+} | {
+    type: "blob";
+    blobSync: () => Uint8Array;
+    blobTypeSync: () => string;
+} | {
+    type: "none";
+};
+export default function to_request(request: RequestFacade, contentType: RequestContentType | ""): Promise<{
+    url: URL;
+    body: BridgedBody;
+    path: any;
+    query: any;
+    headers: any;
+    cookies: any;
 }>;
 export {};
 //# sourceMappingURL=to-request.d.ts.map

package/lib/private/to-request.js

@@ -1,25 +1,45 @@
-function plainUrl(u) {
-    return {
-        href: u.href,
-        origin: u.origin,
-        protocol: u.protocol,
-        username: u.username,
-        password: u.password,
-        host: u.host,
-        hostname: u.hostname,
-        port: u.port,
-        pathname: u.pathname,
-        search: u.search,
-        hash: u.hash,
-    };
+async function bridge_body(body, contentType) {
+    switch (contentType) {
+        case "text/plain": {
+            const s = await body.text();
+            return { type: "text", textSync: () => s };
+        }
+        case "application/json": {
+            const val = await body.json();
+            return { type: "json", jsonSync: () => JSON.stringify(val) };
+        }
+        case "application/x-www-form-urlencoded": {
+            const form = await body.form();
+            return { type: "form", formSync: () => JSON.stringify(form) };
+        }
+        case "multipart/form-data": {
+            const { form, files } = await body.multipart();
+            const pending = [];
+            const bridgedFiles = [];
+            for (const [field, file] of Object.entries(files)) {
+                const name = file.name;
+                const type = file.type;
+                const size = file.size;
+                pending.push(file.arrayBuffer().then(buffer => {
+                    bridgedFiles.push({ bytes: new Uint8Array(buffer), field, name, size, type });
+                }));
+            }
+            await Promise.all(pending);
+            return { type: "multipart", formSync: () => JSON.stringify(form), filesSync: () => bridgedFiles };
+        }
+        case "application/octet-stream": {
+            const blob = await body.blob();
+            const buf = new Uint8Array(await blob.arrayBuffer());
+            return { type: "blob", blobSync: () => buf, blobTypeSync: () => blob.type || "application/octet-stream" };
+        }
+        default:
+            return { type: "none" };
+    }
 }
-function toDict(obj) {
+function to_dict(obj) {
     const out = Object.create(null);
     if (obj instanceof URLSearchParams) {
-        obj.forEach((v, k) => {
-            if (!(k in out))
-                out[k] = v ?? "";
-        });
+        obj.forEach((v, k) => { out[k] = v; });
     }
     else {
         for (const [k, v] of Object.entries(obj)) {
@@ -28,71 +48,15 @@ function toDict(obj) {
     }
     return out;
 }
-async function bridge_form(body) {
-    const form = Object.create(null);
-    const files = [];
-    const pending = [];
-    for (const [k, v] of Object.entries(body.form())) {
-        form[k] = v;
-    }
-    for (const [k, v] of Object.entries(body.files())) {
-        const name = v.name;
-        const type = v.type;
-        const size = v.size;
-        pending.push(v.arrayBuffer().then(buffer => {
-            files.push({
-                bytes: new Uint8Array(buffer),
-                field: k,
-                name,
-                size,
-                type,
-            });
-        }));
-    }
-    await Promise.all(pending);
-    return {
-        form: () => form,
-        files: () => files,
-    };
-}
-async function bridgeBody(body) {
-    let form, buffer, blob;
-    if (body.type === "form") {
-        form = await bridge_form(body);
-    }
-    if (body.type === "binary") {
-        blob = body.binary();
-        buffer = new Uint8Array(await blob.arrayBuffer());
-    }
-    return {
-        text: () => body.text(),
-        json: () => {
-            return JSON.stringify(body.json());
-        },
-        form: () => form.form(),
-        files: () => form.files(),
-        binary: () => {
-            const mime = blob.type || "application/octet-stream";
-            return {
-                buffer,
-                mime,
-            };
-        },
-        none: () => null,
-    };
-}
-export default async function to_request(request) {
-    const body = await bridgeBody(request.body);
-    const cookies = toDict(request.cookies.toJSON());
-    const headers = toDict(request.headers.toJSON());
-    const path = toDict(request.path.toJSON());
-    const query = toDict(request.query.toJSON());
-    const u = request.url;
-    const url = plainUrl(new URL(String(u)));
+export default async function to_request(request, contentType) {
+    const body = await bridge_body(request.body, contentType);
     return {
-        url,
+        url: request.url,
         body,
-        path, query, headers, cookies,
+        path: request.path.toJSON(),
+        query: request.query.toJSON(),
+        headers: request.headers.toJSON(),
+        cookies: request.cookies.toJSON(),
     };
 }
 //# sourceMappingURL=to-request.js.map

package/lib/private/to-response.d.ts

@@ -1,6 +1,6 @@
-import { type ResponseLike } from "@primate/core/response";
+import type { ResponseLike } from "@primate/core";
 import type { Dict } from "@rcompat/type";
 import type { PyProxy } from "pyodide/ffi";
-declare const _default: (response: Dict | PyProxy) => ResponseLike;
-export default _default;
+declare function to_response(args: Dict | PyProxy | undefined): ResponseLike;
+export default to_response;
 //# sourceMappingURL=to-response.d.ts.map

package/lib/private/to-response.js

@@ -1,26 +1,33 @@
 import HANDLER_PROPERTY from "#handler-property";
 import unwrap from "#unwrap";
 import response from "@primate/core/response";
+import is from "@rcompat/is";
 const { error, redirect, view } = response;
 const handlers = { error, redirect, view };
-const handle_handler = (handler, response) => {
+const handle_handler = (handler, args) => {
     if (handler === "view") {
-        const { name, options, props } = response;
+        const { name, options, props } = args;
         return view(name, props, options);
     }
     if (handler === "redirect") {
-        const { location, status } = response;
+        const { location, status } = args;
         return redirect(location, status);
     }
-    const { options } = response;
+    const { options } = args;
     return error(options);
 };
-const is_handler = (handler) => typeof handler === "string" && Object.keys(handlers).includes(handler);
-export default (response) => {
-    const unwrapped = unwrap(response);
+function is_handler(x) {
+    return is.string(x) && Object.keys(handlers).includes(x);
+}
+function to_response(args) {
+    if (is.undefined(args))
+        return null;
+    const unwrapped = unwrap(args);
     const handler = unwrapped[HANDLER_PROPERTY];
     return is_handler(handler)
         ? handle_handler(handler, unwrapped)
         : unwrapped;
-};
+}
+;
+export default to_response;
 //# sourceMappingURL=to-response.js.map

package/lib/private/unwrap.d.ts

@@ -1,4 +1,5 @@
-import type { Dict } from "@rcompat/type";
 import type { PyProxy } from "pyodide/ffi";
-export default function unwrap(response: PyProxy): Dict;
+export default function unwrap(response: PyProxy): {
+    [k: string]: unknown;
+};
 //# sourceMappingURL=unwrap.d.ts.map

package/lib/private/wrapper.d.ts

@@ -1,5 +1,5 @@
 export default function wrapper(source: string, packages: string[], primate_run: string, id: string, context?: {
     i18n?: any;
     session?: any;
-}): Promise<void>;
+}): Promise<Record<string, (request: any) => Promise<any>>>;
 //# sourceMappingURL=wrapper.d.ts.map

package/lib/private/wrapper.js

@@ -3,7 +3,6 @@ import helpers from "@primate/python/helpers";
 import pyodide from "@primate/python/pyodide";
 import to_request from "@primate/python/to-request";
 import to_response from "@primate/python/to-response";
-import route from "primate/route";
 const messageCallback = () => { };
 let _micropip = null;
 const installed = new Set();
@@ -48,6 +47,16 @@ function wrap_i18n(i18n) {
         set(locale) { i18n.locale.set(locale); },
     };
 }
+async function get_entries(python, route_id) {
+    const result = python.runPython(`
+    [{"verb": verb, "content_type": entry["content_type"] or ""}
+     for verb, entry in Route.registry(${JSON.stringify(route_id)}).items()]
+  `).toJs({ dict_converter: Object.fromEntries });
+    return result.map((e) => ({
+        verb: String(e.verb),
+        content_type: String(e.content_type),
+    }));
+}
 export default async function wrapper(source, packages, primate_run, id, context = {}) {
     const python = await pyodide();
     const micropip = await load_micropip(python);
@@ -62,24 +71,23 @@ export default async function wrapper(source, packages, primate_run, id, context
     Route.scope(${route_id})
   `);
     await python.runPython(source);
-    const verbs = python.runPython(`
-    from primate import Route
-    list(Route.registry(${route_id}).keys())
-  `).toJs();
+    const entries = await get_entries(python, id);
     const wrapped_session = wrap_session(context.session);
     const wrapped_i18n = wrap_i18n(context.i18n);
-    for (const verb of verbs) {
-        route[verb.toLowerCase()](async (request) => {
-            python.globals.set("js_req", await to_request(request));
+    return Object.fromEntries(entries.map(({ verb, content_type }) => [
+        verb.toLowerCase(),
+        async (request) => {
+            const jsReq = await to_request(request, content_type);
+            python.globals.set("js_req", jsReq);
             python.globals.set("helpers_obj", helpers);
             python.globals.set("session_obj", wrapped_session);
             python.globals.set("i18n_obj", wrapped_i18n);
             const verb_str = JSON.stringify(verb);
             try {
                 const result = await python.runPythonAsync(`
-          from primate import Route
-          await Route.call_js(${route_id}, ${verb_str}, js_req, helpers_obj, session_obj, i18n_obj)
-        `);
+            from primate import Route
+            await Route.call_js(${route_id}, ${verb_str}, js_req, helpers_obj, session_obj, i18n_obj)
+          `);
                 return to_response(result);
             }
             catch (e) {
@@ -92,7 +100,7 @@ export default async function wrapper(source, packages, primate_run, id, context
                 python.globals.delete("session_obj");
                 python.globals.delete("i18n_obj");
             }
-        });
-    }
+        },
+    ]));
 }
 //# sourceMappingURL=wrapper.js.map

package/lib/public/default.d.ts

@@ -1,4 +1,2 @@
-import Default from "#Default";
-declare const _default: (options?: typeof Default.input) => Default;
-export default _default;
+export { default } from "#default";
 //# sourceMappingURL=default.d.ts.map

package/lib/public/default.js

@@ -1,3 +1,2 @@
-import Default from "#Default";
-export default (options) => new Default(options);
+export { default } from "#default";
 //# sourceMappingURL=default.js.map

package/lib/public/runtime.d.ts

@@ -1,4 +1,2 @@
-import Runtime from "#Runtime";
-declare const _default: (options?: typeof Runtime.input) => Runtime;
-export default _default;
+export { default } from "#runtime";
 //# sourceMappingURL=runtime.d.ts.map

package/lib/public/runtime.js

@@ -1,3 +1,2 @@
-import Runtime from "#Runtime";
-export default (options) => new Runtime(options);
+export { default } from "#runtime";
 //# sourceMappingURL=runtime.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/python",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Python backend for Primate",
   "homepage": "https://primate.run/docs/backend/python",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -17,22 +17,24 @@
     "!/**/*.spec.*"
   ],
   "dependencies": {
-    "@rcompat/assert": "^0.6.0",
-    "@rcompat/fs": "^0.25.2",
-    "@rcompat/io": "^0.3.0",
+    "@rcompat/assert": "^0.13.0",
+    "@rcompat/error": "^0.8.0",
+    "@rcompat/fs": "^0.33.2",
+    "@rcompat/io": "^0.10.0",
+    "@rcompat/is": "^0.11.0",
     "pyodide": "^0.29.3",
-    "@primate/core": "^0.5.0",
-    "pema": "^0.5.0"
+    "@primate/core": "^0.7.0",
+    "pema": "^0.7.0"
   },
   "devDependencies": {
-    "@rcompat/type": "^0.9.0"
+    "@rcompat/type": "^0.17.0"
   },
   "peerDependencies": {
-    "primate": "^0.36.0"
+    "primate": "^0.38.0"
   },
   "imports": {
     "#*": {
-      "apekit": "./src/private/*.ts",
+      "@primate/source": "./src/private/*.ts",
       "default": "./lib/private/*.js"
     }
   },
@@ -42,7 +44,7 @@
       "default": "./lib/public/default.js"
     },
     "./*": {
-      "apekit": "./src/public/*.ts",
+      "@primate/source": "./src/public/*.ts",
       "default": "./lib/public/*.js"
     }
   },

package/lib/private/Default.d.ts

@@ -1,7 +0,0 @@
-import Runtime from "#Runtime";
-import type BuildApp from "@primate/core/BuildApp";
-import type NextBuild from "@primate/core/NextBuild";
-export default class Default extends Runtime {
-    build(app: BuildApp, next: NextBuild): Promise<BuildApp>;
-}
-//# sourceMappingURL=Default.d.ts.map

package/lib/private/Default.js

@@ -1,74 +0,0 @@
-import Runtime from "#Runtime";
-import TAG from "@primate/core/backend/TAG";
-import fail from "@primate/core/fail";
-import log from "@primate/core/log";
-import assert from "@rcompat/assert";
-import fs from "@rcompat/fs";
-import io from "@rcompat/io";
-const PACKAGE = "primate-run";
-const [MAJOR, MINOR] = TAG.split(".").map(Number);
-function package_not_found() {
-    return fail("package not found - run 'pip install {0}~={1}.0'", PACKAGE, TAG);
-}
-function pkg_mismatch(major, minor) {
-    return fail("installed {0} package version {1}.{2}.x not in range ~> {3}.x", PACKAGE, major, minor, TAG);
-}
-async function show_package() {
-    const str0 = () => "";
-    let out = await io.run(`pip show ${PACKAGE} 2>/dev/null`).catch(str0);
-    if (out.trim())
-        return out;
-    out = await io.run(`uv pip show ${PACKAGE} 2>/dev/null`).catch(str0);
-    if (out.trim())
-        return out;
-    out = await io.run(`python -m pip show ${PACKAGE} 2>/dev/null`).catch(str0);
-    if (out.trim())
-        return out;
-    return null;
-}
-async function check_version() {
-    const output = await show_package();
-    if (!output)
-        throw package_not_found();
-    const version_match = output.match(/Version:\s*(\d+)\.(\d+)\.(\d+)/);
-    if (!version_match)
-        throw package_not_found();
-    const [major, minor] = version_match.slice(1).map(Number);
-    if (major !== MAJOR || minor !== MINOR)
-        throw pkg_mismatch(major, minor);
-    log.info("using {0} package {1}.{2}.x", PACKAGE, major, minor);
-}
-export default class Default extends Runtime {
-    async build(app, next) {
-        await check_version();
-        const requirements_txt = app.root.join("requirements.txt");
-        let packages = [];
-        if (await requirements_txt.exists()) {
-            const requirements = await fs.text(requirements_txt);
-            packages = requirements
-                .split("\n")
-                .filter(line => line.trim() && !line.startsWith("#"))
-                .map(p => p.trim());
-        }
-        const packages_str = JSON.stringify(packages);
-        app.bind(this.fileExtension, async (file, { context }) => {
-            assert.true(context === "routes", "python: only route files are supported");
-            const relative = file.debase(app.path.routes).path.replace(/^\//, "");
-            const source = await file.text();
-            return `
-        import wrapper from "@primate/python/wrapper";
-        import i18n from "app:config:i18n";
-        import session from "app:config:session";
-        await wrapper(
-          ${JSON.stringify(source)},
-          ${packages_str},
-          "${PACKAGE}~=${TAG}.0",
-          "${relative}",
-          { i18n, session }
-        );
-      `;
-        });
-        return next(app);
-    }
-}
-//# sourceMappingURL=Default.js.map

package/lib/private/Runtime.d.ts

@@ -1,6 +0,0 @@
-import Module from "@primate/core/backend/Module";
-export default class Runtime extends Module {
-    name: string;
-    defaultExtension: string;
-}
-//# sourceMappingURL=Runtime.d.ts.map

package/lib/private/Runtime.js

@@ -1,6 +0,0 @@
-import Module from "@primate/core/backend/Module";
-export default class Runtime extends Module {
-    name = "python";
-    defaultExtension = ".py";
-}
-//# sourceMappingURL=Runtime.js.map