@abaplint/core 2.98.2 → 2.98.3

package/build/abaplint.d.ts

@@ -1966,6 +1966,7 @@ declare namespace Expressions {
         ComponentCondSub,
         ComponentCond,
         ComponentName,
+        SQLFields,
         ConcatenatedConstant,
         CondBody,
         CondSub,
@@ -5278,6 +5279,10 @@ declare class SQLFieldName extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLFields extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLForAllEntries extends Expression {
     getRunnable(): IStatementRunnable;
 }

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

@@ -43,6 +43,7 @@ __exportStar(require("./component_compare"), exports);
 __exportStar(require("./component_cond_sub"), exports);
 __exportStar(require("./component_cond"), exports);
 __exportStar(require("./component_name"), exports);
+__exportStar(require("./sql_fields"), exports);
 __exportStar(require("./concatenated_constant"), exports);
 __exportStar(require("./cond_body"), exports);
 __exportStar(require("./cond_sub"), exports);

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

@@ -15,7 +15,7 @@ class Select extends combi_1.Expression {
         const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
         const offset = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("OFFSET", _1.SQLSource));
         const bypass = (0, combi_1.str)("BYPASSING BUFFER");
-        const fields = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("FIELDS", _1.SQLFieldList));
+        const fields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields);
         const perm = (0, combi_1.per)(_1.SQLFrom, into, _1.SQLForAllEntries, where, _1.SQLOrderBy, sql_up_to_1.SQLUpTo, offset, _1.SQLClient, _1.SQLHaving, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection);
         const permSingle = (0, combi_1.per)(_1.SQLFrom, sql_into_structure_1.SQLIntoStructure, where, _1.SQLClient, bypass, fields, _1.DatabaseConnection);
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), sql_field_name_1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW));

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

@@ -6,10 +6,10 @@ const _1 = require(".");
 const sql_order_by_1 = require("./sql_order_by");
 const sql_having_1 = require("./sql_having");
 const sql_into_structure_1 = require("./sql_into_structure");
-const sql_field_list_1 = require("./sql_field_list");
 const sql_hints_1 = require("./sql_hints");
 const sql_field_list_loop_1 = require("./sql_field_list_loop");
 const sql_up_to_1 = require("./sql_up_to");
+const version_1 = require("../../../version");
 class SelectLoop extends combi_1.Expression {
     getRunnable() {
         const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
@@ -18,7 +18,7 @@ class SelectLoop extends combi_1.Expression {
         const tab = (0, combi_1.seq)(_1.SQLIntoTable, (0, combi_1.alt)(pack, (0, combi_1.seq)(_1.SQLFrom, pack), (0, combi_1.seq)(pack, _1.SQLFrom)));
         const packTab = (0, combi_1.seq)(pack, _1.SQLIntoTable);
         const perm = (0, combi_1.per)(_1.SQLFrom, where, sql_up_to_1.SQLUpTo, sql_order_by_1.SQLOrderBy, sql_having_1.SQLHaving, _1.SQLClient, bypass, _1.SQLGroupBy, _1.SQLForAllEntries, (0, combi_1.alt)(tab, sql_into_structure_1.SQLIntoStructure, packTab));
-        const strict = (0, combi_1.seq)(_1.SQLFrom, "FIELDS", sql_field_list_1.SQLFieldList, where, sql_into_structure_1.SQLIntoStructure, sql_up_to_1.SQLUpTo);
+        const strict = (0, combi_1.seq)(_1.SQLFrom, (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields), where, sql_into_structure_1.SQLIntoStructure, sql_up_to_1.SQLUpTo);
         const ret = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), sql_field_list_loop_1.SQLFieldListLoop, perm), strict), (0, combi_1.optPrio)(sql_hints_1.SQLHints));
         return ret;
     }

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLFields = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+class SQLFields extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("FIELDS", _1.SQLFieldList);
+    }
+}
+exports.SQLFields = SQLFields;
+//# sourceMappingURL=sql_fields.js.map

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -428,6 +428,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                 return found;
             }
         }
+        found = this.downportSelectFields(low, high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.outlineSwitch(low, high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -597,6 +601,27 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         }
         return undefined;
     }
+    downportSelectFields(low, high, lowFile, _highSyntax) {
+        var _a;
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        else if (!(high.get() instanceof Statements.Select)) {
+            return undefined;
+        }
+        const fields = high.findFirstExpression(Expressions.SQLFields);
+        if (fields === undefined) {
+            return undefined;
+        }
+        const code = (_a = fields.getLastChild()) === null || _a === void 0 ? void 0 : _a.concatTokens();
+        if (code === undefined) {
+            return undefined;
+        }
+        const fix1 = edit_helper_1.EditHelper.deleteRange(lowFile, fields.getFirstToken().getStart(), fields.getLastToken().getEnd());
+        const fix2 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getEnd(), " " + code);
+        const fix = edit_helper_1.EditHelper.merge(fix1, fix2);
+        return issue_1.Issue.atToken(lowFile, fields.getFirstToken(), "Replace FIELDS", this.getMetadata().key, this.conf.severity, fix);
+    }
     downportSelectSingleInline(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.98.2",
+    "version": "2.98.3",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -47,10 +47,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.34.4",
+        "@microsoft/api-extractor": "^7.34.5",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.16.1",
+        "@types/node": "^18.16.2",
         "chai": "^4.3.7",
         "eslint": "^8.39.0",
         "mocha": "^10.2.0",