jsir 2.2.7 → 2.2.9

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, wrapperJsirText
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -1179,18 +1179,17 @@ 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)
+                    text = wrapperJsirText(text)
+
+                    await preLoad(text, "[\\s=;]require", requireG, packages, space)
+                    await preLoad(text, "^require", requireG, 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]
-                    if (loadedSpace) {
-                        info.loaded = loadedSpace
+                    if (global.$packages.hasOwnProperty(info.name)) {
+                        info.loaded = global.$packages[info.name]
                     }
                     if (info.loaded && info.loaded !== info.space) {
                         let version = getPackageVersion(info.loaded, info.name)
@@ -1284,7 +1283,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 +1295,8 @@ const keywordDef = {
                     console.warn('invalid keyword')
                     return
                 }
+            } else {
+                keyword = getAlias(keyword)
             }
             let pair = parseUniqueName(keyword)
             let cmds;
@@ -1362,7 +1363,9 @@ const keywordDef = {
             let type = '';
             for (let arg of args) {
                 if (_cmdMap[arg]) {
-                    path = `${getLibDataDir()}/log/${md5(_cmdMap[trim(arg)])}`
+                    let pair = parseUniqueName(_cmdMap[arg])
+                    let fileName = pair[0] + '/' +  pair[1].split(".")[0]
+                    path = `${getLibDataDir()}/log/${fileName}`
                 } else {
                     type = arg;
                 }
@@ -1380,7 +1383,7 @@ const keywordDef = {
                 console.warn('log file not found')
                 return;
             }
-            ei(cmdStr, [path], true)
+            ei(cmdStr, [`"${path}"`], true)
         },
         short: 'l'
     },
@@ -1506,6 +1509,9 @@ function removeComment(text) {
 function _getScriptRequires(uniqueName, cmds, links) {
     let path = getFullPath(uniqueName);
     let text = removeComment(String(fs.readFileSync(path)))
+
+    text = wrapperJsirText(text);
+
     let temp = []
     regEach(text, /\$require\s*\(([^()]+)\)/g, r=> {
         if (r[1]) {

package/deps/evalCode.js

@@ -19,9 +19,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
     };
 
     // 兼容
-    $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(');
+    $text = $lib.wrapperJsirText($text)
 
     const $setTips = $lib.setTips;
     const $delTips = $lib.delTips;

package/deps/example.js

@@ -7,11 +7,14 @@ let {
     arg, // required argument
     _arg // optional argument
 } = $defArgs()
+
 `,
     initFile: `/*
 An init script
  */
 
-return {}
+module.exports = {
+
+}
 `
 }

package/deps/util.js

@@ -11,12 +11,14 @@ const crypto = require('crypto');
 const dayJs = require('dayjs')
 const table = require('console.table')
 const initModulePaths = Object.assign([], module.paths)
+const path = require('path')
 
 global.$newInput = false
 global.$workspaceMap = {}
 global.$defaultSpace = 'local'
 global.$newError = false
 global.$tips = {}
+global.$packages = {}
 
 let libDataDir;
 let lockDir;
@@ -197,10 +199,12 @@ function createConsole(uniqueName) {
     result.$error = $error;
     result.$draft = draftLog;
     if (uniqueName) {
-        result.$log = createLimitLogger(md5(uniqueName) + '.log', {
+        let pair = parseUniqueName(uniqueName)
+        let fileName = pair[0] + '/' +  pair[1].split(".")[0]
+        result.$log = createLimitLogger(fileName + '.log', {
             logInfo: false
         });
-        result.$error = createLimitLogger(md5(uniqueName) + '.error', {
+        result.$error = createLimitLogger(fileName + '.error', {
             logInfo: false,
             error: true
         });
@@ -296,7 +300,7 @@ function toJsirFileName(name) {
 }
 
 function isJsirFileName(name) {
-    return /^[^./]*[^./\s]\.[^./\s]+$/.test(name)
+    return /^[^./]*[^./\s]\.[^./\s]+$/.test(name) && name.indexOf(".") > 1
 }
 
 function isMatch(text,
@@ -487,8 +491,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) {
@@ -597,6 +607,20 @@ function getLogDir() {
     return logDir;
 }
 
+/**
+ * 根据文件完整路径，检查并创建其父级目录
+ * 示例：/a/b/c/d.txt -> 检查并创建 /a/b/c
+ * @param {string} filePath 文件的完整路径
+ */
+function createDirs(filePath) {
+    // 1. 获取父目录，比如 '/a/b/c'
+    const dirPath = path.dirname(filePath);
+
+    // 2. 使用 mkdirSync + { recursive: true } 来递归创建目录
+    // 如果目录已存在，则不会报错
+    fs.mkdirSync(dirPath, { recursive: true });
+}
+
 function createLimitLogger(fileName, {
     maxChars = 49 * 1024 * 1024,
     logInfo = true,
@@ -609,6 +633,7 @@ function createLimitLogger(fileName, {
     }
     let logDir = getLogDir()
     let logPath = logDir + "/" + fileName
+    createDirs(logPath)
     if (logInfo) {
         console.info(`log: ${logPath}`)
     }
@@ -749,7 +774,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 +783,14 @@ function setModulePaths(space) {
     return moduleDir;
 }
 
+function enrichPackages(moduleName, space) {
+    if (!global.$packages.hasOwnProperty(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 +804,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 +821,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 +881,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';
@@ -1758,7 +1796,18 @@ function getTextComments(text) {
     return results.map(i => i.replace(/\s+$/, ''))
 }
 
+function wrapperJsirText(text) {
+    return text
+        .replace(/^require\s*\(\s*(["'`][ei]\s+)/mg, 'await $require($2')
+        .replace(/([\s=;])require\s*\(\s*(["'`][ei]\s+)/g, '$1await $require($2')
+        .replace(/([\s=;])import\s*\(/g, '$1$import(')
+        .replace(/^import\s*\(/mg, '$import(')
+        .replace(/^module\.exports\s*=\s*/m, 'return ')
+        ;
+}
+
 module.exports = {
+    wrapperJsirText,
     run,
     reget,
     trim,
@@ -1852,5 +1901,7 @@ module.exports = {
     isJsirFileName,
     toJsirFileName,
     fileJson,
-    debugStr
+    debugStr,
+    getAlias,
+    createDirs
 }

package/package.json

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