Merge pull request #6 from RohitM-IN/development

Bug Fixes

Author: RohitM-IN

Diff for: package.json

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

Diff for: src/core/converter.js

@@ -139,8 +139,8 @@ function DevExpressConverter() {
             return handleInOperator(ast);
         }
 
-        const left = convertValue(ast.field);
-        const right = convertValue(ast.value);
+        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];
 
         // Apply short-circuit evaluation if enabled

Diff for: src/core/parser.js

@@ -19,6 +19,21 @@ export function parse(input, variables = []) {
   const tokenizer = new Tokenizer(input);
   let currentToken = tokenizer.nextToken();
 
+    // // Debugging: log the tokens
+    // const tokens = [];
+    // let tempToken = currentToken;
+    // while (tempToken) {
+    //   tokens.push(tempToken);
+    //   tempToken = tokenizer.peekNextToken();
+    //   tokenizer.nextToken();
+    // }
+  
+    // console.log("Tokens:", tokens);
+    
+    // // Reset the tokenizer
+    // tokenizer.reset();
+    // currentToken = tokenizer.nextToken();
+
   // Moves to the next token in the input
   function next() {
     currentToken = tokenizer.nextToken();
@@ -68,6 +83,21 @@ export function parse(input, variables = []) {
       }
 
       next(); // Consume the closing parenthesis
+
+      // Check if the next token is an operator and process it
+    if (currentToken && currentToken.type === "operator") {
+      const operator = currentToken.value;
+      next(); // Move to the next token after the operator
+      const value = parseValue(); // Parse the value after the operator
+
+      return {
+          type: "comparison",
+          left: { type: "function", name: funcName, args },
+          operator,
+          value
+      };
+  }
+
       return { type: "function", name: funcName, args };
     }
 

Diff for: src/core/tokenizer.js

@@ -63,6 +63,22 @@ class Tokenizer {
     // If no valid token is found, throw an error with the remaining input for debugging
     throw new Error(`Unexpected token at: ${this.input.slice(this.index)}`);
   }
+
+  peekNextToken() {
+    if (this.index >= this.input.length) return null;
+    
+    const savedIndex = this.index; // Save current index
+    try {
+      return this.nextToken(); // Get next token
+    } finally {
+      this.index = savedIndex; // Restore index
+    }
+  }
+
+  reset() {
+    this.index = 0; // Reset index to the beginning of the input
+  }
+  
 }
 
 export { Tokenizer };

Diff for: src/index.js

@@ -40,4 +40,8 @@ export function convertAstToDevextreme(ast, variables, state) {
 // const devExpressFilter = parseFilterString("FromDate <= '{TransferOutwardDocument.DocDate}' ", sampleResultObject, "TransferOutwardDocument", "789");
 // const devExpressFilter = parseFilterString("(RS2ID in ({SaleOrderStatusStmtGlobalRpt.StateID}) Or ({SaleOrderStatusStmtGlobalRpt.StateID} =0)) And (RS3ID  in (0,{SaleOrderStatusStmtGlobalRpt.RegionID}) Or {SaleOrderStatusStmtGlobalRpt.RegionID} =0 )", sampleResultObject,);
 
+// const devExpressFilter = convertSQLToAst("ISNULL(SourceID,0) = {ServiceOrderDocument.SourceID} OR ISNULL(SourceID,0) = 0");
+// const devExpressFilterresult = convertAstToDevextreme(devExpressFilter.ast, devExpressFilter.variables,{'ServiceOrderDocument.SourceID': 2});
 // console.log("DevExpress Filter:", JSON.stringify(devExpressFilter, null, 2));
+// console.log("DevExpress Result:", JSON.stringify(devExpressFilterresult, null, 2));
+

Diff for: tests/parser.test.js

@@ -138,6 +138,14 @@ describe("Parser SQL to dx Filter Builder", () => {
                 "or",
                 ["BranchID", "!=", 12]
             ]
+        },
+        {
+            input: "ISNULL(SourceID,0) = {ServiceOrderDocument.SourceID} OR ISNULL(SourceID,0) = 0",
+            expected: [
+                ["SourceID", "=", 2],
+                "or",
+                ["SourceID", "=", 0]
+            ]
         }
     ];
 
@@ -201,5 +209,6 @@ const sampleData = {
     "TransferOutwardDocument.RefBranchID": 42,
     "TransferOutwardDocument.CompanyID": 7,
     "LeadDocument.BranchID": 42,
-    "LeadDocument.CompanyID": 7
+    "LeadDocument.CompanyID": 7,
+    "ServiceOrderDocument.SourceID": 2
 };