esoftplay 0.0.119-r → 0.0.119-u

package/bin/router.js

@@ -385,7 +385,7 @@ import { AntDesignTypes, EntypoTypes, EvilIconsTypes, FeatherTypes, FontAwesomeT
 
 declare module "esoftplay" {
   var _global: any;
-  function useGlobalState<S>(initialState?: S, option?: useGlobalOption): useGlobalReturn<S>;
+  // function useGlobalState<S>(initialState?: S, option?: useGlobalOption): useGlobalReturn<S>;
   function usePersistState<S>(key: string, initialState?: S | (() => S)): [S, (a: S | ((b: S )=> S)) => S | undefined, (a?: (x: S) => void) => void, () => void];
   function useSafeState<S>(initialState?: S | (() => S)): [S, (a: S | ((b: S )=> S)) => S | undefined];
   function applyStyle<T>(style: T): T;

package/global.ts

@@ -1,4 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
+import { UserData } from 'esoftplay/cache/user/data.import';
 import * as R from 'react';
 import { fastFilter, fastLoop } from './fast';
 const _global = require('./_global')
@@ -25,21 +26,21 @@ export interface useGlobalConnect<T> {
 }
 
 _global.useGlobalUserDelete = {}
-let useGlobalSubscriber = {}
+let useGlobalSubscriber: any = {}
 
-class Context {
-  idx = 0
-  increment = () => this.idx++
-  reset = () => {
-    this.idx = 0
-  }
+let idx = 0
+const Context = {
+  reset: () => idx = 0
 }
 
-export const globalIdx = new Context()
+export const globalIdx = Context
 export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
   const Storage = require('./storage').default;
   const STORAGE = o?.inFile ? new Storage() : AsyncStorage
-  const _idx = globalIdx.idx
+  const _idx = idx
+  if (!useGlobalSubscriber) {
+    useGlobalSubscriber = {}
+  }
   if (!useGlobalSubscriber[_idx])
     useGlobalSubscriber[_idx] = [];
   let value: T = initValue;
@@ -67,8 +68,6 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
       set(initValue)
     }
     if (o?.persistKey) {
-      const esp = require('./esp').default;
-      const UserData = esp.mod('user/data')
       if (UserData)
         UserData?.register?.(o?.persistKey)
     }
@@ -157,6 +156,6 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
     return children ? R.cloneElement(children) : null
   }
 
-  globalIdx.increment()
+  idx++
   return { useState, get, set, useSelector, reset: del, connect: _connect };
 }

package/import_migrator.mjs

@@ -1,12 +1,13 @@
 import fs from 'fs'
 const pattern = new RegExp(/\n{0,}import ((.*)) from (?:"esoftplay"|'esoftplay');?/gs)
+const globalPattern = new RegExp(/((?:, useGlobalState|useGlobalState,|\{\s{0,}useGlobalState\s{0,}\}))/gs)
 if (fs.existsSync('./modules')) {
   fs.readdirSync('./modules').forEach((module) => {
     if (!module.startsWith('.')) {
       fs.readdirSync('./modules/' + module).forEach((task) => {
-        // if (task == 'card.tsx') {
         var dFile = fs.readFileSync('./modules/' + module + '/' + task, { encoding: 'utf8' })
         const matchs = dFile.match(pattern)
+        const matchGlobal = dFile.match(globalPattern)
         if (matchs) {
           let espMod = []
           let nonEspMod = []
@@ -33,11 +34,10 @@ if (fs.existsSync('./modules')) {
             })
           }
           dFile = dFile.replace(cmatch, "\nimport { " + espMod.join(", ") + " } from 'esoftplay';\n" + adder)
+          if (matchGlobal)
+            dFile = dFile.replace(matchGlobal, "\nimport useGlobalState from 'esoftplay/global';\n")
           fs.writeFileSync('./modules/' + module + '/' + task, dFile, { encoding: 'utf8' })
-          // }
-
         }
-        // return
       })
     }
   })

package/modules/lib/dialog.tsx

@@ -1,12 +1,10 @@
 // noPage
