@abaplint/cli 2.106.8 → 2.107.0

package/build/cli.js

@@ -26492,6 +26492,7 @@ const _scope_type_1 = __webpack_require__(/*! ../_scope_type */ "./node_modules/
 const sql_source_1 = __webpack_require__(/*! ./sql_source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/sql_source.js");
 const sql_compare_1 = __webpack_require__(/*! ./sql_compare */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/sql_compare.js");
 const sql_order_by_1 = __webpack_require__(/*! ./sql_order_by */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/sql_order_by.js");
+const dynamic_1 = __webpack_require__(/*! ./dynamic */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dynamic.js");
 const isSimple = /^\w+$/;
 class Select {
     runSyntax(node, scope, filename, skipImplicitInto = false) {
@@ -26502,7 +26503,7 @@ class Select {
         if (from === undefined) {
             throw new Error(`Missing FROM`);
         }
-        const fields = this.findFields(node);
+        const fields = this.findFields(node, scope, filename);
         if (fields.length === 0
             && node.findDirectExpression(Expressions.SQLFieldListLoop) === undefined) {
             throw new Error(`fields missing`);
@@ -26660,17 +26661,20 @@ class Select {
         }
         return new basic_1.VoidType("SELECT_todo");
     }
-    findFields(node) {
-        var _a;
+    findFields(node, scope, filename) {
+        var _a, _b;
         let expr = undefined;
         const ret = [];
         expr = node.findFirstExpression(Expressions.SQLFieldList);
         if (expr === undefined) {
             expr = node.findDirectExpression(Expressions.SQLFieldListLoop);
         }
+        if (((_a = expr === null || expr === void 0 ? void 0 : expr.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Dynamic) {
+            new dynamic_1.Dynamic().runSyntax(expr.getFirstChild(), scope, filename);
+        }
         for (const field of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressionsMulti([Expressions.SQLField, Expressions.SQLFieldName])) || []) {
             let code = field.concatTokens().toUpperCase();
-            const as = ((_a = field.findDirectExpression(Expressions.SQLAsName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
+            const as = ((_b = field.findDirectExpression(Expressions.SQLAsName)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
             if (as !== "") {
                 code = code.replace(" AS " + as, "");
             }
@@ -27112,13 +27116,18 @@ exports.SQLCompare = void 0;
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const dynamic_1 = __webpack_require__(/*! ./dynamic */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dynamic.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const sql_source_1 = __webpack_require__(/*! ./sql_source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/sql_source.js");
 class SQLCompare {
     runSyntax(node, scope, filename, tables) {
-        var _a;
+        var _a, _b;
         let sourceType;
         let token;
+        if (((_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Dynamic) {
+            new dynamic_1.Dynamic().runSyntax(node.getFirstChild(), scope, filename);
+            return;
+        }
         for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
@@ -27144,7 +27153,7 @@ class SQLCompare {
                 }
             }
         }
-        const fieldName = (_a = node.findDirectExpression(Expressions.SQLFieldName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+        const fieldName = (_b = node.findDirectExpression(Expressions.SQLFieldName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
         if (fieldName && sourceType && token) {
             // check compatibility for rule sql_value_conversion
             const targetType = this.findType(fieldName, tables, scope);
@@ -49978,12 +49987,14 @@ class Table extends _abstract_object_1.AbstractObject {
     }
     getAllowedNaming() {
         let length = 30;
+        const regex = /^((\/[A-Z_\d]{3,8}\/)|[a-zA-Z0-9]{3})\w+$/;
         if (this.getTableCategory() === TableCategory.Transparent) {
             length = 16;
         }
         return {
             maxLength: length,
             allowNamespace: true,
+            customRegex: regex,
         };
     }
     setDirty() {
@@ -51451,7 +51462,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.106.8";
+        return "2.107.0";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -52469,6 +52480,156 @@ exports.AlignParameters = AlignParameters;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/align_type_expressions.js":
+/*!*******************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/align_type_expressions.js ***!
+  \*******************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AlignTypeExpressions = exports.AlignTypeExpressionsConf = void 0;
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
+const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const Structures = __webpack_require__(/*! ../abap/3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
+const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+/*
+import {EditHelper, IEdit} from "../edit_helper";
+*/
+class AlignTypeExpressionsConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.AlignTypeExpressionsConf = AlignTypeExpressionsConf;
+class AlignTypeExpressions extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new AlignTypeExpressionsConf();
+    }
+    getMetadata() {
+        return {
+            key: "align_type_expressions",
+            title: "Align TYPE expressions",
+            shortDescription: `Align TYPE expressions in statements`,
+            extendedInformation: `
+Currently works for METHODS + BEGIN OF
+
+Also note that clean ABAP does not recommend aligning TYPE clauses:
+https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#dont-align-type-clauses`,
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Whitespace],
+            badExample: `
+TYPES: BEGIN OF foo,
+         bar TYPE i,
+         foobar TYPE i,
+       END OF foo.
+
+INTERFACE lif.
+  METHODS bar
+    IMPORTING
+      foo TYPE i
+      foobar TYPE i.
+ENDINTERFACE.`,
+            goodExample: `
+TYPES: BEGIN OF foo,
+         bar    TYPE i,
+         foobar TYPE i,
+       END OF foo.
+
+INTERFACE lif.
+  METHODS bar
+    IMPORTING
+      foo    TYPE i
+      foobar TYPE i.
+ENDINTERFACE.`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        const issues = [];
+        const stru = file.getStructure();
+        if (stru === undefined) {
+            return issues; // parser error
+        }
+        issues.push(...this.checkTypes(stru, file));
+        issues.push(...this.checkMethods(stru, file));
+        return issues;
+    }
+    checkMethods(stru, file) {
+        const issues = [];
+        const methods = stru.findAllStatements(Statements.MethodDef);
+        for (const m of methods) {
+            const fields = [];
+            const params = m.findAllExpressions(Expressions.MethodParam);
+            let column = 0;
+            for (const p of params) {
+                const children = p.getChildren();
+                const name = children[children.length - 2];
+                fields.push({
+                    nameEnd: name.getLastToken().getEnd(),
+                    after: p.findFirstExpression(Expressions.TypeParam).getFirstToken().getStart()
+                });
+                column = Math.max(column, name.getFirstToken().getEnd().getCol() + 1);
+            }
+            const ret = m.findFirstExpression(Expressions.MethodDefReturning);
+            if (ret) {
+                const children = ret.getChildren();
+                const name = children[children.length - 2];
+                fields.push({
+                    nameEnd: name.getLastToken().getEnd(),
+                    after: ret.findFirstExpression(Expressions.TypeParam).getFirstToken().getStart()
+                });
+                column = Math.max(column, name.getLastToken().getEnd().getCol() + 1);
+            }
+            for (const f of fields) {
+                if (f.after.getCol() !== column) {
+                    //          const fix = this.buildFix(f.name, column);
+                    const message = `Align TYPE expressions to column ${column}`;
+                    const issue = issue_1.Issue.atPosition(file, f.after, message, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+            }
+        }
+        return issues;
+    }
+    checkTypes(stru, file) {
+        const issues = [];
+        const types = stru.findAllStructuresRecursive(Structures.Types);
+        for (const t of types) {
+            const fields = [];
+            let column = 0;
+            const st = t.findDirectStatements(Statements.Type);
+            for (const s of st) {
+                const name = s.getChildren()[1];
+                fields.push({
+                    nameEnd: name.getLastToken().getEnd(),
+                    after: s.getChildren()[2].getFirstToken().getStart()
+                });
+                column = Math.max(column, name.getFirstToken().getEnd().getCol() + 1);
+            }
+            for (const f of fields) {
+                if (f.after.getCol() !== column) {
+                    //          const fix = this.buildFix(f.name, column);
+                    const message = `Align TYPE expressions to column ${column}`;
+                    const issue = issue_1.Issue.atPosition(file, f.after, message, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+            }
+        }
+        return issues;
+    }
+}
+exports.AlignTypeExpressions = AlignTypeExpressions;
+//# sourceMappingURL=align_type_expressions.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/allowed_object_naming.js":
 /*!******************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/allowed_object_naming.js ***!
@@ -61822,6 +61983,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./7bit_ascii */ "./node_modules/@abaplint/core/build/src/rules/7bit_ascii.js"), exports);
 __exportStar(__webpack_require__(/*! ./abapdoc */ "./node_modules/@abaplint/core/build/src/rules/abapdoc.js"), exports);
 __exportStar(__webpack_require__(/*! ./align_parameters */ "./node_modules/@abaplint/core/build/src/rules/align_parameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./align_type_expressions */ "./node_modules/@abaplint/core/build/src/rules/align_type_expressions.js"), exports);
 __exportStar(__webpack_require__(/*! ./allowed_object_naming */ "./node_modules/@abaplint/core/build/src/rules/allowed_object_naming.js"), exports);
 __exportStar(__webpack_require__(/*! ./allowed_object_types */ "./node_modules/@abaplint/core/build/src/rules/allowed_object_types.js"), exports);
 __exportStar(__webpack_require__(/*! ./ambiguous_statement */ "./node_modules/@abaplint/core/build/src/rules/ambiguous_statement.js"), exports);
@@ -65177,6 +65339,7 @@ class NoPrefixesConf extends _basic_rule_config_1.BasicRuleConfig {
         this.types = "^TY_";
         /** importing, exporting, returning and changing parameters, case insensitive regex */
         this.methodParameters = "^[ICER].?_";
+        this.allowIsPrefixBoolean = true;
         // todo, public localClass: string = "";
         // todo, public localInterface: string = "";
         // todo, public functionModuleParameters: string = "";
@@ -65321,12 +65484,18 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/sub-sections/AvoidEncodi
         return ret;
     }
     checkMethodParameters(topNode, regex, file) {
+        var _a, _b;
         const ret = [];
         for (const method of topNode.findAllStatements(Statements.MethodDef)) {
-            for (const def of method.findAllExpressions(Expressions.MethodParamName)) {
-                const name = def.concatTokens();
-                if (name !== "" && name.match(regex)) {
-                    const issue = issue_1.Issue.atToken(file, def.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+            for (const param of method.findAllExpressionsMulti([Expressions.MethodDefReturning, Expressions.MethodParam])) {
+                const nameToken = param === null || param === void 0 ? void 0 : param.findFirstExpression(Expressions.MethodParamName);
+                const type = (_b = (_a = param === null || param === void 0 ? void 0 : param.findFirstExpression(Expressions.TypeParam)) === null || _a === void 0 ? void 0 : _a.concatTokens()) === null || _b === void 0 ? void 0 : _b.toUpperCase();
+                if (this.getConfig().allowIsPrefixBoolean === true && (type === null || type === void 0 ? void 0 : type.endsWith("TYPE ABAP_BOOL"))) {
+                    continue;
+                }
+                const name = nameToken === null || nameToken === void 0 ? void 0 : nameToken.concatTokens();
+                if (nameToken && name && name !== "" && name.match(regex)) {
+                    const issue = issue_1.Issue.atToken(file, nameToken.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                     ret.push(issue);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.106.8",
+    "version": "2.107.0",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.106.8",
+        "@abaplint/core": "^2.107.0",
         "@types/chai": "^4.3.14",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",