sqlparser-devexpress 2.3.18 → 2.4.0

package/package.json

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

package/src/@types/core/converter.d.ts

@@ -9,8 +9,11 @@ export type DevExpressFilter = any[] | null;
 export interface ConvertOptions {
     ast: ASTNode;
     resultObject?: ResultObject;
-    enableShortCircuit?: boolean;
-    isValueNullShortCircuit?: boolean;
+    options?: {
+        enableShortCircuit?: boolean;
+        isValueNullShortCircuit?: boolean;
+        treatNumberAsNullableBit?: boolean;
+    };
 }
 
 /**

package/src/@types/default.d.ts

@@ -38,6 +38,9 @@ export function convertSQLToAst(filterString: string, enableConsoleLogs?: boolea
 export function convertAstToDevextreme(
     ast: ASTNode,
     state?: ResultObject | null,
-    enableShortCircuit?: boolean,
-    isValueNullShortCircuit?: boolean
+    options?: {
+        enableShortCircuit?: boolean;
+        isValueNullShortCircuit?: boolean;
+        treatNumberAsNullableBit?: boolean;
+    }
 ): DevExpressFilter;

package/src/core/converter.js

@@ -9,19 +9,23 @@ function DevExpressConverter() {
     let resultObject = null;
     let EnableShortCircuit = true;
     let IsValueNullShortCircuit = false; // Flag to enable/disable null short-circuiting
+    let TreatNumberAsNullableBit = false; // Flag to enable/disable optional boolean with number conversion
 
     /**
    * Main conversion function that sets up the global context
    * @param {Object} ast - The abstract syntax tree
    * @param {Object} ResultObject - Optional object for placeholder resolution
    * @param {boolean} enableShortCircuit - Optional enabling and disabling the shortcircuit ie evaluating value = value scenario 
+   * @param {boolean} isValueNullShortCircuit - Optional enabling and disabling the null shortcircuit ie evaluating value = null scenario
+   * @param {boolean} treatNumberAsNullableBit - Optional enabling and disabling the optional boolean with number conversion
    * @returns {Array|null} DevExpress format filter
    */
