@abaplint/transpiler-cli 2.5.47 → 2.5.48

package/build/bundle.js

@@ -68271,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);
@@ -69212,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 ***!
@@ -69230,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) {
@@ -69237,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;
@@ -74637,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();
@@ -74698,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 {
@@ -74705,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.47",
+  "version": "2.5.48",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,7 +25,7 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.47",
+    "@abaplint/transpiler": "^2.5.48",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",