@sap/cds-dk 9.2.0 → 9.3.0

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

@@ -1,5 +1,4 @@
-using { AdminService } from '../../srv/admin-service.cds';
-using { sap.capire.bookshop } from '../../db/schema';
+using {AdminService} from '../../srv/admin-service.cds';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -7,13 +6,13 @@ using { sap.capire.bookshop } from '../../db/schema';
 //
 
 annotate AdminService.Books with @(UI: {
-  HeaderInfo       : {
+  HeaderInfo         : {
     TypeName      : '{i18n>Book}',
     TypeNamePlural: '{i18n>Books}',
     Title         : {Value: title},
     Description   : {Value: author.name}
   },
-  Facets: [
+  Facets             : [
     {
       $Type : 'UI.ReferenceFacet',
       Label : '{i18n>General}',
@@ -49,7 +48,7 @@ annotate AdminService.Books with @(UI: {
       Label: '{i18n>Currency}'
     },
   ]},
-  FieldGroup #Admin: {Data: [
+  FieldGroup #Admin  : {Data: [
     {Value: createdBy},
     {Value: createdAt},
     {Value: modifiedBy},
@@ -67,23 +66,23 @@ annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 
 annotate AdminService.Books.texts with @(UI: {
-  Identification: [{Value: title}],
+  Identification : [{Value: title}],
   SelectionFields: [
     locale,
     title
   ],
-  LineItem: [
+  LineItem       : [
     {
       Value: locale,
-      Label: 'Locale'
+      Label: '{i18n>Locale}'
     },
     {
       Value: title,
-      Label: 'Title'
+      Label: '{i18n>Title}'
     },
     {
       Value: descr,
-      Label: 'Description'
+      Label: '{i18n>Description}'
     },
   ]
 });
@@ -105,13 +104,13 @@ annotate AdminService.Books.texts {
 using {sap} from '@sap/cds/common';
 
 extend service AdminService {
-  @readonly entity Languages as projection on sap.common.Languages;
+  @readonly
+  entity Languages as projection on sap.common.Languages;
 }
 
-// Workaround for Fiori popup for asking user to enter a new UUID on Create
-annotate AdminService.Books with {
-  ID @Core.Computed;
-}
+// Workaround for Fiori popups for asking user to enter a valid UUID on Create
+annotate AdminService.Authors : ID with  @Core.Computed  @odata.Type: 'Edm.String';
+annotate AdminService.Books : ID with  @Core.Computed  @odata.Type: 'Edm.String';
 
 // Show Genre as drop down, not a dialog
 annotate AdminService.Books with {

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

@@ -1,57 +1,57 @@
-using { CatalogService } from '../../srv/cat-service.cds';
+using {CatalogService} from '../../srv/cat-service.cds';
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(UI : {
-    HeaderInfo: {
-        TypeName      : '{i18n>Book}',
-        TypeNamePlural: '{i18n>Books}',
-        Title         : {Value: title},
-        Description   : {Value : author}
+annotate CatalogService.Books with @(UI: {
+  HeaderInfo       : {
+    TypeName      : '{i18n>Book}',
+    TypeNamePlural: '{i18n>Books}',
+    Title         : {Value: title},
+    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}'
     },
-    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},
-    ]
+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/common.cds

@@ -2,8 +2,11 @@
  Common Annotations shared by all apps
 */
 
-using { sap.capire.bookshop as my } from '../db/schema';
-using { sap.common, sap.common.Currencies } from '@sap/cds/common';
+using {sap.capire.bookshop as my} from '../db/schema';
+using {
+  sap.common,
+  sap.common.Currencies
+} from '@sap/cds/common';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -11,27 +14,33 @@ using { sap.common, sap.common.Currencies } from '@sap/cds/common';
 //
 annotate my.Books with @(
   Common.SemanticKey: [ID],
-  UI: {
-    Identification: [{ Value: title }],
+  UI                : {
+    Identification : [{Value: title}],
     SelectionFields: [
       ID,
       author_ID,
       price,
       currency_code
     ],
-    LineItem: [
-      { Value: ID, Label: '{i18n>Title}' },
-      { Value: author.ID, Label: '{i18n>Author}' },
-      { Value: genre.name },
-      { Value: stock },
-      { Value: price },
-      { Value: currency.symbol },
+    LineItem       : [
+      {
+        Value: ID,
+        Label: '{i18n>Title}'
+      },
+      {
+        Value: author.ID,
+        Label: '{i18n>Author}'
+      },
+      {Value: genre.name},
+      {Value: stock},
+      {Value: price},
+      {Value: currency.symbol},
     ]
   }
 ) {
-  ID @Common: {
-    SemanticObject: 'Books',
-    Text: title,
+  ID     @Common          : {
+    SemanticObject : 'Books',
+    Text           : title,
     TextArrangement: #TextOnly
   };
   author @ValueList.entity: 'Authors';
@@ -47,14 +56,19 @@ annotate Currencies with {
 //	Books Elements
 //
 annotate my.Books with {
-  ID     @title: '{i18n>ID}';
-  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;
-  stock  @title: '{i18n>Stock}';
-  descr  @title: '{i18n>Description}' @UI.MultiLineText;
-  image  @title: '{i18n>Image}';
+  ID      @title: '{i18n>ID}';
+  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;
+  stock   @title: '{i18n>Stock}';
+  descr   @title: '{i18n>Description}'  @UI.MultiLineText;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -63,35 +77,35 @@ annotate my.Books with {
 //
 annotate my.Genres with @(
   Common.SemanticKey: [name],
-  UI: {
+  UI                : {
     SelectionFields: [name],
-    LineItem: [
-      { Value: name },
+    LineItem       : [
+      {Value: name},
       {
         Value: parent.name,
-        Label: 'Main Genre'
+        Label: '{i18n>MainGenre}'
       },
     ],
   }
 );
 
 annotate my.Genres with {
-  ID  @Common.Text : name  @Common.TextArrangement : #TextOnly;
+  ID  @Common.Text: name  @Common.TextArrangement: #TextOnly;
 }
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details
 //
-annotate my.Genres with @(UI : {
-  Identification: [{ Value: name}],
-  HeaderInfo: {
+annotate my.Genres with @(UI: {
+  Identification: [{Value: name}],
+  HeaderInfo    : {
     TypeName      : '{i18n>Genre}',
     TypeNamePlural: '{i18n>Genres}',
-    Title         : { Value: name },
-    Description   : { Value: ID }
+    Title         : {Value: name},
+    Description   : {Value: ID}
   },
-  Facets: [{
+  Facets        : [{
     $Type : 'UI.ReferenceFacet',
     Label : '{i18n>SubGenres}',
     Target: 'children/@UI.LineItem'
@@ -113,21 +127,21 @@ annotate my.Genres with {
 //
 annotate my.Authors with @(
   Common.SemanticKey: [ID],
-  UI: {
-    Identification : [{ Value: name}],
-    SelectionFields: [ name ],
+  UI                : {
+    Identification : [{Value: name}],
+    SelectionFields: [name],
     LineItem       : [
-      { Value: ID },
-      { Value: dateOfBirth },
-      { Value: dateOfDeath },
-      { Value: placeOfBirth },
-      { Value: placeOfDeath },
+      {Value: ID},
+      {Value: dateOfBirth},
+      {Value: dateOfDeath},
+      {Value: placeOfBirth},
+      {Value: placeOfDeath},
     ],
   }
 ) {
   ID @Common: {
-    SemanticObject: 'Authors',
-    Text: name,
+    SemanticObject : 'Authors',
+    Text           : name,
     TextArrangement: #TextOnly,
   };
 };
@@ -136,14 +150,14 @@ annotate my.Authors with @(
 //
 //	Author Details
 //
-annotate my.Authors with @(UI : {
+annotate my.Authors with @(UI: {
   HeaderInfo: {
     TypeName      : '{i18n>Author}',
     TypeNamePlural: '{i18n>Authors}',
-    Title         : { Value: name },
-    Description   : { Value: dateOfBirth }
+    Title         : {Value: name},
+    Description   : {Value: dateOfBirth}
   },
-  Facets: [{
+  Facets    : [{
     $Type : 'UI.ReferenceFacet',
     Target: 'books/@UI.LineItem'
   }],
@@ -169,12 +183,15 @@ annotate my.Authors with {
 //
 annotate common.Languages with @(
   Common.SemanticKey: [code],
-  Identification: [{ Value: code }],
-  UI: {
-    SelectionFields: [ name, descr ],
-    LineItem: [
-      { Value: code },
-      { Value: name },
+  Identification    : [{Value: code}],
+  UI                : {
+    SelectionFields: [
+      name,
+      descr
+    ],
+    LineItem       : [
+      {Value: code},
+      {Value: name},
     ],
   }
 );
@@ -183,22 +200,22 @@ annotate common.Languages with @(
 //
 //	Language Details
 //
-annotate common.Languages with @(UI : {
-  HeaderInfo: {
+annotate common.Languages with @(UI: {
+  HeaderInfo         : {
     TypeName      : '{i18n>Language}',
     TypeNamePlural: '{i18n>Languages}',
-    Title         : { Value: name },
-    Description   : { Value: descr }
+    Title         : {Value: name},
+    Description   : {Value: descr}
   },
-  Facets: [{
+  Facets             : [{
     $Type : 'UI.ReferenceFacet',
     Label : '{i18n>Details}',
     Target: '@UI.FieldGroup#Details'
   }, ],
-  FieldGroup #Details: {Data : [
-    { Value: code },
-    { Value: name },
-    { Value: descr }
+  FieldGroup #Details: {Data: [
+    {Value: code},
+    {Value: name},
+    {Value: descr}
   ]},
 });
 
@@ -208,16 +225,16 @@ annotate common.Languages with @(UI : {
 //
 annotate common.Currencies with @(
   Common.SemanticKey: [code],
-  Identification: [{ Value: code}],
-  UI: {
+  Identification    : [{Value: code}],
+  UI                : {
     SelectionFields: [
       name,
       descr
     ],
-    LineItem: [
-      { Value: descr },
-      { Value: symbol },
-      { Value: code },
+    LineItem       : [
+      {Value: descr},
+      {Value: symbol},
+      {Value: code},
     ],
   }
 );
@@ -226,24 +243,22 @@ annotate common.Currencies with @(
 //
 //	Currency Details
 //
-annotate common.Currencies with @(UI : {
-  HeaderInfo: {
+annotate common.Currencies with @(UI: {
+  HeaderInfo         : {
     TypeName      : '{i18n>Currency}',
     TypeNamePlural: '{i18n>Currencies}',
-    Title         : { Value: descr },
-    Description   : { Value: code }
+    Title         : {Value: descr},
+    Description   : {Value: code}
   },
-  Facets: [
-    {
-      $Type : 'UI.ReferenceFacet',
-      Label : '{i18n>Details}',
-      Target: '@UI.FieldGroup#Details'
-    }
-  ],
-  FieldGroup #Details: {Data : [
-    { Value: name },
-    { Value: symbol },
-    { Value: code },
-    { Value: descr }
+  Facets             : [{
+    $Type : 'UI.ReferenceFacet',
+    Label : '{i18n>Details}',
+    Target: '@UI.FieldGroup#Details'
+  }],
+  FieldGroup #Details: {Data: [
+    {Value: name},
+    {Value: symbol},
+    {Value: code},
+    {Value: descr}
   ]}
 });

package/lib/init/template/sample/files/db/schema.cds

@@ -1,31 +1,36 @@
-using { Currency, managed, sap } from '@sap/cds/common';
+using {
+  Currency,
+  managed,
+  cuid,
+  sap
+} from '@sap/cds/common';
+
 namespace sap.capire.bookshop;
 
-entity Books : managed {
-  key ID : Integer;
-  @mandatory title  : localized String(111);
-  descr  : localized String(1111);
-  @mandatory author : Association to Authors;
-  genre  : Association to Genres;
-  stock  : Integer;
-  price  : Decimal;
+entity Books : managed, cuid {
+  title    : localized String(111)  @mandatory;
+  descr    : localized String(1111);
+  author   : Association to Authors @mandatory;
+  genre    : Association to Genres;
+  stock    : Integer;
+  price    : Decimal;
   currency : Currency;
-  image : LargeBinary @Core.MediaType : 'image/png';
 }
 
-entity Authors : managed {
-  key ID : Integer;
-  @mandatory name   : String(111);
+entity Authors : managed, cuid {
+  name         : String(111) @mandatory;
   dateOfBirth  : Date;
   dateOfDeath  : Date;
   placeOfBirth : String;
   placeOfDeath : String;
-  books  : Association to many Books on books.author = $self;
+  books        : Association to many Books
+                   on books.author = $self;
 }
 
 /** Hierarchically organized Code List for Genres */
 entity Genres : sap.common.CodeList {
-  key ID   : Integer;
-  parent   : Association to Genres;
-  children : Composition of many Genres on children.parent = $self;
+  key ID       : Integer;
+      parent   : Association to Genres;
+      children : Composition of many Genres
+                   on children.parent = $self;
 }

package/lib/init/template/sample/files/package.json.hbs

@@ -1,3 +1 @@
-{
-  "sapux": ["{{& appPath}}admin-books", "{{& appPath}}browse"]
-}
+{}

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

@@ -1,5 +1,6 @@
-using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService @(requires:'admin') {
-  entity Books as projection on my.Books;
+using {sap.capire.bookshop as my} from '../db/schema';
+
+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,20 +1,37 @@
-using { sap.capire.bookshop as my } from '../db/schema';
+using {sap.capire.bookshop as my} from '../db/schema';
+
 service CatalogService {
 
   /** For displaying lists of Books */
-  @readonly entity ListOfBooks as projection on Books
-  excluding { descr };
+  @readonly
+  entity ListOfBooks as
+    projection on Books
+    excluding {
+      descr
+    };
 
   /** For display in details pages */
-  @readonly entity Books as projection on my.Books { *,
-    author.name as author
-  } excluding { createdBy, modifiedBy };
+  @readonly
+  entity Books       as
+    projection on my.Books {
+      *,
+      author.name as author
+    }
+    excluding {
+      createdBy,
+      modifiedBy
+    };
 
   @requires: 'authenticated-user'
-  action submitOrder (
-    book    : Books:ID @mandatory,
-    quantity: Integer  @mandatory
-  ) returns { stock: Integer };
+  action submitOrder(book : Books : ID  @mandatory,
+                     quantity : Integer @mandatory
+  ) returns {
+    stock                         : Integer
+  };
 
-  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
+  event OrderedBook : {
+    book     : Books : ID;
+    quantity : Integer;
+    buyer    : String
+  };
 }

package/lib/init/template/tiny-sample/files/nodejs/db/schema.cds

@@ -1,7 +1,7 @@
 namespace my.bookshop;
 
 entity Books {
-  key ID : Integer;
-  title  : String;
-  stock  : Integer;
+  key ID    : Integer;
+      title : String;
+      stock : Integer;
 }

package/lib/init/template/typescript/files/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-types": "^0.13.0",
+    "@cap-js/cds-types": "^0.14.0",
     "@types/node": "^22.0.0",
     "tsx": "^4",
     "typescript": "^5"

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

@@ -0,0 +1,22 @@
+const cds = require('../../../cds'), { exists, fs, path } = cds.utils
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+
+module.exports = class extends require('../../plugin') {
+
+  static hasInProduction() {
+    const startPage = path.join(cds.root, cds.env.folders.app, 'index.html')
+    const packageJson = path.join(cds.root, 'package.json')
+    return exists(startPage) && fs.readFileSync(startPage).includes('https://sapui5') ||
+           exists(packageJson) && fs.readFileSync(packageJson).includes('"sapux":')
+  }
+
+  static help() {
+    return 'SAP UI5 integration'
+  }
+
+  async run() {
+    const project = readProject()
+    await merge({ sapux: project.apps.map(({ app }) => project.appPath + app) }).into('package.json')
+  }
+}

package/lib/init/template/workzone-standard/index.js

@@ -46,7 +46,7 @@ module.exports = class extends require('../../plugin') {
       project.uiApp = p
       const manifestPath = join(appPath, p, 'webapp/manifest.json')
       const manifest = exists(manifestPath) ? await read(manifestPath) : {}
-      if (!manifest['sap.app'].crossNavigation.inbounds) {
+      if (!manifest['sap.app']?.crossNavigation?.inbounds) {
         return merge(__dirname, 'files/manifest.json.hbs').into(join(appPath, p, 'webapp/manifest.json'), { project })
       } else {
         return merge({ 'sap.cloud': {