@sap/cds 6.6.1 → 6.7.0

package/bin/deploy/to-hana/cfUtil.js

@@ -13,7 +13,7 @@ const cds = require('../../../lib');
 const LOG = cds.log ? cds.log('deploy') : console;
 const DEBUG = cds.debug('deploy');
 
-const { bold } = require('../../utils/term');
+const { bold, warn } = require('../../utils/term');
 
 const CF_COMMAND = 'cf';
 
@@ -25,6 +25,8 @@ const OPERATION_STATE_IN_PROGRESS = 'in progress';
 const OPERATION_STATE_FAILED = 'failed';
 const OPERATION_STATE_SUCCEEDED = 'succeeded';
 
+const CF_CLIENT_MINIMUM_VERSION = 8;
+
 
 class CfUtil {
 
@@ -135,10 +137,22 @@ class CfUtil {
     }
 
     async getCfTarget() {
+        await this.checkCliVersion();
         await this._cfRun('oauth-token'); // check if token is valid or expired / missing
         return await this.getCfTargetFromConfigFile() || await this.getCfTargetFromCli();
     }
 
+    async checkCliVersion() {
+        const result = await this._cfRun('-v');
+        const version = result?.stdout?.match(/version.*(\d+\.\d+\.\d+)/i)
+        if (parseInt(version?.[1]) < CF_CLIENT_MINIMUM_VERSION) {
+            console.log(warn(`
+[Warning] You are using Cloud Foundry client version ${version[1]}. We recommend version ${CF_CLIENT_MINIMUM_VERSION} or higher.
+Deployment will stop in the near future for Cloud Foundry client versions < ${CF_CLIENT_MINIMUM_VERSION}.
+`));
+        }
+    }
+
     async getCfSpaceInfo() {
         if (!this.spaceInfo) {
             LOG.debug('getting space info');

package/bin/deploy/to-hana/hana.js

@@ -72,7 +72,7 @@ class HanaDeployer {
       }
 
       const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
-      if (hasVCAPEnv) {
+      if (!serviceName && hasVCAPEnv) {
         await fs.mkdir(currentModelFolder, { recursive: true });
       } else {
         const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =

package/bin/deploy/to-hana/hdiDeployUtil.js

@@ -143,7 +143,7 @@ Add it either as a devDependency using 'npm install -D ${this.deployerName}' or
                 }
                 return resolve();
             }, callbacks);
-        }).finally(() => writeStream.end());
+        }).finally(() => writeStream?.end());
     }
 }
 

package/bin/mtx/in-cds.js

@@ -1,14 +1,6 @@
 const cds = require('../build/cds')
-const { _oldMtx } = cds.utils
 
-const _is_streamlined_mtx = ()=>{
-  if (_oldMtx()) return false
-  try { return !!require.resolve('@sap/cds-mtxs/srv/deployment-service') }
-  catch {/* ignored */}
-}
-
-if (!cds.requires.multitenancy || _is_streamlined_mtx()) module.exports = undefined
-else try {
+if (cds.requires.multitenancy && cds.utils._oldMtx()) try {
   // eslint-disable-next-line cds/no-missing-dependencies
   const mtx = module.exports = require ('@sap/cds-mtx')()
   mtx.inject (cds)
@@ -17,6 +9,7 @@ else try {
   if (e.code === 'MODULE_NOT_FOUND') throw new Error('Error serving MTX APIs: @sap/cds-mtx is not installed')
   else throw e
 }
+else module.exports = undefined
 
 /*
  cds.requires.multitenancy  --  use this to check whether mt is enabled (old or new)

package/bin/plugins.js

@@ -0,0 +1,31 @@
+const cds = require('../lib')
+const DEBUG = cds.debug('plugins')
+
+module.exports = async function load_plugins (log = console.log) {
+
+  if (DEBUG) console.time('[cds] - loaded plugins in')
+  const plugins = []
+  if (cds.env.plugins) {
+    for (let each of cds.env.plugins) {
+      let impl = typeof each === 'string' ? each : each.impl
+      if (impl.startsWith('.'))
+        impl = require.resolve(cds.root + '/' + impl)
+      plugins.push(_load_plugin(impl, each))
+    }
+  } else
+    try {
+      const { dependencies } = require(cds.root + '/package.json')
+      for (let each in dependencies) {
+        plugins.push(_load_plugin(each + '/cds-plugin'))
+      }
+    } catch { /* ignored */ }
+  try { await Promise.all(plugins); } catch { /* ignored */ }
+  if (DEBUG) console.timeEnd('[cds] - loaded plugins in')
+
+  async function _load_plugin (impl, conf) {
+    // TODO support ESM plugins.  But see cap/cds/pull/1838#issuecomment-1177200 !
+    const plugin = require(impl)
+    log('loaded plugin:', { impl })
+    if (plugin.activate) await plugin.activate(conf)
+  }
+}

package/bin/serve.js

