@piying/view-vue 1.1.0 → 1.1.1

package/formly/builder.d.ts

@@ -1,6 +1,4 @@
 import { FormBuilder } from '@piying/view-core';
-import type { PiResolvedFormlyFieldConfig } from './type/group';
 import type { VueSchemaHandle } from './vue-schema';
 export declare class VueFormBuilder extends FormBuilder<VueSchemaHandle> {
-    afterResolveConfig(rawConfig: VueSchemaHandle, config: PiResolvedFormlyFieldConfig): PiResolvedFormlyFieldConfig;
 }

package/formly/util/index.d.ts

@@ -0,0 +1,3 @@
+export * from './init-listen';
+export * from './signal-convert';
+export * from './use-control-value-accessor';

package/formly/util/signal-convert.d.ts

@@ -1,5 +1 @@
-import { type Injector, type Signal } from 'static-injector';
-import type { UnWrapSignal } from '@piying/view-core';
-import { type ShallowRef } from 'vue';
-export declare function useSignalConvert<T>(value: Signal<T> | undefined, injector: Injector): T extends undefined ? ShallowRef<undefined> : ShallowRef<UnWrapSignal<T>>;
-export declare function watchChange<T>(value: () => T | undefined, injector: Injector): import("vue").Ref<any> extends T ? T extends T & import("vue").Ref<any> ? import("@vue/shared").IfAny<T, ShallowRef<T>, T> : ShallowRef<T> : ShallowRef<T>;
+export declare function watchChange<T>(value: () => T | undefined): import("vue").Ref<any> extends T ? T extends T & import("vue").Ref<any> ? import("@vue/shared").IfAny<T, import("vue").ShallowRef<T>, T> : import("vue").ShallowRef<T> : import("vue").ShallowRef<T>;

package/formly/util/use-control-value-accessor.d.ts

@@ -0,0 +1,8 @@
+import type { ControlValueAccessor } from '@piying/view-core';
+export declare function useControlValueAccessor(): {
+    cva: ControlValueAccessor;
+    value: import("vue").Ref<any>;
+    disabled: import("vue").Ref<boolean>;
+    valueChange: (value: any) => void;
+    touchedChange: () => void;
+};

package/index.d.ts

@@ -1,3 +1,4 @@
 import PiyingView from './formly/piying-view.vue';
 export { PiyingView };
 export * from '@piying/view-core';
+export * from './formly/util';

package/index.js

