Merge pull request #11 from sisimomo/10-fix-operator-not

fix(not-operator): improved not operator handling in toString() method fixing issue #10
sisimomo · Aug 24, 2023 · 6688153 · 6688153
2 parents fad8e25 + 4fa3a2e
commit 6688153
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spring-filter-query-builder",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/operators.ts b/src/operators.ts
@@ -26,7 +26,10 @@ export class Not extends Operator {
   }
 
   public toString(): string {
-    return `${this.operatorKeyWord} ${this.items[0].toString()}`;
+    if (this.items[0] instanceof Operator) {
+      return `${this.operatorKeyWord}${this.items[0].toString()}`;
+    }
+    return `${this.operatorKeyWord}(${this.items[0].toString()})`;
   }
 }
 

diff --git a/test/operators.test.ts b/test/operators.test.ts
@@ -9,5 +9,9 @@ test('or', () => {
 });
 
 test('not', () => {
-  expect(sfNot(sfOr([sfGt('id', 100), sfIsNull('category.order')])).toString()).toBe('not (id > 100 or category.order is null)');
+  expect(sfNot(sfOr([sfGt('id', 100), sfIsNull('category.order')])).toString()).toBe('not(id > 100 or category.order is null)');
+});
+
+test('not', () => {
+  expect(sfNot(sfGt('id', 100)).toString()).toBe('not(id > 100)');
 });