@abaplint/transpiler 2.5.13 → 2.5.15
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.
|
@@ -6,5 +6,5 @@ export declare class FieldChainTranspiler implements IExpressionTranspiler {
|
|
|
6
6
|
private readonly addGet;
|
|
7
7
|
private addGetOffset;
|
|
8
8
|
constructor(addGet?: boolean);
|
|
9
|
-
transpile(node: Nodes.ExpressionNode, traversal: Traversal, prefix?: boolean, filename?: string): Chunk;
|
|
9
|
+
transpile(node: Nodes.ExpressionNode, traversal: Traversal, prefix?: boolean, filename?: string, wrongScope?: boolean): Chunk;
|
|
10
10
|
}
|
|
@@ -10,9 +10,10 @@ class FieldChainTranspiler {
|
|
|
10
10
|
constructor(addGet = false) {
|
|
11
11
|
this.addGet = addGet;
|
|
12
12
|
}
|
|
13
|
-
transpile(node, traversal, prefix = true, filename) {
|
|
13
|
+
transpile(node, traversal, prefix = true, filename, wrongScope = false) {
|
|
14
14
|
const ret = new chunk_1.Chunk();
|
|
15
15
|
const extra = [];
|
|
16
|
+
let interfaceNameAdded = false;
|
|
16
17
|
for (const c of node.getChildren()) {
|
|
17
18
|
if (c.get() instanceof core_1.Expressions.SourceField
|
|
18
19
|
|| c.get() instanceof core_1.Expressions.Field) {
|
|
@@ -25,11 +26,15 @@ class FieldChainTranspiler {
|
|
|
25
26
|
else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.ClassName) {
|
|
26
27
|
const name = traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken());
|
|
27
28
|
ret.append(name + ".", c, traversal);
|
|
29
|
+
if (wrongScope === true && traversal.reg.getObject("INTF", c.getFirstToken().getStr())) {
|
|
30
|
+
ret.append(traversal_1.Traversal.escapeNamespace(c.getFirstToken().getStr().toLocaleLowerCase()) + "$", c, traversal);
|
|
31
|
+
interfaceNameAdded = true;
|
|
32
|
+
}
|
|
28
33
|
}
|
|
29
34
|
else if (c.get() instanceof core_1.Expressions.AttributeName) {
|
|
30
35
|
const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());
|
|
31
36
|
let name = c.getFirstToken().getStr().toLowerCase();
|
|
32
|
-
if (prefix && interfaceName && name.startsWith(interfaceName) === false) {
|
|
37
|
+
if (prefix && interfaceName && name.startsWith(interfaceName) === false && interfaceNameAdded === false) {
|
|
33
38
|
name = traversal_1.Traversal.escapeNamespace(name).replace("~", "$");
|
|
34
39
|
name = traversal_1.Traversal.escapeNamespace(interfaceName) + "$" + name;
|
|
35
40
|
}
|
|
@@ -102,7 +102,7 @@ class MethodImplementationTranspiler {
|
|
|
102
102
|
}
|
|
103
103
|
else {
|
|
104
104
|
// note: this can be difficult, the "def" might be from an interface, ie. a different scope than the method
|
|
105
|
-
val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename()).getCode();
|
|
105
|
+
val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename(), true).getCode();
|
|
106
106
|
if (val.startsWith(parameterDefault.getFirstToken().getStr().toLowerCase()) === true) {
|
|
107
107
|
val = "this." + val;
|
|
108
108
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abaplint/transpiler",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.15",
|
|
4
4
|
"description": "Transpiler",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"typings": "build/src/index.d.ts",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"author": "abaplint",
|
|
29
29
|
"license": "MIT",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@abaplint/core": "^2.95.
|
|
31
|
+
"@abaplint/core": "^2.95.29",
|
|
32
32
|
"source-map": "^0.7.4"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|