Merge pull request #240 from jetstreamapp/revert-breaking-change

Revert breaking change type WhereClauseWithoutOperator
jetstreamapp · Jan 13, 2024 · fccf925 · fccf925
2 parents 8b458bb + 70a0f9d
commit fccf925
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 4.10.1
+
+Jan 13, 2024
+
+Revert accidental breaking change to types. `WhereClause` left can have `null` in the negation case, but the types did not represent this.
+Updating types to match reality is a breaking change for consumers, so worked around issue and will publish version 5 with breaking change.
+
 ## 4.10.0
 
 Jan 13, 2024

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "soql-parser-js",
-  "version": "4.10.0",
+  "version": "4.10.1",
   "description": "Salesforce.com SOQL parser and composer",
   "main": "dist/index.js",
   "module": "dist_esm/index.js",

diff --git a/src/api/api-models.ts b/src/api/api-models.ts
@@ -157,7 +157,7 @@ export interface Subquery extends QueryBase {
 export type WhereClause = WhereClauseWithoutOperator | WhereClauseWithRightCondition;
 
 export interface WhereClauseWithoutOperator {
-  left: ConditionWithValueQuery | null;
+  left: ConditionWithValueQuery;
 }
 
 export interface WhereClauseWithRightCondition extends WhereClauseWithoutOperator {

diff --git a/src/parser/visitor.ts b/src/parser/visitor.ts
@@ -733,7 +733,7 @@ class SOQLVisitor extends BaseSoqlVisitor {
 
   expressionPartWithNegation(ctx: any) {
     const output: Partial<WhereClauseWithRightCondition> = {
-      left: ctx.L_PAREN ? { openParen: ctx.L_PAREN.length } : null,
+      left: ctx.L_PAREN ? { openParen: ctx.L_PAREN.length } : (null as any), // FIXME: type does not allow null, but changing is a breaking change
       operator: 'NOT',
       right: {
         left: {} as ValueCondition,