esoftplay 0.0.136-j → 0.0.136-l

package/global.ts

@@ -17,31 +17,19 @@ export interface useGlobalAutoSync {
   post: (item: any) => Object,
   isSyncing?: (isSync: boolean) => void
 }
-interface useGlobalOptionA {
-  persistKey?: string;
-  inFastStorage?: boolean;
-  inFile?: never; // Ensures inFile is not present in useGlobalOptionA
-  listener?: (data: any) => void;
-  useAutoSync?: useGlobalAutoSync;
-  jsonBeautify?: boolean;
-  isUserData?: boolean;
-  loadOnInit?: boolean;
-  onFinish?: () => void;
-}
 
-interface useGlobalOptionB {
-  persistKey?: string;
-  inFile?: boolean;
-  inFastStorage?: never; // Ensures inFastStorage is not present in useGlobalOptionB
-  listener?: (data: any) => void;
-  useAutoSync?: useGlobalAutoSync;
-  jsonBeautify?: boolean;
-  isUserData?: boolean;
-  loadOnInit?: boolean;
-  onFinish?: () => void;
+export interface useGlobalOption {
+  persistKey?: string,
+  inFile?: boolean,
+  inFastStorage?: boolean,
+  listener?: (data: any) => void,
+  useAutoSync?: useGlobalAutoSync,
+  jsonBeautify?: boolean,
+  isUserData?: boolean,
+  loadOnInit?: boolean,
+  onFinish?: () => void
 }
 
-export type useGlobalOption = useGlobalOptionA | useGlobalOptionB;
 export interface useGlobalConnect<T> {
   render: (props: T) => any,
 }
@@ -57,10 +45,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   let sync: any = undefined
 
   if (o?.persistKey) {
-    if (o?.inFastStorage == true) {
-      STORAGE = require('esoftplay/mmkv').default
-    } else
-      STORAGE = o?.inFile ? (require('esoftplay/storage').default) : (require('@react-native-async-storage/async-storage').default)
+    STORAGE = o?.inFastStorage ? require('esoftplay/mmkv').default : (o?.inFile ? (require('esoftplay/storage').default) : (require('@react-native-async-storage/async-storage').default))
     loaded = 0
     if (o?.loadOnInit)
       loadFromDisk()
@@ -182,7 +167,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
     set(initValue)
   }
 
-  async function useSelector(se: (state: T) => any): void {
+  function useSelector(se: (state: T) => any): void {
     loadFromDisk()
 
     let [l, s] = R.useState<any>(se(value));

package/mmkv.ts

@@ -9,7 +9,7 @@ const FastStorage = {
   setItem(key: string, value: string) {
     storage.set(key, value)
   },
-  async removeItem(key: string) {
+  removeItem(key: string) {
     storage.delete(key)
   },
   clear(): void {

package/modules/user/data.ts

@@ -1,6 +1,7 @@
 // noPage
 // withObject
 import AsyncStorage from '@react-native-async-storage/async-storage';
+import FastStorage from 'esoftplay/mmkv';
 import Storage from 'esoftplay/storage';
 
 export default {
@@ -28,6 +29,7 @@ export default {
       if (x) {
         const arx = JSON.parse(x)
         AsyncStorage.multiRemove(arx)
+        arx.forEach((ix) => { FastStorage.removeItem(ix) })
         arx.forEach((ix) => { Storage.removeItem(ix) })
       }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay",
-  "version": "0.0.136-j",
+  "version": "0.0.136-l",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",