npm - @sap/artifact-management - Versions diffs - 1.11.1 → 1.13.0 - Mend

@sap/artifact-management 1.11.1 → 1.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (51) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,17 @@
+## 1.13.0 - 21 June, 2022
+### Added
+* Support manual mta editing
+### Changed
+* Enhance CLI api 'get-data-info' for data first UI flow
+## 1.12.1 - 8 June, 2022
+### Fixed
+* Adjust the banner image for preview & launchpad.
+* Reference higher ui5 version for launchpad to enable latest features from FE app.
+## 1.12.0 - 27 May, 2022
+### Added
+* Added new CLI api `get-data-info` to support parsing data file (csv, xml)
+### Changed
+* Refactor mta.yaml to support CI/CD service
 ## 1.11.1 - 17 May, 2022
 ### Fixed
 * Reference ui5 with specific version for preview & launchpad.

package/README.md CHANGED Viewed

@@ -751,4 +751,102 @@ dev-project get-detail-info  <my-application-folder-root absolute path> <type> <
 }
 ```
+---
+## Get Data Information
+###### Method
+`getDataInfo(data: any, mainEntityName?: string, logger? : IChildLogger): Promise<any>;`
+###### Description
+Read and parse an Excel data file (CSV or XML format), or generate the main entity for a data model.
+###### Parameters
+- data: Path of the data file, or a data model parsed from an Excel file.
+- mainEntityName: (Optional) Name of the entity taken as the main entity.
+- logger: (Optional) An instance of IChildLogger which can be implemented by consumers of this library.
+###### returns
+- `Promise<any>`
+###### Example
+```
+const api = new ProjectImpl(projectPath);
+const data = await api.getDataInfo(filePath);
+const dataWithMainEntity = await api.getDataInfo(data, 'mainEntity');
+```
+###### CLI
+```
+dev-project get-data-info  <data file absolute path>
+```
+###### Sample Output
+```
+[
+  {
+    "entity": "entity",
+    "values": [
+      [
+        "9a8a4cad-19c1-46b2-a599-4b735e82374f",
+        "1",
+        "1000000",
+        "Technology"
+      ],
+      [
+        "c84a8e54-ce5a-423b-923e-dab637d298c1",
+        "2",
+        "1500000",
+        "Products"
+      ],
+      [
+        "939be63d-7175-4b53-b593-aa0dde74a04e",
+        "3",
+        "2000000",
+        "Technology"
+      ]
+    ],
+    "labels": [
+      {
+        "label": "ID",
+        "value": "ID"
+      },
+      {
+        "label": "Capex Request",
+        "value": "capex_request"
+      },
+      {
+        "label": "Total Cost",
+        "value": "total_cost"
+      },
+      {
+        "label": "Department",
+        "value": "department"
+      }
+    ],
+    "props": [
+      {
+        "name": "ID",
+        "kind": "dataType",
+        "type": "UUID"
+      },
+      {
+        "name": "capex_request",
+        "kind": "dataType",
+        "type": "String"
+      },
+      {
+        "name": "total_cost",
+        "kind": "dataType",
+        "type": "String"
+      },
+      {
+        "name": "department",
+        "kind": "dataType",
+        "type": "String"
+      }
+    ],
+    "dbProps": [
+      "ID",
+      "capex_request",
+      "total_cost",
+      "department"
+    ]
+  }
+]
+```
 ---

package/dist/src/cp/CFProjectBuilder.js CHANGED Viewed

@@ -15,6 +15,7 @@ const UI5ModuleGenerator_1 = __importDefault(require("../plugins/ui5/generators/
 const artifact_management_mdkplugin_1 = require("@sap/artifact-management-mdkplugin");
 const CapLaunchpadGenerator_1 = __importDefault(require("../plugins/cap/generators/CapLaunchpadGenerator"));
 const path_2 = __importDefault(require("path"));
+const MtaMerger_1 = __importDefault(require("../mta-generator/MtaMerger"));
 class CFProjectBuilder {
     constructor(project, fs) {
         this.resources = [];
@@ -144,7 +145,8 @@ class CFProjectBuilder {
             this.moduleCommandMap.set('before-all', beforeAllPathAndCommands);
         }
         const yamlString = js_yaml_1.default.dump(mtaObject, { skipInvalid: true });
-        await this.fs.writeTextFile('mta.yaml', yamlString);
+        const mtaMerger = new MtaMerger_1.default(this.fs);
+        await mtaMerger.merge(yamlString);
     }
     addResources(builder) {
         for (const service of this.requiredServices) {
@@ -404,19 +406,18 @@ class CFProjectBuilder {
         let apiCommandResponse;
         try {
             apiCommandResponse = await artifact_management_base_1.Util.exec({ stdio: 'pipe' }, 'cf', 'api');
-            if (!apiCommandResponse.stdout) {
-                throw new Error('Not able to get cf api value');
+            if (apiCommandResponse.stdout) {
+                const found = apiCommandResponse.stdout.match(/https:\/\/(.*)[\n\r]/);
+                if (found) {
+                    const logDomain = found[1].replace('api', 'logs');
+                    return `https://${logDomain}/app/dashboards#/view/Overview?_g=(filters:!((query:(match_phrase:(component_name:${this.project.prefix}-srv)))))`;
+                }
             }
         }
         catch (error) {
-            throw new Error('Cannot find api endpoint \nError details: ' + error.message);
-        }
-        const found = apiCommandResponse.stdout.match(/https:\/\/(.*)[\n\r]/);
-        if (!found) {
-            throw new Error('Cannot find the api endpoint in the result of cf api command.');
+            artifact_management_base_1.getLogger().error('Cannot find api endpoint \nError details: ' + error.message);
         }
