Merge pull request #703 from jetstreamapp/upgrade/soql-parser-js-4.10

Upgrade soql-parser-js to 5.0.1
jetstreamapp · Jan 13, 2024 · c564f77 · c564f77
2 parents b75822c + fba2e55
commit c564f77
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/apps/jetstream/src/app/components/load-records/utils/load-records-utils.tsx b/apps/jetstream/src/app/components/load-records/utils/load-records-utils.tsx
@@ -10,7 +10,7 @@ import groupBy from 'lodash/groupBy';
 import isNil from 'lodash/isNil';
 import isString from 'lodash/isString';
 import uniqueId from 'lodash/uniqueId';
-import { Query, WhereClause, composeQuery, getField } from 'soql-parser-js';
+import { Query, WhereClauseWithRightCondition, WhereClauseWithoutOperator, composeQuery, getField } from 'soql-parser-js';
 import type {
   ApiMode,
   FieldMapping,
@@ -690,8 +690,8 @@ function getRelatedFieldsQueries(baseObject: string, relatedObject: string, rela
     fields: Array.from(new Set([getField('Id'), getField(relatedField)])),
   };
 
-  let extraWhereClauseNew: WhereClause | undefined = undefined;
-  const whereClause: WhereClause = {
+  let extraWhereClauseNew: WhereClauseWithoutOperator | WhereClauseWithRightCondition | undefined = undefined;
+  const whereClause: WhereClauseWithoutOperator = {
     left: {
       field: relatedField,
       operator: 'IN',

diff --git a/libs/shared/ui-utils/src/lib/shared-ui-query-utils.ts b/libs/shared/ui-utils/src/lib/shared-ui-query-utils.ts
@@ -1,7 +1,7 @@
 import { logger } from '@jetstream/shared/client-logger';
 import { FetchDebugLogOptions } from '@jetstream/types';
 import isNumber from 'lodash/isNumber';
-import { composeQuery, ConditionWithValueQuery, getField, Query } from 'soql-parser-js';
+import { composeQuery, ConditionWithValueQuery, getField, Query, WhereClauseWithoutOperator } from 'soql-parser-js';
 
 export function getApexLogsQuery({ userId, limit, asOfId }: FetchDebugLogOptions = {}) {
   limit = isNumber(limit) ? Math.abs(limit) : 100;
@@ -47,7 +47,7 @@ export function getApexLogsQuery({ userId, limit, asOfId }: FetchDebugLogOptions
       literalType: 'STRING',
     };
     if (query.where) {
-      query.where = { ...query.where, operator: 'AND', right: { left: leftClause } };
+      query.where = { ...(query.where as WhereClauseWithoutOperator), operator: 'AND', right: { left: leftClause } };
     } else {
       query.where = { left: leftClause };
     }

diff --git a/package.json b/package.json
@@ -338,7 +338,7 @@
     "slack-notify": "^0.1.7",
     "socket.io": "^4.2.0",
     "socket.io-client": "^4.2.0",
-    "soql-parser-js": "^4.9.2",
+    "soql-parser-js": "^5.0.1",
     "split.js": "^1.6.5",
     "superagent": "^5.2.2",
     "tslib": "^2.3.0",

diff --git a/yarn.lock b/yarn.lock
@@ -23549,10 +23549,10 @@ sonic-boom@^2.2.1:
   dependencies:
     atomic-sleep "^1.0.0"
 
-soql-parser-js@^4.9.2:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/soql-parser-js/-/soql-parser-js-4.9.2.tgz#59eff369e9c425507152e34bc50af05e683ac4ad"
-  integrity sha512-+hjOmqYptFGY+WgkF0EJ91XaSCmhdPKDJEl99qmnTMnIwRKlpGVk/95LdpYsIZ5DJKxiOriBOwGa2x52WqwGJw==
+soql-parser-js@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/soql-parser-js/-/soql-parser-js-5.0.1.tgz#eb96a56eb6ef0238a6eef0c6a533e8b01720ae48"
+  integrity sha512-1TEHwUwB+wl/W8avFBwk+iTX0rbt2zEOKK3p7M1AACSUoqq7+eTdZq+Xvy1xA9Hwgp4TrabPXjt4hD8JCGy6+w==
   dependencies:
     chevrotain "^10.5.0"
     commander "^2.20.3"