@primate/solid 0.9.0 → 0.11.0

package/lib/index.d.ts

@@ -1,2 +1,2 @@
 import "./app.d.ts";
-export { default } from "./public/default";
+export { default } from "#default";

package/lib/private/Head/browser.d.ts

@@ -1,9 +1,9 @@
 import type Child from "#Head/ClientChild";
-declare const Head: {
-    (props: {
-        children: Child[];
-    }): null;
-    clear(data_value?: string): void;
-};
+declare function Head(props: {
+    children: Child[];
+}): null;
+declare namespace Head {
+    var clear: (data_value?: string) => void;
+}
 export default Head;
 //# sourceMappingURL=browser.d.ts.map

package/lib/private/Head/default.d.ts

@@ -1,9 +1,9 @@
 import type Child from "#Head/ServerChild";
-declare const Head: {
-    (props: {
-        children: Child[];
-    }): null;
-    clear(data_value?: string): void;
-};
+declare function Head(props: {
+    children: Child[];
+}): null;
+declare namespace Head {
+    var clear: (data_value?: string) => void;
+}
 export default Head;
 //# sourceMappingURL=default.d.ts.map

package/lib/private/Head.d.ts

@@ -1,8 +1,8 @@
-declare const Head: {
-    (props: {
-        children: any[];
-    }): null;
-    clear: (data_value?: string) => void;
-};
+declare function Head(props: {
+    children: any[];
+}): null;
+declare namespace Head {
+    var clear: (data_value?: string) => void;
+}
 export default Head;
 //# sourceMappingURL=Head.d.ts.map

package/lib/private/client/app.js

