@abaplint/core 2.91.32 → 2.91.33

package/build/abaplint.d.ts

@@ -975,6 +975,10 @@ declare class ComponentCond extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class ComponentCondSub extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class ComponentName extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -1815,6 +1819,7 @@ declare namespace Expressions {
         ComponentCompareSimple,
         ComponentCompare,
         ComponentCond,
+        ComponentCondSub,
         ComponentName,
         ConcatenatedConstant,
         CondBody,
@@ -2623,7 +2628,7 @@ export declare interface IConfig {
     rules: any;
 }
 
-declare interface IConfiguration {
+export declare interface IConfiguration {
     getEnabledRules(): IRule[];
     get(): IConfig;
     getGlobal(): IGlobalConfig;

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

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentCond = void 0;
 const combi_1 = require("../combi");
-const tokens_1 = require("../../1_lexer/tokens");
 const _1 = require(".");
 class ComponentCond extends combi_1.Expression {
     getRunnable() {
         const operator = (0, combi_1.alt)("AND", "OR");
-        const another = (0, combi_1.seq)((0, combi_1.opt)("NOT"), (0, combi_1.tok)(tokens_1.WParenLeftW), ComponentCond, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.ParenRightW)));
-        const cnd = (0, combi_1.alt)(_1.ComponentCompare, another);
+        const cnd = (0, combi_1.alt)(_1.ComponentCompare, _1.ComponentCondSub);
         const ret = (0, combi_1.seq)(cnd, (0, combi_1.star)((0, combi_1.seq)(operator, cnd)));
         return ret;
     }

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ComponentCondSub = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+const _1 = require(".");
+class ComponentCondSub extends combi_1.Expression {
+    getRunnable() {
+        const another = (0, combi_1.seq)((0, combi_1.opt)("NOT"), (0, combi_1.tok)(tokens_1.WParenLeftW), _1.ComponentCond, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.ParenRightW)));
+        return another;
+    }
+}
+exports.ComponentCondSub = ComponentCondSub;
+//# sourceMappingURL=component_cond_sub.js.map

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

@@ -40,6 +40,7 @@ __exportStar(require("./component_chain"), exports);
 __exportStar(require("./component_compare_simple"), exports);
 __exportStar(require("./component_compare"), exports);
 __exportStar(require("./component_cond"), exports);
+__exportStar(require("./component_cond_sub"), exports);
 __exportStar(require("./component_name"), exports);
 __exportStar(require("./concatenated_constant"), exports);
 __exportStar(require("./cond_body"), exports);

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

