@abaplint/cli 2.113.216 → 2.113.218

package/build/cli.js

@@ -437,7 +437,7 @@ class CodeClimate {
                         end: issue.getEnd().getRow(),
                     },
                 },
-                severity: (severityArray.includes(issue.getSeverity().toLowerCase())) ? issue.getSeverity().toLowerCase() : defaultSeverity,
+                severity: severityArray.includes(issue.getSeverity().toLowerCase()) ? issue.getSeverity().toLowerCase() : defaultSeverity,
                 fingerprint: md5(issue.getKey() + issue.getMessage() + issue.getFilename() + issue.getStart().getRow() + issue.getEnd().getRow()),
             };
             out.push(single);
@@ -478,7 +478,7 @@ class CodeFrame {
         const builtIssues = this.convertAllIssues(issues).sort(issueSort); // Make sure it is sorted by filename for caching to work
         return [
             ...builtIssues.map(i => this.renderIssue(i)),
-            (issues.length > 0 ? chalk_1.default.red(new total_1.Total().output(issues, fileCount)) : chalk_1.default.green(new total_1.Total().output(issues, fileCount))),
+            issues.length > 0 ? chalk_1.default.red(new total_1.Total().output(issues, fileCount)) : chalk_1.default.green(new total_1.Total().output(issues, fileCount)),
         ].join("\n");
     }
     convertAllIssues(issues) {
@@ -737,7 +737,7 @@ class Sonarqube {
             const single = {
                 engineId: "abaplint",
                 ruleId: issue.getKey(),
-                severity: (severityArray.includes(issue.getSeverity().toUpperCase())) ? issue.getSeverity().toUpperCase() : defaultSeverity,
+                severity: severityArray.includes(issue.getSeverity().toUpperCase()) ? issue.getSeverity().toUpperCase() : defaultSeverity,
                 type: "CODE_SMELL",
                 primaryLocation: {
                     message: issue.getMessage(),
@@ -1192,7 +1192,7 @@ class Rename {
                 continue;
             }
             for (const p of rconfig.patterns || []) {
-                if (!(o.getType().match(p.type))) {
+                if (!o.getType().match(p.type)) {
                     continue;
                 }
                 const regex = new RegExp(p.oldName, "i");
@@ -4107,7 +4107,7 @@ exports.AssociationName = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class AssociationName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^\\_[\w]+$/);
+        return (0, combi_1.regex)(/^(\\_[\w]+)+$/);
     }
 }
 exports.AssociationName = AssociationName;
@@ -23835,7 +23835,7 @@ class TypeUtils {
                     if (!(sourceRowType instanceof basic_1.StructureType)) {
                         return false;
                     }
-                    else if (!(this.structureContainsString(sourceRowType))
+                    else if (!this.structureContainsString(sourceRowType)
                         && this.structureContainsVoid(sourceRowType) === false) {
                         return false;
                     }
@@ -23845,7 +23845,7 @@ class TypeUtils {
                     if (!(targetRowType instanceof basic_1.StructureType)) {
                         return false;
                     }
-                    else if (!(this.structureContainsString(targetRowType))
+                    else if (!this.structureContainsString(targetRowType)
                         && this.structureContainsVoid(targetRowType) === false) {
                         return false;
                     }
@@ -25643,7 +25643,7 @@ class CorrespondingBody {
         }
         const base = (_a = node.findDirectExpression(Expressions.CorrespondingBodyBase)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source);
         if (base) {
-            source_1.Source.runSyntax(base, input);
+            source_1.Source.runSyntax(base, input, targetType);
         }
         let type = undefined;
         for (const s of node.findDirectExpressions(Expressions.Source)) {
@@ -25959,8 +25959,10 @@ class FieldChain {
             }
             else if (current.get() instanceof tokens_1.Dash) {
                 if (context instanceof basic_1.UnknownType) {
+                    /*
                     const message = "Not a structure, type unknown, FieldChain";
-                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, current.getFirstToken(), message));
+                    input.issues.push(syntaxIssue(input, current.getFirstToken(), message));
+                    */
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
                 else if (!(context instanceof basic_1.StructureType)
@@ -32731,9 +32733,10 @@ const component_cond_1 = __webpack_require__(/*! ../expressions/component_cond *
 const dynamic_1 = __webpack_require__(/*! ../expressions/dynamic */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dynamic.js");
 const loop_group_by_1 = __webpack_require__(/*! ../expressions/loop_group_by */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/loop_group_by.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class Loop {
     runSyntax(node, input) {
-        var _a;
+        var _a, _b;
         const loopTarget = node.findDirectExpression(Expressions.LoopTarget);
         let target = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.findDirectExpression(Expressions.Target);
         const targetType = target ? target_1.Target.runSyntax(target, input) : undefined;
@@ -32783,6 +32786,7 @@ class Loop {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
         }
         const targetConcat = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.concatTokens().toUpperCase();
+        const topType = sourceType; // todo: refactor topType vs sourceType vs rowType
         if (sourceType instanceof basic_1.TableType) {
             rowType = sourceType.getRowType();
             sourceType = rowType;
@@ -32790,6 +32794,10 @@ class Loop {
                 sourceType = new basic_1.DataReference(sourceType);
             }
         }
+        const cond = node.findDirectExpression(Expressions.ComponentCond);
+        if (cond !== undefined) {
+            component_cond_1.ComponentCond.runSyntax(cond, input, rowType);
+        }
         if (targetConcat
             && targetConcat.startsWith("TRANSPORTING ")
             && node.findDirectTokenByText("WHERE") === undefined) {
@@ -32797,6 +32805,32 @@ class Loop {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
+        if (node.findDirectTokenByText("USING") !== undefined
+            && cond !== undefined
+            && topType instanceof basic_1.TableType) {
+            // https://github.com/abap2xlsx/abap2xlsx/issues/1341
+            const keyName = node.findExpressionAfterToken("KEY");
+            let key = undefined;
+            if ((keyName === null || keyName === void 0 ? void 0 : keyName.get()) instanceof Expressions.SimpleName) {
+                // it might be dynamic, in that case we cannot check anything
+                key = (_b = topType.getOptions().secondary) === null || _b === void 0 ? void 0 : _b.find(k => k.name.toUpperCase() === keyName.getFirstToken().getStr().toUpperCase());
+                if (key === undefined) {
+                    const message = "Key " + (keyName === null || keyName === void 0 ? void 0 : keyName.concatTokens()) + " not found in table type";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    return;
+                }
+                if (input.scope.getRegistry().getConfig().getVersion() <= version_1.Version.v740sp02) {
+                    const compares = cond.findAllExpressionsRecursive(Expressions.ComponentCompare).map(c => c.concatTokens().toUpperCase());
+                    for (const keyField of key.keyFields) {
+                        if (compares.find(c => c === keyField.toUpperCase() + " IS INITIAL") !== undefined) {
+                            const message = "Loop, key check with IS INITIAL cannot optimized before 7.40 SP02";
+                            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                            return;
+                        }
+                    }
+                }
+            }
+        }
         const inline = target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData);
         if (inline) {
             inline_data_1.InlineData.runSyntax(inline, input, sourceType);
@@ -32817,9 +32851,6 @@ class Loop {
                 fstarget_1.FSTarget.runSyntax(fstarget, input, sourceType);
             }
         }
-        for (const t of node.findDirectExpressions(Expressions.ComponentCond)) {
-            component_cond_1.ComponentCond.runSyntax(t, input, rowType);
-        }
         for (const t of node.findDirectExpressions(Expressions.Dynamic)) {
             dynamic_1.Dynamic.runSyntax(t, input);
         }
@@ -41212,7 +41243,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 class CDSCase extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName)));
-        const value = (0, combi_1.altPrio)(_1.CDSFunction, _1.CDSString, CDSCase, _1.CDSCast, _1.CDSArithmetics, name);
+        const value = (0, combi_1.altPrio)(_1.CDSString, CDSCase, _1.CDSCast, _1.CDSArithmetics, _1.CDSFunction, name);
         const thenValue = (0, combi_1.altPrio)((0, combi_1.seq)("(", value, ")"), value);
         const simple = (0, combi_1.seq)((0, combi_1.altPrio)(_1.CDSFunction, name), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", thenValue)));
         const complex = (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", thenValue));
@@ -41343,7 +41374,7 @@ class CDSDefineCustom extends combi_1.Expression {
     getRunnable() {
         const field = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", cds_type_1.CDSType, ";");
         const compsiOrAssoci = (0, combi_1.seq)(cds_name_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE"), (0, combi_1.opt)((0, combi_1.str)("ROOT")), (0, combi_1.str)("CUSTOM ENTITY"), (0, combi_1.opt)(_1.CDSWithParameters), cds_name_1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE"), (0, combi_1.opt)((0, combi_1.str)("ROOT")), (0, combi_1.str)("CUSTOM ENTITY"), cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineCustom = CDSDefineCustom;
@@ -54518,7 +54549,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.216";
+        return "2.113.218";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -60556,7 +60587,6 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         const source = high.findExpressionAfterToken("MESSAGE");
         if ((source === null || source === void 0 ? void 0 : source.get()) instanceof Expressions.MessageSourceSource
             && ((_a = source.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Source) {
-            ;
             const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const firstToken = high.getFirstToken();
@@ -63988,7 +64018,7 @@ class FullyTypeConstants extends _abap_rule_1.ABAPRule {
         for (const stat of file.getStatements()) {
             if ((stat.get() instanceof Statements.Constant
                 || (this.conf.checkData === true && stat.get() instanceof Statements.Data))
-                && (!this.isTyped(stat))) {
+                && !this.isTyped(stat)) {
                 const type = stat.get() instanceof Statements.Constant ? "constant definition" : "data definition";
                 let token = (_a = stat.findFirstExpression(expressions_1.NamespaceSimpleName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
                 if (token === undefined) {
@@ -64003,7 +64033,7 @@ class FullyTypeConstants extends _abap_rule_1.ABAPRule {
         return issues;
     }
     isTyped(stat) {
-        return (stat.findFirstExpression(expressions_1.Type) || stat.findFirstExpression(expressions_1.TypeTable));
+        return stat.findFirstExpression(expressions_1.Type) || stat.findFirstExpression(expressions_1.TypeTable);
     }
 }
 exports.FullyTypeConstants = FullyTypeConstants;
@@ -65216,7 +65246,7 @@ class ImplementMethods extends _abap_rule_1.ABAPRule {
                 return [idef];
             }
             for (const m of this.findInterfaceMethods(idef)) {
-                if (interfaceInfo.abstractMethods.includes(m.method.name.toUpperCase())) {
+                if (this.isAbstract(m, interfaceInfo, def)) {
                     continue;
                 }
                 if (this.isImplemented(m, def, impl) === false) {
@@ -65235,6 +65265,23 @@ class ImplementMethods extends _abap_rule_1.ABAPRule {
         }
         return ret;
     }
+    isAbstract(m, interfaceInfo, def) {
+        if (interfaceInfo.abstractMethods.includes(m.method.name.toUpperCase())) {
+            return true;
+        }
+        if (!def.superClassName) {
+            return false;
+        }
+        // look up in superclass if method is abstract there
+        const superClass = this.findClass(def.superClassName);
+        const superInterface = superClass === null || superClass === void 0 ? void 0 : superClass.def.interfaces.find(iface => iface.name.toUpperCase() === m.objectName.toUpperCase());
+        if (superClass && superInterface) {
+            return this.isAbstract(m, superInterface, superClass.def);
+        }
+        else {
+            return false;
+        }
+    }
     isImplemented(m, def, impl) {
         if (impl === undefined) {
             return false;
@@ -75597,9 +75644,9 @@ ENDFORM.`,
         for (let i = 0; i < statements.length; i++) {
             const node = statements[i];
             const nodeType = node.get();
-            if ((nodeType instanceof Statements.MethodImplementation
+            if (nodeType instanceof Statements.MethodImplementation
                 || nodeType instanceof Statements.Form
-                || nodeType instanceof Statements.FunctionModule)) {
+                || nodeType instanceof Statements.FunctionModule) {
                 statementCounter = 0;
                 continue;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.216",
+    "version": "2.113.218",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.216",
+        "@abaplint/core": "^2.113.217",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",