@abaplint/transpiler-cli 2.5.1 → 2.5.3

package/build/bundle.js

@@ -35622,7 +35622,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 +35672,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 +35862,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 +36086,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 +40999,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 +46013,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.19";
+        return "2.95.22";
     }
     getDDICReferences() {
         return this.references;
@@ -69408,15 +69435,16 @@ exports.HandleSMIM = void 0;
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 class HandleSMIM {
     runObject(obj, _reg) {
-        var _a, _b;
+        var _a;
         const filename = (_a = obj.getXMLFile()) === null || _a === void 0 ? void 0 : _a.getFilename().replace(".xml", ".mjs").toLowerCase();
         if (filename === undefined) {
             return [];
         }
         obj.parse();
+        const dataFile = obj.getDataFile();
         const chunk = new chunk_1.Chunk().appendString(`abap.SMIM["${obj.getName().toUpperCase()}"] = {
   "objectType": "SMIM",
-  "filename": ${JSON.stringify((_b = obj.getDataFile()) === null || _b === void 0 ? void 0 : _b.getFilename())},
+  "filename": ${JSON.stringify(dataFile === null || dataFile === void 0 ? void 0 : dataFile.getFilename())},
   "url": ${JSON.stringify(obj.getURL())},
   "class": ${JSON.stringify(obj.getClass())},
 };`);
@@ -69430,7 +69458,21 @@ class HandleSMIM {
             requires: [],
             exports: [],
         };
-        return [output];
+        const ret = [output];
+        if (dataFile) {
+            const data = {
+                object: {
+                    name: obj.getName(),
+                    type: obj.getType(),
+                },
+                filename: dataFile === null || dataFile === void 0 ? void 0 : dataFile.getFilename(),
+                chunk: new chunk_1.Chunk().appendString(dataFile === null || dataFile === void 0 ? void 0 : dataFile.getRaw()),
+                requires: [],
+                exports: [],
+            };
+            ret.push(data);
+        }
+        return ret;
     }
 }
 exports.HandleSMIM = HandleSMIM;
@@ -69630,15 +69672,16 @@ exports.HandleW3MI = void 0;
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 class HandleW3MI {
     runObject(obj, _reg) {
-        var _a, _b;
+        var _a;
         const filename = (_a = obj.getXMLFile()) === null || _a === void 0 ? void 0 : _a.getFilename().replace(".xml", ".mjs").toLowerCase();
         if (filename === undefined) {
             return [];
         }
         obj.parse();
+        const dataFile = obj.getDataFile();
         const chunk = new chunk_1.Chunk().appendString(`abap.W3MI["${obj.getName().toUpperCase()}"] = {
   "objectType": "W3MI",
-  "filename": ${JSON.stringify((_b = obj.getDataFile()) === null || _b === void 0 ? void 0 : _b.getFilename())},
+  "filename": ${JSON.stringify(dataFile === null || dataFile === void 0 ? void 0 : dataFile.getFilename())},
 };`);
         const output = {
             object: {
@@ -69650,7 +69693,21 @@ class HandleW3MI {
             requires: [],
             exports: [],
         };
-        return [output];
+        const ret = [output];
+        if (dataFile) {
+            const data = {
+                object: {
+                    name: obj.getName(),
+                    type: obj.getType(),
+                },
+                filename: dataFile === null || dataFile === void 0 ? void 0 : dataFile.getFilename(),
+                chunk: new chunk_1.Chunk().appendString(dataFile === null || dataFile === void 0 ? void 0 : dataFile.getRaw()),
+                requires: [],
+                exports: [],
+            };
+            ret.push(data);
+        }
+        return ret;
     }
 }
 exports.HandleW3MI = HandleW3MI;
@@ -90099,6 +90156,8 @@ function writeObjects(objects, writeSourceMaps, outputFolder, files) {
         if (writeSourceMaps === true
             && o.object.type.toUpperCase() !== "TABL"
             && o.object.type.toUpperCase() !== "DTEL"
+            && o.object.type.toUpperCase() !== "W3MI"
+            && o.object.type.toUpperCase() !== "SMIM"
             && o.object.type.toUpperCase() !== "ENQU"
             && o.object.type.toUpperCase() !== "TTYP") {
             const name = o.filename + ".map";

package/package.json

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