@abaplint/core 2.103.9 → 2.104.0

package/build/src/abap/2_statements/expressions/assign_source.js

@@ -6,9 +6,11 @@ const tokens_1 = require("../../1_lexer/tokens");
 const source_1 = require("./source");
 const dynamic_1 = require("./dynamic");
 const field_1 = require("./field");
+const simple_source3_1 = require("./simple_source3");
+const version_1 = require("../../../version");
 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)))));

package/build/src/abap/5_syntax/statements/assign.js

@@ -11,7 +11,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];

package/build/src/registry.js

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

package/build/src/rules/index.js

@@ -129,6 +129,7 @@ __exportStar(require("./prefer_returning_to_exporting"), exports);
 __exportStar(require("./prefer_xsdbool"), exports);
 __exportStar(require("./preferred_compare_operator"), exports);
 __exportStar(require("./prefix_is_current_class"), exports);
+__exportStar(require("./reduce_procedural_code"), exports);
 __exportStar(require("./reduce_string_templates"), exports);
 __exportStar(require("./release_idoc"), exports);
 __exportStar(require("./remove_descriptions"), exports);

package/build/src/rules/reduce_procedural_code.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReduceProceduralCode = exports.ReduceProceduralCodeConf = void 0;
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const _abap_rule_1 = require("./_abap_rule");
+const _irule_1 = require("./_irule");
+const Statements = require("../abap/2_statements/statements");
+const issue_1 = require("../issue");
+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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.103.9",
+    "version": "2.104.0",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,13 +53,13 @@
         "@microsoft/api-extractor": "^7.38.3",
         "@types/chai": "^4.3.11",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.9.4",
+        "@types/node": "^20.10.1",
         "chai": "^4.3.10",
         "eslint": "^8.54.0",
         "mocha": "^10.2.0",
         "c8": "^8.0.1",
         "source-map-support": "^0.5.21",
-        "ts-json-schema-generator": "^1.4.0",
+        "ts-json-schema-generator": "^1.4.1",
         "typescript": "^5.3.2"
     },
     "dependencies": {