jsir 2.2.6 → 2.2.8

package/cmd/oaa.js

@@ -11,7 +11,7 @@ const {
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    fileJson, fileLock, getOr
+    getOr, getAlias
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -123,10 +123,6 @@ const $data = {
     key: () => Object.keys(_data),
     has: (key) => vl(_data[key])
 }
-const $file = {
-    json: fileJson,
-    lock: fileLock
-}
 const $homeDir = getLibDataDir()
 
 function getFileOpenExe(fileName) {
@@ -471,6 +467,9 @@ async function save(args) {
 
 function resetCmdMap(cmdMap = {}) {
     lastFilterArg = '';
+    if (_noAppendNextLine) {
+        setConfig("lastFilterArg", lastFilterArg)
+    }
     _cmdMap = cmdMap;
 }
 
@@ -875,6 +874,16 @@ function delTipsByIndex(idxs) {
     delTips(...params)
 }
 
+function getPackageVersion(space, name) {
+    let moduleDir = $workspaceMap[space] + '/node_modules'
+    let dir = moduleDir + "/" + name;
+    if (fs.existsSync(dir) && fs.existsSync(dir + '/package.json')) {
+        return require(dir + '/package.json').version;
+    } else {
+        return 'Unknown';
+    }
+}
+
 function copyToSpace(uniqueName) {
     let path = getFullPath(uniqueName)
     let text = String(fs.readFileSync(path))
@@ -1155,7 +1164,7 @@ const keywordDef = {
     },
     deps: {
         comment: 'View file dependencies',
-        exeFn: (args) => {
+        exeFn: async (args) => {
             let uniqueName = _cmdMap[args[0]]
             if (!uniqueName) {
                 console.warn("no items")
@@ -1164,32 +1173,34 @@ const keywordDef = {
                 resetCmdMap(arrayToCmdMap([uniqueName, ...cmds]))
                 listCmd()
 
-                let packages = []
+                let packages = {}
                 for (let un of [uniqueName, ...cmds]) {
                     let path = getFullPath(un);
                     let text = removeComment(String(fs.readFileSync(path)))
+                    let [space] = parseUniqueName(uniqueName)
 
-                    preLoad(text, "[\\s=;]require", requireG, packages)
-                    preLoad(text, "^require", requireG, packages)
-                    preLoad(text, "\\$import", importG, packages)
-                    preLoad(text, "[\\s=;]import", importG, packages)
-                    preLoad(text, "^import", importG, packages)
+                    await preLoad(text, "[\\s=;]require", requireG, packages, space)
+                    await preLoad(text, "^require", requireG, packages, space)
+                    await preLoad(text, "\\$import", importG, packages, space)
+                    await preLoad(text, "[\\s=;]import", importG, packages, space)
+                    await preLoad(text, "^import", importG, packages, space)
                 }
-                let moduleDir = $workspaceMap[global.$defaultSpace] + '/node_modules'
-                let deps = {}
-                packages.forEach(name => {
-                    if (deps[name]) {
-                        return;
+                Object.keys(packages).forEach(key => {
+                    let info = packages[key];
+                    info.version = getPackageVersion(info.space, info.name)
+                    let loadedSpace = global.$packages[info.name]
+                    if (loadedSpace) {
+                        info.loaded = loadedSpace
                     }
-                    let dir = moduleDir + "/" + name;
-                    if (fs.existsSync(dir) && fs.existsSync(dir + '/package.json')) {
-                        deps[name] = require(dir + '/package.json').version;
-                    } else {
-                        deps[name] = 'Unknown';
+                    if (info.loaded && info.loaded !== info.space) {
+                        let version = getPackageVersion(info.loaded, info.name)
+                        if (version !== info.version) {
+                            info.loaded = info.loaded + ":" + getPackageVersion(info.loaded, info.name)
+                        }
                     }
                 })
                 console.info("package version")
-                console.log(JSON.stringify(deps, null, 2))
+                console.nable(Object.values(packages))
             }
         },
         args: {
@@ -1273,7 +1284,7 @@ const keywordDef = {
             let keyword = args[0]
             let justList = false;
             if (keyword.endsWith('.')) {
-                let _tmp = trim(keyword.substring(0, keyword.length - 1));
+                let _tmp = getAlias(keyword.substring(0, keyword.length - 1));
                 if (_tmp) {
                     if (keywordDef[_tmp] || Object.values(keywordDef).map(item => item.short).indexOf(_tmp) !== -1) {
                         help(i => i === _tmp || keywordDef[i].short === _tmp);
@@ -1285,6 +1296,8 @@ const keywordDef = {
                     console.warn('invalid keyword')
                     return
                 }
+            } else {
+                keyword = getAlias(keyword)
             }
             let pair = parseUniqueName(keyword)
             let cmds;
@@ -1397,27 +1410,30 @@ function getQuickRunCmds(input, matchStr) {
     return filterCmd(matchStr).filter(i => parseUniqueName(i)[1].startsWith("e "))
 }
 
-function preLoad(text, fnNameMatch, fn, packages = []) {
-    regEach(text, new RegExp(`${fnNameMatch}\\s*\\(([^()]+)\\)`, 'g'), r=> {
+async function preLoad(text, fnNameMatch, fn, packages = [], space) {
+    let flags = fnNameMatch.startsWith("^") ? 'mg':'g';
+    let items = []
+    regEach(text, new RegExp(`${fnNameMatch}\\s*\\(([^()]+)\\)`, flags), r=> {
         let item = trim(r[1])
         if (item) {
-            try {
-                let packageName = evalVal(item);
-                if (packages.indexOf(packageName) !== -1) {
-                    return;
-                }
-                packages.push(packageName)
-                let result = fn(packageName)
-                if (getType(result) === 'Promise') {
-                    result.catch(e => {
-                        console.$error(e)
-                    })
-                }
-            } catch (e) {
-                console.$error(e)
-            }
+            items.push(item)
         }
     });
+    for (let item of items) {
+        try {
+            let packageName = evalVal(item);
+            if (packages[packageName]) {
+                return;
+            }
+            packages[space + ":" + packageName] = {
+                name: packageName,
+                space,
+            };
+            await fn(packageName, space)
+        } catch (e) {
+            console.$error(e)
+        }
+    }
     return packages;
 }
 
@@ -2037,7 +2053,7 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         return await _requireSource(currSpace, matchItem)
     }
     return await evalCode(addErrorTag($text), $cmdName, $args,
-        $data, $file,
+        $data,
         $require, $requires,
         nextLine, nextText,
         wrapperInput, filterCmd,

package/deps/evalCode.js

@@ -1,9 +1,5 @@
-const {errorTag: $errorTag, importG: $import,
-    setTips: $setTips, delTips: $delTips,
-} = require("./util");
-require = require("./util").requireG
 module.exports = async ($text = '', $cmdName = '', $args = [],
-                        $data, $file,
+                        $data,
                         $require, $requires,
                         $nextLine, $nextText,
                         $enter, $filterCmd,
@@ -11,19 +7,36 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
                         $homeDir, $lib,
                         $cmdMap) => {
     const $defArgs = () => $args;
+
+    // 重定义加载方法
+    const $import = async (moduleName) => await $lib.importG(moduleName, $currentSpace);
+    const require = (moduleName) => $lib.requireG(moduleName, $currentSpace);
+
     const $config = $lib.createConfig($cmdName);
+    const $file = {
+        json: $lib.fileJson,
+        lock: $lib.fileLock
+    };
+
+    // 兼容
+    $text = $text.replace(/^module\.exports\s*=\s*/m, 'return ');
+    $text = $text.replace(/([\s=;])import\s*\(/g, '$1$import(');
+    $text = $text.replace(/^import\s*\(/mg, '$import(');
+
+    const $setTips = $lib.setTips;
+    const $delTips = $lib.delTips;
+    const $errorTag = $lib.errorTag;
+
     const $context = {
         $data, $config, $file,
-        $require, $requires, $import, $errorTag,
+        $require, $requires, $import,
         $text, $cmdName, $args,
         $nextLine, $nextText,
         $setTips, $delTips,
         $enter, $filterCmd,
-        $currentSpace, $homeDir, $lib, $cmdMap
+        $currentSpace, $homeDir, $lib, $cmdMap,
     }
     let console = $lib.createConsole($cmdName);
-    // 兼容module.exports
-    $text = $text.replace(/^module\.exports\s*=\s*/m, 'return ')
     return await eval(`(async ()=>{${$text};
     })()`)
 }

package/deps/util.js

@@ -17,6 +17,7 @@ global.$workspaceMap = {}
 global.$defaultSpace = 'local'
 global.$newError = false
 global.$tips = {}
+global.$packages = Object.create(null)
 
 let libDataDir;
 let lockDir;
@@ -487,8 +488,14 @@ function trimEmptyLine(text) {
     return lines.slice(start, end + 1).join('\n');
 }
 
+let defaultEditor = "vi";
 function getEditor() {
-    return getConfig("defaultEditor", "vi")
+    try {
+        defaultEditor = getConfig("defaultEditor", "vi");
+    } catch (e) {
+        console.$error('getConfig failed', e);
+    }
+    return defaultEditor
 }
 
 function timeStr(fmt, date) {
@@ -748,46 +755,59 @@ async function fileJson(key, fn, fmt = true) {
     return result;
 }
 
-function requireG(moduleName){
-    let moduleDir = $workspaceMap[global.$defaultSpace] + '/node_modules'
+function setModulePaths(space) {
+    let moduleDir = $workspaceMap[space] + '/node_modules'
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
         module.paths.push(moduleDir)
         module.paths.push(...initModulePaths)
     }
-    try {
-        let result = require(moduleName);
-        if (result) {
-            return result
-        }
-    } catch (e) {}
-    let path = moduleDir + '/' + moduleName;
-    if (!fs.existsSync(path)) {
-        console.log(warnStr(`npm install ${moduleName}`))
-        throw `${moduleName} not found, use npm install to add it`;
+    return moduleDir;
+}
+
+function enrichPackages(moduleName, space) {
+    if (!global.$packages[moduleName]) {
+        global.$packages[moduleName] = space
     }
-    return require(path);
 }
 
-async function importG(moduleName) {
-    let moduleDir = $workspaceMap[global.$defaultSpace] + '/node_modules'
+function requireG(moduleName, space){
+    space = space || global.$defaultSpace;
+    let moduleDir = setModulePaths(space);
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
         module.paths.push(moduleDir)
         module.paths.push(...initModulePaths)
     }
+    try {
+        let result = require(moduleName);
+        enrichPackages(moduleName, space);
+        return result
+    } catch (e) {}
+    let path = moduleDir + '/' + moduleName;
+    if (!fs.existsSync(path)) {
+        throw `${space} package [${moduleName}] not found`;
+    }
+    let result = require(path);
+    enrichPackages(moduleName, space);
+    return result;
+}
+
+async function importG(moduleName, space) {
+    space = space || global.$defaultSpace;
+    let moduleDir = setModulePaths(space);
     try {
         let result = await import(moduleName);
-        if (result) {
-            return result
-        }
+        enrichPackages(moduleName, space);
+        return result
     } catch (e) {}
     let path = moduleDir + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        console.log(warnStr(`npm install ${moduleName}`))
-        throw `${moduleName} not found, use npm install to add it`;
+        throw `${space} package [${moduleName}] not found`;
     }
-    return await import(require.resolve(path));
+    let result = await import(require.resolve(path));
+    enrichPackages(moduleName, space);
+    return result;
 }
 
 function validStr(str, name) {
@@ -843,6 +863,18 @@ function getConfigDir() {
     return configDir;
 }
 
+function getAlias(key) {
+    key = trim(key)
+    if (!key) {
+        return key;
+    }
+    let aliasMap = getConfig('alias', {});
+    if (aliasMap.hasOwnProperty(key) && vl(aliasMap[key])) {
+        return aliasMap[key].trim();
+    }
+    return key
+}
+
 function _getConfig(key, defaultVal, uniqueName) {
     let configInit = {}
     let configFile = getLibDataDir() + '/config.json';
@@ -1840,5 +1872,6 @@ module.exports = {
     isJsirFileName,
     toJsirFileName,
     fileJson,
-    debugStr
+    debugStr,
+    getAlias
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {