@abaplint/transpiler-cli 2.5.19 → 2.5.21

package/build/bundle.js

@@ -12720,7 +12720,7 @@ class MethodDef {
         const link = (0, combi_1.seq)("LINK", expressions_1.MethodParamName);
         const full = (0, combi_1.seq)("FULL", expressions_1.MethodParamName);
         const modify = (0, combi_1.alt)((0, combi_1.seq)("FOR ACTION", expressions_1.TypeName, result), (0, combi_1.seq)("FOR CREATE", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation)), (0, combi_1.seq)("FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("FOR UPDATE", expressions_1.TypeName));
-        const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, "FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName));
+        const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, "FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName));
         // todo, this is only from version something
         const amdp = (0, combi_1.seq)("AMDP OPTIONS CDS SESSION CLIENT CURRENT", (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising));
         const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", (0, combi_1.alt)(tableFunction, ddl, behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
@@ -46138,7 +46138,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.31";
+        return "2.95.32";
     }
     getDDICReferences() {
         return this.references;
@@ -73216,36 +73216,46 @@ const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./n
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 class LoopTranspiler {
+    constructor(options) {
+        this.unique = "";
+        this.injectFrom = undefined;
+        this.skipInto = undefined;
+        this.injectFrom = options === null || options === void 0 ? void 0 : options.injectFrom;
+        this.skipInto = options === null || options === void 0 ? void 0 : options.skipInto;
+    }
+    getTarget() {
+        return this.unique;
+    }
     transpile(node, traversal) {
         var _a, _b, _c;
         if (!(node.get() instanceof abaplint.Statements.Loop)) {
             throw new Error("LoopTranspiler, unexpected node");
         }
         const source = traversal.traverse(node.findDirectExpression(abaplint.Expressions.SimpleSource2)).getCode();
-        const unique1 = unique_identifier_1.UniqueIdentifier.get();
+        this.unique = unique_identifier_1.UniqueIdentifier.get();
         let target = "";
         const into = (_a = node.findDirectExpression(abaplint.Expressions.LoopTarget)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(abaplint.Expressions.Target);
-        if (into) {
+        if (into && this.skipInto !== true) {
             const concat = node.concatTokens().toUpperCase();
             const t = traversal.traverse(into).getCode();
             const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
             const typ = traversal.determineType(node, scope);
             if (concat.includes(" REFERENCE INTO ")) {
                 // target is assumed to be a data reference
-                target = t + ".assign(" + unique1 + ");";
+                target = t + ".assign(" + this.unique + ");";
             }
             else if (typ instanceof abaplint.BasicTypes.DataReference) {
                 // row type and target is assumed to be data references
-                target = t + ".assign(" + unique1 + ".getPointer());";
+                target = t + ".assign(" + this.unique + ".getPointer());";
             }
             else {
-                target = t + ".set(" + unique1 + ");";
+                target = t + ".set(" + this.unique + ");";
             }
         }
-        else {
+        else if (this.skipInto !== true) {
             const assigning = (_b = node.findFirstExpression(abaplint.Expressions.FSTarget)) === null || _b === void 0 ? void 0 : _b.findFirstExpression(abaplint.Expressions.FieldSymbol);
             if (assigning) {
-                target = traversal.traverse(assigning).getCode() + ".assign(" + unique1 + ");";
+                target = traversal.traverse(assigning).getCode() + ".assign(" + this.unique + ");";
             }
         }
         const extra = [];
@@ -73254,6 +73264,9 @@ class LoopTranspiler {
             const from = new expressions_1.SourceTranspiler().transpile(fromNode, traversal).getCode();
             extra.push("from: " + from);
         }
+        else if (this.injectFrom) {
+            extra.push("from: " + this.injectFrom);
+        }
         const toNode = node.findExpressionAfterToken("TO");
         if (toNode) {
             const to = new expressions_1.SourceTranspiler().transpile(toNode, traversal).getCode();
@@ -73306,7 +73319,7 @@ class LoopTranspiler {
         if (extra.length > 0) {
             concat = ",{" + extra.join(",") + "}";
         }
-        return new chunk_1.Chunk(`for await (const ${unique1} of abap.statements.loop(${source}${concat})) {\n${target}`);
+        return new chunk_1.Chunk(`for await (const ${this.unique} of abap.statements.loop(${source}${concat})) {\n${target}`);
     }
 }
 exports.LoopTranspiler = LoopTranspiler;
@@ -75530,6 +75543,64 @@ exports.WriteTranspiler = WriteTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/structures/at.js":
+/*!**********************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/structures/at.js ***!
+  \**********************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AtTranspiler = void 0;
+const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const statements_1 = __webpack_require__(/*! ../statements */ "./node_modules/@abaplint/transpiler/build/src/statements/index.js");
+const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
+class AtTranspiler {
+    transpile(node, traversal, previous, loopTarget, tabix, loopStatement) {
+        var _a, _b;
+        const ret = new chunk_1.Chunk();
+        const atStatement = node.findDirectStatement(abaplint.Statements.At);
+        const concat = atStatement === null || atStatement === void 0 ? void 0 : atStatement.concatTokens().toUpperCase();
+        const name = (_b = (_a = atStatement === null || atStatement === void 0 ? void 0 : atStatement.findDirectExpression(abaplint.Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens()) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+        let suffix = `.get().${name}`;
+        if (name === "table_line") {
+            suffix = "";
+        }
+        if (concat === null || concat === void 0 ? void 0 : concat.startsWith("AT NEW ")) {
+            // eslint-disable-next-line max-len
+            ret.appendString(`if (${previous} === undefined || abap.compare.eq(${previous}${suffix}, ${loopTarget}${suffix}) === false) {\n`);
+            const body = node.findDirectStructure(abaplint.Structures.Body);
+            if (body) {
+                ret.appendChunk(traversal.traverse(body));
+            }
+            ret.appendString("}\n");
+        }
+        else if (concat === null || concat === void 0 ? void 0 : concat.startsWith("AT END OF ")) {
+            const next = unique_identifier_1.UniqueIdentifier.get();
+            ret.appendString(`let ${next} = undefined;\n`);
+            const loop = new statements_1.LoopTranspiler({ injectFrom: tabix, skipInto: true });
+            ret.appendChunk(loop.transpile(loopStatement, traversal));
+            ret.appendString(`${next} = ${loop.getTarget()};\n`);
+            ret.appendString(`break;\n`);
+            ret.appendString(`}\n`);
+            // eslint-disable-next-line max-len
+            ret.appendString(`if (${next} === undefined || abap.compare.eq(${next}${suffix}, ${loopTarget}${suffix}) === false) {\n`);
+            const body = node.findDirectStructure(abaplint.Structures.Body);
+            if (body) {
+                ret.appendChunk(traversal.traverse(body));
+            }
+            ret.appendString("}\n");
+        }
+        return ret;
+    }
+}
+exports.AtTranspiler = AtTranspiler;
+//# sourceMappingURL=at.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/structures/at_first.js":
 /*!****************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/structures/at_first.js ***!
@@ -76201,12 +76272,26 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 const at_first_1 = __webpack_require__(/*! ./at_first */ "./node_modules/@abaplint/transpiler/build/src/structures/at_first.js");
 const at_last_1 = __webpack_require__(/*! ./at_last */ "./node_modules/@abaplint/transpiler/build/src/structures/at_last.js");
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
+const statements_1 = __webpack_require__(/*! ../statements */ "./node_modules/@abaplint/transpiler/build/src/statements/index.js");
+const at_1 = __webpack_require__(/*! ./at */ "./node_modules/@abaplint/transpiler/build/src/structures/at.js");
 class LoopTranspiler {
     transpile(node, traversal) {
+        var _a;
         const ret = new chunk_1.Chunk();
         let pre = "";
         let atFirst = undefined;
         let atLast = undefined;
+        let loopStatement = undefined;
+        let previous = "";
+        let tabix = "";
+        let loopTarget = "";
+        let hasAt = false;
+        for (const n of ((_a = node.findDirectStructure(abaplint.Structures.Body)) === null || _a === void 0 ? void 0 : _a.findDirectStructures(abaplint.Structures.Normal)) || []) {
+            if (n.findDirectStructure(abaplint.Structures.At) !== undefined) {
+                hasAt = true;
+                break;
+            }
+        }
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.StructureNode && c.get() instanceof abaplint.Structures.Body) {
                 for (const b of c.getChildren()) {
@@ -76223,12 +76308,37 @@ class LoopTranspiler {
                         else if (n instanceof abaplint.Nodes.StructureNode && n.get() instanceof abaplint.Structures.AtLast) {
                             atLast = new at_last_1.AtLastTranspiler().transpile(n, traversal);
                         }
+                        else if (n instanceof abaplint.Nodes.StructureNode && n.get() instanceof abaplint.Structures.At) {
+                            ret.appendChunk(new at_1.AtTranspiler().transpile(n, traversal, previous, loopTarget, tabix, loopStatement));
+                        }
                         else {
                             ret.appendChunk(traversal.traverse(n));
                         }
                     }
                 }
             }
+            else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.Loop) {
+                if (hasAt === true) {
+                    previous = unique_identifier_1.UniqueIdentifier.get();
+                    tabix = unique_identifier_1.UniqueIdentifier.get();
+                    ret.appendString(`let ${previous} = undefined;\n`);
+                    ret.appendString(`let ${tabix} = undefined;\n`);
+                }
+                const loop = new statements_1.LoopTranspiler();
+                ret.appendChunk(loop.transpile(c, traversal));
+                ret.appendString("\n");
+                if (hasAt === true) {
+                    ret.appendString(tabix + " = new abap.types.Integer().set(abap.builtin.sy.get().tabix.get() + 1);\n");
+                }
+                loopTarget = loop.getTarget();
+                loopStatement = c;
+            }
+            else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndLoop) {
+                if (hasAt === true) {
+                    ret.appendString(`${previous} = ${loopTarget};\n`);
+                }
+                ret.appendChunk(traversal.traverse(c));
+            }
             else {
                 ret.appendChunk(traversal.traverse(c));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.19",
+  "version": "2.5.21",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,11 +25,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.19",
+    "@abaplint/transpiler": "^2.5.21",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.31",
+    "@abaplint/core": "^2.95.32",
     "progress": "^2.0.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",