@pancakeswap/token-lists 0.0.2 → 0.0.4

package/.turbo/turbo-build.log

@@ -8,15 +8,15 @@ $ tsup
 ESM Build start
 CJS Build start
 ESM dist/index.mjs                 208.00 B
-ESM dist/react.mjs                 7.70 KB
+ESM dist/react.mjs                 8.17 KB
 ESM dist/chunk-YBVZDUCZ.mjs        1.92 KB
 ESM dist/getTokenList-T45DK2AY.mjs 13.04 KB
-ESM ⚡️ Build success in 111ms
+ESM ⚡️ Build success in 118ms
 CJS dist/index.js 3.11 KB
-CJS dist/react.js 25.22 KB
-CJS ⚡️ Build success in 104ms
+CJS dist/react.js 25.75 KB
+CJS ⚡️ Build success in 116ms
 DTS Build start
-DTS ⚡️ Build success in 9781ms
+DTS ⚡️ Build success in 9485ms
 DTS dist/index.d.ts          1.54 KB
-DTS dist/react.d.ts          2.63 KB
+DTS dist/react.d.ts          2.51 KB
 DTS dist/types-b620c9be.d.ts 1.03 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pancakeswap/token-lists
 
+## 0.0.4
+
+### Patch Changes
+
+- 5dda2c74f: Fix duplicate active list url issue
+
+## 0.0.3
+
+### Patch Changes
+
+- 64dbde8e2: Fix token list getting from indexeddb not updating when version bump
+
 ## 0.0.2
 
 ### Patch Changes

package/dist/react.d.ts

@@ -3,7 +3,6 @@ import { a as TokenList, V as Version } from './types-b620c9be.js';
 import * as _reduxjs_toolkit from '@reduxjs/toolkit';
 import { ActionCreatorWithPayload } from '@reduxjs/toolkit';
 import * as jotai from 'jotai';
