v-dict 1.2.11 → 2.0.0

package/dist/{chunk-QAVWCRC2.js → chunk-SXX4ZFIR.js}

@@ -1,4 +1,5 @@
 // src/util.ts
+var warn = (msg) => console.warn(`[v-dict]: ${msg}`);
 function isFunction(fn) {
   return typeof fn === "function";
 }
@@ -7,7 +8,10 @@ function clearObj(obj) {
     delete obj[key];
   }
 }
-function mapToObj(map, obj = {}, itemTransformer) {
+function mapToObj(map, {
+  obj = {},
+  itemTransformer
+} = {}) {
   var _a;
   clearObj(obj);
   for (const [key, value] of map) {
@@ -23,21 +27,17 @@ function checkObjItem(item, key, transformer) {
     item.value = transformer(item.value);
   }
 }
-function mapToList(map, list = [], itemTransformer) {
-  const values = itemTransformer ? map.values().map(itemTransformer) : map.values();
+function mapToList(map, {
+  list = [],
+  itemTransformer
+} = {}) {
+  const values = isFunction(itemTransformer) ? map.values().map(itemTransformer) : map.values();
   list.splice(0, list.length, ...values);
   return list;
 }
-function listToMap(list) {
-  return new Map(list.map((item) => [item.value, item]));
-}
-function toMap(data, options = {}) {
-  const { pickValues = [], omitValues = [], transformer } = options;
+function toMap(data, { map = /* @__PURE__ */ new Map(), pickValues = [], omitValues = [], transformer } = {}) {
   const filterFn = (value) => (pickValues.length === 0 || pickValues.includes(value)) && !omitValues.includes(value);
-  if (Array.isArray(data)) {
-    return listToMap(data.filter((item) => filterFn(item.value)));
-  }
-  const map = /* @__PURE__ */ new Map();
+  map.clear();
   Object.entries(data).filter(([key, item]) => {
     checkObjItem(item, key, transformer);
     return filterFn(item.value);
@@ -125,4 +125,4 @@ function createPromise(executor) {
   return promise;
 }
 
-export { clearObj, cloneDeep, createPromise, defineDictData, isFunction, mapToList, mapToObj, merge, toMap };
+export { cloneDeep, createPromise, defineDictData, isFunction, mapToList, mapToObj, merge, toMap, warn };

package/dist/index.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 
-// src/dict-manager.ts
+// src/vue/vue-dict-manager.ts
 
 // src/create-promise.ts
 var noop = () => {
@@ -25,6 +25,7 @@ function createPromise(executor) {
 }
 
 // src/util.ts
+var warn = (msg) => console.warn(`[v-dict]: ${msg}`);
 function isFunction(fn) {
   return typeof fn === "function";
 }
@@ -33,7 +34,10 @@ function clearObj(obj) {
     delete obj[key];
   }
 }
-function mapToObj(map, obj = {}, itemTransformer) {
+function mapToObj(map, {
+  obj = {},
+  itemTransformer
+} = {}) {
   var _a;
   clearObj(obj);
   for (const [key, value] of map) {
@@ -49,21 +53,17 @@ function checkObjItem(item, key, transformer) {
     item.value = transformer(item.value);
   }
 }
-function mapToList(map, list = [], itemTransformer) {
-  const values = itemTransformer ? map.values().map(itemTransformer) : map.values();
+function mapToList(map, {
+  list = [],
+  itemTransformer
+} = {}) {
+  const values = isFunction(itemTransformer) ? map.values().map(itemTransformer) : map.values();
   list.splice(0, list.length, ...values);
   return list;
 }
-function listToMap(list) {
-  return new Map(list.map((item) => [item.value, item]));
-}
-function toMap(data, options = {}) {
-  const { pickValues = [], omitValues = [], transformer } = options;
+function toMap(data, { map = /* @__PURE__ */ new Map(), pickValues = [], omitValues = [], transformer } = {}) {
   const filterFn = (value) => (pickValues.length === 0 || pickValues.includes(value)) && !omitValues.includes(value);
-  if (Array.isArray(data)) {
-    return listToMap(data.filter((item) => filterFn(item.value)));
-  }
-  const map = /* @__PURE__ */ new Map();
+  map.clear();
   Object.entries(data).filter(([key, item]) => {
     checkObjItem(item, key, transformer);
     return filterFn(item.value);
@@ -131,8 +131,7 @@ function cloneDeep(value) {
   return value;
 }
 
-// src/dict-manager.ts
-var warn = (msg) => console.warn(`[v-dict]: ${msg}`);
+// src/vue/vue-dict-manager.ts
 function createDictManager(createDictManagerOptions = {}) {
   const {
     fetch: managerFetch,
@@ -148,12 +147,14 @@ function createDictManager(createDictManagerOptions = {}) {
       (_a = maps[code]) == null ? void 0 : _a.clear();
       return;
     }
-    clearObj(maps);
+    Object.values(maps).forEach((map) => map.clear());
   }
   function _defineDict(defineDictInternalOptions, code, defineDictOptions) {
     const { pickValues, omitValues, extendCode } = defineDictInternalOptions;
     if (maps[code]) {
       warn(`code "${code}" already exists`);
+    } else {
+      maps[code] = /* @__PURE__ */ new Map();
     }
     const _defineDictOptions = Object.assign(
       {
@@ -167,9 +168,8 @@ function createDictManager(createDictManagerOptions = {}) {
     );
     defineDictOptionsMap.set(code, cloneDeep(_defineDictOptions));
     const { data, remote, fetch, extra, transformer, itemTransformer } = _defineDictOptions;
-    const globalLoadPromise = vue.shallowRef(null);
-    let loaded = false;
-    maps[code] = /* @__PURE__ */ new Map();
+    let globalLoadPromise = null;
+    let init = false;
     async function loadDict(options, mapRef) {
       var _a;
       const dataMap = toMap(cloneDeep(data), { pickValues, omitValues, transformer });
@@ -191,21 +191,23 @@ function createDictManager(createDictManagerOptions = {}) {
         useDictOptions
       );
       const { clone, immediate, refresh } = useDictOptions;
-      const loadPromise = !clone ? globalLoadPromise : vue.shallowRef(createPromise());
-      const mapRef = !clone ? vue.toRef(maps, code) : vue.ref();
+      const loadPromise = vue.shallowRef(
+        !clone ? globalLoadPromise : createPromise()
+      );
+      const mapRef = !clone ? vue.toRef(maps, code) : vue.ref(/* @__PURE__ */ new Map());
       const objRef = vue.ref(/* @__PURE__ */ Object.create(null));
       const listRef = vue.ref([]);
       if (!remote || immediate) {
         if (clone) {
           load();
         } else {
-          if (!globalLoadPromise.value) {
-            globalLoadPromise.value = createPromise();
+          if (!globalLoadPromise) {
+            globalLoadPromise = createPromise();
             load();
           } else {
-            globalLoadPromise.value.then(() => {
-              if (!loaded) {
-                loaded = true;
+            globalLoadPromise.then(() => {
+              if (!init) {
+                init = true;
                 load();
               } else if (refresh) {
                 load();
@@ -214,9 +216,9 @@ function createDictManager(createDictManagerOptions = {}) {
           }
         }
       } else {
-        if (!globalLoadPromise.value) {
-          globalLoadPromise.value = createPromise();
-          globalLoadPromise.value.resolve();
+        if (!globalLoadPromise) {
+          globalLoadPromise = createPromise();
+          globalLoadPromise.resolve();
         }
       }
       function load(options) {
@@ -229,24 +231,30 @@ function createDictManager(createDictManagerOptions = {}) {
         return loadPromise.value;
       }
       function _clear() {
-        var _a;
-        (_a = mapRef.value) == null ? void 0 : _a.clear();
+        mapRef.value.clear();
       }
       vue.watch(
         mapRef,
         (newValue) => {
           newValue != null ? newValue : newValue = /* @__PURE__ */ new Map();
-          mapToObj(newValue, objRef.value, itemTransformer);
-          mapToList(newValue, listRef.value, itemTransformer);
+          mapToObj(newValue, {
+            obj: objRef.value,
+            itemTransformer
+          });
+          mapToList(newValue, {
+            list: listRef.value,
+            itemTransformer
+          });
         },
         { deep: true, immediate: true }
       );
       const E = vue.computed(() => {
+        var _a;
         const result = {};
         if (!mapRef.value)
           return result;
         for (const key of mapRef.value.keys()) {
-          result[key] = key;
+          result[key] = (_a = transformer == null ? void 0 : transformer(key)) != null ? _a : key;
         }
         return result;
       });
@@ -266,7 +274,9 @@ function createDictManager(createDictManagerOptions = {}) {
       const reactiveCtx = vue.reactive(ctx);
       return vue.reactive({
         ...ctx,
+        // @ts-ignore
         ...managerExtra == null ? void 0 : managerExtra(reactiveCtx),
+        // @ts-ignore
         ...extra == null ? void 0 : extra(reactiveCtx)
       });
     }

package/dist/index.d.ts

@@ -1,3 +1 @@
-export type * from './types';
-export * from './dict-manager';
-export { defineDictData } from './util';
+export * from './vue';

package/dist/index.js

@@ -1,8 +1,7 @@
-import { clearObj, isFunction, cloneDeep, createPromise, mapToObj, mapToList, toMap, merge } from './chunk-QAVWCRC2.js';
-export { defineDictData } from './chunk-QAVWCRC2.js';
+import { warn, isFunction, cloneDeep, createPromise, mapToObj, mapToList, toMap, merge } from './chunk-SXX4ZFIR.js';
+export { defineDictData } from './chunk-SXX4ZFIR.js';
 import { reactive, readonly, shallowRef, toRef, ref, watch, computed } from 'vue';
 
-var warn = (msg) => console.warn(`[v-dict]: ${msg}`);
 function createDictManager(createDictManagerOptions = {}) {
   const {
     fetch: managerFetch,
@@ -18,12 +17,14 @@ function createDictManager(createDictManagerOptions = {}) {
       (_a = maps[code]) == null ? void 0 : _a.clear();
       return;
     }
-    clearObj(maps);
+    Object.values(maps).forEach((map) => map.clear());
   }
   function _defineDict(defineDictInternalOptions, code, defineDictOptions) {
     const { pickValues, omitValues, extendCode } = defineDictInternalOptions;
     if (maps[code]) {
       warn(`code "${code}" already exists`);
+    } else {
+      maps[code] = /* @__PURE__ */ new Map();
     }
     const _defineDictOptions = Object.assign(
       {
@@ -37,9 +38,8 @@ function createDictManager(createDictManagerOptions = {}) {
     );
     defineDictOptionsMap.set(code, cloneDeep(_defineDictOptions));
     const { data, remote, fetch, extra, transformer, itemTransformer } = _defineDictOptions;
-    const globalLoadPromise = shallowRef(null);
-    let loaded = false;
-    maps[code] = /* @__PURE__ */ new Map();
+    let globalLoadPromise = null;
+    let init = false;
     async function loadDict(options, mapRef) {
       var _a;
       const dataMap = toMap(cloneDeep(data), { pickValues, omitValues, transformer });
@@ -61,21 +61,23 @@ function createDictManager(createDictManagerOptions = {}) {
         useDictOptions
       );
       const { clone, immediate, refresh } = useDictOptions;
-      const loadPromise = !clone ? globalLoadPromise : shallowRef(createPromise());
-      const mapRef = !clone ? toRef(maps, code) : ref();
+      const loadPromise = shallowRef(
+        !clone ? globalLoadPromise : createPromise()
+      );
+      const mapRef = !clone ? toRef(maps, code) : ref(/* @__PURE__ */ new Map());
       const objRef = ref(/* @__PURE__ */ Object.create(null));
       const listRef = ref([]);
       if (!remote || immediate) {
         if (clone) {
           load();
         } else {
-          if (!globalLoadPromise.value) {
-            globalLoadPromise.value = createPromise();
+          if (!globalLoadPromise) {
+            globalLoadPromise = createPromise();
             load();
           } else {
-            globalLoadPromise.value.then(() => {
-              if (!loaded) {
-                loaded = true;
+            globalLoadPromise.then(() => {
+              if (!init) {
+                init = true;
                 load();
               } else if (refresh) {
                 load();
@@ -84,9 +86,9 @@ function createDictManager(createDictManagerOptions = {}) {
           }
         }
       } else {
-        if (!globalLoadPromise.value) {
-          globalLoadPromise.value = createPromise();
-          globalLoadPromise.value.resolve();
+        if (!globalLoadPromise) {
+          globalLoadPromise = createPromise();
+          globalLoadPromise.resolve();
         }
       }
       function load(options) {
@@ -99,24 +101,30 @@ function createDictManager(createDictManagerOptions = {}) {
         return loadPromise.value;
       }
       function _clear() {
-        var _a;
-        (_a = mapRef.value) == null ? void 0 : _a.clear();
+        mapRef.value.clear();
       }
       watch(
         mapRef,
         (newValue) => {
           newValue != null ? newValue : newValue = /* @__PURE__ */ new Map();
-          mapToObj(newValue, objRef.value, itemTransformer);
-          mapToList(newValue, listRef.value, itemTransformer);
+          mapToObj(newValue, {
+            obj: objRef.value,
+            itemTransformer
+          });
+          mapToList(newValue, {
+            list: listRef.value,
+            itemTransformer
+          });
         },
         { deep: true, immediate: true }
       );
       const E = computed(() => {
+        var _a;
         const result = {};
         if (!mapRef.value)
           return result;
         for (const key of mapRef.value.keys()) {
-          result[key] = key;
+          result[key] = (_a = transformer == null ? void 0 : transformer(key)) != null ? _a : key;
         }
         return result;
       });
@@ -136,7 +144,9 @@ function createDictManager(createDictManagerOptions = {}) {
       const reactiveCtx = reactive(ctx);
       return reactive({
         ...ctx,
+        // @ts-ignore
         ...managerExtra == null ? void 0 : managerExtra(reactiveCtx),
+        // @ts-ignore
         ...extra == null ? void 0 : extra(reactiveCtx)
       });
     }

package/dist/react/index.cjs

@@ -25,6 +25,7 @@ function createPromise(executor) {
 }
 
 // src/util.ts
+var warn = (msg) => console.warn(`[v-dict]: ${msg}`);
 function isFunction(fn) {
   return typeof fn === "function";
 }
@@ -33,7 +34,10 @@ function clearObj(obj) {
     delete obj[key];
   }
 }
-function mapToObj(map, obj = {}, itemTransformer) {
+function mapToObj(map, {
+  obj = {},
+  itemTransformer
+} = {}) {
   var _a;
   clearObj(obj);
   for (const [key, value] of map) {
@@ -49,21 +53,17 @@ function checkObjItem(item, key, transformer) {
     item.value = transformer(item.value);
   }
 }
-function mapToList(map, list = [], itemTransformer) {
-  const values = itemTransformer ? map.values().map(itemTransformer) : map.values();
+function mapToList(map, {
+  list = [],
+  itemTransformer
+} = {}) {
+  const values = isFunction(itemTransformer) ? map.values().map(itemTransformer) : map.values();
   list.splice(0, list.length, ...values);
   return list;
 }
-function listToMap(list) {
-  return new Map(list.map((item) => [item.value, item]));
-}
-function toMap(data, options = {}) {
-  const { pickValues = [], omitValues = [], transformer } = options;
+function toMap(data, { map = /* @__PURE__ */ new Map(), pickValues = [], omitValues = [], transformer } = {}) {
   const filterFn = (value) => (pickValues.length === 0 || pickValues.includes(value)) && !omitValues.includes(value);
-  if (Array.isArray(data)) {
-    return listToMap(data.filter((item) => filterFn(item.value)));
-  }
-  const map = /* @__PURE__ */ new Map();
+  map.clear();
   Object.entries(data).filter(([key, item]) => {
     checkObjItem(item, key, transformer);
     return filterFn(item.value);
@@ -132,7 +132,6 @@ function cloneDeep(value) {
 }
 
 // src/react/react-dict-manager.ts
-var warn = (msg) => console.warn(`[v-dict/react]: ${msg}`);
 function createDictManager(createDictManagerOptions = {}) {
   const {
     fetch: managerFetch,
@@ -140,20 +139,24 @@ function createDictManager(createDictManagerOptions = {}) {
     transformer: managerTransformer,
     itemTransformer: managerItemTransformer
   } = createDictManagerOptions;
-  const maps = /* @__PURE__ */ Object.create(null);
   const defineDictOptionsMap = /* @__PURE__ */ new Map();
+  const maps = /* @__PURE__ */ Object.create(null);
+  const versionMap = /* @__PURE__ */ Object.create(null);
   function clear(code) {
     var _a;
     if (code) {
       (_a = maps[code]) == null ? void 0 : _a.clear();
       return;
     }
-    clearObj(maps);
+    Object.values(maps).forEach((map) => map.clear());
   }
   function _defineDict(defineDictInternalOptions, code, defineDictOptions) {
     const { pickValues, omitValues, extendCode } = defineDictInternalOptions;
     if (maps[code]) {
       warn(`code "${code}" already exists`);
+    } else {
+      maps[code] = /* @__PURE__ */ new Map();
+      versionMap[code] = 0;
     }
     const _defineDictOptions = Object.assign(
       {
@@ -168,82 +171,81 @@ function createDictManager(createDictManagerOptions = {}) {
     defineDictOptionsMap.set(code, cloneDeep(_defineDictOptions));
     const { data, remote, fetch, extra, transformer, itemTransformer } = _defineDictOptions;
     let globalLoadPromise = null;
-    let loaded = false;
-    maps[code] = /* @__PURE__ */ new Map();
+    let init = false;
     async function loadDict(options, mapRef) {
       var _a;
-      const dataMap = toMap(cloneDeep(data), { pickValues, omitValues, transformer });
       if (remote) {
         const res = (_a = await (fetch == null ? void 0 : fetch(extendCode != null ? extendCode : code, options))) != null ? _a : [];
-        mapRef.current = toMap(res, { pickValues, omitValues, transformer });
-        dataMap.forEach((value, key) => {
-          if (mapRef.current.has(key)) {
-            merge(mapRef.current.get(key), value);
+        toMap(res, { pickValues, omitValues, transformer, map: mapRef.current });
+        toMap(cloneDeep(data), { pickValues, omitValues, transformer }).forEach(
+          (value, key) => {
+            if (mapRef.current.has(key)) {
+              merge(mapRef.current.get(key), value);
+            }
           }
-        });
+        );
       } else {
-        mapRef.current = dataMap;
+        toMap(cloneDeep(data), { pickValues, omitValues, transformer, map: mapRef.current });
       }
+      versionMap[code] += 1;
     }
     function useDict(useDictOptions = {}) {
-      const mergedOptions = Object.assign(
-        { clone: false, immediate: true, refresh: false },
-        useDictOptions
-      );
+      const mergedOptions = {
+        clone: false,
+        immediate: true,
+        refresh: false,
+        ...useDictOptions
+      };
       const { clone, immediate, refresh } = mergedOptions;
       const loadPromiseRef = react.useRef(
-        !clone ? globalLoadPromise != null ? globalLoadPromise : createPromise() : createPromise()
+        !clone ? globalLoadPromise : createPromise()
       );
       const mapRef = react.useRef(!clone ? maps[code] : /* @__PURE__ */ new Map());
-      const objRef = react.useRef(/* @__PURE__ */ Object.create(null));
-      const listRef = react.useRef([]);
-      const synMapRef = () => {
+      const versionRef = react.useRef(0);
+      const getStateFromMapRef = () => {
         const newObj = /* @__PURE__ */ Object.create(null);
         const newList = [];
-        mapToObj(mapRef.current, newObj, itemTransformer);
-        mapToList(mapRef.current, newList, itemTransformer);
-        objRef.current = newObj;
-        listRef.current = newList;
-      };
-      const extractE = () => {
-        return Object.fromEntries(
-          Array.from(mapRef.current.keys()).map((key) => [String(key), String(key)])
+        mapToObj(mapRef.current, {
+          obj: newObj,
+          itemTransformer
+        });
+        mapToList(mapRef.current, {
+          list: newList,
+          itemTransformer
+        });
+        const newE = Object.fromEntries(
+          Array.from(mapRef.current.keys()).map((key) => {
+            var _a;
+            return [key, (_a = transformer == null ? void 0 : transformer(key)) != null ? _a : key];
+          })
         );
+        return {
+          map: newObj,
+          list: newList,
+          E: newE
+        };
       };
-      synMapRef();
-      const [state, setState] = react.useState({
-        map: objRef.current,
-        list: listRef.current,
-        E: extractE()
-      });
+      const [state, setState] = react.useState(getStateFromMapRef());
+      if (versionRef.current !== versionMap[code]) {
+        versionRef.current = versionMap[code];
+        setState(getStateFromMapRef());
+      }
       const load = react.useCallback((options) => {
         const oldLoadPromise = loadPromiseRef.current;
-        const newLoadPromise = createPromise();
-        loadPromiseRef.current = newLoadPromise;
-        loadDict(Object.assign({}, mergedOptions, options), mapRef).then(() => {
-          synMapRef();
-          setState({
-            map: objRef.current,
-            list: listRef.current,
-            E: extractE()
-          });
+        loadPromiseRef.current = createPromise();
+        loadDict({ ...mergedOptions, ...options }, mapRef).then(() => {
+          setState(getStateFromMapRef());
           oldLoadPromise == null ? void 0 : oldLoadPromise.resolve(void 0);
-          newLoadPromise.resolve(void 0);
+          loadPromiseRef.current.resolve(void 0);
         });
-        return newLoadPromise;
+        return loadPromiseRef.current;
       }, []);
       const clear2 = react.useCallback(() => {
-        var _a;
-        (_a = mapRef.current) == null ? void 0 : _a.clear();
-        setState({
-          map: /* @__PURE__ */ Object.create(null),
-          list: [],
-          E: {}
-        });
+        mapRef.current.clear();
+        setState(getStateFromMapRef());
       }, []);
       const getItem = react.useCallback((value) => {
-        var _a;
-        return value !== null && value !== void 0 ? (_a = mapRef.current) == null ? void 0 : _a.get(value) : null;
+        return value !== null && value !== void 0 ? mapRef.current.get(value) : null;
       }, []);
       react.useEffect(() => {
         if (!remote || immediate) {
@@ -255,8 +257,8 @@ function createDictManager(createDictManagerOptions = {}) {
               load();
             } else {
               globalLoadPromise.then(() => {
-                if (!loaded) {
-                  loaded = true;
+                if (!init) {
+                  init = true;
                   load();
                 } else if (refresh) {
                   load();
@@ -283,7 +285,9 @@ function createDictManager(createDictManagerOptions = {}) {
         };
         return {
           ..._ctx,
+          // @ts-ignore
           ...managerExtra == null ? void 0 : managerExtra(_ctx),
+          // @ts-ignore
           ...extra == null ? void 0 : extra(_ctx)
         };
       }, [state]);

package/dist/react/index.js

@@ -1,8 +1,7 @@
-import { clearObj, isFunction, cloneDeep, createPromise, toMap, merge, mapToObj, mapToList } from '../chunk-QAVWCRC2.js';
-export { defineDictData } from '../chunk-QAVWCRC2.js';
+import { warn, isFunction, cloneDeep, createPromise, toMap, merge, mapToObj, mapToList } from '../chunk-SXX4ZFIR.js';
+export { defineDictData } from '../chunk-SXX4ZFIR.js';
 import { useRef, useState, useCallback, useEffect, useMemo } from 'react';
 
-var warn = (msg) => console.warn(`[v-dict/react]: ${msg}`);
 function createDictManager(createDictManagerOptions = {}) {
   const {
     fetch: managerFetch,
@@ -10,20 +9,24 @@ function createDictManager(createDictManagerOptions = {}) {
     transformer: managerTransformer,
     itemTransformer: managerItemTransformer
   } = createDictManagerOptions;
-  const maps = /* @__PURE__ */ Object.create(null);
   const defineDictOptionsMap = /* @__PURE__ */ new Map();
+  const maps = /* @__PURE__ */ Object.create(null);
+  const versionMap = /* @__PURE__ */ Object.create(null);
   function clear(code) {
     var _a;
     if (code) {
       (_a = maps[code]) == null ? void 0 : _a.clear();
       return;
     }
-    clearObj(maps);
+    Object.values(maps).forEach((map) => map.clear());
   }
   function _defineDict(defineDictInternalOptions, code, defineDictOptions) {
     const { pickValues, omitValues, extendCode } = defineDictInternalOptions;
     if (maps[code]) {
       warn(`code "${code}" already exists`);
+    } else {
+      maps[code] = /* @__PURE__ */ new Map();
+      versionMap[code] = 0;
     }
     const _defineDictOptions = Object.assign(
       {
@@ -38,82 +41,81 @@ function createDictManager(createDictManagerOptions = {}) {
     defineDictOptionsMap.set(code, cloneDeep(_defineDictOptions));
     const { data, remote, fetch, extra, transformer, itemTransformer } = _defineDictOptions;
     let globalLoadPromise = null;
-    let loaded = false;
-    maps[code] = /* @__PURE__ */ new Map();
+    let init = false;
     async function loadDict(options, mapRef) {
       var _a;
-      const dataMap = toMap(cloneDeep(data), { pickValues, omitValues, transformer });
       if (remote) {
         const res = (_a = await (fetch == null ? void 0 : fetch(extendCode != null ? extendCode : code, options))) != null ? _a : [];
-        mapRef.current = toMap(res, { pickValues, omitValues, transformer });
-        dataMap.forEach((value, key) => {
-          if (mapRef.current.has(key)) {
-            merge(mapRef.current.get(key), value);
+        toMap(res, { pickValues, omitValues, transformer, map: mapRef.current });
+        toMap(cloneDeep(data), { pickValues, omitValues, transformer }).forEach(
+          (value, key) => {
+            if (mapRef.current.has(key)) {
+              merge(mapRef.current.get(key), value);
+            }
           }
-        });
+        );
       } else {
-        mapRef.current = dataMap;
+        toMap(cloneDeep(data), { pickValues, omitValues, transformer, map: mapRef.current });
       }
+      versionMap[code] += 1;
     }
     function useDict(useDictOptions = {}) {
-      const mergedOptions = Object.assign(
-        { clone: false, immediate: true, refresh: false },
-        useDictOptions
-      );
+      const mergedOptions = {
+        clone: false,
+        immediate: true,
+        refresh: false,
+        ...useDictOptions
+      };
       const { clone, immediate, refresh } = mergedOptions;
       const loadPromiseRef = useRef(
-        !clone ? globalLoadPromise != null ? globalLoadPromise : createPromise() : createPromise()
+        !clone ? globalLoadPromise : createPromise()
       );
       const mapRef = useRef(!clone ? maps[code] : /* @__PURE__ */ new Map());
-      const objRef = useRef(/* @__PURE__ */ Object.create(null));
-      const listRef = useRef([]);
-      const synMapRef = () => {
+      const versionRef = useRef(0);
+      const getStateFromMapRef = () => {
         const newObj = /* @__PURE__ */ Object.create(null);
         const newList = [];
-        mapToObj(mapRef.current, newObj, itemTransformer);
-        mapToList(mapRef.current, newList, itemTransformer);
-        objRef.current = newObj;
-        listRef.current = newList;
-      };
-      const extractE = () => {
-        return Object.fromEntries(
-          Array.from(mapRef.current.keys()).map((key) => [String(key), String(key)])
+        mapToObj(mapRef.current, {
+          obj: newObj,
+          itemTransformer
+        });
+        mapToList(mapRef.current, {
+          list: newList,
+          itemTransformer
+        });
+        const newE = Object.fromEntries(
+          Array.from(mapRef.current.keys()).map((key) => {
+            var _a;
+            return [key, (_a = transformer == null ? void 0 : transformer(key)) != null ? _a : key];
+          })
         );
+        return {
+          map: newObj,
+          list: newList,
+          E: newE
+        };
       };
-      synMapRef();
-      const [state, setState] = useState({
-        map: objRef.current,
-        list: listRef.current,
-        E: extractE()
-      });
+      const [state, setState] = useState(getStateFromMapRef());
+      if (versionRef.current !== versionMap[code]) {
+        versionRef.current = versionMap[code];
+        setState(getStateFromMapRef());
+      }
       const load = useCallback((options) => {
         const oldLoadPromise = loadPromiseRef.current;
-        const newLoadPromise = createPromise();
-        loadPromiseRef.current = newLoadPromise;
-        loadDict(Object.assign({}, mergedOptions, options), mapRef).then(() => {
-          synMapRef();
-          setState({
-            map: objRef.current,
-            list: listRef.current,
-            E: extractE()
-          });
+        loadPromiseRef.current = createPromise();
+        loadDict({ ...mergedOptions, ...options }, mapRef).then(() => {
+          setState(getStateFromMapRef());
           oldLoadPromise == null ? void 0 : oldLoadPromise.resolve(void 0);
-          newLoadPromise.resolve(void 0);
+          loadPromiseRef.current.resolve(void 0);
         });
-        return newLoadPromise;
+        return loadPromiseRef.current;
       }, []);
       const clear2 = useCallback(() => {
-        var _a;
-        (_a = mapRef.current) == null ? void 0 : _a.clear();
-        setState({
-          map: /* @__PURE__ */ Object.create(null),
-          list: [],
-          E: {}
-        });
+        mapRef.current.clear();
+        setState(getStateFromMapRef());
       }, []);
       const getItem = useCallback((value) => {
-        var _a;
-        return value !== null && value !== void 0 ? (_a = mapRef.current) == null ? void 0 : _a.get(value) : null;
+        return value !== null && value !== void 0 ? mapRef.current.get(value) : null;
       }, []);
       useEffect(() => {
         if (!remote || immediate) {
@@ -125,8 +127,8 @@ function createDictManager(createDictManagerOptions = {}) {
               load();
             } else {
               globalLoadPromise.then(() => {
-                if (!loaded) {
-                  loaded = true;
+                if (!init) {
+                  init = true;
                   load();
                 } else if (refresh) {
                   load();
@@ -153,7 +155,9 @@ function createDictManager(createDictManagerOptions = {}) {
         };
         return {
           ..._ctx,
+          // @ts-ignore
           ...managerExtra == null ? void 0 : managerExtra(_ctx),
+          // @ts-ignore
           ...extra == null ? void 0 : extra(_ctx)
         };
       }, [state]);

package/dist/util.d.ts

@@ -1,15 +1,22 @@
 import type { AnyFn, DictItemRecord, DictMap, DictValue, Merge, PlainObject, Recordable } from './types';
+export declare const warn: (msg: string) => void;
 export declare function isFunction(fn: unknown): fn is AnyFn;
 export declare function clearObj(obj: Recordable): void;
-export declare function mapToObj(map: DictMap, obj?: Recordable<DictItemRecord>, itemTransformer?: (item: DictItemRecord) => any): Recordable<DictItemRecord>;
-export declare function mapToList(map: DictMap, list?: DictItemRecord[], itemTransformer?: (item: DictItemRecord) => any): DictItemRecord[];
-export declare function listToMap(list: DictItemRecord[]): Map<DictValue, DictItemRecord>;
+export declare function mapToObj(map: DictMap, { obj, itemTransformer }?: {
+    obj?: Recordable<DictItemRecord>;
+    itemTransformer?: (item: DictItemRecord) => any;
+}): Recordable<DictItemRecord>;
+export declare function mapToList(map: DictMap, { list, itemTransformer }?: {
+    list?: DictItemRecord[];
+    itemTransformer?: (item: DictItemRecord) => any;
+}): DictItemRecord[];
 type MapOptions = {
+    map?: DictMap;
     pickValues?: DictValue[];
     omitValues?: DictValue[];
     transformer?: (value: DictValue) => DictValue;
 };
-export declare function toMap(data: Recordable<DictItemRecord> | DictItemRecord[], options?: MapOptions): DictMap;
+export declare function toMap(data: Recordable<DictItemRecord> | DictItemRecord[], { map, pickValues, omitValues, transformer }?: MapOptions): DictMap;
 export declare const defineDictData: <T>(data: T) => T;
 export declare function isPlainObject(obj: any): obj is PlainObject;
 export declare function merge<T extends PlainObject, S extends PlainObject[]>(target: T, ...sources: S): Merge<[T, ...S]>;

package/dist/vue/index.d.ts

@@ -0,0 +1,3 @@
+export type * from '../types';
+export * from './vue-dict-manager';
+export { defineDictData } from '../util';

package/dist/{dict-manager.d.ts → vue/vue-dict-manager.d.ts}

@@ -1,4 +1,4 @@
-import type { CreateDictManagerOptions, DefineDict, DictValue, ExtraGetter, Fetch } from './types';
+import type { CreateDictManagerOptions, DefineDict, DictValue, ExtraGetter, Fetch } from '../types';
 export declare function createDictManager<E extends ExtraGetter, F extends Fetch>(createDictManagerOptions?: CreateDictManagerOptions<E, F>): {
     defineDict: DefineDict<E, F>;
     clear: (code?: string) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "v-dict",
-  "version": "1.2.11",
+  "version": "2.0.0",
   "type": "module",
   "description": "Vue3 & React Dict Manager",
   "repository": {