@abaplint/core 2.93.36 → 2.93.38

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

@@ -17,7 +17,7 @@ class FilterBody {
                 new source_1.Source().runSyntax(s, scope, filename);
             }
         }
-        return targetType ? targetType : type;
+        return type ? type : targetType;
     }
 }
 exports.FilterBody = FilterBody;

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

@@ -108,7 +108,14 @@ class Source {
                 case "FILTER":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
-                        return new filter_body_1.FilterBody().runSyntax(node.findDirectExpression(Expressions.FilterBody), scope, filename, foundType);
+                        const bodyType = new filter_body_1.FilterBody().runSyntax(node.findDirectExpression(Expressions.FilterBody), scope, filename, foundType);
+                        if (foundType === undefined || foundType.isGeneric()) {
+                            this.addIfInferred(node, scope, filename, bodyType);
+                        }
+                        else {
+                            this.addIfInferred(node, scope, filename, foundType);
+                        }
+                        return foundType ? foundType : bodyType;
                     }
                 case "CORRESPONDING":
                     {

package/build/src/abap/types/basic/table_type.js

@@ -42,7 +42,7 @@ class TableType extends _abstract_type_1.AbstractType {
         }
     }
     isGeneric() {
-        return false;
+        return this.rowType.isGeneric();
     }
     containsVoid() {
         return this.rowType.containsVoid();

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.36";
+        return "2.93.38";
     }
     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,46 @@ ${indentation}    output = ${topTarget}.`;
         }
         return { body, end };
     }
+    outlineFilter(low, high, lowFile, highSyntax) {
+        var _a;
+        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;
+            }
+            const sourceName = (_a = filterBody.findDirectExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+            if (sourceName === undefined) {
+                continue;
+            }
+            let type = this.findType(i, lowFile, highSyntax);
+            if (type === undefined) {
+                type = "LIKE " + sourceName;
+            }
+            else {
+                type = "TYPE " + type;
+            }
+            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 += `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${indentation}`;
+            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.36",
+    "version": "2.93.38",
     "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.2",
+        "@types/node": "^18.8.3",
         "chai": "^4.3.6",
         "eslint": "^8.24.0",
         "mocha": "^10.0.0",