@primate/svelte 0.23.0 → 0.25.0

package/lib/index.d.ts

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

package/lib/private/client/app.js

@@ -3,11 +3,14 @@ import client from "@primate/core/client";
 import RootView from "svelte:root";
 export default class SvelteApp {
     static mount(_view, data) {
+        const interactive = !data.ssr || data.csr;
+        if (!interactive)
+            return;
         const Root = root[data.ssr ? "ssr" : "csr"](RootView, {
             props: { p: root.toProps(data) },
             target: document.body,
         });
-        if (data.spa) {
+        if (data.csr) {
             const start = () => client.boot((_data, update) => {
                 Root.p = { ...root.toProps(_data), update };
             });

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

@@ -1,10 +1,11 @@
-import type { FormInit } from "@primate/core/client";
+import type { ClientMethod, FormInit } from "@primate/core/client";
 import type { Dict } from "@rcompat/type";
 import type { Readable } from "svelte/store";
-type SvelteFormView<Values extends Dict> = {
+type SvelteFormView<Values extends Dict, Result = unknown> = {
     id: string;
     submitting: boolean;
     submitted: boolean;
+    result: Result | null;
     submit: (event?: Event) => Promise<void>;
     errors: readonly string[];
     field: <K extends keyof Values & string>(name: K) => {
@@ -17,6 +18,11 @@ type SvelteFormView<Values extends Dict> = {
 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;
+}): Readable<SvelteFormView<Values, Result>>;
 declare function form<Values extends Dict>(init: Initial<Values>): Readable<SvelteFormView<Values>>;
 declare function form(init?: FormInit): Readable<SvelteFormView<Dict>>;
 export default form;

package/lib/private/client/form.js

@@ -1,8 +1,19 @@
 import client from "@primate/core/client";
 import { writable } from "svelte/store";
-function form(init) {
-    const { initial, ...form_init } = init ?? {};
-    const controller = client.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 = client.createForm({
+        ...form_init,
+        ...(action !== undefined && {
+            action: action,
+            contentType,
+        }),
+    });
     const values = initial ?? {};
     const make_view = (snapshot) => {
         const form_errors = snapshot.errors.form;
@@ -10,6 +21,7 @@ function form(init) {
             id: snapshot.id,
             submitting: snapshot.submitting,
             submitted: snapshot.submitted,
+            result: snapshot.result,
             submit: controller.submit,
             errors: form_errors,
             field(name) {
@@ -29,7 +41,7 @@ function form(init) {
         submit: controller.submit,
     });
     const { subscribe, set } = writable(initial_view);
-    controller.subscribe((snapshot) => {
+    controller.subscribe(snapshot => {
         set(make_view({
             ...snapshot,
             submit: controller.submit,

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

@@ -1,10 +1,9 @@
 import type Data from "#client/Data";
 import type { Dict } from "@rcompat/type";
-import { hydrate, mount } from "svelte";
 import type { Component } from "svelte";
-type ViewComponent = Component<any>;
+import { hydrate, mount } from "svelte";
 export type RootProps = {
-    views: ViewComponent[];
+    views: Component<any>[];
     props: Dict[];
     request: Data["request"] & {
         url: URL;
@@ -15,12 +14,12 @@ declare function toProps(data: Data): {
     views: Component<{}, {}, string>[];
     props: Dict[];
     request: {
-        url: URL;
         context: Dict;
-        cookies: Dict<string>;
-        headers: Dict<string>;
-        path: Dict<string>;
-        query: Dict<string>;
+        cookies: import("@rcompat/type").PartialDict<string>;
+        headers: import("@rcompat/type").PartialDict<string>;
+        path: import("@rcompat/type").PartialDict<string>;
+        query: import("@rcompat/type").PartialDict<string>;
+        url: URL;
     };
     update: () => undefined;
 };

package/lib/private/context-name.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "__PRMT__";
+declare const _default = "__PRMT__";
 export default _default;
 //# sourceMappingURL=context-name.d.ts.map

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

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

package/lib/private/create-root.js

@@ -1,8 +1,8 @@
-export default (depth, i18n_active) => {
+export default (depth) => {
     const n = depth;
     const body = Array.from({ length: n }, (_, i) => i - 1)
         .reduceRight((child, _, i) => `
-      {#if p.views[${i + 1}]}
+      {#if p.views[${i + 1}] !== undefined}
         <svelte:component this={p.views[${i}]} {...p.props[${i}]}>
           ${child}
         </svelte:component>
@@ -10,43 +10,24 @@ export default (depth, i18n_active) => {
         <svelte:component this={p.views[${i}]} {...p.props[${i}]}/>
       {/if}
     `, `<svelte:component this={p.views[${n}]} {...p.props[${n}]}/>`);
-    const i18nImports = i18n_active
-        ? `
-      import t from "#i18n";
-      import sInternal from "primate/s/internal";
-      import { onMount } from "svelte";`
-        : "";
-    const i18nInit = i18n_active
-        ? `
-      const server = p.request.context.i18n.locale;
-      if (server !== undefined && server !== t.locale.get()) {
-        t[sInternal].init(server);
-      }
-
-      // after hydration: in storage modes, flip to saved locale once
-      onMount(() => { t[sInternal].restore(); });`
-        : "";
     return `
     <script>
       import { afterUpdate, setContext } from "svelte";
       import context_name from "@primate/svelte/context-name";
       import { request } from "@primate/svelte/app";
-      ${i18nImports}
 
       export let p;
 
-      setContext(context_name, p.request.context);
+      setContext(context_name, p.context);
 
-      const { context, path, ...public_request } = p.request;
-      request.set(public_request);
+      function sync(next) {
+        const { context, path, ...public_request } = next.request;
+        request.set(public_request);
+      }
 
-      ${i18nInit}
+      sync(p);
 
-      afterUpdate(() => {
-         const { context, path, ...public_request } = p.request;
-         request.set(public_request);
-         p.update?.();
-      });
+      afterUpdate(() => { sync(p); });
     </script>
 
     ${body}

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/default.js

@@ -9,6 +9,9 @@ const strip = (code) => {
         format: "esm",
     }).code;
 };
+const options = {
+    experimental: { async: true },
+};
 export default frontend({
     ...init,
     root: {
@@ -22,15 +25,15 @@ export default frontend({
             const accessors = true;
             const { css, js } = file.path.endsWith(".js") || file.path.endsWith(".ts")
                 // runes in .svelte.[j|t]s
-                ? compileModule(strip(text), { generate: "client" })
-                : compile(text, { accessors, generate: "client" });
+                ? compileModule(strip(text), { generate: "client", ...options })
+                : compile(text, { accessors, generate: "client", ...options });
             return { css: css?.code ?? "", js: js.code };
         },
         server: (text, file) => {
             const { js } = file?.path.endsWith(".js") || file?.path.endsWith(".ts")
                 // runes in .svelte.[j|t]s
-                ? compileModule(strip(text), { generate: "server" })
-                : compile(text, { generate: "server" });
+                ? compileModule(strip(text), { generate: "server", ...options })
+                : compile(text, { generate: "server", ...options });
             return js.code;
         },
     },

package/lib/private/i18n.d.ts

@@ -0,0 +1,18 @@
+import type { BridgedTranslator, HeadlessTranslator, LocaleOf, RestoreRequest, SetLocaleOf } from "@primate/core/i18n";
+type Unsubscribe = () => void;
+type Subscriber<T> = (value: T) => void;
+type I18NStore<T extends HeadlessTranslator> = {
+    subscribe(run: Subscriber<BridgedTranslator<T>>): Unsubscribe;
+    defaultLocale: T["defaultLocale"];
+    locales: T["locales"];
+    catalogs: T["catalogs"];
+    currency: T["currency"];
+    locale: {
+        get(): LocaleOf<T>;
+        set(locale: SetLocaleOf<T>): void;
+    };
+    restore(request?: RestoreRequest): void;
+};
+export default function i18n<const T extends HeadlessTranslator>(source: T): I18NStore<T>;
+export {};
+//# sourceMappingURL=i18n.d.ts.map

package/lib/private/i18n.js

@@ -0,0 +1,46 @@
+import request from "#request/store";
+export default function i18n(source) {
+    const subscribers = new Set();
+    const notify = () => {
+        for (const subscriber of subscribers)
+            subscriber(value);
+    };
+    const get = () => source.locale.get();
+    const set = (locale) => {
+        const before = source.locale.get();
+        source.locale.set(locale);
+        if (source.locale.get() !== before)
+            notify();
+    };
+    const restore = (next) => {
+        const before = source.locale.get();
+        source.restore(next);
+        if (source.locale.get() !== before)
+            notify();
+    };
+    const value = ((...args) => {
+        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();
+    request.subscribe(next => { restore(next); });
+    return {
+        subscribe(run) {
+            subscribers.add(run);
+            run(value);
+            return () => { subscribers.delete(run); };
+        },
+        defaultLocale: source.defaultLocale,
+        locales: source.locales,
+        catalogs: source.catalogs,
+        currency: source.currency,
+        locale: { get, set },
+        restore,
+    };
+}
+//# sourceMappingURL=i18n.js.map

package/lib/private/init.js

@@ -4,9 +4,9 @@ const module = {
     extensions: [".svelte.js", ".svelte.ts", ".svelte"],
     layouts: true,
     client: true,
-    render(view, props) {
-        const { head, html } = render(view, { props: { p: { ...props } } });
-        return { body: html, head };
+    async render(view, props) {
+        const { body, head } = await render(view, { props: { p: { ...props } } });
+        return { body, head };
     },
     conditions: ["svelte"],
 };

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 svelte(): {
+    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 svelte() {
+    return {
+        name: "svelte",
+        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/lib/public/runtime.d.ts

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

package/lib/public/runtime.js

@@ -1,2 +1,3 @@
+export { default as client } from "#client/index";
 export { default } from "#runtime";
 //# sourceMappingURL=runtime.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/svelte",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "description": "Svelte for Primate",
   "homepage": "https://primate.run/docs/frontend/svelte",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -18,16 +18,16 @@
   ],
   "types": "lib/index.d.ts",
   "dependencies": {
+    "@rcompat/fs": "^0.33.2",
     "esbuild": "^0.28.0",
-    "@primate/core": "^0.6.0"
+    "@primate/core": "^0.8.0"
   },
   "devDependencies": {
-    "@rcompat/type": "^0.11.1",
-    "@primate/test": "^0.0.0"
+    "@rcompat/type": "^0.17.0"
   },
   "peerDependencies": {
     "svelte": "5",
-    "primate": "^0.37.0"
+    "primate": "^0.39.0"
   },
   "imports": {
     "#*": {
@@ -38,20 +38,27 @@
   "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"
     },
+    "./i18n": {
+      "@primate/source": "./src/public/i18n.ts",
+      "default": "./lib/public/i18n.js"
+    },
     "./*": {
       "@primate/source": "./src/public/*.ts",
       "default": "./lib/public/*.js"
     }
   },
   "scripts": {
-    "build": "npm run clean && tsc && cp src/types/app.d.ts lib && cp src/types/index.d.ts lib",
+    "build": "npm run clean && tsgo && cp src/types/app.d.ts lib && cp src/types/index.d.ts lib",
     "clean": "rm -rf ./lib",
-    "lint": "eslint .",
-    "test": "npx proby"
+    "lint": "eslint ."
   }
 }