@sap/cds-dk 7.2.0 → 7.3.1

package/bin/activate.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(activate, {
     options: ['--subdomain', '--passcode', '--username', '--clientid', '--to', '--sync'],
     flags: ['--undeploy', '--wsdl'],
-    shortcuts: ['-s', '-p', '-u', '-c'],
+    shortcuts: ['-s', '-p', '-u', '-c', '-2'],
     help: `
 # SYNOPSIS
 
@@ -55,7 +55,7 @@ module.exports = Object.assign(activate, {
 
     *cds push* to push an extension to a SaaS app based on current MTX Services
     (@sap/cds-mtxs).
-    
+
     https://cap.cloud.sap/docs/guides/multitenancy/mtxs for information on
     @sap/cds-mtxs.
 

package/bin/add.js

@@ -33,7 +33,7 @@ module.exports = Object.assign(add, {
 
     *redis-messaging*       - add support for Redis messaging
 
-    *kibana-logging*        - add support for Kibana formatting
+    *kibana*                - add support for Kibana formatting
 
     *mta*                   - add support for MTA-based deployment
 

package/bin/build.js

@@ -1,6 +1,7 @@
 module.exports = Object.assign(build, {
-    options: ['--project', '--src', '--dest', '--for', '--workspaces', '--use', '--opts', '--log-level', '--options-model', '--clean'],
-    shortcuts: ['-in', '-s', '-o', '-4', '-ws'],
+    options: ['--project', '--src', '--dest', '--for', '--use', '--opts', '--log-level', '--options-model'],
+    shortcuts: ['-in', '-s', '-o', '-4'],
+    flags: ['--ws', '--clean'],
     help: `
 # SYNOPSIS
 
@@ -88,11 +89,13 @@ module.exports = Object.assign(build, {
 async function build([project], options = {}) {
     const path = require('path')
     const cds = require('../lib/cds')
+    
+    // plugins are loaded based on cds.root path
+    cds.root = path.resolve(process.cwd(), project || options.project || '.')
 
     // IMPORTANT: call plugins before subsequent access to cds.env
     await cds.plugins
 
-        cds.root = path.resolve(process.cwd(), project || options.project || '.')
     cds.env = cds.env.for('cds', cds.root);
     delete options.project // avoid that relative project paths are resolved twice
 

package/bin/compile/index.js

@@ -114,7 +114,7 @@ module.exports = Object.assign ( compile, {
     The servers definition used in the generated OpenAPI document. *--openapi:url* is
     ignored when this option is specified.
 
-    *--odata-version* 4.0|4.01 
+    *--odata-version* 4.0|4.01
 
     Adds the OData version's functionality of the input CDS/CSN file to the generated OpenAPI document.
 
@@ -126,7 +126,7 @@ module.exports = Object.assign ( compile, {
 
     A single AsyncAPI document is generated using the details of all input services. Information of _title_
     and _version_ should be provided as preset.
-    
+
 # EXAMPLES
 
    *cds* compile model.cds
@@ -136,11 +136,13 @@ module.exports = Object.assign ( compile, {
 
 `})
 
-function compile_all (root='.') {
+async function compile_all (root='.') {
 
   const {exec} = require ('child_process')
   const cds = require('../../lib') // get the enhanced cds w/ additional compile processors
 
+  await cds.plugins // ensure plugins that extend compile targets are loaded
+
   exec(`find ${root} -name *.cds ! -path '*/node_modules/*'`, (_,stdout)=>{
     const all = stdout.split('\n').slice(0,-1)
     const info = `\n/ compiled ${all.length} cds models in`
@@ -156,13 +158,15 @@ function compile_all (root='.') {
 
 }
 
-function compile (models, options={}) {
+async function compile (models, options={}) {
 
   if (options.all)  return compile_all (models[0])
 
   const { inspect } = require('util')
   const cds = require('../../lib') // get the enhanced cds w/ additional compile processors
 
+  await cds.plugins // ensure plugins that extend compile targets are loaded
+
   let model, src, _suffix; //> be filled in below
   if (!options.as && !/,/.test(options.to))  options.as = 'str'
   if (options.beta)  options.betaMode = true
@@ -278,7 +282,7 @@ function compile (models, options={}) {
     return console.log (o)
   }
 
-  function suffix4 (x) { return x && ({
+  function suffix4 (x) { return x && x !== 'hdbtable' && ({
     edmx: '.xml',
     "edmx-v2": '.xml',
     "edmx-v4": '.xml',

package/bin/env.js

@@ -62,9 +62,6 @@ async function env ([cmd, key, value], options={}) {
     commands[cmd] || ((key = cmd), commands.get)
   )
 
-  // Ensure loading plugins before calling cds.env!
-  await cds.plugins
-
   let env = cds.env
   if (options["resolve-bindings"]) {
     const BindingManager = require('../lib/bind/bindingManager')

package/bin/extend.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(extend, {
-    options: ['--directory', '--subdomain', '--passcode', '--username', '--clientid'],
-    flags: ['--wsdl', '--templates', '--force'],
+    options: ['--directory', '--subdomain', '--passcode', '--username', '--clientid', '--tagRule', '--defaultTag'],
+    flags: ['--wsdl', '--templates', '--force', '--download-migrated-projects'],
     shortcuts: ['-d', '-s', '-p', '-u', '-c'],
     help: `
 # SYNOPSIS
@@ -50,13 +50,25 @@ module.exports = Object.assign(extend, {
         Download only the templates provided by the SaaS application you want to
         extend.
 
+    *--download-migrated-projects*
+
+        To be used only after change to @sap/cds-mtxs. Allows to download migrated extension projects.
+
+    *--tagRule*
+
+        Rule used to split up migrated extension projects into separate projects (please check migration documentation for more).
+
+    *--defaultTag*
+
+        Default tag used for migrated extension projects, default is 'migrated' (please check migration documentation for more).
+
 # SEE ALSO
 
     *cds activate* to activate an extension project.
 
     *cds pull* to get the CDS model of a SaaS app based on current MTX Services
     (@sap/cds-mtxs).
-    
+
     https://cap.cloud.sap/docs/guides/multitenancy/mtxs for information on
     @sap/cds-mtxs.
 
@@ -64,6 +76,20 @@ module.exports = Object.assign(extend, {
 
 
 async function extend ([url], options = {}) {
+
+    if (options['download-migrated-projects']) {
+        const [username, password] = options.username?.split(':') ?? [];
+        delete options.user;
+
+        await require('../lib/client/download_legacy').run({
+            ...options,
+            url,
+            username,
+            password
+        });
+        return
+    }
+
     if (options.force) {
         if (! await require('../lib/client/helper/question').askBooleanQuestion('Using option --force will overwrite existing files. Continue (yN)? ', false, false)) {
             console.log('Extend cancelled')

package/bin/import.js

@@ -1,8 +1,8 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
-    options: ['--out', '--as', '--include-namespaces', '--from'],
+    options: ['--out', '--as', '--include-namespaces', '--from', '--config'],
     flags: ['--dry', '--force', '--no-copy', '--no-save', '--keep-namespace'],
-    shortcuts: ['-o', '-as', '-ns', undefined, '-', '-f'],
+    shortcuts: ['-o', '-as', '-ns', undefined, '-c', '-', '-f'],
     help: `
 # SYNOPSIS
 
@@ -43,6 +43,9 @@ module.exports = Object.assign(_import, {
     *--from*
         Imports the model from the one of the given options "edmx", "openapi" or
         "asyncapi".
+    
+    *-c | --config* <JSON Object>
+        Adds the provided JSON Object as custom configuration data to the package.json.
 
     *Below options are valid for OData only*
 
@@ -68,6 +71,7 @@ module.exports = Object.assign(_import, {
     cds import ~/Downloads/Petstore_OpenAPI.json --from openapi
     cds import ~/Downloads/BookStore_AsyncAPI.json
     cds import ~/Downloads/BookStore_AsyncAPI.json --from asyncapi
+    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx -c {\\"[production]\\":{\\"credentials\\":{\\"destination\\":\\"UI3_noauth\\",\\"path\\":\\"/sap/cap/odata\\"}}}
 
 `})
 const messages = require('../lib/import/message').getMessages();
@@ -95,7 +99,7 @@ async function _import(file, options = {}) {
     }
 
     // reads the file version
-    options.inputFileVersion = apiOptions.odataVersion;
+    options.inputFileKind = apiOptions.odataVersion ? apiOptions.odataVersion : apiOptions.inputFileKind;
 
     // postprocess
     return await common.postProcess(destFilePath, options, csn, cwd);

package/bin/init.js

@@ -22,56 +22,51 @@ module.exports = Object.assign(init, {
         Add one or more features while creating the project.
         <feature> can be one of the following:
 
-        *nodejs*        - prepares as a Node.js-based project, cannot be used with *java*
+        *nodejs*                - creates as a Node.js-based project
 
-        *java*          - prepares as a Java-based project, cannot be used with *nodejs*
+        *java*                  - creates as a Java-based project
 
-                          This feature uses a Java Maven archetype to create a
-                          project using the *Java* programming language.
+        *hana*                  - add support for SAP HANA
 
-        *hana*          - adds configuration for SAP HANA databases
+        *sqlite*                - add support for SQLite databases
 
-        *sqlite*        - adds configuration for SQLite databases
+        *xsuaa*                 - add support for authentication via XSUAA
 
-        *xsuaa*         - adds configuration for authentication via XSUAA
+        *multitenancy*          - add support for multitenancy
 
-        *multitenancy*  - adds configuration for multitenancy
+        *toggles*               - add support for feature toggles
 
-        *toggles*       - adds configuration for feature toggles
+        *extensibility*         - add support for extensibility
 
-        *extensibility* - adds configuration for extensibility
+        *approuter*             - add support for application routing
 
-        *mtx*           - adds configuration for multitenancy, feature toggles and
-                          extensibility
+        *file-based-messaging*  - add support for file-based messaging
 
-        *approuter*     - adds configuration for the Cloud Foundry approuter
+        *enterprise-messaging*  - add support for SAP Event Mesh
 
-        *mta*           - adds an _mta.yaml_ file for MTA-based SAP Business
-                          Technology Platform deployment
+        *redis-messaging*       - add support for Redis messaging
 
-        *cf-manifest*   - adds _manifest.yml_ and _services-manifest.yml_ files for
-                          Cloud Foundry native deployment
+        *kibana*                - add support for Kibana formatting
 
-                          This approach makes use of the 'Create-Service-Push
-                          Plugin' that has to be installed separately using
-                          _cf install-plugin Create-Service-Push_.
-                          _cf create-service-push_ creates the service(s) and pushes
-                          the application(s) to the SAP Business Technology
-                          Platform.
+        *mta*                   - add support for MTA-based deployment
 
-        *pipeline*      - adds files for CI/CD pipeline integration
+        *cf-manifest*           - add support for CF-native deployment
 
-        *sample*        - adds sample files including Fiori UI
+        *helm*                  - add support for Helm-based Kyma deployment
 
-        *sample-tiny*   - adds minimal sample files
+        *html5-repo*            - add support for the HTML5 repository
 
-        *data*          - adds data content for CSN model entities (as csv files)
+        *pipeline*              - add files for CI/CD pipeline integration
 
-        *helm*          - adds helm chart folder that contains the files needed to
-                          deploy the application using Kyma.
+        *tiny-sample*           - add minimal sample files
 
-        *html5-repo*    - adds configuration for HTML5 Application Deployer to Helm
-                          Chart (Kyma Only).
+        *sample*                - add sample files including Fiori UI
+
+        *data*                  - add CSV headers for modeled entities
+
+        *typer*                 - add type generation for CDS models
+
+        *lint*                  - add support for CDS Lint
 
     *--java:mvn* <Comma separated maven archetype specific parameters>
 
@@ -85,16 +80,15 @@ module.exports = Object.assign(init, {
 
 # EXAMPLES
 
-    *cds init* test
-    *cds init* test --add java
-    *cds init* test --add java,hana
-    *cds init* --add mta
-    *cds init* --add cf-manifest
+    *cds init* bookshop
+    *cds init* bookshop --add java
+    *cds init* bookshop --add java,hana
+    *cds init* bookshop --add multitenancy,mta
     *cds init* --add java --java:mvn groupId=myGroup,artifactId=newId,package=my.company
 
 # SEE ALSO
 
-    *cds add* as shortcut for _cds init --add_.
+    *cds add* - to augment your projects later on
 
 `})
 

package/bin/push.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(push, {
-    options: ['--subdomain', '--passcode', '--user', '--client', '--to'],
+    options: ['--subdomain', '--passcode', '--user', '--client', '--to', '--sync'],
     flags: [],
-    shortcuts: ['-s', '-p', '-u', '-c'],
+    shortcuts: ['-s', '-p', '-u', '-c', '-2'],
     help: `
 # SYNOPSIS
 
@@ -13,9 +13,9 @@ module.exports = Object.assign(push, {
     a local file or as a URL to download it from.
     A download URL may contain Basic-Auth credentials as in
     'https://user:pass@host'.
-    
+
     By default, the current working directory is used as project directory.
-    
+
     Unless a custom archive is given, the extension project will be
     automatically built in order to update the generated extension archive. This
     ensures the most recent extension model is pushed.
@@ -48,13 +48,17 @@ module.exports = Object.assign(push, {
 
         Client ID and optionally Client Secret for authentication.
 
+    *--sync*
+
+        Use the synchronous server API to upload extensions.
+
 
 # SEE ALSO
 
     *cds pull* to get the CDS model of the SaaS app.
-    
+
     *cds login* for more information on authentication options.
-    
+
     *cds login* to save project settings and authentication data, simplifying
     multiple runs of this command.
 

package/bin/repl.js

@@ -12,62 +12,42 @@ module.exports = Object.assign (repl, { options: [], help: `
     *cds eval*  to evaluate and execute JavaScript.
 `})
 
-function repl (_, options={}) {
-
-  // enable `await` statement for Node.js < 16
-  if (!process.env['CDS_REPL_SPAWNED'] && process.version.split('.')[0].slice(1) < '16') {
-    process.env['CDS_REPL_SPAWNED'] = true
-    return require('child_process').spawn('node',['--experimental-repl-await',
-      ...process.argv.slice(1) ], {stdio:'inherit'}
-    )
-  }
+async function repl (_, options={}) {
 
   const cds = require('../lib/cds')
-  const path = require('path')
-  const {inspect} = require('util')
+  console.log('\x1b[32m\x1b[1m'+'Welcome to cds repl v', cds.version, '\x1b[0m')
+
+  await cds.plugins
+
+  const { inspect } = require('util')
+  inspect.defaultOptions.colors = true
+  inspect.defaultOptions.depth = 11
 
-  const colors = options.colors !== false
-  const log = options.log || console.log
-  const info = colors ? require('../lib/util/term').info : s => s
-  log(info('Welcome to cds repl v'+ cds.version))
 
-  const cdsr = require('repl').start ({...options, writer:_writer, ignoreUndefined:true })
-  Object.defineProperty (cds,'repl',{value:cdsr})
+  const repl = require('repl').start ({
+    ...options, ignoreUndefined: true,
+    writer: o => {
+      if (!o || typeof o !== 'object') return o
+      return inspect(o).replace(/\[Object: null prototype\] /g, '')
+    }
+  })
 
-  cds.lazify (Object.assign (cdsr.context,{ cds,
+  Object.defineProperty (cds,'repl',{value:repl})
+  cds.lazify (Object.assign (repl.context,{ cds,
     Foo: lazy => new cds.entity ({name:'Foo'}),
     Bar: lazy => new cds.entity ({name:'Bar'}),
   }))
 
-  // cosmetics: don't show cds.env when inspecting cds
-  if (Reflect.getOwnPropertyDescriptor(cds,'env')) {
-    Reflect.defineProperty (cds,'env',{ value:cds.env, enumerable:false })
-  }
-
-  inspect.defaultOptions.colors = true
-  inspect.defaultOptions.depth = 11
-  function _writer (o) {
-    if (!o || typeof o !== 'object') return o
-    return inspect(o).replace(/\[Object: null prototype\] /g, '')
-  }
-
+  repl.history = new Array(222)
   const home = process.env.HOME || process.env.USERPROFILE
-  const history = path.join(home,'.cds-repl-history')
-  if (cdsr.setupHistory) {  // since Node.js 11
-    cdsr.setupHistory (history,()=>{})
-  } else {
-    const fs = require('fs')
-    const historySize = 111
-    fs.readFile(history, 'utf-8', (e, txt) => e || (cdsr.history = txt.split('\n')))
-    cdsr.on('exit', () => {
-      if (cdsr.history)  fs.writeFile(history, cdsr.history.slice(-historySize).join('\n'), () => {})
-    })
-  }
-
+  const history = require('path').join(home,'.cds-repl-history')
+  const fs = require('fs')
+  fs.readFile(history, 'utf-8', (e, txt) => e || Object.assign(repl.history, txt.split('\n')))
+  repl.on('exit', () => fs.writeFile(history, repl.history.join('\n'), () => {}))
 
   process.on('uncaughtException', console.error)
   process.on('unhandledRejection', console.error)
 
 }
-/* eslint no-console:0 */
+
 if (!module.parent) repl()

package/bin/watch.js

@@ -59,8 +59,7 @@ const t = module.exports.codes = {
   orange: colors ? '\x1b[38;2;255;140;0m' : '' // darker orange, works with bright and dark background
 }
 const extDefaults = 'cds,csn,csv,ts,mjs,cjs,js,json,properties,edmx,xml,env'
-const fioriIncludes = /_?(change|variant)$/ // according to fiori: change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change.
-const ignore = RegExp(`app${sep}.*${sep}?webapp${sep}|node_modules|target|\\.cds-services\\.json$`)
+const ignore = RegExp(`(node_modules\\${sep}|@cds-models\\${sep}|@types\\${sep}|app(\\${sep}.+)?\\${sep}((webapp|dist|target)\\${sep}|\\.cds-services\\.json$|tsconfig\\.json$|.*\\.tsbuildinfo$))`)
 
 async function watch ([cwd], {
   args = ['serve', 'all'],
@@ -88,16 +87,14 @@ async function watch ([cwd], {
   env.NODE_PATH = [...paths(cwd||process.cwd()), ...paths(__dirname)].join(delimiter)
 
   if (typeof ext !== 'string')  ext = extDefaults
+  const delay = parseInt(process.env.CDS_WATCH_DELAY) || 200
 
-  let includes
   let liveReload //= ...
   let firstTime = true
   if (!/false|no/.test(options['livereload']) && cds.env.for('cds', cwd||process.cwd()).livereload !== false) {
-    ext += ',css,gif,html,jpg,png,svg'
-    includes = fioriIncludes
     liveReload = new (require ('../lib/watch/livereload-server'))
     env.CDS_LIVERELOAD_PATH = require.resolve ('../lib/watch/livereload-connect')
-    env.CDS_LIVERELOAD_URL = await liveReload.start (options['livereload'])
+    env.CDS_LIVERELOAD_URL = await liveReload.start (options['livereload'], cwd, delay)
       .catch(err => { console.log(`Error starting live reload: ${err.message}`); liveReload = null })
   }
 
@@ -113,7 +110,6 @@ async function watch ([cwd], {
   log ()
   log (`${t.bold}cds ${args.join(' ')}`)
   DEBUG && log (process.pid, 'watching:', ext, '...')
-  includes && DEBUG && log (`also watching: ${includes.source}`)
   DEBUG && log ('ignoring:', ignore.source)
   if (liveReload) log (`live reload enabled for browsers`)
 
@@ -124,8 +120,8 @@ async function watch ([cwd], {
 
   const nodemon = require('../lib/watch/node-watch')
   const watcher = nodemon ({
-    script: resolve(__dirname,'watched'), cwd, env, ext, includes, ignore,
-    delay: parseInt(process.env.CDS_WATCH_DELAY) || 200,
+    script: resolve(__dirname,'watched'), cwd, env, ext, ignore,
+    delay,
     options
   }).on('restart', (files)=>{
     log (`\n${t.bold}        ___________________________\n`)

package/lib/bind/bindingResolver.js

@@ -1,10 +1,11 @@
 const cds = require('../cds');
+const path = require('path');
 const { platformText, bindingText, logger } = require('./bindingUtil');
 
 class BindingResolver {
     getUnresolvedBindings({ cwd = process.cwd(), env } = {}) {
         if (!env) {
-            env = cds.env.for('cds', cwd) // REVISIT: This might load cds.env too early!
+            env = cds.env.for('cds', path.resolve(cwd)) // REVISIT: This might load cds.env too early!
         }
         const bindings = {}
         const requires = env.requires || {}

package/lib/bind/index.js

@@ -101,7 +101,7 @@ function runCmd(profile, isJavaProject) {
     profile = parseProfile(profile);
     if (isJavaProject) {
         const p = profile === 'hybrid' ? '' : ` --profile ${profile}`;
-        return `cds bind exec${p} mvn spring-boot:run`;
+        return `cds bind --exec${p} mvn spring-boot:run`;
     } else {
         const p = profile === 'development' ? '' : ` --profile ${profile}`;
         return `cds watch${p}`;