Merge pull request #7 from RohitM-IN/development

Bug Fixes

Author: RohitM-IN

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "main": "src/index.js",
   "type": "module",
   "scripts": {
@@ -10,6 +10,7 @@
     "import": "./src/index.js",
     "require": "./src/index.js"
   },
+  "types": "src/@types/default.d.ts",
   "keywords": [
     "sql",
     "parser",

src/@types/default.d.ts

@@ -0,0 +1,35 @@
+export type StateDataObject = Record<string, any>;
+
+export interface SanitizedQuery {
+    sanitizedSQL: string;
+    extractedVariables: string[];
+}
+
+export interface ParsedResult {
+    ast: any; // Define a more specific type if possible
+    variables: string[];
+}
+
+export interface ConvertToDevExpressFormatParams {
+    ast: any; // Define a more specific type if possible
+    variables: string[];
+    resultObject: StateDataObject;
+}
+
+export function sanitizeQuery(filterString: string): SanitizedQuery;
+
+export function parse(query: string, variables: string[]): ParsedResult;
+
+export function convertToDevExpressFormat(params: ConvertToDevExpressFormatParams): any;
+
+export function convertSQLToAst(
+    filterString: string,
+    SampleData?: StateDataObject | null,
+    enableConsoleLogs?: boolean
+): ParsedResult;
+
+export function convertAstToDevextreme(
+    ast: any, // Define a more specific type if possible
+    variables: string[],
+    state: StateDataObject
+): any;

src/core/converter.js

@@ -20,18 +20,19 @@ function DevExpressConverter() {
    * @param {Object} ast - The abstract syntax tree
    * @param {Array} vars - Array of variable names
    * @param {Object} ResultObject - Optional object for placeholder resolution
-   * @param {string} primaryEntity - Optional primary entity name
-   * @param {string} primaryKey - Optional primary key value
    * @returns {Array|null} DevExpress format filter
    */
-    function convert(ast, vars, ResultObject = null, PrimaryEntity = null, PrimaryKey = null) {
+    function convert(ast, vars, ResultObject = null) {
         // Set up global context
         variables = vars;
-        primaryKey = PrimaryKey;
-        primaryEntity = PrimaryEntity;
         resultObject = ResultObject;
 
         // Process the AST
+        let result = processAstNode(ast);
+
+        // Handle special cases for short circuit
+        if(result === true || result === false || result === null) return [];
+
         return processAstNode(ast);
     }
 
@@ -191,6 +192,16 @@ function DevExpressConverter() {
             }
         }
 
+        if(Array.isArray(resolvedValue) && resolvedValue.length){
+
+            return Array.prototype.concat
+             .apply(
+               [],
+               resolvedValue.map((i) => [[ast.field, '=', i], 'or']),
+             )
+             .slice(0, -1)
+        }
+
         return [ast.field, "in", resolvedValue];
     }
 
@@ -346,6 +357,6 @@ const devExpressConverter = DevExpressConverter();
  * @param {string} primaryKey - Optional primary key value
  * @returns {Array|null} DevExpress format filter
  */
-export function convertToDevExpressFormat({ ast, variables, resultObject = null, primaryEntity = null, primaryKey = null }) {
-    return devExpressConverter.init(ast, variables, resultObject, primaryEntity, primaryKey);
+export function convertToDevExpressFormat({ ast, variables, resultObject = null }) {
+    return devExpressConverter.init(ast, variables, resultObject);
 }