esoftplay 0.0.109-x → 0.0.110

package/bin/build.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 // @ts-check
-const { exec } = require('child_process');
+const { execSync } = require('child_process');
 const fs = require('fs');
 const DIR = "../../"
 const packjson = DIR + "package.json"
@@ -118,15 +118,15 @@ if (fs.existsSync(packjson)) {
 
 
 		const babelconf = `module.exports = function (api) {
-api.cache(true);
+	api.cache(true);
 
-let plugins = []
+	let plugins = []
 
-if (process.env["ENV"] === "prod") {
-	plugins.push("transform-remove-console");
-	plugins.push("transform-react-native-style-optimizer");
-}
-plugins.push("react-native-reanimated/plugin")
+	if (process.env["ENV"] === "prod") {
+		plugins.push("transform-remove-console");
+		plugins.push("transform-react-native-style-optimizer");
+	}
+	plugins.push("react-native-reanimated/plugin")
 	return {
 		presets: ["babel-preset-expo"],
 		plugins
@@ -310,10 +310,8 @@ export default function App() {
 				cmd += "&& yarn add " + installDevLibs.join(" ") + " --dev "
 			if (installExpoLibs.length > 0)
 				cmd += "&& expo install " + installExpoLibs.join(" ")
-			cmd += " && npm i -s esoftplay"
-			setTimeout(() => {
-				exec(cmd)
-			}, 100);
+			// cmd += " && npm i -s esoftplay"
+			execSync(cmd)
 			console.log('App.js has been replace to App.tsx');
 			// /* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */
 			// if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {

package/bin/router.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+// @ts-check
 /* EXECUTED ON `ESP START` TO BUILD FILE CACHES */
 const fs = require('fs');
 var checks = ['./node_modules/esoftplay/modules/', './modules/', './templates/'];
@@ -9,29 +10,29 @@ var replacer = new RegExp(/(?:\-|\.(?:ios|android))?\.(?:jsx|js|ts|tsx)$/);
 var Text = "";
 const rngh = "./node_modules/react-native-gesture-handler/react-native-gesture-handler.d.ts"
 
-const curPackjson = require('../package.json')
-const mainPackjson = require('../../../package.json')
+// const curPackjson = require('../package.json')
+// const mainPackjson = require('../../../package.json')
 
-function getNestedObjectValue(obj, keys) {
-  if (keys.length > 0) {
-    var key = keys.shift();
-    if (key in obj) {
-      return getNestedObjectValue(obj[key], keys);
-    } else {
-      return null;
-    }
-  } else {
-    return obj;
-  }
-}
+// function getNestedObjectValue(obj, keys) {
+//   if (keys.length > 0) {
+//     var key = keys.shift();
+//     if (key in obj) {
+//       return getNestedObjectValue(obj[key], keys);
+//     } else {
+//       return null;
+//     }
+//   } else {
+//     return obj;
+//   }
+// }
 
 
-const prjVersion = getNestedObjectValue(mainPackjson, ['dependencies', 'esoftplay'])
-if (prjVersion && prjVersion.includes(curPackjson.version)) {
-  try {
-    console.log("\x1b[31m", "VERSI esoftplay tidak SESUAI " + mainPackjson.dependencies.esoftplay + " != " + curPackjson.version + " ✘", "\x1b[0m")
-  } catch (error) { }
-}
+// const prjVersion = getNestedObjectValue(mainPackjson, ['dependencies', 'esoftplay'])
+// if (prjVersion && prjVersion.includes(curPackjson.version)) {
+//   try {
+//     console.log("\x1b[31m", "VERSI esoftplay tidak SESUAI " + mainPackjson.dependencies.esoftplay + " != " + curPackjson.version + " ✘", "\x1b[0m")
+//   } catch (error) { }
+// }
 
 if (fs.existsSync(rngh)) {
   fs.unlink(rngh, (err) => { })

package/esp.ts

@@ -13,20 +13,22 @@ let conf = require('../../config.json');
 let lconf = require('../../config.live.json');
 
 export default (() => {
-  function mergeDeep(target, ...sources) {
-    target = Object(target);
-    for (let source of sources) {
-      source = Object(source);
-      for (let key in source) {
-        if (source.hasOwnProperty(key)) {
-          if (source[key] && typeof source[key] === 'object') {
-            target[key] = mergeDeep(target[key], source[key]);
-          } else {
-            target[key] = source[key];
-          }
-        }
-      }
+  function mergeDeep(target: any, source: any): any {
+    const isObject = (obj) => obj && typeof obj === 'object';
+    if (!isObject(target) || !isObject(source)) {
+      return source;
     }
+    Object.keys(source).forEach(key => {
+      const targetValue = target[key];
+      const sourceValue = source[key];
+      if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
+        target[key] = targetValue.concat(sourceValue);
+      } else if (isObject(targetValue) && isObject(sourceValue)) {
+        target[key] = mergeDeep(Object.assign({}, targetValue), sourceValue);
+      } else {
+        target[key] = sourceValue;
+      }
+    });
     return target;
   }
   app = mergeDeep(app, conf)
@@ -87,7 +89,7 @@ export default (() => {
   function lang(moduleTask: string, langName: string, ...stringToBe: string[]): string {
     let string = esp.assets("locale/" + langId() + ".json")?.[moduleTask]?.[langName]
     if (!string) {
-      string = esp.assets("locale/id.json")[moduleTask][langName]
+      string = esp.assets("locale/id.json")?.[moduleTask]?.[langName]
     }
     function sprintf(string: string, index: number) {
       if (stringToBe[index] != undefined) {

package/package.json

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