-        const logDomain = found[1].replace('api', 'logs');
-        return `https://${logDomain}/app/dashboards#/view/Overview?_g=(filters:!((query:(match_phrase:(component_name:${this.project.prefix}-srv)))))`;
+        return '';
     }
     async getOverviewApplicationId() {
         try {

package/dist/src/cp/CFProjectBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CFProjectBuilder.js","sourceRoot":"","sources":["../../../src/cp/CFProjectBuilder.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"CFProjectBuilder.js","sourceRoot":"","sources":["../../../src/cp/CFProjectBuilder.ts"],"names":[],"mappings":"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"}

package/dist/src/cp/OverviewPageGenerator.js CHANGED Viewed

@@ -66,6 +66,7 @@ class OverviewPageGenerator {
             return item.type === artifact_management_base_1.ItemType.ODataV4ServiceEntity && item.external === false;
         });
         const servicesData = [];
+        const pdmServiceData = [];
         // Iterate through the service items and find all non-external services
         for (const item of serviceModule[0].items) {
             if (item.type === artifact_management_base_1.ItemType.CAPService && item.external === false) {
@@ -90,15 +91,22 @@ class OverviewPageGenerator {
                     return entities;
                 }, []);
                 // Create service entry for services table
-                servicesData.push({
+                const data = {
                     ServiceName: item.name,
                     DetailsURL: `.${item.ref}/`,
                     Metadata: `.${item.ref}/$metadata`,
                     Entities: entities,
                     EntitiesCount: entities.length,
-                });
+                };
+                if (item.info && item.info.isPDMService) {
+                    pdmServiceData.push(data);
+                }
+                else {
+                    servicesData.push(data);
+                }
             }
         }
