@abaplint/core 2.93.35 → 2.93.37

package/build/abaplint.d.ts

@@ -5698,7 +5698,7 @@ declare class Table extends AbstractObject {
         allowNamespace: boolean;
     };
     setDirty(): void;
-    listKeys(): string[];
+    listKeys(reg: IRegistry): string[];
     parseType(reg: IRegistry): AbstractType;
     getTableCategory(): TableCategory | undefined;
     getEnhancementCategory(): EnhancementCategory;

package/build/src/objects/table.js

@@ -42,7 +42,7 @@ class Table extends _abstract_object_1.AbstractObject {
         this.parsedData = undefined;
         super.setDirty();
     }
-    listKeys() {
+    listKeys(reg) {
         if (this.parsedData === undefined) {
             this.parseXML();
         }
@@ -51,7 +51,15 @@ class Table extends _abstract_object_1.AbstractObject {
         }
         const ret = [];
         for (const p of this.parsedData.fields) {
-            if (p.KEYFLAG === "X") {
+            if (p.KEYFLAG === "X" && p.FIELDNAME === ".INCLUDE") {
+                const lookup = new ddic_1.DDIC(reg).lookupTableOrView(p.PRECFIELD).type;
+                if (lookup instanceof Types.StructureType) {
+                    for (const c of lookup.getComponents()) {
+                        ret.push(c.name);
+                    }
+                }
+            }
+            else if (p.KEYFLAG === "X") {
                 ret.push(p.FIELDNAME);
             }
         }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -50,6 +50,7 @@ Current rules:
 * COND is outlined
 * REDUCE is outlined
 * SWITCH is outlined
+* FILTER is outlined
 * APPEND expression is outlined
 * INSERT expression is outlined
 * EMPTY KEY is changed to DEFAULT KEY, opposite of DEFAULT KEY in https://rules.abaplint.org/avoid_use/
@@ -288,6 +289,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.outlineFilter(low, high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.outlineCast(low, high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -1538,6 +1543,53 @@ ${indentation}    output = ${topTarget}.`;
         }
         return { body, end };
     }
+    outlineFilter(low, high, lowFile, highSyntax) {
+        var _a, _b, _c;
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const i of high.findAllExpressionsRecursive(Expressions.Source)) {
+            const firstToken = i.getFirstToken();
+            if (firstToken.getStr().toUpperCase() !== "FILTER") {
+                continue;
+            }
+            const filterBody = i.findDirectExpression(Expressions.FilterBody);
+            if (filterBody === undefined) {
+                continue;
+            }
+            let type = this.findType(i, lowFile, highSyntax);
+            if (type === undefined) {
+                if (high.get() instanceof Statements.Move
+                    && high.findDirectExpression(Expressions.Source) === i
+                    && ((_a = high.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.TargetField)) !== undefined) {
+                    type = "LIKE " + ((_b = high.findDirectExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
+                }
+                if (type === undefined) {
+                    continue;
+                }
+            }
+            else {
+                type = "TYPE " + type;
+            }
+            const sourceName = (_c = filterBody.findDirectExpression(Expressions.Source)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+            if (sourceName === undefined) {
+                continue;
+            }
+            const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
+            const loopName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            let body = "";
+            body += `${indentation}DATA ${uniqueName} ${type}.\n`;
+            body += `${indentation}LOOP AT ${sourceName} INTO DATA(${loopName}) ${filterBody.concatTokens().substring(sourceName.length + 1)}.\n`;
+            body += `${indentation}  INSERT ${loopName} INTO TABLE ${uniqueName}.\n`;
+            body += `${indentation}ENDLOOP.\n`;
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), body);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), i.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, firstToken, "Downport FILTER", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     outlineSwitch(low, high, lowFile, highSyntax) {
         var _a, _b, _c, _d;
         if (!(low.get() instanceof _statement_1.Unknown)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.35",
+    "version": "2.93.37",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -49,7 +49,7 @@
         "@microsoft/api-extractor": "^7.32.0",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^10.0.0",
-        "@types/node": "^18.8.1",
+        "@types/node": "^18.8.3",
         "chai": "^4.3.6",
         "eslint": "^8.24.0",
         "mocha": "^10.0.0",
@@ -59,7 +59,7 @@
         "typescript": "^4.8.4"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.0.10",
+        "fast-xml-parser": "^4.0.11",
         "json5": "^2.2.1",
         "vscode-languageserver-types": "^3.17.2"
     }