esoftplay 0.0.140-u → 0.0.140-w

package/bin/build.js

@@ -227,6 +227,7 @@ if (fs.existsSync(packjson)) {
 	"compilerOptions": {\n\
 		"allowSyntheticDefaultImports": true,\n\
 		"experimentalDecorators": true,\n\
+		"resolveJsonModule": true, \n\
 		"forceConsistentCasingInFileNames": true,\n\
 		"importHelpers": true,\n\
 		"jsx": "react-native",\n\

package/bin/router.js

@@ -437,4 +437,39 @@ export interface EspArgsInterface {
         return console.log(err);
       }
     });
+
+  function readToJSON(path) {
+    var txt = fs.readFileSync(path, 'utf8');
+    let isJSON = txt.startsWith('{') || txt.startsWith('[')
+    return isJSON ? JSON.parse(txt) : txt
+  }
+  const espConfig = readToJSON("./config.json")
+  const presets = {
+    timezone: "",
+    protocol: "",
+    uri: "",
+    url: "",
+    content: "",
+    webviewOpen: "",
+    webviewClose: "",
+    api: "",
+    data: "",
+    home: {
+      member: "",
+      public: ""
+    },
+    group_id: 0,
+    langIds: [],
+    theme: [],
+    comment_login: 1,
+    notification: 0,
+    ...espConfig.config
+  }
+  if (isChange(tmpDir + "config.json", JSON.stringify(presets))) {
+    fs.writeFile(tmpDir + "config.json", JSON.stringify(presets), { flag: 'w' }, function (err) {
+      if (err) {
+        return console.log(err);
+      }
+    });
+  }
 }

package/esp.ts

@@ -1,4 +1,5 @@
 import { EspAssets } from 'esoftplay/cache/assets';
+import cacheConfig from 'esoftplay/cache/config.json';
 import { LibLocale } from 'esoftplay/cache/lib/locale/import';
 import { EspRouterPropertyInterface } from 'esoftplay/cache/properties';
 import { EspRouterInterface } from 'esoftplay/cache/routers';
@@ -7,6 +8,8 @@ import { LogBox, Platform } from 'react-native';
 import 'react-native-reanimated';
 import './oneplusfixfont';
 
+type ConfigType = typeof cacheConfig
+
 const ignoreWarns = [
   "Setting a timer for a long period of time",
   "VirtualizedLists should never be nested inside plain ScrollViews with the same orientation",
@@ -79,21 +82,21 @@ const esp = {
   versionName(): string {
     return (Platform.OS == 'android' ? Constants?.expoConfig?.android?.versionCode : Constants?.expoConfig?.ios?.buildNumber) + '-' + esp.config('publish_id')
   },
-  config(param?: string, ...params: string[]): any {
-    let out: any = esp._config();
+  config<T = ConfigType>(param?: keyof ConfigType, ...params: string[]): T {
+    let out: any = this._config();
     if (param) {
-      var _params = [param, ...params]
-      if (_params.length > 0)
-        for (let i = 0; i < _params.length; i++) {
-          const key = _params[i];
-          if (out?.hasOwnProperty?.(key)) {
-            out = out[key];
-          } else {
-            out = {};
-          }
+      const _params = [param, ...params];
+      for (let i = 0; i < _params.length; i++) {
+        const key = _params[i];
+        if (out && typeof out === 'object' && out.hasOwnProperty(key)) {
+          out = out[key];
+        } else {
+          return {} as T; // Return empty object if key doesn't exist
         }
+      }
     }
-    return out;
+
+    return out as T;
   },
   isDebug(message: string): boolean {
     if (!lconf) {
@@ -117,7 +120,7 @@ const esp = {
       return out;
     }
   },
-  lang(moduleTask: string, langName: string, ...stringToBe: string[]): string {
+  lang<T extends keyof EspRouterInterface>(moduleTask: T, langName: string, ...stringToBe: string[]): string {
     let string = LibLocale.stateLang().get()?.[esp.langId()]?.[moduleTask]?.[langName]
     if (!string) {
       string = esp.assets("locale/id.json")?.[moduleTask]?.[langName]
@@ -156,7 +159,7 @@ const esp = {
     const properties = require('./cache/properties')
     return properties(modtast.join("/"));
   },
-  _config() {
+  _config(): typeof cacheConfig {
     app = esp.mergeDeep(app, conf)
     var msg = ''
     if (!app.hasOwnProperty('config')) {
@@ -173,7 +176,7 @@ const esp = {
       throw error;
     }
 
-    var config = {
+    const config = {
       // default config
       timezone: "Asia/Jakarta",
       protocol: "http",

package/modules/lib/object.ts

@@ -55,9 +55,10 @@ export default class m {
         spec = { [pathToUpdate]: [command, ...allValues] }
       else
         spec = [command, ...allValues]
-      if (hasError)
+      if (hasError) {
+        console.warn("LibObject: Please check your cursor!")
         this.#value = array
-      else
+      } else
         this.#value = update(array, spec)
       return this
     }
@@ -169,9 +170,10 @@ function cursorBuilder(command: string, array: any, value: any, ...values: any[]
     else
       spec = [command, ...allValues]
 
-    if (hasError)
+    if (hasError) {
+      console.warn("LibObject: Please check your cursor!")
       return array
-    else
+    } else
       return update(array, spec)
   }
 }

package/package.json

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