@oiij/naive-ui 0.0.63 → 0.0.64

package/dist/composables/{index.d.ts → index.d.mts}

@@ -1,3 +1,3 @@
-import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./useDataRequest.js";
-import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./useNaiveForm.js";
-import { NaiveThemeReturns, useNaiveTheme } from "./useNaiveTheme.js";
+import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./useDataRequest.mjs";
+import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./useNaiveForm.mjs";
+import { NaiveThemeReturns, useNaiveTheme } from "./useNaiveTheme.mjs";

package/dist/composables/{useDataRequest.d.cts → useDataRequest.d.mts}

@@ -1,5 +1,5 @@
-import * as vue0 from "vue";
 import * as _vueuse_core0 from "@vueuse/core";
+import * as vue0 from "vue";
 import { UseRequestOptions, UseRequestPlugin } from "vue-hooks-plus/es/useRequest/types";
 
 //#region src/composables/useDataRequest.d.ts
@@ -27,7 +27,7 @@ declare function useDataRequest<P extends DataObject = DataObject, D extends Dat
   loading: Readonly<vue0.Ref<boolean, boolean>>;
   data: Readonly<vue0.Ref<D | undefined, D | undefined>>;
   error: Readonly<vue0.Ref<Error | undefined, Error | undefined>>;
