@abaplint/transpiler-cli 2.5.46 → 2.5.48

package/build/bundle.js

@@ -46211,7 +46211,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.44";
+        return "2.95.47";
     }
     getDDICReferences() {
         return this.references;
@@ -50994,14 +50994,16 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                 // actively editing the files
                 continue;
             }
+            if (highSyntax === undefined) {
+                highSyntax = new syntax_1.SyntaxLogic(this.highReg, highSyntaxObj).run();
+            }
+            let containsUnknown = false;
             for (let i = 0; i < lowStatements.length; i++) {
                 const low = lowStatements[i];
                 const high = highStatements[i];
                 if ((low.get() instanceof _statement_1.Unknown && !(high.get() instanceof _statement_1.Unknown))
                     || high.findFirstExpression(Expressions.InlineData)) {
-                    if (highSyntax === undefined) {
-                        highSyntax = new syntax_1.SyntaxLogic(this.highReg, highSyntaxObj).run();
-                    }
+                    containsUnknown = true;
                     try {
                         const issue = this.checkStatement(low, high, lowFile, highSyntax, highFile);
                         if (issue) {
@@ -51019,6 +51021,18 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                     }
                 }
             }
+            if (ret.length === 0 && containsUnknown) {
+                // this is a hack in order not to change too many unit tests
+                for (let i = 0; i < lowStatements.length; i++) {
+                    const high = highStatements[i];
+                    if (high.get() instanceof Statements.Data) {
+                        const issue = this.anonymousTableType(high, lowFile, highSyntax);
+                        if (issue) {
+                            ret.push(issue);
+                        }
+                    }
+                }
+            }
         }
         return ret;
     }
@@ -51049,7 +51063,12 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (low.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
             return undefined;
         }
