sqlparser-devexpress 2.2.4 → 2.3.1

package/package.json

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

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

package/src/core/tokenizer.js

@@ -6,7 +6,7 @@ const tokenPatterns = {
   function: "\\b(ISNULL)\\b", // Matches function names like ISNULL (case-insensitive)
   null: "\\bNULL\\b|\\(\\s*NULL\\s*\\)", // Matches NULL as a keyword
   number: "\\(\\d+\\)|\\d+", // Matches numbers while stripping unnecessary parentheses
-  placeholder: "'?\\{[^}]+\\}'?", // Matches placeholders like {variable} or '{variable}'
+  placeholder: "\\('?\\{[^}]+\\}'?\\)|'?\\{[^}]+\\}'?", // Matches placeholders like {variable} or '{variable}' or ({variable}) or ('{variable}')
   string: "\\('\\w+\\'\\)|'(?:''|[^'])*'", // Matches strings, allowing for escaped single quotes ('')
   operator: "=>|<=|!=|>=|=|<>|>|<|\\bAND\\b|\\bOR\\b|\\bBETWEEN\\b|\\bIN\\b|\\bNOT IN\\b|\\bLIKE\\b|\\bIS NOT\\b|\\bNOT LIKE\\b|\\bIS\\b", // Matches SQL operators and logical keywords
   identifier: "[\\w.]+|\"[^\"]+\"|\\[[^\\]]+\\]", // Matches regular identifiers, quoted identifiers ("identifier"), and bracketed identifiers [identifier]
@@ -47,7 +47,7 @@ class Tokenizer {
       let value = match.groups[type];
 
       // Remove surrounding single quotes from placeholders
-      if (type === "placeholder") value = value.replace(/^['"]|['"]$/g, "").replace(" ", "");
+      if (type === "placeholder") value = value.replace(/^[\s'"\(\)]+|[\s'"\(\)]+|[\s]+/g, "");
 
       if (type === "operator") {
         const lowerValue = value.toLowerCase();
@@ -59,15 +59,15 @@ class Tokenizer {
         }
       }
 
-      if (LITERALS.includes(type)){
+      if (LITERALS.includes(type)) {
         value = value.replace(/^[(]|[)]$/g, "");
       }
 
       if (type === "identifier") {
         value = value.replace(/^["\[]|["\]]$/g, "");
       }
-      
-      
+
+
       return { type, value };
     }
 

package/src/debug.js

@@ -25,10 +25,10 @@
 //     const astTree = parsedResult.ast;
 //     console.log("AST Tree:", JSON.stringify(astTree, null, 2), "\n");
 
-//     return convertToDevExpressFormat({ ast: astTree, variables: extractedVariables, resultObject: sampleData });
+//     return convertToDevExpressFormat({ ast: astTree, resultObject: sampleData });
 // }
 
-// const devexpress = parseFilterString("OrderID = {CustomerOrders.OrderID} AND Status IN (1, 3)", sampleData);
+// const devexpress = parseFilterString("AddressType IN ('2', ('4')) OR AddressType =({ServiceOrderDocument .SourceID})", sampleData);
 // console.log("DevExpress Filter:", JSON.stringify(devexpress, null, 2));
 // // const devexpress = parseFilterString("(RS2ID in ({LeadStatementGlobalRpt.StateID}) Or ({LeadStatementGlobalRpt.StateID} =0)) And (RS3ID  in (0,{LeadStatementGlobalRpt.RegionID}) Or {LeadStatementGlobalRpt.RegionID} =0 )", sampleData);
 

package/tests/parser.test.js

@@ -185,11 +185,13 @@ describe("Parser SQL to dx Filter Builder", () => {
             ]
         },
         {
-            input: "AddressType IN ('2', ('4'))",
+            input: "AddressType IN ('2', ('4')) OR AddressType =({ServiceOrderDocument .SourceID})",
             expected: [
                 ["AddressType", "=", '2'],
                 "or",
-                ["AddressType", "=", '4']
+                ["AddressType", "=", '4'],
+                "or",
+                ["AddressType", "=", 2]
             ]
         }
     ];
@@ -217,7 +219,7 @@ describe("Parser SQL to dx Filter Builder", () => {
             const variables = astwithVariables.variables;
             const ast = astwithVariables.ast;
 
-            const result = convertAstToDevextreme(ast, variables, sampleData);
+            const result = convertAstToDevextreme(ast, sampleData);
 
             if (result == null || result == true || result == false) {
                 expect([]).toEqual(expected);