+        servicesData.push(...pdmServiceData);
         return servicesData;
     }
     async addRoutesToServiceInXsApp(service, fs, projectGeneratorContext) {

package/dist/src/cp/OverviewPageGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OverviewPageGenerator.js","sourceRoot":"","sources":["../../../src/cp/OverviewPageGenerator.ts"],"names":[],"mappings":"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~~YAAY~~,~~CAAC,~~IAAI,~~CAAC~~;~~oBACd~~,WAAW,EAAE,IAAI,CAAC,IAAI;oBACtB,UAAU,EAAE,IAAI,IAAI,CAAC,GAAG,GAAG;oBAC3B,QAAQ,EAAE,IAAI,IAAI,CAAC,GAAG,YAAY;oBAClC,QAAQ,EAAE,QAAQ;oBAClB,aAAa,EAAE,QAAQ,CAAC,MAAM;iBACjC,CAAC,CAAC;~~aACN~~;SACJ;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,OAAa,EAAE,EAAqB,EAAE,uBAA+C;QACzH,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACf,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC;SACrB;QAED,MAAM,UAAU,GAAG,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACjE,IAAI,OAAO,CAAC,IAAI,KAAK,sCAAW,CAAC,WAAW,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACf;QACL,CAAC,CAAE,CAAC,IAAI,CAAC;QAET,gFAAgF;QAChF,0CAA0C;QAC1C,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE;YACtB,MAAM,EAAE,IAAI,OAAO,CAAC,GAAG,QAAQ;YAC/B,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,KAAK;YAC3B,WAAW,EAAE,UAAU;YACvB,kBAAkB,EAAE,OAAO;SAC9B,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE;YACb,UAAU,GAAG,IAAI,CAAC;SACrB;QAED,MAAM,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,OAAO,UAAU,CAAC;IACtB,CAAC;IAEO,mBAAmB;QACvB,MAAM,gBAAgB,GAAG;YACrB;gBACI,QAAQ,EAAE,uBAAuB;gBACjC,WAAW,EAAE,oGAAoG;gBACjH,MAAM,EAAE,+EAA+E;gBACvF,MAAM,EAAE,kBAAkB;gBAC1B,iBAAiB,EAAE,oDAAoD;aAC1E;YACD;gBACI,QAAQ,EAAE,4BAA4B;gBACtC,WAAW,EAAE,0HAA0H;gBACvI,MAAM,EAAE,+EAA+E;gBACvF,MAAM,EAAE,qBAAqB;gBAC7B,iBAAiB,EAAE,gFAAgF;aACtG;YACD;gBACI,QAAQ,EAAE,8BAA8B;gBACxC,WAAW,EAAE,wGAAwG;gBACrH,MAAM,EAAE,qGAAqG;gBAC7G,MAAM,EAAE,2BAA2B;gBACnC,iBAAiB,EAAE,kFAAkF;aACxG;SACJ,CAAC;QACF,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CACJ;~~AAhKD~~,~~wCAgKC~~"}
1	+ {"version":3,"file":"OverviewPageGenerator.js","sourceRoot":"","sources":["../../../src/cp/OverviewPageGenerator.ts"],"names":[],"mappings":"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"}

package/dist/src/cp/templates/assets/header.jpg ADDED Viewed

Binary file

package/dist/src/cp/templates/assets/preview.css CHANGED Viewed

@@ -1,9 +1,8 @@
 .customCellImageBackground {
     color: #fff;
-    background-image: url("header.png");
+    background-image: url("header.jpg");
     background-size: 100% auto;
     background-position: 0 20%;
-    height: 12rem;
 }
 .customCellImageBackground .sapUiBlockCellContent,
 .customCellImageBackground .sapUiBlockCellContent .sapMText {

package/dist/src/cp/templates/file-templates/OverviewPage-template.html CHANGED Viewed

@@ -4,7 +4,7 @@
 <head>
     <title> <%- pageTitle %> </title>
     <script src="shared-config.js"></script>
-    <script src="https://ui5.sap.com/1.96.7/resources/sap-ui-core.js"
+    <script src="https://ui5.sap.com/1.102.1/resources/sap-ui-core.js"
             id="sap-ui-bootstrap"
             data-sap-ui-theme='sap_fiori_3'
             data-sap-ui-bindingSyntax="complex"

package/dist/src/cp/templates/file-templates/launchpadPage-template.html CHANGED Viewed

@@ -10,9 +10,9 @@
             window["sap-ushell-config"] = <%- applications %>;
         </script>
         <link rel="stylesheet" href="assets/launchpad.css">
-        <script src="https://ui5.sap.com/1.96.7/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+        <script src="https://ui5.sap.com/1.102.1/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
         <script
-            src="https://ui5.sap.com/1.96.7/resources/sap-ui-core.js"
+            src="https://ui5.sap.com/1.102.1/resources/sap-ui-core.js"
             data-sap-ui-libs="sap.m, sap.ushell, sap.fe.templates"
             data-sap-ui-compatVersion="edge"
             data-sap-ui-theme="sap_fiori_3"

package/dist/src/mta-generator/MtaMerger.js ADDED Viewed

@@ -0,0 +1,147 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const artifact_management_base_1 = require("@sap/artifact-management-base");
+const simple_git_1 = __importDefault(require("simple-git"));
+const path_1 = __importDefault(require("path"));
+const mtaFile = 'mta.yaml';
+const autoHiddenFile = '.mta.yaml.snapshot';
+const autoMemoryFile = '.mta.yaml.memory';
+const autoDiffFile = '.snapshot.diff';
+class MtaMerger {
+    constructor(fs) {
+        this.fs = fs;
+        this.git = simple_git_1.default(fs.rootPath);
+        this.logger = new artifact_management_base_1.ProjectAPILogger(artifact_management_base_1.getLogger().getChildLogger({ label: 'mtaMerger' }));
+    }
+    get Git() {
+        return this.git;
+    }
+    async merge(content) {
+        let hasConflict = false;
+        if (await this.fs.fileExists(mtaFile) && await this.fs.fileExists(autoHiddenFile)) {
+            if (await this.areDiffFiles(autoHiddenFile, mtaFile)) {
+                await this.fs.writeTextFile(autoMemoryFile, content);
+                const gitRootPath = await this.git.revparse('--show-toplevel');
+                const tempFs = artifact_management_base_1.FileSystemFactory.getFileSystem(this.fs.basePath, gitRootPath);
+                const relativeFolder = tempFs.relativeToRoot('.');
+                await this.writeDataObject(autoHiddenFile);
+                if (await this.diffAutoMtaFile(autoHiddenFile, autoMemoryFile, relativeFolder)) {
+                    await this.addToIndex(mtaFile);
+                    hasConflict = await this.applyDiff(autoDiffFile, mtaFile, relativeFolder);
+                    if (!hasConflict) {
+                        await this.removeIndex(mtaFile);
+                    }
+                }
+                await this.fs.rm(autoMemoryFile);
+            }
+            else {
+                await this.fs.writeTextFile(mtaFile, content);
+            }
+        }
+        else {
+            await this.fs.writeTextFile(mtaFile, content);
+        }
+        // Override the content of the hidden file for next diff operation
+        await this.fs.writeTextFile(autoHiddenFile, content);
+        // Remove the unused diff file
+        if (await this.fs.fileExists(autoDiffFile)) {
+            await this.fs.rm(autoDiffFile);
+        }
+        if (hasConflict) {
+            throw new Error((`Failed to update ${mtaFile} due to conflicts. Please open ${mtaFile} and resolve the conflicts.`));
+        }
+    }
+    async writeDataObject(file) {
+        const checksum = await this.git.raw(['hash-object', '-w', file]);
+        return checksum;
+    }
+    async areDiffFiles(file1, file2) {
+        const checksum1 = await this.git.raw(['hash-object', file1]);
+        const checksum2 = await this.git.raw(['hash-object', file2]);
+        return checksum1 !== checksum2;
+    }
+    async getDiffContent(baseFile, changedFile) {
+        const diffCommand = [
+            'diff',
+            '--no-index',
+            baseFile,
+            changedFile,
+        ];
+        let content = '';
+        await this.git.raw(diffCommand, (error, result) => {
+            if (!error) {
+                content = result;
+            }
+            else {
+                this.logger.error(error.message);
+            }
+        });
+        return content;
+    }
+    async diffAutoMtaFile(hiddenFile, memoryFile, relativeFolder) {
+        let content = await this.getDiffContent(hiddenFile, memoryFile);
+        if (content) {
+            const relativeMtaFilePath = path_1.default.join(relativeFolder, mtaFile);
+            const regExpA = new RegExp('a/' + autoHiddenFile, 'g');
+            content = content.replace(regExpA, `a/${relativeMtaFilePath}`);
+            const regExpB = new RegExp('b/' + autoMemoryFile, 'g');
+            content = content.replace(regExpB, `b/${relativeMtaFilePath}`);
+            await this.fs.writeTextFile(autoDiffFile, content);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    async addToIndex(mtaFile) {
+        const addCommand = [
+            'add',
+            mtaFile,
+        ];
+        return this.git.raw(addCommand, (error, result) => {
+            if (!error) {
+                this.logger.trace(result);
+            }
+            else {
+                this.logger.error(error.message);
+            }
+        });
+    }
+    async applyDiff(diffFile, mtaFile, relativeFolder) {
+        let hasConflict = false;
+        const relativeMtaFilePath = path_1.default.join(relativeFolder, mtaFile);
+        try {
+            await this.git.raw(['apply', '-3', autoDiffFile]);
+        }
+        catch (error) {
+            if (error.message.indexOf(`Applied patch to '${relativeMtaFilePath}' with conflicts`) > -1) {
+                this.logger.warn(error.message);
+                hasConflict = true;
+            }
+            else {
+                this.logger.error(error.message);
+                throw error;
+            }
+        }
+        return hasConflict;
+    }
+    async removeIndex(mtaFile) {
+        const addCommand = [
+            'reset',
+            mtaFile,
+        ];
+        return this.git.raw(addCommand, (error, result) => {
+            if (!error) {
+                this.logger.trace(result);
+            }
+            else {
+                this.logger.error(error.message);
+            }
+        });
+    }
+}
+exports.default = MtaMerger;
+//# sourceMappingURL=MtaMerger.js.map

package/dist/src/mta-generator/MtaMerger.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"MtaMerger.js","sourceRoot":"","sources":["../../../src/mta-generator/MtaMerger.ts"],"names":[],"mappings":";;;;;AACA,4EAAkH;AAClH,4DAAkD;AAClD,gDAAwB;AAExB,MAAM,OAAO,GAAG,UAAU,CAAC;AAC3B,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAC1C,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAEtC,MAAqB,SAAS;IAU1B,YAAY,EAAqB;QAC7B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QAEb,IAAI,CAAC,GAAG,GAAG,oBAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,2CAAgB,CAAC,oCAAS,EAAE,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAC3F,CAAC;IAXD,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAWM,KAAK,CAAC,KAAK,CAAC,OAAe;QAC9B,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YAC/E,IAAI,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE;gBAClD,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBAErD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;gBAC/D,MAAM,MAAM,GAAG,4CAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC9E,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;gBAElD,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;gBAE3C,IAAI,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,EAAE;oBAC5E,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBAE/B,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;oBAC1E,IAAI,CAAC,WAAW,EAAE;wBACd,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;qBACnC;iBACJ;gBAED,MAAM,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;aACpC;iBAAM;gBACH,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aACjD;SACJ;aAAM;YACH,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACjD;QAED,kEAAkE;QAClE,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAErD,8BAA8B;QAC9B,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YACxC,MAAM,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;SAClC;QAED,IAAI,WAAW,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,CAAC,oBAAoB,OAAO,kCAAkC,OAAO,6BAA6B,CAAC,CAAC,CAAC;SACxH;IACL,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,IAAY;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACjE,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,KAAa;QACnD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;QAE7D,OAAO,SAAS,KAAK,SAAS,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,WAAmB;QAC9D,MAAM,WAAW,GAAG;YAChB,MAAM;YACN,YAAY;YACZ,QAAQ;YACR,WAAW;SACd,CAAC;QAEF,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,CAAC,KAAK,EAAE;gBACR,OAAO,GAAG,MAAM,CAAC;aACpB;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACpC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,UAAkB,EAAE,UAAkB,EAAE,cAAsB;QACxF,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAChE,IAAI,OAAO,EAAE;YACT,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAE/D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,cAAc,EAAE,GAAG,CAAC,CAAC;YACvD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,mBAAmB,EAAE,CAAC,CAAC;YAE/D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,cAAc,EAAE,GAAG,CAAC,CAAC;YACvD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,mBAAmB,EAAE,CAAC,CAAC;YAE/D,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAEnD,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,OAAe;QACpC,MAAM,UAAU,GAAG;YACf,KAAK;YACL,OAAO;SACV,CAAC;QAEF,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,CAAC,KAAK,EAAE;gBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;aAC7B;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACpC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,OAAe,EAAE,cAAsB;QAC7E,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAE/D,IAAI;YACA,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;SACrD;QAAC,OAAO,KAAU,EAAE;YACjB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,mBAAmB,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE;gBACxF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAChC,WAAW,GAAG,IAAI,CAAC;aACtB;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACjC,MAAM,KAAK,CAAC;aACf;SACJ;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,OAAe;QACrC,MAAM,UAAU,GAAG;YACf,OAAO;YACP,OAAO;SACV,CAAC;QAEF,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,CAAC,KAAK,EAAE;gBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;aAC7B;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACpC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA/JD,4BA+JC"}

package/dist/src/plugins/cap/generators/CapLaunchpadGenerator.js CHANGED Viewed

@@ -20,15 +20,14 @@ class CapLaunchpadGenerator {
             'build-parameters': {
                 builder: 'custom',
                 commands: [
-                    'rm -rf dist-zip dist',
                     'npm install',
                     'npx -p @ui5/cli ui5 build --dest dist --include-task=generateManifestBundle --include-task=generateCachebusterInfo',
-                    'mkdir dist-zip',
-                    `bash -c "cd dist && npx bestzip ../dist-zip/${zipName} *"`,
+                    `bash -c "cd dist && npx bestzip ../../../build/dist/${zipName} *"`,
+                    'rm -rf dist',
                 ],
                 _artifactName: zipName,
                 'supported-platforms': [],
-                'build-result': 'dist-zip',
+                'build-result': '../../build/dist',
             },
         };
     }

package/dist/src/plugins/cap/generators/CapLaunchpadGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CapLaunchpadGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapLaunchpadGenerator.ts"],"names":[],"mappings":";;AAAA,4EAAgK;AAEhK,MAAqB,qBAAqB;IAEtC,OAAO;QACH,OAAO,qCAAU,CAAC,GAAG,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAA+B;QACzD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,MAAM,OAAO,GAAG,eAAe,CAAC;QAChC,OAAO;YACH,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC;YACjD,IAAI,EAAE,wCAAa,CAAC,KAAK;YACzB,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,iBAAiB,CAAC;YACpD,kBAAkB,EAAE;gBAChB,OAAO,EAAE,QAAQ;gBACjB,QAAQ,EAAY;oBAChB,~~sBAAsB;oBACtB,~~aAAa;oBACb,oHAAoH;oBACpH,~~gBAAgB;oBAChB,+CAA+C~~,OAAO,KAAK;~~iBAC9D~~;gBACD,aAAa,EAAE,OAAO;gBACtB,qBAAqB,EAAE,EAAE;gBACzB,cAAc,EAAE,~~UAAU~~;~~aAC7B~~;SACJ,CAAC;IACN,CAAC;IAED,QAAQ;QACJ,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;~~AAvCD~~,~~wCAuCC~~"}
1	+ {"version":3,"file":"CapLaunchpadGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapLaunchpadGenerator.ts"],"names":[],"mappings":";;AAAA,4EAAgK;AAEhK,MAAqB,qBAAqB;IAEtC,OAAO;QACH,OAAO,qCAAU,CAAC,GAAG,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAA+B;QACzD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,MAAM,OAAO,GAAG,eAAe,CAAC;QAChC,OAAO;YACH,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC;YACjD,IAAI,EAAE,wCAAa,CAAC,KAAK;YACzB,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,iBAAiB,CAAC;YACpD,kBAAkB,EAAE;gBAChB,OAAO,EAAE,QAAQ;gBACjB,QAAQ,EAAY;oBAChB,aAAa;oBACb,oHAAoH;oBACpH,uDAAuD,OAAO,KAAK;oBACnE,aAAa;iBAChB;gBACD,aAAa,EAAE,OAAO;gBACtB,qBAAqB,EAAE,EAAE;gBACzB,cAAc,EAAE,kBAAkB;aACrC;SACJ,CAAC;IACN,CAAC;IAED,QAAQ;QACJ,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AAtCD,wCAsCC"}

package/dist/src/plugins/cap/generators/CapUIDeployerGenerator.js CHANGED Viewed

@@ -11,6 +11,8 @@ class CapUIDeployerGenerator {
     async beforeBuildCommands() {
         return ['rm -rf build/ui-deployer',
             'mkdir -p build/ui-deployer',
+            'rm -rf build/dist',
+            'mkdir -p build/dist',
         ];
     }
     async getModuleManifest(context) {

package/dist/src/plugins/cap/generators/CapUIDeployerGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CapUIDeployerGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapUIDeployerGenerator.ts"],"names":[],"mappings":";;AAAA,4EACwE;AACxE,MAAqB,sBAAsB;IACvC,OAAO;QACH,OAAO,qCAAU,CAAC,GAAG,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,gBAAgB;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,CAAC,0BAA0B;YAC9B,4BAA4B;~~SAC/B~~,CAAC;IACN,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QACtE,MAAM,YAAY,GAAG,SAAS,GAAG,GAAG,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,sCAAW,CAAC,KAAK,CAAC,YAAY,EAAE,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAC/F,MAAM,SAAS,GAAQ,EAAE,CAAC;QAC1B,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,YAAY,EAAE;YAC1C,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC5B,SAAS,CAAC,IAAI,CAAC;oBACX,IAAI,EAAG,SAAS,CAAC,IAAI;oBACrB,SAAS,EAAE,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC;oBACxD,aAAa,EAAE,WAAW;iBAC7B,CAAC,CAAC;aACN;SACJ;QACD,MAAM,CAAC,kBAAkB,CAAC,CAAC,QAAQ,GAAG,SAAS,CAAC;QAChD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,QAAQ;QACJ,OAAO,CAAC;gBACJ,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI;gBACrD,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI;gBACrD,UAAU,EAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE;aAC1C,CAAC,CAAC;IACP,CAAC;CACJ;~~AAxCD~~,~~yCAwCC~~"}
1	+ {"version":3,"file":"CapUIDeployerGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapUIDeployerGenerator.ts"],"names":[],"mappings":";;AAAA,4EACwE;AACxE,MAAqB,sBAAsB;IACvC,OAAO;QACH,OAAO,qCAAU,CAAC,GAAG,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,gBAAgB;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,CAAC,0BAA0B;YAC9B,4BAA4B;YAC5B,mBAAmB;YACnB,qBAAqB;SACxB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QACtE,MAAM,YAAY,GAAG,SAAS,GAAG,GAAG,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,sCAAW,CAAC,KAAK,CAAC,YAAY,EAAE,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAC/F,MAAM,SAAS,GAAQ,EAAE,CAAC;QAC1B,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,YAAY,EAAE;YAC1C,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC5B,SAAS,CAAC,IAAI,CAAC;oBACX,IAAI,EAAG,SAAS,CAAC,IAAI;oBACrB,SAAS,EAAE,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC;oBACxD,aAAa,EAAE,WAAW;iBAC7B,CAAC,CAAC;aACN;SACJ;QACD,MAAM,CAAC,kBAAkB,CAAC,CAAC,QAAQ,GAAG,SAAS,CAAC;QAChD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,QAAQ;QACJ,OAAO,CAAC;gBACJ,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI;gBACrD,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI;gBACrD,UAAU,EAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE;aAC1C,CAAC,CAAC;IACP,CAAC;CACJ;AA1CD,yCA0CC"}

package/dist/src/plugins/cap/generators/templates/mta-cap-template.yaml CHANGED Viewed

@@ -10,8 +10,10 @@ build-parameters:
    - builder: custom
      commands:
       - npm install --production
-      - bash -c "cds -v 2>/dev/null >/dev/null || npm install --no-save @sap/cds-dk"
-      - npx cds build --production
+      - bash -c "cds -v | grep 'cds-dk' || npm i --production --no-save @sap/cds-dk @sap/mdk-tools"
+      - bash -c "export PATH=$PATH:$(pwd)/node_modules/.bin"
+      - cds build --production
 modules:

package/dist/src/plugins/cap/readers/CapModuleReader.js CHANGED Viewed

@@ -110,14 +110,20 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
                 const attrPath = pathParts[0].split('\\').join('/');
                 const external = modelArr.has(attrPath) ? true : false;
                 const ref = this.getServiceRef(service);
-                items.set(ref, {
+                const item = {
                     type: artifact_management_base_1.ItemType.CAPService,
                     name: service.name,
                     ref,
                     path,
                     external,
                     tags: itemTags,
-                });
+                };
+                if (service['@PersonalDataManagerService']) {
+                    item.info = {
+                        isPDMService: true,
+                    };
+                }
+                items.set(ref, item);
                 serviceRefs[service.name] = ref;
             }
         }
@@ -154,7 +160,7 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
                     // Service Entity --Has Dependency--> Service
                     if (entity._service && serviceRef === this.getServiceRef(entity._service)) {
                         // Set PDM service info
-                        if (entity._service['@PersonalDataManagementService']) {
+                        if (entity._service['@PersonalDataManagerService']) {
                             const pdmService = items.get(serviceRef);
                             if (pdmService && !((_a = pdmService.info) === null || _a === void 0 ? void 0 : _a.isPDMItem)) {
                                 pdmService.info = {