@sap/cds-dk 7.0.1 → 7.0.2

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": "/browse/",
+        "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/templateBase.js

@@ -10,7 +10,7 @@ module.exports = class TemplateBase {
      */
     constructor(generator) {
         if (generator.options?.for && typeof generator.options?.for !== 'string') {
-            throw new Error('The --for argument must not be empty.')
+            throw 'The --for argument must not be empty.'
         }
         this.projectPath = cds.root;
         this.options = generator.options || {};

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

@@ -24,7 +24,7 @@ module.exports = class TinySampleTemplate extends require('../templateBase') {
                 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
             }

package/lib/init/util/mvn.js

@@ -164,7 +164,7 @@ class MvnArchetypeUtil {
         if (packageFromParam) {
             // explicitly specified, so do not modify
             if (!options.force && !packageFromParam.match(REGEX_JAVA_PACKAGE)) {
-                throw new Error(`Package '${packageFromParam}' is an invalid Java package name. Use --force to use it anyway.`);
+                throw `Package '${packageFromParam}' is an invalid Java package name. Use --force to use it anyway.`
             }
         } else {
             // potentially overwritten by mvn param

package/lib/init/util/projectReader.js

@@ -56,7 +56,7 @@ module.exports = new class ProjectReader {
             get hasHtml5Repo()   { return _hasFacet('html5-repo') },
             get hasMta()         { return _hasFacet('mta') },
             get hasHelm()        { return _hasFacet('helm') },
-            get appPath()        { return env.folders.app },
+            get appPath()        { return env.folders.app ?? 'app' },
         }
 
         // setting the effective env as it might have changed by already executed 'add' commands, e.g. cds init foo --add hana,mta
@@ -102,7 +102,7 @@ module.exports = new class ProjectReader {
             const dependencies = pom?.dependencies?.[0]?.dependency
             const isOldJavaRuntime = [...dependencies].some(d => /com\.sap\.cloud\.servicesdk/.test(d?.groupId?.[0]))
             if (isOldJavaRuntime) {
-                throw new Error("Projects using the classic CAP Java SDK are not supported")
+                throw "Projects using the classic CAP Java SDK are not supported"
             }
 
             const descriptor = { archiveName: path.basename(cds.root) + "-exec.jar" }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.0.1",
+      "version": "7.0.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -29,17 +29,6 @@
         "cds": "bin/cds.js",
         "cds-ts": "bin/cds-ts.js"
       },
-      "devDependencies": {
-        "@types/jest": "^29",
-        "chai": "^4.3.7",
-        "chai-as-promised": "^7.1.1",
-        "chai-subset": "^1.6.0",
-        "eslint-plugin-cds-dk": "file:.eslint",
-        "jest": "^29",
-        "semver": "^7",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.0.4"
-      },
       "optionalDependencies": {
         "sqlite3": "^5.0.4"
       }
@@ -72,12 +61,12 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.3",
+      "version": "2.1.0",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -93,7 +82,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.43.0",
+      "version": "8.44.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -201,7 +190,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.0.0",
+      "version": "7.0.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=3.9",
@@ -591,7 +580,7 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.9.0",
+      "version": "8.10.0",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -1110,13 +1099,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.43.0",
+      "version": "8.44.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.43.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1128,7 +1117,7 @@
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -1148,7 +1137,7 @@
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
@@ -1188,10 +1177,10 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.2",
+      "version": "9.6.0",
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.4.1"
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

package/lib/init/template/kibana-logging/files/cds.package.json

@@ -1,7 +0,0 @@
-{
-  "cds": {
-    "features": {
-      "kibana_formatter": true
-    }
-  }
-}

package/lib/init/template/kibana-logging/files/mta.yaml.hbs

@@ -1,14 +0,0 @@
----
-modules:
-  - name: {{appName}}-srv
-    type: {{language}}
-    path: {{& srvPath}}
-    requires:
-      - name: {{appName}}-cf-logging
-
-resources:
-  - name: {{appName}}-cf-logging
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: application-logs
-      service-plan: lite

package/lib/init/template/kibana-logging/index.js

@@ -1,45 +0,0 @@
-const { join } = require('path')
-const cds = require('../../../cds')
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { srvNode4, srvJava4, kibanaLogging } = require('../_merging/registry-mta')
-
-module.exports = class KibanaLoggingTemplate extends require('../templateBase') {
-
-    async canRun() {
-        const { hasMta, hasHelm } = await readProject(this.options)
-        if (hasHelm && !hasMta) {
-            throw `'cds add kibana-logging' is not available for Kyma yet`
-        }
-        return true
-    }
-
-    async run() {
-        const project = await readProject(this.options)
-        const { isJava } = project
-        if (isJava) cds.error(`kibana-logging is not implemented for project type Java yet`)
-        await mergeJSON('package.json', join(__dirname, 'files', 'package.json.hbs'), project)
-        await this.runDependentMerging()
-    }
-
-    async runDependentMerging() {
-        const project = await readProject(this.options)
-        const { hasMta, isNodejs, srvPath } = project
-
-        if (hasMta) {
-            const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
-            await mergeYAML(
-                'mta.yaml',
-                join(__dirname, 'files', 'mta.yaml.hbs'),
-                project,
-                {
-                    additions: [srv, kibanaLogging],
-                    relationships: [{
-                        insert: [kibanaLogging, 'name'],
-                        into: [srv, 'requires', 'name']
-                    }],
-                }
-            )
-        }
-    }
-}