sqlparser-devexpress 2.0.6 → 2.0.7

package/package.json

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

package/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

package/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 };
     }
 

package/src/core/tokenizer.js

@@ -6,8 +6,8 @@ const tokenPatterns = {
   number: "\\d+", // Matches numerical values
   placeholder: "'?\\{[^}]+\\}'?", // Matches placeholders like {variable} or '{variable}'
   string: "'(?:''|[^'])*'", // Matches strings, allowing for escaped single quotes ('')
+  operator: "=>|<=|!=|>=|=|<>|>|<|\\bAND\\b|\\bOR\\b|\\bBETWEEN\\b|\\bIN\\b|\\bLIKE\\b|\\bIS NOT\\b|\\bNOT LIKE\\b|\\bIS\\b", // Matches SQL operators and logical keywords
   identifier: "[\\w.]+", // Matches identifiers, including table.column format
-  operator: "(?<!\w)(=>|<=|!=|>=|=|<>|>|<|AND|OR|BETWEEN|IN|LIKE|IS)(?!\w)", // Matches SQL operators and logical keywords
   paren: "[()]", // Matches parentheses
   comma: "," // Matches commas
 };
@@ -47,12 +47,38 @@ class Tokenizer {
       // Remove surrounding single quotes from placeholders
       if (type === "placeholder") value = value.replace(/^['"]|['"]$/g, "");
 
+      if (type === "operator") {
+        const lowerValue = value.toLowerCase();
+        
+        if (lowerValue === "is") {
+          value = "=";
+        } else if (lowerValue === "is not") {
+          value = "!=";
+        }
+      }
+      
       return { type, value };
     }
 
     // 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 };

package/src/index.js

@@ -38,6 +38,10 @@ export function convertAstToDevextreme(ast, variables, state) {
 // Example usage
 // const devExpressFilter = parseFilterString("((ISNULL({0}, 0) = 0 AND CompanyID = {1}) OR CompanyID IS NULL) OR BranchID = {0} | [LeadDocument.BranchID] | [LeadDocument.CompanyID]", sampleResultObject);
 // const devExpressFilter = parseFilterString("FromDate <= '{TransferOutwardDocument.DocDate}' ", sampleResultObject, "TransferOutwardDocument", "789");
-//const devExpressFilter = convertSQLToAst("(ISNULL(IsSubdealer,0) = {LeadDocument.AllowSubDealer})");
+// 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));
+

package/tests/parser.test.js

@@ -130,6 +130,22 @@ describe("Parser SQL to dx Filter Builder", () => {
             expected: [
                 "FromDate", "between", ["10-10-2021", "10-10-2022"]
             ]
+        },
+        {
+            input: "BranchID is Null OR BranchID is not 12",
+            expected: [
+                ["BranchID", "=", null],
+                "or",
+                ["BranchID", "!=", 12]
+            ]
+        },
+        {
+            input: "ISNULL(SourceID,0) = {ServiceOrderDocument.SourceID} OR ISNULL(SourceID,0) = 0",
+            expected: [
+                ["SourceID", "=", 2],
+                "or",
+                ["SourceID", "=", 0]
+            ]
         }
     ];
 
@@ -193,5 +209,6 @@ const sampleData = {
     "TransferOutwardDocument.RefBranchID": 42,
     "TransferOutwardDocument.CompanyID": 7,
     "LeadDocument.BranchID": 42,
-    "LeadDocument.CompanyID": 7
+    "LeadDocument.CompanyID": 7,
+    "ServiceOrderDocument.SourceID": 2
 };