@abaplint/core 2.93.27 → 2.93.29

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

@@ -8,7 +8,7 @@ const version_1 = require("../../../version");
 class ReduceNext extends combi_1.Expression {
     getRunnable() {
         const calcAssign = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WPlus), "="), (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WDash), "="), "/=", "*=", "&&="));
-        const fields = (0, combi_1.seq)(_1.Field, (0, combi_1.altPrio)("=", calcAssign), _1.Source);
+        const fields = (0, combi_1.seq)(_1.SimpleFieldChain, (0, combi_1.altPrio)("=", calcAssign), _1.Source);
         return (0, combi_1.seq)("NEXT", (0, combi_1.plus)(fields));
     }
 }

package/build/src/abap/5_syntax/basic_types.js

@@ -24,7 +24,7 @@ class BasicTypes {
     }
     lookupQualifiedName(name) {
         var _a;
-        // argh, todo, rewrite this entire method
+        // argh, todo, rewrite this entire method, more argh
         if (name === undefined) {
             return undefined;
         }
@@ -38,9 +38,24 @@ class BasicTypes {
             const typeName = split[1];
             const oo = this.scope.findObjectDefinition(ooName);
             if (oo) {
-                const f = oo.getTypeDefinitions().getByName(typeName);
-                if (f) {
-                    return f;
+                if (typeName.includes("-")) {
+                    const split = typeName.split("-");
+                    const subTypeName = split[0];
+                    const fieldName = split[1];
+                    const stru = oo.getTypeDefinitions().getByName(subTypeName);
+                    const struType = stru === null || stru === void 0 ? void 0 : stru.getType();
+                    if (stru && struType instanceof basic_1.StructureType) {
+                        const f = struType.getComponentByName(fieldName);
+                        if (f) {
+                            return new _typed_identifier_1.TypedIdentifier(stru.getToken(), stru.getFilename(), f);
+                        }
+                    }
+                }
+                else {
+                    const f = oo.getTypeDefinitions().getByName(typeName);
+                    if (f) {
+                        return f;
+                    }
                 }
             }
         }

package/build/src/abap/5_syntax/expressions/reduce_body.js

@@ -8,6 +8,7 @@ const inline_field_definition_1 = require("./inline_field_definition");
 const unknown_type_1 = require("../../types/basic/unknown_type");
 const reduce_next_1 = require("./reduce_next");
 const let_1 = require("./let");
+const _scope_type_1 = require("../_scope_type");
 class ReduceBody {
     runSyntax(node, scope, filename) {
         if (node === undefined) {
@@ -20,6 +21,10 @@ class ReduceBody {
         }
         let first = undefined;
         for (const i of node.findDirectExpressions(Expressions.InlineFieldDefinition)) {
+            if (scoped === false) {
+                scope.push(_scope_type_1.ScopeType.Let, "LET", node.getFirstToken().getStart(), filename);
+                scoped = true;
+            }
             const found = new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename);
             if (found && first === undefined) {
                 first = found;

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

@@ -46,6 +46,16 @@ class Describe {
                 new target_1.Target().runSyntax(lengthTarget, scope, filename);
             }
         }
+        const componentsTarget = node.findExpressionAfterToken("COMPONENTS");
+        if ((componentsTarget === null || componentsTarget === void 0 ? void 0 : componentsTarget.get()) instanceof Expressions.Target) {
+            const inline = componentsTarget === null || componentsTarget === void 0 ? void 0 : componentsTarget.findDirectExpression(Expressions.InlineData);
+            if (inline) {
+                new inline_data_1.InlineData().runSyntax(inline, scope, filename, new basic_1.IntegerType());
+            }
+            else {
+                new target_1.Target().runSyntax(componentsTarget, scope, filename);
+            }
+        }
     }
 }
 exports.Describe = Describe;

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.27";
+        return "2.93.29";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/abapdoc.js

@@ -11,6 +11,8 @@ class AbapdocConf extends _basic_rule_config_1.BasicRuleConfig {
         super(...arguments);
         /** Check local classes and interfaces for abapdoc. */
         this.checkLocal = false;
+        this.classDefinition = false;
+        this.interfaceDefinition = false;
     }
 }
 exports.AbapdocConf = AbapdocConf;
@@ -24,7 +26,9 @@ class Abapdoc extends _abap_rule_1.ABAPRule {
             key: "abapdoc",
             title: "Check abapdoc",
             shortDescription: `Various checks regarding abapdoc.
-Base rule checks for existence of abapdoc for public class methods and all interface methods.`,
+Base rule checks for existence of abapdoc for public class methods and all interface methods.
+
+Plus class and interface definitions.`,
             tags: [_irule_1.RuleTag.SingleFile],
         };
     }
@@ -35,6 +39,7 @@ Base rule checks for existence of abapdoc for public class methods and all inter
         this.conf = conf;
     }
     runParsed(file) {
+        var _a, _b;
         const issues = [];
         const rows = file.getRawRows();
         let methods = [];
@@ -43,12 +48,28 @@ Base rule checks for existence of abapdoc for public class methods and all inter
                 continue;
             }
             methods = methods.concat(classDef.methods.filter(m => m.visibility === visibility_1.Visibility.Public));
+            if (this.getConfig().classDefinition === true) {
+                const previousRow = classDef.identifier.getStart().getRow() - 2;
+                if (((_a = rows[previousRow]) === null || _a === void 0 ? void 0 : _a.trim().substring(0, 2)) !== "\"!") {
+                    const message = "Missing ABAP Doc for class " + classDef.identifier.getToken().getStr();
+                    const issue = issue_1.Issue.atIdentifier(classDef.identifier, message, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+            }
         }
         for (const interfaceDef of file.getInfo().listInterfaceDefinitions()) {
             if (this.conf.checkLocal === false && interfaceDef.isLocal === true) {
                 continue;
             }
             methods = methods.concat(interfaceDef.methods);
+            if (this.getConfig().interfaceDefinition === true) {
+                const previousRow = interfaceDef.identifier.getStart().getRow() - 2;
+                if (((_b = rows[previousRow]) === null || _b === void 0 ? void 0 : _b.trim().substring(0, 2)) !== "\"!") {
+                    const message = "Missing ABAP Doc for interface " + interfaceDef.identifier.getToken().getStr();
+                    const issue = issue_1.Issue.atIdentifier(interfaceDef.identifier, message, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+            }
         }
         for (const method of methods) {
             if (method.isRedefinition === true) {

package/build/src/rules/downport.js

@@ -937,6 +937,9 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         if (sourceRef.findFirstExpression(Expressions.TableExpression)) {
             const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             code = `ASSIGN ${sourceRef.concatTokens()} TO FIELD-SYMBOL(<${uniqueName}>).
+IF sy-subrc <> 0.
+  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
+ENDIF.
 GET REFERENCE OF <${uniqueName}> INTO ${target.concatTokens()}`;
         }
         else {
@@ -1473,16 +1476,36 @@ ${indentation}    output = ${topTarget}.`;
             if (gby !== "") {
                 gby = " GROUP BY ( " + gby + " )";
             }
+            const fc = forLoop.findDirectExpression(Expressions.FieldChain);
+            if (fc) {
+                gby = " GROUP BY " + fc.concatTokens();
+            }
+            if (forLoop.findDirectTokenByText("ASCENDING")) {
+                gby += " ASCENDING";
+            }
+            if (forLoop.findDirectTokenByText("DESCENDING")) {
+                gby += " DESCENDING";
+            }
             const groups = forLoop.findExpressionAfterToken("GROUPS");
             if (groups) {
-                gby += " INTO DATA(" + groups.concatTokens() + ")";
+                const concat = groups.concatTokens();
+                if (concat.startsWith("<")) {
+                    gby += " ASSIGNING FIELD-SYMBOL(" + concat + ")";
+                }
+                else {
+                    gby += " INTO DATA(" + concat + ")";
+                }
             }
             let inGroup = "";
             if (forLoop.concatTokens().toUpperCase().includes(" IN GROUP ")) {
                 inGroup = "-items";
             }
+            let into = "INTO DATA";
+            if (loopTargetField.startsWith("<")) {
+                into = "ASSIGNING FIELD-SYMBOL";
+            }
             // todo, also backup sy-index / sy-tabix here?
-            body += indentation + `LOOP AT ${loopSource}${inGroup} INTO DATA(${loopTargetField})${from}${to}${cond}${gby}.\n`;
+            body += indentation + `LOOP AT ${loopSource}${inGroup} ${into}(${loopTargetField})${from}${to}${cond}${gby}.\n`;
             if (indexInto) {
                 body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";
             }
@@ -1633,7 +1656,7 @@ ${indentation}    output = ${topTarget}.`;
                 if (concat.toUpperCase() === "NEXT") {
                     continue;
                 }
-                else if (n.get() instanceof Expressions.Field) {
+                else if (n.get() instanceof Expressions.SimpleFieldChain) {
                     body += indentation + "  " + concat + " ";
                 }
                 else if (n.get() instanceof Expressions.Source) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.27",
+    "version": "2.93.29",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -46,16 +46,16 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.31.1",
+        "@microsoft/api-extractor": "^7.31.2",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.7.18",
+        "@types/node": "^18.7.20",
         "chai": "^4.3.6",
-        "eslint": "^8.23.1",
+        "eslint": "^8.24.0",
         "mocha": "^10.0.0",
         "c8": "^7.12.0",
         "source-map-support": "^0.5.21",
-        "ts-json-schema-generator": "^1.1.0",
+        "ts-json-schema-generator": "^1.1.1",
         "typescript": "^4.8.3"
     },
     "dependencies": {