sqlparser-devexpress 2.3.0 → 2.3.2

package/package.json

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

package/src/core/converter.js

@@ -248,7 +248,7 @@ function DevExpressConverter() {
         if (!resultObject) return `{${placeholder}}`;
 
 
-        return resultObject.hasOwnProperty(placeholder) ? resultObject[placeholder] : `{${placeholder}}`;
+        return resultObject.hasOwnProperty(placeholder) ? resultObject[placeholder] : `{${placeholder.value ?? placeholder}}`;
     }
 
     /**

package/src/core/parser.js

@@ -184,6 +184,8 @@ export function parse(input, variables = []) {
 	function parseValue(operatorToken) {
 		if (!currentToken) throw new Error("Unexpected end of input");
 
+		if(currentToken.type === "function") return parseFunction();
+
 		const token = currentToken;
 		next(); // Move to the next token
 
@@ -199,11 +201,18 @@ export function parse(input, variables = []) {
 			return { type: "placeholder", value: val };
 		}
 
-		operatorToken = operatorToken.toUpperCase();
+		operatorToken = operatorToken?.toUpperCase();
 
 		// Handle IN operator which requires a list of values
 		if (operatorToken && (operatorToken === "IN" || operatorToken === "NOT IN")) return parseInList(token);
 
+		// Handle ({Placeholder}) syntax for placeholders inside parentheses
+		const nextToken = tokenizer.peekNextToken();
+		if(token.type === "paren" && currentToken && currentToken.type === "placeholder" && nextToken && nextToken.type === "paren") {
+			const val = parseValue();
+			return { type: "placeholder", value: val };
+		}
+
 		throw new Error(`Unexpected value: ${token.value}`);
 	}
 

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("(ISNULL(TicketID, 0) = ISNULL({CustomerOrders.OrderID}, 0))", 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/error.test.js

@@ -0,0 +1,66 @@
+import { describe, expect, it } from "vitest";
+import { convertToDevExpressFormat } from "../src/core/converter";
+import { parse } from "../src/core/parser";
+import { sanitizeQuery } from "../src/core/sanitizer";
+import { convertAstToDevextreme, convertSQLToAst } from "../src";
+
+describe("Parser SQL to dx Filter Builder", () => {
+    const testCases = [
+        {
+            input: "NULL",
+            expected: []
+        },
+        {
+            input: "SELECT DISTINCT O.OrderID AS ID, O.CustomerName, O.OrderType, O.CustomerName AS [Online Order], O.OrderDate AS OrderDate, D.DeliveryStatus, O.OrderDate AS [Online Order Date], O.CompanyID, CAST(CAST(O.OrderDate AS DATE) AS VARCHAR(10)) AS DocumentDate FROM Orders O INNER JOIN Payment P ON P.OrderID = O.OrderID INNER JOIN Shipment S ON S.PaymentID = P.PaymentID INNER JOIN Delivery D ON D.ShipmentID = S.ShipmentID ",
+            expect: null
+        },
+        {
+            input: "CompanyID = CompanyID2 = {AccountingRule.CompanyID}",
+            expected: "Error: Invalid comparison: CompanyID = CompanyID2",
+        },
+        {
+            input: "( CompanyID = {AccountingRule.CompanyID}",
+            expected: "Error: Missing closing parenthesis"
+        }
+
+    ];
+
+    testCases.forEach(({ input, expected }, index) => {
+        it(`Test Case ${index + 1}: ${input}`, () => {
+
+            if (expected == undefined) {
+                expected = null
+            }
+
+            let astwithVariables;
+            try {
+                astwithVariables = convertSQLToAst(input);
+            } catch (error) {
+                expect(error.message).toEqual(expected.replace("Error: ", ""));
+                return;
+            }
+
+            if (astwithVariables == null) {
+                expect(null).toEqual(expected);
+                return;
+            }
+
+            const variables = astwithVariables.variables;
+            const ast = astwithVariables.ast;
+
+            const result = convertAstToDevextreme(ast, sampleData);
+
+            if (result == null || result == true || result == false) {
+                expect([]).toEqual(expected);
+                return;
+            }
+
+            expect(result).toEqual(expected);
+        });
+    });
+});
+
+
+const sampleData = {
+    "AccountingRule.CompanyID": 42,
+};

package/tests/parser.test.js

@@ -102,10 +102,6 @@ describe("Parser SQL to dx Filter Builder", () => {
                 ["ItemGroupType", "=", ""]
             ]
         },
-        {
-            input: "NULL",
-            expected: []
-        },
         {
             input: "((ISNULL({0}, 0) = 0 AND CompanyID = {1}) OR CompanyID IS NULL) OR BranchID = {0} | [LeadDocument.BranchID] | [LeadDocument.CompanyID]",
             expected: [
@@ -122,10 +118,6 @@ describe("Parser SQL to dx Filter Builder", () => {
                 ["BranchID", "=", 42]
             ]
         },
-        {
-            input: "SELECT DISTINCT OP.DocID ID,OP.DocName,OP.DocType,OP.DocName [Work Purchase Order],OP.DocDate DocDate,SP.WoStatus,OP.DocDate [Work Purchase Order Date], OP.CompanyID,      cast(cast(OP.DocDate as date) as varchar(10)) DocumentDate        FROM OpenDocuments OP      inner join PurchaseHeader PH on PH.Id=op.DocID       inner JOIN PurchasePosting PP ON PP.DocID = PH.ID       inner JOIN SalePosting SP ON SP.PurchasePostingLineID = PP.ID",
-            expect: null
-        },
         {
             input: "FromDate Between '10-10-2021' AND '10-10-2022'",
             expected: [
@@ -152,10 +144,6 @@ describe("Parser SQL to dx Filter Builder", () => {
                 ["SourceID", "=", null]
             ]
         },
-        {
-            input: "CompanyID = CompanyID2 = {AccountingRule.CompanyID}",
-            expected: "Error: Invalid comparison: CompanyID = CompanyID2",
-        },
         {
             input: "(CompanyID = {LeadDocument.CompanyID} OR ISNULL(CompanyID,0) = 0) AND (ISNULL(IsSubdealer,0) = {LeadDocument.AllowSubDealer})",
             expected: [
@@ -185,11 +173,21 @@ 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]
+            ]
+        },
+        {
+            input: "(ISNULL(TicketID, 0) = ISNULL({SupportResolution.TicketID}, 0))",
+            expected: [
+                ["TicketID", "=", 123],
+                "or",
+                ["TicketID", "=", null]
             ]
         }
     ];
@@ -202,12 +200,8 @@ describe("Parser SQL to dx Filter Builder", () => {
             }
 
             let astwithVariables;
-            try {
-                astwithVariables = convertSQLToAst(input);
-            } catch (error) {
-                expect(error.message).toEqual(expected.replace("Error: ", ""));
-                return;
-            }
+            astwithVariables = convertSQLToAst(input);
+
 
             if (astwithVariables == null) {
                 expect(null).toEqual(expected);
@@ -217,7 +211,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);
@@ -254,5 +248,6 @@ const sampleData = {
     "LeadDocument.BranchID": 42,
     "LeadDocument.CompanyID": 7,
     "ServiceOrderDocument.SourceID": 2,
-    "LeadDocument.AllowSubDealer": true
+    "LeadDocument.AllowSubDealer": true,
+    "SupportResolution.TicketID": 123
 };