wisdom 13.0.3 → 13.1.0

package/ChangeLog

@@ -1,3 +1,32 @@
+2022.05.24, v13.1.0
+
+feature:
+- wisdom: parser: simplify
+
+
+2022.05.24, v13.0.5
+
+fix:
+- wisdom: changelog
+
+
+2022.05.24, v13.0.4
+
+fix:
+- wisdom: traverse: rm maybe array
+
+
+feature:
+- wisdom: rm escape
+
+
+2022.05.24, v13.0.3
+
+fix:
+- wisdom: tag
+- wisdom: build
+
+
 2022.05.24, v12.2.2
 
 fix:

package/lib/parser.js

@@ -1,39 +1,48 @@
 import jessy from 'jessy';
 
-const {isArray} = Array;
+const isUndefined = (a) => typeof a === 'undefined';
 
-const maybeArray = (a) => isArray(a) ? a : [a];
+/*
+Determine if value should be used according to conditional prefixes:
+^  exist
+!  disabled
+:  always
+-  not exist, or disabled
+   not exist, or enabled
+*/
 
 const paths = [
-    'scripts.wisdom',
-    'scripts.wisdom:type',
+    '^scripts.wisdom',
+    '^scripts.wisdom:type',
     'changelog',
-    ['changelog', false],
+    '!changelog',
     ':version',
-    'scripts.wisdom:build',
+    '^scripts.wisdom:build',
     ':commit',
     'tag',
-    ['tag', false],
+    '!tag',
     ':release',
-    '!private',
-    'scripts.wisdom:done',
+    '-private',
+    '^scripts.wisdom:done',
 ];
 
-const check = (info) => (data) => {
-    const [path, value = 'any'] = maybeArray(data);
-    
+const check = (info) => (path) => {
     if (path.startsWith(':'))
         return true;
     
-    const result = jessy(path, info);
+    const cleanPath = path.replace(/[!^:]/, '');
+    const result = jessy(cleanPath, info);
+    
+    if (path.startsWith('-'))
+        return !result || isUndefined(result);
     
     if (path.startsWith('!'))
-        return !result;
+        return !result && !isUndefined(result);
     
-    if (value === 'any')
+    if (path.startsWith('^'))
         return Boolean(result);
     
-    return result === value;
+    return Boolean(result) || isUndefined(result);
 };
 
 export const parse = (info) => {

package/lib/runner.js

@@ -34,7 +34,7 @@ export const run = async (paths, params) => {
         'type': async () => {
             await runWisdom('wisdom:type', type, version, info, emitter);
         },
-        'changelog:true': async () => {
+        'changelog': async () => {
             const [error, data] = tryCatch(changelog, version);
             
             if (error) {
@@ -49,7 +49,7 @@ export const run = async (paths, params) => {
             const value = rmLines(data, 2);
             chlogStore(value);
         },
-        'changelog:false': () => {
+        '!changelog': () => {
             emitter.emit('data', 'changelog: false\n');
         },
         'version': async () => {
@@ -61,10 +61,10 @@ export const run = async (paths, params) => {
         'commit': () => {
             execute(cmd, version, cwd);
         },
-        'tag:true': () => {
+        'tag': () => {
             execute(cmdTag, version, cwd);
         },
-        'tag:false': () => {
+        '!tag': () => {
             emitter.emit('data', 'tag: false\n');
         },
         'release': async () => {

package/lib/traverse.js

@@ -1,23 +1,22 @@
-const {isArray} = Array;
-
-const maybeArray = (a) => isArray(a) ? a : [a];
-
 export const traverse = async (paths, visitors) => {
-    for (const current of paths) {
-        const [path, value = true] = maybeArray(current);
-        
-        if (path === 'scripts.wisdom') {
+    for (const path of paths) {
+        if (path === '^scripts.wisdom') {
             await visitors.wisdom();
             continue;
         }
         
-        if (path === 'scripts.wisdom:type') {
+        if (path === '^scripts.wisdom:type') {
             await visitors.type();
             continue;
         }
         
         if (path === 'changelog') {
-            await visitors[`changelog:${value}`]();
+            await visitors.changelog();
+            continue;
+        }
+        
+        if (path === '!changelog') {
+            await visitors[`!changelog`]();
             continue;
         }
         
@@ -26,7 +25,7 @@ export const traverse = async (paths, visitors) => {
             continue;
         }
         
-        if (path === 'scripts.wisdom:build') {
+        if (path === '^scripts.wisdom:build') {
             await visitors.build();
             continue;
         }
@@ -37,7 +36,12 @@ export const traverse = async (paths, visitors) => {
         }
         
         if (path === 'tag') {
-            await visitors[`path:${value}`]();
+            await visitors.tag();
+            continue;
+        }
+        
+        if (path === '!tag') {
+            await visitors[`!tag`]();
             continue;
         }
         
@@ -46,12 +50,12 @@ export const traverse = async (paths, visitors) => {
             continue;
         }
         
-        if (path === '!private') {
+        if (path === '-private') {
             await visitors.publish();
             continue;
         }
         
-        if (path === 'scripts.wisdom:done') {
+        if (path === '^scripts.wisdom:done') {
             await visitors.done();
             continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wisdom",
-  "version": "13.0.3",
+  "version": "13.1.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "configurable publish releases to github and npm",
   "homepage": "http://github.com/coderaiser/wisdom",