sqlparser-devexpress 2.0.4 → 2.0.6

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "main": "src/index.js",
   "type": "module",
   "scripts": {
     "test": "vitest"
   },
+  "exports": {
+    "import": "./src/index.js",
+    "require": "./src/index.js"
+  },
   "keywords": [
     "sql",
     "parser",

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: "=>|<=|!=|>=|=|<>|>|<|AND|OR|BETWEEN|IN|LIKE|IS", // 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
 };
@@ -40,7 +40,7 @@ class Tokenizer {
       const type = [...tokenTypeMap.keys()].find(name => match.groups[name] !== undefined);
 
       // Skip whitespace tokens
-      if (!type || type === "whitespace") return this.nextToken(); 
+      if (!type || type === "whitespace") return this.nextToken();
 
       let value = match.groups[type];
 

package/src/index.js

@@ -38,6 +38,6 @@ 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 = parseFilterString("(RS2ID in ({SaleOrderStatusStmtGlobalRpt.StateID}) Or ({SaleOrderStatusStmtGlobalRpt.StateID} =0)) And (RS3ID  in (0,{SaleOrderStatusStmtGlobalRpt.RegionID}) Or {SaleOrderStatusStmtGlobalRpt.RegionID} =0 )", sampleResultObject,);
+//const devExpressFilter = convertSQLToAst("(ISNULL(IsSubdealer,0) = {LeadDocument.AllowSubDealer})");
 
 // console.log("DevExpress Filter:", JSON.stringify(devExpressFilter, null, 2));