sqlparser-devexpress 2.5.0 → 2.5.1

package/package.json

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

package/src/core/converter.js

@@ -33,7 +33,10 @@ function DevExpressConverter() {
         // Handle special cases for short circuit
         if (result === true || result === false || result === null) return [];
 
-        return processAstNode(ast);
+        if (result.length == 1) {
+            return result[0];
+        }
+        return result;
     }
 
     /**
@@ -167,67 +170,58 @@ function DevExpressConverter() {
         let isLeftNullCheck = isFunctionNullCheck(ast.left, true);
         let isRightNullCheck = isFunctionNullCheck(ast.right, false) || (ast.value && isFunctionNullCheck(ast.value, false));
         let isBothNullChecks = isLeftNullCheck && isRightNullCheck;
-
+        let isdestructured = false;
+        // 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.
         if (!isBothNullChecks && isLeftNullCheck) {
             const nullCheckArg = (ast.left ?? ast.value).args[1]?.value;
+            let valueRight = null
 
             let baseComparison = comparison;
 
             if (Array.isArray(right) && (right.includes("or") || right.includes("and"))) {
-                const valueRight = right.shift();
+                isdestructured = true;
+                valueRight = right.shift();
                 baseComparison = [[left, operatorToken, valueRight], ...right];
             }
+            const _val = !isdestructured ? baseComparison[2] : valueRight;
+            if (normalizeBool(_val) == normalizeBool(nullCheckArg))
+                comparison = [[...baseComparison], 'or', [left, operatorToken, null, { type: "ISNULL", position: "column", defaultValue: nullCheckArg }, null]];
+            else
+                comparison = [...baseComparison, { type: "ISNULL", position: "column", defaultValue: nullCheckArg }, _val];
 
-            comparison = [[...baseComparison], 'or', [left, operatorToken, null, { type: "ISNULL", position: "column", defaultValue: nullCheckArg }, null]];
 
         } else if (!isBothNullChecks && isRightNullCheck) {
             const nullCheckArg = (ast.right ?? ast.value).args[1]?.value;
-
+            let valueLeft = null
             let baseComparison = comparison;
 
             if (Array.isArray(left) && (left.includes("or") || left.includes("and"))) {
-                const valueLeft = left.shift();
+                isdestructured = true;
+                valueLeft = left.shift();
                 baseComparison = [[valueLeft, operatorToken, right], ...left];
             }
+            const _val = !isdestructured ? baseComparison[2] : valueRight;
 
-            comparison = [[...baseComparison], 'or', [left, operatorToken, null, { type: "ISNULL", position: "value", defaultValue: nullCheckArg }, null]];
-
+            comparison = [...baseComparison, { type: "ISNULL", position: "value", defaultValue: nullCheckArg }, _val];
         } else if (isBothNullChecks) {
             const nullCheckArgleft = (ast.left ?? ast.value).args[1]?.value;
             const nullCheckArgright = (ast.right ?? ast.value).args[1]?.value;
-
+            let valueLeft = null;
             let baseComparison = comparison;
 
             if (Array.isArray(left) && (left.includes("or") || left.includes("and"))) {
-                const valueLeft = left.shift();
+                isdestructured = true;
+                valueLeft = left.shift();
                 baseComparison = [[valueLeft, operatorToken, right], ...left];
             }
 
-            comparison = [[...baseComparison, { type: "ISNULL", position: "both", defaultValue: nullCheckArgleft, defaultValueRight: nullCheckArgright }, baseComparison[2]], 'or', [left, operatorToken, null]];
+            const _val = !isdestructured ? baseComparison[2] : valueLeft;
 
+            if (normalizeBool(nullCheckArgleft) == normalizeBool(nullCheckArgright))
+                comparison = [[...baseComparison, { type: "ISNULL", position: "both", defaultValue: nullCheckArgleft, defaultValueRight: nullCheckArgright }, _val], 'or', [left, operatorToken, null]];
+            else
+                comparison = [[...baseComparison, { type: "ISNULL", position: "both", defaultValue: nullCheckArgleft, defaultValueRight: nullCheckArgright }, _val]];
         }
-        // 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))) {
-        //     const nullCheckArg = (ast.left ?? ast.value).args[1]?.value;
-        //     let baseComparison = comparison;
-
-        //     if (Array.isArray(right) && (right.includes("or") || right.includes("and"))) {
-        //         const valueRight = right.shift();
-        //         baseComparison = [[left, operatorToken, valueRight], ...right];
-        //     }
-
-        //     comparison = [baseComparison, 'or', [left, operatorToken, null, { type: "ISNULL", defaultValue: nullCheckArg }, null]];
-        // } else if (ast.right && isFunctionNullCheck(ast.right, true)) {
-        //     const nullCheckArg = ast.right.args[1]?.value;
-        //     let baseComparison = comparison;
-
-        //     if (Array.isArray(right) && (right.includes("or") || right.includes("and"))) {
-        //         const valueRight = right.shift();
-        //         baseComparison = [[left, operatorToken, valueRight], ...right];
-        //     }
-
-        //     comparison = [baseComparison, 'or', [right, operatorToken, null, { type: "ISNULL", defaultValue: nullCheckArg }, null]];
-        // }
 
         // Apply short-circuit evaluation if enabled
         if (EnableShortCircuit && IsValueNullShortCircuit && (left == null || right == null)) {
@@ -259,6 +253,20 @@ function DevExpressConverter() {
         return comparison;
     }
 
+    /**
+     * Normalizes numeric boolean-like values to actual booleans.
+     *
+     * Converts the number `0` to `false` and `1` to `true`.
+     * If the input is not exactly `0` or `1`, it returns the value unchanged.
+     *
+     * @param {*} value - The value to normalize. Can be of any type.
+     * @returns {*} - Returns `false` if `value` is `0`, `true` if `value` is `1`, otherwise returns the original value.
+     */
+    function normalizeBool(value) {
+        return value === 0 || value === 1 ? Boolean(value) : value;
+    }
+
+
     /**
      * Handles function calls, focusing on ISNULL.
      * @param {Object} ast - The function AST node.

package/src/debug.js

@@ -26,7 +26,7 @@
 //     const astTree = parsedResult.ast;
 //     console.log("AST Tree:", JSON.stringify(astTree, null, 2), "\n");
 
-//     return convertToDevExpressFormat({ ast: astTree, resultObject: sampleData, isValueNullShortCircuit: true });
+//     return convertToDevExpressFormat({ ast: astTree, resultObject: sampleData, options: { isValueNullShortCircuit: true, treatNumberAsNullableBit: true } });
 // }
 
 // const devexpress = parseFilterString("ISNULL(CompanyID,0) = ISNULL({TransferOutwardDocument.CompanyID},0) OR ISNULL(CompanyID,0) = 0", sampleData);

package/tests/parser.test.js

@@ -137,15 +137,15 @@ describe("Parser SQL to dx Filter Builder", () => {
         {
             input: "ISNULL(SourceID,0) = {ServiceOrderDocument.SourceID} OR ISNULL(SourceID,0) = 0",
             expected: [
-                ["SourceID", "=", 2],
+                ["SourceID", "=", 2, { "defaultValue": 0, "position": "column", "type": "ISNULL" }, 2],
                 "or",
-                ["SourceID", "=", null, { "defaultValue": 0, "position": "column", "type": "ISNULL" }, null],
-                "or",
-                ["SourceID", "=", 0],
-                "or",
-                ["SourceID", "=", null, { "defaultValue": 0, "position": "column", "type": "ISNULL" }, null],
-                "or",
-                ["SourceID", "=", false]
+                [
+                    ["SourceID", "=", 0],
+                    "or",
+                    ["SourceID", "=", null, { "defaultValue": 0, "position": "column", "type": "ISNULL" }, null],
+                    "or",
+                    ["SourceID", "=", false]
+                ]
             ]
         },
         {
@@ -163,11 +163,13 @@ describe("Parser SQL to dx Filter Builder", () => {
                     ]
                 ],
                 "and",
-                [
-                    ["IsSubdealer", "=", true],
-                    "or",
-                    ["IsSubdealer", "=", null, { "defaultValue": 0, "position": "column", "type": "ISNULL" }, null]
-                ]
+                // [
+                // ["IsSubdealer", "=", 0],
+                // "or",
+                // ["IsSubdealer", "=", null, { "defaultValue": 0, "position": "column", "type": "ISNULL" }, null],
+                // "or",
+                ["IsSubdealer", "=", true, { "defaultValue": 0, "position": "column", "type": "ISNULL" }, true],
+                // ]
             ]
         },
         {
@@ -199,15 +201,15 @@ describe("Parser SQL to dx Filter Builder", () => {
         {
             input: "CompanyID = ISNULL({LeadDocument.CompanyID},0) OR (ISNULL(CompanyID,0) = 0))",
             expected: [
-                ["CompanyID", "=", 7],
-                "or",
-                ["CompanyID", "=", null, { "type": "ISNULL", "position": "value", "defaultValue": 0 }, null],
-                "or",
-                ["CompanyID", "=", 0],
-                "or",
-                ["CompanyID", "=", null, { "type": "ISNULL", "position": "column", "defaultValue": 0 }, null],
+                ["CompanyID", "=", 7, { "type": "ISNULL", "position": "value", "defaultValue": 0 }, 7],
                 "or",
-                ["CompanyID", "=", false]
+                [
+                    ["CompanyID", "=", 0],
+                    "or",
+                    ["CompanyID", "=", null, { "type": "ISNULL", "position": "column", "defaultValue": 0 }, null],
+                    "or",
+                    ["CompanyID", "=", false]
+                ]
             ]
         },
         {
@@ -317,6 +319,76 @@ describe("Parser SQL to dx Filter Builder", () => {
                 "or",
                 ["CompanyID", "=", false]
             ]
+        },
+        {
+            input: "ISNULL(CompanyID,0) = ISNULL({TransferOutwardDocument.CompanyID},0) OR (ISNULL(CompanyID,1) = 0)",
+            expected: [
+                ["CompanyID", "=", 7, { "type": "ISNULL", "position": "both", "defaultValue": 0, "defaultValueRight": 0 }, 7],
+                "or",
+                ["CompanyID", "=", null],
+                "or",
+                ["CompanyID", "=", 0, { "type": "ISNULL", "position": "column", "defaultValue": 1 }, 0],
+                "or",
+                ["CompanyID", "=", false]
+            ]
+        },
+        {
+            input: "ISNULL(CompanyID,0) = {LeadDocument.CompanyID}",
+            expected: [
+                "CompanyID", "=", 7, { "type": "ISNULL", "position": "column", "defaultValue": 0 }, 7
+            ]
+        },
+        {
+            input: "ISNULL(CompanyID,0) = ISNULL({LeadDocument.CompanyID},0)",
+            expected: [
+                ["CompanyID", "=", 7, { "type": "ISNULL", "position": "both", "defaultValue": 0, "defaultValueRight": 0 }, 7],
+                "or",
+                ["CompanyID", "=", null]
+            ]
+        },
+        {
+            input: "ISNULL(CompanyID,1) = ISNULL({LeadDocument.CompanyID},2)",
+            expected: [
+                "CompanyID", "=", 7, { "type": "ISNULL", "position": "both", "defaultValue": 1, "defaultValueRight": 2 }, 7
+            ]
+        },
+        {
+            input: "CompanyID = ISNULL({LeadDocument.CompanyID},0)",
+            expected: [
+                "CompanyID", "=", 7, { "type": "ISNULL", "position": "value", "defaultValue": 0 }, 7
+            ]
+        },
+        {
+            input: "AllowSubDealer = ISNULL({LeadDocument.AllowSubDealer},0)",
+            expected: [
+                "AllowSubDealer", "=", true, { "type": "ISNULL", "position": "value", "defaultValue": 0 }, true
+            ]
+        },
+        {
+            input: "AllowSubDealer = ISNULL({LeadDocument.AllowSubDealer},1)",
+            expected: [
+                "AllowSubDealer", "=", true, { "type": "ISNULL", "position": "value", "defaultValue": 1 }, true
+            ]
+        },
+        {
+            input: "ISNULL(AllowSubDealer,0) = ISNULL({LeadDocument.AllowSubDealer},1)",
+            expected: [
+                "AllowSubDealer", "=", true, { "type": "ISNULL", "position": "both", "defaultValue": 0, "defaultValueRight": 1 }, true
+            ]
+        },
+        {
+            input: "ISNULL(AllowSubDealer,0) = {LeadDocument.AllowSubDealer}",
+            expected: [
+                "AllowSubDealer", "=", true, { "type": "ISNULL", "position": "column", "defaultValue": 0 }, true
+            ]
+        },
+        {
+            input: "ISNULL(AllowSubDealer,1) = {LeadDocument.AllowSubDealer}",
+            expected: [
+                ["AllowSubDealer", "=", true],
+                'or',
+                ["AllowSubDealer", "=", null, { "type": "ISNULL", "position": "column", "defaultValue": 1 }, null]
+            ]
         }
     ];