@oiij/naive-ui 0.0.3 → 0.0.5

package/dist/composables/useNaiveForm.cjs

@@ -1,4 +1,5 @@
 const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
+const __vueuse_core = require_rolldown_runtime.__toESM(require("@vueuse/core"));
 const vue = require_rolldown_runtime.__toESM(require("vue"));
 
 //#region src/composables/useNaiveForm.ts
@@ -19,7 +20,7 @@ function clearObjectValues(obj, rules) {
 }
 function useNaiveForm(value, options) {
 	const { rules, clearRules } = options ?? {};
-	const formValue = (0, vue.reactive)(structuredClone(value));
+	const formValue = (0, vue.reactive)(value ? structuredClone((0, vue.toRaw)(value)) : {});
 	const formRules = rules;
 	const formRef = (0, vue.ref)();
 	const formProps = {
@@ -27,8 +28,9 @@ function useNaiveForm(value, options) {
 		model: formValue,
 		rules: formRules
 	};
+	const onValidatedEvent = (0, __vueuse_core.createEventHook)();
 	function validate() {
-		return formRef.value?.validate();
+		return formRef.value?.validate().then(() => onValidatedEvent.trigger((0, vue.toRaw)((0, vue.toValue)(formValue))));
 	}
 	function resetValidation() {
 		formRef.value?.restoreValidation();
@@ -47,13 +49,14 @@ function useNaiveForm(value, options) {
 	return {
 		formRef,
 		formValue: (0, vue.toRef)(formValue),
-		rules: formRules,
+		formRules,
 		formProps,
 		validate,
 		resetValidation,
 		resetForm,
 		reset,
-		clear
+		clear,
+		onValidated: onValidatedEvent.on
 	};
 }
 

package/dist/composables/useNaiveForm.d.cts

@@ -1,5 +1,6 @@
 import * as vue1 from "vue";
-import * as async_validator11 from "async-validator";
+import { Ref } from "vue";
+import * as _vueuse_core2 from "@vueuse/core";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
 
 //#region src/composables/useNaiveForm.d.ts
@@ -8,29 +9,27 @@ interface ClearRules {
   number?: number | null;
   boolean?: boolean | null;
 }
-type FormType = Record<string, unknown>;
-type NaiveFormRules<T extends FormType> = Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>> | undefined;
-interface NaiveFormOptions<T extends FormType> {
+type NaiveFormRules<T extends Record<string, any>> = Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>;
+interface NaiveFormOptions<T extends Record<string, any>> {
   rules?: NaiveFormRules<T>;
   clearRules?: ClearRules;
 }
-declare function useNaiveForm<T extends FormType>(value: T, options?: NaiveFormOptions<T>): {
-  formRef: vue1.Ref<FormInst | undefined, FormInst | undefined>;
-  formValue: vue1.Reactive<T> extends infer T_1 ? T_1 extends vue1.Reactive<T> ? T_1 extends (() => infer R) ? Readonly<vue1.Ref<R, R>> : T_1 extends vue1.Ref<any, any> ? T_1 : vue1.Ref<vue1.UnwrapRef<T_1>, vue1.UnwrapRef<T_1>> : never : never;
-  rules: NaiveFormRules<T>;
+declare function useNaiveForm<T extends Record<string, any>>(value?: T, options?: NaiveFormOptions<T>): {
+  formRef: Ref<FormInst | undefined, FormInst | undefined>;
+  formValue: Ref<T>;
+  formRules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>> | undefined;
   formProps: {
-    ref: vue1.Ref<FormInst | undefined, FormInst | undefined>;
+    ref: Ref<FormInst | undefined, FormInst | undefined>;
     model: vue1.Reactive<T>;
-    rules: NaiveFormRules<T>;
+    rules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>> | undefined;
   };
-  validate: () => Promise<{
-    warnings: async_validator11.ValidateError[][] | undefined;
-  }> | undefined;
+  validate: () => Promise<unknown[]> | undefined;
   resetValidation: () => void;
   resetForm: () => void;
   reset: () => void;
   clear: () => void;
+  onValidated: _vueuse_core2.EventHookOn<[T]>;
 };
-type NaiveFormReturns = ReturnType<typeof useNaiveForm>;
+type NaiveFormReturns<T extends Record<string, any>> = ReturnType<typeof useNaiveForm<T>>;
 //#endregion
 export { NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm };

package/dist/composables/useNaiveForm.d.ts

@@ -1,6 +1,7 @@
+import * as _vueuse_core2 from "@vueuse/core";
 import * as vue1 from "vue";
+import { Ref } from "vue";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
-import * as async_validator11 from "async-validator";
 
 //#region src/composables/useNaiveForm.d.ts
 interface ClearRules {
@@ -8,29 +9,27 @@ interface ClearRules {
   number?: number | null;
   boolean?: boolean | null;
 }
-type FormType = Record<string, unknown>;
-type NaiveFormRules<T extends FormType> = Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>> | undefined;
-interface NaiveFormOptions<T extends FormType> {
+type NaiveFormRules<T extends Record<string, any>> = Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>;
+interface NaiveFormOptions<T extends Record<string, any>> {
   rules?: NaiveFormRules<T>;
   clearRules?: ClearRules;
 }
-declare function useNaiveForm<T extends FormType>(value: T, options?: NaiveFormOptions<T>): {
-  formRef: vue1.Ref<FormInst | undefined, FormInst | undefined>;
-  formValue: vue1.Reactive<T> extends infer T_1 ? T_1 extends vue1.Reactive<T> ? T_1 extends (() => infer R) ? Readonly<vue1.Ref<R, R>> : T_1 extends vue1.Ref<any, any> ? T_1 : vue1.Ref<vue1.UnwrapRef<T_1>, vue1.UnwrapRef<T_1>> : never : never;
-  rules: NaiveFormRules<T>;
+declare function useNaiveForm<T extends Record<string, any>>(value?: T, options?: NaiveFormOptions<T>): {
+  formRef: Ref<FormInst | undefined, FormInst | undefined>;
+  formValue: Ref<T>;
+  formRules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>> | undefined;
   formProps: {
-    ref: vue1.Ref<FormInst | undefined, FormInst | undefined>;
+    ref: Ref<FormInst | undefined, FormInst | undefined>;
     model: vue1.Reactive<T>;
-    rules: NaiveFormRules<T>;
+    rules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>> | undefined;
   };
-  validate: () => Promise<{
-    warnings: async_validator11.ValidateError[][] | undefined;
-  }> | undefined;
+  validate: () => Promise<unknown[]> | undefined;
   resetValidation: () => void;
   resetForm: () => void;
   reset: () => void;
   clear: () => void;
+  onValidated: _vueuse_core2.EventHookOn<[T]>;
 };
-type NaiveFormReturns = ReturnType<typeof useNaiveForm>;
+type NaiveFormReturns<T extends Record<string, any>> = ReturnType<typeof useNaiveForm<T>>;
 //#endregion
 export { NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm };

package/dist/composables/useNaiveForm.js

@@ -1,4 +1,5 @@
-import { reactive, ref, toRef } from "vue";
+import { createEventHook } from "@vueuse/core";
+import { reactive, ref, toRaw, toRef, toValue } from "vue";
 
 //#region src/composables/useNaiveForm.ts
 function clearObjectValues(obj, rules) {
@@ -18,7 +19,7 @@ function clearObjectValues(obj, rules) {
 }
 function useNaiveForm(value, options) {
 	const { rules, clearRules } = options ?? {};
-	const formValue = reactive(structuredClone(value));
+	const formValue = reactive(value ? structuredClone(toRaw(value)) : {});
 	const formRules = rules;
 	const formRef = ref();
 	const formProps = {
@@ -26,8 +27,9 @@ function useNaiveForm(value, options) {
 		model: formValue,
 		rules: formRules
 	};
+	const onValidatedEvent = createEventHook();
 	function validate() {
-		return formRef.value?.validate();
+		return formRef.value?.validate().then(() => onValidatedEvent.trigger(toRaw(toValue(formValue))));
 	}
 	function resetValidation() {
 		formRef.value?.restoreValidation();
@@ -46,13 +48,14 @@ function useNaiveForm(value, options) {
 	return {
 		formRef,
 		formValue: toRef(formValue),
-		rules: formRules,
+		formRules,
 		formProps,
 		validate,
 		resetValidation,
 		resetForm,
 		reset,
-		clear
+		clear,
+		onValidated: onValidatedEvent.on
 	};
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oiij/naive-ui",
   "type": "module",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Som Composable Functions And Components for Vue 3",
   "author": "oiij",
   "license": "MIT",
@@ -44,21 +44,24 @@
     "naive-ui": "^2.41.0",
     "prismjs": "^1.30.0",
     "vue": "^3.5.13",
-    "@oiij/markdown-it": "0.0.2",
-    "@oiij/css-render": "0.0.1",
-    "@oiij/use": "0.0.15"
+    "vue-hooks-plus": "^2.4.0",
+    "@oiij/css-render": "0.0.2",
+    "@oiij/markdown-it": "0.0.3",
+    "@oiij/use": "0.0.16"
   },
   "devDependencies": {
     "@types/prismjs": "^1.26.5",
-    "@vueuse/core": "^13.3.0",
+    "@vueuse/core": "^13.4.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
-    "naive-ui": "^2.41.1",
+    "naive-ui": "^2.42.0",
     "prismjs": "^1.30.0",
-    "vue": "^3.5.16",
-    "@oiij/css-render": "0.0.1",
-    "@oiij/use": "0.0.15",
-    "@oiij/markdown-it": "0.0.2"
+    "vue": "^3.5.17",
+    "vue-component-type-helpers": "^2.2.10",
+    "vue-hooks-plus": "^2.4.0",
+    "@oiij/css-render": "0.0.2",
+    "@oiij/markdown-it": "0.0.3",
+    "@oiij/use": "0.0.16"
   },
   "publishConfig": {
     "access": "public"