@abaplint/cli 2.103.10 → 2.104.1

package/build/cli.js

@@ -40873,8 +40873,8 @@ exports.MemoryFile = MemoryFile;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-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;
+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.SkipLogic = 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 = exports.Severity = void 0;
 const issue_1 = __webpack_require__(/*! ./issue */ "./node_modules/@abaplint/core/build/src/issue.js");
 Object.defineProperty(exports, "Issue", ({ enumerable: true, get: function () { return issue_1.Issue; } }));
 const config_1 = __webpack_require__(/*! ./config */ "./node_modules/@abaplint/core/build/src/config.js");
@@ -40973,6 +40973,8 @@ const _irule_1 = __webpack_require__(/*! ./rules/_irule */ "./node_modules/@abap
 Object.defineProperty(exports, "RuleTag", ({ enumerable: true, get: function () { return _irule_1.RuleTag; } }));
 const cyclomatic_complexity_stats_1 = __webpack_require__(/*! ./utils/cyclomatic_complexity_stats */ "./node_modules/@abaplint/core/build/src/utils/cyclomatic_complexity_stats.js");
 Object.defineProperty(exports, "CyclomaticComplexityStats", ({ enumerable: true, get: function () { return cyclomatic_complexity_stats_1.CyclomaticComplexityStats; } }));
+const skip_logic_1 = __webpack_require__(/*! ./skip_logic */ "./node_modules/@abaplint/core/build/src/skip_logic.js");
+Object.defineProperty(exports, "SkipLogic", ({ enumerable: true, get: function () { return skip_logic_1.SkipLogic; } }));
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -51033,7 +51035,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.103.10";
+        return "2.104.1";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -61422,6 +61424,7 @@ __exportStar(__webpack_require__(/*! ./prefer_returning_to_exporting */ "./node_
 __exportStar(__webpack_require__(/*! ./prefer_xsdbool */ "./node_modules/@abaplint/core/build/src/rules/prefer_xsdbool.js"), exports);
 __exportStar(__webpack_require__(/*! ./preferred_compare_operator */ "./node_modules/@abaplint/core/build/src/rules/preferred_compare_operator.js"), exports);
 __exportStar(__webpack_require__(/*! ./prefix_is_current_class */ "./node_modules/@abaplint/core/build/src/rules/prefix_is_current_class.js"), exports);
+__exportStar(__webpack_require__(/*! ./reduce_procedural_code */ "./node_modules/@abaplint/core/build/src/rules/reduce_procedural_code.js"), exports);
 __exportStar(__webpack_require__(/*! ./reduce_string_templates */ "./node_modules/@abaplint/core/build/src/rules/reduce_string_templates.js"), exports);
 __exportStar(__webpack_require__(/*! ./release_idoc */ "./node_modules/@abaplint/core/build/src/rules/release_idoc.js"), exports);
 __exportStar(__webpack_require__(/*! ./remove_descriptions */ "./node_modules/@abaplint/core/build/src/rules/remove_descriptions.js"), exports);
@@ -67188,6 +67191,98 @@ exports.PrefixIsCurrentClass = PrefixIsCurrentClass;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/reduce_procedural_code.js":
+/*!*******************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/reduce_procedural_code.js ***!
+  \*******************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ReduceProceduralCode = exports.ReduceProceduralCodeConf = void 0;
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
+const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
+const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+class ReduceProceduralCodeConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        this.maxStatements = 10;
+    }
+}
+exports.ReduceProceduralCodeConf = ReduceProceduralCodeConf;
+class ReduceProceduralCode extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new ReduceProceduralCodeConf();
+    }
+    getMetadata() {
+        return {
+            key: "reduce_procedural_code",
+            title: "Reduce procedural code",
+            shortDescription: `Checks FORM and FUNCTION-MODULE have few statements`,
+            extendedInformation: `Delegate logic to a class method instead of using FORM or FUNCTION-MODULE.
+
+https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-object-orientation-to-procedural-programming`,
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide],
+            badExample: `FORM foo.
+  DATA lv_bar TYPE i.
+  lv_bar = 2 + 2.
+  IF lv_bar = 4.
+    WRITE 'hello world'.
+  ENDIF.
+  DATA lv_bar TYPE i.
+  lv_bar = 2 + 2.
+  IF lv_bar = 4.
+    WRITE 'hello world'.
+  ENDIF.
+ENDFORM.`,
+            goodExample: `FORM foo.
+  NEW zcl_global_class( )->run_logic( ).
+ENDFORM.`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        const issues = [];
+        if (file.getStructure() === undefined) {
+            // constains syntax errors, skip this check
+            return issues;
+        }
+        let doCount = undefined;
+        let count = 0;
+        for (const statement of file.getStatements()) {
+            if (statement.get() instanceof Statements.Form || statement.get() instanceof Statements.FunctionModule) {
+                doCount = statement;
+                count = 0;
+            }
+            else if (statement.get() instanceof Statements.EndForm || statement.get() instanceof Statements.EndFunction) {
+                if (count >= this.conf.maxStatements && doCount !== undefined) {
+                    const message = "Reduce procedural code, max " + this.conf.maxStatements + " statements";
+                    const issue = issue_1.Issue.atStatement(file, doCount, message, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+                doCount = undefined;
+            }
+            else if (doCount !== undefined) {
+                count = count + 1;
+            }
+        }
+        return issues;
+    }
+}
+exports.ReduceProceduralCode = ReduceProceduralCode;
+//# sourceMappingURL=reduce_procedural_code.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/reduce_string_templates.js":
 /*!********************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/reduce_string_templates.js ***!
@@ -70325,6 +70420,8 @@ DATA: BEGIN OF blah ##NEEDED,
             && !(statement.get() instanceof Statements.Parameter)
             && !(statement.get() instanceof Statements.Data)
             && !(statement.get() instanceof Statements.DataBegin)
+            && !(statement.get() instanceof Statements.ClassData)
+            && !(statement.get() instanceof Statements.ClassDataBegin)
             && !(statement.get() instanceof Statements.Type)
             && !(statement.get() instanceof Statements.Form)
             && !(statement.get() instanceof Statements.Tables)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.103.10",
+    "version": "2.104.1",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.103.10",
+        "@abaplint/core": "^2.104.1",
         "@types/chai": "^4.3.11",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.10.0",
+        "@types/node": "^20.10.1",
         "@types/progress": "^2.0.7",
         "chai": "^4.3.10",
         "chalk": "^5.3.0",