@vunk/form 2.18.2 → 2.19.0

package/components/form-item-renderer/index.mjs

@@ -1,11 +1,9 @@
-import { defineComponent, computed, h, nextTick, openBlock, createBlock, withCtx, renderSlot, createVNode, normalizeProps, guardReactiveProps } from 'vue';
-import { VkfTemplateInstancesProvider } from '@vunk/form/components/template-instances-provider';
-import { genTemplateIfFunc } from '@vunk/form/shared/form';
-import { useTemplateInstancesContext, useRendererData } from '@vunk/form/composables';
-import { noop, isCallable } from '@vunk/shared/function';
-import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
-
-const props = {
+import { defineComponent as R, computed as $, h as z, nextTick as B, openBlock as K, createBlock as M, unref as N, withCtx as c, renderSlot as b, createVNode as q, normalizeProps as w, guardReactiveProps as E } from "vue";
+import { VkfTemplateInstancesProvider as G } from "@vunk/form/components/template-instances-provider";
+import { genTemplateIfFunc as H } from "@vunk/form/shared/form";
+import { useTemplateInstancesContext as J, useRendererData as L } from "@vunk/form/composables";
+import { noop as Q, isCallable as F } from "@vunk/shared/function";
+const V = {
   source: {
     type: Array,
     default: () => []
@@ -19,169 +17,112 @@ const props = {
     type: Array,
     default: () => []
   }
-};
-
-const genInputEffectFunc = (inputEffectRaw) => {
-  if (!inputEffectRaw) {
-    return;
-  }
-  if (typeof inputEffectRaw === "function") {
-    return inputEffectRaw;
-  }
-  if (typeof inputEffectRaw === "string") {
-    const inputEffect = new Function("value", "context", inputEffectRaw);
-    return inputEffect;
-  }
-  return noop;
-};
-
-const VkfFormItemRenderer$1 = defineComponent({
+}, U = (o) => {
+  if (o)
+    return typeof o == "function" ? o : typeof o == "string" ? new Function("value", "context", o) : Q;
+}, h = R({
   name: "VkfFormItemRenderer",
-  props: props,
-  setup(props, ctx) {
-    const { templateInstances, getTemplateInstance } = useTemplateInstancesContext();
-    const {
-      emitSetData,
-      data: rendererData,
-      getDataValue
-    } = useRendererData();
-    const Renderer = (props2) => {
-      return h(VkfFormItemRenderer$1, {
-        templateInstances,
-        ...props2
-      });
-    };
-    const renderFormItems = (data, pK = []) => {
-      return data.reduce((a, c, index) => {
-        c.key = c.key ?? (Array.isArray(c.prop) ? c.prop.join() : c.prop);
-        const currentK = [...props.k, ...pK, index];
-        const validateTemplateType = () => {
-          nextTick(() => {
-            if (c.templateType && !getTemplateInstance(c.templateType)) {
-              console.warn(
-                c.templateType,
-                "templateType\u4E0D\u5B58\u5728\u5C06\u8DF3\u8FC7"
-              );
-            }
-          });
-        };
-        if (c.templateType && getTemplateInstance(c.templateType)) {
-          const slotData = { ...c };
-          Object.assign(
-            slotData,
-            isCallable(c.templateProps) ? c.templateProps(rendererData?.value) : c.templateProps
-          );
-          const templateIf = genTemplateIfFunc(
-            slotData.templateIf
+  props: V,
+  setup(o, l) {
+    const { templateInstances: n, getTemplateInstance: s } = J(), {
+      emitSetData: a,
+      data: r,
+      getDataValue: m
+    } = L(), j = (u) => z(h, {
+      templateInstances: n,
+      ...u
+    }), A = (u, f = []) => u.reduce((p, e, S) => {
+      var P, T, I;
+      e.key = e.key ?? (Array.isArray(e.prop) ? e.prop.join() : e.prop);
+      const y = [...o.k, ...f, S], x = () => {
+        B(() => {
+          e.templateType && !s(e.templateType) && console.warn(
+            e.templateType,
+            "templateType不存在将跳过"
           );
-          const preTemplateVisible = rendererData ? templateIf(rendererData.value) : true;
-          if (!preTemplateVisible) return a;
-          const informationProps = isCallable(slotData.informationProps) ? slotData.informationProps(rendererData?.value) : slotData.informationProps;
-          const inputEffect = genInputEffectFunc(slotData.inputEffect);
-          Reflect.deleteProperty(slotData, "templateType");
-          Reflect.deleteProperty(slotData, "templateIf");
-          Reflect.deleteProperty(slotData, "templateProps");
-          Reflect.deleteProperty(slotData, "informationProps");
-          Reflect.deleteProperty(slotData, "inputEffect");
-          const nodeKey = currentK.join(",") + "-" + c.templateType + "-" + (c.prop || "no-prop");
-          const modelValue = computed({
-            get: () => c.prop && getDataValue?.(c.prop),
-            set: (v) => emitSetData?.({
-              k: c.prop,
-              v
-            })
-          });
-          const defaultSlotArguments = {
-            // for legacy
-            data: slotData,
-            raw: c,
-            props: slotData,
-            k: currentK,
-            key: nodeKey,
-            value: modelValue.value,
-            input: (v) => {
-              modelValue.value = v;
-              inputEffect?.(v, {
-                ...defaultSlotArguments,
-                parentProp: [c.prop].flat(Infinity).slice(0, -1)
-              });
-            },
-            informationProps,
-            templateIf,
-            Renderer,
-            getDataValue,
-            emitSetData,
-            inputEffect
-          };
-          const nodes = getTemplateInstance(c.templateType)?.slots.default?.(defaultSlotArguments);
-          nodes && a.push(nodes);
-        } else {
-          validateTemplateType();
-        }
-        return a;
-      }, []);
-    };
+        });
+      };
+      if (e.templateType && s(e.templateType)) {
+        const t = { ...e };
+        Object.assign(
+          t,
+          F(e.templateProps) ? e.templateProps(r == null ? void 0 : r.value) : e.templateProps
+        );
+        const k = H(
+          t.templateIf
+        );
+        if (!(r ? k(r.value) : !0))
+          return p;
+        const C = F(t.informationProps) ? t.informationProps(r == null ? void 0 : r.value) : t.informationProps, i = U(t.inputEffect);
+        Reflect.deleteProperty(t, "templateType"), Reflect.deleteProperty(t, "templateIf"), Reflect.deleteProperty(t, "templateProps"), Reflect.deleteProperty(t, "informationProps"), Reflect.deleteProperty(t, "inputEffect");
+        const O = y.join(",") + "-" + e.templateType + "-" + (e.prop || "no-prop"), v = $({
+          get: () => e.prop && (m == null ? void 0 : m(e.prop)),
+          set: (d) => a == null ? void 0 : a({
+            k: e.prop,
+            v: d
+          })
+        }), _ = {
+          // for legacy
+          data: t,
+          raw: e,
+          props: t,
+          k: y,
+          key: O,
+          value: v.value,
+          input: (d) => {
+            v.value = d, i == null || i(d, {
+              ..._,
+              parentProp: [e.prop].flat(1 / 0).slice(0, -1)
+            });
+          },
+          informationProps: C,
+          templateIf: k,
+          Renderer: j,
+          getDataValue: m,
+          emitSetData: a,
+          inputEffect: i
+        }, g = (I = (P = s(e.templateType)) == null ? void 0 : (T = P.slots).default) == null ? void 0 : I.call(T, _);
+        g && p.push(g);
+      } else
+        x();
+      return p;
+    }, []);
     return () => {
-      const tempSlots = ctx.slots.default?.();
+      var f, p;
       return [
-        tempSlots,
-        renderFormItems(props.source)
+        (p = (f = l.slots).default) == null ? void 0 : p.call(f),
+        A(o.source)
       ];
     };
   }
-});
-
-var Core = /* @__PURE__ */ _export_sfc(VkfFormItemRenderer$1, [["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/form-item-renderer/src/core.vue"]]);
-
-var _sfc_main = /* @__PURE__ */ defineComponent({
+}), te = /* @__PURE__ */ R({
   __name: "index",
-  props: props,
-  setup(__props, { expose: __expose }) {
-    __expose();
-    const props = __props;
-    const __returned__ = { props, get VkfTemplateInstancesProvider() {
-      return VkfTemplateInstancesProvider;
-    }, Core };
-    Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
-    return __returned__;
-  }
-});
-
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return openBlock(), createBlock($setup["VkfTemplateInstancesProvider"], null, {
-    placeholder: withCtx(() => [
-      renderSlot(_ctx.$slots, "placeholder")
-    ]),
-    default: withCtx(() => [
-      createVNode(
-        $setup["Core"],
-        normalizeProps(guardReactiveProps({
-          ...$setup.props,
-          ..._ctx.$attrs
-        })),
-        {
-          default: withCtx(() => [
-            renderSlot(_ctx.$slots, "default")
+  props: V,
+  setup(o) {
+    const l = o;
+    return (n, s) => (K(), M(N(G), null, {
+      placeholder: c(() => [
+        b(n.$slots, "placeholder")
+      ]),
+      default: c(() => [
+        q(h, w(E({
+          ...l,
+          ...n.$attrs
+        })), {
+          default: c(() => [
+            b(n.$slots, "default")
           ]),
           _: 3
-          /* FORWARDED */
-        },
-        16
-        /* FULL_PROPS */
-      )
-    ]),
-    _: 3
-    /* FORWARDED */
-  });
-}
-var VkfFormItemRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/form-item-renderer/src/index.vue"]]);
-
-var types = /*#__PURE__*/Object.freeze({
+        }, 16)
+      ]),
+      _: 3
+    }));
+  }
+}), oe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null
-});
-
-VkfFormItemRenderer.install = (app) => {
-  app.component(VkfFormItemRenderer.name, VkfFormItemRenderer);
+}, Symbol.toStringTag, { value: "Module" }));
+export {
+  te as VkfFormItemRenderer,
+  oe as __VkfFormItemRenderer,
+  te as default
 };
-
-export { VkfFormItemRenderer, types as __VkfFormItemRenderer, VkfFormItemRenderer as default };

package/components/form-item-renderer/src/core.vue.d.ts

@@ -3,36 +3,36 @@ import { RendererTreeData } from './types';
 declare const VkfFormItemRenderer: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     source: {
         type: import("vue").PropType<RendererTreeData[]>;
-        default: () => any[];
+        default: () => never[];
     };
     templateInstances: {
         type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-        default: any;
+        default: undefined;
     };
     k: {
         type: import("vue").PropType<(string | number)[]>;
-        default: () => any[];
+        default: () => never[];
     };
 }>, () => (VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
-}>[] | VNode<import("vue").RendererNode, import("vue").RendererElement, {
+}>[] | (VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
-}>[][])[], {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}> | undefined)[][] | undefined)[], {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     source: {
         type: import("vue").PropType<RendererTreeData[]>;
-        default: () => any[];
+        default: () => never[];
     };
     templateInstances: {
         type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-        default: any;
+        default: undefined;
     };
     k: {
         type: import("vue").PropType<(string | number)[]>;
-        default: () => any[];
+        default: () => never[];
     };
 }>> & Readonly<{}>, {
     source: RendererTreeData[];
-    templateInstances: Record<string, import("vue").ComponentInternalInstance>;
     k: (string | number)[];
+    templateInstances: Record<string, import("vue").ComponentInternalInstance>;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default VkfFormItemRenderer;

package/components/form-item-renderer/src/ctx.d.ts

@@ -3,14 +3,14 @@ import { RendererTreeData } from './types';
 export declare const props: {
     source: {
         type: PropType<RendererTreeData[]>;
-        default: () => any[];
+        default: () => never[];
     };
     templateInstances: {
         type: PropType<Record<string, ComponentInternalInstance>>;
-        default: any;
+        default: undefined;
     };
     k: {
         type: PropType<(string | number)[]>;
-        default: () => any[];
+        default: () => never[];
     };
 };

package/components/form-item-renderer/src/index.vue.d.ts

@@ -1,93 +1,43 @@
-declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+declare var __VLS_9: {}, __VLS_11: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_9) => any;
+} & {
+    placeholder?: (props: typeof __VLS_11) => any;
+};
+declare const _default: __VLS_WithSlots<import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     source: {
-        type: import("vue").PropType<import("./types").RendererTreeData[]>;
-        default: () => any[];
+        type: import("vue").PropType<import("./types.ts").RendererTreeData[]>;
+        default: () => never[];
     };
     templateInstances: {
         type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-        default: any;
+        default: undefined;
     };
     k: {
         type: import("vue").PropType<(string | number)[]>;
-        default: () => any[];
+        default: () => never[];
     };
