sqlparser-devexpress 2.3.13 → 2.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.3.13",
+  "version": "2.3.15",
   "main": "src/index.js",
   "type": "module",
   "scripts": {

package/src/core/converter.js

@@ -124,10 +124,11 @@ function DevExpressConverter() {
      */
     function handleComparisonOperator(ast) {
         const operator = ast.operator.toUpperCase();
+        const originalOperator = ast.originalOperator?.toUpperCase();
 
         // Handle "IS NULL" condition
-        if (operator === "IS" && ast.value === null) {
-            return [ast.field, "=", null];
+        if ((operator === "IS" || originalOperator === "IS") && ast.value === null) {
+            return [ast.field, "=", null, { type: originalOperator }, null];
         }
 
         // Handle "IN" condition, including comma-separated values
@@ -140,14 +141,21 @@ function DevExpressConverter() {
         const right = ast.right !== undefined ? processAstNode(ast.right) : convertValue(ast.value);
         const rightDefault = ast.right?.args[1]?.value;
         let operatorToken = ast.operator.toLowerCase();
+        let includeExtradata = false;
 
         if (operatorToken === "like") {
             operatorToken = "contains";
         } else if (operatorToken === "not like") {
             operatorToken = "notcontains";
+        } else if (operatorToken === "=" && originalOperator === "IS") {
+            includeExtradata = true
+        } else if (operatorToken == "!=" && originalOperator === "IS NOT") {
+            operatorToken = "!=";
+            includeExtradata = true;
         }
-
         let comparison = [left, operatorToken, right];
+        if (includeExtradata)
+            comparison = [left, operatorToken, right, { type: originalOperator }, right];
 
         // Last null because of special case when using dropdown it https://github.com/DevExpress/DevExtreme/blob/25_1/packages/devextreme/js/__internal/data/m_utils.ts#L18 it takes last value as null
         if ((ast.left && isFunctionNullCheck(ast.left, true)) || (ast.value && isFunctionNullCheck(ast.value, false))) {
@@ -221,6 +229,16 @@ function DevExpressConverter() {
                     return list.includes(fieldVal);
                 else if (operator === "NOT IN")
                     return !list.includes(fieldVal);
+            } else if (!Array.isArray(resolvedValue)) {
+                // normalize numeric strings if LHS is number
+                const value = (typeof resolvedValue === "string" && !isNaN(resolvedValue) && typeof fieldVal === "number")
+                    ? Number(resolvedValue)
+                    : resolvedValue;
+
+                if (operator === "IN")
+                    return fieldVal == value;
+                else if (operator === "NOT IN")
+                    return fieldVal != value;
             }
         }
 

package/src/core/parser.js

@@ -178,6 +178,7 @@ export function parse(input, variables = []) {
 		// Check if it's part of a comparison expression
 		if (currentToken && currentToken.type === "operator") {
 			const operator = currentToken.value.toLowerCase();
+			const originalOperator = currentToken.originalValue;
 			next();
 
 			if (operator === "between") return parseBetweenComparison(field, operator);
@@ -190,7 +191,8 @@ export function parse(input, variables = []) {
 						type: "comparison",
 						field,
 						operator,
-						value: functionNode
+						value: functionNode,
+						originalOperator
 					}
 				}
 
@@ -199,7 +201,8 @@ export function parse(input, variables = []) {
 					type: "comparison",
 					field,
 					operator,
-					value: functionNode.left
+					value: functionNode.left,
+					originalOperator
 				};
 
 				functionNode.left = leftComparison;
@@ -215,7 +218,7 @@ export function parse(input, variables = []) {
 				throw new Error(`Invalid comparison: ${field} ${operator} ${value}`);
 			}
 
-			return { type: "comparison", field, operator, value };
+			return { type: "comparison", field, operator, value, originalOperator };
 		}
 
 		return { type: "field", value: field };

package/src/core/tokenizer.js

@@ -45,12 +45,13 @@ class Tokenizer {
       if (!type || type === "whitespace") return this.nextToken();
 
       let value = match.groups[type];
+      const originalValue = value; // Store the original value for debugging
       let dataType = null;
 
       // Remove surrounding single quotes from placeholders
-      if(type === "placeholder"){
+      if (type === "placeholder") {
 
-        if(value.startsWith("'") && value.endsWith("'")){
+        if (value.startsWith("'") && value.endsWith("'")) {
           dataType = "string";
         }
 
@@ -77,7 +78,7 @@ class Tokenizer {
       }
 
 
-      return { type, value, ...(dataType !== null && { dataType }) };
+      return { type, value, originalValue, ...(dataType !== null && { dataType }) };
     }
 
     // If no valid token is found, throw an error with the remaining input for debugging

package/tests/parser.test.js

@@ -76,13 +76,13 @@ describe("Parser SQL to dx Filter Builder", () => {
                         ["ToDate", ">=", "2022-01-01"]
                     ],
                     'or',
-                    ["ToDate", "=", null]
+                    ["ToDate", "=", null, { "type": "IS" }, null]
                 ],
                 "and",
                 [
                     ["BranchID", "=", 42],
                     "or",
-                    ["RefBranchID", "=", null]
+                    ["RefBranchID", "=", null, { "type": "IS" }, null]
                 ],
                 "and",
                 [
@@ -90,7 +90,7 @@ describe("Parser SQL to dx Filter Builder", () => {
                     // "or",
                     // [7,"=",0],
                     "or",
-                    ["CompanyID", "=", null]
+                    ["CompanyID", "=", null, { "type": "IS" }, null]
                 ]
             ]
         },
@@ -112,7 +112,7 @@ describe("Parser SQL to dx Filter Builder", () => {
                 ["CompanyID", "=", 7],
                 // ],
                 "or",
-                ["CompanyID", "=", null],
+                ["CompanyID", "=", null, { "type": "IS" }, null],
                 // ],
                 'or',
                 ["BranchID", "=", 42]
@@ -127,9 +127,9 @@ describe("Parser SQL to dx Filter Builder", () => {
         {
             input: "BranchID is Null OR BranchID is not 12",
             expected: [
-                ["BranchID", "=", null],
+                ["BranchID", "=", null, { "type": "IS" }, null],
                 "or",
-                ["BranchID", "!=", 12]
+                ["BranchID", "!=", 12, { "type": "IS NOT" }, 12]
             ]
         },
         {
@@ -216,11 +216,21 @@ describe("Parser SQL to dx Filter Builder", () => {
             expected: []
         },
         {
-            input: "ID IN ('1,2') AND 0 IN ('0,2')",
+            input: "ID IN ({WorkOrderLine.CompanyIDs}) AND 0 IN ({WorkOrderLine.CompanyIDs})",
             expected: [
-                ["ID", "=", "1"],
+                ["ID", "=", "0"],
                 "or",
-                ["ID", "=", "2"]
+                ["ID", "=", "1"]
+            ]
+        },
+        {
+            input: "CompanyID is null OR CompanyID is 7 OR CompanyID is not 8",
+            expected: [
+                ["CompanyID", "=", null, { "type": "IS" }, null],
+                "or",
+                ["CompanyID", "=", 7, { "type": "IS" }, 7],
+                "or",
+                ["CompanyID", "!=", 8, { "type": "IS NOT" }, 8]
             ]
         }
     ];
@@ -285,4 +295,5 @@ const sampleData = {
     "SupportResolution.TicketID": 123,
     "SaleOrderStatusStmtGlobalRpt.StateID": null,
     "SaleOrderStatusStmtGlobalRpt.RegionID": null,
+    "WorkOrderLine.CompanyIDs": ["0,1"],
 };