jsir 2.1.2 → 2.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/cmd/oaa.js CHANGED
@@ -1305,7 +1305,7 @@ function _filterCmd(dirPath, arg) {
1305
1305
  let uniqueName = toUniqueName(dirPath + '/' + file)
1306
1306
  isArgsMatch(file, [arg], () => {
1307
1307
  cmdMap[uniqueName] = null;
1308
- }, true, file)
1308
+ }, true)
1309
1309
  }
1310
1310
  return Object.keys(cmdMap)
1311
1311
  }
package/deps/util.js CHANGED
@@ -36,15 +36,22 @@ const $draft = str => {
36
36
  }
37
37
  const $fnCache = {}
38
38
 
39
- function isArgsMatch(text, args, callback, useMd5, md5Str) {
39
+ function isArgsMatch(text, args, callback, useMd5) {
40
40
  let match = false
41
41
  for (let arg of args) {
42
42
  let r = true
43
43
  for (let str of arg.split(',').map(trim).filter(i => i)) {
44
44
  let reg = new RegExp(str.split(/\s+/).join('\\s+'), 'i')
45
- if (!reg.test(text) && !(useMd5 && ('0x' + md5(md5Str || text).substr(0, 8)) === str)) {
46
- r = false
47
- break
45
+ if (useMd5 && /^0x[a-z\d]{8}$/.test(str)) {
46
+ if (('0x' + md5(text).substr(0, 8)) !== str) {
47
+ r = false
48
+ break
49
+ }
50
+ } else {
51
+ if (!reg.test(text)) {
52
+ r = false
53
+ break
54
+ }
48
55
  }
49
56
  }
50
57
  if (r) {
@@ -413,6 +420,7 @@ function getConfig(key, defaultVal) {
413
420
  if (!(key in config)) {
414
421
  writeFlag = true
415
422
  config[key] = null
423
+ warn(`require config "${key}" in ${configFile}`)
416
424
  }
417
425
  if (writeFlag) {
418
426
  fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jsir",
3
- "version": "2.1.2",
3
+ "version": "2.1.4",
4
4
  "description": "js script manager tool",
5
5
  "main": "index.js",
6
6
  "scripts": {