@abaplint/core 2.95.40 → 2.95.42

package/build/abaplint.d.ts

@@ -1328,6 +1328,10 @@ declare class CustomizingTransaction extends AbstractObject {
     getDescription(): string | undefined;
 }
 
+export declare class CyclomaticComplexityStats {
+    static run(obj: IObject): ICyclomaticComplexityResult[];
+}
+
 declare class Dash extends Token {
     static railroad(): string;
 }
@@ -2799,6 +2803,13 @@ export declare interface IConfiguration {
     readByKey(rule: string, key: string): any;
 }
 
+declare interface ICyclomaticComplexityResult {
+    file: IFile;
+    pos: Position;
+    name: string;
+    count: number;
+}
+
 declare interface IDDICReferences {
     setUsing(obj: IObject, using: readonly IObjectAndToken[]): void;
     addUsing(obj: IObject, using: IObjectAndToken | undefined): void;

package/build/src/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RuleTag = exports.Severity = exports.Visibility = exports.Info = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
+exports.Severity = exports.Visibility = exports.Info = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
+exports.RuleTag = void 0;
 const issue_1 = require("./issue");
 Object.defineProperty(exports, "Issue", { enumerable: true, get: function () { return issue_1.Issue; } });
 const config_1 = require("./config");
@@ -96,4 +97,6 @@ const rules_runner_1 = require("./rules_runner");
 Object.defineProperty(exports, "RulesRunner", { enumerable: true, get: function () { return rules_runner_1.RulesRunner; } });
 const _irule_1 = require("./rules/_irule");
 Object.defineProperty(exports, "RuleTag", { enumerable: true, get: function () { return _irule_1.RuleTag; } });
+const cyclomatic_complexity_stats_1 = require("./utils/cyclomatic_complexity_stats");
+Object.defineProperty(exports, "CyclomaticComplexityStats", { enumerable: true, get: function () { return cyclomatic_complexity_stats_1.CyclomaticComplexityStats; } });
 //# sourceMappingURL=index.js.map

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.40";
+        return "2.95.42";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -182,6 +182,19 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         }
         return this.graph.listMainForInclude(filename);
     }
+    containsError(highObj) {
+        for (const file of highObj.getABAPFiles()) {
+            for (const statement of file.getStatements()) {
+                if (statement.get() instanceof _statement_1.Unknown) {
+                    return true; // contains parser errors
+                }
+            }
+            if (file.getStructure() === undefined) {
+                return true;
+            }
+        }
+        return false;
+    }
     run(lowObj) {
         var _a;
         const ret = [];
@@ -198,6 +211,9 @@ Only one transformation is applied to a statement at a time, so multiple steps m
             return ret;
         }
         let highSyntaxObj = highObj;
+        if (this.containsError(highObj)) {
+            return ret;
+        }
         // for includes do the syntax check via a main program
         if (lowObj instanceof objects_1.Program && lowObj.isInclude()) {
             const mains = this.listMainForInclude((_a = lowObj.getMainABAPFile()) === null || _a === void 0 ? void 0 : _a.getFilename());
@@ -2395,6 +2411,11 @@ ${indentation}    output = ${topTarget}.`;
             if (chain === undefined) {
                 continue;
             }
+            const concat = chain.concatTokens().toUpperCase();
+            if (concat.startsWith("LINE_EXISTS( ") || concat.startsWith("LINE_INDEX( ")) {
+                // these are handled separately
+                continue;
+            }
             let predicate = false;
             const spag = highSyntax.spaghetti.lookupPosition(high.getFirstToken().getStart(), lowFile.getFilename());
             for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
@@ -2511,6 +2532,9 @@ ${indentation}    output = ${topTarget}.`;
                 if (node.get() instanceof statements_1.ElseIf) {
                     // assumption: no side effects in IF conditions
                     insertAt = this.findStartOfIf(node, highFile);
+                    if (insertAt === undefined) {
+                        continue;
+                    }
                 }
                 const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, insertAt, code);
                 const start = expression.getFirstToken().getStart();
@@ -2523,14 +2547,15 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     findStartOfIf(node, highFile) {
-        var _a;
         const structure = highFile.getStructure();
         for (const c of (structure === null || structure === void 0 ? void 0 : structure.findAllStructuresRecursive(Structures.If)) || []) {
-            if (((_a = c.findDirectStructure(Structures.ElseIf)) === null || _a === void 0 ? void 0 : _a.getFirstStatement()) === node) {
-                return c.getFirstToken().getStart();
+            for (const ei of c.findDirectStructures(Structures.ElseIf)) {
+                if (ei.getFirstStatement() === node) {
+                    return c.getFirstToken().getStart();
+                }
             }
         }
-        return node.getFirstToken().getStart();
+        return undefined;
     }
     newToCreateObject(low, high, lowFile, highSyntax) {
         if (!(low.get() instanceof _statement_1.Unknown)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.40",
+    "version": "2.95.42",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@microsoft/api-extractor": "^7.34.4",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.15.0",
+        "@types/node": "^18.15.1",
         "chai": "^4.3.7",
         "eslint": "^8.36.0",
         "mocha": "^10.2.0",