@oiij/naive-ui 0.0.20 → 0.0.21

package/dist/composables/useNaiveForm.cjs

@@ -30,7 +30,13 @@ function useNaiveForm(value, options) {
 	};
 	const onValidatedEvent = (0, __vueuse_core.createEventHook)();
 	function validate() {
-		return formRef.value?.validate().then(() => onValidatedEvent.trigger((0, vue.toRaw)((0, vue.toValue)(formValue))));
+		return new Promise((resolve, reject) => {
+			if (!formRef.value) return reject(/* @__PURE__ */ new Error("formRef:undefined"));
+			formRef.value.validate().then((res) => {
+				onValidatedEvent.trigger((0, vue.toRaw)((0, vue.toValue)(formValue)));
+				return resolve(res);
+			}).catch(reject);
+		});
 	}
 	function resetValidation() {
 		formRef.value?.restoreValidation();

package/dist/composables/useNaiveForm.d.cts

@@ -1,6 +1,7 @@
 import * as vue1 from "vue";
 import { Ref } from "vue";
 import * as _vueuse_core2 from "@vueuse/core";
+import { ValidateError } from "async-validator";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
 
 //#region src/composables/useNaiveForm.d.ts
@@ -14,7 +15,7 @@ interface NaiveFormOptions<T extends Record<string, any>> {
   rules?: NaiveFormRules<T>;
   clearRules?: NaiveFormClearRules;
 }
-declare function useNaiveForm<T extends Record<string, any>>(value?: T, options?: NaiveFormOptions<T>): {
+declare function useNaiveForm<T extends Record<string, any> = 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;
@@ -23,13 +24,15 @@ declare function useNaiveForm<T extends Record<string, any>>(value?: T, options?
     model: vue1.Reactive<T>;
     rules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>> | undefined;
   };
-  validate: () => Promise<unknown[]> | undefined;
+  validate: () => Promise<{
+    warnings?: ValidateError[][];
+  }>;
   resetValidation: () => void;
   resetForm: () => void;
   reset: () => void;
   clear: () => void;
   onValidated: _vueuse_core2.EventHookOn<[T]>;
 };
-type NaiveFormReturns<T extends Record<string, any>> = ReturnType<typeof useNaiveForm<T>>;
+type NaiveFormReturns<T extends Record<string, any> = Record<string, any>> = ReturnType<typeof useNaiveForm<T>>;
 //#endregion
 export { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm };

package/dist/composables/useNaiveForm.d.ts

@@ -1,7 +1,8 @@
-import * as _vueuse_core2 from "@vueuse/core";
-import * as vue1 from "vue";
+import * as _vueuse_core1 from "@vueuse/core";
+import * as vue0 from "vue";
 import { Ref } from "vue";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
+import { ValidateError } from "async-validator";
 
 //#region src/composables/useNaiveForm.d.ts
 interface NaiveFormClearRules {
@@ -14,22 +15,24 @@ interface NaiveFormOptions<T extends Record<string, any>> {
   rules?: NaiveFormRules<T>;
   clearRules?: NaiveFormClearRules;
 }
-declare function useNaiveForm<T extends Record<string, any>>(value?: T, options?: NaiveFormOptions<T>): {
+declare function useNaiveForm<T extends Record<string, any> = 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: Ref<FormInst | undefined, FormInst | undefined>;
-    model: vue1.Reactive<T>;
+    model: vue0.Reactive<T>;
     rules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>> | undefined;
   };
-  validate: () => Promise<unknown[]> | undefined;
+  validate: () => Promise<{
+    warnings?: ValidateError[][];
+  }>;
   resetValidation: () => void;
   resetForm: () => void;
   reset: () => void;
   clear: () => void;
-  onValidated: _vueuse_core2.EventHookOn<[T]>;
+  onValidated: _vueuse_core1.EventHookOn<[T]>;
 };
-type NaiveFormReturns<T extends Record<string, any>> = ReturnType<typeof useNaiveForm<T>>;
+type NaiveFormReturns<T extends Record<string, any> = Record<string, any>> = ReturnType<typeof useNaiveForm<T>>;
 //#endregion
 export { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm };

package/dist/composables/useNaiveForm.js

@@ -29,7 +29,13 @@ function useNaiveForm(value, options) {
 	};
 	const onValidatedEvent = createEventHook();
 	function validate() {
-		return formRef.value?.validate().then(() => onValidatedEvent.trigger(toRaw(toValue(formValue))));
+		return new Promise((resolve, reject) => {
+			if (!formRef.value) return reject(/* @__PURE__ */ new Error("formRef:undefined"));
+			formRef.value.validate().then((res) => {
+				onValidatedEvent.trigger(toRaw(toValue(formValue)));
+				return resolve(res);
+			}).catch(reject);
+		});
 	}
 	function resetValidation() {
 		formRef.value?.restoreValidation();

package/dist/composables/useNaiveTheme.d.ts

@@ -1,6 +1,6 @@
 import { ComputedRef, Ref } from "vue";
 import { GlobalThemeOverrides, NDateLocale } from "naive-ui";
-import * as naive_ui_es_themes_interface0 from "naive-ui/es/themes/interface";
+import * as naive_ui_es_themes_interface2 from "naive-ui/es/themes/interface";
 
 //#region src/composables/useNaiveTheme.d.ts
 interface Color {
@@ -19,7 +19,7 @@ interface NaiveThemeOptions {
 declare function useNaiveTheme(options?: NaiveThemeOptions): {
   language: Ref<string | undefined, string | undefined>;
   darkMode: Ref<boolean | undefined, boolean | undefined>;
-  theme: ComputedRef<naive_ui_es_themes_interface0.BuiltInGlobalTheme | undefined>;
+  theme: ComputedRef<naive_ui_es_themes_interface2.BuiltInGlobalTheme | undefined>;
   themeOverrides: ComputedRef<GlobalThemeOverrides>;
   locale: ComputedRef<{
     name: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oiij/naive-ui",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Som Composable Functions And Components for Vue 3",
   "author": "oiij",
   "license": "MIT",
@@ -59,9 +59,9 @@
     "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.18",
-    "@oiij/css-render": "0.0.2"
+    "@oiij/use": "0.0.18"
   },
   "publishConfig": {
     "access": "public"