@abaplint/transpiler-cli 2.5.13 → 2.5.15

package/build/bundle.js

@@ -29930,7 +29930,9 @@ class Data {
                 const found = new data_1.Data().runSyntax(c, scope, filename);
                 if (found) {
                     components.push({ name: found.getName(), type: found.getType() });
-                    values[found.getName()] = found.getValue();
+                    if (found.getValue() !== undefined) {
+                        values[found.getName()] = found.getValue();
+                    }
                 }
             }
             else if (c instanceof nodes_1.StructureNode && ctyp instanceof Structures.Data) {
@@ -29985,7 +29987,8 @@ class Data {
             return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(new Basic.StructureType(components), { withHeader: true }));
         }
         else {
-            return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.StructureType(components), undefined, values);
+            const val = Object.keys(values).length > 0 ? values : undefined;
+            return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.StructureType(components), undefined, val);
         }
     }
 }
@@ -46135,7 +46138,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.28";
+        return "2.95.29";
     }
     getDDICReferences() {
         return this.references;
@@ -51078,6 +51081,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.outlineGetReferenceSimple(high, lowFile);
+        if (found) {
+            return found;
+        }
         found = this.outlineDataSimple(high, lowFile);
         if (found) {
             return found;
@@ -51499,6 +51506,28 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getStart(), node.getEnd(), code);
         return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline DATA", this.getMetadata().key, this.conf.severity, fix);
     }
+    outlineGetReferenceSimple(node, lowFile) {
+        var _a, _b, _c;
+        if (!(node.get() instanceof Statements.GetReference)) {
+            return undefined;
+        }
+        const target = node.findFirstExpression(Expressions.Target);
+        if (!(((_a = target === null || target === void 0 ? void 0 : target.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.InlineData)) {
+            return undefined;
+        }
+        const source = node.findFirstExpression(Expressions.Source);
+        if (!(((_b = source === null || source === void 0 ? void 0 : source.getFirstChild()) === null || _b === void 0 ? void 0 : _b.get()) instanceof Expressions.FieldChain)) {
+            return undefined;
+        }
+        const targetName = ((_c = target.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "errorError";
+        const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+        const firstToken = target.getFirstToken();
+        const lastToken = target.getLastToken();
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getStart(), `DATA ${targetName} LIKE REF TO ${source.concatTokens()}.\n${indentation}`);
+        const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), lastToken.getEnd(), targetName);
+        const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+        return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline DATA", this.getMetadata().key, this.conf.severity, fix);
+    }
     outlineDataSimple(node, lowFile) {
         // outlines "DATA(ls_msg) = temp1.", note that this does not need to look at types
         var _a, _b, _c;
@@ -67731,9 +67760,10 @@ class FieldChainTranspiler {
     constructor(addGet = false) {
         this.addGet = addGet;
     }
-    transpile(node, traversal, prefix = true, filename) {
+    transpile(node, traversal, prefix = true, filename, wrongScope = false) {
         const ret = new chunk_1.Chunk();
         const extra = [];
+        let interfaceNameAdded = false;
         for (const c of node.getChildren()) {
             if (c.get() instanceof core_1.Expressions.SourceField
                 || c.get() instanceof core_1.Expressions.Field) {
@@ -67746,11 +67776,15 @@ class FieldChainTranspiler {
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.ClassName) {
                 const name = traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken());
                 ret.append(name + ".", c, traversal);
+                if (wrongScope === true && traversal.reg.getObject("INTF", c.getFirstToken().getStr())) {
+                    ret.append(traversal_1.Traversal.escapeNamespace(c.getFirstToken().getStr().toLocaleLowerCase()) + "$", c, traversal);
+                    interfaceNameAdded = true;
+                }
             }
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
                 const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());
                 let name = c.getFirstToken().getStr().toLowerCase();
-                if (prefix && interfaceName && name.startsWith(interfaceName) === false) {
+                if (prefix && interfaceName && name.startsWith(interfaceName) === false && interfaceNameAdded === false) {
                     name = traversal_1.Traversal.escapeNamespace(name).replace("~", "$");
                     name = traversal_1.Traversal.escapeNamespace(interfaceName) + "$" + name;
                 }
@@ -73463,7 +73497,7 @@ class MethodImplementationTranspiler {
                         }
                         else {
                             // note: this can be difficult, the "def" might be from an interface, ie. a different scope than the method
-                            val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename()).getCode();
+                            val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename(), true).getCode();
                             if (val.startsWith(parameterDefault.getFirstToken().getStr().toLowerCase()) === true) {
                                 val = "this." + val;
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.13",
+  "version": "2.5.15",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,11 +25,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.13",
+    "@abaplint/transpiler": "^2.5.15",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.28",
+    "@abaplint/core": "^2.95.29",
     "progress": "^2.0.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",