-import * as jotai_utils from 'jotai/utils';
 
 interface ListsState {
     readonly byUrl: {
@@ -46,8 +45,9 @@ declare const rejectVersionUpdate: ActionCreatorWithPayload<Version, string>;
 declare const updateListVersion: _reduxjs_toolkit.ActionCreatorWithoutPayload<"lists/updateListVersion">;
 
 declare const createListsAtom: (storeName: string, reducer: any, initialState: any) => {
-    listsAtom: jotai.WritableAtom<ListsState, ListsState | typeof jotai_utils.RESET | ((prev: ListsState) => ListsState | typeof jotai_utils.RESET), Promise<void>>;
-    useListState: () => [ListsState, (action?: unknown) => void];
+    listsAtom: jotai.WritableAtom<ListsState, any, void>;
+    useListStateReady: () => boolean;
+    useListState: () => [ListsState, (update?: any) => void];
 };
 
 declare function useFetchListCallback(dispatch: (action?: unknown) => void): (listUrl: string, sendDispatch?: boolean) => Promise<TokenList>;

package/dist/react.js

@@ -571,7 +571,7 @@ var createTokenListReducer = (initialState, DEFAULT_LIST_OF_LISTS, DEFAULT_ACTIV
       error: null
     };
   }).addCase(fetchTokenList.fulfilled, (state, { payload: { requestId, tokenList, url } }) => {
-    var _a, _b, _c;
+    var _a, _b;
     const current = (_a = state.byUrl[url]) == null ? void 0 : _a.current;
     const loadingRequestId = (_b = state.byUrl[url]) == null ? void 0 : _b.loadingRequestId;
     if (current) {
@@ -588,8 +588,8 @@ var createTokenListReducer = (initialState, DEFAULT_LIST_OF_LISTS, DEFAULT_ACTIV
         };
       }
     } else {
-      if (DEFAULT_ACTIVE_LIST_URLS.includes(url)) {
-        (_c = state.activeListUrls) == null ? void 0 : _c.push(url);
+      if (DEFAULT_ACTIVE_LIST_URLS.includes(url) && state.activeListUrls && !state.activeListUrls.includes(url)) {
+        state.activeListUrls.push(url);
       }
       state.byUrl[url] = {
         ...state.byUrl[url],
@@ -681,6 +681,7 @@ var createTokenListReducer = (initialState, DEFAULT_LIST_OF_LISTS, DEFAULT_ACTIV
 );
 
 // react/lists.ts
+var import_jotai = require("jotai");
 var import_utils = require("jotai/utils");
 var import_localforage = __toESM(require("localforage"));
 function noop() {
@@ -692,8 +693,8 @@ var noopStorage = {
   keys: [],
   getAllKeys: noop
 };
+var EMPTY = Symbol();
 var createListsAtom = (storeName, reducer, initialState) => {
-  let gotOnce = false;
   function IndexedDBStorage(dbName) {
     if (typeof window !== "undefined") {
       const db = import_localforage.default.createInstance({
@@ -704,17 +705,15 @@ var createListsAtom = (storeName, reducer, initialState) => {
         db,
         getItem: async (key) => {
           const value = await db.getItem(key);
-          gotOnce = true;
           if (value) {
             return value;
           }
           return initialState;
         },
         setItem: (k, v) => {
-          if (gotOnce) {
-            return db.setItem(k, v);
-          }
-          return void 0;
+          if (v === EMPTY)
+            return;
+          return db.setItem(k, v);
         },
         removeItem: db.removeItem,
         delayInit: true
@@ -722,16 +721,33 @@ var createListsAtom = (storeName, reducer, initialState) => {
     }
     return noopStorage;
   }
-  const listsAtom = (0, import_utils.atomWithStorage)(
+  const listsStorageAtom = (0, import_utils.atomWithStorage)(
     "lists",
-    initialState,
+    EMPTY,
     IndexedDBStorage("lists")
   );
+  const defaultStateAtom = (0, import_jotai.atom)(
+    (get) => {
+      const got = get(listsStorageAtom);
+      if (got === EMPTY) {
+        return initialState;
+      }
+      return got;
+    },
+    (get, set, action) => {
+      set(listsStorageAtom, reducer(get(defaultStateAtom), action));
+    }
+  );
+  const isReadyAtom = (0, import_jotai.atom)((get) => get(listsStorageAtom) !== EMPTY);
   function useListState() {
-    return (0, import_utils.useReducerAtom)(listsAtom, reducer);
+    return (0, import_jotai.useAtom)(defaultStateAtom);
+  }
+  function useListStateReady() {
+    return (0, import_jotai.useAtomValue)(isReadyAtom);
   }
   return {
-    listsAtom,
+    listsAtom: defaultStateAtom,
+    useListStateReady,
     useListState
   };
 };

package/dist/react.mjs

@@ -40,7 +40,7 @@ var createTokenListReducer = (initialState, DEFAULT_LIST_OF_LISTS, DEFAULT_ACTIV
       error: null
     };
   }).addCase(fetchTokenList.fulfilled, (state, { payload: { requestId, tokenList, url } }) => {
-    var _a, _b, _c;
+    var _a, _b;
     const current = (_a = state.byUrl[url]) == null ? void 0 : _a.current;
     const loadingRequestId = (_b = state.byUrl[url]) == null ? void 0 : _b.loadingRequestId;
     if (current) {
@@ -57,8 +57,8 @@ var createTokenListReducer = (initialState, DEFAULT_LIST_OF_LISTS, DEFAULT_ACTIV
         };
       }
     } else {
-      if (DEFAULT_ACTIVE_LIST_URLS.includes(url)) {
-        (_c = state.activeListUrls) == null ? void 0 : _c.push(url);
+      if (DEFAULT_ACTIVE_LIST_URLS.includes(url) && state.activeListUrls && !state.activeListUrls.includes(url)) {
+        state.activeListUrls.push(url);
       }
       state.byUrl[url] = {
         ...state.byUrl[url],
@@ -150,7 +150,8 @@ var createTokenListReducer = (initialState, DEFAULT_LIST_OF_LISTS, DEFAULT_ACTIV
 );
 
 // react/lists.ts
-import { atomWithStorage, useReducerAtom } from "jotai/utils";
+import { atom, useAtom, useAtomValue } from "jotai";
+import { atomWithStorage } from "jotai/utils";
 import localForage from "localforage";
 function noop() {
 }
@@ -161,8 +162,8 @@ var noopStorage = {
   keys: [],
   getAllKeys: noop
 };
+var EMPTY = Symbol();
 var createListsAtom = (storeName, reducer, initialState) => {
-  let gotOnce = false;
   function IndexedDBStorage(dbName) {
     if (typeof window !== "undefined") {
       const db = localForage.createInstance({
@@ -173,17 +174,15 @@ var createListsAtom = (storeName, reducer, initialState) => {
         db,
         getItem: async (key) => {
           const value = await db.getItem(key);
-          gotOnce = true;
           if (value) {
             return value;
           }
           return initialState;
         },
         setItem: (k, v) => {
-          if (gotOnce) {
-            return db.setItem(k, v);
-          }
-          return void 0;
+          if (v === EMPTY)
+            return;
+          return db.setItem(k, v);
         },
         removeItem: db.removeItem,
         delayInit: true
@@ -191,16 +190,33 @@ var createListsAtom = (storeName, reducer, initialState) => {
     }
     return noopStorage;
   }
-  const listsAtom = atomWithStorage(
+  const listsStorageAtom = atomWithStorage(
     "lists",
-    initialState,
+    EMPTY,
     IndexedDBStorage("lists")
   );
+  const defaultStateAtom = atom(
+    (get) => {
+      const got = get(listsStorageAtom);
+      if (got === EMPTY) {
+        return initialState;
+      }
+      return got;
+    },
+    (get, set, action) => {
+      set(listsStorageAtom, reducer(get(defaultStateAtom), action));
+    }
+  );
+  const isReadyAtom = atom((get) => get(listsStorageAtom) !== EMPTY);
   function useListState() {
-    return useReducerAtom(listsAtom, reducer);
+    return useAtom(defaultStateAtom);
+  }
+  function useListStateReady() {
+    return useAtomValue(isReadyAtom);
   }
   return {
-    listsAtom,
+    listsAtom: defaultStateAtom,
+    useListStateReady,
     useListState
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pancakeswap/token-lists",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "sideEffects": false,
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -17,13 +17,13 @@
     "@pancakeswap/swap-sdk-core": "*"
   },
   "peerDependencies": {
-    "@reduxjs/toolkit": "^1.8.6",
+    "@reduxjs/toolkit": "^1.9.1",
     "localforage": "^1.10.0",
-    "jotai": "^1.8.6",
+    "jotai": "^1.11.1",
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@reduxjs/toolkit": "^1.8.6",
+    "@reduxjs/toolkit": "^1.9.1",
     "react": "^18.2.0"
   },
   "exports": {

package/react/lists.ts

@@ -1,4 +1,5 @@
-import { atomWithStorage, useReducerAtom } from 'jotai/utils'
+import { atom, useAtom, useAtomValue } from 'jotai'
+import { atomWithStorage } from 'jotai/utils'
 import localForage from 'localforage'
 import { ListsState } from './reducer'
 
@@ -12,8 +13,10 @@ const noopStorage = {
   getAllKeys: noop,
 }
 
+// eslint-disable-next-line symbol-description
+const EMPTY = Symbol()
+
 export const createListsAtom = (storeName: string, reducer: any, initialState: any) => {
-  let gotOnce = false
   /**
    * Persist you redux state using IndexedDB
    * @param {string} dbName - IndexedDB database name
@@ -28,17 +31,15 @@ export const createListsAtom = (storeName: string, reducer: any, initialState: a
         db,
         getItem: async (key: string) => {
           const value = await db.getItem(key)
-          gotOnce = true
           if (value) {
             return value
           }
           return initialState
         },
         setItem: (k: string, v: any) => {
-          if (gotOnce) {
-            return db.setItem(k, v)
-          }
-          return undefined
+          if (v === EMPTY) return
+          // eslint-disable-next-line consistent-return
+          return db.setItem(k, v)
         },
         removeItem: db.removeItem,
         delayInit: true,
@@ -47,19 +48,39 @@ export const createListsAtom = (storeName: string, reducer: any, initialState: a
     return noopStorage
   }
 
-  const listsAtom = atomWithStorage<ListsState>(
+  const listsStorageAtom = atomWithStorage<ListsState | typeof EMPTY>(
     'lists',
-    initialState,
+    EMPTY,
     // @ts-ignore
     IndexedDBStorage('lists'),
   )
 
+  const defaultStateAtom = atom<ListsState, any>(
+    (get) => {
+      const got = get(listsStorageAtom)
+      if (got === EMPTY) {
+        return initialState
+      }
+      return got
+    },
+    (get, set, action) => {
+      set(listsStorageAtom, reducer(get(defaultStateAtom), action))
+    },
+  )
+
+  const isReadyAtom = atom((get) => get(listsStorageAtom) !== EMPTY)
+
   function useListState() {
-    return useReducerAtom(listsAtom, reducer)
+    return useAtom(defaultStateAtom)
+  }
+
+  function useListStateReady() {
+    return useAtomValue(isReadyAtom)
   }
 
   return {
-    listsAtom,
+    listsAtom: defaultStateAtom,
+    useListStateReady,
     useListState,
   }
 }

package/react/reducer.ts

@@ -74,8 +74,8 @@ export const createTokenListReducer = (
           }
         } else {
           // activate if on default active
-          if (DEFAULT_ACTIVE_LIST_URLS.includes(url)) {
-            state.activeListUrls?.push(url)
+          if (DEFAULT_ACTIVE_LIST_URLS.includes(url) && state.activeListUrls && !state.activeListUrls.includes(url)) {
+            state.activeListUrls.push(url)
           }
 
           state.byUrl[url] = {