jsir 2.1.5 → 2.1.7

package/README.md

@@ -0,0 +1,49 @@
+# jsir: JavaScript Script Management Tool
+
+**jsir** is a command line tool designed to help manage and organize your JavaScript files. With **jsir**, you can edit, run, and compare JavaScript files, view file dependencies, and switch between different workspaces.
+
+## Installation
+
+You can install **jsir** globally using npm:
+
+```
+npm install -g jsir
+```
+
+## Getting Started
+
+To start using **jsir**, simply run the command:
+
+```
+jsir
+```
+
+This will open the **jsir** REPL interface where you can start managing your files.
+
+## Commands
+
+Here is a list of available commands in **jsir**:
+
+| Keyword | Short | Comment |
+| --- | --- | --- |
+| .add | .a | Add file |
+| .clear | .C | Clear task |
+| .compare | .c | Compare files |
+| .deps | .d | View file dependencies |
+| .edit | .e | Edit file |
+| .file | .f | Working file mode |
+| .get | .g | Get file |
+| .help | .h | Help documentation |
+| .list | .l | View file list |
+| .quit | .q | Exit |
+| .rename | .n | Rename file |
+| .repl | .p | Interactive interface |
+| .rm | .R | Remove file |
+| .run | .r | Quick execution |
+| .see | .s | View file |
+| .switch | .S | Switch workspace |
+| .uninstall | .u | Uninstall workspace |
+| .version | .v | View version |
+| .workspace | .w | Workspace Management |
+
+For detailed information on how to use each command, use the `.help` command followed by the short keyword of the command.

package/cmd/oaa.js

