jsir 2.2.7 → 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')
@@ -1179,16 +1179,16 @@ const keywordDef = {
                     let text = removeComment(String(fs.readFileSync(path)))
                     let [space] = parseUniqueName(uniqueName)
 
-                   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)
+                    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)
                 }
                 Object.keys(packages).forEach(key => {
                     let info = packages[key];
                     info.version = getPackageVersion(info.space, info.name)
-                    let loadedSpace = getOr(global, '$packages', {})[info.name]
+                    let loadedSpace = global.$packages[info.name]
                     if (loadedSpace) {
                         info.loaded = loadedSpace
                     }
@@ -1284,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);
@@ -1296,6 +1296,8 @@ const keywordDef = {
                     console.warn('invalid keyword')
                     return
                 }
+            } else {
+                keyword = getAlias(keyword)
             }
             let pair = parseUniqueName(keyword)
             let cmds;

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) {
@@ -749,7 +756,7 @@ async function fileJson(key, fn, fmt = true) {
 }
 
 function setModulePaths(space) {
-    let moduleDir = $workspaceMap[space || global.$defaultSpace] + '/node_modules'
+    let moduleDir = $workspaceMap[space] + '/node_modules'
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
         module.paths.push(moduleDir)
@@ -758,7 +765,14 @@ function setModulePaths(space) {
     return moduleDir;
 }
 
+function enrichPackages(moduleName, space) {
+    if (!global.$packages[moduleName]) {
+        global.$packages[moduleName] = space
+    }
+}
+
 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)
@@ -772,21 +786,15 @@ function requireG(moduleName, space){
     } catch (e) {}
     let path = moduleDir + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        throw `${space || global.$defaultSpace} package [${moduleName}] not found`;
+        throw `${space} package [${moduleName}] not found`;
     }
     let result = require(path);
     enrichPackages(moduleName, space);
     return result;
 }
 
-function enrichPackages(moduleName, space) {
-    let packages = getOr(global, '$packages', {});
-    if (!packages[moduleName]) {
-        packages[moduleName] = space
-    }
-}
-
 async function importG(moduleName, space) {
+    space = space || global.$defaultSpace;
     let moduleDir = setModulePaths(space);
     try {
         let result = await import(moduleName);
@@ -795,7 +803,7 @@ async function importG(moduleName, space) {
     } catch (e) {}
     let path = moduleDir + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        throw `${space || global.$defaultSpace} package [${moduleName}] not found`;
+        throw `${space} package [${moduleName}] not found`;
     }
     let result = await import(require.resolve(path));
     enrichPackages(moduleName, space);
@@ -855,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';
@@ -1852,5 +1872,6 @@ module.exports = {
     isJsirFileName,
     toJsirFileName,
     fileJson,
-    debugStr
+    debugStr,
+    getAlias
 }

package/package.json

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