@primate/solid 0.8.0 → 0.10.0

package/lib/app.d.ts

@@ -0,0 +1,5 @@
+declare module "app:solid" {
+  import type { RequestPublic } from "@primate/core";
+  import type { Accessor } from "solid-js";
+  export const request: Accessor<RequestPublic>;
+}

package/lib/index.d.ts

@@ -0,0 +1,3 @@
+import "./app.d.ts";
+export { default } from "#default";
+export { default as client } from "#client/index";

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

@@ -0,0 +1,5 @@
+import type { Data as CoreData } from "@primate/core/client";
+import type Payload from "#client/Payload";
+type Data = CoreData<Payload>;
+export default Data;
+//# sourceMappingURL=Data.d.ts.map

package/lib/private/client/Data.js

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

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

@@ -0,0 +1,7 @@
+import type { Dict } from "@rcompat/type";
+type Payload = {
+    views: string[];
+    props: Dict[];
+};
+export default Payload;
+//# sourceMappingURL=Payload.d.ts.map

package/lib/private/client/Payload.js

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

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

@@ -1,11 +1,14 @@
-import type ClientData from "@primate/core/client/Data";
-import type { Dict } from "@rcompat/type";
-type Data = ClientData<{
-    views: string[];
-    props: Dict[];
-}>;
+import type Data from "#client/Data";
+declare global {
+    interface Window {
+        _$HY: {
+            completed: WeakSet<object>;
+            events: unknown[];
+            r: Record<string, unknown>;
+        };
+    }
+}
 export default class SolidApp {
-    static mount(_view: string, data: ClientData<Data>): void;
+    static mount(_view: string, data: Data): void;
 }
-export {};
 //# sourceMappingURL=app.d.ts.map

package/lib/private/client/app.js

@@ -1,29 +1,29 @@
-import spa from "@primate/core/client/spa";
+import root from "#client/root";
+import client from "@primate/core/client";
 import SolidHead from "@primate/solid/Head";
-import { hydrate, render } from "solid-js/web";
-import root_view from "solid:root";
-import * as views from "solid:views";
-// @ts-expect-error solid hydration
-globalThis._$HY = { completed: new WeakSet(), events: [], r: {} };
+import Root from "solid:root";
+window._$HY = { completed: new WeakSet(), events: [], r: {} };
 const { body } = globalThis.window.document;
 SolidHead.clear();
