@abaplint/core 2.89.6 → 2.89.9

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

@@ -12,7 +12,7 @@ class Message {
         const raising = (0, combi_1.seq)("RAISING", expressions_1.ExceptionName);
         const options = (0, combi_1.per)(like, into, raising);
         const type = (0, combi_1.seq)("TYPE", expressions_1.Source);
-        const sou = (0, combi_1.altPrio)(options, expressions_1.Source);
+        const sou = (0, combi_1.altPrio)(options, s);
         const sourc = (0, combi_1.alt)(sou, (0, combi_1.seq)(s, sou), (0, combi_1.seq)(s, s, sou), (0, combi_1.seq)(s, s, s, options));
         const mwith = (0, combi_1.seq)("WITH", s, (0, combi_1.opt)(sourc));
         const foo = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.opt)(options), (0, combi_1.opt)(mwith));

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

@@ -249,9 +249,9 @@ class BasicTypes {
             }
         }
         const options = {
-            withHeader: text.includes("WITH HEADER LINE"),
+            withHeader: text.includes(" WITH HEADER LINE"),
             type: type,
-            isUnique: text.includes("WITH UNIQUE"),
+            isUnique: text.includes(" WITH UNIQUE"),
             keyFields: keyFields,
         };
         let found = undefined;
@@ -387,7 +387,7 @@ class BasicTypes {
                 sub = node.findFirstExpression(Expressions.FieldChain);
             }
             found = this.resolveLikeName(sub);
-            if (found && text.includes(" OCCURS ")) {
+            if (found && this.isOccurs(node)) {
                 found = new Types.TableType(found, { withHeader: text.includes("WITH HEADER LINE") }, qualifiedName);
             }
         }
@@ -416,10 +416,10 @@ class BasicTypes {
         else if (text.startsWith("TYPE")) {
             found = this.resolveTypeName(typeName, this.findLength(node), this.findDecimals(node), qualifiedName);
             const concat = node.concatTokens().toUpperCase();
-            if (found && concat.includes(" OCCURS ")) {
-                found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, qualifiedName);
+            if (found && this.isOccurs(node)) {
+                found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE") }, qualifiedName);
             }
-            else if (found && concat.includes("WITH HEADER LINE")) {
+            else if (found && concat.includes(" WITH HEADER LINE")) {
                 if (found instanceof Types.VoidType) {
                     found = new Types.TableType(found, { withHeader: true });
                 }
@@ -440,14 +440,24 @@ class BasicTypes {
                     }
                 }
                 found = new Types.CharacterType(length, qualifiedName); // fallback
-                if (concat.includes(" OCCURS ")) {
-                    found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, qualifiedName);
+                if (this.isOccurs(node)) {
+                    found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE") }, qualifiedName);
                 }
             }
         }
         return found;
     }
     /////////////////////
