@marianmeres/condition-parser 1.5.0 → 1.6.0

package/dist/parser.js

@@ -158,13 +158,28 @@ export class ConditionParser {
         this.#consumeWhitespace();
         const remaining = this.#input.slice(this.#pos);
         let result = null;
+        const _isNotAhead = (s) => /\s*not\s+/i.exec(s);
         if (/^and /i.test(remaining)) {
             this.#pos += 4;
             result = "and";
+            // maybe followed by "not"?
+            const notIsAheadMatch = _isNotAhead(remaining);
+            if (notIsAheadMatch) {
+                // minus 1, because the initial test includes single trailing whitespace
+                this.#pos += notIsAheadMatch[0].length - 1;
+                result = "andNot";
+            }
         }
         else if (/^or /i.test(remaining)) {
             this.#pos += 3;
             result = "or";
+            // maybe followed by "not"?
+            const notIsAheadMatch = _isNotAhead(remaining);
+            if (notIsAheadMatch) {
+                // minus 1, because the initial test includes single trailing whitespace
+                this.#pos += notIsAheadMatch[0].length - 1;
+                result = "orNot";
+            }
         }
         else if (openingParenthesesLevel !== undefined) {
             const preLevel = openingParenthesesLevel;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@marianmeres/condition-parser",
-	"version": "1.5.0",
+	"version": "1.6.0",
 	"type": "module",
 	"main": "dist/mod.js",
 	"types": "dist/mod.d.ts",
@@ -14,6 +14,6 @@
 		"url": "https://github.com/marianmeres/condition-parser/issues"
 	},
 	"dependencies": {
-		"@marianmeres/condition-builder": "^1.8.0"
+		"@marianmeres/condition-builder": "^1.9.0"
 	}
 }