esoftplay 0.0.119-b → 0.0.119-e

package/bin/router.js

@@ -239,7 +239,7 @@ checks.forEach(modules => {
                       tmpTask[clsName]["class"] = m[1].replace(m[2], clsName).trim();
 
                       /* tambahkan fungsi Crypt */
-                      if (clsName == 'LibCrypt') {
+                      if (clsName === 'LibCrypt') {
                         tmpTask[clsName]["function"]['encode'] = 'encode(text: string): string;';
                         tmpTask[clsName]["function"]['decode'] = 'decode(text: string): string;';
                       }
@@ -378,7 +378,7 @@ if (isChange(tmpDir + "assets.js", Text))
 
 /* CREATE INDEX.D.TS */
 function createIndex() {
-
+  var PreText = ''
   var Text = `
 import { Component } from 'react';
 import { AntDesignTypes, EntypoTypes, EvilIconsTypes, FeatherTypes, FontAwesomeTypes, FontistoTypes, FoundationTypes, IoniconsTypes, MaterialCommunityIconsTypes, MaterialIconsTypes, OcticonsTypes, SimpleLineIconsTypes, ZocialTypes, } from '@expo/vector-icons/build/esoftplay_icons'
@@ -460,71 +460,88 @@ declare module "esoftplay" {
   }
   function createCache<S>(initialCache?: S, option?: createCacheOption): createCacheReturn<S>;`;
   for (clsName in tmpTask) {
+    let ItemText = ""
+    if (clsName === 'LibCrypt') {
+      tmpTask[clsName]["class"] = "class LibCrypt"
+      tmpTask[clsName]["function"]['encode'] = 'encode(text: string): string;';
+      tmpTask[clsName]["function"]['decode'] = 'decode(text: string): string;';
+    }
     if (tmpTask[clsName]["class"]) {
-      // Text += "\n";
+      // ItemText += "\n";
       for (var i = 0; i < tmpTask[clsName]["type"].length; i++) {
-        Text += "\n  " + tmpTask[clsName]["type"][i].replace(/\n/g, "\n  ");
+        ItemText += "\n  " + tmpTask[clsName]["type"][i].replace(/\n/g, "\n  ");
       }
       for (var i = 0; i < tmpTask[clsName]["interface"].length; i++) {
-        Text += "\n  " + tmpTask[clsName]["interface"][i].replace(/\n/g, "\n  ");
+        ItemText += "\n  " + tmpTask[clsName]["interface"][i].replace(/\n/g, "\n  ");
       }
-      Text += "\n  " + tmpTask[clsName]["class"] + " {";
+      ItemText += "\n  export " + tmpTask[clsName]["class"] + " {";
       var isFilled = false;
       for (fun in tmpTask[clsName]["var"]) {
-        Text += "\n    " + tmpTask[clsName]["var"][fun];
+        ItemText += "\n     " + tmpTask[clsName]["var"][fun];
       }
       for (fun in tmpTask[clsName]["function"]) {
-        Text += "\n    " + tmpTask[clsName]["function"][fun];
+        ItemText += "\n     " + tmpTask[clsName]["function"][fun];
         isFilled = true;
       }
       if (isFilled) {
-        Text += "\n  ";
+        ItemText += "\n  ";
       }
-      // Text += "}\n";
-      Text += "}";
+      // ItemText += "}\n";
+      ItemText += "}";
     } else if (tmpTask[clsName]["hooks"]) {
       for (var i = 0; i < tmpTask[clsName]["interface"].length; i++) {
-        Text += "\n  " + tmpTask[clsName]["interface"][i].replace(/\n/g, "\n  ");
+        ItemText += "\n  export " + tmpTask[clsName]["interface"][i].replace(/\n/g, "\n  ");
       }
-      Text += "\n " + tmpTask[clsName]["hooks"];
+      ItemText += "\n export " + tmpTask[clsName]["hooks"];
       for (var i = 0; i < tmpTask[clsName]["type"].length; i++) {
-        Text += "\n    " + tmpTask[clsName]["type"][i].replace(/\n/g, "\n  ");
+        ItemText += "\n    export " + tmpTask[clsName]["type"][i].replace(/\n/g, "\n  ");
       }
       var isFilled = false;
-      Text += "\n " + tmpTask[clsName]["namespaces"] + " {";
+      ItemText += "\n export " + tmpTask[clsName]["namespaces"] + " {";
       for (fun in tmpTask[clsName]["var"]) {
-        Text += "\n    " + tmpTask[clsName]["var"][fun];
+        ItemText += "\n    export " + tmpTask[clsName]["var"][fun];
       }
       for (fun in tmpTask[clsName]["function"]) {
-        Text += "\n    " + tmpTask[clsName]["function"][fun];
+        ItemText += "\n    export " + tmpTask[clsName]["function"][fun];
         isFilled = true;
       }
       if (isFilled) {
-        Text += "\n  ";
+        ItemText += "\n  ";
       }
-      Text += "}";
+      ItemText += "}";
     } else if (tmpTask[clsName]["uselibs"]) {
       for (var i = 0; i < tmpTask[clsName]["interface"].length; i++) {
-        Text += "\n  " + tmpTask[clsName]["interface"][i].replace(/\n/g, "\n  ");
+        ItemText += "\n  export " + tmpTask[clsName]["interface"][i].replace(/\n/g, "\n  ");
       }
-      Text += "\n " + tmpTask[clsName]["uselibs"];
+      ItemText += "\n export " + tmpTask[clsName]["uselibs"];
       for (var i = 0; i < tmpTask[clsName]["type"].length; i++) {
-        Text += "\n  " + tmpTask[clsName]["type"][i].replace(/\n/g, "\n  ");
+        ItemText += "\n  export " + tmpTask[clsName]["type"][i].replace(/\n/g, "\n  ");
       }
       var isFilled = false;
-      Text += "\n " + tmpTask[clsName]["namespaces"] + " {";
+      ItemText += "\n export " + tmpTask[clsName]["namespaces"] + " {";
       for (fun in tmpTask[clsName]["var"]) {
-        Text += "\n    " + tmpTask[clsName]["var"][fun];
+        ItemText += "\n    export " + tmpTask[clsName]["var"][fun];
       }
       for (fun in tmpTask[clsName]["function"]) {
-        Text += "\n    " + tmpTask[clsName]["function"][fun];
+        ItemText += "\n    export " + tmpTask[clsName]["function"][fun];
         isFilled = true;
       }
       if (isFilled) {
-        Text += "\n  ";
+        ItemText += "\n  ";
       }
-      Text += "}";
+      ItemText += "}";
     }
+    const [module, task] = clsName.split(/(?=[A-Z])/)
+    const nav = module?.toLowerCase() + '/' + task?.toLowerCase()
+    try {
+      fs.mkdirSync(tmpDir + module?.toLowerCase())
+    } catch (error) { }
+    PreText += "import '" + tmpDir + nav + ".import.d';\n"
+    fs.writeFile(tmpDir + nav + '.import.d.ts', ItemText, { flag: 'w' }, function (err) {
+      if (err) {
+        return console.log(err);
+      }
+    });
   }
   Text += "\n\ttype LibNavigationRoutes = \"" + Navigations.join("\" |\n\t\t\t \"") + "\"\n"
   Text += "\n\ttype AllRoutes = \"" + AllRoutes.join("\" |\n\t\t\t \"") + "\"\n"
@@ -536,8 +553,8 @@ declare module "esoftplay" {
     const Words = v.split("/")
     return `\t\tT extends "${v}" ? typeof ${ucword(Words[0]) + ucword(Words[1]) + "Property"} :`
   }).join("\n") + "\nnever;\n"
-  Text += "}"
-
+  Text += "}\n"
+  Text = PreText + Text
   if (isChange(typesDir + "index.d.ts", Text)) {
     fs.writeFile(typesDir + "index.d.ts", Text, { flag: 'w' }, function (err) {
       if (err) {
@@ -584,12 +601,16 @@ function createRouter() {
   var nav = "";
   var staticImport = []
 
-  staticImport.push("var isEqual = require('react-fast-compare');\n")
+  // staticImport.push("var isEqual = require('react-fast-compare');\n")
   staticImport.push("export function applyStyle(style){ return style };\n")
   staticImport.push("export { default as useGlobalState } from '../../../node_modules/esoftplay/global';\n")
   staticImport.push("export { default as usePersistState } from '../../../node_modules/esoftplay/persist';\n")
   staticImport.push("export { default as useSafeState } from '../../../node_modules/esoftplay/state';\n")
   staticImport.push("export { default as esp } from '../../../node_modules/esoftplay/esp';\n")
+  staticImport.push("export { default as createCache } from '../../../node_modules/esoftplay/_cache';\n")
+  staticImport.push("export { default as _global } from '../../../node_modules/esoftplay/_global';\n")
+  staticImport.push("import { stable } from 'usestable';\n")
+
   for (const module in Modules) {
     for (const task in Modules[module]) {
       nav = module + '/' + task;
@@ -600,7 +621,7 @@ function createRouter() {
       Task += "\t\t" + 'case "' + nav + '":' + "\n\t\t\t" + 'Out = require("../../.' + Modules[module][task] + '")?.default' + "\n\t\t\t" + 'break;' + "\n";
       TaskProperty += "\t\t" + 'case "' + nav + '":' + "\n\t\t\t" + 'Out = require("../../.' + Modules[module][task] + '")' + "\n\t\t\t" + 'break;' + "\n";
       /* ADD ROUTER EACH FILE FOR STATIC IMPORT */
-      var item = "import { default as _" + ucword(module) + ucword(task) + " } from '../../." + Modules[module][task] + "';\n"
+      var item = "import { stable } from 'usestable';\nimport { default as _" + ucword(module) + ucword(task) + " } from '../../." + Modules[module][task] + "';\n"
       if (HookModules.includes(nav)) {
         item += "" +
           "import * as " + ucword(module) + ucword(task) + SuffixHooksProperty + " from '../../." + Modules[module][task] + "';\n" +
@@ -614,26 +635,33 @@ function createRouter() {
       } else {
         item += "export { _" + ucword(module) + ucword(task) + " as " + ucword(module) + ucword(task) + " };\n"
       }
-      if (module == 'lib' && task == 'component') {
-        staticImport.splice(2, 0, item)
-      } else if (module == 'lib' && task == 'style') {
-        staticImport.splice(4, 0, item)
-      } else if (module == 'lib' && task == 'worker') {
-        staticImport.splice(4, 0, item)
-      } else if (module == 'lib' && task == 'navigation') {
-        staticImport.splice(4, 0, item)
-      } else if (task == 'style') {
-        staticImport.splice(9, 0, item)
-      } else if (task == 'scrollpicker') {
-        staticImport.splice(10, 0, item)
-      } else {
-        staticImport.push(item);
-      }
+      try {
+        fs.mkdirSync(tmpDir + module)
+      } catch (error) { }
+      fs.writeFile(tmpDir + nav + '.import.js', item, { flag: 'w' }, function (err) {
+        if (err) {
+          return console.log(err);
+        }
+      });
+
+      // if (module == 'lib' && task == 'component') {
+      //   staticImport.splice(2, 0, item)
+      // } else if (module == 'lib' && task == 'style') {
+      //   staticImport.splice(4, 0, item)
+      // } else if (module == 'lib' && task == 'worker') {
+      //   staticImport.splice(4, 0, item)
+      // } else if (module == 'lib' && task == 'navigation') {
+      //   staticImport.splice(4, 0, item)
+      // } else if (task == 'style') {
+      //   staticImport.splice(9, 0, item)
+      // } else if (task == 'scrollpicker') {
+      //   staticImport.splice(10, 0, item)
+      // } else {
+      //   staticImport.push(item);
+      // }
     }
   }
-  staticImport.splice(2, 0, "export { default as createCache } from '../../../node_modules/esoftplay/_cache';\n")
-  staticImport.splice(2, 0, "export { default as _global } from '../../../node_modules/esoftplay/_global';\n")
-  staticImport.splice(2, 0, "import { stable } from 'usestable';\n")
+
   const x = staticImport.join('')
   if (isChange(tmpDir + 'index.js', x))
     fs.writeFile(tmpDir + 'index.js', x, { flag: 'w' }, function (err) {

package/global.ts

@@ -4,8 +4,6 @@ import { fastFilter, fastLoop } from './fast';
 const _global = require('./_global')
 const isEqual = require('react-fast-compare');
 
-
-
 export interface useGlobalReturn<T> {
   useState: () => [T, (newState: T) => void, () => void],
   get: () => T,

package/import_migrator.mjs

@@ -0,0 +1,44 @@
+import fs from 'fs'
+const pattern = new RegExp(/\n{0,}import ((.*)) from (?:"esoftplay"|'esoftplay');?/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)
+        if (matchs) {
+          let espMod = []
+          let nonEspMod = []
+          const cmatch = matchs[0]
+          const arrModules = cmatch.substring(cmatch.indexOf('{') + 1, cmatch.lastIndexOf('}')).split(',')
+          arrModules.forEach((mod) => {
+            const modTrim = mod.trim()
+            if (modTrim.match(/^[a-z]/g)) {
+              console.log("ESP MODULE : " + modTrim)
+              espMod.push(modTrim)
+            } else {
+              nonEspMod.push(modTrim)
+              console.log("NON ESP MODULE : " + modTrim)
+            }
+          })
+          let adder = ""
+          if (nonEspMod.length > 0) {
+            nonEspMod.forEach((non) => {
+              if (non) {
+                const [module, task] = non.split(/(?=[A-Z])/)
+                if (module && task)
+                  adder += `import { ${non} } from 'esoftplay/cache/${module.toLowerCase()}/${task.toLowerCase()}.import';\n`
+              }
+            })
+          }
+          dFile = dFile.replace(cmatch, "\nimport { " + espMod.join(", ") + " } from 'esoftplay';\n" + adder)
+          fs.writeFileSync('./modules/' + module + '/' + task, dFile, { encoding: 'utf8' })
+          // }
+
+        }
+        // return
+      })
+    }
+  })
+}

package/{modules/lib → libs}/worker.tsx

@@ -1,47 +1,30 @@
-// noPage
-
-import { _global } from 'esoftplay';
-import React, { Component } from "react";
-import { Platform } from 'react-native';
-
-
-export interface LibWorkerInit {
-  task: string,
-  taskId: string,
-  result: (res: string) => void
-}
-
-export interface LibWorkerProps {
-  tasks?: LibWorkerInit[],
-}
-export interface LibWorkerState {
-
-}
-_global.LibWorkerBase = React.createRef()
-_global.LibWorkerTasks = new Map()
+import React from "react";
+import { Platform, View } from 'react-native';
+import WebView from "react-native-webview";
+const _global = require('../_global').default
+const esp = require('../esp').default
+
+_global.WorkerBase = React.createRef()
+_global.WorkerTasks = new Map()
 _global.injectedJavaScripts = []
-_global.LibWorkerReady = 0
-_global.LibWorkerCount = 0
-
-export default class m extends Component<LibWorkerProps, LibWorkerState> {
-  constructor(props: LibWorkerProps) {
-    super(props)
-  }
-  static delete(taskId: string): void {
-    _global.LibWorkerTasks.delete(taskId)
-  }
-
-  static registerJob(name: string, func: Function): (params: any[], res: (data: any) => void) => void {
+_global.WorkerReady = 0
+_global.WorkerCount = 0
+
+const Worker = {
+  delete(taskId: string) {
+    _global.WorkerTasks.delete(taskId)
+  },
+  registerJob(name: string, func: Function): (params: any[], res: (data: any) => void) => void {
     'show source';
     const x = func.toString().replace('function', 'function ' + name)
     _global.injectedJavaScripts.push(x)
-    m.dispatch(() => x, '', () => { })
+    Worker.dispatch(() => x, '', () => { })
     return (params: (string | number | boolean)[], res: (data: string) => void) => {
       if (Platform.OS == 'android')
         if (Platform.Version <= 22) {
           return res(func(...params))
         }
-      m.dispatch(
+      Worker.dispatch(
         (id: number) => {
           let _params = params.map((param) => {
             if (typeof param == 'string')
@@ -52,13 +35,12 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
         }
         , '', res)
     }
-  }
-
-  static registerJobAsync(name: string, func: (...fparams: any[]) => Promise<any>): (params: any[], res: (data: any) => void) => void {
+  },
+  registerJobAsync(name: string, func: (...fparams: any[]) => Promise<any>): (params: any[], res: (data: any) => void) => void {
     'show source';
     const x = func.toString().replace('function', 'function ' + name)
     _global.injectedJavaScripts.push(x)
-    m.dispatch(() => x, '', () => { })
+    Worker.dispatch(() => x, '', () => { })
     return (params: (string | number | boolean)[], res: (data: string) => void) => {
       if (Platform.OS == 'android')
         if (Platform.Version <= 22) {
@@ -66,7 +48,7 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
           return
         }
 
-      m.dispatch(
+      Worker.dispatch(
         (id: number) => {
           let _params = params.map((param) => {
             if (typeof param == 'string')
@@ -77,24 +59,22 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
         }
         , '', res)
     }
-  }
-
-  static objToString(data: any): string {
+  },
+  objToString(data: any): string {
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
         return JSON.stringify(data)
       }
     return JSON.stringify(JSON.stringify(data)).slice(1, -1);
-  }
-
-  static jobAsync(func: (...fparams: any[]) => Promise<any>, params: (string | number | boolean)[], res: (data: any) => void): void {
+  },
+  jobAsync(func: (...fparams: any[]) => Promise<any>, params: (string | number | boolean)[], res: (data: any) => void): void {
     'show source';
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
         (async () => res(await func(...params)))()
         return
       }
-    m.dispatch(
+    Worker.dispatch(
       (id: number) => {
         const nameFunction = func.toString().replace('function', 'function tempFunction')
         let _params = params.map((param) => {
@@ -105,15 +85,14 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
         return (`(async () => window.ReactNativeWebView.postMessage(JSON.stringify({ data: await ` + nameFunction + `(` + _params.join(", ") + `), id: ` + id + ` })))();true;`)
       }
       , '', res)
-  }
-
-  static job(func: Function, params: (string | number | boolean)[], res: (data: any) => void): void {
+  },
+  job(func: Function, params: (string | number | boolean)[], res: (data: any) => void): void {
     'show source';
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
         return res(func(...params))
       }
-    m.dispatch(
+    Worker.dispatch(
       (id: number) => {
         const nameFunction = func.toString().replace('function', 'function tempFunction')
         let _params = params.map((param) => {
@@ -126,46 +105,55 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
         return out
       }
       , '', res)
-  }
-
-  // static image(url: string, toSize: number, result: (r: string) => void): void {
-  //   m.dispatch((id) => `imageCompress("` + id + `", "` + url + `", ` + PixelRatio.getPixelSizeForLayoutSize(toSize) + `)`, url, result)
-  // }
-
-  static dispatch(task: (id: number) => string, url: string, result: (r: string) => void): void {
-    if (_global.LibWorkerReady > 0 && typeof _global.LibWorkerBase?.current?.injectJavaScript == 'function') {
-      _global.LibWorkerCount++
-      var _task = task(_global.LibWorkerCount)
-      _global.LibWorkerTasks.set(String(_global.LibWorkerCount), {
+  },
+  dispatch(task: (id: number) => string, url: string, result: (r: string) => void): void {
+    if (_global.WorkerReady > 0 && typeof _global.WorkerBase?.current?.injectJavaScript == 'function') {
+      _global.WorkerCount++
+      var _task = task(_global.WorkerCount)
+      _global.WorkerTasks.set(String(_global.WorkerCount), {
         task: _task,
         result: result
       })
-      _global.LibWorkerBase?.current?.injectJavaScript?.(_task)
+      _global.WorkerBase?.current?.injectJavaScript?.(_task)
     } else {
       setTimeout(() => {
-        m.dispatch(task, url, result)
+        Worker.dispatch(task, url, result)
       }, 1000);
     }
-  }
-
-  static onMessage(withRefName: string): any {
+  },
+  onMessage(withRefName: string): any {
     return (e: any) => {
       if (e.nativeEvent.data == withRefName) {
-        _global.LibWorkerReady += 1
+        _global.WorkerReady += 1
         return
       }
       const dt = e.nativeEvent.data
       const x = JSON.parse(dt)
-      const itemTask = _global.LibWorkerTasks.get(String(x.id))
+      const itemTask = _global.WorkerTasks.get(String(x.id))
       if (itemTask) {
         itemTask.result(x.data)
-        m.delete(x.id)
+        Worker.delete(x.id)
       }
     }
-  }
-
-  render(): any {
-    return null
+  },
+  View(): any {
+    if (Platform.OS == 'android')
+      if (Platform.Version <= 22) {
+        return null
+      }
+    return (
+      <View style={{ height: 0, width: 0 }} >
+        <WebView
+          ref={_global.WorkerBase}
+          style={{ width: 0, height: 0 }}
+          javaScriptEnabled={true}
+          injectedJavaScript={`\nwindow.ReactNativeWebView.postMessage("BaseWorkerIsReady")\n` + _global.injectedJavaScripts.join('\n') + '\ntrue;'}
+          originWhitelist={["*"]}
+          source={{ uri: esp.config("protocol") + "://" + esp.config("domain") + esp.config("uri") + "dummyPageToBypassCORS" }}
+          onMessage={Worker.onMessage('BaseWorkerIsReady')}
+        />
+      </View>
+    )
   }
 }
-
+export default Worker

package/modules/lib/carrousel.tsx

@@ -1,6 +1,9 @@
 // noPage
+import {  } from 'esoftplay';
+
+import { LibComponent } from 'esoftplay/cache/lib/component.import';
+import { LibFocus } from 'esoftplay/cache/lib/focus.import';
 
-import { LibComponent, LibFocus } from 'esoftplay';
 import React from 'react';
 import { Platform, ScrollView, StyleSheet, Text, TouchableOpacity, TouchableWithoutFeedback, View } from 'react-native';
 

package/modules/lib/carrousel_snap.tsx

@@ -1,7 +1,9 @@
 // withHooks
 // noPage
+import {  } from 'esoftplay';
+
+import { LibFocus } from 'esoftplay/cache/lib/focus.import';
 
-import { LibFocus } from "esoftplay";
 import React, { useEffect, useMemo, useRef } from 'react';
 import { ScrollView, View } from 'react-native';
 

package/modules/lib/collaps.tsx

@@ -1,7 +1,8 @@
 // withHooks
 // noPage
-
 import { useSafeState } from 'esoftplay';
+
+
 import React, { useCallback } from 'react';
 import { Pressable } from 'react-native';
 import Animated, { interpolate, useAnimatedStyle, useSharedValue, withSpring, withTiming } from 'react-native-reanimated';