@abaplint/cli 2.102.48 → 2.102.50

package/build/cli.js

@@ -5236,6 +5236,7 @@ __exportStar(__webpack_require__(/*! ./sql_group_by */ "./node_modules/@abaplint
 __exportStar(__webpack_require__(/*! ./sql_having */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_having.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_hints */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_hints.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_in */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_in.js"), exports);
+__exportStar(__webpack_require__(/*! ./sql_into_list */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_into_list.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_into_structure */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_into_structure.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_into_table */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_into_table.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_join */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_join.js"), exports);
@@ -6721,13 +6722,13 @@ const sql_field_name_1 = __webpack_require__(/*! ./sql_field_name */ "./node_mod
 const sql_up_to_1 = __webpack_require__(/*! ./sql_up_to */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_up_to.js");
 class Select extends combi_1.Expression {
     getRunnable() {
-        const into = (0, combi_1.altPrio)(_1.SQLIntoTable, sql_into_structure_1.SQLIntoStructure);
+        const into = (0, combi_1.altPrio)(_1.SQLIntoTable, sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
         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, _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 permSingle = (0, combi_1.per)(_1.SQLFrom, (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList), 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));
         const fieldList = (0, combi_1.optPrio)((0, combi_1.altPrio)(_1.SQLFieldList, paren));
         const single = (0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE"), fieldList, permSingle);
@@ -6767,8 +6768,9 @@ class SelectLoop extends combi_1.Expression {
         const pack = (0, combi_1.seq)("PACKAGE SIZE", _1.SQLSource);
         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, (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields), where, sql_into_structure_1.SQLIntoStructure, sql_up_to_1.SQLUpTo);
+        const into = (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
+        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, into, packTab));
+        const strict = (0, combi_1.seq)(_1.SQLFrom, (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields), where, into, 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;
     }
@@ -7750,6 +7752,30 @@ exports.SQLIn = SQLIn;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_into_list.js":
+/*!**********************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_into_list.js ***!
+  \**********************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SQLIntoList = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const paren_left_1 = __webpack_require__(/*! ../../1_lexer/tokens/paren_left */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/paren_left.js");
+class SQLIntoList extends combi_1.Expression {
+    getRunnable() {
+        const intoList = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(paren_left_1.WParenLeft), (0, combi_1.tok)(paren_left_1.WParenLeftW)), (0, combi_1.starPrio)((0, combi_1.seq)(_1.SQLTarget, ",")), _1.SQLTarget, ")");
+        return (0, combi_1.seq)("INTO", intoList);
+    }
+}
+exports.SQLIntoList = SQLIntoList;
+//# sourceMappingURL=sql_into_list.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_into_structure.js":
 /*!***************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_into_structure.js ***!
@@ -7762,12 +7788,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SQLIntoStructure = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
-const paren_left_1 = __webpack_require__(/*! ../../1_lexer/tokens/paren_left */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/paren_left.js");
 class SQLIntoStructure extends combi_1.Expression {
     getRunnable() {
-        const intoList = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(paren_left_1.WParenLeft), (0, combi_1.tok)(paren_left_1.WParenLeftW)), (0, combi_1.starPrio)((0, combi_1.seq)(_1.SQLTarget, ",")), _1.SQLTarget, ")");
         const intoSimple = (0, combi_1.seq)((0, combi_1.optPrio)("CORRESPONDING FIELDS OF"), _1.SQLTarget);
-        return (0, combi_1.seq)("INTO", (0, combi_1.altPrio)(intoList, intoSimple));
+        return (0, combi_1.seq)("INTO", intoSimple);
     }
 }
 exports.SQLIntoStructure = SQLIntoStructure;
@@ -12015,7 +12039,7 @@ const sql_into_structure_1 = __webpack_require__(/*! ../expressions/sql_into_str
 class FetchNextCursor {
     getMatcher() {
         const size = (0, combi_1.seq)("PACKAGE SIZE", expressions_1.SQLSourceSimple);
-        const ret = (0, combi_1.seq)("FETCH NEXT CURSOR", expressions_1.SQLSourceSimple, (0, combi_1.alt)(sql_into_structure_1.SQLIntoStructure, expressions_1.SQLIntoTable), (0, combi_1.optPrio)(size));
+        const ret = (0, combi_1.seq)("FETCH NEXT CURSOR", expressions_1.SQLSourceSimple, (0, combi_1.alt)(sql_into_structure_1.SQLIntoStructure, expressions_1.SQLIntoTable, expressions_1.SQLIntoList), (0, combi_1.optPrio)(size));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -25563,6 +25587,7 @@ const sql_for_all_entries_1 = __webpack_require__(/*! ./sql_for_all_entries */ "
 const _scope_type_1 = __webpack_require__(/*! ../_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
 const sql_source_1 = __webpack_require__(/*! ./sql_source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/sql_source.js");
 const sql_compare_1 = __webpack_require__(/*! ./sql_compare */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/sql_compare.js");
+const isSimple = /^\w+$/;
 class Select {
     runSyntax(node, scope, filename, skipImplicitInto = false) {
         var _a, _b;
@@ -25575,10 +25600,7 @@ class Select {
             throw new Error(`fields missing`);
         }
         this.checkFields(fields, dbSources, scope);
-        for (const inline of node.findAllExpressions(Expressions.InlineData)) {
-            // todo, for now these are voided
-            new inline_data_1.InlineData().runSyntax(inline, scope, filename, this.buildType(fields));
-        }
+        this.handleInto(node, scope, filename, fields, dbSources);
         const fae = node.findDirectExpression(Expressions.SQLForAllEntries);
         if (fae) {
             scope.push(_scope_type_1.ScopeType.OpenSQL, "SELECT", token.getStart(), filename);
@@ -25590,6 +25612,7 @@ class Select {
         // check implicit into, the target field is implict equal to the table name
         if (skipImplicitInto === false
             && node.findDirectExpression(Expressions.SQLIntoTable) === undefined
+            && node.findDirectExpression(Expressions.SQLIntoList) === undefined
             && node.findDirectExpression(Expressions.SQLIntoStructure) === undefined) {
             const fields = (_a = node.findFirstExpression(Expressions.SQLAggregation)) === null || _a === void 0 ? void 0 : _a.concatTokens();
             const c = new RegExp(/^count\(\s*\*\s*\)$/, "i");
@@ -25621,6 +25644,54 @@ class Select {
             scope.pop(node.getLastToken().getEnd());
         }
     }
+    handleInto(node, scope, filename, fields, dbSources) {
+        const intoTable = node.findDirectExpression(Expressions.SQLIntoTable);
+        if (intoTable) {
+            const inline = intoTable.findFirstExpression(Expressions.InlineData);
+            if (inline) {
+                new inline_data_1.InlineData().runSyntax(inline, scope, filename, this.buildTableType(fields, dbSources, scope));
+            }
+        }
+        const intoStructure = node.findDirectExpression(Expressions.SQLIntoStructure);
+        if (intoStructure) {
+            for (const inline of intoStructure.findAllExpressions(Expressions.InlineData)) {
+                // todo, for now these are voided
+                new inline_data_1.InlineData().runSyntax(inline, scope, filename, new basic_1.VoidType("SELECT_todo"));
+            }
+        }
+        const intoList = node.findDirectExpression(Expressions.SQLIntoList);
+        if (intoList) {
+            const isDynamic = fields.length === 1 && fields[0].expression.findDirectExpression(Expressions.Dynamic) !== undefined;
+            const targets = intoList.findDirectExpressions(Expressions.SQLTarget);
+            if (targets.length !== fields.length && isDynamic !== true) {
+                throw new Error(`number of fields selected vs list does not match`);
+            }
+            for (let i = 0; i < targets.length; i++) {
+                const target = targets[i];
+                const field = fields[i];
+                const inline = target.findFirstExpression(Expressions.InlineData);
+                if (inline) {
+                    if (isDynamic) {
+                        throw new Error(`dynamic field list, inlining not possible`);
+                    }
+                    if (isSimple.test(field.code) && dbSources.length === 1 && dbSources[0] !== undefined) {
+                        const dbType = dbSources[0].parseType(scope.getRegistry());
+                        let type = new basic_1.VoidType("SELECT_todo");
+                        if (dbType instanceof basic_1.StructureType) {
+                            type = dbType.getComponentByName(field.code);
+                            if (type === undefined) {
+                                throw new Error(`handleInto, internal error, should be checked earlier`);
+                            }
+                        }
+                        new inline_data_1.InlineData().runSyntax(inline, scope, filename, type);
+                    }
+                    else {
+                        new inline_data_1.InlineData().runSyntax(inline, scope, filename, new basic_1.VoidType("SELECT_todo"));
+                    }
+                }
+            }
+        }
+    }
     checkFields(fields, dbSources, scope) {
         if (dbSources.length > 1) {
             return;
@@ -25637,7 +25708,6 @@ class Select {
         if (!(type instanceof basic_1.StructureType)) {
             throw new Error("checkFields, expected structure, " + type.constructor.name);
         }
-        const isSimple = /^\w+$/;
         for (const field of fields) {
             if (field.code === "*") {
                 continue;
@@ -25647,21 +25717,44 @@ class Select {
             }
         }
     }
-    buildType(_fields) {
+    buildTableType(fields, dbSources, scope) {
+        if (dbSources.length !== 1) {
+            return new basic_1.VoidType("SELECT_todo");
+        }
+        if (dbSources[0] === undefined) {
+            // then its a voided table
+            return new basic_1.VoidType("SELECT_todo");
+        }
+        const dbType = dbSources[0].parseType(scope.getRegistry());
+        if (!(dbType instanceof basic_1.StructureType)) {
+            return new basic_1.VoidType("SELECT_todo");
+        }
+        if (fields.length === 1 && fields[0].code === "*") {
+            return new basic_1.TableType(dbType, { withHeader: false, keyType: basic_1.TableKeyType.default }, undefined);
+        }
+        const allFieldsSimple = fields.every(f => isSimple.test(f.code));
+        if (allFieldsSimple === true) {
+            const components = [];
+            for (const field of fields) {
+                const type = dbType.getComponentByName(field.code);
+                if (type === undefined) {
+                    return new basic_1.VoidType("SELECT_todo");
+                }
+                components.push({ name: field.code, type });
+            }
+            return new basic_1.TableType(new basic_1.StructureType(components), { withHeader: false, keyType: basic_1.TableKeyType.default }, undefined);
+        }
         return new basic_1.VoidType("SELECT_todo");
     }
     findFields(node) {
         var _a;
         let expr = undefined;
         const ret = [];
-        expr = node.findDirectExpression(Expressions.SQLFieldList);
+        expr = node.findFirstExpression(Expressions.SQLFieldList);
         if (expr === undefined) {
-            expr = node.findDirectExpression(Expressions.SQLFields);
+            expr = node.findDirectExpression(Expressions.SQLFieldListLoop);
         }
-        if (expr === undefined) {
-            node.findDirectExpression(Expressions.SQLFieldName);
-        }
-        for (const field of (expr === null || expr === void 0 ? void 0 : expr.findAllExpressions(Expressions.SQLField)) || []) {
+        for (const field of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressionsMulti([Expressions.SQLField, Expressions.SQLFieldName])) || []) {
             let code = field.concatTokens().toUpperCase();
             const as = ((_a = field.findDirectExpression(Expressions.SQLAsName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
             if (as !== "") {
@@ -33638,6 +33731,20 @@ class ExpressionNode extends _abstract_node_1.AbstractNode {
         }
         return ret;
     }
+    findDirectExpressionsMulti(type) {
+        const ret = [];
+        for (const child of this.getChildren()) {
+            if (child instanceof ExpressionNode) {
+                for (const t of type) {
+                    if (child.get() instanceof t) {
+                        ret.push(child);
+                        break;
+                    }
+                }
+            }
+        }
+        return ret;
+    }
     findDirectTokenByText(text) {
         for (const child of this.getChildren()) {
             if (child instanceof token_node_1.TokenNode && child.get().getStr().toUpperCase() === text.toUpperCase()) {
@@ -49038,7 +49145,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.48";
+        return "2.102.50";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -60811,7 +60918,7 @@ ENDIF.
     }
     ////////////////////
     analyzeInto(file, m) {
-        const into = m.findFirstExpression(Expressions.SQLIntoStructure);
+        const into = m.findFirstExpression(Expressions.SQLIntoList);
         if (into === undefined) {
             return [];
         }
@@ -63061,6 +63168,7 @@ ENDIF.`,
             if (this.conf.selectWithoutInto
                 && (sta instanceof Statements.Select || sta instanceof Statements.SelectLoop)
                 && staNode.findFirstExpression(Expressions.SQLIntoStructure) === undefined
+                && staNode.findFirstExpression(Expressions.SQLIntoList) === undefined
                 && staNode.findFirstExpression(Expressions.SQLIntoTable) === undefined) {
                 const concat = (_a = staNode.findFirstExpression(Expressions.SQLFieldList)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
                 if (concat !== "COUNT(*)" && concat !== "COUNT( * )") {
@@ -66984,6 +67092,7 @@ Activates from v750 and up`,
                 const where = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLCond);
                 const order = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLOrderBy);
                 const into = (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoStructure))
+                    || (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoList))
                     || (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoTable));
                 if (into === undefined || where === undefined) {
                     continue;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.102.48",
+    "version": "2.102.50",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,14 +38,14 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.102.48",
+        "@abaplint/core": "^2.102.50",
         "@types/chai": "^4.3.6",
         "@types/glob": "^7.2.0",
-        "@types/minimist": "^1.2.2",
-        "@types/mocha": "^10.0.1",
-        "@types/node": "^20.7.0",
+        "@types/minimist": "^1.2.3",
+        "@types/mocha": "^10.0.2",
+        "@types/node": "^20.7.1",
         "@types/progress": "^2.0.5",
-        "chai": "^4.3.8",
+        "chai": "^4.3.9",
         "chalk": "^5.3.0",
         "eslint": "^8.50.0",
         "glob": "^7.2.3",