-import { useGlobalState } from 'esoftplay';
-
 import { LibComponent } from 'esoftplay/cache/lib/component.import';
-import { LibIcon } from 'esoftplay/cache/lib/icon.import';
-import { LibIconStyle } from 'esoftplay/cache/lib/icon.import';
+import { LibIcon, LibIconStyle } from 'esoftplay/cache/lib/icon.import';
 import { LibStyle } from 'esoftplay/cache/lib/style.import';
 import { LibTextstyle } from 'esoftplay/cache/lib/textstyle.import';
 import { LibTheme } from 'esoftplay/cache/lib/theme.import';
+import useGlobalState from 'esoftplay/global';
 
 import React from 'react';
 import { BackHandler, Keyboard, TouchableOpacity, View } from 'react-native';

package/modules/lib/image.tsx

@@ -1,12 +1,12 @@
 // noPage
-import { esp, useGlobalState } from 'esoftplay';
+import { esp } from 'esoftplay';
 import { LibComponent } from 'esoftplay/cache/lib/component.import';
 import { LibCurl } from 'esoftplay/cache/lib/curl.import';
 import { LibIcon } from 'esoftplay/cache/lib/icon.import';
 import { LibNavigation } from 'esoftplay/cache/lib/navigation.import';
 import { LibProgress } from 'esoftplay/cache/lib/progress.import';
 import { LibStyle } from 'esoftplay/cache/lib/style.import';
-
+import useGlobalState from 'esoftplay/global';
 import { Camera } from 'expo-camera';
 import * as ImageManipulator from 'expo-image-manipulator';
 import { SaveFormat } from 'expo-image-manipulator';

package/modules/lib/locale.ts

@@ -1,6 +1,7 @@
 // noPage
-import { useGlobalReturn, useGlobalState } from 'esoftplay';
+import { useGlobalReturn } from 'esoftplay';
 import { LibNavigation } from 'esoftplay/cache/lib/navigation.import';
+import useGlobalState from 'esoftplay/global';
 
 
 

package/modules/lib/net_status.tsx

@@ -1,6 +1,7 @@
 // noPage
-import { useGlobalReturn, useGlobalState } from 'esoftplay';
+import { useGlobalReturn } from 'esoftplay';
 import { LibComponent } from 'esoftplay/cache/lib/component.import';
+import useGlobalState from 'esoftplay/global';
 
 import React from "react";
 import { Animated, Text } from "react-native";

package/modules/lib/notification.ts

@@ -2,13 +2,14 @@
 import { useGlobalReturn } from 'esoftplay';
 // noPage
 
-import { esp, useGlobalState } from 'esoftplay';
+import { esp } from 'esoftplay';
 import { LibCrypt } from 'esoftplay/cache/lib/crypt.import';
 import { LibCurl } from 'esoftplay/cache/lib/curl.import';
 import { LibNavigation } from 'esoftplay/cache/lib/navigation.import';
 import { LibObject } from 'esoftplay/cache/lib/object.import';
 import { UserClass } from 'esoftplay/cache/user/class.import';
 import { UserNotification } from 'esoftplay/cache/user/notification.import';
+import useGlobalState from 'esoftplay/global';
 
 import { fastFilter } from "esoftplay/fast";
 import Constants from 'expo-constants';

package/modules/lib/notify.ts

@@ -1,7 +1,7 @@
 // useLibs
-import { useGlobalState } from 'esoftplay';
 import { LibCrypt } from 'esoftplay/cache/lib/crypt.import';
 import { LibObject } from 'esoftplay/cache/lib/object.import';