+    isOccurs(node) {
+        var _a;
+        if (node.findDirectTokenByText("OCCURS")) {
+            return true;
+        }
+        else if ((_a = node.findFirstExpression(Expressions.TypeTable)) === null || _a === void 0 ? void 0 : _a.findDirectTokenByText("OCCURS")) {
+            return true;
+        }
+        return false;
+    }
     // todo, rewrite this method
     resolveTypeChain(expr) {
         var _a;

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

@@ -2,15 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentCompareSimple = void 0;
 const Expressions = require("../../2_statements/expressions");
+const nodes_1 = require("../../nodes");
 const component_chain_1 = require("./component_chain");
 const source_1 = require("./source");
 class ComponentCompareSimple {
     runSyntax(node, scope, filename, rowType) {
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
-        }
-        for (const s of node.findDirectExpressions(Expressions.ComponentChainSimple)) {
-            new component_chain_1.ComponentChain().runSyntax(rowType, s);
+        let targetType = undefined;
+        for (const c of node.getChildren()) {
+            if (c instanceof nodes_1.ExpressionNode) {
+                if (c.get() instanceof Expressions.ComponentChainSimple) {
+                    targetType = new component_chain_1.ComponentChain().runSyntax(rowType, c);
+                }
+                else if (c.get() instanceof Expressions.Dynamic) {
+                    targetType = undefined;
+                }
+                else if (c.get() instanceof Expressions.Source) {
+                    new source_1.Source().runSyntax(c, scope, filename, targetType);
+                }
+                else {
+                    throw "ComponentCompareSimple, unexpected node";
+                }
+            }
         }
     }
 }

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

@@ -4,7 +4,9 @@ exports.LoopGroupBy = void 0;
 const Expressions = require("../../2_statements/expressions");
 const basic_1 = require("../../types/basic");
 const component_compare_1 = require("./component_compare");
+const inline_data_1 = require("./inline_data");
 const inline_fs_1 = require("./inline_fs");
+const target_1 = require("./target");
 class LoopGroupBy {
     runSyntax(node, scope, filename) {
         const components = [];
@@ -17,6 +19,15 @@ class LoopGroupBy {
             return;
         }
         const sourceType = new basic_1.StructureType(components);
+        for (const t of node.findAllExpressions(Expressions.Target)) {
+            const inline = t.findDirectExpression(Expressions.InlineData);
+            if (inline) {
+                new inline_data_1.InlineData().runSyntax(inline, scope, filename, new basic_1.VoidType("todoGroupBy"));
+            }
+            else {
+                new target_1.Target().runSyntax(t, scope, filename);
+            }
+        }
         const inlinefs = node.findFirstExpression(Expressions.InlineFS);
         if (inlinefs) {
             new inline_fs_1.InlineFS().runSyntax(inlinefs, scope, filename, sourceType);

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

@@ -167,6 +167,9 @@ class Source {
                 break;
             }
         }
+        if (node.findDirectTokenByText("&&")) {
+            return new basic_1.StringType();
+        }
         return context;
     }
     ////////////////////////////////

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -63,6 +63,7 @@ Current rules:
 * Moving with +=, -=, /=, *=, &&= is expanded
 * line_exists and line_index is downported to READ TABLE
 * ENUMs, but does not nessesarily give the correct type and value
+* MESSAGE with non simple source
 
 Only one transformation is applied to a statement at a time, so multiple steps might be required to do the full downport.`,
             tags: [_irule_1.RuleTag.Experimental, _irule_1.RuleTag.Downport, _irule_1.RuleTag.Quickfix],
@@ -285,6 +286,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.downportMessage(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         return undefined;
     }
     //////////////////////////////////////////
@@ -456,6 +461,30 @@ ${indentation}`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
+    downportMessage(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Message)) {
+            return undefined;
+        }
+        const foundWith = high.findExpressionAfterToken("WITH");
+        if (foundWith === undefined) {
+            return undefined;
+        }
+        const likeSource = high.findExpressionAfterToken("LIKE");
+        for (const s of high.findAllExpressions(Expressions.Source)) {
+            if (s === likeSource) {
+                continue;
+            }
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const firstToken = high.getFirstToken();
+            const code = `DATA(${uniqueName}) = ${s.concatTokens()}.\n${indentation}`;
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), code);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, s.getFirstToken().getStart(), s.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Refactor MESSAGE WITH source", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     replaceAppendExpression(high, lowFile, highSyntax) {
         if (!(high.get() instanceof Statements.Append)) {
             return undefined;
@@ -661,36 +690,46 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         bar->if_t100_dyn_msg~msgv4 = 'abc'.
         RAISE EXCEPTION bar.
         */
-        var _a;
-        if (node.get() instanceof Statements.Raise) {
-            const startToken = node.findDirectTokenByText("ID");
-            if (startToken === undefined) {
-                return undefined;
-            }
+        var _a, _b, _c;
+        if (!(node.get() instanceof Statements.Raise)) {
+            return undefined;
+        }
+        let id = undefined;
+        let number = undefined;
+        let startToken = node.findDirectTokenByText("ID");
+        if (startToken) {
             const sources = node.findDirectExpressions(Expressions.Source);
-            const id = sources[0].concatTokens();
+            id = sources[0].concatTokens();
             const numberExpression = node.findExpressionAfterToken("NUMBER");
             if (numberExpression === undefined) {
                 throw "downport raiseException, could not find number";
             }
-            let number = numberExpression.concatTokens();
+            number = numberExpression.concatTokens();
             if (numberExpression.get() instanceof Expressions.MessageNumber) {
                 number = "'" + number + "'";
             }
-            const className = ((_a = node.findDirectExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "ERROR";
-            const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-            const abap = `DATA ${uniqueName1} LIKE if_t100_message=>t100key.
-${indentation}${uniqueName1}-msgid = ${id}.
+        }
+        else {
+            const s = node.findDirectExpression(Expressions.MessageSource);
+            if (s === undefined) {
+                return undefined;
+            }
+            id = "'" + ((_a = s.findDirectExpression(Expressions.MessageClass)) === null || _a === void 0 ? void 0 : _a.concatTokens()) + "'";
+            number = "'" + ((_b = s.findDirectExpression(Expressions.MessageTypeAndNumber)) === null || _b === void 0 ? void 0 : _b.concatTokens().substring(1)) + "'";
+            startToken = node.getFirstToken();
+        }
+        const className = ((_c = node.findDirectExpression(Expressions.ClassName)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "ERROR";
+        const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+        const abap = `DATA ${uniqueName1} LIKE if_t100_message=>t100key.
+${indentation}${uniqueName1}-msgid = ${id === null || id === void 0 ? void 0 : id.toUpperCase()}.
 ${indentation}${uniqueName1}-msgno = ${number}.
 ${indentation}DATA ${uniqueName2} TYPE REF TO ${className}.
 ${indentation}CREATE OBJECT ${uniqueName2} EXPORTING textid = ${uniqueName1}.
 ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
-            const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getStart(), node.getEnd(), abap);
-            return issue_1.Issue.atToken(lowFile, startToken, "Downport RAISE MESSAGE", this.getMetadata().key, this.conf.severity, fix);
-        }
-        return undefined;
+        const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getStart(), node.getEnd(), abap);
+        return issue_1.Issue.atToken(lowFile, startToken, "Downport RAISE MESSAGE", this.getMetadata().key, this.conf.severity, fix);
     }
     emptyKey(node, lowFile) {
         for (let i of node.findAllExpressions(Expressions.TypeTable)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.89.6",
+    "version": "2.89.9",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,12 +45,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.22.2",
+        "@microsoft/api-extractor": "^7.23.0",
         "@types/chai": "^4.3.1",
-        "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.25",
+        "@types/mocha": "^9.1.1",
+        "@types/node": "^17.0.26",
         "chai": "^4.3.6",
-        "eslint": "^8.13.0",
+        "eslint": "^8.14.0",
         "mocha": "^9.2.2",
         "c8": "^7.11.2",
         "source-map-support": "^0.5.21",