Merge pull request #10 from RohitM-IN/development

Bug fixes

Author: RohitM-IN

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "main": "src/index.js",
   "type": "module",
   "scripts": {
@@ -32,4 +32,4 @@
   "devDependencies": {
     "vitest": "^3.0.5"
   }
-}
+}

src/@types/default.d.ts

@@ -12,8 +12,8 @@ export interface ParsedResult {
 
 export interface ConvertToDevExpressFormatParams {
     ast: any; // Define a more specific type if possible
-    variables: string[];
     resultObject: StateDataObject;
+    enableShortCircuit?: boolean;
 }
 
 export function sanitizeQuery(filterString: string): SanitizedQuery;
@@ -30,6 +30,6 @@ export function convertSQLToAst(
 
 export function convertAstToDevextreme(
     ast: any, // Define a more specific type if possible
-    variables: string[],
-    state: StateDataObject
+    state: StateDataObject,
+    enableShortCircuit?: boolean,
 ): any;

src/core/converter.js

@@ -7,7 +7,7 @@ import { LOGICAL_OPERATORS } from "../constants.js";
 function DevExpressConverter() {
     // Global variables accessible throughout the converter
     let resultObject = null;
-    const EnableShortCircuit = true;
+    let EnableShortCircuit = true;
 
     /**
    * Main conversion function that sets up the global context
@@ -376,5 +376,5 @@ const devExpressConverter = DevExpressConverter();
  * @returns {Array|null} DevExpress format filter
  */
 export function convertToDevExpressFormat({ ast, resultObject = null, enableShortCircuit = true }) {
-    return devExpressConverter.init(ast, resultObject,enableShortCircuit);
+    return devExpressConverter.init(ast, resultObject, enableShortCircuit);
 }

src/index.js

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