-const make_props = (data) => ({
-    views: data.views.map(name => views[name]),
-    props: data.props,
-    request: {
-        ...data.request,
-        url: new URL(location.href),
-    },
-});
 export default class SolidApp {
     static mount(_view, data) {
-        const mount = () => root_view(make_props(data));
-        let dispose = data.ssr ? hydrate(mount, body) : render(mount, body);
-        if (data.spa) {
-            window.addEventListener("DOMContentLoaded", _ => spa(_data => {
+        const interactive = !data.ssr || data.csr;
+        if (!interactive)
+            return;
+        const mount = () => Root(root.toProps(data));
+        let dispose = root[data.ssr ? "ssr" : "csr"](mount, body);
+        if (data.csr) {
+            const start = () => client.boot((_data, update) => {
                 dispose();
-                dispose = render(() => root_view(make_props(_data)), body);
-            }));
+                dispose = root.csr(() => Root(root.toProps(_data, update)), body);
+                update?.();
+            });
+            if (document.readyState === "loading") {
+                window.addEventListener("DOMContentLoaded", start, { once: true });
+            }
+            else {
+                start();
+            }
         }
     }
 }

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

@@ -1,20 +1,22 @@
-import { type FormInit } from "@primate/core/client";
+import type { ClientMethod, FormInit } from "@primate/core/client";
 import type { Dict } from "@rcompat/type";
 type FormView<Values extends Dict> = {
     id: string;
     submitting: boolean;
+    submitted: boolean;
     submit: (event?: Event) => Promise<void>;
-    errors: readonly string[];
+    errors: string[];
     field: <K extends keyof Values & string>(name: K) => {
         name: string;
         value: Values[K];
         error: string | null;
-        errors: readonly string[];
+        errors: string[];
     };
 };
 type Initial<Values extends Dict> = FormInit & {
     initial?: Values;
 };
+declare function form<Values extends Dict>(action: ClientMethod<Values>, init?: Initial<Values>): FormView<Values>;
 declare function form<Values extends Dict>(init: Initial<Values>): FormView<Values>;
 declare function form(init?: FormInit): FormView<Dict>;
 export default form;

package/lib/private/client/form.js

@@ -1,18 +1,36 @@
 import core from "@primate/core/client";
 import { createSignal, onCleanup } from "solid-js";
-function form(init) {
-    const { initial, ...form_init } = init ?? {};
-    const controller = core.createForm(form_init);
+function form(action_or_init, maybe_init) {
+    const is_action = typeof action_or_init === "function";
+    const { initial, ...form_init } = (is_action ? (maybe_init ?? {}) : (action_or_init ?? {}));
+    const action = is_action ? action_or_init : undefined;
+    const contentType = is_action
+        ? action_or_init.contentType
+        : undefined;
+    const controller = core.createForm({
+        ...form_init,
+        ...action !== undefined && {
+            action: action,
+            contentType,
+        },
+    });
     const values = initial ?? {};
     const [snapshot, setSnapshot] = createSignal(controller.read());
-    const unsub = controller.subscribe((next) => setSnapshot(next));
-    onCleanup(unsub);
+    const unsubscribe = controller.subscribe(next => setSnapshot(next));
+    onCleanup(unsubscribe);
     return {
-        id: controller.id,
+        get id() {
+            return snapshot().id;
+        },
         get submitting() {
             return snapshot().submitting;
         },
-        submit: (event) => controller.submit(event),
+        get submitted() {
+            return snapshot().submitted;
+        },
+        submit(event) {
+            return controller.submit(event);
+        },
         get errors() {
             return snapshot().errors.form;
         },
@@ -25,8 +43,7 @@ function form(init) {
                     return snapshot().errors.fields[key] ?? [];
                 },
                 get error() {
-                    const errors = snapshot().errors.fields[key] ?? [];
-                    return errors[0] ?? null;
+                    return (snapshot().errors.fields[key] ?? [])[0] ?? null;
                 },
             };
         },

package/lib/{public/client.d.ts → private/client/index.d.ts}

@@ -45,4 +45,4 @@ declare const client: {
     };
 };
 export default client;
-//# sourceMappingURL=client.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/lib/{public/client.js → private/client/index.js}

@@ -2,4 +2,4 @@ import field from "#client/field";
 import form from "#client/form";
 const client = { form, field };
 export default client;
-//# sourceMappingURL=client.js.map
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1,21 @@
+import type Data from "#client/Data";
+import type { Dict } from "@rcompat/type";
+import { type Component } from "solid-js";
+import { render } from "solid-js/web";
+type ViewComponent = Component<any>;
+export type RootProps = {
+    views: ViewComponent[];
+    props: Dict[];
+    request: Data["request"] & {
+        url: URL;
+    };
+    update?: () => void;
+};
+declare function toProps(data: Data, update?: () => void): RootProps;
+declare const root: {
+    toProps: typeof toProps;
+    csr: typeof render;
+    ssr: typeof import("solid-js/web/types/client.js").hydrate;
+};
+export default root;
+//# sourceMappingURL=root.d.ts.map

package/lib/private/client/root.js

@@ -0,0 +1,20 @@
+import { hydrate, render } from "solid-js/web";
+import * as Views from "solid:views";
+function toProps(data, update) {
+    return {
+        views: data.views.map(name => Views[name]),
+        props: data.props,
+        request: {
+            ...data.request,
+            url: new URL(data.request.url),
+        },
+        update,
+    };
+}
+const root = {
+    toProps,
+    csr: render,
+    ssr: hydrate,
+};
+export default root;
+//# sourceMappingURL=root.js.map

package/lib/private/create-root.js

@@ -1,11 +1,11 @@
 export default (length, i18n_active) => {
     const n = length;
     const body = Array.from({ length: n }, (_, i) => i - 1).reduceRight((child, _, i) => `views[${i + 1}] !== undefined
-      ? createComponent(views[${i}], { request, ...props[${i}],
+      ? createComponent(views[${i}], { ...props[${i}],
           get children() { return ${child}; }
         })
-      : createComponent(views[${i}], { request, ...props[${i}] })
-    `, `createComponent(views[${n}], { request, ...props[${n}] })`);
+      : createComponent(views[${i}], props[${i}])
+    `, `createComponent(views[${n}], props[${n}])`);
     const i18n_imports = i18n_active
         ? `
       import I18nBridge from "@primate/solid/i18n/Bridge";
@@ -17,10 +17,12 @@ export default (length, i18n_active) => {
     return `
     import { createSignal } from "solid-js";
     import { createComponent } from "solid-js/web";
+    import { setRequest } from "@primate/solid/app";
     import AppContext from "@primate/solid/context/app";
     import HeadContext from "@primate/solid/context/head";${i18n_imports}
 
     export default ({ views, props, request, push_heads: value }) => {
+      setRequest(request);
       const [context, setContext] = createSignal(request.context);
       const $value = { context, setContext };
 

package/lib/private/default.d.ts

@@ -0,0 +1,7 @@
+declare const _default: (input?: {
+    extensions?: string[] | undefined;
+    csr?: boolean | undefined;
+    ssr?: boolean | undefined;
+} | undefined) => import("@primate/core/frontend").Module;
+export default _default;
+//# sourceMappingURL=default.d.ts.map

package/lib/private/{Default.js → default.js}

@@ -1,18 +1,20 @@
 import create_root from "#create-root";
-import Runtime from "#Runtime";
+import init from "#init";
 import { transformSync } from "@babel/core";
 import build_presets from "@primate/core/build/presets";
 import transform from "@primate/core/build/transform";
+import frontend from "@primate/core/frontend";
 // @ts-expect-error no declaration file
 import solid from "babel-preset-solid";
 function compile(text, presets) {
     return transformSync(transform(text, build_presets.solid).code, { presets })?.code ?? "";
 }
-export default class Default extends Runtime {
-    root = {
+export default frontend({
+    ...init,
+    root: {
         create: create_root,
-    };
-    compile = {
+    },
+    compile: {
         client: (text) => {
             const presets = [[solid, { generate: "dom", hydratable: true }]];
             return { js: compile(text, presets) };
@@ -21,6 +23,6 @@ export default class Default extends Runtime {
             const presets = [[solid, { generate: "ssr", hydratable: true }]];
             return compile(text, presets);
         },
-    };
-}
-//# sourceMappingURL=Default.js.map
+    },
+});
+//# sourceMappingURL=default.js.map

package/lib/private/init.d.ts

@@ -0,0 +1,5 @@
+import type { Init } from "@primate/core/frontend";
+import type { Component } from "solid-js";
+declare const module: Init<Component>;
+export default module;
+//# sourceMappingURL=init.d.ts.map

package/lib/private/{Runtime.js → init.js}

@@ -1,11 +1,10 @@
-import FrontendModule from "@primate/core/frontend/Module";
 import { renderToString } from "solid-js/web";
-export default class Runtime extends FrontendModule {
-    name = "solid";
-    defaultExtensions = [".jsx", ".tsx"];
-    client = true;
-    layouts = true;
-    render = (view, props) => {
+const module = {
+    name: "solid",
+    extensions: [".jsx", ".tsx"],
+    layouts: true,
+    client: true,
+    render(view, props) {
         const heads = [];
         const push_heads = (sub_heads) => {
             heads.push(...sub_heads);
@@ -17,6 +16,7 @@ export default class Runtime extends FrontendModule {
         }
         const head = heads.join("\n");
         return { body, head };
-    };
-}
-//# sourceMappingURL=Runtime.js.map
+    },
+};
+export default module;
+//# sourceMappingURL=init.js.map

package/lib/private/request/store.d.ts

@@ -0,0 +1,4 @@
+import type { RequestPublic } from "@primate/core";
+declare const request: import("solid-js").Accessor<RequestPublic>, setRequest: import("solid-js").Setter<RequestPublic>;
+export { request, setRequest };
+//# sourceMappingURL=store.d.ts.map

package/lib/private/request/store.js

@@ -0,0 +1,4 @@
+import { createSignal } from "solid-js";
+const [request, setRequest] = createSignal(undefined);
+export { request, setRequest };
+//# sourceMappingURL=store.js.map

package/lib/private/runtime.d.ts

@@ -0,0 +1,7 @@
+declare const _default: (input?: {
+    extensions?: string[] | undefined;
+    csr?: boolean | undefined;
+    ssr?: boolean | undefined;
+} | undefined) => import("@primate/core/frontend").Module;
+export default _default;
+//# sourceMappingURL=runtime.d.ts.map

package/lib/private/runtime.js

@@ -0,0 +1,4 @@
+import init from "#init";
+import frontend from "@primate/core/frontend";
+export default frontend(init);
+//# sourceMappingURL=runtime.js.map

package/lib/public/app.d.ts

@@ -0,0 +1,2 @@
+export { request, setRequest } from "#request/store";
+//# sourceMappingURL=app.d.ts.map

package/lib/public/app.js

@@ -0,0 +1,2 @@
+export { request, setRequest } from "#request/store";
+//# sourceMappingURL=app.js.map

package/lib/public/browser.d.ts

@@ -1,2 +1,3 @@
 export { default } from "#client/app";
+export { default as client } from "#client/index";
 //# sourceMappingURL=browser.d.ts.map

package/lib/public/browser.js

@@ -1,2 +1,3 @@
 export { default } from "#client/app";
+export { default as client } from "#client/index";
 //# sourceMappingURL=browser.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,3 @@
-import Runtime from "#Runtime";
-declare const _default: (options?: typeof Runtime.input) => Runtime;
-export default _default;
+export { default as client } from "#client/index";
+export { default } from "#runtime";
 //# sourceMappingURL=runtime.d.ts.map

package/lib/public/runtime.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/solid",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "SolidJS for Primate",
   "homepage": "https://primate.run/docs/frontend/solid",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -16,46 +16,58 @@
     "/lib/**/*.d.ts",
     "!/**/*.spec.*"
   ],
+  "types": "lib/index.d.ts",
   "devDependencies": {
-    "@rcompat/type": "^0.9.0",
+    "@rcompat/type": "^0.17.0",
     "@types/babel__core": "^7.20.5"
   },
   "dependencies": {
     "@babel/core": "^7.28.6",
-    "@rcompat/fs": "^0.25.2",
-    "@rcompat/runtime": "^0.9.0",
-    "babel-preset-solid": "^1.9.10",
-    "@primate/core": "^0.5.0"
+    "@rcompat/fs": "^0.33.2",
+    "@rcompat/runtime": "^0.16.0",
+    "babel-preset-solid": "^1.9.12",
+    "@primate/core": "^0.7.0"
   },
   "peerDependencies": {
     "solid-js": "1",
-    "primate": "^0.36.0"
+    "primate": "^0.38.0"
   },
   "imports": {
+    "#i18n/Bridge.default": {
+      "@primate/source": "./src/private/i18n/Bridge.default.tsx",
+      "default": "./lib/private/i18n/Bridge.default.js"
+    },
     "#*": {
-      "apekit": "./src/private/*.ts",
+      "@primate/source": "./src/private/*.ts",
       "default": "./lib/private/*.js"
     },
     "#HeadImpl": {
-      "apekit": "./src/private/Head/default.ts",
+      "@primate/source": "./src/private/Head/default.ts",
       "browser": "./lib/private/Head/browser.js",
       "default": "./lib/private/Head/default.js"
     }
   },
   "exports": {
     ".": {
+      "types": "./lib/index.d.ts",
+      "@primate/runtime": "./src/public/runtime.ts",
+      "@primate/source": "./src/public/default.ts",
       "browser": "./lib/public/browser.js",
       "runtime": "./lib/public/runtime.js",
       "default": "./lib/public/default.js"
     },
-    "./*": "./lib/public/*.js",
+    "./*": {
+      "@primate/source": "./src/public/*.ts",
+      "default": "./lib/public/*.js"
+    },
     "./i18n/Bridge": {
+      "@primate/source": "./src/public/i18n/Bridge/default.ts",
       "browser": "./lib/public/i18n/Bridge/browser.js",
       "default": "./lib/public/i18n/Bridge/default.js"
     }
   },
   "scripts": {
-    "build": "npm run clean && tsc",
+    "build": "npm run clean && tsc && cp src/types/{app,index}.d.ts lib",
     "postbuild": "node scripts/compile-jsx.js",
     "clean": "rm -rf ./lib",
     "lint": "eslint ."

package/lib/private/Default.d.ts

@@ -1,13 +0,0 @@
-import Runtime from "#Runtime";
-export default class Default extends Runtime {
-    root: {
-        create: (length: number, i18n_active: boolean) => string;
-    };
-    compile: {
-        client: (text: string) => {
-            js: string;
-        };
-        server: (text: string) => string;
-    };
-}
-//# sourceMappingURL=Default.d.ts.map

package/lib/private/Runtime.d.ts

@@ -1,11 +0,0 @@
-import FrontendModule from "@primate/core/frontend/Module";
-import type Render from "@primate/core/frontend/Render";
-import type { Component } from "solid-js";
-export default class Runtime extends FrontendModule<Component> {
-    name: string;
-    defaultExtensions: string[];
-    client: boolean;
-    layouts: boolean;
-    render: Render<Component>;
-}
-//# sourceMappingURL=Runtime.d.ts.map