@abaplint/core 2.112.15 → 2.112.17

package/build/abaplint.d.ts

@@ -2522,6 +2522,7 @@ export declare class FlowGraph {
     private label;
     constructor(counter: number);
     getStart(): string;
+    getLabel(): string;
     getEnd(): string;
     addEdge(from: string, to: string): void;
     removeEdge(from: string, to: string): void;

package/build/src/abap/5_syntax/_builtin.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuiltIn = exports.BuiltInMethod = void 0;
-/* eslint-disable max-len */
 const _typed_identifier_1 = require("../types/_typed_identifier");
 const basic_1 = require("../types/basic");
 const tokens_1 = require("../1_lexer/tokens");

package/build/src/abap/5_syntax/basic_types.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicTypes = void 0;
-/* eslint-disable default-case */
 const _typed_identifier_1 = require("../types/_typed_identifier");
 const Expressions = require("../2_statements/expressions");
 const Statements = require("../2_statements/statements");

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

@@ -11,6 +11,9 @@ class FlowGraph {
     getStart() {
         return this.startNode;
     }
+    getLabel() {
+        return this.label;
+    }
     getEnd() {
         return this.endNode;
     }

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

@@ -11,22 +11,26 @@ class StatementFlow {
         this.counter = 0;
     }
     build(stru) {
-        var _a, _b;
+        var _a, _b, _c;
         const ret = [];
-        const forms = stru.findAllStructures(Structures.Form);
-        for (const f of forms) {
-            const formName = "FORM " + ((_a = f.findFirstExpression(Expressions.FormName)) === null || _a === void 0 ? void 0 : _a.concatTokens());
-            this.counter = 1;
-            const graph = this.traverseBody(this.findBody(f), { procedureEnd: "end#1" });
-            graph.setLabel(formName);
-            ret.push(graph);
-        }
-        const methods = stru.findAllStructures(Structures.Method);
-        for (const f of methods) {
-            const methodName = "METHOD " + ((_b = f.findFirstExpression(Expressions.MethodName)) === null || _b === void 0 ? void 0 : _b.concatTokens());
+        const structures = stru.findAllStructuresMulti([Structures.Form, Structures.Method, Structures.FunctionModule]);
+        for (const s of structures) {
+            let name = "";
+            if (s.get() instanceof Structures.Form) {
+                name = "FORM " + ((_a = s.findFirstExpression(Expressions.FormName)) === null || _a === void 0 ? void 0 : _a.concatTokens());
+            }
+            else if (s.get() instanceof Structures.Method) {
+                name = "METHOD " + ((_b = s.findFirstExpression(Expressions.MethodName)) === null || _b === void 0 ? void 0 : _b.concatTokens());
+            }
+            else if (s.get() instanceof Structures.FunctionModule) {
+                name = "FUNCTION " + ((_c = s.findFirstExpression(Expressions.Field)) === null || _c === void 0 ? void 0 : _c.concatTokens());
+            }
+            else {
+                throw new Error("StatementFlow, unknown structure");
+            }
             this.counter = 1;
-            const graph = this.traverseBody(this.findBody(f), { procedureEnd: "end#1" });
-            graph.setLabel(methodName);
+            const graph = this.traverseBody(this.findBody(s), { procedureEnd: "end#1" });
+            graph.setLabel(name);
             ret.push(graph);
         }
         return ret.map(f => f.reduce());
@@ -153,6 +157,7 @@ class StatementFlow {
             || type instanceof Structures.With
             || type instanceof Structures.Provide
             || type instanceof Structures.Select
+            || type instanceof Structures.LoopAtScreen
             || type instanceof Structures.Do) {
             const loopName = this.buildName(n.getFirstStatement());
             const sub = this.traverseBody(this.findBody(n), Object.assign(Object.assign({}, context), { loopStart: loopName, loopEnd: graph.getEnd() }));
@@ -161,6 +166,25 @@ class StatementFlow {
             graph.addEdge(sub.getEnd(), loopName);
             graph.addEdge(loopName, graph.getEnd());
         }
+        else if (type instanceof Structures.Data
+            || type instanceof Structures.Types) {
+            // these doesnt affect control flow, so just take the first statement
+            const statement = n.getFirstStatement();
+            const name = this.buildName(statement);
+            graph.addEdge(current, name);
+            graph.addEdge(name, graph.getEnd());
+        }
+        else if (type instanceof Structures.AtFirst
+            || type instanceof Structures.AtLast
+            || type instanceof Structures.At
+            || type instanceof Structures.OnChange) {
+            const name = this.buildName(n.getFirstStatement());
+            const body = this.traverseBody(this.findBody(n), context);
+            graph.addEdge(current, name);
+            graph.addGraph(name, body);
+            graph.addEdge(body.getEnd(), graph.getEnd());
+            graph.addEdge(current, graph.getEnd());
+        }
         else if (type instanceof Structures.Try) {
             const tryName = this.buildName(n.getFirstStatement());
             const body = this.traverseBody(this.findBody(n), context);

package/build/src/abap/types/basic/character_type.js

@@ -11,7 +11,7 @@ class CharacterType extends _abstract_type_1.AbstractType {
         this.length = length;
     }
     cloneType(input) {
-        const clone = Object.assign({}, this.getAbstractTypeData()) || {};
+        const clone = Object.assign({}, this.getAbstractTypeData());
         if (input.qualifiedName) {
             clone.qualifiedName = input.qualifiedName;
         }

package/build/src/registry.js

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

package/build/src/rules/cds_legacy_view.js

@@ -18,7 +18,6 @@ class CDSLegacyView {
             key: "cds_legacy_view",
             title: "CDS Legacy View",
             shortDescription: `Identify CDS Legacy Views`,
-            // eslint-disable-next-line max-len
             extendedInformation: `Use DEFINE VIEW ENTITY instead of DEFINE VIEW
 
 https://blogs.sap.com/2021/10/16/a-new-generation-of-cds-views-how-to-migrate-your-cds-views-to-cds-view-entities/

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@abaplint/core",
-    "version": "2.112.15",
+    "version": "2.112.17",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
     "funding": "https://github.com/sponsors/larshp",
     "scripts": {
-        "lint": "eslint src/**/*.ts test/**/*.ts --format unix",
-        "lint:fix": "eslint src/**/*.ts test/**/*.ts --format unix --fix",
+        "lint": "eslint src/**/*.ts test/**/*.ts",
+        "lint:fix": "eslint src/**/*.ts test/**/*.ts --fix",
         "compile": "tsc && sh scripts/version.sh",
         "test": "npm run compile && mocha --timeout 1000 && npm run lint && npm run schema && api-extractor run",
         "test:only": "npm run compile && mocha --timeout 1000000",
@@ -50,12 +50,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.47.5",
+        "@microsoft/api-extractor": "^7.47.6",
         "@types/chai": "^4.3.17",
         "@types/mocha": "^10.0.7",
         "@types/node": "^22.2.0",
         "chai": "^4.5.0",
-        "eslint": "^8.57.0",
+        "eslint": "^9.9.0",
         "mocha": "^10.7.3",
         "c8": "^10.1.2",
         "source-map-support": "^0.5.21",