@sap/cds-dk 8.2.2 → 8.3.0

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

@@ -5,6 +5,7 @@ const { bold } = require('../../../util/term')
 const { copyRenderedYAML } = require('../../../util/fs')
 const { readProject } = require('../../projectReader')
 const { merge, sort } = require('../../merge')
+const { mvn } = require('../../add')
 
 module.exports = class MtaTemplate extends require('../../plugin') {
 
@@ -23,6 +24,7 @@ module.exports = class MtaTemplate extends require('../../plugin') {
         }
         await merge(__dirname, 'files/package.json').into('package.json')
         await sort('package.json', 'devDependencies')
+        if (project.isJava) await mvn.add('cf')
     }
 
     async finalize() {

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

@@ -1,7 +1,7 @@
 const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge, mergeGitignore } = require('../../merge')
-const { warn, dim } = require('../../../util/term')
+const { warn, dim, bold } = require('../../../util/term')
 const { TYPER } = require('../../constants').OPTIONS
 const { exists, read } = require('../../../cds').utils
 
@@ -30,6 +30,7 @@ module.exports = class TyperTemplate extends require('../../plugin') {
     await merge(template('package.json')).into('package.json')
     await mergeGitignore('.gitignore', template('gitignore'))
     console.log(dim(`  Adding '@cds-models' to .gitignore to ignore generated types`)) // REVISIT: other facets are silent wrt. what they change
+    console.log(dim('  Added new dependencies to the project. Run ') + bold('npm i') + dim(' to install.'))
     try {
       await merge(source).into(target)
     } catch (e) {

package/lib/init/template/workzone-standard/files/manifest.json.hbs

@@ -1,6 +1,20 @@
 {
+  "sap.app": {
+    "crossNavigation": {
+      "inbounds": {
+        "{{uiApp}}-display": {
+          "semanticObject": "{{uiApp}}",
+          "action": "display",
+          "signature": {
+            "parameters": {},
+            "additionalParameters": "allowed"
+          }
+        }
+      }
+    }
+  },
   "sap.cloud": {
     "public": true,
-    "service": "{{appName}}.service"
+    "service": "{{strippedAppName}}.service"
   }
 }

package/lib/init/template/workzone-standard/files/mta.yaml.hbs

@@ -1,5 +1,13 @@
 ---
 modules:
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
+        properties:
+          srv-url: ${default-url}
+
   - name: {{appName}}-destinations
     type: com.sap.application.content
     requires:
@@ -25,13 +33,14 @@ modules:
             - Name: {{appName}}-html5-repository
               ServiceInstanceName: {{appName}}-html5-repo-host
               ServiceKeyName: {{appName}}-html5-repo-host-key
-              sap.cloud.service: {{appName}}.service
+              sap.cloud.service: {{strippedAppName}}.service
             - Name: {{appName}}-auth
               Authentication: OAuth2UserTokenExchange
               ServiceInstanceName: {{appName}}-auth
               ServiceKeyName: {{appName}}-auth-key
-              sap.cloud.service: {{appName}}.service
+              sap.cloud.service: {{strippedAppName}}.service
 
+resources:
   - name: {{appName}}-destination
     type: org.cloudfoundry.managed-service
     parameters:

package/lib/init/template/workzone-standard/files/xs-app.json.hbs

@@ -0,0 +1,18 @@
+{
+  "authenticationMethod": "route",
+  "routes": [
+    {
+      "source": "^/?odata/(.*)$",
+      "target": "/odata/$1",
+      "destination": "{{appName}}-srv-api",
+      {{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}
+      "csrfProtection": true
+    },
+    {
+      "source": "^(.*)$",
+      "target": "$1",
+      "service": "html5-apps-repo-rt"{{#hasXsuaa}},
+      "authenticationType": "xsuaa"{{/hasXsuaa}}
+    }
+  ]
+}

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

@@ -2,7 +2,8 @@ const cds = require('../../../cds')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { join } = require('path')
-const { destination, destinations } = require('../../registries/mta')
+const { destination, destinations, srv4 } = require('../../registries/mta')
+const { odataApi } = require('../../registries/xs-app')
 
 module.exports = class extends require('../../plugin') {
 
@@ -28,19 +29,36 @@ module.exports = class extends require('../../plugin') {
     async run() {
       const project = readProject()
       const { appUIPaths, appPath } = project
-      await Promise.all(appUIPaths.map(p =>
-        merge(__dirname, 'files/manifest.json.hbs').into(join(appPath, p, 'webapp/manifest.json'), { project })
-      ))
+      await Promise.all(appUIPaths.map(p => {
+        project.uiApp = p
+        return merge(__dirname, 'files/manifest.json.hbs').into(join(appPath, p, 'webapp/manifest.json'), { project })
+      }))
       await merge({ cds: { requires: { workzone: true } } }).into('package.json')
     }
 
     async combine() {
       const project = readProject()
-      const { hasMta } = project
+      const { hasMta, srvPath, apps, appPath } = project
+
+      await Promise.all(apps.map(async ({app}) => {
+        const additions = [odataApi]
+        const overwrites = [{
+          item: [odataApi, 'destination'],
+          withValue: `${project.appName}-srv-api`
+        }]
+        project.app = app
+        await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions, overwrites })
+      }))
 
       if (hasMta) {
-          const additions = [destinations, destination]
-          await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions })
+        const srv = srv4(srvPath)
+        const additions = [srv, destinations, destination,
+          {
+            in: [destination, 'requires'],
+            where: { name: 'srv-api' }
+          }
+        ]
+        await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions })
       }
   }
 }

