jsir 2.2.8 → 2.3.0

package/cmd/oaa.js

@@ -4,14 +4,14 @@ const {
     getLibDataDir, trim, regEach, getConfig, mkdir, reget,
     getCbText, e, sleep, objDataFile, vl, md5, BigNumber,
     arrayDataFile, infoStr, warnStr,
-    getInfo, ei, pad, msgStr, getType,
+    getInfo, pad, msgStr, getType,
     isMatch, draftQuery, setConfig,
     getTextComments, importG, requireG,
     clearConsole, trimText, getFnArgsStr,
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    getOr, getAlias
+    getOr, getAlias, wrapperJsirText, eia
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -26,11 +26,7 @@ const example = require("../deps/example");
 const _workspaceConfigFile = 'workspace.json';
 const _libDataDir = getLibDataDir()
 const _fileWatcherMap = {}
-const _types = {
-    'e': "exe",
-    'i': "init",
-    'f': "file"
-}
+const _types = setting.fileType
 const console = createConsole();
 
 let lastFilterArg = '';
@@ -41,6 +37,7 @@ let _rlHistory = []
 let _haveWrapperInput = true
 let _noAppendNextLine = true
 let _onLazyTempCode = null
+let _isTipsDoneShowKey = false
 
 const _onLazyGetMap = Object.create(null)
 const _data = Object.create(null)
@@ -291,7 +288,9 @@ async function nextLine(callback, promptStr, hidden) {
 }
 
 function defaultPromptStr(showKey = false) {
-    return [getTipStr(showKey), $defaultSpace].filter(i => i).join(':') + `> `;
+    let tips = [getTipStr(showKey), $defaultSpace].filter(i => i).join(':') + `> `;
+    _isTipsDoneShowKey  = showKey;
+    return tips;
 }
 
 function initRl(callback, promptStr, hidden) {
@@ -367,7 +366,11 @@ function getTipStr(showKey = false) {
             items.push(item)
         }
     }
-    return items.join(',');
+    let tips = items.join(',')
+    if (!showKey && !_isTipsDoneShowKey && tips.length > 81) {
+        return '...'
+    }
+    return tips;
 }
 
 function closeRl() {
@@ -450,9 +453,9 @@ async function save(args) {
         return
     }
     let resp;
-    if (args[0] === 'e') {
+    if (args[0].startsWith(setting.exeKey)) {
         resp = example.exeFile;
-    } else if (args[0] === 'i') {
+    } else if (args[0].startsWith(setting.initKey)) {
         resp = example.initFile;
     } else {
         resp = await getCbText();
@@ -534,7 +537,7 @@ function listCmd(tmpMap) {
         let item = {
             key: ' ' + i,
             name: pair[0] + '/' + name,
-            type: [_types[name.split(/\s+/)[0]] || 'note', suffix].map(trim).join(".")
+            type: [_types[name.substring(0, 1)] || setting.defaultType, suffix].map(trim).join(".")
         }
         items.push(item)
 
@@ -552,9 +555,9 @@ function listCmd(tmpMap) {
             }
             if (item.type) {
                 let pair = parseUniqueName(item.name);
-                if (item.type.startsWith('exe.')) {
+                if (item.type.startsWith(_types[setting.exeKey] + '.')) {
                     item.name = infoStr(pair[1])
-                } else if (item.type.startsWith('init.')) {
+                } else if (item.type.startsWith(_types[setting.initKey] + '.')) {
                     item.name = msgStr(pair[1])
                 } else {
                     item.name = pair[1]
@@ -574,6 +577,33 @@ async function wrapperInput(str) {
     }
 }
 
+function wrapperAlias(str) {
+    let aliasMap = null;
+    try {
+        aliasMap = getConfig("alias");
+    } catch (e) {
+        console.$error(e);
+    }
+    if (!aliasMap) {
+        return str;
+    }
+    let args = enrichArgs(str);
+    for (let i = 0; i < args.length; i++) {
+        let arg = args[i];
+        if (arg.endsWith("   ")) {
+            arg = `\`${arg}\``
+        } else if (arg.endsWith("  ")) {
+            arg = `"${arg}"`
+        } else if (arg.endsWith(" ")) {
+            arg = `'${arg}'`
+        } else {
+            arg = getAlias(aliasMap, arg)
+        }
+        args[i] = arg;
+    }
+    return args.join(' ')
+}
+
 async function _wrapperInput(str) {
     _haveWrapperInput = true;
     global.$newInput = true;
@@ -582,6 +612,8 @@ async function _wrapperInput(str) {
     if (!str) {
         return;
     }
+    str = wrapperAlias(str);
+
     if (/^[`'"]/.test(str)) {
         let fstr = str.substr(0, 1);
         if (fstr === '`') {
@@ -616,10 +648,10 @@ async function _wrapperInput(str) {
             let path = getFullPath(_cmdMap[strs[0]])
             let uniqueName = trim(_cmdMap[strs[0]]);
             let fileName = parseUniqueName(uniqueName)[1]
-            let firstName = fileName.split(/\s+/)[0]
-            if (firstName === 'f') {
+            let firstName = fileName.substring(0, 1)
+            if (firstName === setting.fileKey) {
                 await workFile(uniqueName)
-            } else if (firstName !== 'e') {
+            } else if (firstName !== setting.exeKey) {
                 console.log(String(fs.readFileSync(path)));
             } else {
                 await runCmd(str)
@@ -1073,7 +1105,7 @@ const keywordDef = {
                 console.warn("no items")
             } else {
                 let path = getFullPath(uniqueName)
-                ei(getEditor(), [path])
+                await eia(getEditor(), [path])
             }
         },
         args: {
@@ -1088,9 +1120,9 @@ const keywordDef = {
             if (uniqueName) {
                 let configDir = `${getLibDataDir()}/config`;
                 mkdir(configDir)
-                ei(getEditor(), [`${configDir}/${md5(uniqueName)}.json`])
+                await eia(getEditor(), [`${configDir}/${md5(uniqueName)}.json`])
             } else {
-                ei(getEditor(), [`${getLibDataDir()}/config.json`])
+                await eia(getEditor(), [`${getLibDataDir()}/config.json`])
             }
         },
         short: 's'
@@ -1179,18 +1211,17 @@ const keywordDef = {
                     let text = removeComment(String(fs.readFileSync(path)))
                     let [space] = parseUniqueName(uniqueName)
 
+                    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)
-                    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 = 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 +1315,7 @@ const keywordDef = {
             let keyword = args[0]
             let justList = false;
             if (keyword.endsWith('.')) {
-                let _tmp = getAlias(keyword.substring(0, keyword.length - 1));
+                let _tmp = trim(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,8 +1327,6 @@ const keywordDef = {
                     console.warn('invalid keyword')
                     return
                 }
-            } else {
-                keyword = getAlias(keyword)
             }
             let pair = parseUniqueName(keyword)
             let cmds;
@@ -1344,7 +1373,7 @@ const keywordDef = {
     },
     exe: {
         comment: 'System execute',
-        exeFn: (args) => {
+        exeFn: async (args) => {
             let cmd = ''
             let _args = []
             if (args.length > 0) {
@@ -1353,18 +1382,20 @@ const keywordDef = {
             if (args.length > 1) {
                 _args = args.slice(1)
             }
-            ei(`cd "${$workspaceMap[global.$defaultSpace]}";${cmd}`, _args, true)
+            await eia(`cd "${$workspaceMap[global.$defaultSpace]}";${cmd}`, _args, true)
         },
         short: 'E'
     },
     log: {
         comment: 'View log (type[[lt][le]], index)',
-        exeFn: (args) => {
+        exeFn: async (args) => {
             let path = `${getLibDataDir()}/log/jsir`
             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;
                 }
@@ -1382,7 +1413,7 @@ const keywordDef = {
                 console.warn('log file not found')
                 return;
             }
-            ei(cmdStr, [path], true)
+            await eia(cmdStr, [`"${path}"`], true)
         },
         short: 'l'
     },
@@ -1407,7 +1438,7 @@ function getQuickRunCmds(input, matchStr) {
     } else if (input.startsWith("/")) {
         matchStr = '/' + matchStr;
     }
-    return filterCmd(matchStr).filter(i => parseUniqueName(i)[1].startsWith("e "))
+    return filterCmd(matchStr).filter(i => parseUniqueName(i)[1].startsWith(setting.exeKey))
 }
 
 async function preLoad(text, fnNameMatch, fn, packages = [], space) {
@@ -1508,6 +1539,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]) {
@@ -1914,7 +1948,7 @@ function parseArgDef(inputString) {
 }
 
 function getArgDef(text, uniqueName) {
-    if (uniqueName && !parseUniqueName(uniqueName)[1].startsWith("e ")) {
+    if (uniqueName && !parseUniqueName(uniqueName)[1].startsWith(setting.exeKey)) {
         return {}
     }
     if (text.indexOf("$defArgs") === -1) {
@@ -1966,12 +2000,7 @@ function filterRequire(currSpace, cmdMatchStr) {
 
     let cmds;
     let uName = toUniqueName(cmdMatchStr, currSpace)
-    let pr = parseUniqueName(uName)
-    let fullPath;
-    if (!/^[ef]\s+/.test(pr[1])) {
-        uName = pr[0] + "/i " + pr[1].replace(/^f\s+/, '')
-        fullPath = getFullPath(uName)
-    }
+    let fullPath = getFullPath(uName)
     if (fullPath && fs.existsSync(fullPath)) {
         cmds = [uName]
     } else {
@@ -1980,6 +2009,9 @@ function filterRequire(currSpace, cmdMatchStr) {
         if (cmds.length > 0) {
             cmds = cmds.filter(cmd => parseUniqueName(cmd)[0] === (appointSpace || currSpace))
         }
+        if (cmds.length > 0) {
+            cmds = cmds.filter(cmd => parseUniqueName(cmd)[1].startsWith(setting.initKey))
+        }
     }
     if (cmds.length > 1) {
         throw `multiple match: ${cmdMatchStr}`
@@ -1995,9 +2027,9 @@ async function _requireSource(currSpace, cmdMatchStr) {
     let path = getFullPath(uniqueName)
     let text = String(await fp.readFile(path))
     let pair = parseUniqueName(uniqueName)
-    if (pair[1].startsWith('i ')) {
+    if (pair[1].startsWith(setting.initKey)) {
         result = await evalText(text, uniqueName)
-    } else if (pair[1].startsWith('e ')) {
+    } else if (pair[1].startsWith(setting.exeKey)) {
         result = async (argsStr) => {
             return await runCmd(trim(argsStr), uniqueName, text)
         }
@@ -2080,15 +2112,15 @@ function sigExit() {
 }
 
 process.on('uncaughtException',function(err){
-    console.error('uncaughtException', err)
+    console.$error('uncaughtException', err)
     _noAppendNextLine || nextLine()
 })
 process.on('unhandledRejection',function(err){
-    console.error('unhandledRejection', err)
+    console.$error('unhandledRejection', err)
     _noAppendNextLine || nextLine()
 })
 process.on('rejectionHandled',function(err){
-    console.error('rejectionHandled', err)
+    console.$error('rejectionHandled', err)
     _noAppendNextLine || nextLine()
 })
 process.on('SIGINT', sigExit);

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/setting.js

@@ -1,4 +1,21 @@
+
+const exeKey = 'e';
+const initKey = 'i';
+const fileKey = 'f';
+
+const fileType = {};
+fileType[exeKey] = "exe";
+fileType[initKey] = "init";
+fileType[fileKey] = "file";
+
+const defaultType = 'note';
+
 module.exports = {
     name: 'jsir',
-    libDataDir: '.jsirData'
-}
+    libDataDir: '.jsirData',
+    fileType,
+    exeKey,
+    initKey,
+    fileKey,
+    defaultType
+}

package/deps/util.js

@@ -1,7 +1,7 @@
 const setting = require('./setting')
 const os = require('os')
 const home = os.homedir()
-const {exec, spawnSync} = require('child_process');
+const {exec, spawnSync, spawn} = require('child_process');
 const readline = require('readline')
 const fs = require('fs')
 const fp = require('fs').promises
@@ -11,17 +11,21 @@ const crypto = require('crypto');
 const dayJs = require('dayjs')
 const table = require('console.table')
 const initModulePaths = Object.assign([], module.paths)
+const path = require('path')
+const _types = setting.fileType
+const _typeKeys = Object.keys(_types)
 
 global.$newInput = false
 global.$workspaceMap = {}
 global.$defaultSpace = 'local'
 global.$newError = false
 global.$tips = {}
-global.$packages = Object.create(null)
+global.$packages = {}
 
 let libDataDir;
 let lockDir;
 let logDir;
+let tempDir;
 let configDir;
 
 class SyncQueue {
@@ -198,10 +202,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
         });
@@ -297,6 +303,9 @@ function toJsirFileName(name) {
 }
 
 function isJsirFileName(name) {
+    if (name.indexOf(".") === 1) {
+        return _typeKeys.indexOf(name.substring(0, 1)) === -1
+    }
     return /^[^./]*[^./\s]\.[^./\s]+$/.test(name)
 }
 
@@ -604,6 +613,29 @@ function getLogDir() {
     return logDir;
 }
 
+function getTempDir() {
+    if (tempDir) {
+        return tempDir;
+    }
+    tempDir = getLibDataDir() + "/temp"
+    mkdir(tempDir)
+    return tempDir;
+}
+
+/**
+ * 根据文件完整路径，检查并创建其父级目录
+ * 示例：/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,
@@ -616,6 +648,7 @@ function createLimitLogger(fileName, {
     }
     let logDir = getLogDir()
     let logPath = logDir + "/" + fileName
+    createDirs(logPath)
     if (logInfo) {
         console.info(`log: ${logPath}`)
     }
@@ -661,7 +694,7 @@ function getInitName(fileName) {
     fileName = trim(fileName)
     let homeDir = global.$workspaceMap[$defaultSpace]
     if (!fileName.startsWith("/")) {
-        fileName = 'i ' + fileName.replace(/i\s+/, '')
+        fileName = setting.initKey + ' ' + fileName.replace(new RegExp(`^${setting.initKey}\\s+`), '')
         if (!/\..+/.test(fileName)) {
             fileName = fileName + '.js'
         }
@@ -669,6 +702,7 @@ function getInitName(fileName) {
     }
     return fileName;
 }
+
 function dataFile(fileName, fn, fmt, defaultObj = {}, returnStr = false) {
     let dataDir = getLibDataDir() + "/data"
     fileName = trim(fileName)
@@ -728,7 +762,7 @@ async function fileJson(key, fn, fmt = true) {
     let fileName = trim(key)
     let path = dataDir + "/" + fileName;
     let homeDir = global.$workspaceMap[$defaultSpace]
-    let isInit = fileName.startsWith("i ");
+    let isInit = fileName.startsWith(setting.initKey);
     if (isInit) {
         path = homeDir + '/' + toJsirFileName(fileName);
     }
@@ -766,7 +800,7 @@ function setModulePaths(space) {
 }
 
 function enrichPackages(moduleName, space) {
-    if (!global.$packages[moduleName]) {
+    if (!global.$packages.hasOwnProperty(moduleName)) {
         global.$packages[moduleName] = space
     }
 }
@@ -863,12 +897,11 @@ function getConfigDir() {
     return configDir;
 }
 
-function getAlias(key) {
+function getAlias(aliasMap, key) {
     key = trim(key)
     if (!key) {
         return key;
     }
-    let aliasMap = getConfig('alias', {});
     if (aliasMap.hasOwnProperty(key) && vl(aliasMap[key])) {
         return aliasMap[key].trim();
     }
@@ -1072,6 +1105,9 @@ function setTips(key, value, onRm) {
     `
     可以设置相同的key, value值，会在左侧提示符体现出来
     `
+    if (!vl(key) || key.indexOf(",") !== -1) {
+        throw "invalid tip key";
+    }
     getOr(global.$tips, key, []).push(value);
     if (onRm) {
         getOr(_tipsOnRm, key, []).push(onRm)
@@ -1318,7 +1354,7 @@ function mkdir(dir) {
 
 function e(cmd, mbNum = 3, doTrim = true){
     `
-    return Promise(result)
+    return Promise(resolve, reject)
     `
     return new Promise((resolve, reject) => {
         exec(`${cmd}`, {
@@ -1335,7 +1371,7 @@ function e(cmd, mbNum = 3, doTrim = true){
 
 function ee(cmd, mbNum = 3, doTrim = true){
     `
-    return Promise([stdout, stderr])
+    return Promise(resolve([stdout, stderr]))
     `
     return new Promise((resolve, reject) => {
         exec(`${cmd}`, {
@@ -1354,6 +1390,23 @@ function ei(cmd, args = [], shell = false) {
     spawnSync(cmd, args, {stdio:"inherit", shell});
 }
 
+async function eia(cmd, args = [], shell = false) {
+    `
+    当前进程不会卡住，输入输出由cmd进程持有
+    `
+    let child = spawn(cmd, args, {stdio:"inherit", shell});
+    return new Promise((resolve, reject) => {
+        // 监听子进程的关闭事件
+        child.on('close', (code) => {
+            resolve(code);
+        });
+        // 可选：监听子进程的错误事件
+        child.on('error', (err) => {
+            reject(err)
+        });
+    })
+}
+
 async function getCbText(mbNum) {
     return await e(`pbpaste`, mbNum, false)
 }
@@ -1778,7 +1831,36 @@ 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 ')
+        ;
+}
+
+async function terminalRun(cmd) {
+    `
+    打开新的苹果终端并执行命令
+    `
+    const scriptText = `tell application "Terminal"
+    activate
+    do script "${cmd}"
+end tell
+`;
+    let tempScriptPath = getTempDir() + `/terminalRun_${Date.now()}.scpt`
+    fs.writeFileSync(tempScriptPath, scriptText);
+    try {
+        console.log(await e(`osascript ${tempScriptPath}`))
+    } finally {
+        fs.unlinkSync(tempScriptPath)
+    }
+}
+
 module.exports = {
+    wrapperJsirText,
     run,
     reget,
     trim,
@@ -1873,5 +1955,9 @@ module.exports = {
     toJsirFileName,
     fileJson,
     debugStr,
-    getAlias
+    getAlias,
+    createDirs,
+    getTempDir,
+    terminalRun,
+    eia
 }

package/package.json

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