@abaplint/cli 2.103.9 → 2.104.0

package/build/cli.js

@@ -3960,9 +3960,11 @@ const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source.js");
 const dynamic_1 = __webpack_require__(/*! ./dynamic */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/dynamic.js");
 const field_1 = __webpack_require__(/*! ./field */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/field.js");
+const simple_source3_1 = __webpack_require__(/*! ./simple_source3 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/simple_source3.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class AssignSource extends combi_1.Expression {
     getRunnable() {
-        const component = (0, combi_1.seq)("COMPONENT", source_1.Source, "OF STRUCTURE", source_1.Source);
+        const component = (0, combi_1.seq)("COMPONENT", (0, combi_1.alt)(simple_source3_1.SimpleSource3, (0, combi_1.ver)(version_1.Version.v740sp02, source_1.Source)), "OF STRUCTURE", source_1.Source);
         const tableField = (0, combi_1.seq)("TABLE FIELD", (0, combi_1.alt)(source_1.Source, dynamic_1.Dynamic));
         const arrow = (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow));
         const source = (0, combi_1.alt)((0, combi_1.seq)(source_1.Source, (0, combi_1.opt)((0, combi_1.seq)(arrow, dynamic_1.Dynamic))), component, tableField, (0, combi_1.seq)(dynamic_1.Dynamic, (0, combi_1.opt)((0, combi_1.seq)(arrow, (0, combi_1.alt)(field_1.Field, dynamic_1.Dynamic)))));
@@ -28215,7 +28217,7 @@ class Assign {
     runSyntax(node, scope, filename) {
         var _a;
         const assignSource = node.findDirectExpression(Expressions.AssignSource);
-        const sources = (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpressions(Expressions.Source)) || [];
+        const sources = (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpressionsMulti([Expressions.Source, Expressions.SimpleSource3])) || [];
         const theSource = sources[sources.length - 1];
         let sourceType = undefined;
         const firstAssign = assignSource === null || assignSource === void 0 ? void 0 : assignSource.getChildren()[0];
@@ -51031,7 +51033,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.103.9";
+        return "2.104.0";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -61420,6 +61422,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);
@@ -67186,6 +67189,100 @@ 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.
+
+Only one issue is reported per include/file.
+
+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 ***!

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.103.9",
+    "version": "2.104.0",
     "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.9",
+        "@abaplint/core": "^2.104.0",
         "@types/chai": "^4.3.11",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.9.4",
+        "@types/node": "^20.10.1",
         "@types/progress": "^2.0.7",
         "chai": "^4.3.10",
         "chalk": "^5.3.0",