sqlparser-devexpress 2.1.3 → 2.1.4

package/package.json

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

package/src/constants.js

@@ -0,0 +1,11 @@
+// 
+export const LITERALS = ["number", "string", "null"];
+
+// Define operator precedence for parsing expressions
+export const OPERATOR_PRECEDENCE = {
+    "OR": 1, "AND": 2, "=": 3, "!=": 3, ">": 3, "<": 3, ">=": 3, "<=": 3,
+    "IN": 3, "<>": 3, "LIKE": 3, "IS": 3, "BETWEEN": 3
+};
+
+// Regular expression to check for unsupported SQL patterns (like SELECT-FROM or JOIN statements)
+export const UNSUPPORTED_PATTERN = /\bSELECT\b.*\bFROM\b|\bINNER\s+JOIN\b/i;

package/src/core/parser.js

@@ -1,15 +1,6 @@
+import { LITERALS, OPERATOR_PRECEDENCE, UNSUPPORTED_PATTERN } from "../constants.js";
 import { Tokenizer } from "./tokenizer.js";
 
-// Define operator precedence for parsing expressions
-const OPERATOR_PRECEDENCE = {
-	"OR": 1, "AND": 2, "=": 3, "!=": 3, ">": 3, "<": 3, ">=": 3, "<=": 3,
-	"IN": 3, "<>": 3, "LIKE": 3, "IS": 3, "BETWEEN": 3
-};
-
-const LITERALS = ["number", "string", "null"];
-
-// Regular expression to check for unsupported SQL patterns (like SELECT-FROM or JOIN statements)
-const UNSUPPORTED_PATTERN = /\bSELECT\b.*\bFROM\b|\bINNER\s+JOIN\b/i;
 
 export function parse(input, variables = []) {
 

package/src/core/tokenizer.js

@@ -1,14 +1,16 @@
+import { LITERALS } from "../constants";
+
 // Define regex patterns for different token types
 const tokenPatterns = {
   whitespace: "\\s+", // Matches spaces, tabs, and newlines
   function: "\\b(ISNULL)\\b", // Matches function names like ISNULL (case-insensitive)
-  null: "\\bNULL\\b", // Matches NULL as a keyword
-  number: "\\d+", // Matches numerical values
+  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}'
-  string: "'(?:''|[^'])*'", // Matches strings, allowing for escaped single quotes ('')
+  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 identifiers, including table.column format
-  paren: "[()]", // Matches parentheses
+  paren: "[()]", // Matches standalone parentheses
   comma: "," // Matches commas
 };
 
@@ -45,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(/^['"]|['"]$/g, "").replace(" ", "");
 
       if (type === "operator") {
         const lowerValue = value.toLowerCase();
@@ -57,6 +59,8 @@ class Tokenizer {
         }
       }
 
+      if (LITERALS.includes(type)) value = value.replace(/^[(]|[)]$/g, "")
+
       return { type, value };
     }
 

package/src/index.js

@@ -5,13 +5,14 @@ import { sanitizeQuery } from "./core/sanitizer.js";
 
 export function convertSQLToAst(filterString, enableConsoleLogs = false) {
     let { sanitizedSQL, extractedVariables } = sanitizeQuery(filterString);
-    !!enableConsoleLogs && console.log("Sanitized SQL:", sanitizedSQL, "\n");
 
     const parsedResult = parse(sanitizedSQL, extractedVariables);
 
-    !!enableConsoleLogs && console.log("Extracted Variables:", JSON.stringify(parsedResult.variables, null, 2), "\n");
-    !!enableConsoleLogs && console.log("AST Tree:", JSON.stringify(parsedResult.ast, null, 2), "\n");
-
+    if (enableConsoleLogs === true) {
+        console.log("Sanitized SQL:", sanitizedSQL, "\n");
+        console.log("Extracted Variables:", JSON.stringify(parsedResult.variables, null, 2), "\n");
+        console.log("AST Tree:", JSON.stringify(parsedResult.ast, null, 2), "\n");
+    }
     return parsedResult;
 }
 

package/tests/parser.test.js

@@ -183,6 +183,14 @@ describe("Parser SQL to dx Filter Builder", () => {
                 "and",
                 ["AddressType", "!=", 4]
             ]
+        },
+        {
+            input: "AddressType IN ('2', ('4'))",
+            expected: [
+                ["AddressType", "=", '2'],
+                "or",
+                ["AddressType", "=", '4']
+            ]
         }
     ];