jsir 2.1.3 → 2.1.5

package/cmd/oaa.js

@@ -36,22 +36,21 @@ let _cmdMap = {}
 let _rl
 let _rlHistory = []
 let _haveWrapperInput = true
-let _exit = false
 let _noAppendNextLine = true
 
-const _onGetMap = {}
+const _onLazyGetMap = {}
 const _data = {}
 const _tempTime = 60 * 1000
-const _dealOnGet = (key) => {
-    if (_noAppendNextLine || !_onGetMap[key]) {
+const _dealOnLazyGet = (key) => {
+    if (_noAppendNextLine || !_onLazyGetMap[key]) {
         return _data[key]
     }
-    let item = _onGetMap[key]
+    let item = _onLazyGetMap[key]
     if (Date.now() <= item.startTime) {
         item.startTime = Date.now() + _tempTime
         return _data[key]
     }
-    let flag = _onGetMap[key].fn()
+    let flag = _onLazyGetMap[key].fn()
     if (getType(flag)=== 'Promise') {
         return new Promise(async (resolve, reject) => {
             try {
@@ -67,6 +66,15 @@ const _dealOnGet = (key) => {
         return _data[key]
     }
 }
+const _dataSet = (key, val, onLazyGet) => {
+    if (onLazyGet) {
+        _onLazyGetMap[key] = {
+            fn: onLazyGet,
+            startTime: Date.now() + _tempTime
+        }
+    }
+    return _data[key] = val
+}
 const $data = {
     get: (key, defaultVal) => {
         if (!vl(_data[key])) {
@@ -76,34 +84,26 @@ const $data = {
                 return _data[key]
             }
         }
-        return _dealOnGet(key)
+        return _dealOnLazyGet(key)
     },
-    gos: (key, defaultVal) => {
+    gos: (key, defaultVal, onLazyGet) => {
         if (!vl(_data[key])) {
             if (defaultVal !== undefined) {
-                _data[key] = defaultVal
-                return defaultVal
+                return _dataSet(key, defaultVal, onLazyGet)
             } else {
                 return _data[key]
             }
         }
-        return _dealOnGet(key)
-    },
-    set: (key, val, onGet) => {
-        if (onGet) {
-            _onGetMap[key] = {
-                fn: onGet,
-                startTime: Date.now() + _tempTime
-            }
-        }
-        return _data[key] = val
+        return _dealOnLazyGet(key)
     },
+    set: _dataSet,
     del: (key) => {
         let val = _data[key]
         delete _data[key]
         return val
     },
-    keys: () => Object.keys(_data)
+    keys: () => Object.keys(_data),
+    have: (key) => vl(_data[key])
 }
 const $homeDir = getLibDataDir()
 
@@ -171,7 +171,7 @@ async function getFileWatcher(workFilePath, text) {
         _fs.writeFileSync(workFilePath, text)
         let watcher = _chokidar.watch([workFilePath]);
         _fileWatcherMap[workFilePath] = watcher;
-        setTips("FILE", "FILE", () => {
+        setTips("FILE", null, () => {
             Object.keys(_fileWatcherMap).forEach(closeFileWatcher);
         })
         return watcher
@@ -270,13 +270,18 @@ function getExeStr(oldText, newText) {
     }
 }
 
-async function nextLine(callback, preStr, hidden) {
+async function nextLine(callback, promptStr, hidden) {
     return new Promise(resolve => {
-        _nextLine(callback, preStr, hidden, resolve)
+        _nextLine(callback, promptStr, hidden, resolve)
     })
 }
 
-function initRl(callback, preStr, hidden) {
+function defaultPromptStr(showKey = false) {
+    return [getTipStr(showKey), $defaultSpace].filter(i => i).join(':') + `> `;
+}
+
+function initRl(callback, promptStr, hidden) {
+    let origin_writeToOutput;
     if (!_rl) {
         _rl = readline.createInterface({
             input: process.stdin,
@@ -284,8 +289,10 @@ function initRl(callback, preStr, hidden) {
         })
         _rl.on("SIGINT", async () => {
             if (_noAppendNextLine) {
+                delTips();
                 process.exit(0);
             } else {
+                _rl._writeToOutput = origin_writeToOutput;
                 _haveWrapperInput = true;
                 _rl.clearLine(0)
                 nextLine();
@@ -293,12 +300,11 @@ function initRl(callback, preStr, hidden) {
         });
         _rl.history = _rlHistory
     }
-
-    let promptStr = preStr
+    origin_writeToOutput = _rl._writeToOutput
     if (promptStr !== '') {
-        promptStr = (preStr
+        promptStr = (promptStr
             || ((callback && callback !== wrapperInput) ? "-> ":"")
-            || [Object.values(global.$tips).map(trim).filter(i => i).map(i => i.replace(/,/g, '-')).join(','), $defaultSpace].filter(i => i).join(':') + `> `)
+            || defaultPromptStr())
         promptStr = infoStr(promptStr)
     }
     if (hidden) {
@@ -318,69 +324,88 @@ function initRl(callback, preStr, hidden) {
     _rl.setPrompt(promptStr);
 }
 
+function getTipStr(showKey = false) {
+    let items = [];
+    for (let key of Object.keys(global.$tips)) {
+        let val = global.$tips[key].map(i => trim(i).replace(/,/g, '-')).join("|");
+        key = trim(key)
+
+        let item
+        if (!showKey && vl(val)) {
+            item = val;
+        } else if (vl(key)) {
+            item = key
+        }
+        if (item) {
+            items.push(item)
+        }
+    }
+    return items.join(',');
+}
+
 function closeRl() {
     _rlHistory = _rl.history;
     _rl.close();
     _rl = null;
 }
 
-function _nextLine(callback, preStr, hidden, resolve, end) {
+function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
     end = trim(end)
     if (!_haveWrapperInput) {
         return
     }
-    initRl(callback, preStr, hidden);
+    initRl(callback, promptStr, hidden);
     _haveWrapperInput = false
     let inputStr = ''
-    let lineHander = async line => {
+    let lineHandler = async line => {
         let textLine = line
         line = trim(line)
-        if (end) {
-            if (line !== end) {
+        if (isText) {
+            if (!end) {
+                end = line
+                line = ''
+            } else if (line !== end) {
                 inputStr += textLine + '\n'
             }
         } else {
             inputStr = line
-            if (/^\s+$/.test(textLine) && (!callback || wrapperInput === callback)) {
-                process.stdout.write('\033[2J\033[H');
-                listCmd();
-            }
         }
-        if (line && (hidden || (callback && callback !== wrapperInput))) {
+        if (trim(textLine) && (hidden || (callback && callback !== wrapperInput))) {
             _rl.history = _rl.history.slice(1)
         }
-        if (!end || line === end) {
+        if (!isText || line === end) {
             _haveWrapperInput = true;
             closeRl()
             inputStr = inputStr.replace(/\s+$/, '');
 
             let pro = (callback || wrapperInput)(inputStr);
-
             resolve && resolve(inputStr);
-            let currCallback = callback;
-            callback = null;
-            hidden = false;
-            end = null;
-            inputStr = '';
-
             try {
                 await pro;
             } finally {
-                if ((currCallback || wrapperInput) === wrapperInput) {
-                    _noAppendNextLine || nextLine()
+                if ((callback || wrapperInput) === wrapperInput) {
+                    if (!_noAppendNextLine) {
+                        if (/^\s+$/.test(textLine)) {
+                            process.stdout.write('\033[2J\033[H');
+                            listCmd();
+                            nextLine(null, defaultPromptStr(true))
+                        } else {
+                            nextLine()
+                        }
+                    }
                 }
             }
         }
     }
 
     _rl.removeAllListeners('line')
-    _rl.on('line', lineHander)
+    _rl.on('line', lineHandler)
     _rl.prompt()
 }
 
 async function nextText(callback, end, hidden) {
     return new Promise(resolve => {
-        _nextLine(callback, '', hidden, resolve, end)
+        _nextLine(callback, '', hidden, resolve, end, true)
     })
 }
 
@@ -400,13 +425,13 @@ async function save(args) {
         resp = `/*
 A test exe script
  */
- 
+
 $defArgs({
-    arg: '必填参数',
-    _arg: '非必填参数'
+    arg: 'required argument',
+    _arg: 'optional argument'
 })
 
-let {} = $lib // 引用内置资源
+let {} = $lib // Reference to built-in resources
 
 console.log($args)
 
@@ -417,7 +442,7 @@ return {}
 A test init script
  */
 
-let {} = $lib // 引用内置资源
+let {} = $lib // Reference to built-in resources
 
 return {}
 `;
@@ -447,8 +472,15 @@ function rename(dir, oldName, newName) {
     listCmd()
 }
 
-function listCmd() {
-    let items = Object.values(_cmdMap)
+function listCmd(tmpMap) {
+    let tmpList = false;
+    if (tmpMap) {
+        tmpList = true;
+    } else {
+        tmpMap = _cmdMap;
+    }
+
+    tmpMap = arrayToCmdMap(Object.values(tmpMap)
         .filter(item => _fs.existsSync(getFullPath(item)))
         .sort((a,b) => {
             a = parseUniqueName(a)[1];
@@ -459,17 +491,19 @@ function listCmd() {
             orderA = orderA === -1 ? 999999:orderA;
             orderB = orderB === -1 ? 999999:orderB;
             return orderA - orderB
-        })
+        }))
 
-    _cmdMap = arrayToCmdMap(items)
-    if (_noAppendNextLine) {
-        objDataFile(_cmdMapFile, () => _cmdMap)
+    if (!tmpList) {
+        _cmdMap = tmpMap;
+        if (_noAppendNextLine) {
+            objDataFile(_cmdMapFile, () => _cmdMap)
+        }
     }
 
-    items = []
-    for (let i of Object.keys(_cmdMap)) {
-        let text = String(_fs.readFileSync(getFullPath(_cmdMap[i])))
-        let pair = parseUniqueName(_cmdMap[i])
+    let items = []
+    for (let i of Object.keys(tmpMap)) {
+        let text = String(_fs.readFileSync(getFullPath(tmpMap[i])))
+        let pair = parseUniqueName(tmpMap[i])
         let name = trimJsirFileName(pair[1])
         let suffix = getJsirFileSuffix(pair[1])
         let item = {
@@ -480,9 +514,9 @@ function listCmd() {
         items.push(item)
 
         if (!text) {
-            text = String(_fs.readFileSync(getFullPath(_cmdMap[i])))
+            text = String(_fs.readFileSync(getFullPath(tmpMap[i])))
         }
-        getComments(i, _cmdMap[i], text, items, item)
+        getComments(i, tmpMap[i], text, items, item)
     }
     if (Object.keys(items).length === 0) {
         warn("no items")
@@ -614,7 +648,7 @@ function help() {
         return {
             keyword: ' ' + warnStr(`.${key}`),
             short: ' ' + warnStr(`.${item.short}`),
-            comment: [item.comment, item.args ? getArgComments(item.args).join('\n'):''].filter(i => i).join("\n"),
+            comment: [infoStr(item.comment), item.args ? getArgComments(item.args).join('\n'):''].filter(i => i).join("\n"),
         }
     }))
 }
@@ -716,21 +750,21 @@ let compareMode = {
 
 const keywordDef = {
     help: {
-        comment: '帮助文档',
+        comment: 'Help documentation',
         exeFn: (args) => {
             help()
         },
         short: 'h'
     },
     version: {
-        comment: '查看版本',
+        comment: 'View version',
         exeFn: (args) => {
             console.log(require("../package.json").version)
         },
         short: 'v'
     },
     list: {
-        comment: '查看文件列表',
+        comment: 'View file list',
         exeFn: (args) => {
             if (args.length > 0) {
                 _cmdMap = arrayToCmdMap(filterCmd(args.length > 0 ? args.join(' '):[',']))
@@ -738,22 +772,22 @@ const keywordDef = {
             listCmd()
         },
         args: {
-            queryParams: '字符串匹配，[,]代表全部，关键字可以省略'
+            queryParams: 'string matching, [,] represents all, keywords can be omitted'
         },
         short: 'l'
     },
     clear: {
-        comment: '清除任务',
+        comment: 'Clear task',
         exeFn: (args) => {
             delTipsByIndex(args.filter(i => i))
         },
         args: {
-            tipIndex: '左侧提示符下标，可以多个用空格隔开'
+            tipIndex: 'left prompt index, can be separated by spaces for multiple'
         },
         short: 'C'
     },
     see: {
-        comment: '查看文件',
+        comment: 'View file',
         exeFn: (args) => {
             let uniqueName = _cmdMap[args[0]]
             if (!uniqueName) {
@@ -765,12 +799,12 @@ const keywordDef = {
             }
         },
         args: {
-            fileIndex: '文件下标'
+            fileIndex: 'File index'
         },
         short: 's'
     },
     rm: {
-        comment: '删除文件',
+        comment: 'Remove file',
         exeFn: (args) => {
             let uniqueName = _cmdMap[args[0]]
             if (args[0] === 'ALL') {
@@ -788,12 +822,12 @@ const keywordDef = {
             }
         },
         args: {
-            fileIndex: '文件下标, ALL代表全部'
+            fileIndex: 'File index, [ALL] for all files'
         },
         short: 'R'
     },
     get: {
-        comment: '获取文件',
+        comment: 'Get file',
         exeFn: (args) => {
             let uniqueName = _cmdMap[args[0]]
             if (args[0] === 'ALL') {
@@ -807,12 +841,12 @@ const keywordDef = {
             }
         },
         args: {
-            fileIndex: '文件下标, ALL代表全部'
+            fileIndex: 'File index, [ALL] for all files'
         },
         short: 'g'
     },
     rename: {
-        comment: '重命名文件',
+        comment: 'Rename file',
         exeFn: (args) => {
             let uniqueName = _cmdMap[args[0]]
             if (!uniqueName) {
@@ -824,13 +858,13 @@ const keywordDef = {
             }
         },
         args: {
-            fileIndex: '文件下标',
-            newName: '新名字'
+            fileIndex: 'File index',
+            newName: 'New name'
         },
         short: 'n'
     },
     edit: {
-        comment: '编辑文件',
+        comment: 'Edit file',
         exeFn: async (args) => {
             let uniqueName = _cmdMap[args[0]]
             if (!uniqueName) {
@@ -841,12 +875,12 @@ const keywordDef = {
             }
         },
         args: {
-            fileIndex: '文件下标'
+            fileIndex: 'File index'
         },
         short: 'e'
     },
     compare: {
-        comment: '比较文件',
+        comment: 'Compare files',
         exeFn: async (args) => {
             let aUniqueName = _cmdMap[args[0]]
             let bUniqueName = _cmdMap[args[1]]
@@ -878,14 +912,14 @@ const keywordDef = {
             }
         },
         args: {
-            a: '文件/工作空间',
-            b: '文件/工作空间',
+            a: 'File/workspace',
+            b: 'File/workspace',
             mode: 'a=, b=, ab=, a+, b+, ab+'
         },
         short: 'c'
     },
     deps: {
-        comment: '查看文件依赖',
+        comment: 'View file dependencies',
         exeFn: (args) => {
             let uniqueName = _cmdMap[args[0]]
             if (!uniqueName) {
@@ -909,12 +943,12 @@ const keywordDef = {
             }
         },
         args: {
-            fileIndex: '文件下标'
+            fileIndex: 'File index'
         },
         short: 'd'
     },
     file: {
-        comment: '工作文件模式',
+        comment: 'Working file mode',
         exeFn: async (args) => {
             if (args.length === 0) {
                 await workFile('')
@@ -928,12 +962,12 @@ const keywordDef = {
             }
         },
         args: {
-            fileIndex: '文件下标'
+            fileIndex: 'File index'
         },
         short: 'f'
     },
     workspace: {
-        comment: '工作空间管理',
+        comment: 'Workspace Management',
         exeFn: async (args) => {
             let newWorkspace = args.join(' ')
             if (newWorkspace) {
@@ -953,12 +987,12 @@ const keywordDef = {
             console.table(items)
         },
         args: {
-            workspacePath: '新增工作空间路径'
+            workspacePath: 'New workspace path'
         },
         short: 'w'
     },
     uninstall: {
-        comment: '卸载工作空间',
+        comment: 'Uninstall workspace',
         exeFn: async (args) => {
             let workspaces = Object.values($workspaceMap)
             let items = workspaces.map((path, index) => {
@@ -982,7 +1016,7 @@ const keywordDef = {
         short: 'u'
     },
     switch: {
-        comment: '切换工作空间',
+        comment: 'Switch workspace',
         exeFn: async (args) => {
             checkWorkspaces()
             let workspaces = Object.values($workspaceMap)
@@ -1005,54 +1039,74 @@ const keywordDef = {
         short: 'S'
     },
     add: {
-        comment: '新增文件',
+        comment: 'Add file',
         exeFn: async (args) => {
             await save(args)
         },
         args: {
-            fileName: '文件名称(e可执行，i资源文件，f工作文件), 例：.add e test'
+            fileName: 'File name (e for executable, i for resource file, f for working file), example: .add e test'
         },
         short: 'a'
     },
     run: {
-        comment: '快捷执行',
+        comment: 'Quick execution',
         exeFn: async (args) => {
             if (!args[0]) {
                 warn('invalid args')
                 return
             }
-            let cmds = filterCmd('^e ' + toJsirFileName(args[0]).replace(/^[eif]\s+/, '') + '$')
+            let pair = parseUniqueName(args[0])
+            let cmds;
+            if (/^0x[a-z\d]{8}$/.test(pair[1]) || pair[1].indexOf(",") !== -1) {
+                cmds = getQuickRunCmds(args[0], args[0])
+            } else {
+                cmds = getQuickRunCmds(args[0], '^e ' + toJsirFileName(pair[1]) + '$')
+                if (cmds.length === 0) {
+                    cmds = getQuickRunCmds(args[0], args[0])
+                }
+            }
             if (cmds.length === 1) {
+                listCmd(arrayToCmdMap(cmds))
                 await runCmd(args.slice(1).join(' '), cmds[0])
+            } else {
+                warn(cmds.length > 1 ? "multiple match" : "no match")
             }
         },
         args: {
-            fileNameReg: '文件名称匹配'
+            fileNameReg: 'File name matching'
         },
         short: 'r'
     },
     quit: {
-        comment: '退出',
+        comment: 'Exit',
         exeFn: (args) => {
+            delTips();
             console.log(infoStr("Bye!"))
-            _exit = true;
             process.exit(0)
         },
         short: 'q'
     },
     repl: {
-        comment: '交互式界面',
+        comment: 'Interactive interface',
         exeFn: (args) => {
             _noAppendNextLine = false
+            _cmdMap = {}
             console.log(warnStr("You can start with .help, use * to expand context"))
-            if (Object.keys(_cmdMap).length > 0) {
-                listCmd()
-            }
         },
         short: 'p'
     }
 }
 
+function getQuickRunCmds(input, matchStr) {
+    let pair = parseUniqueName(input)
+    if (pair[0]) {
+        matchStr = pair[0] + '/' + matchStr;
+    } else if (input.startsWith("/")) {
+        matchStr = '/' + matchStr;
+    }
+    return filterCmd(matchStr).filter(i => parseUniqueName(i)[1].startsWith("e "))
+}
+
 function preLoad(text, fnNameMatch, fn) {
     regEach(text, new RegExp(`${fnNameMatch}\\s*\\(([^()]+)\\)`, 'g'), r=> {
         let item = trim(r[1])
@@ -1180,7 +1234,7 @@ function getScriptRequires(uniqueName) {
 }
 
 function getComments(i, cmdName, text, cols = [], col) {
-    let docLines = [infoStr(getCmdMd5Key(parseUniqueName(cmdName)[1])) + " - " + infoStr(i)]
+    let docLines = [getCmdMd5Key(parseUniqueName(cmdName)[1]) + " - " + i]
     text = trim(text)
     docLines.push(...getTextComments(text))
     let argDef = getArgDef(text)
@@ -1189,12 +1243,17 @@ function getComments(i, cmdName, text, cols = [], col) {
         docLines.push(...comments)
     }
     if (docLines.length > 0) {
-        col.doc = '- ' + infoStr(trim(docLines[0]))
+        col.doc = '- ' + docLines[0]
         if (docLines.length > 1) {
-            for (let line of docLines.slice(1)) {
-                cols.push({
-                    doc: '  ' + line
-                })
+            cols.push({
+                doc: '  ' + infoStr(docLines[1])
+            })
+            if (docLines.length > 2) {
+                for (let line of docLines.slice(2)) {
+                    cols.push({
+                        doc: '  ' + line
+                    })
+                }
             }
         }
     }
@@ -1327,7 +1386,7 @@ function getArgComments(argDef) {
         let aLine = []
         for (let k of keys) {
             let item = warnStr(k) + (argDef[k] ? ` <${argDef[k]}>`:'')
-            if ([...aLine, item].join(', ').length > 64) {
+            if (aLine.length > 0 && [...aLine, item].join(', ').length > 64) {
                 comments.push(aLine.join(", ") + ", ")
                 aLine = []
             }
@@ -1392,7 +1451,8 @@ async function runCmd(str = '', uniqueName = '', text = '') {
                 pair = [arg, oriArgs[i+1]]
                 i++
             } else {
-                pair = [arg, null]
+                // 只传参数名称，不传参数，使用翻译赋值为true
+                pair = [arg, 'true   ']
             }
         } else {
             pair = [null, arg]
@@ -1422,7 +1482,7 @@ async function runCmd(str = '', uniqueName = '', text = '') {
     for (let key of Object.keys(exactArgs)) {
         scriptArgs[key] = exactArgs[key]
     }
-    let exit = false
+    let argAbsent = false
     let scriptArgKeys = Object.keys(scriptArgs);
     for(let name of argNames) {
         let defStr = argDef[name]
@@ -1436,15 +1496,15 @@ async function runCmd(str = '', uniqueName = '', text = '') {
             continue
         }
         if (scriptArgKeys.indexOf(name) === -1 || (reg && !reg.test(scriptArgs[name]))) {
-            exit = true
+            argAbsent = true
             warn(`require ${warnStr(name)}` + (defStr ? ` <${defStr}>`:''))
         }
     }
-    if (exit) {
+    if (argAbsent) {
         throw 'invalid args';
     }
 
-    process.argv = [process.argv[0], path, ...scriptArgs]
+    process.argv = [process.argv[0], path, ...(scriptArgs.map(String))]
     return await evalText(text, uniqueName, scriptArgs)
 }
 
@@ -1514,9 +1574,7 @@ function getArgDef(text) {
 }
 
 function setTips(key, value, onRm) {
-    let vals = getOr(global.$tips, key, []);
-    vals.push(value)
-    global.$tips[key] = [...new Set(vals)]
+    getOr(global.$tips, key, []).push(value);
     if (onRm) {
         getOr(_tipsOnRm, key, []).push(onRm)
     }
@@ -1677,14 +1735,17 @@ process.on('rejectionHandled',function(err){
 })
 process.on('SIGINT', function () {
     if (_noAppendNextLine) {
-        process.exit();
+        delTips();
+        process.exit(0);
     } else {
         nextLine();
     }
 });
 process.on('beforeExit', function () {
-    if (!_exit) {
-        _noAppendNextLine || nextLine();
+    if (_noAppendNextLine) {
+        delTips();
+    } else {
+        nextLine();
     }
 });
 

package/deps/util.js

@@ -43,13 +43,16 @@ function isArgsMatch(text, args, callback, useMd5) {
         for (let str of arg.split(',').map(trim).filter(i => i)) {
             let reg = new RegExp(str.split(/\s+/).join('\\s+'), 'i')
             if (useMd5 && /^0x[a-z\d]{8}$/.test(str)) {
-                if (('0x' + md5(text).substr(0, 8)) === str) {
+                if (('0x' + md5(text).substr(0, 8)) !== str) {
+                    r = false
+                    break
+                }
+            } else {
+                if (!reg.test(text)) {
+                    r = false
                     break
                 }
-            } else if (reg.test(text)){
-                break
             }
-            r = false
         }
         if (r) {
             match = true
@@ -885,22 +888,69 @@ function strEq(a, b) {
 
 function wrapRows(rows) {
     let newRows = []
+    // 构建新的数组
     for(let row of rows) {
         let temp = []
         for(let key of Object.keys(row)) {
             let val = row[key]
-            if (getType(val) !== "String") {
+            if (typeof val === 'number') {
+                let r = getOr(temp, 0, {})
+                r[key] = val;
+                continue;
+            }
+            if (typeof val !== "string") {
                 val = JSON.stringify(val, null, 2)
             }
+
+            let r = getOr(temp, 0, {})
+            r[key] = val;
+        }
+        newRows.push(...temp)
+    }
+
+    // 排序
+    if (newRows.length > 0) {
+        newRows.sort((a,b) => {
+            for (let key of Object.keys(newRows[0])) {
+                if (a[key] < b[key]) {
+                    return -1;
+                } else if (a[key] > b[key]) {
+                    return 1;
+                }
+            }
+            return 0;
+        })
+        let keyMap = {}
+        for (let newRow of newRows) {
+            let lastKey
+            for (let key of Object.keys(newRows[0])) {
+                if (keyMap[key] === newRow[key]) {
+                    if (!lastKey || newRow[lastKey] === ' - ') {
+                        newRow[key] = ' - '
+                    }
+                } else {
+                    keyMap[key] = newRow[key]
+                }
+                lastKey = key;
+            }
+        }
+    }
+
+    // 换行处理
+    let result = []
+    for(let row of newRows) {
+        let temp = []
+        for(let key of Object.keys(row)) {
+            let val = row[key]
             let items = String(val).split('\n')
             for(let i = 0; i<items.length; i++) {
                 let r = getOr(temp, i, {})
                 r[key] = items[i]
             }
         }
-        newRows.push(...temp)
+        result.push(...temp)
     }
-    return newRows
+    return result
 }
 
 function info(msg) {
@@ -1123,7 +1173,6 @@ function errorTag(e, tag) {
 function getTextComments(text) {
     let results = []
     text = text.replace(/\r/g, '\n')
-    text = text.replace(/\n+/g, '\n')
     let lines = text.split(/\n/);
 
     if (text.startsWith("/*")) {
@@ -1141,17 +1190,14 @@ function getTextComments(text) {
             results.push(line)
         }
     } else {
-        for (let key of ['#', '/', '-', ';']) {
-            if (!text.startsWith(key)) {
-                continue
-            }
+        let firstReg = /^[#/\-;]+/;
+        if (firstReg.test(text)) {
             for (let line of lines) {
                 let trimLine = trim(line)
                 if (!trimLine) {
-                    continue
+                    break
                 }
-                if (trimLine.startsWith(key)) {
-                    let line = trimLine.replace(new RegExp(`^[${key}]+`), '');
+                if (firstReg.test(trimLine)) {
                     if (trim(line)) {
                         results.push(line)
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {