jsir 2.0.4 → 2.0.5

package/cmd/oaa.js

@@ -1,41 +1,57 @@
 #!/usr/bin/env node
+const $lib = require('../util');
+const path = require('path');
 const {
     getLibDataDir, trim, regEach, getConfig, mkdir, reget,
     getCbText, e, sleep, objDataFile, vl, md5, BigNumber,
     info, warn, error, arrayDataFile, infoStr, warnStr, errorStack,
     getInfo, ei, pad, msgStr, getType,
     errorTag, isArgsMatch, draftQuery, setConfig,
-    $log, $draft, $config, getTextComments
-} = require('../util')
-const evalCode = require('../evalCode')
-
-const _types = {
-    'e': "exe",
-    'i': "init",
-    'f': "file"
+    $log, $draft, getTextComments, globalModulesPath
+} = $lib;
+const _args = process.argv.slice(2).map(trim)
+let nodePath = trim(process.env.NODE_PATH)
+let avoidFlag = path.delimiter + path.delimiter + path.delimiter;
+if (!nodePath.endsWith(avoidFlag) && nodePath.indexOf(globalModulesPath) === -1) {
+    process.env.NODE_PATH = [globalModulesPath, nodePath].filter(i => i).join(path.delimiter) + avoidFlag
+    process.on('SIGINT', function () {});
+    ei(`jsir`, _args);
+    return;
 }
+
+const evalCode = require('../evalCode')
 const _chokidar = require('chokidar');
+const setting = require('../setting')
 const _fs = require('fs')
+const readline = require("readline");
+
+const _workspaceConfigFile = 'workspace.json';
 const _libDataDir = getLibDataDir()
-const _args = process.argv.slice(2).map(trim)
 const _history9 = []
 const _tipsOnRm = {}
-const readline = require("readline");
 const _fileWatcherMap = {}
-const setting = require('../setting')
+const _types = {
+    'e': "exe",
+    'i': "init",
+    'f': "file"
+}
+const $config = {
+    get: getConfig,
+    set: setConfig
+}
+
 let _cmdMapFile = setting.name + 'CmdMap.json'
 let _cmdMap = {}
 let _rl
 let _rlHistory = []
 let _haveWrapperInput = true