-  params: Readonly<vue0.Ref<P[] | [], P[] | []>>;
+  params: Readonly<vue0.Ref<[] | P[], [] | P[]>>;
   list: vue0.ComputedRef<R[]>;
   pagination: vue0.Ref<{
     page: number;

package/dist/composables/{useNaiveForm.d.ts → useNaiveForm.d.mts}

@@ -1,7 +1,7 @@
-import { DataObject } from "./useDataRequest.js";
+import { DataObject } from "./useDataRequest.mjs";
 import * as _vueuse_core3 from "@vueuse/core";
 import * as vue5 from "vue";
-import { Ref } from "vue";
+import { Ref, TemplateRef } from "vue";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
 import { ValidateError } from "async-validator";
 
@@ -16,12 +16,11 @@ type NaiveFormOptions<T extends DataObject> = {
   rules?: NaiveFormRules<T> | Ref<NaiveFormRules<T>>;
   clearRules?: NaiveFormClearRules;
 };
-declare function useNaiveForm<T extends DataObject = DataObject>(value?: T | Ref<T>, options?: NaiveFormOptions<T>): {
-  formRef: Ref<FormInst | undefined, FormInst | undefined>;
+declare function useNaiveForm<T extends DataObject = DataObject>(formRef: TemplateRef<FormInst>, value?: T | Ref<T>, options?: NaiveFormOptions<T>): {
+  formRef: Readonly<vue5.ShallowRef<FormInst | null>>;
   formValue: Ref<T, T>;
   formRules: Ref<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>, Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
   formProps: {
-    ref: Ref<FormInst | undefined, FormInst | undefined>;
     model: vue5.Reactive<T>;
     rules: vue5.Reactive<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
   };

package/dist/composables/{useNaiveForm.js → useNaiveForm.mjs}

@@ -30,14 +30,12 @@ function deepMerge(target = {}, source = {}) {
 	}
 	return target;
 }
-function useNaiveForm(value, options) {
+function useNaiveForm(formRef, value, options) {
 	const { rules, clearRules } = options ?? {};
 	const cacheValue = cloneDeep(toValue(value));
 	const formValue = ref(toValue(value ?? {}));
 	const formRules = ref(toValue(rules) ?? {});
-	const formRef = ref();
 	const formProps = {
-		ref: formRef,
 		model: reactive(formValue.value),
 		rules: reactive(formRules.value)
 	};

package/dist/composables/{useNaiveTheme.d.ts → useNaiveTheme.d.mts}

@@ -1,4 +1,4 @@
-import { Colors } from "./_helper.js";
+import { Colors } from "./_helper.mjs";
 import { ComputedRef, Ref } from "vue";
 import { GlobalThemeOverrides, NDateLocale } from "naive-ui";
 import * as naive_ui_es_themes_interface0 from "naive-ui/es/themes/interface";

package/dist/composables/{useNaiveTheme.js → useNaiveTheme.mjs}

@@ -1,4 +1,4 @@
-import { getColors } from "./_helper.js";
+import { getColors } from "./_helper.mjs";
 import { computed, ref, toValue, watchEffect } from "vue";
 import { darkTheme, dateEnUS, dateZhCN, enUS, zhCN } from "naive-ui";
 
@@ -25,7 +25,7 @@ function useNaiveTheme(options) {
 	watchEffect(() => {
 		darkModeRef.value = toValue(darkMode);
 	});
-	const { common,...extra } = globalThemeOverrides ?? {};
+	const { common, ...extra } = globalThemeOverrides ?? {};
 	const colorRef = ref({ ...colors });
 	function setColor(v) {
 		colorRef.value = {

package/dist/{index.d.cts → index.d.mts}

@@ -1,4 +1,5 @@
-import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./composables/useDataRequest.cjs";
-import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./composables/useNaiveForm.cjs";
-import { NaiveThemeReturns, useNaiveTheme } from "./composables/useNaiveTheme.cjs";
+import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./composables/useDataRequest.mjs";
+import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./composables/useNaiveForm.mjs";
+import { NaiveThemeReturns, useNaiveTheme } from "./composables/useNaiveTheme.mjs";
+import "./composables/index.mjs";
 export { DataObject, DataRequestFields, NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, NaiveThemeReturns, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest, useNaiveForm, useNaiveTheme };

package/dist/index.mjs

@@ -0,0 +1,5 @@
+import { useDataRequest } from "./composables/useDataRequest.mjs";
+import { useNaiveForm } from "./composables/useNaiveForm.mjs";
+import { useNaiveTheme } from "./composables/useNaiveTheme.mjs";
+
+export { useDataRequest, useNaiveForm, useNaiveTheme };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oiij/naive-ui",
   "type": "module",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "description": "Some Composable Functions And Components for Vue 3",
   "author": "oiij",
   "license": "MIT",
@@ -18,19 +18,17 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
     },
     "./components": {
       "types": "./dist/components.d.ts",
-      "import": "./dist/components.js",
-      "require": "./dist/components.cjs"
+      "import": "./dist/components.js"
     }
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "files": [
     "LICENSE",
     "README.md",
@@ -38,32 +36,31 @@
     "package.json"
   ],
   "peerDependencies": {
-    "@vueuse/core": "^14.0.0",
+    "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
-    "es-toolkit": "^1.41.0",
-    "naive-ui": "^2.43.1",
+    "es-toolkit": "^1.43.0",
+    "naive-ui": "^2.43.2",
     "prismjs": "^1.30.0",
-    "vue": "^3.5.22",
+    "vue": "^3.5.25",
     "vue-hooks-plus": "^2.4.1",
-    "@oiij/css-render": "0.0.6",
-    "@oiij/markdown-it": "0.0.8",
-    "@oiij/use": "0.0.27"
+    "@oiij/css-render": "0.0.7",
+    "@oiij/use": "0.0.28",
+    "@oiij/markdown-it": "0.0.9"
   },
   "devDependencies": {
     "@types/prismjs": "^1.26.5",
-    "@vueuse/core": "^14.0.0",
+    "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
-    "es-toolkit": "^1.41.0",
-    "naive-ui": "^2.43.1",
+    "es-toolkit": "^1.43.0",
+    "naive-ui": "^2.43.2",
     "prismjs": "^1.30.0",
-    "vue": "^3.5.22",
-    "vue-component-type-helpers": "^3.1.2",
+    "vue": "^3.5.25",
     "vue-hooks-plus": "^2.4.1",
-    "@oiij/css-render": "0.0.6",
-    "@oiij/markdown-it": "0.0.8",
-    "@oiij/use": "0.0.27"
+    "@oiij/use": "0.0.28",
+    "@oiij/markdown-it": "0.0.9",
+    "@oiij/css-render": "0.0.7"
   },
   "publishConfig": {
     "access": "public"

package/dist/_virtual/rolldown_runtime.cjs

@@ -1,25 +0,0 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-
-exports.__toESM = __toESM;