@@ -3,10 +3,11 @@ const $lib = require('../deps/util');
 const {
     getLibDataDir, trim, regEach, getConfig, mkdir, reget,
     getCbText, e, sleep, objDataFile, vl, md5, BigNumber,
-    info, warn, error, arrayDataFile, infoStr, warnStr, errorStack,
+    arrayDataFile, infoStr, warnStr, errorStack,
     getInfo, ei, pad, msgStr, getType,
     errorTag, isArgsMatch, draftQuery, setConfig,
-    $log, $draft, getTextComments, getOr, importG
+    $log, $draft, getTextComments, getOr, importG, requireG,
+    clearConsole
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -15,8 +16,8 @@ const _chokidar = require('chokidar');
 const setting = require('../deps/setting')
 const _fs = require('fs')
 const readline = require("readline");
-const {requireG} = require("../deps/util");
-
+const packageJson = require("../package.json");
+const example = require("../deps/example");
 const _workspaceConfigFile = 'workspace.json';
 const _libDataDir = getLibDataDir()
 const _tipsOnRm = {}
@@ -30,6 +31,10 @@ const $config = {
     get: getConfig,
     set: setConfig
 }
+const CONSOLE = Object.assign({}, console);
+const info = (msg) => $lib.info(msg, CONSOLE);
+const warn = (msg) => $lib.warn(msg, CONSOLE);
+const error = (msg, tag) => $lib.error(msg, tag, CONSOLE);
 
 let _cmdMapFile = setting.name + 'CmdMap.json'
 let _cmdMap = {}
@@ -40,14 +45,14 @@ let _noAppendNextLine = true
 
 const _onLazyGetMap = {}
 const _data = {}
-const _tempTime = 60 * 1000
+const _lazyTime = 5 * 60 * 1000
 const _dealOnLazyGet = (key) => {
     if (_noAppendNextLine || !_onLazyGetMap[key]) {
         return _data[key]
     }
     let item = _onLazyGetMap[key]
     if (Date.now() <= item.startTime) {
-        item.startTime = Date.now() + _tempTime
+        item.startTime = Date.now() + _lazyTime
         return _data[key]
     }
     let flag = _onLazyGetMap[key].fn()
@@ -55,14 +60,14 @@ const _dealOnLazyGet = (key) => {
         return new Promise(async (resolve, reject) => {
             try {
                 await flag
-                item.startTime = Date.now() + _tempTime
+                item.startTime = Date.now() + _lazyTime
                 resolve(_data[key])
             } catch (e) {
                 reject(e)
             }
         })
     } else {
-        item.startTime = Date.now() + _tempTime
+        item.startTime = Date.now() + _lazyTime
         return _data[key]
     }
 }
@@ -70,7 +75,7 @@ const _dataSet = (key, val, onLazyGet) => {
     if (onLazyGet) {
         _onLazyGetMap[key] = {
             fn: onLazyGet,
-            startTime: Date.now() + _tempTime
+            startTime: Date.now() + _lazyTime
         }
     }
     return _data[key] = val
@@ -209,7 +214,7 @@ async function watchFile(uniqueName) {
             text = newText;
             if (trim(exeStr)) {
                 try {
-                    console.log("\n" + infoStr("------ workFile run ------"))
+                    CONSOLE.log("\n" + infoStr("------ workFile run ------"))
                     await wrapperInput("# " + exeStr)
                 } catch (e) {
                     error(e)
@@ -377,7 +382,9 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
             _haveWrapperInput = true;
             closeRl()
             inputStr = inputStr.replace(/\s+$/, '');
-
+            if (!isText && /^\d+$/.test(inputStr) && /^\s+/.test(textLine)) {
+                inputStr = "& " + inputStr;
+            }
             let pro = (callback || wrapperInput)(inputStr);
             resolve && resolve(inputStr);
             try {
@@ -386,7 +393,11 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
                 if ((callback || wrapperInput) === wrapperInput) {
                     if (!_noAppendNextLine) {
                         if (/^\s+$/.test(textLine)) {
-                            process.stdout.write('\033[2J\033[H');
+                            if (textLine.length > 1) {
+                                clearConsole(false)
+                            } else {
+                                clearConsole();
+                            }
                             listCmd();
                             nextLine(null, defaultPromptStr(true))
                         } else {
@@ -422,30 +433,9 @@ async function save(args) {
     }
     let resp;
     if (args[0] === 'e') {
-        resp = `/*
-A test exe script
- */
-
-$defArgs({
-    arg: 'required argument',
-    _arg: 'optional argument'
-})
-
-let {} = $lib // Reference to built-in resources
-
-console.log($args)
-
-return {}
-`;
+        resp = example.exeFile;
     } else if (args[0] === 'i') {
-        resp = `/*
-A test init script
- */
-
-let {} = $lib // Reference to built-in resources
-
-return {}
-`;
+        resp = example.initFile;
     } else {
         resp = await getCbText();
     }
@@ -522,6 +512,9 @@ function listCmd(tmpMap) {
         warn("no items")
     } else {
         items.forEach(item => {
+            if (tmpList && item.key) {
+                item.key = ' - '
+            }
             if (item.type) {
                 let pair = parseUniqueName(item.name);
                 if (item.type.startsWith('exe.')) {
@@ -534,7 +527,7 @@ function listCmd(tmpMap) {
                 item.name = pair[0] + '/' + item.name
             }
         })
-        console.table(items)
+        CONSOLE.table(items)
     }
 }
 
@@ -556,11 +549,11 @@ async function _wrapperInput(str) {
     }
     if (/^&/.test(str)) {
         let cmdStr = trim(str.substr(1));
-        if (/^\d+$/.test(cmdStr) && _cmdMap[cmdStr]) {
+        if (/^\d+$/.test(cmdStr)) {
             if (_cmdMap[cmdStr]) {
                 ei('vi', [getFullPath(_cmdMap[cmdStr])])
             } else {
-                warn("no items")
+                ei('vi', ['-n'])
             }
         } else if (cmdStr) {
             ei(cmdStr.split(/\s+/)[0],
@@ -576,7 +569,7 @@ async function _wrapperInput(str) {
         } else {
             let fLine = trim(str.substr(1))
             if (fLine) {
-                console.log(draftQuery(fLine).join("\n"))
+                CONSOLE.log(draftQuery(fLine).join("\n"))
             } else {
                 let text = str.substr(1) + "\n" + await nextText(line => line, fstr)
                 $draft(text)
@@ -587,14 +580,14 @@ async function _wrapperInput(str) {
         let isStar =  str.startsWith('*')
         let text = trim(str.replace(/^[$#*]/, ''))
         if (is$) {
-            console.log(await evalText('return ' + text))
+            CONSOLE.log(await evalText('return ' + text))
         } else if (isStar) {
             if (!text) {
                 text = '$context';
             }
             let result = await evalText('return ' + text)
             if (!result || typeof result === 'string' || Object.keys(result).length === 0) {
-                console.nable([getInfo(result)])
+                CONSOLE.nable([getInfo(result)])
                 return
             }
             let rows = []
@@ -604,7 +597,7 @@ async function _wrapperInput(str) {
             if (rows.length === 0) {
                 warn("no items")
             } else {
-                console.nable(rows)
+                CONSOLE.nable(rows)
             }
         } else {
             await evalText(text)
@@ -624,7 +617,7 @@ async function _wrapperInput(str) {
             if (firstName === 'f') {
                 await workFile(uniqueName)
             } else if (firstName !== 'e') {
-                console.log(String(_fs.readFileSync(path)));
+                CONSOLE.log(String(_fs.readFileSync(path)));
             } else {
                 await runCmd(str)
             }
@@ -643,7 +636,7 @@ function arrayToCmdMap(cmds) {
 }
 
 function help() {
-    console.nable(Object.keys(keywordDef).map(key => {
+    CONSOLE.nable(Object.keys(keywordDef).map(key => {
         let item = keywordDef[key];
         return {
             keyword: ' ' + warnStr(`.${key}`),
@@ -759,7 +752,7 @@ const keywordDef = {
     version: {
         comment: 'View version',
         exeFn: (args) => {
-            console.log(require("../package.json").version)
+            CONSOLE.log(packageJson.version)
         },
         short: 'v'
     },
@@ -795,7 +788,7 @@ const keywordDef = {
             } else {
                 let path = getFullPath(uniqueName)
                 let sourceStr = String(_fs.readFileSync(path))
-                console.log(sourceStr)
+                CONSOLE.log(sourceStr)
             }
         },
         args: {
@@ -888,7 +881,7 @@ const keywordDef = {
             let bSpace = args[1]
 
             if (aUniqueName && bUniqueName) {
-                await e(`idea diff "${getFullPath(aUniqueName)}" "${getFullPath(bUniqueName)}"`)
+                await e(`${getConfig("compareExe", "idea diff")} "${getFullPath(aUniqueName)}" "${getFullPath(bUniqueName)}"`)
             } else if (aSpace && bSpace) {
                 if (!args[2]) {
                     warn('require mode')
@@ -984,7 +977,7 @@ const keywordDef = {
                     path
                 }
             })
-            console.table(items)
+            CONSOLE.table(items)
         },
         args: {
             workspacePath: 'New workspace path'
@@ -1002,7 +995,7 @@ const keywordDef = {
                     path
                 }
             })
-            console.table(items)
+            CONSOLE.table(items)
             let index = await nextLine(line => line, "index: ")
             let workspace = workspaces[index - 1]
             if (workspace) {
@@ -1027,7 +1020,7 @@ const keywordDef = {
                     path
                 }
             })
-            console.table(items)
+            CONSOLE.table(items)
             let index = trim(await nextLine(line => line, "switch workspace: "));
             if (index && workspaces[index - 1]) {
                 let workspace = workspaces[index - 1];
@@ -1055,19 +1048,31 @@ const keywordDef = {
                 warn('invalid args')
                 return
             }
-            let pair = parseUniqueName(args[0])
+            let keyword = args[0]
+            let justList = false;
+            if (keyword.endsWith('.')) {
+                let _tmp = trim(keyword.substring(0, keyword.length - 1));
+                if (_tmp) {
+                    justList = true;
+                    keyword = _tmp;
+                }
+            }
+            let pair = parseUniqueName(keyword)
             let cmds;
             if (/^0x[a-z\d]{8}$/.test(pair[1]) || pair[1].indexOf(",") !== -1) {
-                cmds = getQuickRunCmds(args[0], args[0])
+                cmds = getQuickRunCmds(keyword, keyword)
             } else {
-                cmds = getQuickRunCmds(args[0], '^e ' + toJsirFileName(pair[1]) + '$')
+                cmds = getQuickRunCmds(keyword, '^e ' + toJsirFileName(pair[1]) + '$')
                 if (cmds.length === 0) {
-                    cmds = getQuickRunCmds(args[0], args[0])
+                    cmds = getQuickRunCmds(keyword, keyword)
                 }
             }
             if (cmds.length === 1) {
-                listCmd(arrayToCmdMap(cmds))
-                await runCmd(args.slice(1).join(' '), cmds[0])
+                if (justList) {
+                    listCmd(arrayToCmdMap(cmds))
+                } else {
+                    await runCmd(args.slice(1).join(' '), cmds[0])
+                }
             } else {
                 warn(cmds.length > 1 ? "multiple match" : "no match")
             }
@@ -1081,7 +1086,7 @@ const keywordDef = {
         comment: 'Exit',
         exeFn: (args) => {
             delTips();
-            console.log(infoStr("Bye!"))
+            CONSOLE.log(infoStr("Bye!"))
             process.exit(0)
         },
         short: 'q'
@@ -1091,7 +1096,7 @@ const keywordDef = {
         exeFn: (args) => {
             _noAppendNextLine = false
             _cmdMap = {}
-            console.log(warnStr("You can start with .help, use * to expand context"))
+            CONSOLE.log(warnStr("You can start with .help, use * to expand context"))
         },
         short: 'p'
     }
@@ -1158,7 +1163,7 @@ async function _dealKeyword(keyword, args) {
         }
     }
     if (unMatched) {
-        warn(`unknown keyword: ${keyword}`)
+        await keywordDef.run.exeFn([keyword, ...args])
     }
 }
 
@@ -1382,18 +1387,15 @@ function parseUniqueName(uniqueName) {
 function getArgComments(argDef) {
     let comments = []
     let keys = Object.keys(argDef)
+    let shortMap = {}
+    let tempShortMap = getShortDefMap(keys)
+    for (let key of Object.keys(tempShortMap)) {
+        shortMap[tempShortMap[key].replace(/^:/, '')] = key;
+    }
     if (keys.length > 0) {
-        let aLine = []
         for (let k of keys) {
-            let item = warnStr(k) + (argDef[k] ? ` <${argDef[k]}>`:'')
-            if (aLine.length > 0 && [...aLine, item].join(', ').length > 64) {
-                comments.push(aLine.join(", ") + ", ")
-                aLine = []
-            }
-            aLine.push(item)
-        }
-        if (aLine.length > 0) {
-            comments.push(aLine.join(", "))
+            let item = warnStr(k) + (shortMap[k] ? ` ${warnStr(shortMap[k])}`:'') + (argDef[k] ? ` <${argDef[k]}>`:'')
+            comments.push(item)
         }
         comments[0] = '$args: ' + comments[0]
         if (comments.length > 1) {
@@ -1405,6 +1407,39 @@ function getArgComments(argDef) {
     return comments
 }
 
+function getShortStr(str) {
+    let result = []
+    for (let i = 0; i < str.length; i++) {
+        if (i === 0) {
+            result.push(str[i].toLowerCase())
+        }
+        if (/[A-Z]/.test(str[i])) {
+            result.push(str[i].toLowerCase())
+        }
+    }
+    return result.join('');
+}
+
+function getShortDefMap(argDefKeys) {
+    const result = {};
+    for (let str of argDefKeys) {
+        let originStr = ":" + str;
+        str = str.replace(/^:/, '')
+        str = str.replace(/^_/, '')
+        let shortStr = getShortStr(str);
+        let key = '-' + shortStr;
+        let val = result[key]
+        let i = 1;
+        while (val) {
+            key = '-' + shortStr + i;
+            val = result[key];
+            i ++;
+        }
+        result[key] = originStr;
+    }
+    return result;
+}
+
 async function runCmd(str = '', uniqueName = '', text = '') {
     let path = getFullPath(uniqueName);
     if (uniqueName || text) {
@@ -1433,8 +1468,9 @@ async function runCmd(str = '', uniqueName = '', text = '') {
         return;
     }
 
-    let oriArgs = enrichArgs(str, text)
     let argDef = getArgDef(text)
+    let shortDefMap = getShortDefMap(Object.keys(argDef))
+    let oriArgs = enrichArgs(str).map(i => shortDefMap[i] ? shortDefMap[i]:i)
     if (argDef['[ParseError]']) {
         throw `argDef [ParseError] ${argDef['[ParseError]']}`
     }
@@ -1445,7 +1481,7 @@ async function runCmd(str = '', uniqueName = '', text = '') {
         let arg = oriArgs[i]
         let needTrans
         let pair
-        if (arg.startsWith(":") || arg.startsWith("_")) {
+        if (arg.startsWith(":") || arg.startsWith("_") && !arg.endsWith(' ')) {
             arg = arg.replace(/^:/, '')
             if (oriArgs[i+1] && !(oriArgs[i+1].startsWith(":") || oriArgs[i+1].startsWith("_"))) {
                 pair = [arg, oriArgs[i+1]]
@@ -1547,8 +1583,8 @@ function getArgDef(text) {
         argDef = (exeStr ? evalVal(exeStr) : {}) || {}
         let array = []
         for (let key of Object.keys(argDef)) {
-            if (array.hasOwnProperty(key)) {
-                throw `invalid argName ${key}`
+            if (/\s/.test(key) || array.hasOwnProperty(key)) {
+                throw `invalid argName ${warnStr(key)}`
             }
         }
     } catch (e) {
@@ -1714,7 +1750,6 @@ async function evalText($text = '', $cmdName = '', $args = []) {
             setTips, delTips,
             wrapperInput, filterCmd,
             currSpace,
-            $log, $draft,
             $homeDir, $lib)
     } catch(e) {
         throw errorTag(e, $cmdName);

package/deps/evalCode.js

@@ -1,4 +1,4 @@
-const {info: $info, msg: $msg, warn: $warn, error: $error, importG: $import} = require("./util");
+const {info: $info, msg: $msg, warn: $warn, error: $error, importG: $import, $log, $draft} = require("./util");
 require = require("./util").requireG
 module.exports = async ($text = '', $cmdName = '', $args = [],
                         $data, $config,
@@ -7,7 +7,6 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
                         $setTips, $delTips,
                         $enter, $filterCmd,
                         $currentSpace,
-                        $log, $draft,
                         $homeDir, $lib) => {
     const $defArgs = () => $args;
     const $context = {

package/deps/example.js

@@ -0,0 +1,25 @@
+module.exports = {
+    exeFile: `/*
+A test exe script
+ */
+
+$defArgs({
+    arg: 'required argument',
+    _arg: 'optional argument'
+})
+
+let {} = $lib // Reference to built-in resources
+
+console.log($args)
+
+return {}
+`,
+    initFile: `/*
+A test init script
+ */
+
+let {} = $lib // Reference to built-in resources
+
+return {}
+`
+}

package/deps/util.js

@@ -13,6 +13,7 @@ const globalDirectories = require('global-dirs');
 const emptyFn = ()=>{}
 const dayJs = require('dayjs')
 const table = require('console.table')
+const {log: _log, clear: _clear} = console;
 const _fs = require("fs");
 if (module.paths.indexOf(globalDirectories.npm.packages) === -1) {
     module.paths.push(globalDirectories.npm.packages)
@@ -126,10 +127,10 @@ function nableStr(rows) {
     return tableStr(wrapRows(rows))
 }
 console.table = (...args) => {
-    console.log(tableStr(...args))
+    _log(tableStr(...args))
 }
 console.nable = (rows) => {
-    console.log(nableStr(rows))
+    _log(nableStr(rows))
 }
 
 function timeStr(fmt, date) {
@@ -212,9 +213,16 @@ async function timeLimit(proms, mills) {
     return result
 }
 
-function clearConsole() {
-    process.stdout.write('\033[0f');
-    console.clear()
+function clearConsole(clean = true) {
+    if (clean) {
+        // \033[0f 清除从光标位置到屏幕末尾的内容，并把光标移动到屏幕的左上角。
+        // process.stdout.write('\033[0f');
+        _clear();
+    } else {
+        // \033[2J：清空屏幕。
+        // \033[H：将光标定位到屏幕左上角。
+        process.stdout.write('\033[2J\033[H');
+    }
 }
 
 function appendLog(fileName, text) {
@@ -344,7 +352,7 @@ function requireG(moduleName){
     } catch (e) {}
     let path = globalDirectories.npm.packages + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        console.log(warnStr(`npm install -g ${moduleName}`))
+        _log(warnStr(`npm install -g ${moduleName}`))
         throw `${moduleName} not found, use above cmd to install it`;
     }
     return require(path);
@@ -359,7 +367,7 @@ async function importG(moduleName) {
     } catch (e) {}
     let path = globalDirectories.npm.packages + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        console.log(warnStr(`npm install -g ${moduleName}`))
+        _log(warnStr(`npm install -g ${moduleName}`))
         throw `${moduleName} not found, use above cmd to install it`;
     }
     return await import(path);
@@ -953,32 +961,32 @@ function wrapRows(rows) {
     return result
 }
 
-function info(msg) {
+function info(msg, _console = console) {
     if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
         msg = infoStr(msg)
     }
-    console.log(infoStr('[info]'), msg)
+    _console.log(infoStr('[info]'), msg)
 }
 
-function msg(msg) {
+function msg(msg, _console = console) {
     if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
         msg = msgStr(msg)
     }
-    console.log(msgStr('[msg]'), msg)
+    _console.log(msgStr('[msg]'), msg)
 }
 
-function warn(msg) {
+function warn(msg, _console = console) {
     if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
         msg = warnStr(msg)
     }
-    console.warn(warnStr('[warn]'), msg)
+    _console.warn(warnStr('[warn]'), msg)
 }
 
-function error(msg, tag) {
+function error(msg, tag, _console = console) {
     if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
         msg = errorStr(msg)
     }
-    console.error(errorStr(`[${tag || 'error'}]`), msg)
+    _console.error(errorStr(`[${tag || 'error'}]`), msg)
 }
 
 function infoStr(str) {

package/index.js

@@ -1,4 +0,0 @@
-
-module.exports = {
-    ...require('deps/util')
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jsir",
-  "version": "2.1.5",
-  "description": "js script manager tool",
+  "version": "2.1.7",
+  "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {
     "test": "cmd/oaa.js"
@@ -9,7 +9,12 @@
   "bin": {
     "jsir": "cmd/oaa.js"
   },
-  "keywords": [],
+  "keywords": [
+    "javascript",
+    "scripts",
+    "manager",
+    "executor"
+  ],
   "author": "",
   "license": "ISC",
   "dependencies": {