Merge pull request #150 from cap-js-community/fix/cdm-build

CDM - small fixes and output format

Author: oklemenz2

README.md

@@ -432,8 +432,12 @@ The CDM Builder allows to build a CDM file `cdm.json` from apps, roles and porta
 
 - Build CDM: `cdm-build`
 
-The generated CDM is generated at `app/cdm.json` and can be included into HTML5 Repository automatically
-when copied at `resources/cdm.json` during build time.
+The generated CDM is (per default) generated at `app/cdm.json`.
+
+### Options:
+
+- `-f, --force`: Overwrite existing CDM file. Default is `false`
+- `-t, --target`: Specify target path for generated CDM file. Default is `app/cdm.json`
 
 ## Support, Feedback, Contributing
 

bin/cdm-build.js

@@ -15,7 +15,11 @@ process.argv = process.argv.map((arg) => {
   return arg.toLowerCase();
 });
 
-program.version(packageJSON.version, "-v, --version").usage("[options]").option("-f, --force", "Force generation");
+program
+  .version(packageJSON.version, "-v, --version")
+  .usage("[options]")
+  .option("-f, --force", "Force generation")
+  .option("-t, --target <target>", "Target path");
 
 program.unknownOption = function () {};
 program.parse(process.argv);

src/cdm-build/CDMBuilder.js

@@ -64,7 +64,7 @@ class CDMBuilder {
     this.addRoles(cdm, roles);
     if (!this.options.skipWrite) {
       fs.mkdirSync(path.dirname(this.targetPath), { recursive: true });
-      fs.writeFileSync(this.targetPath, JSON.stringify(cdm, null, 2));
+      fs.writeFileSync(this.targetPath, JSON.stringify(Object.values(cdm.payload).flat(), null, 2));
     }
     return cdm;
   }
@@ -171,7 +171,7 @@ class CDMBuilder {
     cdm.payload.spaces.push(space);
     let index = 1;
     for (const group of cdm.payload.groups || []) {
-      const pageId = `${this.namespace}-page${cdm.payload.groups.length > 1 ? `-${index++}` : ""}\`;`;
+      const pageId = `${this.namespace}-page${cdm.payload.groups.length > 1 ? `-${index++}` : ""}`;
       cdm.payload.pages.push({
         _version: this.version,
         identification: {
@@ -221,11 +221,12 @@ class CDMBuilder {
               },
             },
             tags: {
+              keywords: [],
               technicalAttributes: ["APPTYPE_HOMEPAGE"],
             },
           },
           "sap.integration": {
-            urlTemplateId: `${this.namespace}-urltemplate.home`,
+            urlTemplateId: `${this.namespace}-urltemplate-home`,
             urlTemplateParams: { path: "" },
           },
           "sap.ui": {

test/cdm-build/__snapshots__/cdm-build.test.js.snap

@@ -31,13 +31,14 @@ exports[`CDM Builder Build 1`] = `
                 },
               },
               "tags": {
+                "keywords": [],
                 "technicalAttributes": [
                   "APPTYPE_HOMEPAGE",
                 ],
               },
             },
             "sap.integration": {
-              "urlTemplateId": "common-urltemplate.home",
+              "urlTemplateId": "common-urltemplate-home",
               "urlTemplateParams": {
                 "path": "",
               },
@@ -221,7 +222,7 @@ exports[`CDM Builder Build 1`] = `
         "_version": "3.2.0",
         "identification": {
           "entityType": "page",
-          "id": "common-page\`;",
+          "id": "common-page",
           "title": "{{title}}",
         },
         "payload": {
@@ -309,7 +310,7 @@ exports[`CDM Builder Build 1`] = `
         "payload": {
           "contentNodes": [
             {
-              "id": "common-page\`;",
+              "id": "common-page",
               "type": "page",
             },
           ],