@@ -1,151 +1,126 @@
-var U = Object.defineProperty;
-var q = (r, e, t) => e in r ? U(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
-var E = (r, e, t) => q(r, typeof e != "symbol" ? e + "" : e, t);
-import { shallowRef as F, watchEffect as R, defineComponent as T, inject as G, computed as m, createBlock as y, renderSlot as N, openBlock as c, resolveDynamicComponent as C, mergeProps as $, unref as a, toHandlers as g, withCtx as D, createVNode as z, normalizeProps as L, guardReactiveProps as W, defineAsyncComponent as J, provide as H, createElementBlock as x, createCommentVNode as P, Fragment as S, createTextVNode as K, watch as M } from "vue";
-import { CoreSchemaHandle as Q, FormBuilder as X, isFieldControl as Y, convert as Z } from "@piying/view-core";
+var W = Object.defineProperty;
+var J = (n, e, o) => e in n ? W(n, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : n[e] = o;
+var R = (n, e, o) => J(n, typeof e != "symbol" ? e + "" : e, o);
+import { inject as P, shallowRef as T, watchEffect as G, defineComponent as D, computed as v, createBlock as _, renderSlot as A, openBlock as d, resolveDynamicComponent as V, mergeProps as b, unref as i, toHandlers as j, withCtx as S, createVNode as K, normalizeProps as M, guardReactiveProps as Q, defineAsyncComponent as X, provide as H, ref as $, watch as N, onUnmounted as Y, createElementBlock as B, createCommentVNode as F, Fragment as O } from "vue";
+import { CoreSchemaHandle as Z, FormBuilder as L, isFieldControl as ee, createViewControlLink as te, convert as oe } from "@piying/view-core";
 export * from "@piying/view-core";
-import { effect as B, createRootInjector as ee, ChangeDetectionSchedulerImpl as te, ChangeDetectionScheduler as oe, createInjector as ne, DestroyRef as le, untracked as re } from "static-injector";
-import { deepEqual as se } from "fast-equals";
-class ue extends Q {
+import { effect as q, createRootInjector as ne, ChangeDetectionSchedulerImpl as re, ChangeDetectionScheduler as le, createInjector as ae, DestroyRef as ue, untracked as se } from "static-injector";
+import { deepEqual as ce } from "fast-equals";
+class ie extends Z {
   constructor() {
     super(...arguments);
-    E(this, "contents");
+    R(this, "contents");
   }
 }
-class ae extends X {
-  afterResolveConfig(e, t) {
-    var n;
-    const o = e;
-    return e.type, {
-      ...t,
-      contents: (n = o.contents) == null ? void 0 : n.sort((l, u) => l.nodes && u.nodes ? 0 : l.nodes ? -1 : 1)
-      // define,
-    };
-  }
+class de extends L {
 }
-const A = Symbol(), ie = Symbol();
-function f(r, e) {
-  const t = F(void 0);
-  return R((o) => {
-    t.value = r();
-    const n = B(
+const x = Symbol(), fe = Symbol();
+function m(n) {
+  const e = P(x), o = T(void 0);
+  return G((r) => {
+    o.value = n();
+    const a = q(
       () => {
-        const l = r();
-        Object.is(t.value, l) || (t.value = l);
+        const t = n();
+        Object.is(o.value, t) || (o.value = t);
       },
       { injector: e }
     );
-    o(() => {
-      n.destroy();
-    });
-  }), t;
-}
-function ce(r) {
-  const e = F(void 0);
-  let t = !1, o;
-  return R((l) => {
-    let u = !0;
-    if (o = r(), o && Y(o))
-      t = !0, e.value = o.modelValueToViewValue$$();
-    else {
-      t = !1;
-      return;
-    }
-    const s = B(
-      () => {
-        const i = o.modelValueToViewValue$$();
-        u ? (u = !1, Object.is(e.value, i) || (e.value = i)) : e.value = i;
-      },
-      { injector: o.injector }
-    );
-    l(() => {
-      s.destroy();
+    r(() => {
+      a.destroy();
     });
-  }), [e, (l) => {
-    t && o.setViewValue(l);
-  }];
+  }), o;
 }
-const O = /* @__PURE__ */ T({
+const z = /* @__PURE__ */ D({
   __name: "wrapper",
   props: {
     wrappers: {}
   },
-  setup(r) {
-    const e = G(A), t = r, o = m(() => t.wrappers.slice(1)), n = m(() => t.wrappers[0]), l = f(
-      () => {
-        var s, i;
-        return { ...(s = n.value) == null ? void 0 : s.inputs(), ...(i = n.value) == null ? void 0 : i.attributes() };
-      },
-      e
-    ), u = m(() => {
-      var s;
-      return ((s = n.value) == null ? void 0 : s.outputs) ?? {};
+  setup(n) {
+    const e = n, o = v(() => e.wrappers.slice(1)), r = v(() => e.wrappers[0]), a = m(() => {
+      var l, f;
+      return { ...(l = r.value) == null ? void 0 : l.inputs(), ...(f = r.value) == null ? void 0 : f.attributes() };
+    }), t = v(() => {
+      var l;
+      return ((l = r.value) == null ? void 0 : l.outputs) ?? {};
     });
-    return (s, i) => n.value ? (c(), y(C(n.value.type), $({ key: 0 }, a(l), g(u.value)), {
-      default: D(() => [
-        z(O, L(W({ wrappers: o.value })), {
-          default: D(() => [
-            N(s.$slots, "default")
+    return (l, f) => r.value ? (d(), _(V(r.value.type), b({ key: 0 }, i(a), j(t.value)), {
+      default: S(() => [
+        K(z, M(Q({ wrappers: o.value })), {
+          default: S(() => [
+            A(l.$slots, "default")
           ]),
           _: 3
         }, 16)
       ]),
       _: 3
-    }, 16)) : N(s.$slots, "default", { key: 1 });
+    }, 16)) : A(l.$slots, "default", { key: 1 });
   }
-}), de = /* @__PURE__ */ T({
+}), pe = /* @__PURE__ */ D({
   __name: "field-template",
   props: {
     field: {}
   },
-  setup(r) {
-    const e = r, t = G(A), o = f(() => e.field.inputs(), t), n = f(() => e.field.outputs(), t), l = f(() => e.field.renderConfig(), t), [u, s] = ce(() => e.field.form.control), i = f(() => e.field.attributes(), t), I = m(() => ({ ...o.value, fields: e.field.fieldGroup() })), V = m(() => ({ ...o.value, fields: e.field.fieldArray() })), _ = f(() => e.field.wrappers$$(), t), h = f(() => {
-      var d, p;
-      return (p = (d = e.field).fieldGroup) == null ? void 0 : p.call(d);
-    }, t), w = f(() => {
-      var d, p;
-      return (p = (d = e.field).fieldArray) == null ? void 0 : p.call(d);
-    }, t), j = m(() => ({ ...i.value, ...o.value })), v = m(
+  setup(n) {
+    const e = n, o = P(x), r = m(() => e.field.inputs()), a = m(() => e.field.outputs()), t = m(() => e.field.renderConfig()), l = m(() => e.field.attributes()), f = v(() => ({ ...r.value, fields: e.field.fieldGroup() })), E = v(() => ({ ...r.value, fields: e.field.fieldArray() })), I = m(() => e.field.wrappers()), C = m(() => {
+      var u, s;
+      return (s = (u = e.field).fieldGroup) == null ? void 0 : s.call(u);
+    }), g = m(() => {
+      var u, s;
+      return (s = (u = e.field).fieldArray) == null ? void 0 : s.call(u);
+    }), y = v(() => ({ ...l.value, ...r.value })), c = v(
       () => {
-        var d, p, k;
-        return typeof ((d = e.field.define) == null ? void 0 : d.type) == "function" ? J((p = e.field.define) == null ? void 0 : p.type) : (k = e.field.define) == null ? void 0 : k.type;
+        var u, s, k;
+        return typeof ((u = e.field.define) == null ? void 0 : u.type) == "function" ? X((s = e.field.define) == null ? void 0 : s.type) : (k = e.field.define) == null ? void 0 : k.type;
       }
-    ), b = m(() => e.field);
-    return H(ie, b), (d, p) => {
+    ), h = v(() => e.field);
+    H(fe, h);
+    const w = $(null), U = ee(h.value.form.control);
+    let p;
+    return N(
+      w,
+      (u) => {
+        p == null || p.forEach((s) => s()), U && u && (p = te(
+          () => h.value.form.control,
+          u.cva,
+          o
+        ));
+      },
+      { immediate: !0 }
+    ), Y(() => {
+      p == null || p.forEach((u) => u()), p = [];
+    }), (u, s) => {
       var k;
-      return a(l).hidden ? P("", !0) : (c(), x(S, { key: 0 }, [
-        (k = b.value.define) != null && k.type ? (c(), y(O, {
+      return i(t).hidden ? F("", !0) : (d(), B(O, { key: 0 }, [
+        (k = h.value.define) != null && k.type ? (d(), _(z, {
           key: 0,
-          wrappers: a(_)
+          wrappers: i(I)
         }, {
-          default: D(() => [
-            a(h) ? (c(), y(C(v.value), $({ key: 0 }, I.value, g(a(n))), null, 16)) : a(w) ? (c(), y(C(v.value), $({ key: 1 }, V.value, g(a(n))), null, 16)) : (c(), x(S, { key: 2 }, [
-              b.value.form.control ? (c(), x(S, { key: 0 }, [
-                K(" 111 "),
-                (c(), y(C(v.value), $(j.value, g(a(n)), {
-                  modelValue: a(u),
-                  "onUpdate:modelValue": a(s)
-                }), null, 16, ["modelValue", "onUpdate:modelValue"]))
-              ], 64)) : (c(), y(C(v.value), $({ key: 1 }, j.value, g(a(n))), null, 16))
+          default: S(() => [
+            i(C) ? (d(), _(V(c.value), b({ key: 0 }, f.value, j(i(a))), null, 16)) : i(g) ? (d(), _(V(c.value), b({ key: 1 }, E.value, j(i(a))), null, 16)) : (d(), B(O, { key: 2 }, [
+              h.value.form.control ? (d(), _(V(c.value), b({ key: 0 }, y.value, j(i(a)), {
+                ref_key: "childRef",
+                ref: w
+              }), null, 16)) : (d(), _(V(c.value), b({ key: 1 }, y.value, j(i(a))), null, 16))
             ], 64))
           ]),
           _: 1
-        }, 8, ["wrappers"])) : P("", !0)
+        }, 8, ["wrappers"])) : F("", !0)
       ], 64));
     };
   }
 });
-function pe(r, e, t, o) {
-  let n = !0;
-  return B(
+function me(n, e, o, r) {
+  let a = !0;
+  return q(
     () => {
-      const l = e.value$$();
-      n ? (se(l, r) || o(l), n = !1) : o(l);
+      const t = e.value$$();
+      a ? (ce(t, n) || r(t), a = !1) : r(t);
     },
-    { injector: t }
+    { injector: o }
   );
 }
-const _e = /* @__PURE__ */ T({
+const ge = /* @__PURE__ */ D({
   __name: "piying-view",
   props: {
     schema: {},
@@ -153,60 +128,91 @@ const _e = /* @__PURE__ */ T({
     options: {}
   },
   emits: ["update:modelValue"],
-  setup(r, { emit: e }) {
-    const t = r, o = e, n = ee({
+  setup(n, { emit: e }) {
+    const o = n, r = e, a = ne({
       providers: [
         {
-          provide: oe,
-          useClass: te
+          provide: le,
+          useClass: re
         }
       ]
     });
-    H(A, n);
-    const l = F(void 0);
-    return M(
-      () => [t.schema, t.options],
-      ([u, s], i, I) => {
-        const V = ne({ providers: [], parent: n }), _ = Z(u, {
-          handle: ue,
-          builder: ae,
-          injector: V,
-          registerOnDestroy: (w) => {
-            V.get(le).onDestroy(() => {
-              w();
+    H(x, a);
+    const t = T(void 0);
+    return N(
+      () => [o.schema, o.options],
+      ([l, f], E, I) => {
+        const C = ae({ providers: [], parent: a }), g = oe(l, {
+          handle: ie,
+          builder: de,
+          injector: C,
+          registerOnDestroy: (c) => {
+            C.get(ue).onDestroy(() => {
+              c();
             });
           },
-          ...s
+          ...f
         });
-        l.value = _;
-        let h;
-        if (_.form.control) {
-          const w = t.modelValue;
-          h = pe(
-            typeof w < "u" ? w : void 0,
-            _.form.control,
-            V,
-            (j) => {
-              re(() => {
-                var v;
-                (v = _.form.control) != null && v.valueNoError$$() && o("update:modelValue", j);
+        t.value = g;
+        let y;
+        if (g.form.control) {
+          const c = o.modelValue;
+          y = me(
+            typeof c < "u" ? c : void 0,
+            g.form.control,
+            C,
+            (h) => {
+              se(() => {
+                var w;
+                (w = g.form.control) != null && w.valueNoError$$() && r("update:modelValue", h);
               });
             }
           );
         }
         I(() => {
-          V.destroy(), h == null || h.destroy();
+          C.destroy(), y == null || y.destroy();
         });
       },
       { immediate: !0 }
-    ), R(() => {
-      var u;
-      (u = l.value.form.control) == null || u.updateValue(t.modelValue);
-    }), (u, s) => (c(), y(de, {
-      field: l.value
+    ), G(() => {
+      var l;
+      (l = t.value.form.control) == null || l.updateValue(o.modelValue);
+    }), (l, f) => (d(), _(pe, {
+      field: t.value
     }, null, 8, ["field"]));
   }
 });
+function we() {
+  const n = $(), e = $(!1);
+  let o, r;
+  return {
+    cva: {
+      writeValue(t) {
+        n.value = t;
+      },
+      registerOnChange(t) {
+        o = t;
+      },
+      registerOnTouched(t) {
+        r = t;
+      },
+      setDisabledState(t) {
+        e.value = t;
+      }
+    },
+    value: n,
+    disabled: e,
+    valueChange: (t) => {
+      o(t);
+    },
+    touchedChange: () => {
+      r();
+    }
+  };
+}
 export {
-  _e as PiyingView
+  ge as PiyingView,
+  me as initListen,
+  we as useControlValueAccessor,
+  m as watchChange
 };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@piying/view-vue",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "dependencies": {
-    "@piying/view-core": "^0.6.5",
+    "@piying/view-core": "^0.6.22",
     "fast-equals": "^5.2.2",
     "rfdc": "^1.4.1",
     "static-injector": "^6.1.2"

package/components/HelloWorld.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
-export default _default;

package/formly/util/field-connect.d.ts

@@ -1,2 +0,0 @@
-import { type AbstractControl } from '@piying/view-core';
-export declare function useFieldConnect(controlFn: () => AbstractControl | undefined): readonly [import("vue").ShallowRef<any>, (value: any) => void];