v-dict 2.0.0 → 2.0.2

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

@@ -12,10 +12,9 @@ function mapToObj(map, {
   obj = {},
   itemTransformer
 } = {}) {
-  var _a;
   clearObj(obj);
   for (const [key, value] of map) {
-    obj[key] = (_a = itemTransformer == null ? void 0 : itemTransformer(value)) != null ? _a : value;
+    obj[key] = isFunction(itemTransformer) ? itemTransformer(value) : value;
   }
   return obj;
 }

package/dist/index.cjs

@@ -38,10 +38,9 @@ function mapToObj(map, {
   obj = {},
   itemTransformer
 } = {}) {
-  var _a;
   clearObj(obj);
   for (const [key, value] of map) {
-    obj[key] = (_a = itemTransformer == null ? void 0 : itemTransformer(value)) != null ? _a : value;
+    obj[key] = isFunction(itemTransformer) ? itemTransformer(value) : value;
   }
   return obj;
 }

package/dist/index.js

@@ -1,5 +1,5 @@
-import { warn, isFunction, cloneDeep, createPromise, mapToObj, mapToList, toMap, merge } from './chunk-SXX4ZFIR.js';
-export { defineDictData } from './chunk-SXX4ZFIR.js';
+import { warn, isFunction, cloneDeep, createPromise, mapToObj, mapToList, toMap, merge } from './chunk-E7KZBQBQ.js';
+export { defineDictData } from './chunk-E7KZBQBQ.js';
 import { reactive, readonly, shallowRef, toRef, ref, watch, computed } from 'vue';
 
 function createDictManager(createDictManagerOptions = {}) {

package/dist/react/index.cjs

@@ -38,10 +38,9 @@ function mapToObj(map, {
   obj = {},
   itemTransformer
 } = {}) {
-  var _a;
   clearObj(obj);
   for (const [key, value] of map) {
-    obj[key] = (_a = itemTransformer == null ? void 0 : itemTransformer(value)) != null ? _a : value;
+    obj[key] = isFunction(itemTransformer) ? itemTransformer(value) : value;
   }
   return obj;
 }
@@ -141,14 +140,22 @@ function createDictManager(createDictManagerOptions = {}) {
   } = createDictManagerOptions;
   const defineDictOptionsMap = /* @__PURE__ */ new Map();
   const maps = /* @__PURE__ */ Object.create(null);
-  const versionMap = /* @__PURE__ */ Object.create(null);
+  const listenersMap = /* @__PURE__ */ Object.create(null);
+  function emitChange(code) {
+    var _a;
+    const listeners = code ? (_a = listenersMap[code]) != null ? _a : [] : Object.values(listenersMap).flat();
+    for (let listener of listeners) {
+      listener();
+    }
+  }
   function clear(code) {
     var _a;
     if (code) {
       (_a = maps[code]) == null ? void 0 : _a.clear();
-      return;
+    } else {
+      Object.values(maps).forEach((map) => map == null ? void 0 : map.clear());
     }
-    Object.values(maps).forEach((map) => map.clear());
+    emitChange(code);
   }
   function _defineDict(defineDictInternalOptions, code, defineDictOptions) {
     const { pickValues, omitValues, extendCode } = defineDictInternalOptions;
@@ -156,7 +163,6 @@ function createDictManager(createDictManagerOptions = {}) {
       warn(`code "${code}" already exists`);
     } else {
       maps[code] = /* @__PURE__ */ new Map();
-      versionMap[code] = 0;
     }
     const _defineDictOptions = Object.assign(
       {
@@ -172,23 +178,56 @@ function createDictManager(createDictManagerOptions = {}) {
     const { data, remote, fetch, extra, transformer, itemTransformer } = _defineDictOptions;
     let globalLoadPromise = null;
     let init = false;
-    async function loadDict(options, mapRef) {
+    async function loadDict(options, map = /* @__PURE__ */ new Map()) {
       var _a;
       if (remote) {
         const res = (_a = await (fetch == null ? void 0 : fetch(extendCode != null ? extendCode : code, options))) != null ? _a : [];
-        toMap(res, { pickValues, omitValues, transformer, map: mapRef.current });
+        toMap(res, { pickValues, omitValues, transformer, map });
         toMap(cloneDeep(data), { pickValues, omitValues, transformer }).forEach(
           (value, key) => {
-            if (mapRef.current.has(key)) {
-              merge(mapRef.current.get(key), value);
+            if (map.has(key)) {
+              merge(map.get(key), value);
             }
           }
         );
       } else {
-        toMap(cloneDeep(data), { pickValues, omitValues, transformer, map: mapRef.current });
+        toMap(cloneDeep(data), { pickValues, omitValues, transformer, map });
       }
-      versionMap[code] += 1;
+      return map;
     }
+    function subscribeMap(listener) {
+      var _a;
+      listenersMap[code] = [...(_a = listenersMap[code]) != null ? _a : [], listener];
+      return () => {
+        listenersMap[code] = listenersMap[code].filter((l) => l !== listener);
+      };
+    }
+    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];
+        })
+      );
+      return {
+        map: newObj,
+        list: newList,
+        E: newE
+      };
+    };
     function useDict(useDictOptions = {}) {
       const mergedOptions = {
         clone: false,
@@ -200,52 +239,37 @@ function createDictManager(createDictManagerOptions = {}) {
       const loadPromiseRef = react.useRef(
         !clone ? globalLoadPromise : createPromise()
       );
-      const mapRef = react.useRef(!clone ? maps[code] : /* @__PURE__ */ new Map());
-      const versionRef = react.useRef(0);
-      const getStateFromMapRef = () => {
-        const newObj = /* @__PURE__ */ Object.create(null);
-        const newList = [];
-        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
-        };
-      };
-      const [state, setState] = react.useState(getStateFromMapRef());
-      if (versionRef.current !== versionMap[code]) {
-        versionRef.current = versionMap[code];
-        setState(getStateFromMapRef());
-      }
+      const map = react.useSyncExternalStore(subscribeMap, getMapSnapshot);
+      const [clonedMap, setClonedMap] = react.useState(/* @__PURE__ */ new Map());
+      const state = react.useMemo(
+        () => createStateFromMap(!clone ? map : clonedMap),
+        [clone, map, clonedMap]
+      );
       const load = react.useCallback((options) => {
         const oldLoadPromise = loadPromiseRef.current;
         loadPromiseRef.current = createPromise();
-        loadDict({ ...mergedOptions, ...options }, mapRef).then(() => {
-          setState(getStateFromMapRef());
+        loadDict({ ...mergedOptions, ...options }).then((map2) => {
+          if (!clone) {
+            maps[code] = map2;
+            emitChange(code);
+          } else {
+            setClonedMap(map2);
+          }
           oldLoadPromise == null ? void 0 : oldLoadPromise.resolve(void 0);
           loadPromiseRef.current.resolve(void 0);
         });
         return loadPromiseRef.current;
       }, []);
       const clear2 = react.useCallback(() => {
-        mapRef.current.clear();
-        setState(getStateFromMapRef());
+        if (!clone) {
+          maps[code] = /* @__PURE__ */ new Map();
+          emitChange(code);
+          return;
+        }
+        setClonedMap(map);
       }, []);
       const getItem = react.useCallback((value) => {
-        return value !== null && value !== void 0 ? mapRef.current.get(value) : null;
+        return value !== null && value !== void 0 ? state.map[value] : null;
       }, []);
       react.useEffect(() => {
         if (!remote || immediate) {
@@ -290,7 +314,7 @@ function createDictManager(createDictManagerOptions = {}) {
           // @ts-ignore
           ...extra == null ? void 0 : extra(_ctx)
         };
-      }, [state]);
+      }, [state, loadPromiseRef.current]);
       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-SXX4ZFIR.js';
-export { defineDictData } from '../chunk-SXX4ZFIR.js';
-import { useRef, useState, useCallback, useEffect, useMemo } from 'react';
+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';
 
 function createDictManager(createDictManagerOptions = {}) {
   const {
@@ -11,14 +11,22 @@ function createDictManager(createDictManagerOptions = {}) {
   } = createDictManagerOptions;
   const defineDictOptionsMap = /* @__PURE__ */ new Map();
   const maps = /* @__PURE__ */ Object.create(null);
-  const versionMap = /* @__PURE__ */ Object.create(null);
+  const listenersMap = /* @__PURE__ */ Object.create(null);
+  function emitChange(code) {
+    var _a;
+    const listeners = code ? (_a = listenersMap[code]) != null ? _a : [] : Object.values(listenersMap).flat();
+    for (let listener of listeners) {
+      listener();
+    }
+  }
   function clear(code) {
     var _a;
     if (code) {
       (_a = maps[code]) == null ? void 0 : _a.clear();
-      return;
+    } else {
+      Object.values(maps).forEach((map) => map == null ? void 0 : map.clear());
     }
-    Object.values(maps).forEach((map) => map.clear());
+    emitChange(code);
   }
   function _defineDict(defineDictInternalOptions, code, defineDictOptions) {
     const { pickValues, omitValues, extendCode } = defineDictInternalOptions;
@@ -26,7 +34,6 @@ function createDictManager(createDictManagerOptions = {}) {
       warn(`code "${code}" already exists`);
     } else {
       maps[code] = /* @__PURE__ */ new Map();
-      versionMap[code] = 0;
     }
     const _defineDictOptions = Object.assign(
       {
@@ -42,23 +49,56 @@ function createDictManager(createDictManagerOptions = {}) {
     const { data, remote, fetch, extra, transformer, itemTransformer } = _defineDictOptions;
     let globalLoadPromise = null;
     let init = false;
-    async function loadDict(options, mapRef) {
+    async function loadDict(options, map = /* @__PURE__ */ new Map()) {
       var _a;
       if (remote) {
         const res = (_a = await (fetch == null ? void 0 : fetch(extendCode != null ? extendCode : code, options))) != null ? _a : [];
-        toMap(res, { pickValues, omitValues, transformer, map: mapRef.current });
+        toMap(res, { pickValues, omitValues, transformer, map });
         toMap(cloneDeep(data), { pickValues, omitValues, transformer }).forEach(
           (value, key) => {
-            if (mapRef.current.has(key)) {
-              merge(mapRef.current.get(key), value);
+            if (map.has(key)) {
+              merge(map.get(key), value);
             }
           }
         );
       } else {
-        toMap(cloneDeep(data), { pickValues, omitValues, transformer, map: mapRef.current });
+        toMap(cloneDeep(data), { pickValues, omitValues, transformer, map });
       }
-      versionMap[code] += 1;
+      return map;
     }
+    function subscribeMap(listener) {
+      var _a;
+      listenersMap[code] = [...(_a = listenersMap[code]) != null ? _a : [], listener];
+      return () => {
+        listenersMap[code] = listenersMap[code].filter((l) => l !== listener);
+      };
+    }
+    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];
+        })
+      );
+      return {
+        map: newObj,
+        list: newList,
+        E: newE
+      };
+    };
     function useDict(useDictOptions = {}) {
       const mergedOptions = {
         clone: false,
@@ -70,52 +110,37 @@ function createDictManager(createDictManagerOptions = {}) {
       const loadPromiseRef = useRef(
         !clone ? globalLoadPromise : createPromise()
       );
-      const mapRef = useRef(!clone ? maps[code] : /* @__PURE__ */ new Map());
-      const versionRef = useRef(0);
-      const getStateFromMapRef = () => {
-        const newObj = /* @__PURE__ */ Object.create(null);
-        const newList = [];
-        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
-        };
-      };
-      const [state, setState] = useState(getStateFromMapRef());
-      if (versionRef.current !== versionMap[code]) {
-        versionRef.current = versionMap[code];
-        setState(getStateFromMapRef());
-      }
+      const map = useSyncExternalStore(subscribeMap, getMapSnapshot);
+      const [clonedMap, setClonedMap] = useState(/* @__PURE__ */ new Map());
+      const state = useMemo(
+        () => createStateFromMap(!clone ? map : clonedMap),
+        [clone, map, clonedMap]
+      );
       const load = useCallback((options) => {
         const oldLoadPromise = loadPromiseRef.current;
         loadPromiseRef.current = createPromise();
-        loadDict({ ...mergedOptions, ...options }, mapRef).then(() => {
-          setState(getStateFromMapRef());
+        loadDict({ ...mergedOptions, ...options }).then((map2) => {
+          if (!clone) {
+            maps[code] = map2;
+            emitChange(code);
+          } else {
+            setClonedMap(map2);
+          }
           oldLoadPromise == null ? void 0 : oldLoadPromise.resolve(void 0);
           loadPromiseRef.current.resolve(void 0);
         });
         return loadPromiseRef.current;
       }, []);
       const clear2 = useCallback(() => {
-        mapRef.current.clear();
-        setState(getStateFromMapRef());
+        if (!clone) {
+          maps[code] = /* @__PURE__ */ new Map();
+          emitChange(code);
+          return;
+        }
+        setClonedMap(map);
       }, []);
       const getItem = useCallback((value) => {
-        return value !== null && value !== void 0 ? mapRef.current.get(value) : null;
+        return value !== null && value !== void 0 ? state.map[value] : null;
       }, []);
       useEffect(() => {
         if (!remote || immediate) {
@@ -160,7 +185,7 @@ function createDictManager(createDictManagerOptions = {}) {
           // @ts-ignore
           ...extra == null ? void 0 : extra(_ctx)
         };
-      }, [state]);
+      }, [state, loadPromiseRef.current]);
       return ctx;
     }
     useDict.extend = (extendCode2, extendOptions) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "v-dict",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "type": "module",
   "description": "Vue3 & React Dict Manager",
   "repository": {
@@ -48,8 +48,8 @@
   "dependencies": {},
   "peerDependencies": {
     "vue": "^3.0.0",
-    "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+    "react": ">=16.8.0",
+    "react-dom": ">=16.8.0"
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.1",