@abaplint/transpiler 2.4.4 → 2.4.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SQLCondTranspiler = void 0;
4
4
  const abaplint = require("@abaplint/core");
5
+ const traversal_1 = require("../traversal");
5
6
  const chunk_1 = require("../chunk");
6
7
  const simple_source3_1 = require("./simple_source3");
7
8
  const field_chain_1 = require("./field_chain");
@@ -29,7 +30,7 @@ class SQLCondTranspiler {
29
30
  ret += this.sqlIn(c, traversal);
30
31
  }
31
32
  else {
32
- ret += this.basicCondition(c, traversal);
33
+ ret += this.basicCondition(c, traversal, traversal.getFilename());
33
34
  }
34
35
  }
35
36
  else if (c instanceof abaplint.Nodes.ExpressionNode) {
@@ -52,18 +53,17 @@ class SQLCondTranspiler {
52
53
  const ret = `" + abap.expandIN("${fieldName.concatTokens()}", ${source.concatTokens()}) + "`;
53
54
  return ret;
54
55
  }
55
- basicCondition(c, traversal) {
56
+ basicCondition(c, traversal, filename) {
56
57
  let ret = "";
57
58
  if (c.getChildren().length !== 3) {
58
- return this.basicConditionNew(c, traversal);
59
- // throw new Error("SQL Condition, transpiler todo1, " + c.concatTokens() + ", " + c.getChildren().length);
59
+ return this.basicConditionNew(c, traversal, filename);
60
60
  }
61
61
  const fieldName = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
62
62
  const operator = c.findDirectExpression(abaplint.Expressions.SQLCompareOperator);
63
63
  const source = c.findDirectExpression(abaplint.Expressions.SQLSource);
64
64
  if (fieldName && source && operator === undefined && c.findDirectTokenByText("LIKE")) {
65
65
  ret += fieldName.concatTokens() + " LIKE ";
66
- ret += this.sqlSource(source, traversal);
66
+ ret += this.sqlSource(source, traversal, filename);
67
67
  return ret;
68
68
  }
69
69
  if (fieldName === undefined || operator === undefined || source === undefined) {
@@ -77,21 +77,35 @@ class SQLCondTranspiler {
77
77
  op = "<>";
78
78
  }
79
79
  ret += fieldName.concatTokens() + " " + op + " ";
80
- ret += this.sqlSource(source, traversal);
80
+ ret += this.sqlSource(source, traversal, filename);
81
81
  return ret;
82
82
  }
83
- sqlSource(source, traversal) {
83
+ sqlSource(source, traversal, filename) {
84
84
  let ret = "";
85
85
  const simple = source.findDirectExpression(abaplint.Expressions.SimpleSource3);
86
+ const alias = source.findDirectExpression(abaplint.Expressions.SQLAliasField);
86
87
  if (simple && simple.findDirectExpression(abaplint.Expressions.Constant) === undefined) {
87
88
  ret += "'\" + " + new simple_source3_1.SimpleSource3Transpiler(true).transpile(simple, traversal).getCode() + " + \"'";
88
89
  }
90
+ else if (alias) {
91
+ // SQLAliasField might be a SQL reference or value from ABAP interface
92
+ const pre = alias.concatTokens().split("~")[0];
93
+ const found = traversal.findInterfaceDefinition(pre, traversal.findCurrentScopeByToken(alias.getFirstToken()));
94
+ if (found) {
95
+ let name = traversal.prefixAndName(alias.getFirstToken(), filename).replace("~", "$");
96
+ name = traversal_1.Traversal.escapeNamespace(name);
97
+ ret += "'\" + " + name + ".get() + \"'";
98
+ }
99
+ else {
100
+ ret += source.concatTokens();
101
+ }
102
+ }
89
103
  else {
90
104
  ret += source.concatTokens();
91
105
  }
92
106
  return ret;
93
107
  }
94
- basicConditionNew(node, traversal) {
108
+ basicConditionNew(node, traversal, filename) {
95
109
  let ret = "";
96
110
  for (const child of node.getChildren()) {
97
111
  if (ret !== "") {
@@ -102,7 +116,7 @@ class SQLCondTranspiler {
102
116
  }
103
117
  else if (child.get() instanceof abaplint.Expressions.SQLSource
104
118
  && child instanceof abaplint.Nodes.ExpressionNode) {
105
- ret += this.sqlSource(child, traversal);
119
+ ret += this.sqlSource(child, traversal, filename);
106
120
  }
107
121
  else {
108
122
  ret += child.concatTokens();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abaplint/transpiler",
3
- "version": "2.4.4",
3
+ "version": "2.4.5",
4
4
  "description": "Transpiler",
5
5
  "main": "build/src/index.js",
6
6
  "typings": "build/src/index.d.ts",