@abaplint/cli 2.112.15 → 2.112.17

package/build/cli.js

@@ -20102,7 +20102,6 @@ var Visibility;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.BuiltIn = exports.BuiltInMethod = void 0;
-/* eslint-disable max-len */
 const _typed_identifier_1 = __webpack_require__(/*! ../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
 const basic_1 = __webpack_require__(/*! ../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const tokens_1 = __webpack_require__(/*! ../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
@@ -22951,7 +22950,6 @@ exports.AssertError = AssertError;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.BasicTypes = void 0;
-/* eslint-disable default-case */
 const _typed_identifier_1 = __webpack_require__(/*! ../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
 const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const Statements = __webpack_require__(/*! ../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
@@ -35022,6 +35020,9 @@ class FlowGraph {
     getStart() {
         return this.startNode;
     }
+    getLabel() {
+        return this.label;
+    }
     getEnd() {
         return this.endNode;
     }
@@ -35178,22 +35179,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());
@@ -35320,6 +35325,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() }));
@@ -35328,6 +35334,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);
@@ -36624,7 +36649,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;
         }
@@ -52488,7 +52513,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.112.15";
+        return "2.112.17";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -54536,7 +54561,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/cli",
-    "version": "2.112.15",
+    "version": "2.112.17",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
         "abaplint": "abaplint"
     },
     "scripts": {
-        "lint": "eslint src/**/*.ts test/**/*.ts --format unix",
+        "lint": "eslint src/**/*.ts test/**/*.ts",
         "compile": "tsc",
         "test": "npm run compile && mocha && npm run lint && npm run webpack",
         "webpack": "webpack --progress",
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.112.15",
+        "@abaplint/core": "^2.112.17",
         "@types/chai": "^4.3.17",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
@@ -47,7 +47,7 @@
         "@types/progress": "^2.0.7",
         "chai": "^4.5.0",
         "chalk": "^5.3.0",
-        "eslint": "^8.57.0",
+        "eslint": "^9.9.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
         "memfs": "=4.9.3",