@primate/vue 0.16.1 → 0.18.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/client/app.js

@@ -2,9 +2,12 @@ import root from "#client/root";
 import client from "@primate/core/client";
 export default class VueApp {
     static mount(_view, data) {
+        const interactive = !data.ssr || data.csr;
+        if (!interactive)
+            return;
         let app = root[data.ssr ? "ssr" : "csr"](root.toProps(data));
         app.mount("#app");
-        if (data.spa) {
+        if (data.csr) {
             const start = () => client.boot((next, update) => {
                 app.unmount();
                 app = root.csr(root.toProps(next, update));

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,14 +1,25 @@
 import core from "@primate/core/client";
 import { onUnmounted, shallowRef } from "vue";
-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 = shallowRef(controller.read());
-    const unsub = controller.subscribe((next) => {
+    const unsubscribe = controller.subscribe(next => {
         snapshot.value = next;
     });
-    onUnmounted(unsub);
+    onUnmounted(unsubscribe);
     return {
         get id() {
             return snapshot.value.id;
@@ -19,6 +30,9 @@ function form(init) {
         get submitted() {
             return snapshot.value.submitted;
         },
+        get result() {
+            return snapshot.value.result;
+        },
         submit(event) {
             return controller.submit(event);
         },

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

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

package/lib/private/create-root.js

@@ -1,58 +1,31 @@
-export default (depth, i18n_active) => {
-    const n = depth;
+export default function createRoot(depth) {
     const build_view = (index) => {
-        // anchor case: render the deepest view
-        if (index === n)
+        if (index > depth)
+            return `h("div")`;
+        if (index === depth)
             return `h(p.views[${index}], p.props[${index}] || {})`;
-        else {
-            // recursive case: render view with child
-            const child = build_view(index + 1);
-            return `h(p.views[${index}], p.props[${index}] || {}, () => [${child}])`;
-        }
+        const child = build_view(index + 1);
+        return `h(p.views[${index}], p.props[${index}] || {}, () => [${child}])`;
     };
-    const body = depth > 0 ? build_view(0) : "h(\"div\")";
-    const vueImports = `
-    import {
-      defineComponent, h${i18n_active ? ", ref, onMounted, onUnmounted" : ""}
-    } from "vue";
-    import { setRequest } from "@primate/vue/app";
-    `;
-    const i18nImports = i18n_active
-        ? `
-import t from "#i18n";
-import sInternal from "primate/s/internal";`
-        : "";
-    const i18nSetup = i18n_active
-        ? `
-const initialLocale = props.p?.request?.context?.i18n?.locale;
-if (initialLocale) t[sInternal].init(initialLocale);
-
-onMounted(() => { t[sInternal].restore(); });
-
-if (typeof window !== "undefined") {
-  const version = ref(t[sInternal].version);
-  const removeDepend = t[sInternal].depend(() => { void version.value; });
-  const unsubscribe = t.onChange(() => {
-    version.value = t[sInternal].version;
-  });
-  onUnmounted(() => { unsubscribe?.(); removeDepend?.(); });
-}`
-        : "";
+    const body = `h(Suspense, null, { default: () => ${build_view(0)} })`;
     return `
-${vueImports}
-${i18nImports}
+import { defineComponent, h, Suspense } from "vue";
+import { setRequest } from "@primate/vue/app";
+
 export default defineComponent({
   name: "root",
   props: { p: { type: Object, required: true } },
+
   setup(props) {
-    ${i18nSetup}
     return () => {
       const p = props.p;
-      setRequest(props.p.request);
+
+      setRequest(p.request);
+
       return ${body};
     };
   },
 });
 `;
-};
+}
 //# sourceMappingURL=create-root.js.map

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,42 @@
+import request from "#request/store";
+import { ref, watch } from "vue";
+export default function i18n(source) {
+    const version = ref(0);
+    const notify = () => { version.value += 1; };
+    const depend = () => {
+        void version.value;
+    };
+    const restore = (next) => {
+        const before = source.locale.get();
+        source.restore(next);
+        if (source.locale.get() !== before)
+            notify();
+    };
+    const get = () => {
+        depend();
+        return source.locale.get();
+    };
+    const set = (locale) => {
+        const before = source.locale.get();
+        source.locale.set(locale);
+        if (source.locale.get() !== before) {
+            notify();
+        }
+    };
+    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(request.value);
+    watch(request, next => {
+        restore(next);
+    }, { immediate: false });
+    return value;
+}
+//# sourceMappingURL=i18n.js.map

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

@@ -26,10 +26,10 @@ declare const store: import("vue").Ref<{
             sort: () => void;
             toString: () => string;
             forEach: (callbackfn: (value: string, key: string, parent: URLSearchParams) => void, thisArg?: any) => void;
+            [Symbol.iterator]: () => URLSearchParamsIterator<[string, string]>;
             entries: () => URLSearchParamsIterator<[string, string]>;
             keys: () => URLSearchParamsIterator<string>;
             values: () => URLSearchParamsIterator<string>;
-            [Symbol.iterator]: () => URLSearchParamsIterator<[string, string]>;
         };
         username: string;
         toJSON: () => string;
@@ -61,10 +61,10 @@ declare const store: import("vue").Ref<{
             sort: () => void;
             toString: () => string;
             forEach: (callbackfn: (value: string, key: string, parent: URLSearchParams) => void, thisArg?: any) => void;
+            [Symbol.iterator]: () => URLSearchParamsIterator<[string, string]>;
             entries: () => URLSearchParamsIterator<[string, string]>;
             keys: () => URLSearchParamsIterator<string>;
             values: () => URLSearchParamsIterator<string>;
-            [Symbol.iterator]: () => URLSearchParamsIterator<[string, string]>;
         };
         username: string;
         toJSON: () => string;

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/app.d.ts

@@ -25,10 +25,10 @@ export declare function useRequest(): import("vue").Ref<{
             sort: () => void;
             toString: () => string;
             forEach: (callbackfn: (value: string, key: string, parent: URLSearchParams) => void, thisArg?: any) => void;
+            [Symbol.iterator]: () => URLSearchParamsIterator<[string, string]>;
             entries: () => URLSearchParamsIterator<[string, string]>;
             keys: () => URLSearchParamsIterator<string>;
             values: () => URLSearchParamsIterator<string>;
-            [Symbol.iterator]: () => URLSearchParamsIterator<[string, string]>;
         };
         username: string;
         toJSON: () => string;
@@ -60,10 +60,10 @@ export declare function useRequest(): import("vue").Ref<{
             sort: () => void;
             toString: () => string;
             forEach: (callbackfn: (value: string, key: string, parent: URLSearchParams) => void, thisArg?: any) => void;
+            [Symbol.iterator]: () => URLSearchParamsIterator<[string, string]>;
             entries: () => URLSearchParamsIterator<[string, string]>;
             keys: () => URLSearchParamsIterator<string>;
             values: () => URLSearchParamsIterator<string>;
-            [Symbol.iterator]: () => URLSearchParamsIterator<[string, string]>;
         };
         username: string;
         toJSON: () => string;

package/lib/public/browser.d.ts

@@ -1,2 +1,6 @@
-export { default } from "#client/app";
+export default function vue(): {
+    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 vue() {
+    return {
+        name: "vue",
+        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/vue",
-  "version": "0.16.1",
+  "version": "0.18.0",
   "description": "Vue for Primate",
   "homepage": "https://primate.run/docs/frontend/vue",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -18,15 +18,15 @@
   ],
   "types": "lib/index.d.ts",
   "dependencies": {
-    "@primate/core": "^0.6.0"
+    "@rcompat/fs": "^0.33.2",
+    "@primate/core": "^0.8.0"
   },
   "devDependencies": {
-    "@rcompat/type": "^0.11.1",
-    "@primate/test": "^0.0.0"
+    "@rcompat/type": "^0.17.0"
   },
   "peerDependencies": {
     "vue": "3",
-    "primate": "^0.37.0"
+    "primate": "^0.39.0"
   },
   "imports": {
     "#*": {
@@ -37,8 +37,12 @@
   "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"
     },
@@ -48,9 +52,8 @@
     }
   },
   "scripts": {
-    "build": "npm run clean && tsc && cp src/types/{app,index}.d.ts lib",
+    "build": "npm run clean && tsgo && cp src/types/{app,index}.d.ts lib",
     "clean": "rm -rf ./lib",
-    "lint": "eslint .",
-    "test": "npx proby"
+    "lint": "eslint ."
   }
 }