-        let found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
+        // downport XSDBOOL() early, as it is valid 702 syntax
+        let found = this.replaceXsdBool(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
+        found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
         if (found) {
             return found;
         }
@@ -51191,10 +51210,6 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.replaceXsdBool(high, lowFile, highSyntax);
-        if (found) {
-            return found;
-        }
         found = this.replaceLineFunctions(high, lowFile, highSyntax, highFile);
         if (found) {
             return found;
@@ -51432,6 +51447,22 @@ ${indentation}`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
+    // the anonymous type minght be used in inferred type statements, define it so it can be referred
+    anonymousTableType(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Data)) {
+            return undefined;
+        }
+        const tt = high.findFirstExpression(Expressions.TypeTable);
+        if (tt === undefined) {
+            return undefined;
+        }
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const code = `TYPES ${uniqueName} ${tt.concatTokens()}.\n`;
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), code);
+        const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, tt.getFirstToken().getStart(), tt.getLastToken().getEnd(), "TYPE " + uniqueName);
+        const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Add type for table definition", this.getMetadata().key, this.conf.severity, fix);
+    }
     downportMessage(high, lowFile, highSyntax) {
         var _a, _b;
         if (!(high.get() instanceof Statements.Message)) {
@@ -52624,7 +52655,12 @@ ${indentation}    output = ${topTarget}.`;
                 const s = (_a = init.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
                 const t = (_b = init.findFirstExpression(Expressions.TypeName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 if (s) {
-                    body += indentation + `DATA(${name}) = ${s}.\n`;
+                    if (s.toUpperCase().startsWith("VALUE #")) {
+                        body += indentation + `DATA(${name}) = ${s.replace("#", type)}.\n`;
+                    }
+                    else {
+                        body += indentation + `DATA(${name}) = ${s}.\n`;
+                    }
                 }
                 else {
                     body += indentation + `DATA ${name} TYPE ${t}.\n`;
@@ -52679,6 +52715,7 @@ ${indentation}    output = ${topTarget}.`;
             if (firstToken.getStr().toUpperCase() !== "VALUE") {
                 continue;
             }
+            const valueBody = s.findDirectExpression(Expressions.ValueBody);
             let type = this.findType(s, lowFile, highSyntax);
             if (type === undefined) {
                 if (high.get() instanceof Statements.Move && high.findDirectExpression(Expressions.Source) === s) {
@@ -52691,7 +52728,6 @@ ${indentation}    output = ${topTarget}.`;
             else {
                 type = "TYPE " + type;
             }
-            const valueBody = s.findDirectExpression(Expressions.ValueBody);
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
             let indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             let body = "";
@@ -52704,6 +52740,11 @@ ${indentation}    output = ${topTarget}.`;
             let added = false;
             let data = "";
             let previous = undefined;
+            if ((valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpression(Expressions.ValueBodyLine)) !== undefined) {
+                structureName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
+                const extra = (valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpression(Expressions.For)) ? "  " : "";
+                data = indentation + extra + `DATA ${structureName} LIKE LINE OF ${uniqueName}.\n`;
+            }
             for (const a of (valueBody === null || valueBody === void 0 ? void 0 : valueBody.getChildren()) || []) {
                 if (a.get() instanceof Expressions.FieldAssignment) {
                     if (added === false) {
@@ -52730,10 +52771,6 @@ ${indentation}    output = ${topTarget}.`;
                 if (a instanceof nodes_1.ExpressionNode && a.get() instanceof Expressions.ValueBodyLine) {
                     let skip = false;
                     for (const b of (a === null || a === void 0 ? void 0 : a.getChildren()) || []) {
-                        if (b.concatTokens() === "(" && added === false) {
-                            structureName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
-                            data = indentation + `DATA ${structureName} LIKE LINE OF ${uniqueName}.\n`;
-                        }
                         if (b.get() instanceof Expressions.FieldAssignment) {
                             if (added === false) {
                                 body += data;
@@ -68234,6 +68271,7 @@ __exportStar(__webpack_require__(/*! ./source_field_symbol */ "./node_modules/@a
 __exportStar(__webpack_require__(/*! ./source_field */ "./node_modules/@abaplint/transpiler/build/src/expressions/source_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./source */ "./node_modules/@abaplint/transpiler/build/src/expressions/source.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_cond */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_cond.js"), exports);
+__exportStar(__webpack_require__(/*! ./sql_field */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_from */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_from.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_join */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_join.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_source_simple */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_source_simple.js"), exports);
@@ -69175,6 +69213,33 @@ exports.SQLCondTranspiler = SQLCondTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_field.js":
+/*!******************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/sql_field.js ***!
+  \******************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SQLField = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class SQLField {
+    transpile(node, _traversal) {
+        const chunk = new chunk_1.Chunk();
+        let concat = node.concatTokens();
+        if (concat.includes("~") && concat.split("~")[0].includes("/")) {
+            concat = "'" + concat.replace("~", "'~");
+        }
+        chunk.appendString(concat);
+        return chunk;
+    }
+}
+exports.SQLField = SQLField;
+//# sourceMappingURL=sql_field.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_from.js":
 /*!*****************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/sql_from.js ***!
@@ -69193,6 +69258,7 @@ class SQLFromTranspiler {
         const chunk = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.TokenNode) {
+                // keywords
                 chunk.appendString(c.concatTokens() + " ");
             }
             else if (c.get() instanceof abaplint.Expressions.SQLJoin) {
@@ -69200,7 +69266,15 @@ class SQLFromTranspiler {
                 chunk.appendString(" ");
             }
             else {
-                chunk.appendString(c.concatTokens() + " ");
+                if (c.findFirstExpression(abaplint.Expressions.Dynamic)) {
+                    chunk.appendString(c.concatTokens() + " ");
+                }
+                else if (c.concatTokens().includes("/")) {
+                    chunk.appendString("'" + c.concatTokens() + "' ");
+                }
+                else {
+                    chunk.appendString(c.concatTokens() + " ");
+                }
             }
         }
         return chunk;
@@ -74600,14 +74674,17 @@ class SelectTranspiler {
         let select = "SELECT ";
         const fieldList = node.findFirstExpression(abaplint.Expressions.SQLFieldList)
             || node.findFirstExpression(abaplint.Expressions.SQLFieldListLoop);
-        if ((fieldList === null || fieldList === void 0 ? void 0 : fieldList.getChildren().length) === 1) {
-            select += fieldList.concatTokens();
-        }
-        else {
-            // add commas between field names, this is required for SQLite, and easy to remove in other clients?
-            select += fieldList === null || fieldList === void 0 ? void 0 : fieldList.findAllExpressions(abaplint.Expressions.SQLField).map(e => e.concatTokens()).join(", ");
+        const fields = [];
+        for (const f of (fieldList === null || fieldList === void 0 ? void 0 : fieldList.getChildren()) || []) {
+            if (f instanceof abaplint.Nodes.ExpressionNode && f.get() instanceof abaplint.Expressions.SQLField) {
+                const code = new expressions_1.SQLField().transpile(f, traversal).getCode();
+                fields.push(code);
+            }
+            else {
+                fields.push(f.concatTokens());
+            }
         }
-        select += " ";
+        select += fields.join(", ") + " ";
         const from = node.findFirstExpression(abaplint.Expressions.SQLFrom);
         if (from) {
             select += new sql_from_1.SQLFromTranspiler().transpile(from, traversal).getCode();
@@ -74661,6 +74738,10 @@ class SelectTranspiler {
             const faeTranspiled = new expressions_1.SQLSourceTranspiler().transpile(fn, traversal).getCode();
             select = select.replace(new RegExp(" " + escapeRegExp(faeTranspiled), "g"), " " + unique);
             select = select.replace(unique + ".get().table_line.get()", unique + ".get()"); // there can be only one?
+            let by = `Object.keys(${target}.getRowType().get())`;
+            if (keys.length > 0) {
+                by = JSON.stringify(keys);
+            }
             const code = `if (${faeTranspiled}.array().length === 0) {
   throw "FAE, todo, empty table";
 } else {
@@ -74668,8 +74749,8 @@ class SelectTranspiler {
   for await (const ${unique} of abap.statements.loop(${faeTranspiled})) {
     await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}, {appending: true});
   }
-  abap.statements.sort(${target}, {by: Object.keys(${target}.getRowType().get()).map(k => { return {component: k}; })});
-  await abap.statements.deleteInternal(${target}, {adjacent: true});
+  abap.statements.sort(${target}, {by: ${by}.map(k => { return {component: k}; })});
+  await abap.statements.deleteInternal(${target}, {adjacent: true, by: ${by}});
   abap.builtin.sy.get().dbcnt.set(${target}.array().length);
 }`;
             return new chunk_1.Chunk().append(code, node, traversal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.46",
+  "version": "2.5.48",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,12 +25,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.46",
+    "@abaplint/transpiler": "^2.5.48",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^18.15.3",
-    "@abaplint/core": "^2.95.44",
+    "@types/node": "^18.15.5",
+    "@abaplint/core": "^2.95.47",
     "progress": "^2.0.3",
     "webpack": "^5.76.2",
     "webpack-cli": "^5.0.1",