package/lib/mtx/auth_manager.js

@@ -67,7 +67,7 @@ function reqParams(method, params) {
 }
 
 async function fetchToken(params) {
-    if (params.has('token') || !(params.has('refreshToken') || params.has('passcode') || !params.has('passcodeUrl'))) {
+    if (params.has('token') || !(params.has('refreshToken') || params.has('passcode') || params.has('clientid') || !params.has('passcodeUrl'))) {
         return;
     }
 
@@ -99,18 +99,20 @@ async function fetchToken(params) {
     if (error) {
         let message;
         if (REASONS.invalid_scope.test(error.message)) {
-            message = 'token has invalid scope. Check if your user has the required roles';
+            message = 'token has invalid scope. Ensure your user has the required roles';
         } else if (error.status === 404) {
-            message = 'token endpoint not found. Check if MTX is running with extensibility enabled';
+            message = 'token endpoint not found. Ensure that MTX is running with extensibility enabled';
         } else if (error.message.includes('<html')) { // should already be caught when fetching passcode URL
-            message = 'HTML response received. Check if route to MTX is configured correctly in App Router';
+            message = 'HTML response received. Ensure the route to MTX is configured correctly in App Router';
         } else if (error.status === 401) {
             message = `invalid credentials`;
             if (params.has('passcode')) {
-                message += `. Check if passcode is correct`;
+                message += `. Ensure the passcode is correct`;
                 if (params.has('passcodeUrl')) {
                     message += `. Passcode URL: ${params.get('passcodeUrl')}`;
                 }
+            } else if (params.has('clientid')) {
+                message += `. Ensure the client credentials are correct`;
             }
         } else {
             message = 'error on token request';

package/lib/mtx/util/errors.js

@@ -5,11 +5,11 @@ function handleHttpError(error, params, { url, command } = {}) {
     const prefix = `Request to ${url} failed`;
     switch (error.status) {
         case 401:
-            throw getMessage(`${prefix}: invalid authentication.\nRetry with valid passcode${
-                params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''
-            } or username/password (required if SaaS app is configured with mocked-auth).`, { error, command });
+            throw getMessage(`${prefix}: invalid authentication` + (
+                params.has('username') ? `. Ensure that username and password are correct` : ''
+            ), { error, command });
         case 403:
-            throw getMessage(prefix + ': insufficient authorization. Ensure client has all necessary roles.', { error, command });
+            throw getMessage(prefix + ': insufficient authorization. Ensure the user has all necessary roles.', { error, command });
         case 404:
             throw getMessage(prefix + ': resource not found.', { error, command });
         case 422:

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.2.2",
+  "version": "8.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.2.2",
+      "version": "8.3.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -54,7 +54,7 @@
       }
     },
     "node_modules/@cap-js/openapi": {
-      "version": "1.0.5",
+      "version": "1.0.6",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "pluralize": "^8.0.0"
@@ -99,7 +99,7 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
+      "version": "4.11.1",
       "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -117,6 +117,13 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/core": {
+      "version": "0.6.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "3.1.0",
       "license": "MIT",
@@ -139,7 +146,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.10.0",
+      "version": "9.11.1",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -153,7 +160,7 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.1.0",
+      "version": "0.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "levn": "^0.4.1"
@@ -214,7 +221,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.2.2",
+      "version": "8.3.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -240,7 +247,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.2.0",
+      "version": "5.3.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -276,7 +283,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.1.0",
+      "version": "2.2.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -288,7 +295,7 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "3.0.5",
+      "version": "3.1.0",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=7",
@@ -302,13 +309,13 @@
       }
     },
     "node_modules/@sap/hdi": {
-      "version": "4.5.2",
+      "version": "4.6.0",
       "license": "See LICENSE file",
       "dependencies": {
-        "async": "3.2.3"
+        "async": "^3.2.3"
       },
       "engines": {
-        "node": ">=12 <=20"
+        "node": ">=18 <=20"
       },
       "peerDependencies": {
         "@sap/hana-client": "^2 >= 2.5",
@@ -324,16 +331,15 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "5.2.3",
-      "hasInstallScript": true,
+      "version": "5.3.2",
       "license": "See LICENSE file",
       "dependencies": {
-        "@sap/hdi": "4.5.2",
-        "@sap/xsenv": "5.2.0",
-        "async": "3.2.6",
-        "dotenv": "16.4.5",
-        "handlebars": "4.7.8",
-        "micromatch": "4.0.8"
+        "@sap/hdi": "^4.6.0",
+        "@sap/xsenv": "^5.2.0",
+        "async": "^3.2.6",
+        "dotenv": "^16.4.5",
+        "handlebars": "^4.7.8",
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": "^18.0.0 || ^20.0.0"
@@ -351,22 +357,26 @@
         }
       }
     },
-    "node_modules/@sap/hdi/node_modules/async": {
-      "version": "3.2.3",
-      "license": "MIT"
-    },
     "node_modules/@sap/xsenv": {
-      "version": "5.2.0",
+      "version": "5.3.0",
       "license": "SEE LICENSE IN LICENSE file",
       "dependencies": {
-        "debug": "4.3.5",
-        "node-cache": "^5.1.0",
+        "debug": "4.3.7",
+        "node-cache": "^5.1.2",
         "verror": "1.10.1"
       },
       "engines": {
         "node": "^18.0.0 || ^20.0.0"
       }
     },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "license": "MIT"
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "license": "MIT"
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "license": "MIT",
@@ -734,10 +744,10 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.7",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -880,18 +890,21 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.10.0",
+      "version": "9.11.1",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.11.0",
         "@eslint/config-array": "^0.18.0",
+        "@eslint/core": "^0.6.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.10.0",
-        "@eslint/plugin-kit": "^0.1.0",
+        "@eslint/js": "9.11.1",
+        "@eslint/plugin-kit": "^0.2.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -937,7 +950,7 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.0.2",
+      "version": "8.1.0",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -951,7 +964,7 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.0.0",
+      "version": "4.1.0",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -961,12 +974,12 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.1.0",
+      "version": "10.2.0",
       "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.12.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.0.0"
+        "eslint-visitor-keys": "^4.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1364,7 +1377,7 @@
       }
     },
     "node_modules/hdb": {
-      "version": "0.19.9",
+      "version": "0.19.10",
       "license": "Apache-2.0",
       "dependencies": {
         "iconv-lite": "^0.4.18"
@@ -1649,7 +1662,7 @@
       "optional": true
     },
     "node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT"
     },
     "node_modules/mustache": {
@@ -1680,7 +1693,7 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.67.0",
+      "version": "3.68.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2089,10 +2102,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "license": "MIT"
-    },
     "node_modules/serve-static": {
       "version": "1.16.2",
       "license": "MIT",

package/package.json

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