jsir 2.0.6 → 2.0.8

package/cleanEval.js

@@ -0,0 +1,3 @@
+module.exports = {
+    evalVal: (exeStr) => eval(`(${exeStr})`)
+}

package/cmd/oaa.js

@@ -1,16 +1,4 @@
 #!/usr/bin/env node
-const path = require('path');
-const {spawnSync} = require('child_process');
-const globalDirectories = require('global-dirs');
-let nodePath = process.env.NODE_PATH ? process.env.NODE_PATH.trim():'';
-let avoidFlag = path.delimiter + path.delimiter + path.delimiter;
-if (!nodePath.endsWith(avoidFlag) && nodePath.indexOf(globalDirectories.npm.packages) === -1) {
-    process.env.NODE_PATH = [globalDirectories.npm.packages, nodePath].filter(i => i).join(path.delimiter) + avoidFlag
-    process.on('SIGINT', function () {});
-    spawnSync(process.argv[0], process.argv.slice(1), {stdio:"inherit"});
-    return;
-}
-
 const $lib = require('../util');
 const {
     getLibDataDir, trim, regEach, getConfig, mkdir, reget,
@@ -22,6 +10,7 @@ const {
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../evalCode')
+const {evalVal} = require('../cleanEval')
 const _chokidar = require('chokidar');
 const setting = require('../setting')
 const _fs = require('fs')
@@ -47,20 +36,69 @@ let _rl
 let _rlHistory = []
 let _haveWrapperInput = true
 let _exit = false
+let _noAppendNextLine = true
 
+const _onGetMap = {}
 const _data = {}
+const _dealOnGet = (key) => {
+    if (_noAppendNextLine || !_onGetMap[key]) {
+        return _data[key]
+    }
+    let item = _onGetMap[key]
+    if (Date.now() <= item.startTime) {
+        return _data[key]
+    }
+    let flag = _onGetMap[key].fn()
+    if (getType(flag)=== 'Promise') {
+        return new Promise(async (resolve, reject) => {
+            try {
+                await flag
+                item.startTime = Date.now() + (9 * 1000)
+                resolve(_data[key])
+            } catch (e) {
+                reject(e)
+            }
+        })
+    } else {
+        item.startTime = Date.now() + (9 * 1000)
+        return _data[key]
+    }
+}
 const $data = {
     get: (key, defaultVal) => {
-        if (!(key in _data) && defaultVal !== undefined) {
-            _data[key] = defaultVal
+        if (!vl(_data[key])) {
+            if (vl(defaultVal)) {
+                return defaultVal
+            } else {
+                return _data[key]
+            }
         }
-        return _data[key]
+        return _dealOnGet(key)
     },
-    set: (key, val) => {
-        _data[key] = val
+    gos: (key, defaultVal) => {
+        if (!vl(_data[key])) {
+            if (vl(defaultVal)) {
+                _data[key] = defaultVal
+                return defaultVal
+            } else {
+                return _data[key]
+            }
+        }
+        return _dealOnGet(key)
+    },
+    set: (key, val, onGet) => {
+        if (onGet) {
+            _onGetMap[key] = {
+                fn: onGet,
+                startTime: Date.now() + (9 * 1000)
+            }
+        }
+        return _data[key] = val
     },
     del: (key) => {
+        let val = _data[key]
         delete _data[key]
+        return val
     },
     keys: () => Object.keys(_data)
 }
@@ -71,8 +109,6 @@ global.$newInput = false
 global.$workspaceMap = {}
 global.$defaultSpace = 'local'
 
-let _noAppendNextLine = true
-
 function getFileOpenExe(fileName) {
     fileName = trim(fileName);
     let strs = fileName.split('.')
@@ -80,12 +116,11 @@ function getFileOpenExe(fileName) {
     if (strs.length > 1) {
         suffix = strs[strs.length - 1]
     }
+    let defaultExe = getConfig("defaultExe", "idea");
     if (!suffix) {
-        return 'idea'
+        return defaultExe
     }
-
-    let exe = getConfig(`${suffix}_exe`)
-    return exe || 'idea';
+    return getConfig(`${suffix}_exe`, defaultExe);
 }
 
 function checkWorkspaces() {
@@ -121,12 +156,7 @@ async function start() {
         }).join(' ')
         await wrapperInput(line)
     } else {
-        let defaultAction = getConfig("defaultAction", "repl");
-        if (defaultAction && keywordDef[defaultAction]) {
-            await wrapperInput('.' + defaultAction)
-        } else {
-            await wrapperInput('.repl')
-        }
+        await wrapperInput(getConfig("defaultAction", ".repl"))
     }
 }
 
@@ -975,10 +1005,8 @@ const keywordDef = {
                 return
             }
             let cmds = filterCmd('^e ' + toJsirFileName(args[0]).replace(/^[eif]\s+/, '') + '$')
-            _cmdMap = arrayToCmdMap(cmds)
-            listCmd()
             if (cmds.length === 1) {
-                await runCmd('1 ' + args.slice(1).join(' '))
+                await runCmd(args.slice(1).join(' '), cmds[0])
             }
         },
         args: {
@@ -1371,7 +1399,7 @@ function getArgDef(text) {
     let exeStr = trim(reget(text, /\$defArgs\(\s*(\{[\s\S]*?\})\s*\)/))
     let argDef = {}
     try {
-        argDef = eval(`(${exeStr || '{}'})`) || {}
+        argDef = (exeStr ? evalVal(exeStr) : {}) || {}
         let array = []
         for (let key of Object.keys(argDef)) {
             if (array.hasOwnProperty(key)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {

package/util.js

@@ -18,6 +18,9 @@ const emptyFn = ()=>{}
 const dayJs = require('dayjs')
 const table = require('console.table')
 const _fs = require("fs");
+if (module.paths.indexOf(globalDirectories.npm.packages) === -1) {
+    module.paths.push(globalDirectories.npm.packages)
+}
 
 let _globalLog = createLimitLogger2(`${setting.name}.log`, null, false)
 const $log = str => {
@@ -135,7 +138,7 @@ function vl(obj) {
         return !Number.isNaN(obj)
     }
     if (typeof obj === 'string') {
-        obj = trim(obj)
+        obj = obj.trim()
     }
     return !(obj === null || obj === undefined || obj === '')
 }
@@ -329,32 +332,32 @@ function dataFile(fileName, fn, fmt, defaultObj = {}, returnStr = false) {
     }
 }
 
-function requireG(module){
+function requireG(moduleName){
     try {
-        let result = require(module);
+        let result = require(moduleName);
         if (result) {
             return result
         }
     } catch (e) {}
-    let path = globalDirectories.npm.packages + '/' + module;
+    let path = globalDirectories.npm.packages + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        console.log(warnStr(`npm install -g ${module}`))
-        throw `${module} not found, use above cmd to install it`;
+        console.log(warnStr(`npm install -g ${moduleName}`))
+        throw `${moduleName} not found, use above cmd to install it`;
     }
     return require(path);
 }
 
-async function importG(module) {
+async function importG(moduleName) {
     try {
-        let result = await import(module);
+        let result = await import(moduleName);
         if (result) {
             return result
         }
     } catch (e) {}
-    let path = globalDirectories.npm.packages + '/' + module;
+    let path = globalDirectories.npm.packages + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        console.log(warnStr(`npm install -g ${module}`))
-        throw `${module} not found, use above cmd to install it`;
+        console.log(warnStr(`npm install -g ${moduleName}`))
+        throw `${moduleName} not found, use above cmd to install it`;
     }
     return await import(path);
 }
@@ -399,10 +402,7 @@ function aesDecipher(str, key){
     }
 }
 
-function getConfig(key, defaultVal = null) {
-    if (typeof defaultVal === "string") {
-        defaultVal = trim(defaultVal)
-    }
+function getConfig(key, defaultVal) {
     let configInit = {}
     let configFile = getLibDataDir() + '/config.json';
     if (!fs.existsSync(configFile)) {
@@ -416,11 +416,18 @@ function getConfig(key, defaultVal = null) {
     let writeFlag = false
     if (!(key in config)) {
         writeFlag = true
-        config[key] = defaultVal
+        config[key] = null
     }
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
     }
+
+    if (typeof defaultVal === "string") {
+        defaultVal = trim(defaultVal)
+    }
+    if (!vl(config[key]) && vl(defaultVal)) {
+        return defaultVal
+    }
     let val = config[key]
     if (typeof val === "string") {
         val = trim(val)