@abaplint/transpiler-cli 2.5.2 → 2.5.4

package/build/bundle.js

@@ -22546,7 +22546,7 @@ const basic_types_1 = __webpack_require__(/*! ../basic_types */ "./node_modules/
 const unknown_type_1 = __webpack_require__(/*! ../../types/basic/unknown_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/unknown_type.js");
 const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 class InlineFieldDefinition {
-    runSyntax(node, scope, filename) {
+    runSyntax(node, scope, filename, targetType) {
         var _a;
         let type = undefined;
         const field = (_a = node.findDirectExpression(Expressions.Field)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
@@ -22561,6 +22561,9 @@ class InlineFieldDefinition {
         if (typeName) {
             type = new basic_types_1.BasicTypes(filename, scope).parseType(typeName);
         }
+        if (targetType !== undefined) {
+            type = targetType;
+        }
         if (type === undefined) {
             type = new unknown_type_1.UnknownType("InlineFieldDefinition, fallback");
         }
@@ -23681,7 +23684,7 @@ const reduce_next_1 = __webpack_require__(/*! ./reduce_next */ "./node_modules/@
 const let_1 = __webpack_require__(/*! ./let */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/let.js");
 const _scope_type_1 = __webpack_require__(/*! ../_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
 class ReduceBody {
-    runSyntax(node, scope, filename) {
+    runSyntax(node, scope, filename, targetType) {
         if (node === undefined) {
             return;
         }
@@ -23696,7 +23699,7 @@ class ReduceBody {
                 scope.push(_scope_type_1.ScopeType.Let, "LET", node.getFirstToken().getStart(), filename);
                 scoped = true;
             }
-            const found = new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename);
+            const found = new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename, targetType);
             if (found && first === undefined) {
                 first = found;
             }
@@ -23926,7 +23929,7 @@ class Source {
                 case "REDUCE":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
-                        const bodyType = new reduce_body_1.ReduceBody().runSyntax(node.findDirectExpression(Expressions.ReduceBody), scope, filename);
+                        const bodyType = new reduce_body_1.ReduceBody().runSyntax(node.findDirectExpression(Expressions.ReduceBody), scope, filename, foundType);
                         if (foundType === undefined) {
                             this.addIfInferred(node, scope, filename, bodyType);
                         }
@@ -35622,7 +35625,7 @@ const __1 = __webpack_require__(/*! ../.. */ "./node_modules/@abaplint/core/buil
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class CDSDefineProjection extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "VIEW", (0, combi_1.ver)(__1.Version.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)((0, combi_1.seq)("PROVIDER CONTRACT", _1.CDSName)), "AS PROJECTION ON", _1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "VIEW", (0, combi_1.ver)(__1.Version.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSAs), (0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineProjection = CDSDefineProjection;
@@ -35672,7 +35675,7 @@ const cds_as_1 = __webpack_require__(/*! ./cds_as */ "./node_modules/@abaplint/c
 const cds_cast_1 = __webpack_require__(/*! ./cds_cast */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_cast.js");
 class CDSElement extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters)))), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, ": REDIRECTED TO", (0, combi_1.opt)((0, combi_1.alt)("PARENT", "COMPOSITION CHILD")), _1.CDSName), (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters)))), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;
@@ -35862,6 +35865,27 @@ exports.CDSParametersSelect = CDSParametersSelect;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_provider_contract.js":
+/*!****************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_provider_contract.js ***!
+  \****************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CDSProviderContract = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+class CDSProviderContract extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("PROVIDER CONTRACT", (0, combi_1.alt)("TRANSACTIONAL_QUERY", "TRANSACTIONAL_INTERFACE", "ANALYTICAL_QUERY"));
+    }
+}
+exports.CDSProviderContract = CDSProviderContract;
+//# sourceMappingURL=cds_provider_contract.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_relation.js":
 /*!*******************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_relation.js ***!
@@ -36065,6 +36089,7 @@ __exportStar(__webpack_require__(/*! ./cds_define_view */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./cds_element */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_element.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_function */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_function.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_group_by */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_group_by.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_provider_contract */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_provider_contract.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_integer */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_integer.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_join */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_join.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_name */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_name.js"), exports);
@@ -40977,7 +41002,12 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             let found = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName);
             if (found === undefined) {
                 const list = e.findDirectExpressions(expressions_1.CDSName);
-                found = list[list.length - 1];
+                if (e.concatTokens().toUpperCase().includes(" REDIRECTED TO ")) {
+                    found = list[0];
+                }
+                else {
+                    found = list[list.length - 1];
+                }
             }
             if (found === undefined) {
                 continue;
@@ -45986,7 +46016,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.19";
+        return "2.95.23";
     }
     getDDICReferences() {
         return this.references;

package/package.json

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