tiddy 2.4.0 → 2.5.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as vue14 from "vue";
-import { AllowedComponentProps, CSSProperties, Component, ComputedRef, DefineComponent, ExtractPublicPropTypes, PropType, Raw, Ref as Ref$1, Slot } from "vue";
+import { AllowedComponentProps, CSSProperties, Component, ComputedRef, DefineComponent, ExtractPublicPropTypes, HTMLAttributes, PropType, Raw, Ref, Slot } from "vue";
 import * as element_plus0 from "element-plus";
 import { DialogInstance, DialogProps, FormInstance, FormItemProp, FormItemProps, FormItemRule, FormProps, SelectInstance, TableColumnInstance, TableInstance } from "element-plus";
 
@@ -23,6 +23,9 @@ type OrRef<T> = T | Ref<T>;
 type TdFieldsProps = {
   fields: TdFormFieldProps[];
 };
+type TdArrayFieldsProps = {
+  fields: OrFunction<TdFormFieldProps[]>;
+};
 declare const objectFieldPropsDef: {
   prop: {
     type: PropType<OrFunction<string>>;
@@ -125,7 +128,7 @@ declare const widgetFieldPropsDef: {
     default: undefined;
   };
 };
-type PropsOf<C> = C extends DefineComponent<infer P, any, any, any, any> ? P : C extends (new (...args: any) => any) ? InstanceType<C> extends {
+type PropsOf<C> = C extends (new (...args: any[]) => any) ? InstanceType<C>['$props'] : C extends DefineComponent<any, any, any, any, any, any, any, any> ? InstanceType<C> extends {
   $props: infer P;
 } ? P : Record<string, any> : Record<string, any>;
 type TdWidgetFieldProps = ExtractPublicPropTypes<typeof widgetFieldPropsDef> & AllowedComponentProps & Record<PropertyKey, any>;
@@ -148,7 +151,7 @@ declare const arrayFieldPropsDef: {
     type: PropType<FormProps["labelPosition"]>;
   };
   fields: {
-    type: PropType<any[]>;
+    type: PropType<OrFunction<any[]>>;
     default: () => never[];
   };
   type: {
@@ -180,7 +183,7 @@ declare const arrayFieldPropsDef: {
     default: boolean;
   };
 };
-type TdArrayFieldProps = TdFieldsProps & ExtractPublicPropTypes<typeof arrayFieldPropsDef> & AllowedComponentProps;
+type TdArrayFieldProps = TdArrayFieldsProps & ExtractPublicPropTypes<typeof arrayFieldPropsDef> & AllowedComponentProps;
 declare const layoutFieldPropsDef: {
   prop: {
     type: PropType<OrFunction<string>>;
@@ -241,10 +244,10 @@ declare const tdformItemProps: {
   };
 };
 type TdFormItemProps = ExtractPublicPropTypes<typeof tdformItemProps> & Partial<FormItemProps>;
-type PropsOrRef<T> = { [K in keyof T]?: OrRef<T[K]> };
-declare function widget<T>(c: T | Raw<T>, props?: OrRef<PropsOrRef<PropsOf<T>>>): {
+type PropsOrRef<T> = { [K in keyof T]?: OrRef<T[K]> } | Ref<T>;
+declare function widget<T>(c: T | Raw<T>, props?: PropsOrRef<PropsOf<T> & HTMLAttributes>): {
   component: T | Raw<T>;
-  widget: any;
+  widget: PropsOrRef<PropsOf<T> & HTMLAttributes> | undefined;
 };
 //#endregion
 //#region src/form/form.vue.d.ts
@@ -329,7 +332,7 @@ declare const __VLS_base$3: vue14.DefineComponent<vue14.ExtractPropTypes<{
   };
 }>> & Readonly<{}>, {
   hideRequiredAsterisk: boolean;
-  messageLabel: any;
+  messageLabel: OrRef<string>;
   formatMessage: AnyFunction;
 }, {}, {}, {}, string, vue14.ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export$5: __VLS_WithSlots$3<typeof __VLS_base$3, __VLS_Slots$3>;
@@ -364,11 +367,11 @@ type TableColumnProp = {
     default: () => never[];
   };
   hide: {
-    type: PropType<boolean | Ref$1<boolean>>;
+    type: PropType<boolean | Ref<boolean>>;
     default: false;
   };
   dangerouslyUseHTMLString: {
-    type: PropType<boolean | Ref$1<boolean>>;
+    type: PropType<boolean | Ref<boolean>>;
     default: false;
   };
 };

package/dist/index.js

@@ -46,6 +46,10 @@ const fieldsPropsDef = { fields: {
 	type: Array,
 	default: () => []
 } };
+const arrayFieldsPropsDef = { fields: {
+	type: [Array, Function],
+	default: () => []
+} };
 const commonFieldPropsDef = {
 	prop: {
 		type: [String, Function],
@@ -188,7 +192,7 @@ const arrayFieldPropsDef = {
 		type: Boolean,
 		default: false
 	},
-	...fieldsPropsDef,
+	...arrayFieldsPropsDef,
 	...commonFieldPropsDef
 };
 const layoutFieldPropsDef = {
@@ -684,9 +688,11 @@ var form_field_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 	setup(__props) {
 		const attrs = useAttrs();
 		const fullProp = computed(() => attrs["full-prop"] || attrs.prop);
+		const formCtx = inject(formCtxKey);
 		const fieldAttrs = computed(() => {
 			const attr = {};
 			for (const [k, v] of Object.entries(attrs)) if (k === "component" && v) attr[k] = markRaw(toRaw(v));
+			else if (k === "fields" && isFunction(v) && !attrs.type) attr[k] = v(getDeepValue(formCtx.model, attrs["full-prop"]));
 			else attr[k] = v;
 			return attr;
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiddy",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "packageManager": "pnpm@10.11.0",
   "description": "A set of Vue 3 components based on element-plus",
   "type": "module",
@@ -30,6 +30,7 @@
     "play": "vite",
     "test": "vitest",
     "type": "vue-tsc --noEmit",
+    "pretype": "pnpm run build",
     "format": "biome format --write .",
     "prepublishOnly": "pnpm run build",
     "docs:dev": "vitepress dev docs",