@@ -6,8 +6,7 @@ const combi_1 = require("../combi");
 const sql_source_simple_1 = require("./sql_source_simple");
 class SQLClient extends combi_1.Expression {
     getRunnable() {
-        // todo, client specified and connection not possible in Cloud
-        const client = (0, combi_1.alt)("CLIENT SPECIFIED", (0, combi_1.seq)("USING", (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CLIENT", sql_source_simple_1.SQLSourceSimple)), (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("CLIENTS IN", (0, combi_1.alt)(sql_source_simple_1.SQLSourceSimple, "T000"))), (0, combi_1.ver)(version_1.Version.v754, "ALL CLIENTS"))));
+        const client = (0, combi_1.alt)((0, combi_1.verNot)(version_1.Version.Cloud, "CLIENT SPECIFIED"), (0, combi_1.seq)("USING", (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CLIENT", sql_source_simple_1.SQLSourceSimple)), (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("CLIENTS IN", (0, combi_1.alt)(sql_source_simple_1.SQLSourceSimple, "T000"))), (0, combi_1.ver)(version_1.Version.v754, "ALL CLIENTS"))));
         return client;
     }
 }

package/build/src/abap/2_statements/statements/insert_internal.js

@@ -11,11 +11,12 @@ class InsertInternal {
         const ref = (0, combi_1.seq)("REFERENCE INTO", expressions_1.Target);
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
         const initial = (0, combi_1.str)("INITIAL LINE");
-        const into = (0, combi_1.seq)("INTO", (0, combi_1.opt)("TABLE"), expressions_1.Target);
+        const into = (0, combi_1.seq)("INTO", expressions_1.Target);
+        const intoTable = (0, combi_1.seq)("INTO TABLE", expressions_1.Target, (0, combi_1.opt)((0, combi_1.alt)(ref, assigning)));
         const to = (0, combi_1.seq)("TO", expressions_1.Source);
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const fromTo = (0, combi_1.seq)((0, combi_1.optPrio)(from), (0, combi_1.optPrio)(to));
-        const foo = (0, combi_1.per)(into, ref, index, assigning);
+        const fromTo = (0, combi_1.opt)((0, combi_1.per)(from, to));
+        const foo = (0, combi_1.alt)(intoTable, (0, combi_1.seq)(into, (0, combi_1.opt)((0, combi_1.per)(index, (0, combi_1.alt)(ref, assigning)))), (0, combi_1.per)(index, (0, combi_1.alt)(ref, assigning)));
         const lines = (0, combi_1.seq)("LINES OF", target, (0, combi_1.opt)(fromTo));
         const src = (0, combi_1.alt)(expressions_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source));
         const tab = (0, combi_1.seq)("TABLE", expressions_1.Source);

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

@@ -5,8 +5,11 @@ const Expressions = require("../../2_statements/expressions");
 const component_compare_1 = require("./component_compare");
 class ComponentCond {
     runSyntax(node, scope, filename) {
-        for (const t of node.findDirectExpressions(Expressions.ComponentCond)) {
-            new ComponentCond().runSyntax(t, scope, filename);
+        for (const t of node.findDirectExpressions(Expressions.ComponentCondSub)) {
+            const c = t.findDirectExpression(Expressions.ComponentCond);
+            if (c) {
+                new ComponentCond().runSyntax(c, scope, filename);
+            }
         }
         for (const t of node.findDirectExpressions(Expressions.ComponentCompare)) {
             new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);

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

@@ -30,9 +30,9 @@ class Append {
             const rowType = targetType instanceof basic_1.TableType ? targetType.getRowType() : targetType;
             new inline_data_1.InlineData().runSyntax(dataTarget, scope, filename, new basic_1.DataReference(rowType));
         }
-        let source = node.findDirectExpression(Expressions.Source);
+        let source = node.findDirectExpression(Expressions.SimpleSource4);
         if (source === undefined) {
-            source = node.findDirectExpression(Expressions.SimpleSource4);
+            source = node.findDirectExpression(Expressions.Source);
         }
         if (source) {
             if (targetType !== undefined

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InsertFieldGroup = void 0;
+const Expressions = require("../../2_statements/expressions");
+const source_1 = require("../expressions/source");
+const target_1 = require("../expressions/target");
+class InsertFieldGroup {
+    runSyntax(node, scope, filename) {
+        for (const s of node.findAllExpressions(Expressions.Source)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
+        for (const s of node.findAllExpressions(Expressions.SimpleSource1)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
+        for (const t of node.findDirectExpressions(Expressions.Target)) {
+            new target_1.Target().runSyntax(t, scope, filename);
+        }
+    }
+}
+exports.InsertFieldGroup = InsertFieldGroup;
+//# sourceMappingURL=insert_field_group.js.map

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

@@ -131,6 +131,7 @@ const unassign_1 = require("./statements/unassign");
 const insert_textpool_1 = require("./statements/insert_textpool");
 const get_cursor_1 = require("./statements/get_cursor");
 const loop_at_screen_1 = require("./statements/loop_at_screen");
+const insert_field_group_1 = require("./statements/insert_field_group");
 // -----------------------------------
 const map = {};
 function addToMap(handler) {
@@ -203,6 +204,7 @@ if (Object.keys(map).length === 0) {
     addToMap(new find_1.Find());
     addToMap(new message_1.Message());
     addToMap(new system_call_1.SystemCall());
+    addToMap(new insert_field_group_1.InsertFieldGroup());
     addToMap(new get_time_1.GetTime());
     addToMap(new unassign_1.Unassign());
     addToMap(new get_parameter_1.GetParameter());

package/build/src/registry.js

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

package/build/src/rules/many_parentheses.js

@@ -49,11 +49,17 @@ ENDIF.
         if (structure === undefined) {
             return [];
         }
-        for (const cond of structure.findAllExpressions(Expressions.Cond)) {
+        for (const cond of structure.findAllExpressionsMulti([Expressions.Cond, Expressions.ComponentCond])) {
             issues.push(...this.analyze(file, cond));
         }
-        for (const sub of structure.findAllExpressions(Expressions.CondSub)) {
-            const cond = sub.findDirectExpressions(Expressions.Cond);
+        for (const sub of structure.findAllExpressionsMulti([Expressions.CondSub, Expressions.ComponentCondSub])) {
+            let cond = [];
+            if (sub.get() instanceof Expressions.CondSub) {
+                cond = sub.findDirectExpressions(Expressions.Cond);
+            }
+            else {
+                cond = sub.findDirectExpressions(Expressions.ComponentCond);
+            }
             if (cond.length !== 1) {
                 continue;
             }
@@ -106,29 +112,37 @@ ENDIF.
     analyze(file, cond) {
         const issues = [];
         let comparator = "";
+        let found = false;
         for (const c of cond.getChildren()) {
             let current = "";
             if (c instanceof nodes_1.TokenNode) {
                 current = c.get().getStr().toUpperCase();
             }
-            else if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.CondSub) {
+            else if (c instanceof nodes_1.ExpressionNode
+                && (c.get() instanceof Expressions.CondSub || c.get() instanceof Expressions.ComponentCondSub)) {
                 if (c.getFirstToken().getStr().toUpperCase() === "NOT") {
                     return [];
                 }
-                const i = c.findDirectExpression(Expressions.Cond);
+                let i = c.findDirectExpression(Expressions.Cond);
+                if (i === undefined) {
+                    i = c.findDirectExpression(Expressions.ComponentCond);
+                }
                 if (i === undefined) {
                     return [];
                 }
                 current = this.findComparator(i);
+                if (current !== "") {
+                    found = true; // dont report for the simple case that contains quick fixes
+                }
             }
             if (comparator === "") {
                 comparator = current;
             }
-            else if (comparator !== current) {
+            else if (comparator !== "" && current !== "" && comparator !== current) {
                 return [];
             }
         }
-        if (comparator !== "" && comparator !== "MIXED") {
+        if (comparator !== "" && comparator !== "MIXED" && found === true) {
             const message = "Too many parentheses, complex";
             const issue = issue_1.Issue.atToken(file, cond.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
             issues.push(issue);

package/build/src/rules/parser_missing_space.js

@@ -51,25 +51,28 @@ This rule makes sure the spaces are consistently required across the language.`,
     missingSpace(statement) {
         const found = statement.findAllExpressionsMulti([Expressions.CondSub, Expressions.SQLCond,
             Expressions.ValueBody, Expressions.NewObject, Expressions.Cond,
-            Expressions.ComponentCond, Expressions.MethodCallParam], true);
+            Expressions.ComponentCond, Expressions.ComponentCondSub, Expressions.MethodCallParam], true);
         let pos = undefined;
         for (const f of found) {
             const type = f.get();
-            if (type instanceof Expressions.CondSub) {
-                pos = this.checkCondSub(f);
-            }
-            else if (type instanceof Expressions.ValueBody) {
-                pos = this.checkValueBody(f);
-            }
-            else if (type instanceof Expressions.Cond) {
+            if (type instanceof Expressions.Cond) {
                 pos = this.checkCond(f);
             }
+            else if (type instanceof Expressions.CondSub) {
+                pos = this.checkCondSub(f);
+            }
             else if (type instanceof Expressions.ComponentCond) {
                 pos = this.checkComponentCond(f);
             }
+            else if (type instanceof Expressions.ComponentCondSub) {
+                pos = this.checkComponentCondSub(f);
+            }
             else if (type instanceof Expressions.SQLCond) {
                 pos = this.checkSQLCond(f);
             }
+            else if (type instanceof Expressions.ValueBody) {
+                pos = this.checkValueBody(f);
+            }
             else if (type instanceof Expressions.NewObject) {
                 pos = this.checkNewObject(f);
             }
@@ -136,7 +139,7 @@ This rule makes sure the spaces are consistently required across the language.`,
         }
         return undefined;
     }
-    checkComponentCond(cond) {
+    checkComponentCondSub(cond) {
         const children = cond.getChildren();
         for (let i = 0; i < children.length; i++) {
             if (children[i].get() instanceof Expressions.ComponentCond) {
@@ -157,6 +160,19 @@ This rule makes sure the spaces are consistently required across the language.`,
         }
         return undefined;
     }
+    checkComponentCond(cond) {
+        const children = cond.getAllTokens();
+        for (let i = 0; i < children.length - 1; i++) {
+            const current = children[i];
+            const next = children[i + 1];
+            if (next.getStr().startsWith("'")
+                && next.getRow() === current.getRow()
+                && next.getCol() === current.getEnd().getCol()) {
+                return current.getEnd();
+            }
+        }
+        return undefined;
+    }
     checkValueBody(vb) {
         var _a, _b;
         const children = vb.getChildren();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.32",
+    "version": "2.91.33",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,10 +45,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.29.2",
+        "@microsoft/api-extractor": "^7.29.3",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.7.3",
+        "@types/node": "^18.7.9",
         "chai": "^4.3.6",
         "eslint": "^8.22.0",
         "mocha": "^10.0.0",