@abaplint/transpiler 2.5.14 → 2.5.16

package/build/src/expressions/field_chain.js

@@ -13,6 +13,7 @@ class FieldChainTranspiler {
     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) {
@@ -27,12 +28,13 @@ class FieldChainTranspiler {
                 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;
                 }

package/build/src/statements/class_implementation.d.ts

@@ -4,4 +4,6 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class ClassImplementationTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
+    private findImplementedInterface;
+    private findImplementedClass;
 }

package/build/src/statements/class_implementation.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClassImplementationTranspiler = void 0;
+/* eslint-disable max-len */
 const abaplint = require("@abaplint/core");
 const traversal_1 = require("../traversal");
 const chunk_1 = require("../chunk");
@@ -17,9 +18,38 @@ class ClassImplementationTranspiler {
         else if (def === null || def === void 0 ? void 0 : def.getSuperClass()) {
             ret += " extends " + traversal_1.Traversal.escapeNamespace((_a = def === null || def === void 0 ? void 0 : def.getSuperClass()) === null || _a === void 0 ? void 0 : _a.toLowerCase());
         }
+        const scope = traversal.findCurrentScopeByToken(token);
         return new chunk_1.Chunk().append(ret + ` {
 static INTERNAL_TYPE = 'CLAS';
-static IMPLEMENTED_INTERFACES = [${def === null || def === void 0 ? void 0 : def.getImplementing().map(e => `"` + e.name.toUpperCase() + `"`).join(",")}];`, node, traversal);
+static IMPLEMENTED_INTERFACES = [${this.findImplementedClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];`, node, traversal);
+    }
+    findImplementedInterface(traversal, def, scope) {
+        if (def === undefined || scope === undefined) {
+            return [];
+        }
+        const list = def.getImplementing().map(i => i.name.toUpperCase());
+        for (const i of def.getImplementing()) {
+            const idef = traversal.findInterfaceDefinition(i.name, scope);
+            list.push(...this.findImplementedInterface(traversal, idef, scope));
+        }
+        return list;
+    }
+    findImplementedClass(traversal, def, scope) {
+        if (def === undefined || scope === undefined) {
+            return [];
+        }
+        const list = def.getImplementing().map(i => i.name.toUpperCase());
+        for (const i of def.getImplementing()) {
+            const idef = traversal.findInterfaceDefinition(i.name, scope);
+            list.push(...this.findImplementedInterface(traversal, idef, scope));
+        }
+        let sup = def.getSuperClass();
+        while (sup !== undefined) {
+            const sdef = traversal.findClassDefinition(sup, scope);
+            list.push(...this.findImplementedClass(traversal, sdef, scope));
+            sup = sdef === null || sdef === void 0 ? void 0 : sdef.getSuperClass();
+        }
+        return list;
     }
 }
 exports.ClassImplementationTranspiler = ClassImplementationTranspiler;

package/build/src/statements/message.js

@@ -34,6 +34,23 @@ class MessageTranspiler {
                 options.push("number: \"" + str.substr(1, 3) + "\"");
                 options.push("type: \"" + str.substr(0, 1).toUpperCase() + "\"");
             }
+            const like = messagesource.findExpressionAfterToken("LIKE");
+            if (like) {
+                options.push("displayLike: " + traversal.traverse(like).getCode());
+            }
+        }
+        else {
+            // exception based
+            const exception = node.findDirectExpression(abaplint.Expressions.SimpleSource3);
+            options.push("exception: " + traversal.traverse(exception).getCode());
+            const type = node.findExpressionAfterToken("TYPE");
+            if (type) {
+                options.push("type: " + traversal.traverse(type).getCode());
+            }
+            const like = node.findExpressionAfterToken("LIKE");
+            if (like) {
+                options.push("displayLike: " + traversal.traverse(like).getCode());
+            }
         }
         const w = [];
         let withs = false;

package/build/src/structures/interface.js

@@ -18,7 +18,6 @@ class InterfaceTranspiler {
                 name = traversal_1.Traversal.escapeNamespace(name);
                 ret += `class ${name} {\n`;
                 ret += `static INTERNAL_TYPE = 'INTF';\n`;
-                ret += `static IMPLEMENTED_INTERFACES = [${def === null || def === void 0 ? void 0 : def.getImplementing().map(e => `"` + e.name.toUpperCase() + `"`).join(",")}];\n`;
             }
             else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndInterface) {
                 ret += "}\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.5.14",
+  "version": "2.5.16",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.95.29",
+    "@abaplint/core": "^2.95.30",
     "source-map": "^0.7.4"
   },
   "devDependencies": {