@sap/cds-dk 7.0.1 → 7.0.3

package/lib/init/template/sample/files/app/browse/fiori-service.cds

@@ -0,0 +1,56 @@
+using { CatalogService } from '../../srv/cat-service.cds';
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Object Page
+//
+annotate CatalogService.Books with @(UI : {
+    HeaderInfo: {
+        TypeName      : 'Book',
+        TypeNamePlural: 'Books',
+        Description   : {Value : author}
+    },
+    HeaderFacets: [{
+        $Type : 'UI.ReferenceFacet',
+        Label : '{i18n>Description}',
+        Target: '@UI.FieldGroup#Descr'
+    }, ],
+    Facets: [{
+        $Type : 'UI.ReferenceFacet',
+        Label : '{i18n>Details}',
+        Target: '@UI.FieldGroup#Price'
+    }, ],
+    FieldGroup #Descr: {Data : [{Value : descr}, ]},
+    FieldGroup #Price: {Data : [
+        {Value: price},
+        {
+            Value: currency.symbol,
+            Label: '{i18n>Currency}'
+        },
+    ]},
+});
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books List Page
+//
+annotate CatalogService.Books with @(UI : {
+    SelectionFields: [
+        ID,
+        price,
+        currency_code
+    ],
+    LineItem: [
+        {
+            Value: ID,
+            Label: '{i18n>Title}'
+        },
+        {
+            Value: author,
+            Label: '{i18n>Author}'
+        },
+        {Value: genre.name},
+        {Value: price},
+        {Value: currency.symbol},
+    ]
+});

package/lib/init/template/sample/files/app/browse/webapp/Component.js

@@ -0,0 +1,7 @@
+sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
+	"use strict";
+	return AppComponent.extend("bookshop.Component", {
+		metadata: { manifest: "json" }
+	});
+});
+/* eslint no-undef:0 */

package/lib/init/template/sample/files/app/browse/webapp/i18n/i18n.properties

@@ -0,0 +1,4 @@
+appTitle=Browse Books
+appSubTitle=Find all your favorite books
+appDescription=This application lets you find the next books you want to read.
+appInfo=This is an app info field

package/lib/init/template/sample/files/app/browse/webapp/manifest.json

