@abaplint/core 2.113.1 → 2.113.3

package/build/abaplint.d.ts

@@ -1821,6 +1821,8 @@ declare type DynproField = {
 
 declare type DynproHeader = {
     number: string;
+    description: string;
+    nextScreen: string;
     fields: DynproField[];
 };
 
@@ -2679,6 +2681,8 @@ declare class FunctionExportingParameter extends Expression {
 declare class FunctionGroup extends ABAPObject {
     private includes;
     private modules;
+    private description;
+    private dynpros;
     getType(): string;
     getDescription(): string | undefined;
     setDirty(): void;
@@ -2686,6 +2690,7 @@ declare class FunctionGroup extends ABAPObject {
         maxLength: number;
         allowNamespace: boolean;
     };
+    getDynpros(): DynproList;
     getSequencedFiles(): readonly ABAPFile[];
     getModules(): FunctionModuleDefinition[];
     getIncludeFiles(): {
@@ -4901,9 +4906,6 @@ declare namespace Objects {
         Package,
         Parameter,
         PersonalizationObject,
-        DynproField,
-        DynproHeader,
-        DynproList,
         Program,
         ProxyObject,
         PushChannel,

package/build/src/abap/flow/statement_flow.js

@@ -16,7 +16,9 @@ class StatementFlow {
         var _a, _b, _c, _d;
         const ret = [];
         let name = "";
-        const structures = stru.findAllStructuresMulti([Structures.Form, Structures.ClassImplementation, Structures.FunctionModule]);
+        const structures = stru.findAllStructuresMulti([
+            Structures.Form, Structures.ClassImplementation, Structures.FunctionModule, Structures.Module
+        ]);
         for (const s of structures) {
             if (s.get() instanceof Structures.Form) {
                 name = "FORM " + ((_a = s.findFirstExpression(Expressions.FormName)) === null || _a === void 0 ? void 0 : _a.concatTokens());
@@ -34,6 +36,10 @@ class StatementFlow {
                 name = "FUNCTION " + ((_d = s.findFirstExpression(Expressions.Field)) === null || _d === void 0 ? void 0 : _d.concatTokens());
                 ret.push(this.run(s, name));
             }
+            else if (s.get() instanceof Structures.Module) {
+                name = s.getFirstStatement().concatTokens().toUpperCase();
+                ret.push(this.run(s, name));
+            }
             else {
                 throw new Error("StatementFlow, unknown structure");
             }

package/build/src/objects/_dynpros.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDynpros = parseDynpros;
+const xml_utils_1 = require("../xml_utils");
+function parseDynpros(parsed) {
+    var _a, _b, _c, _d;
+    const dynpros = [];
+    const xmlDynpros = (_c = (_b = (_a = parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]) === null || _b === void 0 ? void 0 : _b["asx:values"]) === null || _c === void 0 ? void 0 : _c.DYNPROS;
+    if (xmlDynpros !== undefined) {
+        for (const d of (0, xml_utils_1.xmlToArray)(xmlDynpros.item)) {
+            const fields = [];
+            for (const f of (0, xml_utils_1.xmlToArray)((_d = d.FIELDS) === null || _d === void 0 ? void 0 : _d.RPY_DYFATC)) {
+                fields.push({
+                    name: f.NAME,
+                    type: f.TYPE,
+                    length: f.LENGTH,
+                });
+            }
+            dynpros.push({
+                number: d.HEADER.SCREEN,
+                description: d.HEADER.DESCRIPT,
+                nextScreen: d.HEADER.NEXTSCREEN,
+                fields: fields,
+            });
+        }
+    }
+    return dynpros;
+}
+//# sourceMappingURL=_dynpros.js.map

package/build/src/objects/function_group.js

@@ -5,18 +5,23 @@ const _abap_object_1 = require("./_abap_object");
 const types_1 = require("../abap/types");
 const xml_utils_1 = require("../xml_utils");
 const fast_xml_parser_1 = require("fast-xml-parser");
+const _dynpros_1 = require("./_dynpros");
 class FunctionGroup extends _abap_object_1.ABAPObject {
     constructor() {
         super(...arguments);
         this.includes = undefined;
         this.modules = undefined;
+        this.description = undefined;
+        this.dynpros = undefined;
     }
     getType() {
         return "FUGR";
     }
     getDescription() {
-        // todo
-        return undefined;
+        if (this.description === undefined) {
+            this.parseXML();
+        }
+        return this.description;
     }
     setDirty() {
         super.setDirty();
@@ -29,6 +34,12 @@ class FunctionGroup extends _abap_object_1.ABAPObject {
             allowNamespace: true,
         };
     }
+    getDynpros() {
+        if (this.dynpros === undefined) {
+            this.parseXML();
+        }
+        return this.dynpros || [];
+    }
     getSequencedFiles() {
         const main = this.getMainABAPFile();
         if (main === undefined) {
@@ -130,22 +141,24 @@ class FunctionGroup extends _abap_object_1.ABAPObject {
     }
     /////////////////////////////////
     parseXML() {
-        var _a, _b;
+        var _a, _b, _c;
         this.includes = [];
         this.modules = [];
         const parsed = this.parseRaw2();
         if (parsed === undefined) {
             return;
         }
+        this.description = (_a = parsed.abapGit["asx:abap"]["asx:values"]) === null || _a === void 0 ? void 0 : _a.AREAT;
+        this.dynpros = (0, _dynpros_1.parseDynpros)(parsed);
         // INCLUDES
-        const includes = (_a = parsed.abapGit["asx:abap"]["asx:values"]) === null || _a === void 0 ? void 0 : _a.INCLUDES;
+        const includes = (_b = parsed.abapGit["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.INCLUDES;
         if (includes !== undefined) {
             for (const i of (0, xml_utils_1.xmlToArray)(includes.SOBJ_NAME)) {
                 this.includes.push(i);
             }
         }
         // FUNCTION MODULES
-        const functions = (_b = parsed.abapGit["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.FUNCTIONS;
+        const functions = (_c = parsed.abapGit["asx:abap"]["asx:values"]) === null || _c === void 0 ? void 0 : _c.FUNCTIONS;
         for (const module of (0, xml_utils_1.xmlToArray)(functions === null || functions === void 0 ? void 0 : functions.item)) {
             this.modules.push(new types_1.FunctionModuleDefinition(module));
         }

package/build/src/objects/program.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Program = void 0;
 const _abap_object_1 = require("./_abap_object");
-const xml_utils_1 = require("../xml_utils");
+const _dynpros_1 = require("./_dynpros");
 class Program extends _abap_object_1.ABAPObject {
     getType() {
         return "PROG";
@@ -38,11 +38,10 @@ class Program extends _abap_object_1.ABAPObject {
     }
     getDynpros() {
         this.parseXML();
-        return this.parsedXML.dynpros;
+        return this.parsedXML.dynpros || [];
     }
     ////////////////////////////
     parseXML() {
-        var _a, _b, _c, _d;
         if (this.parsedXML !== undefined) {
             return;
         }
@@ -56,24 +55,7 @@ class Program extends _abap_object_1.ABAPObject {
             };
             return;
         }
-        const dynpros = [];
-        const xmlDynpros = (_c = (_b = (_a = parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]) === null || _b === void 0 ? void 0 : _b["asx:values"]) === null || _c === void 0 ? void 0 : _c.DYNPROS;
-        if (xmlDynpros !== undefined) {
-            for (const d of (0, xml_utils_1.xmlToArray)(xmlDynpros.item)) {
-                const fields = [];
-                for (const f of (0, xml_utils_1.xmlToArray)((_d = d.FIELDS) === null || _d === void 0 ? void 0 : _d.RPY_DYFATC)) {
-                    fields.push({
-                        name: f.NAME,
-                        type: f.TYPE,
-                        length: f.LENGTH,
-                    });
-                }
-                dynpros.push({
-                    number: d.HEADER.SCREEN,
-                    fields: fields,
-                });
-            }
-        }
+        const dynpros = (0, _dynpros_1.parseDynpros)(parsed);
         this.parsedXML = {
             isInclude: file ? file.getRaw().includes("<SUBC>I</SUBC>") : false,
             isModulePool: file ? file.getRaw().includes("<SUBC>M</SUBC>") : false,

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.1";
+        return "2.113.3";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.1",
+    "version": "2.113.3",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",