jsir 1.3.2 → 2.0.1

package/cmd/{ooa.js → oaa.js}

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 const {
     getLibDataDir, trim, regEach, getConfig, mkdir, reget,
-    getCbText, e, sleep, objDataFile, setConfig, vl, md5, BigNumber,
+    getCbText, e, sleep, objDataFile, vl, md5, BigNumber,
     info, warn, error, arrayDataFile, infoStr, warnStr, errorStack,
     getInfo, ei, pad, msgStr, getType,
-    errorTag, isArgsMatch, draftQuery
+    errorTag, isArgsMatch, draftQuery, setConfig,
+    $log, $draft, $config, getTextComments
 } = require('../util')
 const evalCode = require('../evalCode')
 
@@ -16,38 +17,31 @@ const _types = {
 const _chokidar = require('chokidar');
 const _fs = require('fs')
 const _libDataDir = getLibDataDir()
-const _home = _libDataDir + '/ooa'
 const _args = process.argv.slice(2).map(trim)
 const _history9 = []
 const _tipsOnRm = {}
 const readline = require("readline");
 const _fileWatcherMap = {}
-
+const setting = require('../setting')
+let _cmdMapFile = setting.name + 'CmdMap.json'
 let _cmdMap = {}
 let _rl
 let _rlHistory = []
 let _haveWrapperInput = true
-let _repos = arrayDataFile('repos.json')
+let _workspaceConfigFile = 'workspace.json';
 let _exit = false
 
 const $data = {}
+const $homeDir = getLibDataDir()
+const $lib = {...require('../util')}
 
-global.$lib = {}
 global.$tips = {}
 global.$newInput = false
-
-try {
-    getConfig("jsLibSource")
-} catch (e) {
-    error(e)
-}
+global.$workspaceMap = {}
+global.$defaultSpace = 'local'
 
 let _noAppendNextLine = true
 
-function initRuntime() {
-    global.$lib = {...require('../util')}
-}
-
 function getFileOpenExe(fileName) {
     fileName = trim(fileName);
     let strs = fileName.split('.')
@@ -63,17 +57,32 @@ function getFileOpenExe(fileName) {
     return exe || 'idea';
 }
 
+function checkWorkspaces() {
+    let localWorkspace = _libDataDir + '/local';
+    global.$workspaceMap = {
+        'local': localWorkspace
+    }
+    mkdir(localWorkspace)
+    for (let workspace of arrayDataFile(_workspaceConfigFile)) {
+        workspace = workspace.replace(/\/+$/, '')
+        let space = getSpaceFromDir(workspace);
+        if (space === 'local') {
+            continue
+        }
+        if (_fs.existsSync(workspace)) {
+            $workspaceMap[space] = workspace;
+        }
+    }
+    arrayDataFile(_workspaceConfigFile, () => Object.values($workspaceMap))
+    initWorkspace()
+}
+
 async function start() {
-    mkdir(_home)
-    dealSourceCmds()
+    checkWorkspaces()
 
-    if (_args[0] === '--repl') {
-        initRuntime()
-        _noAppendNextLine = false
-        console.log(warnStr("You can start with .help"))
-    } else if (_args[0]) {
+    if (_args[0]) {
         if (_noAppendNextLine) {
-            _cmdMap = objDataFile('ooaCmdMap.json')
+            _cmdMap = objDataFile(_cmdMapFile)
         }
         let line = _args.map(i => {
             if (/\s+/.test(i) || !i) {
@@ -81,21 +90,14 @@ async function start() {
             }
             return i
         }).join(' ')
-        if (/^\d+$/.test(_args[0])) {
-            if (_args[0] === '0' || (_cmdMap[_args[0]] && ['e ', 'f '].filter(i => _cmdMap[_args[0]].startsWith(i)).length > 0)) {
-                initRuntime()
-            }
-        }
         await wrapperInput(line)
     } else {
-        if (_noAppendNextLine) {
-            _cmdMap = objDataFile('ooaCmdMap.json')
-        }
-        listCmd();
+        _noAppendNextLine = false
+        console.log(warnStr("You can start with .help, use * to expand context"))
     }
 }
 
-async function getFileWatcher(fileName, workFilePath, text) {
+async function getFileWatcher(workFilePath, text) {
     info("workFile open " + workFilePath)
     if (!_fileWatcherMap[workFilePath]) {
         _fs.unlinkSync(workFilePath)
@@ -118,22 +120,21 @@ function closeFileWatcher(workFilePath) {
     delete _fileWatcherMap[workFilePath]
 }
 
-async function workFile(name) {
-    name = trim(name)
-    if (!name) {
-        name = 'workFile'
+async function workFile(uniqueName) {
+    uniqueName = trim(uniqueName)
+    if (!uniqueName) {
+        uniqueName = toUniqueName('f workFile')
     }
-    let fileName = `f ${toJsirFileName(name)}`
-    await watchFile(fileName)
+    await watchFile(uniqueName)
 }
 
-async function watchFile(fileName) {
-    let workFilePath = `${_home}/${fileName}`;
+async function watchFile(uniqueName) {
+    let workFilePath = getFullPath(uniqueName);
     if (!_fs.existsSync(workFilePath)) {
         _fs.writeFileSync(workFilePath, '');
     }
     let text = String(_fs.readFileSync(workFilePath))
-    let watcher = await getFileWatcher(fileName, workFilePath, text)
+    let watcher = await getFileWatcher(workFilePath, text)
 
     if (watcher) {
         watcher.on('change', async () => {
@@ -152,7 +153,7 @@ async function watchFile(fileName) {
             closeFileWatcher(workFilePath);
         });
     }
-    await e(`"${getFileOpenExe(fileName)}" "${workFilePath}"`)
+    await e(`"${getFileOpenExe(parseUniqueName(uniqueName)[1])}" "${workFilePath}"`)
 }
 
 function getExeStr(oldText, newText) {
@@ -227,12 +228,11 @@ function initRl(callback, preStr, hidden) {
         _rl.history = _rlHistory
     }
 
-    let repoTip = trim(trim(getConfig("jsLibSource")).split('/').map(trim).reverse().filter(i => i)[0])
     let promptStr = preStr
     if (promptStr !== '') {
         promptStr = (preStr
             || ((callback && callback !== wrapperInput) ? "-> ":"")
-            || [Object.values(global.$tips).filter(i => String(i)).join(','), repoTip].filter(i => i).join(':') + `> `)
+            || [Object.values(global.$tips).filter(i => String(i)).join(','), $defaultSpace].filter(i => i).join(':') + `> `)
         promptStr = infoStr(promptStr)
     }
     if (hidden) {
@@ -318,24 +318,13 @@ async function nextText(callback, end, hidden) {
     })
 }
 
-function dealSourceCmds() {
-    let source = trim(getConfig("jsLibSource"));
-    if (source && _fs.existsSync(source)) {
-        _fs.readdirSync(source).filter(isJsirFileName).forEach(item => {
-            if (!_fs.existsSync(_home + "/" + item)) {
-                _fs.writeFileSync(_home + "/" + item, String(_fs.readFileSync(source + "/" + item)))
-            }
-        })
-    }
-}
-
 async function save(args) {
-    let name = toJsirFileName(args.join(' '))
-    let path = `${_home}/${name}`
+    let uniqueName = toUniqueName(toJsirFileName(args.join(' ')))
+    let path = getFullPath(uniqueName)
     if (_fs.existsSync(path)) {
         warn(`${path} already exist`)
         _cmdMap = {
-            1:  name
+            1:  uniqueName
         }
         listCmd()
         return
@@ -374,32 +363,24 @@ return {}
     _fs.writeFileSync(path, resp)
     info(`${path} created`)
     _cmdMap = {
-        1:  name
+        1:  uniqueName
     }
     listCmd()
 }
 
-function rename(dir, oldName, newName, isOoa) {
+function rename(dir, oldName, newName) {
     let old = dir + '/' + oldName;
     let _new = dir + '/' + newName;
     if (_fs.existsSync(_new)) {
-        if (isOoa) {
-            warn(`${_new} already exist`)
-            _cmdMap = {
-                1:  newName
-            }
-            listCmd()
-        }
-        return
-    }
-    _fs.rename(old, _new, ()=>{})
-    if (isOoa) {
+        warn(`${_new} already exist`)
+    } else {
+        _fs.rename(old, _new, ()=>{})
         info(`${_new} renamed`)
-        _cmdMap = {
-            1:  newName
-        }
-        listCmd()
     }
+    _cmdMap = {
+        1:  toUniqueName(newName)
+    }
+    listCmd()
 }
 
 function putHis(x) {
@@ -422,85 +403,57 @@ function hisToCmdMap() {
     _cmdMap = cmdMap
 }
 
-function listCmd(prefixKey, inputCmdMap) {
-    let currCmdMap = _cmdMap
-    if (inputCmdMap) {
-        currCmdMap =inputCmdMap;
-    }
-    let newCmdMap = {}
-    let prefixMap = {}
-    for (let i of Object.keys(currCmdMap)) {
-        let jsLib = trim(getConfig("jsLibSource"))
-        let sourceFile = jsLib + "/" + currCmdMap[i]
-        let prefix = [' ', ' ']
-        prefixMap[currCmdMap[i]] = prefix;
-        if (jsLib && _fs.existsSync(sourceFile)) {
-            prefix[1] = '#'
-            let text1 = String(_fs.readFileSync(_home + "/" + currCmdMap[i]))
-            let text2 = String(_fs.readFileSync(sourceFile))
-            if (text1 !== text2) {
-                prefix[0] = '*'
-            }
-        }
-    }
-    let items = Object.values(currCmdMap)
-        .filter(item => _fs.existsSync(_home + "/" + item)
-            && ((prefixKey === '' && prefixMap[item].filter(i => trim(i)).length <= 0)
-                || (trim(prefixKey) && prefixMap[item].indexOf(trim(prefixKey)) !== -1)
-                || (!prefixKey && prefixKey !== '')))
+function listCmd() {
+    let items = Object.values(_cmdMap)
+        .filter(item => _fs.existsSync(getFullPath(item)))
         .sort((a,b) => {
+            a = parseUniqueName(a)[1];
+            b = parseUniqueName(b)[1];
             let typeKeys = Object.keys(_types);
             let orderA = typeKeys.indexOf(a.split(/\s+/)[0]);
             let orderB = typeKeys.indexOf(b.split(/\s+/)[0]);
-            orderA = orderA === -1 ? 999:orderA;
-            orderB = orderB === -1 ? 999:orderB;
+            orderA = orderA === -1 ? 999999:orderA;
+            orderB = orderB === -1 ? 999999:orderB;
             return orderA - orderB
         })
-    for(let i = 0; i< items.length; i++) {
-        newCmdMap[i + 1] =items[i]
-    }
 
-    currCmdMap = newCmdMap
-    if (!inputCmdMap) {
-        _cmdMap = newCmdMap
-        if (_noAppendNextLine) {
-            objDataFile('ooaCmdMap.json', () => _cmdMap)
-        }
-    } else {
-        for (let key of Object.keys(inputCmdMap)) {
-            delete inputCmdMap[key]
-        }
-        Object.assign(inputCmdMap, newCmdMap)
+    _cmdMap = arrayToCmdMap(items)
+    if (_noAppendNextLine) {
+        objDataFile(_cmdMapFile, () => _cmdMap)
     }
 
     items = []
-    for (let i of Object.keys(currCmdMap)) {
-        let prefix = prefixMap[currCmdMap[i]]
-        let text = String(_fs.readFileSync(_home + "/" + currCmdMap[i]))
-        let name = trimJsirFileName(currCmdMap[i])
-        let suffix = getJsirFileSuffix(currCmdMap[i])
+    for (let i of Object.keys(_cmdMap)) {
+        let text = String(_fs.readFileSync(getFullPath(_cmdMap[i])))
+        let pair = parseUniqueName(_cmdMap[i])
+        let name = trimJsirFileName(pair[1])
+        let suffix = getJsirFileSuffix(pair[1])
         let item = {
-            key: prefix.join('') + i,
-            name: name.replace(/^[eif]\s+/, ''),
+            key: ' ' + i,
+            name: pair[0] + '/' + name.replace(/^[eif]\s+/, ''),
             type: [_types[name.split(/\s+/)[0]] || 'note', suffix].map(trim).join(".")
         }
         items.push(item)
 
         if (!text) {
-            text = String(_fs.readFileSync(_home + "/" + currCmdMap[i]))
+            text = String(_fs.readFileSync(getFullPath(_cmdMap[i])))
         }
-        getComments(i, currCmdMap[i], text, items, item)
+        getComments(i, _cmdMap[i], text, items, item)
     }
     if (Object.keys(items).length === 0) {
         warn("no items")
     } else {
         items.forEach(item => {
             if (item.type) {
+                let pair = parseUniqueName(item.name);
                 if (item.type.startsWith('exe.')) {
-                    item.name = infoStr(item.name)
+                    item.name = infoStr(pair[1])
                 } else if (item.type.startsWith('init.')) {
-                    item.name = msgStr(item.name)
+                    item.name = msgStr(pair[1])
+                } else {
+                    item.name = pair[1]
                 }
+                item.name = pair[0] + '/' + item.name
             }
         })
         console.table(items)
@@ -527,7 +480,7 @@ async function _wrapperInput(str) {
         let cmdStr = trim(str.substr(1));
         if (/^\d+$/.test(cmdStr) && _cmdMap[cmdStr]) {
             if (_cmdMap[cmdStr]) {
-                ei('vi', [getLibDataDir() + '/ooa/' + _cmdMap[cmdStr]])
+                ei('vi', [getFullPath(_cmdMap[cmdStr])])
             } else {
                 warn("no items")
             }
@@ -558,6 +511,9 @@ async function _wrapperInput(str) {
         if (is$) {
             console.log(await evalText('return ' + text))
         } else if (isStar) {
+            if (!text) {
+                text = '$context';
+            }
             let items = text.split(/\s+/).map(trim).filter(i => i)
             let result = await evalText('return ' + items[0])
             if (!result || typeof result === 'string' || Object.keys(result).length === 0) {
@@ -567,7 +523,7 @@ async function _wrapperInput(str) {
             let rows = []
             let matchs = items.slice(1)
             for (let key of Object.keys(result)) {
-                if (matchs.length === 0 || isArgsMatch(key, matchs)){
+                if (matchs.length === 0 || isArgsMatch(key, [matchs.join(' ')])){
                     rows.push(getInfo(result[key], key))
                 }
             }
@@ -587,17 +543,18 @@ async function _wrapperInput(str) {
             help()
         }
     } else if (!str.split(/\s+/)[0].match(/^\d+$/)) {
-        _cmdMap = filterCmd(str.split(/\s+/))
+        _cmdMap = arrayToCmdMap(filterCmd(str))
         listCmd()
     } else {
         let strs = str.split(/\s+/)
         if (_cmdMap[strs[0]]) {
             putHis(_cmdMap[strs[0]])
-            let path = _home + '/' + _cmdMap[strs[0]]
-            let fileName = trim(_cmdMap[strs[0]]);
+            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') {
-                await workFile(fileName.replace(/^\s*f\s*/, ''))
+                await workFile(uniqueName)
             } else if (firstName !== 'e') {
                 console.log(String(_fs.readFileSync(path)));
             } else {
@@ -609,6 +566,13 @@ async function _wrapperInput(str) {
     }
 }
 
+function arrayToCmdMap(cmds) {
+    let cmdMap = {}
+    for (let i = 0; i < cmds.length; i++) {
+        cmdMap[i + 1] = cmds[i];
+    }
+    return cmdMap
+}
 
 function help() {
     console.nable(Object.keys(keywordDef).map(key => {
@@ -640,6 +604,82 @@ function delTipsByIndex(idxs) {
     delTips(...params)
 }
 
+function copyToSpace(uniqueName) {
+    let path = getFullPath(uniqueName)
+    let text = String(_fs.readFileSync(path))
+    let fileName = parseUniqueName(uniqueName)[1];
+    let targetPath = $workspaceMap[$defaultSpace] + '/' + fileName;
+    if (_fs.existsSync(targetPath)) {
+        warn(`${fileName} already exist in ${$defaultSpace}`)
+    } else {
+        _fs.writeFileSync(targetPath, text)
+        info(`get ${uniqueName} to ${$defaultSpace}`)
+    }
+}
+
+let compareMode = {
+    'a=': (aSpace, bSpace, as, bs) => {
+        let result = []
+        for (let a of as) {
+            if (bs.indexOf(a) !== -1) {
+                result.push(aSpace + '/' + a)
+            }
+        }
+        return result
+    },
+    'b=': (aSpace, bSpace, as, bs) => {
+        let result = []
+        for (let a of as) {
+            if (bs.indexOf(a) !== -1) {
+                result.push(bSpace + '/' + a)
+            }
+        }
+        return result
+    },
+    'ab=': (aSpace, bSpace, a, b, as, bs) => {
+        let result = []
+        for (let a of as) {
+            if (bs.indexOf(a) !== -1) {
+                result.push(aSpace + '/' + a)
+                result.push(bSpace + '/' + a)
+            }
+        }
+        return result
+    },
+    'a+': (aSpace, bSpace, as, bs) => {
+        let result = []
+        for(let a of as) {
+            if (bs.indexOf(a) === -1) {
+                result.push(aSpace + '/' + a)
+            }
+        }
+        return result
+    },
+    'b+': (aSpace, bSpace, as, bs) => {
+        let result = []
+        for(let b of bs) {
+            if (as.indexOf(b) === -1) {
+                result.push(bSpace + '/' + b)
+            }
+        }
+        return result
+    },
+    'ab+': (aSpace, bSpace, as, bs) => {
+        let result = []
+        for(let a of as) {
+            if (bs.indexOf(a) === -1) {
+                result.push(aSpace + '/' + a)
+            }
+        }
+        for(let b of bs) {
+            if (as.indexOf(b) === -1) {
+                result.push(bSpace + '/' + b)
+            }
+        }
+        return result
+    }
+}
+
 const keywordDef = {
     help: {
         comment: '帮助文档',
@@ -649,13 +689,15 @@ const keywordDef = {
         short: 'H'
     },
     list: {
-        comment: '查看本地文件列表',
+        comment: '查看文件列表',
         exeFn: (args) => {
-            _cmdMap = filterCmd(args.length > 0 ? args:[','])
+            if (args.length > 0) {
+                _cmdMap = arrayToCmdMap(filterCmd(args.length > 0 ? args.join(' '):[',']))
+            }
             listCmd()
         },
         args: {
-            queryParams: '条件参数(param1,param2 param3 ...)'
+            queryParams: '条件参数(param1,param2 param3 ...), [,]代表全部'
         },
         short: 'l'
     },
@@ -670,13 +712,13 @@ const keywordDef = {
         short: 'C'
     },
     see: {
-        comment: '查看本地文件',
+        comment: '查看文件',
         exeFn: (args) => {
-            let name = _cmdMap[args[0]]
-            if (!name) {
+            let uniqueName = _cmdMap[args[0]]
+            if (!uniqueName) {
                 warn("no items")
             } else {
-                let path = _home + '/' + name
+                let path = getFullPath(uniqueName)
                 let sourceStr = String(_fs.readFileSync(path))
                 console.log(sourceStr)
             }
@@ -687,147 +729,74 @@ const keywordDef = {
         short: 's'
     },
     rm: {
-        comment: '删除本地文件以及其源文件',
+        comment: '删除文件',
         exeFn: (args) => {
-            let name = _cmdMap[args[0]]
-            if (!name) {
+            let uniqueName = _cmdMap[args[0]]
+            if (args[0] === 'ALL') {
+                for (let value of Object.values(_cmdMap)) {
+                    let path = getFullPath(value)
+                    _fs.unlinkSync(path)
+                    info(`${path} removed`)
+                }
+            } else if (!uniqueName) {
                 warn("no items")
             } else {
-                let path = _home + '/' + name
+                let path = getFullPath(uniqueName)
                 _fs.unlinkSync(path)
-                let jsLibDir = trim(getConfig("jsLibSource"))
-                if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                    if (_fs.existsSync(jsLibDir + '/' + name)) {
-                        _fs.unlinkSync(jsLibDir + '/' + name)
-                    }
-                }
                 info(`${path} removed`)
             }
         },
         args: {
-            fileIndex: '文件下标'
+            fileIndex: '文件下标, ALL代表全部'
         },
         short: 'R'
     },
-    rename: {
-        comment: '重命名本地文件以及其源文件',
-        exeFn: (args) => {
-            let name = _cmdMap[args[0]]
-            if (!name) {
-                warn("no items")
-            } else {
-                let newName =trim(args.slice(1).join(" "))
-                if (newName) {
-                    newName = toJsirFileName(newName)
-                    let jsLibDir = trim(getConfig("jsLibSource"))
-                    if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                        if (_fs.existsSync(jsLibDir + '/' + name)) {
-                            rename(jsLibDir, name, newName)
-                        }
-                    }
-                    rename(_home, name, newName, true)
-                }
-            }
-        },
-        args: {
-            fileIndex: '文件下标',
-            newName: '新名字'
-        },
-        short: 'r'
-    },
-    source: {
-        comment: '查看源文件',
-        exeFn: (args) => {
-            let name = _cmdMap[args[0]]
-            if (!name) {
-                warn("no items")
-            } else {
-                let jsLibDir = trim(getConfig("jsLibSource"))
-                if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                    let sFile = jsLibDir + "/" + name
-                    if (_fs.existsSync(sFile)) {
-                        let sourceStr = String(_fs.readFileSync(sFile))
-                        console.log(sourceStr)
-                    }
-                } else {
-                    warn('require origin workspace')
-                }
-            }
-        },
-        args: {
-            fileIndex: '文件下标'
-        },
-        short: 'S'
-    },
     get: {
-        comment: '将源文件内容覆盖到本地文件',
+        comment: '获取文件',
         exeFn: (args) => {
-            let name = _cmdMap[args[0]]
-            if (!args[0]) {
-                listCmd('*')
-            } else if (!name) {
+            let uniqueName = _cmdMap[args[0]]
+            if (args[0] === 'ALL') {
+                for (let value of Object.values(_cmdMap)) {
+                    copyToSpace(value)
+                }
+            } else if (!uniqueName) {
                 warn("no items")
             } else {
-                let jsLibDir = trim(getConfig("jsLibSource"))
-                if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                    let sFile = jsLibDir + "/" + name
-                    if (_fs.existsSync(sFile)) {
-                        let sourceStr = String(_fs.readFileSync(sFile))
-                        let path = _home + '/' + name
-                        if (sourceStr) {
-                            _fs.writeFileSync(path, sourceStr)
-                        }
-                    }
-                    info(`${name} pulled`)
-                } else {
-                    warn('require origin workspace')
-                }
+                copyToSpace(uniqueName)
             }
         },
         args: {
-            fileIndex: '文件下标'
+            fileIndex: '文件下标, ALL代表全部'
         },
         short: 'g'
     },
-    push: {
-        comment: '将本地文件内容覆盖到源文件',
+    rename: {
+        comment: '重命名文件',
         exeFn: (args) => {
-            let name = _cmdMap[args[0]]
-            if (!args[0]) {
-                listCmd('#')
-            } else if (!name) {
+            let uniqueName = _cmdMap[args[0]]
+            if (!uniqueName) {
                 warn("no items")
             } else {
-                let jsLibDir = trim(getConfig("jsLibSource"))
-                if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                    _fs.writeFileSync(jsLibDir + "/" + name, String(_fs.readFileSync(_home + '/' + name)))
-                    info(`${name} pushed`)
-                } else {
-                    warn('require origin workspace')
-                }
+                let pair = parseUniqueName(uniqueName)
+                let newName =trim(args.slice(1).join(" "))
+                rename($workspaceMap[pair[0]], pair[1], toJsirFileName(newName), true)
             }
         },
         args: {
-            fileIndex: '文件下标'
-        },
-        short: 'p'
-    },
-    unsync: {
-        comment: '查看未同步源文件的本地文件列表',
-        exeFn: (args) => {
-            listCmd('')
+            fileIndex: '文件下标',
+            newName: '新名字'
         },
-        short: 'u'
+        short: 'n'
     },
     edit: {
-        comment: '编辑本地文件',
+        comment: '编辑文件',
         exeFn: async (args) => {
-            let name = _cmdMap[args[0]]
-            if (!name) {
+            let uniqueName = _cmdMap[args[0]]
+            if (!uniqueName) {
                 warn("no items")
             } else {
-                let path = _home + '/' + name
-                await e(`"${getFileOpenExe(name)}" "${path}"`)
+                let path = getFullPath(uniqueName)
+                await e(`"${getFileOpenExe(parseUniqueName(uniqueName)[1])}" "${path}"`)
             }
         },
         args: {
@@ -836,44 +805,61 @@ const keywordDef = {
         short: 'e'
     },
     compare: {
-        comment: '比较本地文件和源文件',
+        comment: '比较文件',
         exeFn: async (args) => {
-            let name = _cmdMap[args[0]]
-            if (!name) {
-                warn("no items")
-            } else {
-                let path = _home + '/' + name
-                let jsLibDir = trim(getConfig("jsLibSource"))
-                if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                    let sPath = jsLibDir + "/" + name
-                    await e(`idea diff "${sPath}" "${path}"`)
-                } else {
-                    warn('require origin workspace')
+            let aUniqueName = _cmdMap[args[0]]
+            let bUniqueName = _cmdMap[args[1]]
+            let aSpace = args[0]
+            let bSpace = args[1]
+
+            if (aUniqueName && bUniqueName) {
+                await e(`idea diff "${getFullPath(aUniqueName)}" "${getFullPath(bUniqueName)}"`)
+            } else if (aSpace && bSpace) {
+                if (!args[2]) {
+                    warn('require mode')
+                    return
                 }
-            }
-        },
-        args: {
-            fileIndex: '文件下标',
-        },
-        short: 'c'
-    },
-    deps: {
-        comment: '查看文件依赖',
-        exeFn: (args) => {
-            let name = _cmdMap[args[0]]
-            if (!name) {
-                warn("no items")
-            } else {
-                let md5Keys = getScriptRequires(name);
-                _cmdMap = filterCmd(md5Keys)
+
+                let mode = args[2]
+                if (Object.keys(compareMode).indexOf(mode) === -1) {
+                    warn('invalid mode')
+                    return;
+                }
+
+                let aFiles = _fs.readdirSync($workspaceMap[aSpace]).filter(isJsirFileName)
+                let bFiles = _fs.readdirSync($workspaceMap[bSpace]).filter(isJsirFileName)
+
+                let result = compareMode[mode](aSpace, bSpace, aFiles, bFiles);
+                _cmdMap = arrayToCmdMap(result)
                 listCmd()
+            } else {
+                warn('invalid args')
             }
         },
         args: {
-            fileIndex: '文件下标'
+            a: '文件/工作空间',
+            b: '文件/工作空间',
+            mode: 'a=, b=, ab=, a+, b+, ab+'
         },
-        short: 'd'
+        short: 'c'
     },
+    // deps: {
+    //     comment: '查看文件依赖',
+    //     exeFn: (args) => {
+    //         let uniqueName = _cmdMap[args[0]]
+    //         if (!uniqueName) {
+    //             warn("no items")
+    //         } else {
+    //             let md5Keys = getScriptRequires(uniqueName);
+    //             _cmdMap = arrayToCmdMap(filterCmd(md5Keys))
+    //             listCmd()
+    //         }
+    //     },
+    //     args: {
+    //         fileIndex: '文件下标'
+    //     },
+    //     short: 'd'
+    // },
     history: {
         comment: '查看执行记录',
         exeFn: (args) => {
@@ -902,36 +888,76 @@ const keywordDef = {
         short: 'f'
     },
     workspace: {
-        comment: '源空间管理',
+        comment: '工作空间管理',
         exeFn: async (args) => {
-            let newRepo = args.join(' ')
-            let currRepo = getConfig('jsLibSource');
-            if (!newRepo) {
-                console.log(`current: ${currRepo}`)
-                _repos = _repos.filter(i => _fs.existsSync(i))
-                for(let i = 0; i<_repos.length; i++) {
-                    console.log(`${i+1}: ${_repos[i]}`)
+            let newWorkspace = args.join(' ')
+            if (newWorkspace) {
+                let workspaces = Object.values($workspaceMap)
+                workspaces.push(newWorkspace)
+                arrayDataFile(_workspaceConfigFile, () => workspaces)
+            }
+            checkWorkspaces()
+            let workspaces = Object.values($workspaceMap)
+            let items = workspaces.map((path, index) => {
+                return {
+                    index: ' ' + (index + 1),
+                    name: getSpaceFromDir(path),
+                    path
                 }
-                let repoStr = trim(await nextLine(line => line, 'reset(or blank): '))
-                if (/^\d+$/.test(repoStr)) {
-                    repoStr = _repos[Number(repoStr) - 1]
+            })
+            console.table(items)
+        },
+        args: {
+            workspacePath: '新增工作空间路径'
+        },
+        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
                 }
-                newRepo = repoStr
+            })
+            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')
             }
-            if (newRepo && newRepo !== currRepo) {
-                if (_fs.existsSync(newRepo)) {
-                    setConfig('jsLibSource', newRepo)
-                    if (_repos.indexOf(newRepo) === -1) {
-                        _repos.push(newRepo)
-                    }
-                    arrayDataFile('repos.json', () => _repos)
-                    dealSourceCmds()
-                } else {
-                    warn(`repo ${newRepo} not exist`)
+        },
+        short: 'u'
+    },
+    switch: {
+        comment: '切换工作空间',
+        exeFn: async (args) => {
+            checkWorkspaces()
+            let workspaces = Object.values($workspaceMap)
+            let items = workspaces.map((path, index) => {
+                return {
+                    index: ' ' + (index + 1),
+                    name: getSpaceFromDir(path),
+                    path
                 }
+            })
+            console.table(items)
+            let index = trim(await nextLine(line => line, "switch workspace: "));
+            if (index && workspaces[index - 1]) {
+                let workspace = workspaces[index - 1];
+                initWorkspace(getSpaceFromDir(workspace))
+            } else {
+                warn('no items')
             }
         },
-        short: 'w'
+        short: 'S'
     },
     add: {
         comment: '新增文件',
@@ -943,6 +969,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) => {
@@ -973,62 +1018,52 @@ async function dealKeyword(str) {
     }
 }
 
-function getScriptMd5Map() {
-    let files = _fs.readdirSync(_home)
-    let md5Map = {}
-    for (let file of files) {
-        file = trim(file)
-        md5Map['0x' + md5(file).substr(0, 8)] = file;
-    }
-    return md5Map
-}
-
-function _getScriptRequires(md5Map, scriptName, md5Keys, links) {
-    let path = _home + '/' + scriptName;
-    let text = String(_fs.readFileSync(path))
-    let temp = []
-    regEach(text, /(0x[0-9a-f]{8})/g, r=> {
-        temp.push(r[1])
-    });
-    temp = [...new Set(temp)]
-    temp = temp.filter(i => {
-        let have = md5Map[i];
-        if (have && links.indexOf(i) !== -1) {
-            let items = [...links, i];
-            let errorStr = items.map(item => item === i ? warnStr(item):item).join("->")
-            throw `circle deps: ${errorStr}`
-        }
-        return have;
-    })
-    md5Keys.push(...temp)
-    for (let md5Key of temp) {
-        _getScriptRequires(md5Map, md5Map[md5Key], md5Keys, [...links, md5Key])
-    }
-}
-
-function getScriptRequires(scriptName) {
-    let md5Keys = [];
-    _getScriptRequires(getScriptMd5Map(), scriptName, md5Keys, ['0x' + md5(scriptName).substr(0, 8)]);
-    return md5Keys
-}
+// function getScriptMd5Map() {
+//     let md5Map = {}
+//     _workspaces.forEach(i => _getScriptMd5Map(i, md5Map))
+//     return md5Map
+// }
+
+// function _getScriptMd5Map(dir, md5Map) {
+//     let files = _fs.readdirSync(dir).filter(isJsirFileName)
+//     for (let file of files) {
+//         md5Map[getCmdMd5Key(file)] = file;
+//     }
+// }
+
+// function _getScriptRequires(uniqueName, matchStrs, links) {
+//     let path = getFullPath(uniqueName);
+//     let text = String(_fs.readFileSync(path))
+//     let temp = []
+//     regEach(text, /\$require\s*\([^()]+\)/g, r=> {
+//         temp.push(r[1])
+//     });
+//     temp = [...new Set(temp)]
+//     temp = temp.filter(i => {
+//         let have = md5Map[i];
+//         if (have && links.indexOf(i) !== -1) {
+//             let items = [...links, i];
+//             let errorStr = items.map(item => item === i ? warnStr(item):item).join("->")
+//             throw `circle deps: ${errorStr}`
+//         }
+//         return have;
+//     })
+//     md5Keys.push(...temp)
+//     for (let md5Key of temp) {
+//         _getScriptRequires(md5Map, md5Map[md5Key], md5Keys, [...links, md5Key])
+//     }
+// }
+
+// function getScriptRequires(uniqueName) {
+//     let matchStrs = [];
+//     _getScriptRequires(uniqueName, matchStrs, [getCmdMd5Key(uniqueName)]);
+//     return md5Keys
+// }
 
 function getComments(i, cmdName, text, cols = [], col) {
-    let docLines = [infoStr('0x' + md5(cmdName).substr(0, 8)) + " - " + infoStr(i)]
+    let docLines = [infoStr(getCmdMd5Key(parseUniqueName(cmdName)[1])) + " - " + infoStr(i)]
     text = trim(text)
-    if (text.startsWith("/*")) {
-        for (let line of text.split("\n")) {
-            let trimLine = trim(line)
-            if (trimLine.startsWith("/*")) {
-                continue
-            }
-            if (trimLine.endsWith("*/")) {
-                break
-            }
-            if (trimLine) {
-                docLines.push(line)
-            }
-        }
-    }
+    docLines.push(...getTextComments(text))
     let argDef = getArgDef(text)
     let comments = getArgComments(argDef)
     if (comments) {
@@ -1046,8 +1081,43 @@ 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`
+    }
+    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`
+    }
     if (isJsirFileName(name)) {
         return name;
     }
@@ -1059,14 +1129,13 @@ function toJsirFileName(name) {
 }
 
 function isJsirFileName(name) {
-    name = trim(name)
-    return /^[^.]*[^.\s]\.[^.\s]+$/.test(name)
+    return /^[^./]*[^./\s]\.[^./\s]+$/.test(name)
 }
 
 function trimJsirFileName(name) {
     name = trim(name)
     if (isJsirFileName(name)) {
-        return trim(name.replace(/\.[^.\s]+$/, ''))
+        return trim(name.replace(/\.[^./\s]+$/, ''))
     }
     return name
 }
@@ -1079,23 +1148,55 @@ function getJsirFileSuffix(name) {
     return ''
 }
 
-function filterCmd(args){
+function initWorkspace(space) {
+    let current = getConfig("workspace");
+    let workspace = space || current || 'local'
+    if (!$workspaceMap[current]) {
+        workspace = 'local'
+    }
+    setConfig("workspace", workspace)
+    global.$defaultSpace = workspace;
+}
+
+function filterCmd(arg){
+    arg = trim(arg)
+    let spaceName
+    if (arg.indexOf('/') !== -1) {
+        let index = arg.indexOf('/');
+        spaceName = trim(arg.substring(0, index)) || $defaultSpace
+        arg = trim(arg.substring(index + 1))
+    }
+    let cmds = []
+    for (let workspace of Object.values($workspaceMap)) {
+        let spaceTmp = getSpaceFromDir(workspace);
+        if (!spaceName || spaceName === spaceTmp) {
+            cmds.push(..._filterCmd(workspace, arg));
+        }
+    }
+    return cmds;
+}
+
+function _filterCmd(dirPath, arg) {
     let cmdMap = {}
-    let files = _fs.readdirSync(_home)
-    let i = 1
+    let files = _fs.readdirSync(dirPath).filter(isJsirFileName)
     for (let file of files) {
         file = trim(file)
-        if (!isJsirFileName(file)) {
-            continue
-        }
-        isArgsMatch(file, args, () => {
-            if (Object.values(cmdMap).indexOf(file) === -1) {
-                cmdMap[i] = file
-                i ++
-            }
-        }, true)
+        let uniqueName = toUniqueName(dirPath + '/' + file)
+        isArgsMatch(file, [arg], () => {
+            cmdMap[uniqueName] = null;
+        }, true, file)
     }
-    return cmdMap
+    return Object.keys(cmdMap)
+}
+
+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) {
@@ -1124,25 +1225,25 @@ function getArgComments(argDef) {
     return comments
 }
 
-async function runCmd(str = '', scriptName = '', text = '') {
-    let path = _home + '/' + scriptName;
-    if (scriptName || text) {
+async function runCmd(str = '', uniqueName = '', text = '') {
+    let path = getFullPath(uniqueName);
+    if (uniqueName || text) {
         str = `0 ${str}`
     }
     if (!text) {
         let strs = str.split(/\s+/)
-        if (!scriptName) {
+        if (!uniqueName) {
             if (!_cmdMap[strs[0]] && strs[0] !== '0') {
                 warn('no items')
                 return
             }
             if (_cmdMap[strs[0]]) {
-                scriptName = _cmdMap[strs[0]];
+                uniqueName = _cmdMap[strs[0]];
             }
         }
 
-        if (scriptName) {
-            path = _home + '/' + scriptName;
+        if (uniqueName) {
+            path = getFullPath(uniqueName);
             text = String(_fs.readFileSync(path))
         } else {
             text = await getCbText()
@@ -1223,7 +1324,7 @@ async function runCmd(str = '', scriptName = '', text = '') {
     }
 
     process.argv = [process.argv[0], path, ...scriptArgs]
-    return await evalText(text, scriptName, scriptArgs)
+    return await evalText(text, uniqueName, scriptArgs)
 }
 
 // 使用空格作为可执行的标志
@@ -1328,32 +1429,50 @@ function tipsOnRmCallback(key) {
     }
 }
 
-async function _requireSource(cmdMatchStr, printLog = false) {
+function getCmdMd5Key(str) {
+    return '0x' + md5(str).substr(0, 8);
+}
+
+async function _requireSource(currSpace, cmdMatchStr, printLog = false) {
     cmdMatchStr = trim(cmdMatchStr);
     let nullable = false;
     if (cmdMatchStr.startsWith("*")) {
         nullable = true;
         cmdMatchStr = trim(cmdMatchStr.substr(1));
     }
-    if (_fs.existsSync(_home + '/' + cmdMatchStr)) {
-        cmdMatchStr = '0x' + md5(cmdMatchStr).substr(0, 8);
-    }
 
-    let cmdMap = filterCmd(cmdMatchStr.split(/\s+/))
-    if (Object.keys(cmdMap).length !== 1) {
+    let cmds;
+    let uName = toUniqueName(cmdMatchStr, currSpace)
+    let pr = parseUniqueName(uName)
+    let fullPath;
+    if (!/^[eif]\s+/.test(pr[1])) {
+        uName = pr[0] + "/i " + pr[1]
+        fullPath = getFullPath(uName)
+    }
+    if (fullPath && _fs.existsSync(fullPath)) {
+        cmds = [uName]
+    } else {
+        let appointSpace = parseUniqueName(cmdMatchStr)[0]
+        cmds = filterCmd(cmdMatchStr);
+        if (cmds.length > 0) {
+            cmds = cmds.filter(cmd => parseUniqueName(cmd)[0] === (appointSpace || currSpace))
+        }
+    }
+    if (cmds.length !== 1) {
         if (nullable) {
             return null;
         }
-        throw `none match: ${cmdMatchStr}`
+        throw `none unique match: ${cmdMatchStr}`
     }
-    let cmdName = Object.values(cmdMap)[0];
 
     let result
-    let path = _home + '/' + cmdName
+    let uniqueName = cmds[0];
+    let path = getFullPath(uniqueName)
     let text = String(_fs.readFileSync(path))
-    if (cmdName.startsWith('i ')) {
+    let pair = parseUniqueName(uniqueName)
+    if (pair[1].startsWith('i ')) {
         try {
-            result = await evalText(text, cmdName)
+            result = await evalText(text, uniqueName)
         } catch (e) {
             if (nullable) {
                 warn(`require [${cmdMatchStr}] failed`)
@@ -1363,9 +1482,9 @@ async function _requireSource(cmdMatchStr, printLog = false) {
                 throw e
             }
         }
-    } else if (cmdName.startsWith('e ')) {
+    } else if (pair[1].startsWith('e ')) {
         result = async (argsStr) => {
-            return await runCmd(trim(argsStr), cmdName, text)
+            return await runCmd(trim(argsStr), uniqueName, text)
         }
     }
     if (!vl(result)) {
@@ -1381,7 +1500,7 @@ async function _requireSource(cmdMatchStr, printLog = false) {
             let startTime = Date.now();
             let pl = () => {
                 if (printLog) {
-                    info(`${cmdName} finished in ${Date.now() - startTime}ms`)
+                    info(`${uniqueName} finished in ${Date.now() - startTime}ms`)
                 }
             }
             try {
@@ -1392,7 +1511,7 @@ async function _requireSource(cmdMatchStr, printLog = false) {
                         return Promise.resolve(result);
                     }).catch(e => {
                         pl();
-                        return Promise.reject(errorTag(e, cmdName))
+                        return Promise.reject(errorTag(e, uniqueName))
                     })
                 } else {
                     pl();
@@ -1400,18 +1519,18 @@ async function _requireSource(cmdMatchStr, printLog = false) {
                 }
             } catch (e) {
                 pl();
-                throw errorTag(e, cmdName);
+                throw errorTag(e, uniqueName);
             }
         }
     }
     return result
 }
 
-async function _requireSources(...matchItem) {
+async function _requireSources(currSpace, ...matchItems) {
     let result = []
-    for (let i = 0; i < matchItem.length; i++) {
-        let curr = matchItem[i]
-        let next = matchItem[i + 1]
+    for (let i = 0; i < matchItems.length; i++) {
+        let curr = matchItems[i]
+        let next = matchItems[i + 1]
         if (typeof curr === 'number') {
             curr = '0x' + pad(8, BigNumber(curr).toString(16), '0');
         }
@@ -1419,20 +1538,30 @@ async function _requireSources(...matchItem) {
             next = '0x' + pad(8, BigNumber(next).toString(16), '0');
         }
         if (typeof curr === 'string' && typeof next !== "string") {
-            result.push(await _requireSource(curr, next))
+            result.push(await _requireSource(currSpace, curr, next))
             i++
         } else if (typeof curr === 'string') {
-            result.push(await _requireSource(curr))
+            result.push(await _requireSource(currSpace, curr))
         }
     }
     return result
 }
 
 async function evalText($text = '', $cmdName = '', $args = []) {
+    let currSpace;
+    if ($cmdName) {
+        let pair = parseUniqueName($cmdName)
+        currSpace = pair[0]
+    } else {
+        currSpace = $defaultSpace
+    }
+    let $require = async (...matchItems) => {
+        return await _requireSources(currSpace, ...matchItems)
+    }
     try {
-        return await evalCode($text, $cmdName, $args,
-            _home, _cmdMap, _requireSources, $data,
-            nextLine, nextText, setTips, delTips, wrapperInput, filterCmd)
+        return await evalCode($text, $cmdName, $args, $require, $data,
+            nextLine, nextText, setTips, delTips, wrapperInput, filterCmd,
+            currSpace, $log, $draft, $config, $homeDir, $lib)
     } catch(e) {
         throw errorTag(e, $cmdName);
     }