@@ -0,0 +1,139 @@
+{
+  "_version": "1.49.0",
+  "sap.app": {
+    "id": "bookshop",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
+    "type": "application",
+    "title": "{{appTitle}}",
+    "description": "{{appDescription}}",
+    "i18n": "i18n/i18n.properties",
+    "dataSources": {
+      "CatalogService": {
+        "uri": "/odata/v4/catalog/",
+        "type": "OData",
+        "settings": {
+          "odataVersion": "4.0"
+        }
+      }
+    },
+    "crossNavigation": {
+      "inbounds": {
+        "intent1": {
+          "signature": {
+            "parameters": {
+              "Books.ID": {
+                "renameTo": "ID"
+              },
+              "Authors.books.ID": {
+                "renameTo": "ID"
+              }
+            },
+            "additionalParameters": "ignored"
+          },
+          "semanticObject": "Books",
+          "action": "display",
+          "title": "{{appTitle}}",
+          "info": "{{appInfo}}",
+          "subTitle": "{{appSubTitle}}",
+          "icon": "sap-icon://course-book",
+          "indicatorDataSource": {
+            "dataSource": "CatalogService",
+            "path": "Books/$count",
+            "refresh": 1800
+          }
+        }
+      }
+    }
+  },
+  "sap.ui": {
+    "technology": "UI5",
+    "fullWidth": false,
+    "deviceTypes": {
+      "desktop": true,
+      "tablet": true,
+      "phone": true
+    }
+  },
+  "sap.ui5": {
+    "dependencies": {
+      "minUI5Version": "1.115.1",
+      "libs": {
+        "sap.fe.templates": {}
+      }
+    },
+    "models": {
+      "i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/i18n.properties"
+      },
+      "": {
+        "dataSource": "CatalogService",
+        "settings": {
+          "synchronizationMode": "None",
+          "operationMode": "Server",
+          "autoExpandSelect": true,
+          "earlyRequests": true,
+          "groupProperties": {
+            "default": {
+              "submit": "Auto"
+            }
+          }
+        }
+      }
+    },
+    "routing": {
+      "routes": [
+        {
+          "pattern": ":?query:",
+          "name": "BooksList",
+          "target": "BooksList"
+        },
+        {
+          "pattern": "Books({key}):?query:",
+          "name": "BooksDetails",
+          "target": "BooksDetails"
+        }
+      ],
+      "targets": {
+        "BooksList": {
+          "type": "Component",
+          "id": "BooksList",
+          "name": "sap.fe.templates.ListReport",
+          "options": {
+            "settings": {
+              "entitySet": "Books",
+              "initialLoad": true,
+              "navigation": {
+                "Books": {
+                  "detail": {
+                    "route": "BooksDetails"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "BooksDetails": {
+          "type": "Component",
+          "id": "BooksDetailsList",
+          "name": "sap.fe.templates.ObjectPage",
+          "options": {
+            "settings": {
+              "entitySet": "Books"
+            }
+          }
+        }
+      }
+    },
+    "contentDensities": {
+      "compact": true,
+      "cozy": true
+    }
+  },
+  "sap.fiori": {
+    "registrationIds": [],
+    "archeType": "transactional"
+  }
+}

package/lib/init/template/sample/files/app/common.cds

@@ -10,16 +10,16 @@ using { sap.common, sap.common.Currencies } from '@sap/cds/common';
 //	Books Lists
 //
 annotate my.Books with @(
-  Common.SemanticKey : [ID],
-  UI                 : {
-    Identification  : [{ Value: title }],
-    SelectionFields : [
+  Common.SemanticKey: [ID],
+  UI: {
+    Identification: [{ Value: title }],
+    SelectionFields: [
       ID,
       author_ID,
       price,
       currency_code
     ],
-    LineItem        : [
+    LineItem: [
       { Value: ID, Label: '{i18n>Title}' },
       { Value: author.ID, Label: '{i18n>Author}' },
       { Value: genre.name },
@@ -29,16 +29,16 @@ annotate my.Books with @(
     ]
   }
 ) {
-  ID  @Common: {
-    SemanticObject : 'Books',
+  ID @Common: {
+    SemanticObject: 'Books',
     Text: title,
-    TextArrangement : #TextOnly
+    TextArrangement: #TextOnly
   };
-  author @ValueList.entity      : 'Authors';
+  author @ValueList.entity: 'Authors';
 };
 
 annotate Currencies with {
-  symbol @Common.Label : '{i18n>Currency}';
+  symbol @Common.Label: '{i18n>Currency}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -46,10 +46,10 @@ annotate Currencies with {
 //	Books Details
 //
 annotate my.Books with @(UI : {HeaderInfo : {
-  TypeName       : '{i18n>Book}',
-  TypeNamePlural : '{i18n>Books}',
-  Title          : { Value: title },
-  Description    : { Value: author.name }
+  TypeName      : '{i18n>Book}',
+  TypeNamePlural: '{i18n>Books}',
+  Title         : { Value: title },
+  Description   : { Value: author.name }
 }, });
 
 
@@ -62,9 +62,9 @@ annotate my.Books with {
   title  @title: '{i18n>Title}';
   genre  @title: '{i18n>Genre}'   @Common: { Text: genre.name, TextArrangement: #TextOnly };
   author @title: '{i18n>Author}'  @Common: { Text: author.name, TextArrangement: #TextOnly };
-  price  @title: '{i18n>Price}'   @Measures.ISOCurrency : currency_code;
+  price  @title: '{i18n>Price}'   @Measures.ISOCurrency: currency_code;
   stock  @title: '{i18n>Stock}';
-  descr  @title: '{i18n>Description}'  @UI.MultiLineText;
+  descr  @title: '{i18n>Description}' @UI.MultiLineText;
   image  @title: '{i18n>Image}';
 }
 
@@ -73,13 +73,13 @@ annotate my.Books with {
 //	Genres List
 //
 annotate my.Genres with @(
-  Common.SemanticKey : [name],
-  UI                 : {
-    SelectionFields : [name],
-    LineItem        : [
+  Common.SemanticKey: [name],
+  UI: {
+    SelectionFields: [name],
+    LineItem: [
       { Value: name },
       {
-        Value : parent.name,
+        Value: parent.name,
         Label: 'Main Genre'
       },
     ],
@@ -95,17 +95,17 @@ annotate my.Genres with {
 //	Genre Details
 //
 annotate my.Genres with @(UI : {
-  Identification : [{ Value: name}],
-  HeaderInfo     : {
-    TypeName       : '{i18n>Genre}',
-    TypeNamePlural : '{i18n>Genres}',
-    Title          : { Value: name },
-    Description    : { Value: ID }
+  Identification: [{ Value: name}],
+  HeaderInfo: {
+    TypeName      : '{i18n>Genre}',
+    TypeNamePlural: '{i18n>Genres}',
+    Title         : { Value: name },
+    Description   : { Value: ID }
   },
-  Facets         : [{
-    $Type  : 'UI.ReferenceFacet',
-    Label  : '{i18n>SubGenres}',
-    Target : 'children/@UI.LineItem'
+  Facets: [{
+    $Type : 'UI.ReferenceFacet',
+    Label : '{i18n>SubGenres}',
+    Target: 'children/@UI.LineItem'
   }, ],
 });
 
@@ -123,11 +123,11 @@ annotate my.Genres with {
 //	Authors List
 //
 annotate my.Authors with @(
-  Common.SemanticKey : [ID],
-  UI                 : {
-    Identification  : [{ Value: name}],
-    SelectionFields : [name],
-    LineItem        : [
+  Common.SemanticKey: [ID],
+  UI: {
+    Identification : [{ Value: name}],
+    SelectionFields: [ name ],
+    LineItem       : [
       { Value: ID },
       { Value: dateOfBirth },
       { Value: dateOfDeath },
@@ -136,10 +136,10 @@ annotate my.Authors with @(
     ],
   }
 ) {
-  ID  @Common: {
-    SemanticObject : 'Authors',
+  ID @Common: {
+    SemanticObject: 'Authors',
     Text: name,
-    TextArrangement : #TextOnly,
+    TextArrangement: #TextOnly,
   };
 };
 
@@ -148,16 +148,16 @@ annotate my.Authors with @(
 //	Author Details
 //
 annotate my.Authors with @(UI : {
-  HeaderInfo : {
-    TypeName       : '{i18n>Author}',
-    TypeNamePlural : '{i18n>Authors}',
-    Title          : { Value: name },
-    Description    : { Value: dateOfBirth }
+  HeaderInfo: {
+    TypeName      : '{i18n>Author}',
+    TypeNamePlural: '{i18n>Authors}',
+    Title         : { Value: name },
+    Description   : { Value: dateOfBirth }
   },
-  Facets     : [{
-    $Type  : 'UI.ReferenceFacet',
-    Target : 'books/@UI.LineItem'
-  }, ],
+  Facets: [{
+    $Type : 'UI.ReferenceFacet',
+    Target: 'books/@UI.LineItem'
+  }],
 });
 
 
@@ -179,14 +179,11 @@ annotate my.Authors with {
 //	Languages List
 //
 annotate common.Languages with @(
-  Common.SemanticKey : [code],
-  Identification     : [{ Value: code}],
-  UI                 : {
-    SelectionFields : [
-      name,
-      descr
-    ],
-    LineItem        : [
+  Common.SemanticKey: [code],
+  Identification: [{ Value: code }],
+  UI: {
+    SelectionFields: [ name, descr ],
+    LineItem: [
       { Value: code },
       { Value: name },
     ],
@@ -198,18 +195,18 @@ annotate common.Languages with @(
 //	Language Details
 //
 annotate common.Languages with @(UI : {
-  HeaderInfo          : {
-    TypeName       : '{i18n>Language}',
-    TypeNamePlural : '{i18n>Languages}',
-    Title          : { Value: name },
-    Description    : { Value: descr }
+  HeaderInfo: {
+    TypeName      : '{i18n>Language}',
+    TypeNamePlural: '{i18n>Languages}',
+    Title         : { Value: name },
+    Description   : { Value: descr }
   },
-  Facets              : [{
-    $Type  : 'UI.ReferenceFacet',
-    Label  : '{i18n>Details}',
-    Target : '@UI.FieldGroup#Details'
+  Facets: [{
+    $Type : 'UI.ReferenceFacet',
+    Label : '{i18n>Details}',
+    Target: '@UI.FieldGroup#Details'
   }, ],
-  FieldGroup #Details : {Data : [
+  FieldGroup #Details: {Data : [
     { Value: code },
     { Value: name },
     { Value: descr }
@@ -221,14 +218,14 @@ annotate common.Languages with @(UI : {
 //	Currencies List
 //
 annotate common.Currencies with @(
-  Common.SemanticKey : [code],
-  Identification     : [{ Value: code}],
-  UI                 : {
-    SelectionFields : [
+  Common.SemanticKey: [code],
+  Identification: [{ Value: code}],
+  UI: {
+    SelectionFields: [
       name,
       descr
     ],
-    LineItem        : [
+    LineItem: [
       { Value: descr },
       { Value: symbol },
       { Value: code },
@@ -241,20 +238,20 @@ annotate common.Currencies with @(
 //	Currency Details
 //
 annotate common.Currencies with @(UI : {
-  HeaderInfo           : {
-    TypeName       : '{i18n>Currency}',
-    TypeNamePlural : '{i18n>Currencies}',
-    Title          : { Value: descr },
-    Description    : { Value: code }
+  HeaderInfo: {
+    TypeName      : '{i18n>Currency}',
+    TypeNamePlural: '{i18n>Currencies}',
+    Title         : { Value: descr },
+    Description   : { Value: code }
   },
-  Facets               : [
+  Facets: [
     {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Details}',
-      Target : '@UI.FieldGroup#Details'
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Details}',
+      Target: '@UI.FieldGroup#Details'
     }
   ],
-  FieldGroup #Details  : {Data : [
+  FieldGroup #Details: {Data : [
     { Value: name },
     { Value: symbol },
     { Value: code },

package/lib/init/template/sample/files/app/services.cds

@@ -2,4 +2,5 @@
   This model controls what gets served to Fiori frontends...
 */
 using from './common';
+using from './browse/fiori-service';
 using from './admin-books/fiori-service';

package/lib/init/template/sample/files/srv/admin-service.cds

@@ -1,5 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService @(requires:'admin', path:'/admin') {
+service AdminService @(requires:'admin') {
   entity Books as projection on my.Books;
   entity Authors as projection on my.Authors;
 }

package/lib/init/template/sample/files/srv/cat-service.cds

@@ -1,5 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service CatalogService @(path:'/browse') {
+service CatalogService {
 
   /** For displaying lists of Books */
   @readonly entity ListOfBooks as projection on Books

package/lib/init/template/sample/index.js

@@ -6,7 +6,7 @@ const { copyFiles } = require('../../util/template')
 module.exports = class SampleTemplate extends require('../templateBase') {
 
     async canRun() {
-        const { isJava } = await readProject(this.options)
+        const { isJava } = await readProject()
         if (isJava) throw `'cds add sample' is not available for Java yet`
         return true
     }
@@ -14,11 +14,12 @@ module.exports = class SampleTemplate extends require('../templateBase') {
     async run() {
         const { db, srv, app } = (await this.getEnv()).folders
         const language = exists('pom.xml') ? 'java' : 'nodejs'
+        const { force } = cds.cli.options
         await Promise.all([
-          copyFiles(join(__dirname, 'files', 'db'),  db, {}, this.options.force),
-          copyFiles(join(__dirname, 'files', 'app'), app, {}, this.options.force),
-          copyFiles(join(__dirname, 'files', 'srv'), srv, {}, this.options.force),
-          copyFiles(join(__dirname, 'files', language), srv, {}, this.options.force)
+          copyFiles(join(__dirname, 'files', 'db'),  db, {}, force),
+          copyFiles(join(__dirname, 'files', 'app'), app, {}, force),
+          copyFiles(join(__dirname, 'files', 'srv'), srv, {}, force),
+          copyFiles(join(__dirname, 'files', language), srv, {}, force)
         ])
     }
 }

package/lib/init/template/sqlite/index.js

@@ -7,7 +7,7 @@ const { mergeJSON } = require('../../util/merge')
 module.exports = class SQLiteTemplate extends require('../templateBase') {
 
     async run() {
-      const project = await readProject(this.options)
+      const project = await readProject()
       const { configFile } = project
       project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
       await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)

package/lib/init/template/templateBase.js

@@ -1,25 +1,14 @@
-const cds = require('../../cds');
-const path = require('path');
-
-const { PROJECT_TYPE } = require('../constants');
-const { exists } = require('../../cds').utils;
+const cds = require('../../cds')
+const { exists } = require('../../cds').utils
+const { PROJECT_TYPE } = require('../constants')
 
 module.exports = class TemplateBase {
+
     /**
      * @constructor
      */
-    constructor(generator) {
-        if (generator.options?.for && typeof generator.options?.for !== 'string') {
-            throw new Error('The --for argument must not be empty.')
-        }
-        this.projectPath = cds.root;
-        this.options = generator.options || {};
-        this.generator = generator;
+    constructor() {
         this.name = this.constructor.name.replace(/template/i, '').replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase()
-
-        this.cwd = this.options.cwd || process.cwd();
-
-        this.projectName = path.basename(cds.root);
     }
 
     /**
@@ -51,7 +40,7 @@ module.exports = class TemplateBase {
     }
 
     // eslint-disable-next-line no-unused-vars
-    static hasFacet(env, options) {
+    static hasFacet(env) {
         return true;
     }
 
@@ -85,13 +74,14 @@ module.exports = class TemplateBase {
     }
 
     /**
+     * @abstract
      * Executes steps for related facets that are set up for the project.
      */
     async runRelatedMerging() {
         for (const facet of this.getRelatedFacets()) {
             const Template = require('./'+facet)
-            const template = new Template(this.generator)
-            if (Template.hasFacet(await this.getEnv(), this.options)) await template.runDependentMerging()
+            const template = new Template()
+            if (Template.hasFacet(await this.getEnv())) await template.runDependentMerging()
         }
     }
 

package/lib/init/template/tiny-sample/index.js

@@ -16,15 +16,15 @@ module.exports = class TinySampleTemplate extends require('../templateBase') {
     }
 
     async _addJavaSamples() {
-        if (!this.options.add.has(JAVA)) {
-            const mvnAddSamplesArgs = mvnArchetypes.getAddSamplesCmdArgs(this.options)
+        if (!cds.cli.options.add.has(JAVA)) {
+            const mvnAddSamplesArgs = mvnArchetypes.getAddSamplesCmdArgs()
             try {
                 await commandUtil.spawnCommand('mvn', mvnAddSamplesArgs, { cwd: cds.root })
-                const mvnAddTestsArgs = mvnArchetypes.getAddTestsCmdArgs(this.options)
+                const mvnAddTestsArgs = mvnArchetypes.getAddTestsCmdArgs()
                 await commandUtil.spawnCommand('mvn', mvnAddTestsArgs, { cwd: cds.root })
             } catch (err) {
                 if (err.code === 'ENOENT' && err.path === 'mvn') {
-                    throw new Error(`Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`)
+                    throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
                 }
                 throw err
             }
@@ -33,7 +33,7 @@ module.exports = class TinySampleTemplate extends require('../templateBase') {
 
     async _addNodejsSamples() {
         const { db, srv } = (await this.getEnv()).folders
-        await copyFiles(join(__dirname, 'files', 'nodejs', 'db'), db, {}, this.options.force)
-        await copyFiles(join(__dirname, 'files', 'nodejs', 'srv'), srv, { dbFolder: db.replace(/[\\/]+$/, '') }, this.options.force)
+        await copyFiles(join(__dirname, 'files', 'nodejs', 'db'), db, {}, cds.cli.options.force)
+        await copyFiles(join(__dirname, 'files', 'nodejs', 'srv'), srv, { dbFolder: db.replace(/[\\/]+$/, '') }, cds.cli.options.force)
     }
 }

package/lib/init/template/toggles/index.js

@@ -9,10 +9,9 @@ module.exports = class TogglesTemplate extends require('../templateBase') {
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { isNodejs , configFile} = project
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
     if (isNodejs) await sort('package.json', 'dependencies')
-    await this.runDependentMerging()
   }
 }

package/lib/init/template/typer/files/xsconfig.json

@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "checkJs": true,
     "moduleResolution": "nodenext",
     "paths": {
       "#cds-models/*": ["./@cds-models/*"]

package/lib/init/template/typer/index.js

@@ -7,7 +7,7 @@ const { exists, read } = require('../../../cds').utils
 
 module.exports = class TyperTemplate extends require('../templateBase') {
   async canRun() {
-    const { isJava } = await readProject(this.options)
+    const { isJava } = await readProject()
     if (isJava) {
       console.warn(warn(`This appears to be a Java project. 'cds add ${TYPER}' is intended to be used in Node.js projects. Proceeding anyway.\n`))
     }