@piying/view-vue2-legacy 2.10.0 → 2.10.1

package/component/field-control-bind.vue.d.ts

@@ -0,0 +1,35 @@
+import type { KeyPath } from '@piying/view-core';
+import type { PiResolvedViewFieldConfig } from '../type/group';
+type __VLS_Props = {
+    field: PiResolvedViewFieldConfig;
+    path?: KeyPath;
+};
+declare var __VLS_1: {
+    cvaa: {
+        value: import("vue").ShallowRef<any>;
+        disabled: import("vue").Ref<boolean>;
+        valueChange: (input: any) => void;
+        touchedChange: () => void;
+    };
+    field: PiResolvedViewFieldConfig | undefined;
+};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_base: import("vue").DefineComponent<__VLS_TypePropsToOption<__VLS_Props>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_Props>>>, {}>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
+export default _default;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<Required<T>[K]>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/component/field-template.vue.d.ts

@@ -1,6 +1,8 @@
 import type { PiResolvedViewFieldConfig } from '../type/group';
+import { type KeyPath } from '@piying/view-core';
 type __VLS_Props = {
     field: PiResolvedViewFieldConfig;
+    path?: KeyPath;
 };
 declare const __VLS_export: import("vue").DefineComponent<__VLS_TypePropsToOption<__VLS_Props>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_Props>>>, {}>;
 declare const _default: typeof __VLS_export;

package/component/piying-view.vue.d.ts

@@ -1,12 +1,9 @@
 import * as v from 'valibot';
-import type { Injector } from 'static-injector';
+import type { FieldConvertViewOptions } from '@piying/view-core';
 type __VLS_Props = {
-    schema: v.BaseSchema<any, any, any> | v.SchemaWithPipe<any>;
+    schema: v.BaseSchema<any, any, any>;
     modelValue?: any;
-    options: {
-        injector?: Injector;
-        [name: string]: any;
-    };
+    options: FieldConvertViewOptions;
 };
 declare const __VLS_export: import("vue").DefineComponent<__VLS_TypePropsToOption<__VLS_Props>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (...args: any[]) => void;

package/index.d.ts

@@ -5,6 +5,8 @@ import PiyingFieldTemplate from './component/field-template.vue';
 export { PiyingFieldTemplate };
 import PiyingViewGroup from './component/group.vue';
 export { PiyingViewGroup };
+import PiyingFieldControlBind from './component/field-control-bind.vue';
+export { PiyingFieldControlBind as Field, PiyingFieldControlBind };
 export * from './type';
 export * from './token';
 export * from './builder';

package/index.js

@@ -1,5 +1,5 @@
-import { CoreSchemaHandle, FormBuilder, isFieldControl, isLazyMark, getLazyImport, createViewControlLink, convert, initListen } from "@piying/view-core";
 import { effect, createRootInjector, ChangeDetectionSchedulerImpl, ChangeDetectionScheduler, createInjector, untracked } from "static-injector";
+import { isFieldControl, isLazyMark, getLazyImport, createViewControlLink, FormBuilder, CoreSchemaHandle, createConvertToField, initListen } from "@piying/view-core";
 var emptyObject = Object.freeze({});
 var isArray = Array.isArray;
 function isUndef(v) {
@@ -1439,17 +1439,17 @@ function normalizeArrayChildren(children, nestedIndex) {
   }
   return res;
 }
