@abaplint/transpiler-cli 2.11.0 → 2.11.2

package/build/bundle.js

@@ -19800,6 +19800,12 @@ class BuiltInMethod extends _identifier_1.Identifier {
     getAll() {
         throw new Error("BuiltInMethod->getAll, Method not implemented");
     }
+    getEventName() {
+        return undefined;
+    }
+    getEventClass() {
+        return undefined;
+    }
     getImporting() {
         const ret = [];
         for (const i in this.method.mandatory) {
@@ -38747,10 +38753,14 @@ class EventDefinition extends _identifier_1.Identifier {
         super(found.getFirstToken(), input.filename);
         this.parameters = [];
         this.parse(node, input);
+        this.is_static = node.getFirstToken().getStr().toUpperCase() === "CLASS";
     }
     getParameters() {
         return this.parameters;
     }
+    isStatic() {
+        return this.is_static;
+    }
     ///////////////
     parse(node, input) {
         for (const e of node.findAllExpressions(expressions_1.MethodParam)) {
@@ -39170,7 +39180,7 @@ const _reference_1 = __webpack_require__(/*! ../5_syntax/_reference */ "./node_m
 class MethodDefinition extends _identifier_1.Identifier {
     // todo: final flag
     constructor(node, visibility, input) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!(node.get() instanceof statements_1.MethodDef)) {
             throw new Error("MethodDefinition, expected MethodDef as part of input node");
         }
@@ -39192,8 +39202,11 @@ class MethodDefinition extends _identifier_1.Identifier {
             }
         }
         this.eventHandler = false;
-        if (node.findDirectExpression(Expressions.EventHandler)) {
+        const handler = node.findDirectExpression(Expressions.EventHandler);
+        if (handler) {
             this.eventHandler = true;
+            this.eventName = (_a = handler.findDirectExpression(Expressions.EventName)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+            this.eventClass = (_b = handler.findDirectExpression(Expressions.ClassName)) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase();
         }
         this.abstract = false;
         if (node.findDirectExpression(Expressions.Abstract)) {
@@ -39205,7 +39218,7 @@ class MethodDefinition extends _identifier_1.Identifier {
             this.static = true;
         }
         this.raising = [];
-        for (const r of ((_a = node.findDirectExpression(Expressions.MethodDefRaising)) === null || _a === void 0 ? void 0 : _a.findAllExpressions(Expressions.ClassName)) || []) {
+        for (const r of ((_c = node.findDirectExpression(Expressions.MethodDefRaising)) === null || _c === void 0 ? void 0 : _c.findAllExpressions(Expressions.ClassName)) || []) {
             const token = r.getFirstToken();
             const name = token.getStr();
             this.raising.push(name);
@@ -39221,7 +39234,7 @@ class MethodDefinition extends _identifier_1.Identifier {
             }
         }
         this.exceptions = [];
-        for (const r of ((_b = node.findDirectExpression(Expressions.MethodDefExceptions)) === null || _b === void 0 ? void 0 : _b.findAllExpressions(Expressions.NamespaceSimpleName)) || []) {
+        for (const r of ((_d = node.findDirectExpression(Expressions.MethodDefExceptions)) === null || _d === void 0 ? void 0 : _d.findAllExpressions(Expressions.NamespaceSimpleName)) || []) {
             const token = r.getFirstToken();
             const name = token.getStr();
             this.exceptions.push(name);
@@ -39247,6 +39260,12 @@ class MethodDefinition extends _identifier_1.Identifier {
     isEventHandler() {
         return this.eventHandler;
     }
+    getEventName() {
+        return this.eventName;
+    }
+    getEventClass() {
+        return this.eventClass;
+    }
     getParameters() {
         return this.parameters;
     }
@@ -53585,7 +53604,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.150";
+        return "2.113.151";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -86259,11 +86278,19 @@ exports.RaiseTranspiler = RaiseTranspiler;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RaiseEventTranspiler = 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 expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 class RaiseEventTranspiler {
     transpile(node, traversal) {
-        // todo
-        return new chunk_1.Chunk().append(`abap.statements.raiseEvent();`, node, traversal);
+        const eventName = traversal_1.Traversal.escapeNamespace(node.findFirstExpression(abaplint.Expressions.EventName)?.concatTokens())?.toLowerCase().replace("~", "$");
+        const parameters = node.findFirstExpression(abaplint.Expressions.ParameterListS);
+        let extra = "";
+        if (parameters) {
+            extra = "," + new expressions_1.ParameterListSTranspiler().transpile(parameters, traversal).getCode();
+        }
+        return new chunk_1.Chunk().append(`await abap.statements.raiseEvent(this.${eventName}, this.me${extra});`, node, traversal);
     }
 }
 exports.RaiseEventTranspiler = RaiseEventTranspiler;
@@ -87092,20 +87119,54 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 class SetHandlerTranspiler {
     transpile(node, traversal) {
         const methods = [];
+        let eventClass = undefined;
+        let eventName = undefined;
         for (const m of node.findDirectExpressions(abaplint.Expressions.MethodSource)) {
-            methods.push(new expressions_1.MethodSourceTranspiler().transpile(m, traversal).getCode());
+            methods.push(new expressions_1.MethodSourceTranspiler().transpile(m, traversal).getCode().replace("await ", ""));
+            if (eventClass === undefined) {
+                const nameToken = m.getFirstToken();
+                const scope = traversal.findCurrentScopeByToken(nameToken);
+                const method = traversal.findMethodReference(nameToken, scope);
+                if (method?.def.isEventHandler() !== true) {
+                    throw new Error(`SetHandlerTranspiler: Method "${nameToken.getStr()}" is not an event handler`);
+                }
+                eventName = method.def.getEventName();
+                eventClass = this.findEventClass(method.def, traversal, scope);
+                // className = method.def.getEventClass();
+                // this.findEventClass(def, eventName, traversal, scope);
+            }
         }
         let f = undefined;
         const forExpression = node.findExpressionAfterToken("FOR");
-        if (forExpression) {
+        if (forExpression instanceof abaplint.Expressions.Source) {
             f = new expressions_1.SourceTranspiler().transpile(forExpression, traversal).getCode();
         }
-        let activation = undefined;
+        else {
+            f = `"ALL"`;
+        }
+        let activation = "";
         const activationExpression = node.findExpressionAfterToken("ACTIVATION");
         if (activationExpression) {
-            activation = new expressions_1.SourceTranspiler().transpile(activationExpression, traversal).getCode();
+            activation = ", " + new expressions_1.SourceTranspiler().transpile(activationExpression, traversal).getCode();
         }
-        return new chunk_1.Chunk().append(`abap.statements.setHandler([${methods.join(",")}], ${f}, ${activation});`, node, traversal);
+        return new chunk_1.Chunk().append(`abap.statements.setHandler({EVENT_NAME: "${eventName}", EVENT_CLASS: "${eventClass}"}, [${methods.join(",")}], ${f}${activation});`, node, traversal);
+    }
+    findEventClass(mdef, traversal, scope) {
+        let def = traversal.findClassDefinition(mdef.getEventClass(), scope);
+        if (def === undefined) {
+            def = traversal.findInterfaceDefinition(mdef.getEventClass(), scope);
+        }
+        // look through super classes
+        while (def?.getSuperClass() !== undefined) {
+            if (def.getEvents().find(e => e.getName().toUpperCase() === mdef.getEventName()?.toUpperCase())) {
+                break;
+            }
+            def = traversal.findClassDefinition(def.getSuperClass(), scope);
+        }
+        if (def === undefined) {
+            throw new Error(`SetHandlerTranspiler: findEventClass "${mdef.getEventClass()}" not found`);
+        }
+        return traversal.buildInternalName(def.getName(), def);
     }
 }
 exports.SetHandlerTranspiler = SetHandlerTranspiler;
@@ -89901,6 +89962,7 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         for (const i of def.getImplementing()) {
             ret += this.dataFromInterfaces(i.name, scope, cName);
             ret += this.aliasesFromInterfaces(i.name, scope, cName);
+            ret += this.eventsFromInterfaces(i.name, scope);
         }
         // handle aliases after initialization of carrier variables
         for (const a of def.getAliases() || []) {
@@ -89910,6 +89972,27 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         for (const c of def.getAttributes()?.getConstants() || []) {
             ret += "this." + Traversal.escapeNamespace(c.getName().toLowerCase()) + " = " + cName + "." + Traversal.escapeNamespace(c.getName().toLowerCase()) + ";\n";
         }
+        for (const e of def.getEvents() || []) {
+            const name = this.buildInternalName(def.getName(), def);
+            ret += "this." + Traversal.escapeNamespace(e.getName().toLowerCase()) + " = {\"EVENT_NAME\": \"" + e.getName().toUpperCase() + "\", \"EVENT_CLASS\": \"" + name + "\"};\n";
+        }
+        return ret;
+    }
+    eventsFromInterfaces(name, scope) {
+        let ret = "";
+        const intf = this.findInterfaceDefinition(name, scope);
+        if (intf === undefined) {
+            return ret;
+        }
+        for (const e of intf.getEvents() || []) {
+            const fname = Traversal.escapeNamespace(e.getName().toLowerCase());
+            const iname = Traversal.escapeNamespace(intf?.getName().toLowerCase());
+            const name = this.buildInternalName(intf.getName(), intf);
+            ret += "this." + iname + "$" + fname + " = {\"EVENT_NAME\": \"" + e.getName().toUpperCase() + "\", \"EVENT_CLASS\": \"" + name + "\"};\n";
+        }
+        for (const i of intf.getImplementing() || []) {
+            ret += this.eventsFromInterfaces(i.name, scope);
+        }
         return ret;
     }
     findInterfaceDefinition(name, scope) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,8 +27,8 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.113.150",
-    "@abaplint/transpiler": "^2.11.0",
+    "@abaplint/core": "^2.113.151",
+    "@abaplint/transpiler": "^2.11.2",
     "@types/glob": "^8.1.0",
     "@types/node": "^22.17.0",
     "@types/progress": "^2.0.7",