v-dict 2.0.7 → 2.0.9

package/dist/react/index.cjs

@@ -207,33 +207,6 @@ function createDictManager(createDictManagerOptions = {}) {
     function getMapSnapshot() {
       return maps[code];
     }
-    const createStateFromMap = (map = /* @__PURE__ */ new Map()) => {
-      const newObj = /* @__PURE__ */ Object.create(null);
-      const newList = [];
-      mapToObj(map, {
-        obj: newObj,
-        itemTransformer
-      });
-      mapToList(map, {
-        list: newList,
-        itemTransformer
-      });
-      const newE = Object.fromEntries(
-        Array.from(map.keys()).map((key) => {
-          var _a;
-          return [key, (_a = transformer == null ? void 0 : transformer(key)) != null ? _a : key];
-        })
-      );
-      const getItem = (value) => {
-        return value !== null && value !== void 0 ? newObj[value] : null;
-      };
-      return {
-        map: newObj,
-        list: newList,
-        E: newE,
-        getItem
-      };
-    };
     function useDict(useDictOptions = {}) {
       const mergedOptions = {
         clone: false,
@@ -242,77 +215,94 @@ function createDictManager(createDictManagerOptions = {}) {
         ...useDictOptions
       };
       const { clone, immediate, refresh } = mergedOptions;
-      const stateRef = react.useRef(createStateFromMap());
-      const clonedLoadPromiseRef = react.useRef(null);
       const globalMap = react.useSyncExternalStore(subscribeMap, getMapSnapshot);
       const [clonedMap, setClonedMap] = react.useState(/* @__PURE__ */ new Map());
-      const loadPromise = !clone ? globalLoadPromise : clonedLoadPromiseRef.current;
-      const map = !clone ? globalMap : clonedMap;
-      const state = react.useMemo(() => createStateFromMap(map), [map]);
-      const load = react.useCallback((options) => {
-        const oldLoadPromise = loadPromise;
-        if (!clone) {
-          globalLoadPromise = createPromise();
-        } else {
-          clonedLoadPromiseRef.current = createPromise();
-        }
-        loadDict({ ...mergedOptions, ...options }).then((map2) => {
-          var _a;
+      const createStateFromMap = (map = /* @__PURE__ */ new Map()) => {
+        const newObj = /* @__PURE__ */ Object.create(null);
+        const newList = [];
+        mapToObj(map, {
+          obj: newObj,
+          itemTransformer
+        });
+        mapToList(map, {
+          list: newList,
+          itemTransformer
+        });
+        const newE = Object.fromEntries(
+          Array.from(map.keys()).map((key) => {
+            var _a;
+            return [key, (_a = transformer == null ? void 0 : transformer(key)) != null ? _a : key];
+          })
+        );
+        const getItem = (value) => {
+          return value !== null && value !== void 0 ? newObj[value] : null;
+        };
+        return {
+          map: newObj,
+          list: newList,
+          E: newE,
+          getItem
+        };
+      };
+      const stateRef = react.useRef({
+        ...createStateFromMap(clonedMap),
+        clear: () => {
           if (!clone) {
-            maps[code] = map2;
+            maps[code] = /* @__PURE__ */ new Map();
             emitChange(code);
-          } else {
-            setClonedMap(map2);
+            return;
           }
-          stateRef.current = createStateFromMap(map2);
-          oldLoadPromise == null ? void 0 : oldLoadPromise.resolve(void 0);
+          setClonedMap(/* @__PURE__ */ new Map());
+        },
+        loadPromise: !clone ? globalLoadPromise : createPromise(),
+        async load(options) {
+          const oldLoadPromise = stateRef.current.loadPromise;
+          stateRef.current.loadPromise = createPromise();
           if (!clone) {
-            globalLoadPromise.resolve(void 0);
-          } else {
-            (_a = clonedLoadPromiseRef.current) == null ? void 0 : _a.resolve(void 0);
+            globalLoadPromise = stateRef.current.loadPromise;
           }
-        });
-        return !clone ? globalLoadPromise : clonedLoadPromiseRef.current;
-      }, []);
-      const clear2 = () => {
-        if (!clone) {
-          maps[code] = /* @__PURE__ */ new Map();
-          emitChange(code);
-          return;
+          loadDict({ ...mergedOptions, ...options }).then((map) => {
+            Object.assign(stateRef.current, createStateFromMap(map));
+            if (!clone) {
+              maps[code] = map;
+              emitChange(code);
+            } else {
+              setClonedMap(map);
+            }
+            oldLoadPromise == null ? void 0 : oldLoadPromise.resolve(void 0);
+            stateRef.current.loadPromise.resolve(void 0);
+          });
+          return stateRef.current.loadPromise;
         }
-        setClonedMap(/* @__PURE__ */ new Map());
-      };
+      });
+      if (!clone) {
+        Object.assign(stateRef.current, createStateFromMap(globalMap));
+      }
       react.useEffect(() => {
         if (remote && !immediate) {
           return;
         }
         if (clone) {
-          load();
+          stateRef.current.load();
         } else {
           if (!init) {
             init = true;
-            load();
+            stateRef.current.load();
           } else if (refresh) {
-            load();
+            stateRef.current.load();
           }
         }
       }, []);
       const ctx = react.useMemo(() => {
-        const value = {
-          ...state,
-          loadPromise,
-          load,
-          clear: clear2
-        };
         return {
-          ...value,
+          ...stateRef.current,
           // @ts-ignore
-          ...managerExtra == null ? void 0 : managerExtra(value),
+          ...managerExtra == null ? void 0 : managerExtra(stateRef.current),
           // @ts-ignore
-          ...extra == null ? void 0 : extra(value),
-          stateRef
+          ...extra == null ? void 0 : extra(stateRef.current),
+          ref: stateRef
         };
-      }, [state, loadPromise]);
+      }, [!clone ? globalMap : clonedMap]);
       return ctx;
     }
     useDict.extend = (extendCode2, extendOptions) => {

package/dist/react/index.js

@@ -1,6 +1,6 @@
 import { warn, isFunction, cloneDeep, createPromise, toMap, merge, mapToObj, mapToList } from '../chunk-E7KZBQBQ.js';
 export { defineDictData } from '../chunk-E7KZBQBQ.js';
-import { useRef, useSyncExternalStore, useState, useMemo, useCallback, useEffect } from 'react';
+import { useSyncExternalStore, useState, useRef, useEffect, useMemo } from 'react';
 
 function createDictManager(createDictManagerOptions = {}) {
   const {
@@ -78,33 +78,6 @@ function createDictManager(createDictManagerOptions = {}) {
     function getMapSnapshot() {
       return maps[code];
     }
-    const createStateFromMap = (map = /* @__PURE__ */ new Map()) => {
-      const newObj = /* @__PURE__ */ Object.create(null);
-      const newList = [];
-      mapToObj(map, {
-        obj: newObj,
-        itemTransformer
-      });
-      mapToList(map, {
-        list: newList,
-        itemTransformer
-      });
-      const newE = Object.fromEntries(
-        Array.from(map.keys()).map((key) => {
-          var _a;
-          return [key, (_a = transformer == null ? void 0 : transformer(key)) != null ? _a : key];
-        })
-      );
-      const getItem = (value) => {
-        return value !== null && value !== void 0 ? newObj[value] : null;
-      };
-      return {
-        map: newObj,
-        list: newList,
-        E: newE,
-        getItem
-      };
-    };
     function useDict(useDictOptions = {}) {
       const mergedOptions = {
         clone: false,
@@ -113,77 +86,94 @@ function createDictManager(createDictManagerOptions = {}) {
         ...useDictOptions
       };
       const { clone, immediate, refresh } = mergedOptions;
-      const stateRef = useRef(createStateFromMap());
-      const clonedLoadPromiseRef = useRef(null);
       const globalMap = useSyncExternalStore(subscribeMap, getMapSnapshot);
       const [clonedMap, setClonedMap] = useState(/* @__PURE__ */ new Map());
-      const loadPromise = !clone ? globalLoadPromise : clonedLoadPromiseRef.current;
-      const map = !clone ? globalMap : clonedMap;
-      const state = useMemo(() => createStateFromMap(map), [map]);
-      const load = useCallback((options) => {
-        const oldLoadPromise = loadPromise;
-        if (!clone) {
-          globalLoadPromise = createPromise();
-        } else {
-          clonedLoadPromiseRef.current = createPromise();
-        }
-        loadDict({ ...mergedOptions, ...options }).then((map2) => {
-          var _a;
+      const createStateFromMap = (map = /* @__PURE__ */ new Map()) => {
+        const newObj = /* @__PURE__ */ Object.create(null);
+        const newList = [];
+        mapToObj(map, {
+          obj: newObj,
+          itemTransformer
+        });
+        mapToList(map, {
+          list: newList,
+          itemTransformer
+        });
+        const newE = Object.fromEntries(
+          Array.from(map.keys()).map((key) => {
+            var _a;
+            return [key, (_a = transformer == null ? void 0 : transformer(key)) != null ? _a : key];
+          })
+        );
+        const getItem = (value) => {
+          return value !== null && value !== void 0 ? newObj[value] : null;
+        };
+        return {
+          map: newObj,
+          list: newList,
+          E: newE,
+          getItem
+        };
+      };
+      const stateRef = useRef({
+        ...createStateFromMap(clonedMap),
+        clear: () => {
           if (!clone) {
-            maps[code] = map2;
+            maps[code] = /* @__PURE__ */ new Map();
             emitChange(code);
-          } else {
-            setClonedMap(map2);
+            return;
           }
-          stateRef.current = createStateFromMap(map2);
-          oldLoadPromise == null ? void 0 : oldLoadPromise.resolve(void 0);
+          setClonedMap(/* @__PURE__ */ new Map());
+        },
+        loadPromise: !clone ? globalLoadPromise : createPromise(),
+        async load(options) {
+          const oldLoadPromise = stateRef.current.loadPromise;
+          stateRef.current.loadPromise = createPromise();
           if (!clone) {
-            globalLoadPromise.resolve(void 0);
-          } else {
-            (_a = clonedLoadPromiseRef.current) == null ? void 0 : _a.resolve(void 0);
+            globalLoadPromise = stateRef.current.loadPromise;
           }
-        });
-        return !clone ? globalLoadPromise : clonedLoadPromiseRef.current;
-      }, []);
-      const clear2 = () => {
-        if (!clone) {
-          maps[code] = /* @__PURE__ */ new Map();
-          emitChange(code);
-          return;
+          loadDict({ ...mergedOptions, ...options }).then((map) => {
+            Object.assign(stateRef.current, createStateFromMap(map));
+            if (!clone) {
+              maps[code] = map;
+              emitChange(code);
+            } else {
+              setClonedMap(map);
+            }
+            oldLoadPromise == null ? void 0 : oldLoadPromise.resolve(void 0);
+            stateRef.current.loadPromise.resolve(void 0);
+          });
+          return stateRef.current.loadPromise;
         }
-        setClonedMap(/* @__PURE__ */ new Map());
-      };
+      });
+      if (!clone) {
+        Object.assign(stateRef.current, createStateFromMap(globalMap));
+      }
       useEffect(() => {
         if (remote && !immediate) {
           return;
         }
         if (clone) {
-          load();
+          stateRef.current.load();
         } else {
           if (!init) {
             init = true;
-            load();
+            stateRef.current.load();
           } else if (refresh) {
-            load();
+            stateRef.current.load();
           }
         }
       }, []);
       const ctx = useMemo(() => {
-        const value = {
-          ...state,
-          loadPromise,
-          load,
-          clear: clear2
-        };
         return {
-          ...value,
+          ...stateRef.current,
           // @ts-ignore
-          ...managerExtra == null ? void 0 : managerExtra(value),
+          ...managerExtra == null ? void 0 : managerExtra(stateRef.current),
           // @ts-ignore
-          ...extra == null ? void 0 : extra(value),
-          stateRef
+          ...extra == null ? void 0 : extra(stateRef.current),
+          ref: stateRef
         };
-      }, [state, loadPromise]);
+      }, [!clone ? globalMap : clonedMap]);
       return ctx;
     }
     useDict.extend = (extendCode2, extendOptions) => {

package/dist/types/dict.d.ts

@@ -21,17 +21,8 @@ export type Dict<K extends PropertyKey = PropertyKey, I extends Recordable = Dic
     load: (options?: O) => LoadPromise;
     clear: () => void;
     getItem: (value?: I['value'] | Nil) => I | Nil;
-    stateRef?: {
-        current: {
-            list: I[];
-            E: {
-                [X in K]: X;
-            };
-            map: {
-                [X in K]: I;
-            };
-            getItem: (value?: I['value'] | Nil) => I | Nil;
-        };
+    ref?: {
+        current: Omit<Dict<K, I, O>, 'ref'>;
     };
 };
 export type Fetch = (code: string, options: Recordable) => MaybePromise<DictItemRecord[]>;

package/package.json

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