jsir 2.2.1 → 2.2.2

package/cmd/oaa.js

@@ -6,8 +6,12 @@ const {
     arrayDataFile, infoStr, warnStr, errorStack,
     getInfo, ei, pad, msgStr, getType,
     isArgsMatch, draftQuery, setConfig,
-    $log, $draft, getTextComments, getOr, importG, requireG,
-    clearConsole, trimText
+    getTextComments, importG, requireG,
+    clearConsole, trimText, getFnArgsStr,
+    createConsole, setTips, delTips,
+    getEditor, errorStr, getConfigDir,
+    getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
+    fileJson, fileLock
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -15,23 +19,19 @@ const {evalVal} = require('../deps/cleanEval')
 const _chokidar = require('chokidar');
 const setting = require('../deps/setting')
 const fs = require('fs')
+const fp = require('fs').promises
 const readline = require("readline");
 const packageJson = require("../package.json");
 const example = require("../deps/example");
 const _workspaceConfigFile = 'workspace.json';
 const _libDataDir = getLibDataDir()
-const _tipsOnRm = {}
 const _fileWatcherMap = {}
 const _types = {
     'e': "exe",
     'i': "init",
     'f': "file"
 }
-const $config = {
-    get: getConfig,
-    set: setConfig
-}
-const console = Object.assign({}, global.console);
+const console = createConsole();
 
 let lastFilterArg = '';
 let _cmdMapFile = setting.name + 'CmdMap.json'
@@ -123,13 +123,12 @@ const $data = {
     keys: () => Object.keys(_data),
     have: (key) => vl(_data[key])
 }
+const $file = {
+    json: fileJson,
+    lock: fileLock
+}
 const $homeDir = getLibDataDir()
 
-global.$tips = {}
-global.$newInput = false
-global.$workspaceMap = {}
-global.$defaultSpace = 'local'
-
 function getFileOpenExe(fileName) {
     fileName = trim(fileName);
     let strs = fileName.split('.')
@@ -321,10 +320,17 @@ function initRl(callback, promptStr, hidden) {
     }
     origin_writeToOutput = _rl._writeToOutput
     if (promptStr !== '') {
-        promptStr = (promptStr
-            || ((callback && callback !== wrapperInput) ? "-> ":"")
-            || defaultPromptStr())
-        promptStr = infoStr(promptStr)
+        promptStr = promptStr || ((callback && callback !== wrapperInput) ? "-> ":"")
+        if (promptStr) {
+            promptStr = infoStr(promptStr);
+        } else {
+            if (global.$newError) {
+                global.$newError = false;
+                promptStr = errorStr(defaultPromptStr())
+            } else {
+                promptStr = infoStr(defaultPromptStr())
+            }
+        }
     }
     if (hidden) {
         _rl._writeToOutput = function _writeToOutput(stringToWrite){
@@ -346,7 +352,13 @@ function initRl(callback, promptStr, hidden) {
 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("|");
+        let val = global.$tips[key].map(i => {
+            let item = trim(i)
+            if (item.indexOf(',') !== -1) {
+                item = `[${item}]`;
+            }
+            return item;
+        }).join("|");
         key = trim(key)
 
         let item
@@ -470,6 +482,15 @@ function rename(dir, oldName, newName) {
     } else {
         fs.renameSync(old, _new)
         console.info(`${_new} renamed`)
+
+        let configDir = getConfigDir();
+        let uniqueOld = toUniqueName(old);
+        let uniqueNew = toUniqueName(_new);
+        let configFileOld = configDir + '/' + md5(uniqueOld) + '.json';
+        let configFileNew = configDir + '/' + md5(uniqueNew) + '.json';
+        if (fs.existsSync(configFileOld) && !fs.existsSync(configFileNew)) {
+            fs.renameSync(configFileOld, configFileNew)
+        }
     }
     resetCmdMap({
         1:  toUniqueName(_new)
@@ -554,10 +575,6 @@ async function wrapperInput(str) {
     }
 }
 
-function getEditor() {
-    return getConfig("defaultEditor", "vi")
-}
-
 async function _wrapperInput(str) {
     _haveWrapperInput = true;
     global.$newInput = true;
@@ -576,8 +593,7 @@ async function _wrapperInput(str) {
             if (fLine) {
                 console.log(draftQuery(fLine).join("\n"))
             } else {
-                let text = str.substr(1) + "\n" + await nextText(line => line, fstr)
-                $draft(text)
+                console.$draft(await nextText(line => line, fstr))
             }
         }
     } else if (/^[$#*]/.test(str)) {
@@ -641,6 +657,7 @@ async function dealStar(text) {
             await dealStartGlobalMode(rows, items, text);
         }
     }
+    rows = rows.filter(i => !i.name.startsWith('_'));
     if (rows.length === 0) {
         console.warn("no items")
     } else {
@@ -664,6 +681,7 @@ function dealStarGlobal(items, text) {
 
 function dealStarCmd(rows, cmd, filterStr) {
     let content = String(fs.readFileSync(getFullPath(cmd)));
+    let lines = content.split('\n');
     let capturingFunction = false;
     let inMultiLineComment = false;
     let potentialComments = [];
@@ -682,7 +700,7 @@ function dealStarCmd(rows, cmd, filterStr) {
         comments = [];
     }
 
-    for (let line of content.split('\n')) {
+    for (let [index, line] of lines.entries()) {
         // Handle multi-line comment start or continue
         if (line.trim().startsWith('/*') || inMultiLineComment) {
             inMultiLineComment = true;
@@ -701,12 +719,16 @@ function dealStarCmd(rows, cmd, filterStr) {
         }
 
         // Check for function start
-        if ((line.startsWith('function') || line.startsWith('async function')) && isArgsMatch(line, [filterStr])) {
-            fnName = reget(line, /function\s+(\w+)\s*\(/);
-            fnType = line.startsWith('async') ? 'AsyncFunction' : 'Function';
-            capturingFunction = true;
-            comments = [...potentialComments]; // Confirm the comments are related to the function
-            potentialComments = []; // Clear the potential comments as they are now confirmed
+        if ((line.startsWith('function') || line.startsWith('async function'))) {
+            let _fnName = reget(line, /function\s+(\w+)\s*\(/);
+            let matchKey = _fnName + "(" + getFnArgsStr(lines.slice(index, index + 9).join("\n")) + ")"
+            if (isArgsMatch(matchKey, [filterStr])) {
+                fnName = _fnName;
+                fnType = line.startsWith('async') ? 'AsyncFunction' : 'Function';
+                capturingFunction = true;
+                comments = [...potentialComments]; // Confirm the comments are related to the function
+                potentialComments = []; // Clear the potential comments as they are now confirmed
+            }
         }
 
         // Capture function lines
@@ -739,7 +761,13 @@ async function dealStarCase(result, matchStrs, cmd) {
         rows.push(getInfo(result))
     } else {
         for (let key of Object.keys(result)) {
-            if (matchStrs.length === 0 || isArgsMatch(key, [matchStrs.join(' ')])){
+            let obj = result[key];
+            let type = getType(obj);
+            let matchKey = key;
+            if (type === 'Function' || type === 'AsyncFunction') {
+                matchKey = key + "(" + getFnArgsStr(String(obj)) + ")";
+            }
+            if (matchStrs.length === 0 || isArgsMatch(matchKey, [matchStrs.join(' ')])){
                 rows.push(getInfo(result[key], key))
             }
         }
@@ -994,18 +1022,39 @@ const keywordDef = {
     setting: {
         comment: 'Global settings',
         exeFn: async (args) => {
-            ei(getEditor(), [`${getLibDataDir()}/config.json`])
+            let uniqueName = _cmdMap[args[0]];
+            if (uniqueName) {
+                let isExe = uniqueName &&uniqueName.split("/")[1].startsWith('e ');
+                if (!isExe) {
+                    console.warn("not exe file")
+                    return;
+                }
+                let configDir = `${getLibDataDir()}/config`;
+                mkdir(configDir)
+                ei(getEditor(), [`${configDir}/${md5(uniqueName)}.json`])
+            } else {
+                ei(getEditor(), [`${getLibDataDir()}/config.json`])
+            }
         },
         short: 's'
     },
     open: {
         comment: 'open file',
         exeFn: async (args) => {
-            let uniqueName = _cmdMap[args[0]]
+            let uniqueName = _cmdMap[args[0]] || args.join(" ");
             if (!uniqueName) {
                 console.warn("no items")
             } else {
                 let path = getFullPath(uniqueName)
+                if (!fs.existsSync(path)) {
+                    let cmds = filterCmd(uniqueName);
+                    if (cmds.length === 1) {
+                        path = getFullPath(cmds[0])
+                    } else {
+                        console.warn("no items")
+                        return;
+                    }
+                }
                 await e(`"${getFileOpenExe(parseUniqueName(uniqueName)[1])}" "${path}"`)
             }
         },
@@ -1241,6 +1290,30 @@ const keywordDef = {
             ei(`cd "${$workspaceMap[global.$defaultSpace]}";npm ${args.join(' ')}`, [], true)
         },
         short: 'N'
+    },
+    log: {
+        comment: 'View log',
+        exeFn: (args) => {
+            let path = `${getLibDataDir()}/log/jsir`
+            let type = 'log';
+            if (args.length > 1) {
+                path = `${getLibDataDir()}/log/${md5(_cmdMap[trim(args[0])])}`
+                type = trim(args[1])
+            } else if (args.length > 0) {
+                if (_cmdMap[args[0]]) {
+                    path = `${getLibDataDir()}/log/${md5(_cmdMap[trim(args[0])])}`
+                } else {
+                    type = args[0]
+                }
+            }
+            path = path + '.' + type;
+            if (!fs.existsSync(path)) {
+                console.warn('log file not found')
+                return;
+            }
+            ei('less', [path])
+        },
+        short: 'L'
     }
 }
 
@@ -1267,11 +1340,11 @@ function preLoad(text, fnNameMatch, fn, packages = []) {
                 let result = fn(packageName)
                 if (getType(result) === 'Promise') {
                     result.catch(e => {
-                        $log(e)
+                        console.$error(e)
                     })
                 }
             } catch (e) {
-                $log(e)
+                console.$error(e)
             }
         }
     });
@@ -1420,57 +1493,6 @@ function getComments(i, cmdName, text, cols = [], col) {
     }
 }
 
-function getFullPath(name) {
-    name = trim(name)
-    if (!name) {
-        return name;
-    }
-    let uniqueName = toUniqueName(name)
-    let pair = parseUniqueName(uniqueName)
-    let space = $workspaceMap[pair[0]]
-    if (!space) {
-        return ''
-    }
-    return `${space}/${pair[1]}`
-}
-
-function toUniqueName(name, space) {
-    name = trim(name)
-    if (!name) {
-        throw `invalid name '${name}'`
-    }
-    let uniqueName
-    if (name.startsWith('/')) {
-        let items = name.split('/').map(trim).filter(i => i).reverse()
-        uniqueName = items[1] + '/' + items[0]
-    } else if (name.indexOf('/') !== -1) {
-        uniqueName = name;
-    } else {
-        uniqueName = (space || $defaultSpace) + '/' + name;
-    }
-    let pair = parseUniqueName(uniqueName);
-    return (pair[0] || space || $defaultSpace) + '/' + toJsirFileName(pair[1])
-}
-
-function toJsirFileName(name) {
-    name = trim(name)
-    if (!name) {
-        throw `invalid name '${name}'`
-    }
-    if (isJsirFileName(name)) {
-        return name;
-    }
-    name = name + '.js'
-    if (!isJsirFileName(name)) {
-        throw `invalid name '${name}'`
-    }
-    return name
-}
-
-function isJsirFileName(name) {
-    return /^[^./]*[^./\s]\.[^./\s]+$/.test(name)
-}
-
 function trimJsirFileName(name) {
     name = trim(name)
     if (isJsirFileName(name)) {
@@ -1551,12 +1573,6 @@ function getSpaceFromDir(dirPath) {
     return trim(trim(dirPath).split('/').map(trim).filter(i => i).reverse()[0])
 }
 
-function parseUniqueName(uniqueName) {
-    let pair = uniqueName.split('/').map(trim).filter(i => i)
-    let len = pair.length;
-    return [pair[len - 2], pair[len - 1]]
-}
-
 function getArgComments(argDef, showShort = false) {
     let comments = []
     let keys = Object.keys(argDef)
@@ -1569,13 +1585,13 @@ function getArgComments(argDef, showShort = false) {
     }
     if (keys.length > 0) {
         for (let k of keys) {
-            let item = warnStr(k) + (shortMap[k] ? ` ${warnStr(shortMap[k])}`:'') + (argDef[k] ? ` <${argDef[k]}>`:'')
+            let item = warnStr(k) + (shortMap[k] ? ` ${warnStr(shortMap[k])}`:'') + (argDef[k] ? ` ${argDef[k]}`:'')
             comments.push(item)
         }
-        comments[0] = '$args: ' + comments[0]
+        comments[0] = comments[0]
         if (comments.length > 1) {
             for(let i = 1; i< comments.length; i++) {
-                comments[i] = '       ' + comments[i]
+                comments[i] = comments[i]
             }
         }
     }
@@ -1680,7 +1696,8 @@ async function getScriptArgs(argDef, oriArgs) {
         }
         if (arg.startsWith(":") || arg.startsWith("_") && !arg.endsWith(' ')) {
             arg = arg.replace(/^:/, '')
-            if (oriArgs[i+1] && (oriArgs[i+1].endsWith(' ') || !(oriArgs[i+1].startsWith(":") || oriArgs[i+1].startsWith("_") || oriArgs[i+1].startsWith("-")))) {
+            if (oriArgs[i+1] &&
+                (oriArgs[i+1].endsWith(' ') || !(oriArgs[i+1].startsWith(":") || oriArgs[i+1].startsWith("_") || oriArgs[i+1].startsWith("-")))) {
                 pair = [arg, oriArgs[i+1]]
                 i++
             } else {
@@ -1776,19 +1793,41 @@ function parseArgDef(inputString) {
     if (!preStr) {
         return result;
     }
-    let ss = preStr.split(/[,\n]|(?<!\/)\/(?=\/)/g).map(trim).filter(i => i);
-    for (let i = 0; i < ss.length; i++) {
-        let s1 = trim(ss[i]);
+    let ss = preStr.split(/\n|(?<!\/)\/(?=\/)/g).map(trim).filter(i => i);
+    let items = []
+    for (let s of ss) {
+        if (s.startsWith("/")) {
+            items.push(s);
+        } else {
+            items.push(...s.split(/,/))
+        }
+    }
+    items = items.map(trim).filter(i => i);
+    for (let i = 0; i < items.length; i++) {
+        let s1 = trim(items[i]);
         if (s1.startsWith("/")) {
             continue;
         }
-        if (ss[i+1] && ss[i+1].startsWith("/")) {
-            result[s1] = trim(ss[i+1].replace(/^\//, ""));
+        if (items[i+1] && items[i+1].startsWith("/")) {
+            result[s1] = trim(items[i+1].replace(/^\//, ""));
             i++;
         } else {
             result[s1] = '';
         }
     }
+    for (let key of Object.keys(result)) {
+        let comment = result[key];
+        let defaultValStr = ''
+        if (key.indexOf("=") !== -1) {
+            delete result[key];
+            let ss = key.split('=').map(trim);
+            key = ss[0]
+            defaultValStr = ss[1]
+        }
+        if (defaultValStr) {
+            result[key] = ['<' + warnStr(defaultValStr) + '>', comment].join(' ')
+        }
+    }
     return result;
 }
 
@@ -1810,7 +1849,6 @@ function getArgDef(text, uniqueName) {
             }
         }
     } catch (e) {
-        $log(errorStack(e))
         argDef = {'[ParseError]': String(e)}
     }
     if (typeof argDef !== 'object') {
@@ -1831,45 +1869,6 @@ function getArgDef(text, uniqueName) {
     return Object.assign(temp, tempOpt)
 }
 
-function setTips(key, value, onRm) {
-    getOr(global.$tips, key, []).push(value);
-    if (onRm) {
-        getOr(_tipsOnRm, key, []).push(onRm)
-    }
-}
-
-function delTips(...keys) {
-    for (let key of Object.keys($tips)) {
-        if (keys.length === 0) {
-            delete $tips[key]
-            tipsOnRmCallback(key)
-        } else if (keys.indexOf(key) !== -1) {
-            delete $tips[key]
-            tipsOnRmCallback(key)
-        }
-    }
-    if (keys.length === 0) {
-        for (let key of Object.keys(_tipsOnRm)) {
-            tipsOnRmCallback(key)
-        }
-    }
-}
-
-function tipsOnRmCallback(key) {
-    let callbacks = _tipsOnRm[key]
-    delete _tipsOnRm[key]
-    if (callbacks && callbacks.length > 0) {
-        for (let callback of callbacks) {
-            try {
-                callback()
-            } catch (e) {
-                $log(errorStack(e))
-                console.error(`[${key}] OnRmCallback: ${String(e)}`)
-            }
-        }
-    }
-}
-
 function getCmdMd5Key(str) {
     return '0x' + md5(str).substr(0, 8);
 }
@@ -1913,7 +1912,7 @@ async function _requireSource(currSpace, cmdMatchStr) {
     let result
     let uniqueName = filterRequire(currSpace, cmdMatchStr);
     let path = getFullPath(uniqueName)
-    let text = String(fs.readFileSync(path))
+    let text = String(await fp.readFile(path))
     let pair = parseUniqueName(uniqueName)
     if (pair[1].startsWith('i ')) {
         result = await evalText(text, uniqueName)
@@ -1973,10 +1972,9 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         return await _requireSource(currSpace, matchItem)
     }
     return await evalCode(addErrorTag($text), $cmdName, $args,
-        $data, $config,
+        $data, $file,
         $require, $requires,
         nextLine, nextText,
-        setTips, delTips,
         wrapperInput, filterCmd,
         currSpace,
         $homeDir, $lib, _cmdMap);

package/deps/evalCode.js

@@ -1,25 +1,27 @@
-const {errorTag: $errorTag, importG: $import, $log, $draft} = require("./util");
+const {errorTag: $errorTag, importG: $import,
+    setTips: $setTips, delTips: $delTips,
+} = require("./util");
 require = require("./util").requireG
 module.exports = async ($text = '', $cmdName = '', $args = [],
-                        $data, $config,
+                        $data, $file,
                         $require, $requires,
                         $nextLine, $nextText,
-                        $setTips, $delTips,
                         $enter, $filterCmd,
                         $currentSpace,
                         $homeDir, $lib,
                         $cmdMap) => {
     const $defArgs = () => $args;
+    const $config = $lib.createConfig($cmdName);
     const $context = {
-        global, $data, $config,
+        $data, $config, $file,
         $require, $requires, $import, $errorTag,
         $text, $cmdName, $args,
         $nextLine, $nextText,
         $setTips, $delTips,
         $enter, $filterCmd,
-        $currentSpace, $log,
-        $draft, $homeDir, $lib, $cmdMap
+        $currentSpace, $homeDir, $lib, $cmdMap
     }
+    const console = $lib.createConsole($cmdName);
     return await eval(`(async ()=>{${$text};
     })()`)
 }