@abaplint/runtime 2.13.53 → 2.13.55

package/build/src/abap_eventing.d.ts

@@ -3,10 +3,12 @@ export type ABAPEventReference = {
     EVENT_NAME: string;
     EVENT_CLASS: string;
 };
-type HandlerMethod = (parameters?: any) => Promise<void>;
+export type HandlerMethod = {
+    method: (parameters?: any) => Promise<void>;
+    receiver: object;
+};
 export declare class ABAPEventing {
     private readonly registrations;
     setHandler(event: ABAPEventReference, methods: HandlerMethod[], forObject: ABAPObject | "ALL", activation: boolean): any;
     raiseEvent(event: ABAPEventReference, me: ABAPObject, parameters: object): Promise<void>;
 }
-export {};

package/build/src/abap_eventing.js

@@ -13,21 +13,27 @@ class ABAPEventing {
         if (!this.registrations[event.EVENT_CLASS][event.EVENT_NAME]) {
             this.registrations[event.EVENT_CLASS][event.EVENT_NAME] = [];
         }
-        const ref = forObject === "ALL" ? "ALL" : new WeakRef(forObject);
+        const target = forObject === "ALL" ? "ALL" : forObject.get();
         const handlers = this.registrations[event.EVENT_CLASS][event.EVENT_NAME];
         if (activation === true) {
             // todo: tackle duplicates
             handlers.push({
                 handlers: methods,
-                forObject: ref,
+                forObject: target === "ALL" ? "ALL" : new WeakRef(target),
             });
         }
         else {
             if (methods.length > 1) {
                 throw new Error("ABAPEventing.setHandler: deactivation of multiple methods not supported, todo");
             }
-            // todo: comparing the functions via toString might give the wrong result
-            const index = handlers.findIndex(handler => handler.forObject === ref && handler.handlers[0].toString() === methods[0].toString());
+            const index = handlers.findIndex(handler => {
+                const sameObject = handler.forObject === "ALL"
+                    ? target === "ALL"
+                    : target !== "ALL" && handler.forObject.deref() === target;
+                const sameMethod = handler.handlers[0].method === methods[0].method
+                    && handler.handlers[0].receiver === methods[0].receiver;
+                return sameObject && sameMethod;
+            });
             if (index !== -1) {
                 handlers.splice(index, 1);
             }
@@ -42,12 +48,12 @@ class ABAPEventing {
         for (const handler of handlers) {
             if (handler.forObject === "ALL") {
                 for (const method of handler.handlers) {
-                    await method(parameters);
+                    await method.method.call(method.receiver, parameters);
                 }
             }
-            else if (handler.forObject.deref() === me) {
+            else if (handler.forObject.deref() === me.get()) {
                 for (const method of handler.handlers) {
-                    await method(parameters);
+                    await method.method.call(method.receiver, parameters);
                 }
             }
         }

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

@@ -1,4 +1,4 @@
-import { ABAPEventReference } from "../abap_eventing";
+import { ABAPEventReference, HandlerMethod } from "../abap_eventing";
 import { ABAPObject, FieldSymbol } from "../types";
 import { ICharacter } from "../types/_character";
-export declare function setHandler(eventReference: ABAPEventReference, methods: any[], forObject: ABAPObject | FieldSymbol, activation?: ICharacter): void;
+export declare function setHandler(eventReference: ABAPEventReference, methods: HandlerMethod[], forObject: ABAPObject | FieldSymbol, activation?: ICharacter): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.13.53",
+  "version": "2.13.55",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",