@abaplint/transpiler-cli 2.5.48 → 2.5.50

package/build/bundle.js

@@ -68272,6 +68272,7 @@ __exportStar(__webpack_require__(/*! ./source_field */ "./node_modules/@abaplint
 __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_source */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_from_source.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);
@@ -69083,6 +69084,7 @@ const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@aba
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const simple_source3_1 = __webpack_require__(/*! ./simple_source3 */ "./node_modules/@abaplint/transpiler/build/src/expressions/simple_source3.js");
 const field_chain_1 = __webpack_require__(/*! ./field_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_chain.js");
+const sql_field_name_1 = __webpack_require__(/*! ./sql_field_name */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_field_name.js");
 class SQLCondTranspiler {
     transpile(node, traversal) {
         var _a;
@@ -69135,11 +69137,15 @@ class SQLCondTranspiler {
         if (c.getChildren().length !== 3) {
             return this.basicConditionNew(c, traversal, filename);
         }
-        const fieldName = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
+        let fieldName = undefined;
+        const fieldNameExpression = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
+        if (fieldNameExpression) {
+            fieldName = new sql_field_name_1.SQLFieldNameTranspiler().transpile(fieldNameExpression, traversal).getCode();
+        }
         const operator = c.findDirectExpression(abaplint.Expressions.SQLCompareOperator);
         const source = c.findDirectExpression(abaplint.Expressions.SQLSource);
         if (fieldName && source && operator === undefined && c.findDirectTokenByText("LIKE")) {
-            ret += fieldName.concatTokens() + " LIKE ";
+            ret += fieldName + " LIKE ";
             ret += this.sqlSource(source, traversal, filename);
             return ret;
         }
@@ -69153,7 +69159,7 @@ class SQLCondTranspiler {
         else if (op.toUpperCase() === "NE") {
             op = "<>";
         }
-        ret += fieldName.concatTokens() + " " + op + " ";
+        ret += fieldName + " " + op + " ";
         ret += this.sqlSource(source, traversal, filename);
         return ret;
     }
@@ -69194,8 +69200,9 @@ class SQLCondTranspiler {
             if (ret !== "") {
                 ret += " ";
             }
-            if (child.get() instanceof abaplint.Expressions.SQLFieldName) {
-                ret += child.concatTokens();
+            if (child.get() instanceof abaplint.Expressions.SQLFieldName
+                && child instanceof abaplint.Nodes.ExpressionNode) {
+                ret += new sql_field_name_1.SQLFieldNameTranspiler().transpile(child, traversal).getCode();
             }
             else if (child.get() instanceof abaplint.Expressions.SQLSource
                 && child instanceof abaplint.Nodes.ExpressionNode) {
@@ -69222,9 +69229,45 @@ exports.SQLCondTranspiler = SQLCondTranspiler;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SQLField = void 0;
+exports.SQLFieldTranspiler = 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 sql_field_name_1 = __webpack_require__(/*! ./sql_field_name */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_field_name.js");
+class SQLFieldTranspiler {
+    transpile(node, traversal) {
+        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.SQLFieldName) {
+                chunk.appendChunk(new sql_field_name_1.SQLFieldNameTranspiler().transpile(c, traversal));
+            }
+            else {
+                chunk.appendString(c.concatTokens() + " ");
+            }
+        }
+        return chunk;
+    }
+}
+exports.SQLFieldTranspiler = SQLFieldTranspiler;
+//# sourceMappingURL=sql_field.js.map
+
+/***/ }),
+
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_field_name.js":
+/*!***********************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/sql_field_name.js ***!
+  \***********************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SQLFieldNameTranspiler = void 0;
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
-class SQLField {
+class SQLFieldNameTranspiler {
     transpile(node, _traversal) {
         const chunk = new chunk_1.Chunk();
         let concat = node.concatTokens();
@@ -69235,8 +69278,8 @@ class SQLField {
         return chunk;
     }
 }
-exports.SQLField = SQLField;
-//# sourceMappingURL=sql_field.js.map
+exports.SQLFieldNameTranspiler = SQLFieldNameTranspiler;
+//# sourceMappingURL=sql_field_name.js.map
 
 /***/ }),
 
@@ -69253,6 +69296,7 @@ exports.SQLFromTranspiler = 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 sql_join_1 = __webpack_require__(/*! ./sql_join */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_join.js");
+const sql_from_source_1 = __webpack_require__(/*! ./sql_from_source */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_from_source.js");
 class SQLFromTranspiler {
     transpile(node, traversal) {
         const chunk = new chunk_1.Chunk();
@@ -69265,6 +69309,9 @@ class SQLFromTranspiler {
                 chunk.appendChunk(new sql_join_1.SQLJoinTranspiler().transpile(c, traversal));
                 chunk.appendString(" ");
             }
+            else if (c.get() instanceof abaplint.Expressions.SQLFromSource) {
+                chunk.appendChunk(new sql_from_source_1.SQLFromSourceTranspiler().transpile(c, traversal));
+            }
             else {
                 if (c.findFirstExpression(abaplint.Expressions.Dynamic)) {
                     chunk.appendString(c.concatTokens() + " ");
@@ -69285,6 +69332,41 @@ exports.SQLFromTranspiler = SQLFromTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_from_source.js":
+/*!************************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/sql_from_source.js ***!
+  \************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SQLFromSourceTranspiler = 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");
+class SQLFromSourceTranspiler {
+    transpile(node, _traversal) {
+        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.DatabaseTable && c.concatTokens().includes("/")) {
+                chunk.appendString("'" + c.concatTokens() + "' ");
+            }
+            else {
+                chunk.appendString(c.concatTokens() + " ");
+            }
+        }
+        return chunk;
+    }
+}
+exports.SQLFromSourceTranspiler = SQLFromSourceTranspiler;
+//# sourceMappingURL=sql_from_source.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_join.js":
 /*!*****************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/sql_join.js ***!
@@ -69298,16 +69380,21 @@ exports.SQLJoinTranspiler = 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 sql_cond_1 = __webpack_require__(/*! ./sql_cond */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_cond.js");
+const sql_from_source_1 = __webpack_require__(/*! ./sql_from_source */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_from_source.js");
 class SQLJoinTranspiler {
     transpile(node, traversal) {
         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.SQLCond) {
                 chunk.appendChunk(new sql_cond_1.SQLCondTranspiler().transpile(c, traversal));
             }
+            else if (c.get() instanceof abaplint.Expressions.SQLFromSource) {
+                chunk.appendChunk(new sql_from_source_1.SQLFromSourceTranspiler().transpile(c, traversal));
+            }
             else {
                 chunk.appendString(c.concatTokens() + " ");
             }
@@ -69331,9 +69418,20 @@ exports.SQLJoinTranspiler = SQLJoinTranspiler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SQLSourceTranspiler = 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");
 class SQLSourceTranspiler {
     transpile(node, traversal) {
         let s = node.findDirectExpression(abaplint.Expressions.Source);
+        if ((s === null || s === void 0 ? void 0 : s.getChildren().length) === 1 && s.getChildren()[0].get() instanceof abaplint.Expressions.SQLAliasField) {
+            const chunk = new chunk_1.Chunk();
+            let concat = s.concatTokens();
+            if (concat.includes("~") && concat.split("~")[0].includes("/")) {
+                concat = "'" + concat.replace("~", "'~");
+            }
+            concat = concat.replace("~", ".");
+            chunk.appendString(concat);
+            return chunk;
+        }
         if (s === undefined) {
             s = node.findDirectExpression(abaplint.Expressions.SimpleSource3);
         }
@@ -74677,7 +74775,7 @@ class SelectTranspiler {
         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();
+                const code = new expressions_1.SQLFieldTranspiler().transpile(f, traversal).getCode();
                 fields.push(code);
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.48",
+  "version": "2.5.50",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,7 +25,7 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.48",
+    "@abaplint/transpiler": "^2.5.50",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",