sqlparser-devexpress 2.1.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "src/index.js",
   "type": "module",
   "scripts": {
@@ -11,6 +11,10 @@
     "require": "./src/index.js"
   },
   "types": "src/@types/default.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/RohitM-IN/SQLParser.git"
+  },
   "keywords": [
     "sql",
     "parser",

package/src/core/converter.js

@@ -31,7 +31,7 @@ function DevExpressConverter() {
         let result = processAstNode(ast);
 
         // Handle special cases for short circuit
-        if(result === true || result === false || result === null) return [];
+        if (result === true || result === false || result === null) return [];
 
         return processAstNode(ast);
     }
@@ -192,17 +192,13 @@ function DevExpressConverter() {
             }
         }
 
-        if(Array.isArray(resolvedValue) && resolvedValue.length){
+        if (Array.isArray(resolvedValue) && resolvedValue.length) {
+
+            return resolvedValue.flatMap(i => [[ast.field, '=', i], 'or']).slice(0, -1);
 
-            return Array.prototype.concat
-             .apply(
-               [],
-               resolvedValue.map((i) => [[ast.field, '=', i], 'or']),
-             )
-             .slice(0, -1)
         }
 
-        return [ast.field, "in", resolvedValue];
+        return [ast.field, "=", resolvedValue];
     }
 
     /**
@@ -329,7 +325,14 @@ function DevExpressConverter() {
      * @returns {boolean|null} The result of the evaluation or null if not evaluable.
      */
     function evaluateExpression(left, operator, right) {
-        if (isNaN(left) || isNaN(right) || left === null || right === null) return null;
+        if ((left !== null && isNaN(left)) || (right !== null && isNaN(right))) return null;
+
+        if (left === null || right === null) {
+            if (operator === '=' || operator === '==') return left === right;
+            if (operator === '<>' || operator === '!=') return left !== right;
+            return null; // Any comparison with null should return null
+        }
+
         switch (operator) {
             case '=': case '==': return left === right;
             case '<>': case '!=': return left !== right;
@@ -337,7 +340,7 @@ function DevExpressConverter() {
             case '>=': return left >= right;
             case '<': return left < right;
             case '<=': return left <= right;
-            default: return false;
+            default: return null; // Invalid operator
         }
     }
 

package/src/core/parser.js

@@ -25,9 +25,9 @@ export function parse(input, variables = []) {
 	// const tokens = [];
 	// let tempToken = currentToken;
 	// while (tempToken) {
-	//   tokens.push(tempToken);
-	//   tempToken = tokenizer.peekNextToken();
-	//   tokenizer.nextToken();
+	// 	tokens.push(tempToken);
+	// 	tempToken = tokenizer.peekNextToken();
+	// 	tokenizer.nextToken();
 	// }
 
 	// console.log("Tokens:", tokens);

package/src/debug.js

@@ -0,0 +1,40 @@
+// // 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,);
+
+// import { convertToDevExpressFormat } from "./core/converter.js";
+// import { parse } from "./core/parser.js";
+// import { sanitizeQuery } from "./core/sanitizer.js";
+// import { convertAstToDevextreme, convertSQLToAst } from "./index.js";
+
+// const sampleData = {
+//     'LeadStatementGlobalRpt.StateID': null,
+//     'LeadStatementGlobalRpt.RegionID': null,
+//     'ServiceOrderDocument.SourceID': 2
+// }
+
+// export function parseFilterString(filterString, sampleData = null) {
+//     if (filterString.toUpperCase().startsWith("SELECT")) return null; // Skip full SQL queries
+
+//     let { sanitizedSQL, extractedVariables } = sanitizeQuery(filterString);
+//     console.log("Sanitized SQL:", sanitizedSQL, "\n");
+
+//     const parsedResult = parse(sanitizedSQL, extractedVariables);
+//     extractedVariables = parsedResult.variables;
+//     console.log("Extracted Variables:", JSON.stringify(extractedVariables, null, 2), "\n");
+
+//     const astTree = parsedResult.ast;
+//     console.log("AST Tree:", JSON.stringify(astTree, null, 2), "\n");
+
+//     return convertToDevExpressFormat({ ast: astTree, variables: extractedVariables, resultObject: sampleData });
+// }
+
+// // const devexpress = parseFilterString("(RS2ID in ({LeadStatementGlobalRpt.StateID}) Or ({LeadStatementGlobalRpt.StateID} =0)) And (RS3ID  in (0,{LeadStatementGlobalRpt.RegionID}) Or {LeadStatementGlobalRpt.RegionID} =0 )", sampleData);
+// const devexpress = parseFilterString("{LeadStatementGlobalRpt.RegionID} =0", sampleData);
+// console.log("DevExpress Filter:", JSON.stringify(devexpress, null, 2));
+
+// // const devExpressFilter = convertSQLToAst("(RS2ID in ({LeadStatementGlobalRpt.StateID}) Or ({LeadStatementGlobalRpt.StateID} =0)) And (RS3ID  in (0,{LeadStatementGlobalRpt.RegionID}) Or {LeadStatementGlobalRpt.RegionID} =0 ) ");
+// // const devExpressFilterresult = convertAstToDevextreme(devExpressFilter.ast, devExpressFilter.variables, sampleData);
+// // console.log("DevExpress Filter:", JSON.stringify(devExpressFilter, null, 2));
+// // console.log("DevExpress Result:", JSON.stringify(devExpressFilterresult, null, 2));

package/src/index.js

@@ -19,29 +19,5 @@ export function convertAstToDevextreme(ast, variables, state) {
     return convertToDevExpressFormat({ ast, variables, resultObject: state })
 }
 
-// export function parseFilterString(filterString, sampleData = null) {
-//     if (filterString.toUpperCase().startsWith("SELECT")) return null; // Skip full SQL queries
 
-//     let { sanitizedSQL, extractedVariables } = sanitizeQuery(filterString);
-//     console.log("Sanitized SQL:", sanitizedSQL, "\n");
-
-//     const parsedResult = parse(sanitizedSQL, extractedVariables);
-//     extractedVariables = parsedResult.variables;
-//     console.log("Extracted Variables:", JSON.stringify(extractedVariables, null, 2), "\n");
-
-//     const astTree = parsedResult.ast;
-//     console.log("AST Tree:", JSON.stringify(astTree, null, 2), "\n");
-
-//     return convertToDevExpressFormat({ ast: astTree, variables: extractedVariables, resultObject: sampleData });
-// }
-
-// 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("CompanyID = CompanyID2 = {AccountingRule.CompanyID}");
-// 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));