-let _workspaceConfigFile = 'workspace.json';
 let _exit = false
 
 const _data = {}
 const $data = {
-    get: (key, val) => {
-        if (!(key in _data) && val !== undefined) {
-            _data[key] = val
+    get: (key, defaultVal) => {
+        if (!(key in _data) && defaultVal !== undefined) {
+            _data[key] = defaultVal
         }
         return _data[key]
     },
@@ -48,7 +64,6 @@ const $data = {
     keys: () => Object.keys(_data)
 }
 const $homeDir = getLibDataDir()
-const $lib = {...require('../util')}
 
 global.$tips = {}
 global.$newInput = false
@@ -549,9 +564,9 @@ async function _wrapperInput(str) {
             await evalText(text)
         }
     } else if (str.match(/^\./)) {
-        let argsStr = trim(str.substring(1))
-        if (argsStr) {
-            await dealKeyword(argsStr)
+        let items = enrichArgs(trim(str.substring(1))).map(trim)
+        if (items.length > 0) {
+            await dealKeyword(items[0], items.slice(1))
         } else {
             help()
         }
@@ -1012,17 +1027,14 @@ const keywordDef = {
     }
 }
 
-async function dealKeyword(str) {
+async function dealKeyword(keyword, args) {
     let unMatched = true;
     for (let key of Object.keys(keywordDef)) {
         let item = keywordDef[key]
-        let currStr = str === key ? item.short : str.replace(new RegExp(`^${key}\\s+`), item.short + ' ')
-        let strs = trim(currStr).split(/\s+/)
-        let fstr = strs[0]
-        let ostr = strs.slice(1)
-        if (item.short === fstr) {
+        let shortKey = keyword === key ? item.short : keyword;
+        if (item.short === shortKey) {
             unMatched = false;
-            await item.exeFn(ostr);
+            await item.exeFn(args);
             break;
         }
     }
@@ -1575,9 +1587,15 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         return (await _requireSources(currSpace, matchItem, printLog))[0]
     }
     try {
-        return await evalCode($text, $cmdName, $args, $data, $require, $requires,
-            nextLine, nextText, setTips, delTips, wrapperInput, filterCmd,
-            currSpace, $log, $draft, $config, $homeDir, $lib)
+        return await evalCode($text, $cmdName, $args,
+            $data, $config,
+            $require, $requires,
+            nextLine, nextText,
+            setTips, delTips,
+            wrapperInput, filterCmd,
+            currSpace,
+            $log, $draft,
+            $homeDir, $lib)
     } catch(e) {
         throw errorTag(e, $cmdName);
     }

package/evalCode.js

@@ -1,32 +1,25 @@
-const {info: $info, msg: $msg, warn: $warn, error: $error,
-    infoStr: $infoStr, msgStr: $msgStr, warnStr: $warnStr, errorStr: $errorStr,
-    tableStr: $tableStr, nableStr: $nableStr,
-    errorMsg: $errorMsg, errorStack: $errorStack} = require("./util");
-require = require("./util").requireG;
+const {info: $info, msg: $msg, warn: $warn, error: $error, importG: $import} = require("./util");
+require = require("./util").requireG
 module.exports = async ($text = '', $cmdName = '', $args = [],
-                        $data,
+                        $data, $config,
                         $require, $requires,
                         $nextLine, $nextText,
                         $setTips, $delTips,
                         $enter, $filterCmd,
-                        $currentSpace, $log,
-                        $draft, $config,
+                        $currentSpace,
+                        $log, $draft,
                         $homeDir, $lib) => {
     const $defArgs = () => $args;
     const $context = {
-        global, $data,
-        $require, $requires,
+        global, $data, $config,
+        $require, $requires, $import,
         $info, $msg, $warn, $error,
-        $infoStr, $msgStr, $warnStr, $errorStr,
-        $tableStr, $nableStr,
-        $errorMsg, $errorStack,
         $text, $cmdName, $args,
         $nextLine, $nextText,
         $setTips, $delTips,
         $enter, $filterCmd,
         $currentSpace, $log,
-        $draft, $config,
-        $homeDir, $lib
+        $draft, $homeDir, $lib
     }
     return await eval(`(async ()=>{${$text};
     })()`)

package/package.json

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

package/util.js

@@ -37,57 +37,6 @@ const $draft = str => {
 }
 const $fnCache = {}
 
-const $config = {
-    _buildId: null,
-    build: async function () {
-        if ($config._buildId == null) {
-            await _buildConfig()
-        }
-    },
-    close: () => {
-        clearTimeout($config._buildId)
-        $config._buildId = null
-    },
-    localConfig: {},
-    remoteConfig: {},
-    getLocal: (key, defaultVal) => {
-        if (key && Object.keys($config.localConfig).indexOf(key) === -1) {
-            getConfig(key)
-        }
-        return getVl($config.localConfig[key], defaultVal)
-    },
-    getRemote: (key, defaultVal) => {
-        let machine = $config.getLocal('machine')
-        let remoteKey = `${machine}${machine ? '-':''}${key}`
-        return getVl($config.remoteConfig[remoteKey], $config.remoteConfig[key], defaultVal)
-    },
-    get: (key, defaultVal) => {
-        return getFnVl(() => $config.getRemote(key),
-            () => $config.getLocal(key), defaultVal)
-    },
-    set: (key, val) => {
-        $config.localConfig[key] = val
-        setConfig(key, val)
-    }
-}
-
-async function _buildConfig() {
-    try {
-        $config.localConfig = getConfig()
-        let remoteConfigIp = getConfig('remoteConfigIp')
-
-        if (remoteConfigIp) {
-            if (remoteConfigIp.indexOf(":") === -1) {
-                remoteConfigIp = remoteConfigIp+":9563"
-            }
-            $config.remoteConfig = (await got.get(`http://${remoteConfigIp}`)).data || $config.remoteConfig
-        } else {
-            $config.remoteConfig = {}
-        }
-    } catch (e) {}
-    $config._buildId = setTimeout(_buildConfig, 3000);
-}
-
 function isArgsMatch(text, args, callback, useMd5, md5Str) {
     let match = false
     for (let arg of args) {
@@ -389,11 +338,27 @@ function requireG(module){
     } catch (e) {}
     let path = globalDirectories.npm.packages + '/' + module;
     if (!fs.existsSync(path)) {
-        throw `ERROR: ${module} not found, use [npm install -g ${module}] to install it`;
+        console.log(warnStr(`npm install -g ${module}`))
+        throw `${module} not found, use above cmd to install it`;
     }
     return require(path);
 }
 
+async function importG(module) {
+    try {
+        let result = await import(module);
+        if (result) {
+            return result
+        }
+    } catch (e) {}
+    let path = globalDirectories.npm.packages + '/' + module;
+    if (!fs.existsSync(path)) {
+        console.log(warnStr(`npm install -g ${module}`))
+        throw `${module} not found, use above cmd to install it`;
+    }
+    return await import(path);
+}
+
 function validStr(str, name) {
     if (!vl(str) || typeof str !== 'string') {
         throw "invalid cipher " + name;
@@ -434,11 +399,11 @@ function aesDecipher(str, key){
     }
 }
 
-function getConfig(key, defaultVal = '') {
-    let configInit = {}
-    if (key) {
-        configInit[key] = ''
+function getConfig(key, defaultVal) {
+    if (typeof defaultVal === "string") {
+        defaultVal = trim(defaultVal)
     }
+    let configInit = {}
     let configFile = getLibDataDir() + '/config.json';
     if (!fs.existsSync(configFile)) {
         fs.writeFileSync(configFile, JSON.stringify(configInit, null, 2));
@@ -448,23 +413,15 @@ function getConfig(key, defaultVal = '') {
     if (key === undefined) {
         return config
     }
-    let actConfigKeys = Object.keys(config);
     let writeFlag = false
-    for (let k of Object.keys(configInit)) {
-        if (actConfigKeys.indexOf(k) === -1) {
-            writeFlag = true
-            config[k] = ''
-        }
+    if (!(key in config) && defaultVal !== undefined) {
+        writeFlag = true
+        config[key] = defaultVal
     }
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
     }
-    let val
-    if (!(key in config)) {
-        val = defaultVal
-    } else {
-        val = config[key]
-    }
+    let val = config[key]
     if (typeof val === "string") {
         val = trim(val)
     }
@@ -491,25 +448,6 @@ function setConfig(key, val) {
     return val
 }
 
-async function getUniConfig(key, defaultVal) {
-    let remoteConfigIp = getConfig('remoteConfigIp')
-    let val
-    if (remoteConfigIp) {
-        if (remoteConfigIp.indexOf(":") === -1) {
-            remoteConfigIp = remoteConfigIp+":9563"
-        }
-        let machine = getConfig('machine')
-        val = (await got.get(`http://${remoteConfigIp}/${machine}${machine ? '-':''}${key}`)).data;
-        if (!vl(val)) {
-            val = (await got.get(`http://${remoteConfigIp}/${key}`)).data;
-        }
-    }
-    if (!vl(val)) {
-        val = getConfig(key, defaultVal)
-    }
-    return val;
-}
-
 function bAdd(str1, str2) {
     return new BigNumber(String(str1)).plus(new BigNumber(String(str2))).toString()
 }
@@ -1246,6 +1184,7 @@ module.exports = {
     aesCipher,
     aesDecipher,
     requireG,
+    importG,
     toBigNum,
     objDataFile,
     appendLog,
@@ -1258,7 +1197,6 @@ module.exports = {
     eFn,
     removeFirst,
     sleep,
-    getUniConfig,
     timeLimit,
     dayJs,
     setCbText,
@@ -1266,7 +1204,6 @@ module.exports = {
     vl,
     getVl,
     getFnVl,
-    $config,
     timeStr,
     splitArray,
     BigNumber,
@@ -1310,5 +1247,6 @@ module.exports = {
     iarrayDataFile,
     isArgsMatch,
     draftQuery,
-    getTextComments
+    getTextComments,
+    globalModulesPath: globalDirectories.npm.packages
 }