@abaplint/transpiler 2.11.33 → 2.11.35

package/build/src/handlers/handle_fugr.d.ts

@@ -3,5 +3,6 @@ import { IOutputFile, ITranspilerOptions } from "../types";
 export declare class HandleFUGR {
     private readonly options;
     constructor(options?: ITranspilerOptions);
+    static shouldSkip(obj: abaplint.ABAPObject, reg: abaplint.IRegistry): any;
     runObject(obj: abaplint.ABAPObject, reg: abaplint.IRegistry): IOutputFile[];
 }

package/build/src/handlers/handle_fugr.js

@@ -10,12 +10,15 @@ class HandleFUGR {
     constructor(options) {
         this.options = options;
     }
+    static shouldSkip(obj, reg) {
+        // @ts-ignore  todo
+        return new abaplint.SkipLogic(reg).isGeneratedFunctionGroup(obj);
+    }
     // function groups are compiled into a single file, with one closure for the function groups top variables
     runObject(obj, reg) {
         const spaghetti = new abaplint.SyntaxLogic(reg, obj).run().spaghetti;
         const chunk = new chunk_1.Chunk().appendString("{\n");
-        // @ts-ignore  todo
-        if (new abaplint.SkipLogic(reg).isGeneratedFunctionGroup(obj)) {
+        if (HandleFUGR.shouldSkip(obj, reg)) {
             return [];
         }
         for (const file of obj.getSequencedFiles()) {

package/build/src/initialization.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Initialization = void 0;
 exports.escapeNamespaceFilename = escapeNamespaceFilename;
 const abaplint = require("@abaplint/core");
+const handle_fugr_1 = require("./handlers/handle_fugr");
 function escapeNamespaceFilename(filename) {
     // ES modules are resolved and cached as URLs. This means that special characters must be
     // percent-encoded, such as # with %23 and ? with %3F.
@@ -90,6 +91,9 @@ export async function initializeABAP() {\n`;
             else if (obj instanceof abaplint.Objects.Program && obj.isInclude() === true) {
                 continue;
             }
+            else if (obj instanceof abaplint.Objects.FunctionGroup && handle_fugr_1.HandleFUGR.shouldSkip(obj, reg) === true) {
+                continue;
+            }
             else if (obj instanceof abaplint.Objects.Interface
                 || obj instanceof abaplint.Objects.FunctionGroup
                 || (options?.importProg === true && obj instanceof abaplint.Objects.Program)

package/build/src/statements/set_handler.js

@@ -12,7 +12,7 @@ class SetHandlerTranspiler {
         for (const m of node.findDirectExpressions(abaplint.Expressions.MethodSource)) {
             methods.push(new expressions_1.MethodSourceTranspiler().transpile(m, traversal).getCode().replace("await ", "") + ".bind(this)");
             if (eventClass === undefined) {
-                const nameToken = m.getFirstToken();
+                const nameToken = m.getLastToken();
                 const scope = traversal.findCurrentScopeByToken(nameToken);
                 const method = traversal.findMethodReference(nameToken, scope);
                 if (method?.def.isEventHandler() !== true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.11.33",
+  "version": "2.11.35",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",