@abaplint/transpiler-cli 2.14.16 → 2.14.17

package/build/bundle.js

@@ -118628,6 +118628,118 @@ exports.FilterBodyTranspiler = FilterBodyTranspiler;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/for_groups.js"
+/*!*******************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/for_groups.js ***!
+  \*******************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ForGroupsTranspiler = void 0;
+const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const statements_1 = __webpack_require__(/*! ../statements */ "./node_modules/@abaplint/transpiler/build/src/statements/index.js");
+const source_field_symbol_1 = __webpack_require__(/*! ./source_field_symbol */ "./node_modules/@abaplint/transpiler/build/src/expressions/source_field_symbol.js");
+const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
+/** FOR GROUPS group OF member IN itab GROUP BY key [ASCENDING|DESCENDING] [WITHOUT MEMBERS] */
+class ForGroupsTranspiler {
+    transpile(forExpression, traversal) {
+        const targets = forExpression.getChildren().filter(c => c instanceof core_1.Nodes.ExpressionNode
+            && (c.get() instanceof core_1.Expressions.TargetField || c.get() instanceof core_1.Expressions.TargetFieldSymbol));
+        const source = forExpression.findDirectExpression(core_1.Expressions.Source);
+        if (targets.length !== 2 || source === undefined) {
+            throw new Error("FOR GROUPS, unexpected structure, " + forExpression.concatTokens());
+        }
+        if (forExpression.findDirectExpression(core_1.Expressions.LoopGroupByComponent)) {
+            throw new Error("FOR GROUPS, GROUP BY with components, todo, " + forExpression.concatTokens());
+        }
+        const groupBy = forExpression.findDirectExpression(core_1.Expressions.FieldChain);
+        if (groupBy === undefined) {
+            throw new Error("FOR GROUPS, GROUP BY expected, " + forExpression.concatTokens());
+        }
+        if (forExpression.findDirectTokenByText("TEXT")) {
+            throw new Error("FOR GROUPS, AS TEXT, todo, " + forExpression.concatTokens());
+        }
+        const declarations = [];
+        const [groupNode, memberNode] = targets;
+        const row = unique_identifier_1.UniqueIdentifier.get();
+        const loopEntry = unique_identifier_1.UniqueIdentifier.get();
+        let memberInGenerator;
+        let memberInBody;
+        if (memberNode.get() instanceof core_1.Expressions.TargetFieldSymbol) {
+            declarations.push(this.declareFieldSymbol(memberNode, traversal));
+            const name = new source_field_symbol_1.SourceFieldSymbolTranspiler().transpile(memberNode, traversal).getCode();
+            memberInGenerator = `${name}.assign(${row});`;
+            memberInBody = `${name}.assign(${loopEntry}.members[0]);`;
+        }
+        else {
+            const name = traversal.traverse(memberNode).getCode();
+            memberInGenerator = `const ${name} = ${row}.clone();`;
+            memberInBody = `const ${name} = ${loopEntry}.members[0].clone();`;
+        }
+        let groupInBody;
+        if (groupNode.get() instanceof core_1.Expressions.TargetFieldSymbol) {
+            declarations.push(this.declareFieldSymbol(groupNode, traversal));
+            const name = new source_field_symbol_1.SourceFieldSymbolTranspiler().transpile(groupNode, traversal).getCode();
+            groupInBody = `${name}.assign(${loopEntry}.key);`;
+        }
+        else {
+            groupInBody = `const ${traversal.traverse(groupNode).getCode()} = ${loopEntry}.key.clone();`;
+        }
+        const groups = unique_identifier_1.UniqueIdentifier.get();
+        const key = unique_identifier_1.UniqueIdentifier.get();
+        const rawKey = unique_identifier_1.UniqueIdentifier.get();
+        const entry = unique_identifier_1.UniqueIdentifier.get();
+        let ordered = `${groups}.values()`;
+        if (forExpression.findDirectTokenByText("ASCENDING")) {
+            ordered = `[...${groups}.values()].sort((a, b) => abap.compare.lt(a.key, b.key) ? -1 : abap.compare.gt(a.key, b.key) ? 1 : 0)`;
+        }
+        else if (forExpression.findDirectTokenByText("DESCENDING")) {
+            ordered = `[...${groups}.values()].sort((a, b) => abap.compare.gt(a.key, b.key) ? -1 : abap.compare.lt(a.key, b.key) ? 1 : 0)`;
+        }
+        // groups are kept in order of first occurrence
+        const generator = `(async function*() {\n`
+            + `const ${groups} = new Map();\n`
+            + `for await (const ${row} of abap.statements.loop(${traversal.traverse(source).getCode()})) {\n`
+            + `${memberInGenerator}\n`
+            + `const ${key} = ${traversal.traverse(groupBy).getCode()};\n`
+            + `const ${rawKey} = ${key}.get();\n`
+            + `let ${entry} = ${groups}.get(${rawKey});\n`
+            + `if (${entry} === undefined) {\n`
+            + `${entry} = {key: ${key}.clone(), members: []};\n`
+            + `${groups}.set(${rawKey}, ${entry});\n`
+            + `}\n`
+            + `${entry}.members.push(${row});\n`
+            + `}\n`
+            + `for (const value of ${ordered}) {\n`
+            + `yield value;\n`
+            + `}\n`
+            + `})()`;
+        return {
+            declarations,
+            open: `for await (const ${loopEntry} of ${generator}) {`,
+            preBody: [groupInBody, memberInBody],
+            close: "}",
+        };
+    }
+    /** abaplint does not always add the FOR GROUPS targets to the scope, or types them void,
+     *  then the field symbol is declared untyped, it is only ever assigned to rows of the source */
+    declareFieldSymbol(node, traversal) {
+        const token = node.getFirstToken();
+        const found = traversal.findCurrentScopeByToken(token)?.findVariable(token.getStr());
+        if (found !== undefined && !(found.getType() instanceof core_1.BasicTypes.VoidType)) {
+            return new statements_1.FieldSymbolTranspiler().transpile(node, traversal).getCode();
+        }
+        const name = new source_field_symbol_1.SourceFieldSymbolTranspiler().transpile(node, traversal).getCode();
+        return `let ${name} = new abap.types.FieldSymbol();`;
+    }
+}
+exports.ForGroupsTranspiler = ForGroupsTranspiler;
+//# sourceMappingURL=for_groups.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/function_exporting.js"
 /*!***************************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/function_exporting.js ***!
@@ -119835,6 +119947,7 @@ const let_1 = __webpack_require__(/*! ./let */ "./node_modules/@abaplint/transpi
 const statements_1 = __webpack_require__(/*! ../statements */ "./node_modules/@abaplint/transpiler/build/src/statements/index.js");
 const source_field_symbol_1 = __webpack_require__(/*! ./source_field_symbol */ "./node_modules/@abaplint/transpiler/build/src/expressions/source_field_symbol.js");
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
+const for_groups_1 = __webpack_require__(/*! ./for_groups */ "./node_modules/@abaplint/transpiler/build/src/expressions/for_groups.js");
 class ReduceBodyTranspiler {
     transpile(typ, body, traversal) {
         if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
@@ -119875,7 +119988,7 @@ class ReduceBodyTranspiler {
     }
     describeFor(forExpression, body, traversal, declarations) {
         if (forExpression.findDirectTokenByText("GROUPS")) {
-            return this.describeGroupsFor(forExpression, body, traversal);
+            return this.describeGroupsFor(forExpression, traversal, declarations);
         }
         const loopExpression = forExpression.findDirectExpression(core_1.Expressions.InlineLoopDefinition);
         if (loopExpression === undefined) {
@@ -119942,47 +120055,20 @@ class ReduceBodyTranspiler {
             close: "}",
         };
     }
-    describeGroupsFor(forExpression, body, traversal) {
-        const targets = forExpression.findDirectExpressions(core_1.Expressions.TargetField);
-        const source = forExpression.findDirectExpression(core_1.Expressions.Source);
-        const groupBy = forExpression.findDirectExpression(core_1.Expressions.FieldChain);
-        if (targets.length !== 2 || source === undefined || groupBy === undefined) {
-            throw new Error("ReduceBodyTranspiler invalid GROUPS FOR, " + body.concatTokens());
+    describeGroupsFor(forExpression, traversal, declarations) {
+        const groups = new for_groups_1.ForGroupsTranspiler().transpile(forExpression, traversal);
+        declarations.push(...groups.declarations);
+        const preBody = [...groups.preBody];
+        const letNode = forExpression.findDirectExpression(core_1.Expressions.Let);
+        if (letNode) {
+            preBody.push(new let_1.LetTranspiler().transpile(letNode, traversal).getCode());
         }
-        const groupTarget = traversal.traverse(targets[0]).getCode();
-        const memberTarget = traversal.traverse(targets[1]).getCode();
-        const sourceCode = traversal.traverse(source).getCode();
-        const groupByCode = traversal.traverse(groupBy).getCode();
-        const groups = unique_identifier_1.UniqueIdentifier.get();
-        const row = unique_identifier_1.UniqueIdentifier.get();
-        const key = unique_identifier_1.UniqueIdentifier.get();
-        const rawKey = unique_identifier_1.UniqueIdentifier.get();
-        const entry = unique_identifier_1.UniqueIdentifier.get();
-        const generator = `(async function*() {\n`
-            + `const ${groups} = new Map();\n`
-            + `for await (const ${row} of abap.statements.loop(${sourceCode})) {\n`
-            + `const ${memberTarget} = ${row}.clone();\n`
-            + `const ${key} = ${groupByCode};\n`
-            + `const ${rawKey} = ${key}.get();\n`
-            + `let ${entry} = ${groups}.get(${rawKey});\n`
-            + `if (${entry} === undefined) {\n`
-            + `${entry} = {key: ${key}.clone(), members: []};\n`
-            + `${groups}.set(${rawKey}, ${entry});\n`
-            + `}\n`
-            + `${entry}.members.push(${row});\n`
-            + `}\n`
-            + `for (const value of ${groups}.values()) { yield value; }\n`
-            + `})()`;
-        const loopEntry = unique_identifier_1.UniqueIdentifier.get();
         return {
             beforeLoop: [],
-            open: `for await (const ${loopEntry} of ${generator}) {`,
-            preBody: [
-                `const ${groupTarget} = ${loopEntry}.key.clone();`,
-                `const ${memberTarget} = ${loopEntry}.members[0].clone();`,
-            ],
+            open: groups.open,
+            preBody,
             postBody: [],
-            close: "}",
+            close: groups.close,
         };
     }
     describeIndexFor(forExpression, body, traversal) {
@@ -122485,6 +122571,7 @@ const field_assignment_1 = __webpack_require__(/*! ./field_assignment */ "./node
 const statements_1 = __webpack_require__(/*! ../statements */ "./node_modules/@abaplint/transpiler/build/src/statements/index.js");
 const source_field_symbol_1 = __webpack_require__(/*! ./source_field_symbol */ "./node_modules/@abaplint/transpiler/build/src/expressions/source_field_symbol.js");
 const let_1 = __webpack_require__(/*! ./let */ "./node_modules/@abaplint/transpiler/build/src/expressions/let.js");
+const for_groups_1 = __webpack_require__(/*! ./for_groups */ "./node_modules/@abaplint/transpiler/build/src/expressions/for_groups.js");
 class ValueBodyTranspiler {
     transpile(typ, body, traversal) {
         if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
@@ -122590,7 +122677,23 @@ class ValueBodyTranspiler {
         let uniqueCounter = 1;
         for (const child of forNodes) {
             const loop = child.findDirectExpression(core_1.Expressions.InlineLoopDefinition);
-            if (loop) {
+            if (child.findDirectTokenByText("GROUPS")) {
+                const groups = new for_groups_1.ForGroupsTranspiler().transpile(child, traversal);
+                preLoopDecls.push(...groups.declarations);
+                const preBody = [...groups.preBody];
+                const llet = child.findDirectExpression(core_1.Expressions.Let);
+                if (llet) {
+                    preBody.push(new let_1.LetTranspiler().transpile(llet, traversal).getCode());
+                }
+                descriptors.push({
+                    beforeLoop: [],
+                    open: groups.open,
+                    preBody,
+                    postBody: [],
+                    close: groups.close,
+                });
+            }
+            else if (loop) {
                 if (["THEN", "UNTIL", "WHILE", "FROM", "TO", "GROUPS"].some(token => child.findDirectTokenByText(token))) {
                     throw new Error("ValueBody FOR todo, " + body.concatTokens());
                 }
@@ -127446,6 +127549,27 @@ exports.DataTranspiler = DataTranspiler;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/statements/delete_cluster.js"
+/*!**********************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/statements/delete_cluster.js ***!
+  \**********************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DeleteClusterTranspiler = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class DeleteClusterTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("DELETE CLUSTER, not supported, transpiler");`);
+    }
+}
+exports.DeleteClusterTranspiler = DeleteClusterTranspiler;
+//# sourceMappingURL=delete_cluster.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/statements/delete_database.js"
 /*!***********************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/statements/delete_database.js ***!
@@ -129730,6 +129854,7 @@ __exportStar(__webpack_require__(/*! ./convert */ "./node_modules/@abaplint/tran
 __exportStar(__webpack_require__(/*! ./create_data */ "./node_modules/@abaplint/transpiler/build/src/statements/create_data.js"), exports);
 __exportStar(__webpack_require__(/*! ./create_object */ "./node_modules/@abaplint/transpiler/build/src/statements/create_object.js"), exports);
 __exportStar(__webpack_require__(/*! ./data */ "./node_modules/@abaplint/transpiler/build/src/statements/data.js"), exports);
+__exportStar(__webpack_require__(/*! ./delete_cluster */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_cluster.js"), exports);
 __exportStar(__webpack_require__(/*! ./delete_database */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_database.js"), exports);
 __exportStar(__webpack_require__(/*! ./delete_dataset */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_dataset.js"), exports);
 __exportStar(__webpack_require__(/*! ./delete_internal */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_internal.js"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.14.16",
+  "version": "2.14.17",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -28,7 +28,7 @@
   "license": "MIT",
   "devDependencies": {
     "@abaplint/core": "^2.120.92",
-    "@abaplint/transpiler": "^2.14.16",
+    "@abaplint/transpiler": "^2.14.17",
     "@types/glob": "^9.0.0",
     "@types/node": "^26.6.6",
     "@types/progress": "^2.0.7",