@abaplint/core 2.93.28 → 2.93.30

package/build/abaplint.d.ts

@@ -993,6 +993,10 @@ declare class ComponentCompareSimple extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class ComponentCompareSingle extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class ComponentCond extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -1821,6 +1825,7 @@ declare namespace Expressions {
         ArithOperator,
         ArrowOrDash,
         Arrow,
+        AssignSource,
         AssociationName,
         AttributeChain,
         AttributeName,
@@ -1830,7 +1835,6 @@ declare namespace Expressions {
         Cast,
         ClassFinal,
         ClassFriends,
-        AssignSource,
         ClassGlobal_2 as ClassGlobal,
         ClassName,
         Color,
@@ -1839,9 +1843,10 @@ declare namespace Expressions {
         ComponentChainSimple,
         ComponentChain,
         ComponentCompareSimple,
+        ComponentCompareSingle,
         ComponentCompare,
-        ComponentCond,
         ComponentCondSub,
+        ComponentCond,
         ComponentName,
         ConcatenatedConstant,
         CondBody,

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ComponentCompareSingle = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const component_chain_simple_1 = require("./component_chain_simple");
+class ComponentCompareSingle extends combi_1.Expression {
+    getRunnable() {
+        const ret = (0, combi_1.seq)((0, combi_1.altPrio)(component_chain_simple_1.ComponentChainSimple, _1.Dynamic), "=", _1.Source);
+        return ret;
+    }
+}
+exports.ComponentCompareSingle = ComponentCompareSingle;
+//# sourceMappingURL=component_compare_single.js.map

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

@@ -20,6 +20,7 @@ __exportStar(require("./and_return"), exports);
 __exportStar(require("./arith_operator"), exports);
 __exportStar(require("./arrow_or_dash"), exports);
 __exportStar(require("./arrow"), exports);
+__exportStar(require("./assign_source"), exports);
 __exportStar(require("./association_name"), exports);
 __exportStar(require("./attribute_chain"), exports);
 __exportStar(require("./attribute_name"), exports);
@@ -29,7 +30,6 @@ __exportStar(require("./call_transformation_parameters"), exports);
 __exportStar(require("./cast"), exports);
 __exportStar(require("./class_final"), exports);
 __exportStar(require("./class_friends"), exports);
-__exportStar(require("./assign_source"), exports);
 __exportStar(require("./class_global"), exports);
 __exportStar(require("./class_name"), exports);
 __exportStar(require("./color"), exports);
@@ -38,9 +38,10 @@ __exportStar(require("./compare"), exports);
 __exportStar(require("./component_chain_simple"), exports);
 __exportStar(require("./component_chain"), exports);
 __exportStar(require("./component_compare_simple"), exports);
+__exportStar(require("./component_compare_single"), exports);
 __exportStar(require("./component_compare"), exports);
-__exportStar(require("./component_cond"), exports);
 __exportStar(require("./component_cond_sub"), exports);
+__exportStar(require("./component_cond"), exports);
 __exportStar(require("./component_name"), exports);
 __exportStar(require("./concatenated_constant"), exports);
 __exportStar(require("./cond_body"), exports);

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

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoopGroupByComponent = void 0;
 const combi_1 = require("../combi");
 const component_name_1 = require("./component_name");
-const component_compare_simple_1 = require("./component_compare_simple");
+const component_compare_single_1 = require("./component_compare_single");
 class LoopGroupByComponent extends combi_1.Expression {
     getRunnable() {
         const groupSize = (0, combi_1.seq)(component_name_1.ComponentName, "=", "GROUP SIZE");
         const groupIndex = (0, combi_1.seq)(component_name_1.ComponentName, "=", "GROUP INDEX");
-        const components = (0, combi_1.alt)(component_compare_simple_1.ComponentCompareSimple, groupSize, groupIndex);
+        const components = (0, combi_1.alt)(component_compare_single_1.ComponentCompareSingle, groupSize, groupIndex);
         return components;
     }
 }

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/loop_group_by.js

@@ -32,7 +32,7 @@ class LoopGroupBy {
         */
         //    const sourceType = new StructureType(components);
         for (const c of node.findDirectExpressions(Expressions.LoopGroupByComponent)) {
-            for (const t of c.findDirectExpressions(Expressions.ComponentCompareSimple)) {
+            for (const t of c.findDirectExpressions(Expressions.ComponentCompareSingle)) {
                 new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);
             }
         }

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.28";
+        return "2.93.30";
     }
     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

@@ -993,6 +993,9 @@ GET REFERENCE OF <${uniqueName}> INTO ${target.concatTokens()}`;
                 groupIndexName = name === null || name === void 0 ? void 0 : name.concatTokens();
             }
             else {
+                if (condition !== "") {
+                    condition += " ";
+                }
                 condition += c.concatTokens();
                 type = type.replace(loopTargetName, loopSourceRowType);
                 type = type.replace("->", "-");
@@ -1030,11 +1033,15 @@ ELSE.\n`;
         code += `  CLEAR ${uniqueName}.\n`;
         for (const c of group.findAllExpressions(Expressions.LoopGroupByComponent)) {
             const concat = c.concatTokens();
+            //      console.dir(concat);
             if (concat.endsWith(" GROUP INDEX")) {
                 code += `  ${uniqueName}-${groupIndexName} = ${uniqueNameIndex}.\n`;
             }
+            else if (concat.endsWith(" GROUP SIZE")) {
+                code += `  ${uniqueName}-${groupCountName} = 1.\n`;
+            }
             else {
-                code += `  ${uniqueName}-${concat.replace("GROUP SIZE", "1")}.\n`;
+                code += `  ${uniqueName}-${concat}.\n`;
             }
         }
         if (singleName !== "") {
@@ -1656,7 +1663,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.28",
+    "version": "2.93.30",
     "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.23",
         "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": {