@@ -7,9 +7,12 @@ const { body } = globalThis.window.document;
 SolidHead.clear();
 export default class SolidApp {
     static mount(_view, 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.spa) {
+        if (data.csr) {
             const start = () => client.boot((_data, update) => {
                 dispose();
                 dispose = root.csr(() => Root(root.toProps(_data, update)), body);

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

@@ -1,21 +1,27 @@
-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> = {
+type FormView<Values extends Dict, Result = unknown> = {
     id: string;
     submitting: boolean;
     submitted: boolean;
+    result: Result | null;
     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, Path extends Dict, Result = unknown>(action: ClientMethod<Values, Path> & {
+    _result?: Result;
+}, init?: Initial<Values> & {
+    path?: Path;
+}): FormView<Values, Result>;
 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,12 +1,23 @@
 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);
-    const values = (initial ?? {});
+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 {
         get id() {
             return snapshot().id;
@@ -17,6 +28,9 @@ function form(init) {
         get submitted() {
             return snapshot().submitted;
         },
+        get result() {
+            return snapshot().result;
+        },
         submit(event) {
             return controller.submit(event);
         },

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

@@ -1,4 +1,4 @@
-import type ContextData from "@primate/core/i18n/ContextData";
+import type { ContextData } from "@primate/core/i18n";
 import type { Dict } from "@rcompat/type";
 import { type Accessor, type Setter } from "solid-js";
 type Context = {

package/lib/private/create-root.d.ts

@@ -1,3 +1,3 @@
-declare const _default: (length: number, i18n_active: boolean) => string;
+declare const _default: (length: number) => string;
 export default _default;
 //# sourceMappingURL=create-root.d.ts.map

package/lib/private/create-root.js

@@ -1,4 +1,4 @@
-export default (length, i18n_active) => {
+export default (length) => {
     const n = length;
     const body = Array.from({ length: n }, (_, i) => i - 1).reduceRight((child, _, i) => `views[${i + 1}] !== undefined
       ? createComponent(views[${i}], { ...props[${i}],
@@ -6,31 +6,17 @@ export default (length, i18n_active) => {
         })
       : createComponent(views[${i}], props[${i}])
     `, `createComponent(views[${n}], props[${n}])`);
-    const i18n_imports = i18n_active
-        ? `
-      import I18nBridge from "@primate/solid/i18n/Bridge";
-      import t from "#i18n";`
-        : "";
-    const tree = i18n_active
-        ? `<I18nBridge t={t}>{${body}}</I18nBridge>`
-        : `{${body}}`;
     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}
+    import HeadContext from "@primate/solid/context/head";
 
     export default ({ views, props, request, push_heads: value }) => {
       setRequest(request);
-      const [context, setContext] = createSignal(request.context);
-      const $value = { context, setContext };
 
-      return <AppContext.Provider value={$value}>
-          <HeadContext.Provider value={value}>
-            ${tree}
-          </HeadContext.Provider>
-        </AppContext.Provider>
+      return <HeadContext.Provider value={value}>
+        {${body}}
+      </HeadContext.Provider>
     }
   `;
 };

package/lib/private/default.d.ts

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

package/lib/private/i18n.d.ts

@@ -0,0 +1,3 @@
+import type { BridgedTranslator, HeadlessTranslator } from "@primate/core/i18n";
+export default function i18n<const T extends HeadlessTranslator>(source: T): BridgedTranslator<T>;
+//# sourceMappingURL=i18n.d.ts.map

package/lib/private/i18n.js

@@ -0,0 +1,51 @@
+import { request } from "#request/store";
+import { createSignal } from "solid-js";
+export default function i18n(source) {
+    const [version, setVersion] = createSignal(0);
+    let restored = false;
+    let restored_request;
+    const current_request = () => request();
+    const restore_from_request = () => {
+        const next = current_request();
+        if (restored && next === restored_request)
+            return;
+        restored = true;
+        restored_request = next;
+        source.restore(next);
+    };
+    const depend = () => {
+        version();
+        restore_from_request();
+    };
+    const restore = (next = current_request()) => {
+        const before = source.locale.get();
+        restored = true;
+        restored_request = next;
+        source.restore(next);
+        if (source.locale.get() !== before)
+            setVersion(v => v + 1);
+    };
+    const get = () => {
+        depend();
+        return source.locale.get();
+    };
+    const set = (locale) => {
+        const before = source.locale.get();
+        source.locale.set(locale);
+        if (source.locale.get() !== before)
+            setVersion(v => v + 1);
+    };
+    const value = ((...args) => {
+        depend();
+        return source(...args);
+    });
+    value.defaultLocale = source.defaultLocale;
+    value.locales = source.locales;
+    value.catalogs = source.catalogs;
+    value.currency = source.currency;
+    value.locale = { get, set };
+    value.restore = restore;
+    restore();
+    return value;
+}
+//# sourceMappingURL=i18n.js.map

package/lib/private/runtime.d.ts

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

package/lib/public/browser.d.ts

@@ -1,2 +1,6 @@
-export { default } from "#client/app";
+export default function solid(): {
+    name: string;
+    setup(): void;
+};
+export { default as app } from "#client/app";
 //# sourceMappingURL=browser.d.ts.map

package/lib/public/browser.js

@@ -1,2 +1,8 @@
-export { default } from "#client/app";
+export default function solid() {
+    return {
+        name: "solid",
+        setup() { },
+    };
+}
+export { default as app } from "#client/app";
 //# sourceMappingURL=browser.js.map

package/lib/public/i18n.d.ts

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

package/lib/public/i18n.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/solid",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "SolidJS for Primate",
   "homepage": "https://primate.run/docs/frontend/solid",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -18,20 +18,18 @@
   ],
   "types": "lib/index.d.ts",
   "devDependencies": {
-    "@rcompat/type": "^0.11.1",
-    "@types/babel__core": "^7.20.5",
-    "@primate/test": "^0.0.0"
+    "@rcompat/type": "^0.17.0",
+    "@types/babel__core": "^7.20.5"
   },
   "dependencies": {
-    "@babel/core": "^7.28.6",
-    "@rcompat/fs": "^0.28.1",
-    "@rcompat/runtime": "^0.11.1",
+    "@babel/core": "^7.29.7",
+    "@rcompat/runtime": "^0.16.0",
     "babel-preset-solid": "^1.9.12",
-    "@primate/core": "^0.6.0"
+    "@primate/core": "^0.8.0"
   },
   "peerDependencies": {
     "solid-js": "1",
-    "primate": "^0.37.0"
+    "primate": "^0.39.0"
   },
   "imports": {
     "#*": {
@@ -47,26 +45,23 @@
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
+      "browser": {
+        "@primate/source": "./src/public/browser.ts",
+        "default": "./lib/public/browser.js"
+      },
+      "@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"
     },
     "./*": {
       "@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 && cp src/types/{app,index}.d.ts lib",
-    "postbuild": "node scripts/compile-jsx.js",
+    "build": "npm run clean && tsgo && cp src/types/{app,index}.d.ts lib",
     "clean": "rm -rf ./lib",
-    "lint": "eslint .",
-    "test": "npx proby"
+    "lint": "eslint ."
   }
 }

package/lib/private/i18n/Bridge.browser.d.ts

@@ -1,8 +0,0 @@
-import type API from "@primate/core/i18n/API";
-import type Catalogs from "@primate/core/i18n/Catalogs";
-import { type JSX } from "solid-js";
-export default function I18nBridge<C extends Catalogs>(props: {
-    t: API<C>;
-    children?: JSX.Element;
-}): any;
-//# sourceMappingURL=Bridge.browser.d.ts.map

package/lib/private/i18n/Bridge.browser.js

@@ -1,25 +0,0 @@
-import { memo as _$memo } from "solid-js/web";
-import AppContext from "#context/app";
-import sInternal from "@primate/core/i18n/sInternal";
-import { createSignal, onCleanup, onMount, useContext } from "solid-js";
-function I18nBridge(props) {
-  const {
-    context
-  } = useContext(AppContext);
-  const server = context().i18n.locale;
-  if (server !== void 0 && server !== props.t.locale.get()) {
-    props.t[sInternal].init(server);
-  }
-  const [version, setVersion] = createSignal(props.t[sInternal].version);
-  const removeDepend = props.t[sInternal].depend(() => {
-    version();
-  });
-  const off = props.t.subscribe(() => setVersion(v => v + 1));
-  onMount(() => props.t[sInternal].restore());
-  onCleanup(() => {
-    off();
-    removeDepend();
-  });
-  return _$memo(() => props.children);
-}
-export { I18nBridge as default };

package/lib/private/i18n/Bridge.default.d.ts

@@ -1,8 +0,0 @@
-import type API from "@primate/core/i18n/API";
-import type Catalogs from "@primate/core/i18n/Catalogs";
-import { type JSX } from "solid-js";
-export default function I18nBridge<C extends Catalogs>(props: {
-    t: API<C>;
-    children?: JSX.Element;
-}): any;
-//# sourceMappingURL=Bridge.default.d.ts.map

package/lib/private/i18n/Bridge.default.js

@@ -1,12 +0,0 @@
-import { memo as _$memo } from "solid-js/web";
-import AppContext from "#context/app";
-import sInternal from "@primate/core/i18n/sInternal";
-import { useContext } from "solid-js";
-function I18nBridge(props) {
-  const {
-    context
-  } = useContext(AppContext);
-  props.t[sInternal].init(context().i18n.locale);
-  return _$memo(() => props.children);
-}
-export { I18nBridge as default };

package/lib/public/i18n/Bridge/browser.d.ts

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

package/lib/public/i18n/Bridge/browser.js

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

package/lib/public/i18n/Bridge/default.d.ts

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

package/lib/public/i18n/Bridge/default.js

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