jsir 2.0.0 → 2.0.2

package/cmd/oaa.js

@@ -29,7 +29,6 @@ let _rl
 let _rlHistory = []
 let _haveWrapperInput = true
 let _workspaceConfigFile = 'workspace.json';
-let _workspaces = arrayDataFile(_workspaceConfigFile)
 let _exit = false
 
 const $data = {}
@@ -60,9 +59,11 @@ function getFileOpenExe(fileName) {
 
 function checkWorkspaces() {
     let localWorkspace = _libDataDir + '/local';
-    $workspaceMap['local'] = localWorkspace;
+    global.$workspaceMap = {
+        'local': localWorkspace
+    }
     mkdir(localWorkspace)
-    for (let workspace of _workspaces) {
+    for (let workspace of arrayDataFile(_workspaceConfigFile)) {
         workspace = workspace.replace(/\/+$/, '')
         let space = getSpaceFromDir(workspace);
         if (space === 'local') {
@@ -72,18 +73,14 @@ function checkWorkspaces() {
             $workspaceMap[space] = workspace;
         }
     }
-    _workspaces = Object.values($workspaceMap);
-    arrayDataFile(_workspaceConfigFile, () => _workspaces)
+    arrayDataFile(_workspaceConfigFile, () => Object.values($workspaceMap))
     initWorkspace()
 }
 
 async function start() {
     checkWorkspaces()
 
-    if (_args[0] === '--repl') {
-        _noAppendNextLine = false
-        console.log(warnStr("You can start with .help, use * to expand context"))
-    } else if (_args[0]) {
+    if (_args[0]) {
         if (_noAppendNextLine) {
             _cmdMap = objDataFile(_cmdMapFile)
         }
@@ -95,10 +92,8 @@ async function start() {
         }).join(' ')
         await wrapperInput(line)
     } else {
-        if (_noAppendNextLine) {
-            _cmdMap = objDataFile(_cmdMapFile)
-        }
-        listCmd();
+        _noAppendNextLine = false
+        console.log(warnStr("You can start with .help, use * to expand context"))
     }
 }
 
@@ -346,7 +341,6 @@ $defArgs({
 })
 
 let {} = $lib // 引用内置资源
-let [] = await $require() // 模糊引用脚本资源
 
 console.log($args)
 
@@ -358,7 +352,6 @@ A test init script
  */
 
 let {} = $lib // 引用内置资源
-let [] = await $require() // 模糊引用脚本资源
 
 return {}
 `;
@@ -383,7 +376,7 @@ function rename(dir, oldName, newName) {
         info(`${_new} renamed`)
     }
     _cmdMap = {
-        1:  toUniqueName(newName)
+        1:  toUniqueName(_new)
     }
     listCmd()
 }
@@ -696,11 +689,13 @@ const keywordDef = {
     list: {
         comment: '查看文件列表',
         exeFn: (args) => {
-            _cmdMap = arrayToCmdMap(filterCmd(args.length > 0 ? args.join(' '):[',']))
+            if (args.length > 0) {
+                _cmdMap = arrayToCmdMap(filterCmd(args.length > 0 ? args.join(' '):[',']))
+            }
             listCmd()
         },
         args: {
-            queryParams: '条件参数(param1,param2 param3 ...)'
+            queryParams: '条件参数(param1,param2 param3 ...), [,]代表全部'
         },
         short: 'l'
     },
@@ -789,7 +784,7 @@ const keywordDef = {
             fileIndex: '文件下标',
             newName: '新名字'
         },
-        short: 'r'
+        short: 'n'
     },
     edit: {
         comment: '编辑文件',
@@ -895,10 +890,13 @@ const keywordDef = {
         exeFn: async (args) => {
             let newWorkspace = args.join(' ')
             if (newWorkspace) {
-                _workspaces.push(newWorkspace)
+                let workspaces = Object.values($workspaceMap)
+                workspaces.push(newWorkspace)
+                arrayDataFile(_workspaceConfigFile, () => workspaces)
             }
             checkWorkspaces()
-            let items = _workspaces.map((path, index) => {
+            let workspaces = Object.values($workspaceMap)
+            let items = workspaces.map((path, index) => {
                 return {
                     index: ' ' + (index + 1),
                     name: getSpaceFromDir(path),
@@ -912,11 +910,36 @@ const keywordDef = {
         },
         short: 'w'
     },
+    uninstall: {
+        comment: '卸载工作空间',
+        exeFn: async (args) => {
+            let workspaces = Object.values($workspaceMap)
+            let items = workspaces.map((path, index) => {
+                return {
+                    index: ' ' + (index + 1),
+                    name: getSpaceFromDir(path),
+                    path
+                }
+            })
+            console.table(items)
+            let index = await nextLine(line => line, "index: ")
+            let workspace = workspaces[index - 1]
+            if (workspace) {
+                workspaces = workspaces.filter(i => i !== workspace);
+                arrayDataFile(_workspaceConfigFile, () => workspaces);
+                checkWorkspaces()
+            } else {
+                warn('invalid args')
+            }
+        },
+        short: 'u'
+    },
     switch: {
         comment: '切换工作空间',
         exeFn: async (args) => {
             checkWorkspaces()
-            let items = _workspaces.map((path, index) => {
+            let workspaces = Object.values($workspaceMap)
+            let items = workspaces.map((path, index) => {
                 return {
                     index: ' ' + (index + 1),
                     name: getSpaceFromDir(path),
@@ -925,9 +948,11 @@ const keywordDef = {
             })
             console.table(items)
             let index = trim(await nextLine(line => line, "switch workspace: "));
-            if (index && _workspaces[index - 1]) {
-                let workspace = _workspaces[index - 1];
+            if (index && workspaces[index - 1]) {
+                let workspace = workspaces[index - 1];
                 initWorkspace(getSpaceFromDir(workspace))
+            } else {
+                warn('no items')
             }
         },
         short: 'S'
@@ -942,6 +967,25 @@ const keywordDef = {
         },
         short: 'a'
     },
+    run: {
+        comment: '快捷执行',
+        exeFn: async (args) => {
+            if (!args[0]) {
+                warn('invalid args')
+                return
+            }
+            let cmds = filterCmd('^e ' + toJsirFileName(args[0]).replace(/^[eif]\s+/, '') + '$')
+            _cmdMap = arrayToCmdMap(cmds)
+            listCmd()
+            if (cmds.length === 1) {
+                await runCmd('1 ' + args.slice(1).join(' '))
+            }
+        },
+        args: {
+            fileNameReg: '文件名称匹配'
+        },
+        short: 'r'
+    },
     quit: {
         comment: '退出',
         exeFn: (args) => {
@@ -1104,17 +1148,12 @@ function getJsirFileSuffix(name) {
 
 function initWorkspace(space) {
     let current = getConfig("workspace");
-    if (current && space && current === space) {
-        // 值没有改变
-        return;
-    }
     let workspace = space || current || 'local'
-    if (workspace) {
-        setConfig("workspace", workspace)
-        global.$defaultSpace = workspace;
-    } else {
-        global.$defaultSpace = workspace;
+    if (!$workspaceMap[current]) {
+        workspace = 'local'
     }
+    setConfig("workspace", workspace)
+    global.$defaultSpace = workspace;
 }
 
 function filterCmd(arg){
@@ -1122,11 +1161,11 @@ function filterCmd(arg){
     let spaceName
     if (arg.indexOf('/') !== -1) {
         let index = arg.indexOf('/');
-        spaceName = arg.substring(0, index) || $defaultSpace
+        spaceName = trim(arg.substring(0, index)) || $defaultSpace
         arg = trim(arg.substring(index + 1))
     }
     let cmds = []
-    for (let workspace of _workspaces) {
+    for (let workspace of Object.values($workspaceMap)) {
         let spaceTmp = getSpaceFromDir(workspace);
         if (!spaceName || spaceName === spaceTmp) {
             cmds.push(..._filterCmd(workspace, arg));
@@ -1514,11 +1553,14 @@ async function evalText($text = '', $cmdName = '', $args = []) {
     } else {
         currSpace = $defaultSpace
     }
-    let $require = async (...matchItems) => {
+    let $requires = async (...matchItems) => {
         return await _requireSources(currSpace, ...matchItems)
     }
+    let $require = async (matchItem, printLog) => {
+        return (await _requireSources(currSpace, matchItem, printLog))[0]
+    }
     try {
-        return await evalCode($text, $cmdName, $args, $require, $data,
+        return await evalCode($text, $cmdName, $args, $data, $require, $requires,
             nextLine, nextText, setTips, delTips, wrapperInput, filterCmd,
             currSpace, $log, $draft, $config, $homeDir, $lib)
     } catch(e) {

package/evalCode.js

@@ -5,7 +5,8 @@ const {info: $info, msg: $msg, warn: $warn, error: $error,
     importG: $import} = require("./util");
 require = require("./util").requireG;
 module.exports = async ($text = '', $cmdName = '', $args = [],
-                        $require, $data,
+                        $data,
+                        $require, $requires,
                         $nextLine, $nextText,
                         $setTips, $delTips,
                         $enter, $filterCmd,
@@ -15,7 +16,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
     const $defArgs = () => $args;
     const $context = {
         global, $data,
-        $require, $import,
+        $require, $requires, $import,
         $info, $msg, $warn, $error,
         $infoStr, $msgStr, $warnStr, $errorStr,
         $tableStr, $nableStr,

package/package.json

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