-}>, {
-    props: import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-        source: {
-            type: import("vue").PropType<import("./types").RendererTreeData[]>;
-            default: () => any[];
-        };
-        templateInstances: {
-            type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-            default: any;
-        };
-        k: {
-            type: import("vue").PropType<(string | number)[]>;
-            default: () => any[];
-        };
-    }>> & Readonly<{}> & {}>;
-    readonly VkfTemplateInstancesProvider: {
-        new (...args: any[]): any;
-        __isFragment?: never;
-        __isTeleport?: never;
-        __isSuspense?: never;
-    } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<Record<string | symbol, any>>>, Record<string | symbol, any>, any, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
-        [x: string]: any;
-        [x: symbol]: any;
-    }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & {
-        install(app: import("vue").App): void;
-    };
-    Core: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-        source: {
-            type: import("vue").PropType<import("./types").RendererTreeData[]>;
-            default: () => any[];
-        };
-        templateInstances: {
-            type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-            default: any;
-        };
-        k: {
-            type: import("vue").PropType<(string | number)[]>;
-            default: () => any[];
-        };
-    }>, () => (import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-        [key: string]: any;
-    }>[] | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-        [key: string]: any;
-    }>[][])[], {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-        source: {
-            type: import("vue").PropType<import("./types").RendererTreeData[]>;
-            default: () => any[];
-        };
-        templateInstances: {
-            type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-            default: any;
-        };
-        k: {
-            type: import("vue").PropType<(string | number)[]>;
-            default: () => any[];
-        };
-    }>> & Readonly<{}>, {
-        source: import("./types").RendererTreeData[];
-        templateInstances: Record<string, import("vue").ComponentInternalInstance>;
-        k: (string | number)[];
-    }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     source: {
-        type: import("vue").PropType<import("./types").RendererTreeData[]>;
-        default: () => any[];
+        type: import("vue").PropType<import("./types.ts").RendererTreeData[]>;
+        default: () => never[];
     };
     templateInstances: {
         type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-        default: any;
+        default: undefined;
     };
     k: {
         type: import("vue").PropType<(string | number)[]>;
-        default: () => any[];
+        default: () => never[];
     };
 }>> & Readonly<{}>, {
-    source: import("./types").RendererTreeData[];
-    templateInstances: Record<string, import("vue").ComponentInternalInstance>;
+    source: import("./types.ts").RendererTreeData[];
     k: (string | number)[];
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+    templateInstances: Record<string, import("vue").ComponentInternalInstance>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>, __VLS_Slots>;
 export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/components/form-item-renderer-template/index.cjs

@@ -1,47 +1 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var composables = require('@vunk/form/composables');
-var vue = require('vue');
-var _pluginVue_exportHelper = require('../_plugin-vue_export-helper.cjs');
-
-const props = {
-  type: {
-    type: String,
-    required: true,
-    default: ""
-  }
-};
-
-var _sfc_main = vue.defineComponent({
-  name: "VkfFormItemRendererTemplate",
-  props,
-  setup(props2) {
-    const templateInstances = composables.useTemplateInstances();
-    if (!templateInstances) throw new Error();
-    const vm = vue.getCurrentInstance();
-    const oVm = templateInstances[props2.type];
-    if (vm && templateInstances) {
-      templateInstances[props2.type] = vm;
-    }
-    vue.onUnmounted(() => {
-      templateInstances[props2.type] = oVm;
-    });
-    return () => null;
-  }
-});
-
-var VkfFormItemRendererTemplate = /* @__PURE__ */ _pluginVue_exportHelper._export_sfc(_sfc_main, [["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/form-item-renderer-template/src/index.vue"]]);
-
-var types = /*#__PURE__*/Object.freeze({
-  __proto__: null
-});
-
-VkfFormItemRendererTemplate.install = (app) => {
-  app.component(VkfFormItemRendererTemplate.name, VkfFormItemRendererTemplate);
-};
-
-exports.VkfFormItemRendererTemplate = VkfFormItemRendererTemplate;
-exports.__VkfFormItemRendererTemplate = types;
-exports.default = VkfFormItemRendererTemplate;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("@vunk/form/composables"),n=require("vue"),l={type:{type:String,required:!0,default:""}},o=n.defineComponent({name:"VkfFormItemRendererTemplate",props:l,setup(t){const e=u.useTemplateInstances();if(!e)throw new Error;const r=n.getCurrentInstance(),s=e[t.type];return r&&e&&(e[t.type]=r),n.onUnmounted(()=>{e[t.type]=s}),()=>null}}),m=Object.freeze(Object.defineProperty({__proto__:null},Symbol.toStringTag,{value:"Module"}));exports.VkfFormItemRendererTemplate=o;exports.__VkfFormItemRendererTemplate=m;exports.default=o;

package/components/form-item-renderer-template/index.mjs

@@ -1,41 +1,28 @@
-import { useTemplateInstances } from '@vunk/form/composables';
-import { defineComponent, getCurrentInstance, onUnmounted } from 'vue';
-import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
-
-const props = {
+import { useTemplateInstances as o } from "@vunk/form/composables";
+import { defineComponent as m, getCurrentInstance as a, onUnmounted as s } from "vue";
+const p = {
   type: {
     type: String,
-    required: true,
+    required: !0,
     default: ""
   }
-};
-
-var _sfc_main = defineComponent({
+}, u = m({
   name: "VkfFormItemRendererTemplate",
-  props,
-  setup(props2) {
-    const templateInstances = useTemplateInstances();
-    if (!templateInstances) throw new Error();
-    const vm = getCurrentInstance();
-    const oVm = templateInstances[props2.type];
-    if (vm && templateInstances) {
-      templateInstances[props2.type] = vm;
-    }
-    onUnmounted(() => {
-      templateInstances[props2.type] = oVm;
-    });
-    return () => null;
+  props: p,
+  setup(t) {
+    const e = o();
+    if (!e)
+      throw new Error();
+    const n = a(), r = e[t.type];
+    return n && e && (e[t.type] = n), s(() => {
+      e[t.type] = r;
+    }), () => null;
   }
-});
-
-var VkfFormItemRendererTemplate = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/form-item-renderer-template/src/index.vue"]]);
-
-var types = /*#__PURE__*/Object.freeze({
+}), c = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null
-});
-
-VkfFormItemRendererTemplate.install = (app) => {
-  app.component(VkfFormItemRendererTemplate.name, VkfFormItemRendererTemplate);
+}, Symbol.toStringTag, { value: "Module" }));
+export {
+  u as VkfFormItemRendererTemplate,
+  c as __VkfFormItemRendererTemplate,
+  u as default
 };
-
-export { VkfFormItemRendererTemplate, types as __VkfFormItemRendererTemplate, VkfFormItemRendererTemplate as default };

package/components/form-item-renderer-template/src/index.vue.d.ts

@@ -4,7 +4,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         required: boolean;
         default: string;
     };
-}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, () => null, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     type: {
         type: StringConstructor;
         required: boolean;