sqlparser-devexpress 2.1.1 → 2.1.2

package/package.json

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

package/src/core/converter.js

@@ -136,13 +136,21 @@ function DevExpressConverter() {
         }
 
         // Handle "IN" condition, including comma-separated values
-        if (operator === "IN") {
-            return handleInOperator(ast);
+        if (operator === "IN" || operator === "NOT IN") {
+            return handleInOperator(ast, operator);
         }
 
         const left = ast.left !== undefined ? processAstNode(ast.left) : convertValue(ast.field);
         const right = ast.right !== undefined ? processAstNode(ast.right) : convertValue(ast.value);
-        const comparison = [left, ast.operator.toLowerCase(), right];
+        const operatorToken = ast.operator.toLowerCase();
+
+        let comparison = [left, operatorToken, right];
+
+        if (isFunctionNullCheck(ast.left, true)) {
+            comparison = [[left, operatorToken, right], 'or', [left, operatorToken, null]];
+        } else if (isFunctionNullCheck(ast.right, true)) {
+            comparison = [[left, operatorToken, right], 'or', [right, operatorToken, null]];
+        }
 
         // Apply short-circuit evaluation if enabled
         if (EnableShortCircuit) {
@@ -179,7 +187,7 @@ function DevExpressConverter() {
      * @param {Object} ast - The comparison operator AST node.
      * @returns {Array} DevExpress format filter.
      */
-    function handleInOperator(ast) {
+    function handleInOperator(ast, operator) {
         let resolvedValue = convertValue(ast.value);
 
         // Handle comma-separated values in a string
@@ -190,15 +198,18 @@ function DevExpressConverter() {
             } else {
                 resolvedValue = firstValue;
             }
+        } else if (typeof resolvedValue === 'string' && resolvedValue.includes(',')) {
+            resolvedValue = resolvedValue.split(',').map(v => v.trim());
         }
 
-        if (Array.isArray(resolvedValue) && resolvedValue.length) {
-
-            return resolvedValue.flatMap(i => [[ast.field, '=', i], 'or']).slice(0, -1);
+        let operatorToken = operator === "IN" ? '=' : operator === "NOT IN" ? '!=' : operator;
+        let joinOperatorToken = operator === "IN" ? 'or' : operator === "NOT IN" ? 'and' : operator;
 
+        if (Array.isArray(resolvedValue) && resolvedValue.length) {
+            return resolvedValue.flatMap(i => [[ast.field, operatorToken, i], joinOperatorToken]).slice(0, -1);
         }
 
-        return [ast.field, "=", resolvedValue];
+        return [ast.field, operatorToken, resolvedValue];
     }
 
     /**
@@ -221,7 +232,7 @@ function DevExpressConverter() {
             }
 
             // Special handling for ISNULL function
-            if (val.type === "function" && val.name === "ISNULL" && val.args?.length >= 2) {
+            if (isFunctionNullCheck(val)) {
                 return convertValue(val.args[0]);
             }
 
@@ -256,6 +267,18 @@ function DevExpressConverter() {
         return node?.type === "function" && node.name === "ISNULL" && valueNode?.type === "value";
     }
 
+    /**
+     * Checks if a node is a ISNULL function without value
+     * @param {Object} node 
+     * @returns {boolean} True if this is an ISNULL check.
+     */
+    function isFunctionNullCheck(node, isPlaceholderCheck = false) {
+        const isValidFunction = node?.type === "function" && node?.name === "ISNULL" && node?.args?.length >= 2;
+
+        return isPlaceholderCheck ? isValidFunction && node?.args[0]?.value?.type !== "placeholder" : isValidFunction;
+    }
+
+
     /**
      * Determines whether the logical tree should be flattened.
      * This is based on the parent operator and the current operator.

package/src/core/parser.js

@@ -208,8 +208,10 @@ export function parse(input, variables = []) {
 			return { type: "placeholder", value: val };
 		}
 
+		operatorToken = operatorToken.toUpperCase();
+
 		// Handle IN operator which requires a list of values
-		if (operatorToken && operatorToken.toUpperCase() === "IN") return parseInList(token);
+		if (operatorToken && (operatorToken === "IN" || operatorToken === "NOT IN")) return parseInList(token);
 
 		throw new Error(`Unexpected value: ${token.value}`);
 	}

package/src/core/tokenizer.js

@@ -6,7 +6,7 @@ const tokenPatterns = {
   number: "\\d+", // Matches numerical values
   placeholder: "'?\\{[^}]+\\}'?", // Matches placeholders like {variable} or '{variable}'
   string: "'(?:''|[^'])*'", // Matches strings, allowing for escaped single quotes ('')
-  operator: "=>|<=|!=|>=|=|<>|>|<|\\bAND\\b|\\bOR\\b|\\bBETWEEN\\b|\\bIN\\b|\\bLIKE\\b|\\bIS NOT\\b|\\bNOT LIKE\\b|\\bIS\\b", // Matches SQL operators and logical keywords
+  operator: "=>|<=|!=|>=|=|<>|>|<|\\bAND\\b|\\bOR\\b|\\bBETWEEN\\b|\\bIN\\b|\\bNOT IN\\b|\\bLIKE\\b|\\bIS NOT\\b|\\bNOT LIKE\\b|\\bIS\\b", // Matches SQL operators and logical keywords
   identifier: "[\\w.]+", // Matches identifiers, including table.column format
   paren: "[()]", // Matches parentheses
   comma: "," // Matches commas
@@ -49,14 +49,14 @@ class Tokenizer {
 
       if (type === "operator") {
         const lowerValue = value.toLowerCase();
-        
+
         if (lowerValue === "is") {
           value = "=";
         } else if (lowerValue === "is not") {
           value = "!=";
         }
       }
-      
+
       return { type, value };
     }
 
@@ -66,7 +66,7 @@ class Tokenizer {
 
   peekNextToken() {
     if (this.index >= this.input.length) return null;
-    
+
     const savedIndex = this.index; // Save current index
     try {
       return this.nextToken(); // Get next token
@@ -78,7 +78,7 @@ class Tokenizer {
   reset() {
     this.index = 0; // Reset index to the beginning of the input
   }
-  
+
 }
 
 export { Tokenizer };

package/src/index.js

@@ -5,12 +5,12 @@ import { sanitizeQuery } from "./core/sanitizer.js";
 
 export function convertSQLToAst(filterString, enableConsoleLogs = false) {
     let { sanitizedSQL, extractedVariables } = sanitizeQuery(filterString);
-    enableConsoleLogs && console.log("Sanitized SQL:", sanitizedSQL, "\n");
+    !!enableConsoleLogs && console.log("Sanitized SQL:", sanitizedSQL, "\n");
 
     const parsedResult = parse(sanitizedSQL, extractedVariables);
 
-    enableConsoleLogs && console.log("Extracted Variables:", JSON.stringify(parsedResult.variables, null, 2), "\n");
-    enableConsoleLogs && console.log("AST Tree:", JSON.stringify(parsedResult.ast, null, 2), "\n");
+    !!enableConsoleLogs && console.log("Extracted Variables:", JSON.stringify(parsedResult.variables, null, 2), "\n");
+    !!enableConsoleLogs && console.log("AST Tree:", JSON.stringify(parsedResult.ast, null, 2), "\n");
 
     return parsedResult;
 }

package/tests/parser.test.js

@@ -37,7 +37,7 @@ describe("Parser SQL to dx Filter Builder", () => {
         {
             input: "ID IN ({WorkOrderLine.ApplicableUoms}) AND (CompanyID = {WorkOrderDocument.CompanyID} OR {WorkOrderDocument.CompanyID} = 0)",
             expected: [
-                [["ID", "=", "UOM1"] , 'or', ["ID", "=", "UOM2"], 'or', ["ID", "=", "UOM3"]],
+                [["ID", "=", "UOM1"], 'or', ["ID", "=", "UOM2"], 'or', ["ID", "=", "UOM3"]],
                 "and",
                 // [
                 ["CompanyID", "=", 42],
@@ -145,12 +145,44 @@ describe("Parser SQL to dx Filter Builder", () => {
             expected: [
                 ["SourceID", "=", 2],
                 "or",
-                ["SourceID", "=", 0]
+                ["SourceID", "=", null],
+                "or",
+                ["SourceID", "=", 0],
+                "or",
+                ["SourceID", "=", null]
             ]
         },
         {
             input: "CompanyID = CompanyID2 = {AccountingRule.CompanyID}",
             expected: "Error: Invalid comparison: CompanyID = CompanyID2",
+        },
+        {
+            input: "(CompanyID = {LeadDocument.CompanyID} OR ISNULL(CompanyID,0) = 0) AND (ISNULL(IsSubdealer,0) = {LeadDocument.AllowSubDealer})",
+            expected: [
+                [
+                    ["CompanyID", "=", 7],
+                    "or",
+                    [
+                        ["CompanyID", "=", 0],
+                        "or",
+                        ["CompanyID", "=", null]
+                    ]
+                ],
+                "and",
+                [
+                    ["IsSubdealer", "=", true],
+                    "or",
+                    ["IsSubdealer", "=", null]
+                ]
+            ]
+        },
+        {
+            input: 'AddressType NOT IN (2, 4)',
+            expected: [
+                ["AddressType", "!=", 2],
+                "and",
+                ["AddressType", "!=", 4]
+            ]
         }
     ];
 
@@ -165,7 +197,7 @@ describe("Parser SQL to dx Filter Builder", () => {
             try {
                 astwithVariables = convertSQLToAst(input);
             } catch (error) {
-                expect(error.message).toEqual(expected.replace("Error: ",""));
+                expect(error.message).toEqual(expected.replace("Error: ", ""));
                 return;
             }
 
@@ -186,7 +218,7 @@ describe("Parser SQL to dx Filter Builder", () => {
 
             expect(result).toEqual(expected);
         });
-      });
+    });
 });
 
 
@@ -213,5 +245,6 @@ const sampleData = {
     "TransferOutwardDocument.CompanyID": 7,
     "LeadDocument.BranchID": 42,
     "LeadDocument.CompanyID": 7,
-    "ServiceOrderDocument.SourceID": 2
+    "ServiceOrderDocument.SourceID": 2,
+    "LeadDocument.AllowSubDealer": true
 };