-    function convert(ast, ResultObject = null, enableShortCircuit = true, isValueNullShortCircuit = false) {
+    function convert(ast, ResultObject = null, enableShortCircuit = true, isValueNullShortCircuit = false, treatNumberAsNullableBit = false) {
         // Set up global context
         resultObject = ResultObject;
         EnableShortCircuit = enableShortCircuit;
         IsValueNullShortCircuit = isValueNullShortCircuit;
+        TreatNumberAsNullableBit = treatNumberAsNullableBit;
 
         // Process the AST
         let result = processAstNode(ast);
@@ -176,6 +180,23 @@ function DevExpressConverter() {
             if (isAlwaysFalse(comparison, leftDefault, rightDefault)) return false;
         }
 
+        if (TreatNumberAsNullableBit && typeof right === "number" && (right == 0 || right == 1)) {
+
+            if (Array.isArray(comparison[0])) {
+                return [
+                    ...comparison,
+                    'or',
+                    [left, operatorToken, right == true]
+                ];
+            }
+
+            return [
+                [...comparison],
+                'or',
+                [left, operatorToken, right == true]
+            ];
+        }
+
         return comparison;
     }
 
@@ -452,10 +473,13 @@ const devExpressConverter = DevExpressConverter();
  * Converts an abstract syntax tree to DevExpress format
  * @param {Object} ast - The abstract syntax tree
  * @param {Object} resultObject - Optional object for placeholder resolution
- * @param {string} enableShortCircuit - Optional enabling and disabling the shortcircuit ie evaluating value = value scenario 
- * @param {boolean} isValueNullShortCircuit - Optional enabling and disabling the null shortcircuit ie evaluating value = null scenario
+ * @param {Object} options - Optional options for conversion
+ * @param {boolean} options.enableShortCircuit - Enable or disable short-circuit evaluation
+ * @param {boolean} options.isValueNullShortCircuit - Enable or disable null short-circuit evaluation
+ * @param {boolean} options.treatNumberAsNullableBit  - Enable or disable optional boolean with number conversion
  * @returns {Array|null} DevExpress format filter
  */
-export function convertToDevExpressFormat({ ast, resultObject = null, enableShortCircuit = true, isValueNullShortCircuit = false }) {
-    return devExpressConverter.init(ast, resultObject, enableShortCircuit, isValueNullShortCircuit);
+export function convertToDevExpressFormat({ ast, resultObject = null, options = {} }) {
+    const { enableShortCircuit = true, isValueNullShortCircuit = false, treatNumberAsNullableBit = false } = options;
+    return devExpressConverter.init(ast, resultObject, enableShortCircuit, isValueNullShortCircuit, treatNumberAsNullableBit);
 }

package/src/core/parser.js

@@ -142,15 +142,12 @@ export function parse(input, variables = []) {
 				left = { type: "logical", operator, left, right };
 			} else if (currentToken?.type == "identifier") {
 				const right = parseValue(operator);
-				let newOp = operator;
-				if (operator === '>') newOp = '<';
-				else if (operator === '<') newOp = '>';
-				else if (operator === '>=') newOp = '<=';
-				else if (operator === '<=') newOp = '>=';
+				let newOperator = inverseOperator(operator);
+
 				left = {
 					type: "comparison",
 					right: left,
-					operator: newOp,
+					operator: newOperator,
 					left: { type: "field", value: right }
 				};
 			}
@@ -233,7 +230,8 @@ export function parse(input, variables = []) {
 
 			// Swap the field and value if the field is a placeholder and the value is an identifier
 			if (valueType == "identifier" && fieldType == "placeholder") {
-				return { type: "comparison", value: field, operator, field: value, originalOperator };
+				let newOperator = inverseOperator(operator);
+				return { type: "comparison", value: field, operator: newOperator, field: value, originalOperator };
 			}
 
 			return { type: "comparison", field, operator, value, originalOperator };
@@ -242,6 +240,16 @@ export function parse(input, variables = []) {
 		return { type: "field", value: field };
 	}
 
+	function inverseOperator(operator) {
+		switch (operator.toUpperCase()) {
+			case ">": return "<";
+			case "<": return ">";
+			case ">=": return "<=";
+			case "<=": return ">=";
+			default: return operator; // Return the operator as is if no inverse is defined
+		}
+	}
+
 	// Parses values including numbers, strings, placeholders, and IN lists
 	function parseValue(operatorToken) {
 		if (!currentToken) throw new Error("Unexpected end of input");

package/src/index.js

@@ -16,8 +16,8 @@ export function convertSQLToAst(filterString, enableConsoleLogs = false) {
     return parsedResult;
 }
 
-export function convertAstToDevextreme(ast, state = null, enableShortCircuit = true, isValueNullShortCircuit = false) {
-    return convertToDevExpressFormat({ ast, resultObject: state, enableShortCircuit, isValueNullShortCircuit })
+export function convertAstToDevextreme(ast, state = null, options = {}) {
+    return convertToDevExpressFormat({ ast, resultObject: state, options })
 }
 
 

package/tests/error.test.js

@@ -1,7 +1,4 @@
 import { describe, expect, it } from "vitest";
-import { convertToDevExpressFormat } from "../src/core/converter";
-import { parse } from "../src/core/parser";
-import { sanitizeQuery } from "../src/core/sanitizer";
 import { convertAstToDevextreme, convertSQLToAst } from "../src";
 
 describe("Parser SQL to dx Filter Builder", () => {

package/tests/parser.test.js

@@ -141,7 +141,9 @@ describe("Parser SQL to dx Filter Builder", () => {
                 "or",
                 ["SourceID", "=", 0],
                 "or",
-                ["SourceID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null]
+                ["SourceID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null],
+                "or",
+                ["SourceID", "=", false]
             ]
         },
         {
@@ -153,7 +155,9 @@ describe("Parser SQL to dx Filter Builder", () => {
                     [
                         ["CompanyID", "=", 0],
                         "or",
-                        ["CompanyID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null]
+                        ["CompanyID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null],
+                        "or",
+                        ["CompanyID", "=", false]
                     ]
                 ],
                 "and",
@@ -199,7 +203,9 @@ describe("Parser SQL to dx Filter Builder", () => {
                 "or",
                 ["CompanyID", "=", 0],
                 "or",
-                ["CompanyID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null]
+                ["CompanyID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null],
+                "or",
+                ["CompanyID", "=", false]
 
             ]
         },
@@ -288,6 +294,14 @@ describe("Parser SQL to dx Filter Builder", () => {
             expected: [
                 "ID", "=", 2
             ]
+        },
+        {
+            input: "IsChecked = 1",
+            expected: [
+                ["IsChecked", "=", 1],
+                "or",
+                ["IsChecked", "=", true]
+            ]
         }
     ];
 
@@ -310,7 +324,10 @@ describe("Parser SQL to dx Filter Builder", () => {
             const variables = astwithVariables.variables;
             const ast = astwithVariables.ast;
 
-            const result = convertAstToDevextreme(ast, sampleData, true, true);
+            const result = convertAstToDevextreme(ast, sampleData, {
+                isValueNullShortCircuit: true,
+                treatNumberAsNullableBit: true
+            });
 
             if (result == null || result == true || result == false) {
                 expect([]).toEqual(expected);