-function renderList(val, render5) {
+function renderList(val, render6) {
   var ret = null, i, l, keys, key;
   if (isArray(val) || typeof val === "string") {
     ret = new Array(val.length);
     for (i = 0, l = val.length; i < l; i++) {
-      ret[i] = render5(val[i], i);
+      ret[i] = render6(val[i], i);
     }
   } else if (typeof val === "number") {
     ret = new Array(val);
     for (i = 0; i < val; i++) {
-      ret[i] = render5(i + 1, i);
+      ret[i] = render6(i + 1, i);
     }
   } else if (isObject(val)) {
     if (hasSymbol && val[Symbol.iterator]) {
@@ -1457,7 +1457,7 @@ function renderList(val, render5) {
       var iterator = val[Symbol.iterator]();
       var result = iterator.next();
       while (!result.done) {
-        ret.push(render5(result.value, ret.length));
+        ret.push(render6(result.value, ret.length));
         result = iterator.next();
       }
     } else {
@@ -1465,7 +1465,7 @@ function renderList(val, render5) {
       ret = new Array(keys.length);
       for (i = 0, l = keys.length; i < l; i++) {
         key = keys[i];
-        ret[i] = render5(val[key], key, i);
+        ret[i] = render6(val[key], key, i);
       }
     }
   }
@@ -1899,7 +1899,7 @@ function renderMixin(Vue2) {
   };
   Vue2.prototype._render = function() {
     var vm = this;
-    var _a = vm.$options, render5 = _a.render, _parentVnode = _a._parentVnode;
+    var _a = vm.$options, render6 = _a.render, _parentVnode = _a._parentVnode;
     if (_parentVnode && vm._isMounted) {
       vm.$scopedSlots = normalizeScopedSlots(vm.$parent, _parentVnode.data.scopedSlots, vm.$slots, vm.$scopedSlots);
       if (vm._slotsProxy) {
@@ -1913,7 +1913,7 @@ function renderMixin(Vue2) {
     try {
       setCurrentInstance(vm);
       currentRenderingInstance = vm;
-      vnode = render5.call(vm._renderProxy, vm.$createElement);
+      vnode = render6.call(vm._renderProxy, vm.$createElement);
     } catch (e) {
       handleError(e, vm, "render");
       if (process.env.NODE_ENV !== "production" && vm.$options.renderError) {
@@ -6775,15 +6775,8 @@ if (inBrowser) {
     }
   }, 0);
 }
-class VueSchemaHandle extends CoreSchemaHandle {
-}
-class VueFormBuilder extends FormBuilder {
-}
 const InjectorToken = /* @__PURE__ */ Symbol();
 const PI_VIEW_FIELD_TOKEN = /* @__PURE__ */ Symbol();
-const PI_INPUT_OPTIONS_TOKEN = /* @__PURE__ */ Symbol();
-const PI_INPUT_SCHEMA_TOKEN = /* @__PURE__ */ Symbol();
-const PI_INPUT_MODEL_TOKEN = /* @__PURE__ */ Symbol();
 function signalToRef(value) {
   const injector = inject(InjectorToken);
   const dataRef = shallowRef(void 0);
@@ -6850,7 +6843,7 @@ var freeze = function(e, t, n) {
   }), e("div", { attrs: { fragment: this.name } }, n);
 } };
 var Fragment = component;
-const _sfc_main$3 = /* @__PURE__ */ defineComponent({
+const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "wrapper",
   props: {
     wrappers: null
@@ -6864,10 +6857,10 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     return { __sfc: true, dInputs, restWrappers, wrapper, inputs, outputs, SelfComponent: PiWrapper, Fragment };
   }
 });
-function normalizeComponent(scriptExports, render5, staticRenderFns, functionalTemplate, injectStyles, scopeId, moduleIdentifier, shadowMode) {
+function normalizeComponent(scriptExports, render6, staticRenderFns, functionalTemplate, injectStyles, scopeId, moduleIdentifier, shadowMode) {
   var options = typeof scriptExports === "function" ? scriptExports.options : scriptExports;
-  if (render5) {
-    options.render = render5;
+  if (render6) {
+    options.render = render6;
     options.staticRenderFns = staticRenderFns;
     options._compiled = true;
   }
@@ -6879,42 +6872,46 @@ function normalizeComponent(scriptExports, render5, staticRenderFns, functionalT
     options
   };
 }
-var _sfc_render$3 = function render() {
+var _sfc_render$4 = function render() {
   var _vm = this, _c = _vm._self._c, _setup = _vm._self._setupProxy;
   return _c(_setup.Fragment, [_setup.wrapper ? [_c(_setup.wrapper.type, _vm._g(_vm._b({ tag: "component" }, "component", _setup.inputs, false), _setup.outputs), [_c(_setup.SelfComponent, _vm._b({}, "self-component", { wrappers: _setup.restWrappers }, false), [_vm._t("default")], 2)], 1)] : [_vm._t("default")]], 2);
 };
-var _sfc_staticRenderFns$3 = [];
-var __component__$3 = /* @__PURE__ */ normalizeComponent(
-  _sfc_main$3,
-  _sfc_render$3,
-  _sfc_staticRenderFns$3,
+var _sfc_staticRenderFns$4 = [];
+var __component__$4 = /* @__PURE__ */ normalizeComponent(
+  _sfc_main$4,
+  _sfc_render$4,
+  _sfc_staticRenderFns$4,
   false,
   null,
   "1a421ffb"
 );
-const PiWrapper = __component__$3.exports;
-const _sfc_main$2 = /* @__PURE__ */ defineComponent({
+const PiWrapper = __component__$4.exports;
+const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "field-template",
   props: {
-    field: null
+    field: null,
+    path: null
   },
   setup(__props) {
     const props2 = __props;
+    const field = computed(() => {
+      const keyPath = props2.path;
+      return keyPath ? props2.field.get(keyPath) : props2.field;
+    });
     const injector = inject(InjectorToken);
-    const renderConfig = signalToRef(() => props2.field.renderConfig());
-    const inputs = signalToRef(() => props2.field.inputs?.());
-    const attributes = signalToRef(() => props2.field.attributes?.());
+    const renderConfig = signalToRef(() => field.value.renderConfig());
+    const inputs = signalToRef(() => field.value.inputs?.());
+    const attributes = signalToRef(() => field.value.attributes?.());
     const fieldInput = computed(() => ({ ...attributes.value, ...inputs.value }));
-    const outputs = signalToRef(() => props2.field.outputs?.());
-    const events2 = signalToRef(() => props2.field.events?.());
+    const outputs = signalToRef(() => field.value.outputs?.());
+    const events2 = signalToRef(() => field.value.events?.());
     const fieldOutput = computed(() => ({ ...outputs.value, ...events2.value }));
-    const fieldChildren = signalToRef(() => props2.field.children?.());
-    const wrappers = signalToRef(() => props2.field.wrappers());
-    const define = signalToRef(() => props2.field.define?.());
+    const fieldChildren = signalToRef(() => field.value.children?.());
+    const wrappers = signalToRef(() => field.value.wrappers());
+    const define = signalToRef(() => field.value.define?.());
     const componentType = computed(
       () => typeof define.value?.type === "function" || isLazyMark(define.value?.type) ? defineAsyncComponent(getLazyImport(define.value?.type)) : define.value?.type
     );
-    const field = computed(() => props2.field);
     provide(PI_VIEW_FIELD_TOKEN, field);
     const childRef = shallowRef(null);
     const isControl = isFieldControl(field.value.form.control);
@@ -6933,24 +6930,43 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       dispose?.(true);
       dispose = void 0;
     });
-    return { __sfc: true, props: props2, injector, renderConfig, inputs, attributes, fieldInput, outputs, events: events2, fieldOutput, fieldChildren, wrappers, define, componentType, field, childRef, isControl, dispose, PiWrapper, Fragment };
+    return { __sfc: true, props: props2, field, injector, renderConfig, inputs, attributes, fieldInput, outputs, events: events2, fieldOutput, fieldChildren, wrappers, define, componentType, childRef, isControl, dispose, PiWrapper, Fragment };
   }
 });
-var _sfc_render$2 = function render2() {
+var _sfc_render$3 = function render2() {
   var _vm = this, _c = _vm._self._c, _setup = _vm._self._setupProxy;
   return _c(_setup.Fragment, [!_setup.renderConfig.hidden ? [_setup.define?.type ? [_c(_setup.PiWrapper, { attrs: { "wrappers": _setup.wrappers } }, [_setup.fieldChildren ? [_c(_setup.componentType, _vm._g(_vm._b({ tag: "component" }, "component", _setup.fieldInput, false), _setup.fieldOutput))] : [_setup.field.form.control ? [_c(_setup.componentType, _vm._g(_vm._b({ ref: "childRef", tag: "component" }, "component", _setup.fieldInput, false), _setup.fieldOutput))] : [_c(_setup.componentType, _vm._g(_vm._b({ tag: "component" }, "component", _setup.fieldInput, false), _setup.fieldOutput))]]], 2)] : _vm._e()] : _vm._e()], 2);
 };
-var _sfc_staticRenderFns$2 = [];
-var __component__$2 = /* @__PURE__ */ normalizeComponent(
-  _sfc_main$2,
-  _sfc_render$2,
-  _sfc_staticRenderFns$2,
+var _sfc_staticRenderFns$3 = [];
+var __component__$3 = /* @__PURE__ */ normalizeComponent(
+  _sfc_main$3,
+  _sfc_render$3,
+  _sfc_staticRenderFns$3,
   false,
   null,
-  "11ac4a03"
+  "8f9e37ed"
 );
-const FieldTemplate = __component__$2.exports;
-const _sfc_main$1 = /* @__PURE__ */ defineComponent({
+const FieldTemplate = __component__$3.exports;
+class VueFormBuilder extends FormBuilder {
+}
+class VueSchemaHandle extends CoreSchemaHandle {
+}
+const DefaultConvertOptions = {
+  builder: VueFormBuilder,
+  handle: VueSchemaHandle
+};
+const convertToField = createConvertToField(
+  DefaultConvertOptions,
+  createRootInjector({
+    providers: [
+      {
+        provide: ChangeDetectionScheduler,
+        useClass: ChangeDetectionSchedulerImpl
+      }
+    ]
+  })
+);
+const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "piying-view",
   props: {
     schema: null,
@@ -6972,18 +6988,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       })
     );
     provide(InjectorToken, rootInjector);
-    provide(
-      PI_INPUT_OPTIONS_TOKEN,
-      computed(() => inputs.options)
-    );
-    provide(
-      PI_INPUT_SCHEMA_TOKEN,
-      computed(() => inputs.schema)
-    );
-    provide(
-      PI_INPUT_MODEL_TOKEN,
-      computed(() => inputs.modelValue)
-    );
     const initResult = shallowRef();
     watch(
       () => [inputs.schema, inputs.options, rootInjector.value],
@@ -6992,12 +6996,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         onCleanup(() => {
           subInjector.destroy();
         });
-        const field2 = convert(inputs.schema, {
-          ...inputs.options,
-          handle: VueSchemaHandle,
-          builder: VueFormBuilder,
-          injector: subInjector
-        });
+        const field2 = convertToField(
+          () => inputs.schema,
+          subInjector,
+          () => inputs.options
+        );
         initResult.value = [field2, subInjector];
       },
       { immediate: true }
@@ -7026,20 +7029,20 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     return { __sfc: true, inputs, emit, maybeParentField, rootInjector, initResult, field, FieldTemplate };
   }
 });
-var _sfc_render$1 = function render3() {
+var _sfc_render$2 = function render3() {
   var _vm = this, _c = _vm._self._c, _setup = _vm._self._setupProxy;
   return _c(_setup.FieldTemplate, { attrs: { "field": _setup.field } });
 };
-var _sfc_staticRenderFns$1 = [];
-var __component__$1 = /* @__PURE__ */ normalizeComponent(
-  _sfc_main$1,
-  _sfc_render$1,
-  _sfc_staticRenderFns$1,
+var _sfc_staticRenderFns$2 = [];
+var __component__$2 = /* @__PURE__ */ normalizeComponent(
+  _sfc_main$2,
+  _sfc_render$2,
+  _sfc_staticRenderFns$2,
   false,
   null,
-  "9c3edea6"
+  "9d8be97a"
 );
-const piyingView = __component__$1.exports;
+const piyingView = __component__$2.exports;
 function useControlValueAccessor(autoChange = true, optionalBind) {
   const value = shallowRef();
   const disabled = ref$1(false);
@@ -7087,7 +7090,7 @@ function useControlValueAccessor(autoChange = true, optionalBind) {
     }
   };
 }
-const _sfc_main = /* @__PURE__ */ defineComponent({
+const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "group",
   setup(__props) {
     const field = inject(PI_VIEW_FIELD_TOKEN);
@@ -7095,12 +7098,64 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return { __sfc: true, field, children, FieldTemplate, Fragment };
   }
 });
-var _sfc_render = function render4() {
+var _sfc_render$1 = function render4() {
   var _vm = this, _c = _vm._self._c, _setup = _vm._self._setupProxy;
   return _c(_setup.Fragment, [_vm._l(_setup.children, function(field, index2) {
     return [_c(_setup.FieldTemplate, { key: index2, attrs: { "field": field } })];
   })], 2);
 };
+var _sfc_staticRenderFns$1 = [];
+var __component__$1 = /* @__PURE__ */ normalizeComponent(
+  _sfc_main$1,
+  _sfc_render$1,
+  _sfc_staticRenderFns$1,
+  false,
+  null,
+  "038a7f41"
+);
+const group = __component__$1.exports;
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "field-control-bind",
+  props: {
+    field: null,
+    path: null
+  },
+  setup(__props) {
+    const props2 = __props;
+    const resolvedField = computed(() => {
+      const keyPath = props2.path;
+      return keyPath ? props2.field.get(keyPath) : props2.field;
+    });
+    let dispose;
+    const { cva, cvaa } = useControlValueAccessor();
+    watch(
+      [resolvedField],
+      ([field]) => {
+        dispose?.();
+        if (field?.form?.control) {
+          const control = field.form.control;
+          if (!control) {
+            throw new Error(`📍 fieldControlBind:[${field.keyPath || ""}]->[${props2.path || ""}]❗`);
+          }
+          if (!isFieldControl(control)) {
+            throw new Error(`🏷️ fieldControl❗`);
+          }
+          dispose = createViewControlLink(() => control, cva, field.injector);
+        }
+      },
+      { immediate: true }
+    );
+    onUnmounted(() => {
+      dispose?.(true);
+      dispose = void 0;
+    });
+    return { __sfc: true, props: props2, resolvedField, dispose, cva, cvaa };
+  }
+});
+var _sfc_render = function render5() {
+  var _vm = this, _c = _vm._self._c, _setup = _vm._self._setupProxy;
+  return _c("div", [_vm._t("default", null, { "cvaa": _setup.cvaa, "field": _setup.resolvedField })], 2);
+};
 var _sfc_staticRenderFns = [];
 var __component__ = /* @__PURE__ */ normalizeComponent(
   _sfc_main,
@@ -7108,15 +7163,14 @@ var __component__ = /* @__PURE__ */ normalizeComponent(
   _sfc_staticRenderFns,
   false,
   null,
-  "038a7f41"
+  "7747f509"
 );
-const group = __component__.exports;
+const fieldControlBind = __component__.exports;
 export {
+  fieldControlBind as Field,
   InjectorToken,
-  PI_INPUT_MODEL_TOKEN,
-  PI_INPUT_OPTIONS_TOKEN,
-  PI_INPUT_SCHEMA_TOKEN,
   PI_VIEW_FIELD_TOKEN,
+  fieldControlBind as PiyingFieldControlBind,
   FieldTemplate as PiyingFieldTemplate,
   piyingView as PiyingView,
   group as PiyingViewGroup,