@@ -154,12 +154,19 @@ async function serve (all=[], o={}) {
   if (o.watch)  return _watch.call(this, o.project,o)   // cds serve --watch <project>
   if (o.project) _chdir_to (o.project)      // cds run --project <project>
 
+  const TRACE = cds.debug('trace')
+  // if (TRACE) {
+  //   TRACE?.time('load express   '); require('express') // eslint-disable-line cds/no-missing-dependencies
+  //   TRACE?.timeEnd('load express   ')
+  // }
+  TRACE?.time('cds bootstrap  ')
+
   // Load local server.js early in order to allow setting custom cds.log.Loggers
   const cds_server = await _local_server_js() || cds.server
   if (!o.silent) _prepare_logging ()
 
   // The following things are meant for dev mode, which can be overruled by feature flagse...
-  const {features} = cds.env
+  const {features,fiori} = cds.env
   {
     // handle --with-mocks resp. --mocked
     if (features.with_mocks) o.mocked = _with_mocks(o)
@@ -174,23 +181,16 @@ async function serve (all=[], o={}) {
     if (features.live_reload) require('../app/etc/livereload')
 
     // add dev helper for Fiori URLs
-    if (features.fiori_routes) require('../app/fiori/routes')
+    if (fiori.routes) require('../app/fiori/routes')
 
     // add fiori preview links to default index.html
-    if (features.fiori_preview) require('../app/fiori/preview')
+    if (fiori.preview) require('../app/fiori/preview')
 
   }
 
   // activate plugins
-  if (cds.env.plugins) for (let each of cds.env.plugins) {
-    if (typeof each === 'string') each = {impl:each}
-    let impl = each.impl
-    if (impl.startsWith('.')) impl = require.resolve(cds.root+'/'+impl)
-    log ('loading plugin:', {impl})
-    // TODO support ESM plugins.  But see cap/cds/pull/1838#issuecomment-1177200 !
-    const plugin = require(impl)
-    if (plugin.activate) await plugin.activate(each)
-  }
+  await require("./plugins")(log)
+  TRACE?.timeEnd('cds bootstrap  ')
 
   // bootstrap server from project-local server.js or from @sap/cds/server.js
   const server = await cds_server(o)

package/lib/compile/etc/_localized.js

@@ -45,7 +45,7 @@ function unfold_csn (m) { // NOSONAR
 	const pass2 = []
 
 	const _conf = env.requires.db || env.requires.sql || env.requires.kinds && env.requires.kinds.sql
-	const _on_sqlite = _conf.kind === 'sqlite' || _conf.kind === 'better-sqlite' || _conf.dialect === 'sqlite'
+	const _on_sqlite = _conf.kind === 'sqlite' || _conf.dialect === 'sqlite'
 	const _locales = _on_sqlite && _locales_4sql.sqlite
 
 	// Pass 1 - add localized.<locale> entities and views

package/lib/compile/for/lean_drafts.js

@@ -19,7 +19,13 @@ function _isCompositionBacklink(e) {
   }
 }
 
-const IGNORED_ANNOTATIONS = [
+const IGNORED_ENTITY_ANNOTATIONS = new Set([
+  '@readonly',
+  '@insertonly',
+  '@restrict',
+])
+
+const IGNORED_ELEMENT_ANNOTATIONS = [
   '@assert.range',
   '@assert.enum',
   '@assert.format',
@@ -27,14 +33,21 @@ const IGNORED_ANNOTATIONS = [
   '@mandatory',
   '@Core.Immutable',
   '@readonly',
-  '@cds.on.update',
-  '@cds.on.insert',
   '@Core.Computed',
   '@Common.FieldControl.Readonly',
   '@Common.FieldControl.Mandatory',
   '@FieldControl.Mandatory',
   '@FieldControl.ReadOnly',
-  '@Common.FieldControl'
+  '@Common.FieldControl',
+  '@PersonalData.DataSubjectRole',
+  '@PersonalData.EntitySemantics',
+  '@PersonalData.IsPotentiallyPersonal',
+  '@PersonalData.IsPotentiallySensitive',
+  '@PersonalData.FieldSemantics'
+  // These are still needed:
+  // '@odata.etag',
+  // '@cds.on.update',
+  // '@cds.on.insert',
 ]
 
 module.exports = function cds_compile_for_lean_drafts(csn) {
@@ -96,7 +109,10 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
     Object.defineProperty(active, 'drafts', { value: draft })
     Object.defineProperty(draft, 'actives', { value: active })
     draft['@cds.persistence.table'] = _draftEntity
-    if (draft['@restrict']) draft['@restrict'] = undefined
+
+    for (const key in draft) {
+      if (IGNORED_ENTITY_ANNOTATIONS.has(key) || key.startsWith('@Capabilities') || key.startsWith('@PersonalData')) draft[key] = undefined
+    }
     // Recursively add drafts for compositions
     for (const each in draft.elements) {
       const e = draft.elements[each]
@@ -106,7 +122,7 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
         _redirect(newEl, draftEntity(e._target, model))
       }
       newEl.parent = draft
-      for (const ignoredAnno of IGNORED_ANNOTATIONS) {
+      for (const ignoredAnno of IGNORED_ELEMENT_ANNOTATIONS) {
         if (newEl[ignoredAnno]) newEl[ignoredAnno] = undefined
       }
       draft.elements[each] = newEl

package/lib/compile/for/nodejs.js

@@ -1,13 +1,16 @@
 const cds = require ('../../index')
+const TRACE = cds.debug('trace')
 
 module.exports = function cds_compile_for_nodejs (csn,o) {
   if ('_4nodejs' in csn) return csn._4nodejs
+  TRACE?.time('cds.compile 4n ')
   let dsn = csn // cds.minify (csn)
   dsn = cds.compile.for.drafts (csn,o) //> creates a partial copy -> avoid any cds.linked() before
   dsn = cds.compile._localized.unfold_csn (dsn)
   dsn = cds.linked (dsn)
-  if (cds.env.features.lean_draft) cds.compile.for.lean_drafts(dsn, o)
+  if (cds.env.fiori.lean_draft) cds.compile.for.lean_drafts(dsn, o)
   Object.defineProperty (csn, '_4nodejs', {value:dsn})
   Object.defineProperty (dsn, '_4nodejs', {value:dsn})
+  TRACE?.timeEnd('cds.compile 4n ')
   return dsn
 }

package/lib/compile/load.js

@@ -1,9 +1,9 @@
 const cds = require('..')
-
+const TRACE = cds.debug('trace')
 
 module.exports = exports = function cds_load (files, options) {
   const all = cds.resolve(files,options)
-  if (!all)  return Promise.reject (new cds.error ({
+  if (!all) return Promise.reject (new cds.error ({
     message: `Couldn't find a CDS model for '${files}' in ${cds.root}`,
     code: 'MODEL_NOT_FOUND', files,
   }))
@@ -13,6 +13,7 @@ module.exports = exports = function cds_load (files, options) {
 
 exports.parsed = function cds_get (files, options, _flavor) { // NOSONAR
 
+  TRACE?.time('cds.load model ')
   const o = typeof options === 'string' ? { flavor:options } : options || {}
   if (!files) files = ['*']; else if (!Array.isArray(files)) files = [files]
   if (o.files || o.flavor === 'files') return cds.resolve(files,o)
@@ -31,6 +32,7 @@ exports.parsed = function cds_get (files, options, _flavor) { // NOSONAR
 
 const _finalize = (csn,o) => {
   if (!o.silent) cds.emit ('loaded', csn)
+  TRACE?.timeEnd('cds.load model ')
   return csn
 }
 

package/lib/core/index.js

@@ -50,27 +50,21 @@ const roots = _roots ({
 /** Construct builtin.types as dictionary of all roots and common types */
 const types = _common ({ __proto__: roots,
 	UUID: {type:'string',length:36,isUUID:true},
+	String: {type:'string'}, LargeString: {type:'String'},
+	Binary: {type:'string'}, LargeBinary: {type:'Binary'},
 	Boolean: {type:'boolean'},
 	Integer: {type:'number'},
 		UInt8: {type:'Integer'},
-		Int16: {type:'Integer'},
-		Int32: {type:'Integer'},
-		Int64: {type:'Integer'},
-		Integer16: {type:'Int16'},
-		Integer32: {type:'Int32'},
-		Integer64: {type:'Int64'},
-	Decimal: {type:'number'},
-	DecimalFloat: {type:'number'},
+		Int16: {type:'Integer'}, Integer16: {type:'Int16'},
+		Int32: {type:'Integer'}, Integer32: {type:'Int32'},
+		Int64: {type:'Integer'}, Integer64: {type:'Int64'},
 	Float: {type:'number'},
-	Double: {type:'number'},
-	DateTime: {type:'date'},
+	Double: {type:'Float'},
+	Decimal: {type:'Float'}, DecimalFloat: {type:'Decimal'},
 	Date: {type:'date'},
 	Time: {type:'date'},
-	Timestamp: {type:'date'},
-	String: {type:'string'},
-	Binary: {type:'string'},
-	LargeString: {type:'string'},
-	LargeBinary: {type:'string'}
+	DateTime: {type:'date'},
+	Timestamp: {type:'DateTime'},
 })
 
 /**
@@ -90,5 +84,31 @@ function _common (defs) {
 	return prefixed
 }
 
+;(
+	/**
+	 * Adds convenience functions which can be used like that:
+	 * ```js
+	 * var { Date, Time, DateTime } = cds.builtin.types
+	 * DateTime.now()   //> 2023-02-10T14:41:36.218Z
+	 * Date.now()       //> 2023-02-10T14:41:36.218Z
+	 * Time.now()       //> 14:43:18
+	 * Date.today()     //> 2023-02-10
+	 * ```
+	 */
+	function _add_convenience_functions(){
+		Object.defineProperties (types.Date, {
+			today: { value: ()=> (new Date).toISOString().slice(0,10) },
+			now: { value: ()=> (new Date).toISOString() },
+		})
+
+		Object.defineProperties (types.Time, {
+			now: { value: ()=> (new Date).toISOString().slice(11,19) },
+		})
+
+		Object.defineProperties (types.DateTime, {
+			now: { value: ()=> (new Date).toISOString() },
+		})
+	}
+)()
 
 module.exports = { types, classes }