+import useGlobalState from 'esoftplay/global';
 
 
 export interface LibNotifyItem {

package/modules/lib/progress.tsx

@@ -1,9 +1,9 @@
 // noPage
-import { useGlobalState } from 'esoftplay';
 import { LibComponent } from 'esoftplay/cache/lib/component.import';
 import { LibStyle } from 'esoftplay/cache/lib/style.import';
 import { LibTextstyle } from 'esoftplay/cache/lib/textstyle.import';
 import { LibTheme } from 'esoftplay/cache/lib/theme.import';
+import useGlobalState from 'esoftplay/global';
 
 import React from 'react';
 import { ActivityIndicator, BackHandler, View } from 'react-native';

package/modules/lib/theme.tsx

@@ -1,7 +1,8 @@
 // noPage
-import { esp, useGlobalState } from 'esoftplay';
+import { esp } from 'esoftplay';
 import { LibNavigation } from 'esoftplay/cache/lib/navigation.import';
 import { LibStyle } from 'esoftplay/cache/lib/style.import';
+import useGlobalState from 'esoftplay/global';
 
 import AsyncStorage from '@react-native-async-storage/async-storage';
 const { colorPrimary, colorAccent } = LibStyle

package/modules/lib/toast.tsx

@@ -1,8 +1,7 @@
 // withHooks
 // noPage
-import { useGlobalState } from 'esoftplay';
 import { LibStyle } from 'esoftplay/cache/lib/style.import';
-
+import useGlobalState from 'esoftplay/global';
 import React, { useEffect } from 'react';
 import { Text } from 'react-native';
 import Animated, { interpolate, useAnimatedProps, useSharedValue, withTiming } from 'react-native-reanimated';

package/modules/lib/utils.ts

@@ -1,7 +1,8 @@
 // noPage
-import { esp, useGlobalState } from 'esoftplay';
+import { esp } from 'esoftplay';
 import { LibToastProperty } from 'esoftplay/cache/lib/toast.import';
 import { fastFilter, fastLoop } from 'esoftplay/fast';
+import useGlobalState from 'esoftplay/global';
 import moment from "esoftplay/moment";
 import * as Application from 'expo-application';
 import * as Clipboard from 'expo-clipboard';

package/modules/user/class.ts

@@ -7,10 +7,10 @@ import { LibNotification } from 'esoftplay/cache/lib/notification.import';
 import { UserClass } from 'esoftplay/cache/user/class.import';
 import { UserData } from 'esoftplay/cache/user/data.import';
 
+import useGlobalState from 'esoftplay/global';
 import Constants from 'expo-constants';
 import * as Notifications from 'expo-notifications';
 import { Platform } from 'react-native';
-import useGlobalState from '../../global';
 import moment from "../../moment";
 
 const state = useGlobalState?.(null, { persistKey: "user" })

package/modules/user/index.tsx

@@ -1,6 +1,6 @@
 // withHooks
 // noPage
-import { esp, useSafeState } from 'esoftplay';
+import { esp, useSafeState, _global } from 'esoftplay';
 import { LibDialog } from 'esoftplay/cache/lib/dialog.import';
 import { LibImage } from 'esoftplay/cache/lib/image.import';
 import { LibNet_status } from 'esoftplay/cache/lib/net_status.import';

package/modules/user/notification.tsx

@@ -1,5 +1,5 @@
 //
-import { useGlobalReturn, useGlobalState } from 'esoftplay';
+import { useGlobalReturn } from 'esoftplay';
 import { LibComponent } from 'esoftplay/cache/lib/component.import';
 import { LibIcon } from 'esoftplay/cache/lib/icon.import';
 import { LibList } from 'esoftplay/cache/lib/list.import';
@@ -7,6 +7,7 @@ import { LibNotification } from 'esoftplay/cache/lib/notification.import';
 import { LibStatusbar } from 'esoftplay/cache/lib/statusbar.import';
 import { LibStyle } from 'esoftplay/cache/lib/style.import';
 import { UserNotification_item } from 'esoftplay/cache/user/notification_item.import';
+import useGlobalState from 'esoftplay/global';
 
 import { Pressable, Text, TouchableOpacity, View } from "react-native";
 //@ts-ignore

package/modules/user/routes.ts

@@ -1,6 +1,6 @@
 // noPage
-import { useGlobalReturn, useGlobalState } from 'esoftplay';
-
+import { useGlobalReturn } from 'esoftplay';
+import useGlobalState from 'esoftplay/global';
 
 const state = useGlobalState(undefined)
 

package/package.json

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