@abaplint/transpiler-cli 2.4.3 → 2.4.5

package/build/bundle.js

@@ -68491,6 +68491,7 @@ exports.SourceFieldSymbolTranspiler = SourceFieldSymbolTranspiler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SQLCondTranspiler = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const simple_source3_1 = __webpack_require__(/*! ./simple_source3 */ "./node_modules/@abaplint/transpiler/build/src/expressions/simple_source3.js");
 const field_chain_1 = __webpack_require__(/*! ./field_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_chain.js");
@@ -68518,7 +68519,7 @@ class SQLCondTranspiler {
                     ret += this.sqlIn(c, traversal);
                 }
                 else {
-                    ret += this.basicCondition(c, traversal);
+                    ret += this.basicCondition(c, traversal, traversal.getFilename());
                 }
             }
             else if (c instanceof abaplint.Nodes.ExpressionNode) {
@@ -68541,39 +68542,59 @@ class SQLCondTranspiler {
         const ret = `" + abap.expandIN("${fieldName.concatTokens()}", ${source.concatTokens()}) + "`;
         return ret;
     }
-    basicCondition(c, traversal) {
+    basicCondition(c, traversal, filename) {
         let ret = "";
         if (c.getChildren().length !== 3) {
-            return this.basicConditionNew(c, traversal);
-            //      throw new Error("SQL Condition, transpiler todo1, " + c.concatTokens() + ", " + c.getChildren().length);
+            return this.basicConditionNew(c, traversal, filename);
         }
         const fieldName = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
         const operator = c.findDirectExpression(abaplint.Expressions.SQLCompareOperator);
         const source = c.findDirectExpression(abaplint.Expressions.SQLSource);
         if (fieldName && source && operator === undefined && c.findDirectTokenByText("LIKE")) {
             ret += fieldName.concatTokens() + " LIKE ";
-            ret += this.sqlSource(source, traversal);
+            ret += this.sqlSource(source, traversal, filename);
             return ret;
         }
         if (fieldName === undefined || operator === undefined || source === undefined) {
             throw new Error("SQL Condition, transpiler todo2, " + c.concatTokens());
         }
-        ret += fieldName.concatTokens() + " " + operator.concatTokens() + " ";
-        ret += this.sqlSource(source, traversal);
+        let op = operator.concatTokens();
+        if (op.toUpperCase() === "EQ") {
+            op = "=";
+        }
+        else if (op.toUpperCase() === "NE") {
+            op = "<>";
+        }
+        ret += fieldName.concatTokens() + " " + op + " ";
+        ret += this.sqlSource(source, traversal, filename);
         return ret;
     }
-    sqlSource(source, traversal) {
+    sqlSource(source, traversal, filename) {
         let ret = "";
         const simple = source.findDirectExpression(abaplint.Expressions.SimpleSource3);
+        const alias = source.findDirectExpression(abaplint.Expressions.SQLAliasField);
         if (simple && simple.findDirectExpression(abaplint.Expressions.Constant) === undefined) {
             ret += "'\" + " + new simple_source3_1.SimpleSource3Transpiler(true).transpile(simple, traversal).getCode() + " + \"'";
         }
+        else if (alias) {
+            // SQLAliasField might be a SQL reference or value from ABAP interface
+            const pre = alias.concatTokens().split("~")[0];
+            const found = traversal.findInterfaceDefinition(pre, traversal.findCurrentScopeByToken(alias.getFirstToken()));
+            if (found) {
+                let name = traversal.prefixAndName(alias.getFirstToken(), filename).replace("~", "$");
+                name = traversal_1.Traversal.escapeNamespace(name);
+                ret += "'\" + " + name + ".get() + \"'";
+            }
+            else {
+                ret += source.concatTokens();
+            }
+        }
         else {
             ret += source.concatTokens();
         }
         return ret;
     }
-    basicConditionNew(node, traversal) {
+    basicConditionNew(node, traversal, filename) {
         let ret = "";
         for (const child of node.getChildren()) {
             if (ret !== "") {
@@ -68584,7 +68605,7 @@ class SQLCondTranspiler {
             }
             else if (child.get() instanceof abaplint.Expressions.SQLSource
                 && child instanceof abaplint.Nodes.ExpressionNode) {
-                ret += this.sqlSource(child, traversal);
+                ret += this.sqlSource(child, traversal, filename);
             }
             else {
                 ret += child.concatTokens();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,7 +25,7 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.4.3",
+    "@abaplint/transpiler": "^2.4.5",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",