jsir 1.1.2 → 1.1.4

package/cmd/ooa.js

@@ -133,7 +133,7 @@ run(async () => {
 
         if (['run', 'edit', 'rm', 'diff', 'push', 'pull'].indexOf(_args[0]) !== -1
             && _args[1] && !/^\d+$/.test(_args[1])) {
-            let name = `e ${_args[1]}.js`
+            let name = toJsirFileName(`e ${_args[1]}`)
             let path = _home + '/' + name
             if (_fs.existsSync(path)) {
                 _cmdMap = {
@@ -204,7 +204,7 @@ async function fileLine(name) {
     }
     let tempDir = getLibDataDir() + "/ooa"
     mkdir(tempDir)
-    let workFile = `${tempDir}/f ${name}.js`;
+    let workFile = `${tempDir}/f ${toJsirFileName(name)}`;
     if (!_fs.existsSync(workFile)) {
         _fs.writeFileSync(workFile, '');
     }
@@ -307,8 +307,7 @@ async function dealInitData() {
             continue;
         }
         let filePath = _home + "/" + file;
-        let initDataName = file.replace(/^i\s+/, '')
-            .replace(/\.js$/, '')
+        let initDataName = trimJsirFileName(file.replace(/^i\s+/, ''))
             .split(/\s+/).filter(item => item).join("_");
         let text = String(_fs.readFileSync(filePath))
         $i[initDataName] = null
@@ -408,7 +407,7 @@ function dealSourceCmds() {
         mkdir(source)
     }
     if (source && _fs.existsSync(source)) {
-        _fs.readdirSync(source).filter(item => item.endsWith('.js')).forEach(item => {
+        _fs.readdirSync(source).filter(isJsirFileName).forEach(item => {
             if (!_fs.existsSync(_home + "/" + item)) {
                 _fs.writeFileSync(_home + "/" + item, String(_fs.readFileSync(source + "/" + item)))
             }
@@ -419,7 +418,7 @@ function dealSourceCmds() {
 }
 
 async function save(args) {
-    let path = `${_home}/${args.join(' ')}.js`
+    let path = `${_home}/${toJsirFileName(args.join(' '))}`
     if (_fs.existsSync(path)) {
         warn('already exist')
         return
@@ -508,11 +507,12 @@ function listCmd() {
 
             text = text1
         }
-        let name = _cmdMap[i].replace(/\.js$/, '')
+        let name = trimJsirFileName(_cmdMap[i])
+        let suffix = getJsirFileSuffix(_cmdMap[i])
         let item = {
             key: prefix.join('') + i,
             name: name.replace(/^[eif]\s+/, ''),
-            type: _types[name.split(/\s+/)[0]] || 'note'
+            type: [_types[name.split(/\s+/)[0]] || 'note', suffix].map(trim).join(".")
         }
         items.push(item)
 
@@ -657,7 +657,7 @@ async function wrapperInput(str) {
         if (_cmdMap[strs[0]]) {
             putHis(_cmdMap[strs[0]])
             let path = _home + '/' + _cmdMap[strs[0]]
-            let fileName = _cmdMap[strs[0]].replace(/\.js$/, '');
+            let fileName = trimJsirFileName(_cmdMap[strs[0]]);
             let firstName = trim(fileName).split(/\s+/)[0]
             if (firstName === 'f') {
                 await fileLine(fileName.replace(/^\s*f\s*/, ''))
@@ -735,7 +735,7 @@ async function dealKeyword(str, strs, fstr, ostr) {
         } else {
             let newName =trim(ostr.join(" "))
             if (newName) {
-                newName = newName + ".js"
+                newName = toJsirFileName(newName)
                 if (rename(_home + '/' + name, _home + '/' + newName)) {
                     info(`${_home + '/' + newName} renamed`)
                 }
@@ -838,7 +838,6 @@ async function dealKeyword(str, strs, fstr, ostr) {
     }
 }
 
-
 function getComments(text, cols = [], col) {
     let docLines = []
     text = trim(text)
@@ -873,16 +872,49 @@ function getComments(text, cols = [], col) {
     }
 }
 
+function toJsirFileName(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return name;
+    }
+    name = name + '.js'
+    if (!isJsirFileName(name)) {
+        throw `invalid name`
+    }
+    return name
+}
+
+function isJsirFileName(name) {
+    name = trim(name)
+    return /^[^.]*[^.\s]\.[^.\s]+$/.test(name)
+}
+
+function trimJsirFileName(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return trim(name.replace(/\.[^.\s]+$/, ''))
+    }
+    return name
+}
+
+function getJsirFileSuffix(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return trim(name.split('.').slice(-1))
+    }
+    return ''
+}
+
 function filterCmd(args){
     let cmdMap = {}
     let files = _fs.readdirSync(_home)
     let i = 1
     for (let file of files) {
         file = trim(file)
-        let fileName = file.replace(/\.js$/, '')
-        if (!file.endsWith('.js') || !fileName) {
+        if (!isJsirFileName(file)) {
             continue
         }
+        let fileName = trimJsirFileName(file)
         isArgsMatch(fileName, args, () => {
             if (Object.values(cmdMap).indexOf(file) === -1) {
                 cmdMap[i] = file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,6 @@
     "abi-decoder": "^2.3.0",
     "address": "^1.1.2",
     "axios": "^0.20.0",
-    "better-sqlite3": "^7.4.3",
     "bignumber.js": "^9.0.0",
     "chokidar": "^3.5.2",
     "console.table": "^0.10.0",

package/sql.js

@@ -1,11 +0,0 @@
-const {getLibDataDir, mkdir, createLimitLogger} = require('./util');
-const Database = require('better-sqlite3');
-let dataDir = getLibDataDir()
-let dbDir = dataDir + '/db'
-mkdir(dbDir)
-
-function getDb(name) {
-    let dbFile = dbDir + '/' + name
-    return new Database(dbFile, { verbose: createLimitLogger(name + '.dblog') });
-}
-