@sap/cds 5.9.8 → 6.0.3

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

@@ -1,6 +1,6 @@
 const cp = require('child_process');
 const path = require('path');
-const { fse } = require('@sap/cds-foss');
+const fs = require('fs').promises;
 const util = require('util');
 
 const cds = require('../../../lib');
@@ -40,12 +40,14 @@ class GitUtil {
     # added by cds deploy
     ${file}
     `;
-        await fse.outputFile(gitIgnorePath, gitignore, 'utf8');
+
+        await fs.mkdir(path.dirname(gitIgnorePath), { recursive: true });
+        await fs.writeFile(gitIgnorePath, gitignore, 'utf8');
     }
 
     async readFileSafely(file) {
         try {
-            return await fse.readFile(file, 'utf8');
+            return await fs.readFile(file, 'utf8');
         } catch (err) {
             return '';
         }

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

@@ -3,7 +3,7 @@ const os = require('os');
 const path = require('path');
 const util = require('util');
 
-const { fse } = require('@sap/cds-foss');
+const fs = require('fs').promises;
 
 const { BuildTaskEngine, BuildTaskFactory } = require('../../build');
 const buildConstants = require('../../build/constants');
@@ -14,7 +14,7 @@ const LOG = cds.log ? cds.log('deploy') : console;
 const cfUtil = require('./cfUtil');
 const hdiDeployUtil = require('./hdiDeployUtil');
 const gitUtil = require('./gitUtil');
-const mtaUtil = require('../../build/mtaUtil');
+const mtaUtil = require('./mtaUtil');
 
 const { bold, info } = require('../../utils/term');
 
@@ -35,7 +35,12 @@ class HanaDeployer {
     this.logger = logger;
 
     this.logger.log(`${bold('Starting deploy to SAP HANA ...')}`);
-    if (bindCallback) {
+    if (vcapFile)  {
+      this.logger.log();
+      this.logger.log(`Using VCAP_SERVICES from file ${vcapFile} (beta feature).`);
+      bindCallback = null // credentials are given - no cds bind then
+    }
+    else if (bindCallback) {
       this.logger.log('Using cds bind');
     }
     this.logger.log();
@@ -46,8 +51,6 @@ class HanaDeployer {
 
     let vcapServices;
     if (vcapFile) {
-      this.logger.log();
-      this.logger.log(`Using vcap file ${vcapFile} (beta feature).`);
       vcapServices = await this._loadVCAPServices(vcapFile);
     }
 
@@ -57,11 +60,11 @@ class HanaDeployer {
 
       if (undeployWhitelist) {
         this.logger.log('Writing undeploy.json');
-        await fse.writeJSON(path.join(currentModelFolder, 'undeploy.json'), undeployWhitelist);
+        await fs.write(path.join(currentModelFolder, 'undeploy.json'), JSON.stringify(undeployWhitelist, null, 2));
       }
 
       if (vcapFile) {
-        await fse.mkdirp(currentModelFolder);
+        await fs.mkdir(currentModelFolder, { recursive: true });
       } else {
         const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =
           await this._getOrCreateCFService(projectPath, currentModelFolder, serviceName, tunnelAddress);
@@ -203,7 +206,7 @@ class HanaDeployer {
 
   async _loadVCAPServices(vcapFile) {
     try {
-      const content = await fse.readJSON(vcapFile);
+      const content = JSON.parse(await fs.readFile(vcapFile));
       if (!content.VCAP_SERVICES) {
         throw new Error(`The vcap file ${vcapFile} does not contain a VCAP_SERVICES entry.`);
       }
@@ -221,7 +224,7 @@ class HanaDeployer {
       const defaultEnvJsonPath = path.join(currentFolder, 'default-env.json');
 
       try {
-        defaultEnvJson = await fse.readJSON(defaultEnvJsonPath, UTF_8);
+        defaultEnvJson = JSON.parse(await fs.readFile(defaultEnvJsonPath, UTF_8));
       } catch (err) {
         // ignore any errors
       }
@@ -240,9 +243,8 @@ class HanaDeployer {
       }
 
       this.logger.log(`Writing ${defaultEnvJsonPath}`);
-      await fse.outputJSON(defaultEnvJsonPath, defaultEnvJson, {
-        spaces: 2
-      });
+      await fs.mkdir(path.dirname(defaultEnvJsonPath), {recursive: true})
+      await fs.writeFile(defaultEnvJsonPath, JSON.stringify(defaultEnvJson, null, 2));
     }
   }
 
@@ -285,7 +287,7 @@ class HanaDeployer {
 
   async readFileSafely(file) {
     try {
-      return await fse.readFile(file, 'utf8');
+      return await fs.readFile(file, 'utf8');
     } catch (err) {
       return '';
     }

package/bin/{build → deploy/to-hana}/mtaUtil.js

@@ -1,13 +1,14 @@
-const cds = require('./cds')
-const { fs } = require('@sap/cds-foss')
+const cds = require('../../../lib')
+const fs = require('fs').promises
+const {existsSync} = require('fs')
 const path = require('path')
-const { getProperty } = require('./util')
 
 const HDI_CONTAINER_TYPES = ['com.sap.xs.hdi-container']
 const UTF_8 = 'utf-8'
 const MTA_YAML = 'mta.yaml'
+const LOG = cds.log ? cds.log('deploy') : console;
 
-async function getHanaDbModuleDescriptor(projectPath, moduleName, logger) {
+async function getHanaDbModuleDescriptor(projectPath, moduleName, logger = LOG) {
     // mta might be null if mta.yaml does not exist
     const mta = await _getMta(projectPath, logger)
     const projectInfo = await _getProjectInfo(projectPath, mta, logger)
@@ -22,7 +23,7 @@ async function getHanaDbModuleDescriptor(projectPath, moduleName, logger) {
     }
 }
 
-async function getServiceModuleDescriptor(projectPath, moduleName, moduleType, logger) {
+async function getServiceModuleDescriptor(projectPath, moduleName, moduleType, logger = LOG) {
     // mta might be null if mta.yaml does not exist
     const mta = await _getMta(projectPath, logger)
     const projectInfo = await _getProjectInfo(projectPath, mta, logger)
@@ -48,9 +49,9 @@ async function _getProjectInfo(projectPath, mta, logger) {
     }
     // 2. use package.json data
     const packageJsonPath = path.join(projectPath, 'package.json')
-    if (await fs.pathExists(packageJsonPath)) {
+    if (existsSync(packageJsonPath)) {
         try {
-            const packageJson = await fs.readJSON(packageJsonPath, 'utf-8')
+            const packageJson = JSON.parse((await fs.readFile(packageJsonPath, 'utf-8')).toString())
             if (!details.description && packageJson.description) {
                 details.description = packageJson.description
             }
@@ -100,7 +101,7 @@ async function _getMta(projectPath, logger) {
     // yaml.parse  oesn't like null
     const mtaFilePath = path.join(projectPath, MTA_YAML)
 
-    const existsMtaYaml = await fs.pathExists(mtaFilePath)
+    const existsMtaYaml = existsSync(mtaFilePath)
     if (!existsMtaYaml) {
         logger.debug('mta.yaml not existing')
         return null
@@ -115,7 +116,7 @@ async function _getMta(projectPath, logger) {
 function _getApplicationName(mta, moduleName, moduleType) {
     const module = _findModule(mta, moduleName, moduleType)
     if (module) {
-        const appName = getProperty(module, 'parameters.app-name')
+        const appName = module.parameters && module.parameters['app-name']
         return appName ? appName : module.name
     }
     return null

package/bin/mtx/in-cds.js

@@ -1,9 +1,21 @@
 const cds = require('../build/cds')
-if (cds.requires.multitenancy && !cds.env.features.streamlined_mtx) try {
-    const mtx = module.exports = require ('@sap/cds-mtx')()
-    mtx.inject (cds)
-    cds.on('served', () => cds.emit('mtx'))
-} catch(e) {   
-   if (e.code === 'MODULE_NOT_FOUND') throw new Error('Error serving MTX APIs: @sap/cds-mtx is not installed')
-   else throw e
+const _is_streamlined_mtx = ()=>{
+  if (process.env.OLD_MTX) 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 {
+  const mtx = module.exports = require ('@sap/cds-mtx')()
+  mtx.inject (cds)
+  cds.on('served', () => cds.emit('mtx'))
+} catch(e) {
+  if (e.code === 'MODULE_NOT_FOUND') throw new Error('Error serving MTX APIs: @sap/cds-mtx is not installed')
+  else throw e
+}
+
+/*
+ cds.requires.multitenancy  --  use this to check whether mt is enabled (old or new)
+ cds.mtx                    --  use this to check whether old(!) mtx is enabled
+*/

package/bin/serve.js

@@ -124,15 +124,18 @@ module.exports = Object.assign ( serve, {
 
 
 const cds = require('../lib'), { exists, isfile, local, path } = cds.utils
-let log = console.log // provisional logger, see _prepare_logging
+
+// provisional loggers, see _prepare_logging
+let log = console.log
+let debug = false
 
 /**
  * The main function which dispatches into the respective usage variants.
  * @param {string[]} all - project folder, model filenames, or service name
  */
 async function serve (all=[], o={}) { // NOSONAR
-
   // canonicalize options to ease subsequent tasks...
+  cds.options = o
   const [pms] = all // project folder, model filenames, or service name
   if (o.from)                o.from = o.from.split(',')
   if (o.project||o.projects) { o.project = pms; o.service='all'; o.from='*' }
@@ -170,8 +173,19 @@ async function serve (all=[], o={}) { // NOSONAR
 
   }
 
+  // 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) plugin.activate(each)
+  }
+
   // bootstrap server from project-local server.js or from @sap/cds/server.js
-  const cds_server = _local_server_js() || cds.server
+  const cds_server = await _local_server_js() || cds.server
   const server = await cds_server(o)
 
   // return a promise which resolves to the created http server when listening
@@ -183,24 +197,36 @@ async function serve (all=[], o={}) { // NOSONAR
     }
     server.listening ? _started(server) : server.once('listening',_started)
     server.on ('error',_reject) // startup errors like EADDRINUSE
+    server.on ('close', ()=> shutdown())  // in case of server.close() was called, like in cds.test
+
+    let shutdownCalled = false
+    const shutdown = async sig => {
+      if (shutdownCalled)  return
+      shutdownCalled = true
+      global.it || cds.watched || console.log()  // blank line makes the ^C look pretty in terminals
+      debug && debug(`${sig}, shutting down, calling ${cds.listeners('shutdown').length} listeners`)
+      await Promise.all(cds.listeners('shutdown').map((fn) => fn()))
+      if (process.env.NODE_ENV !== 'test' && !global.it)  process.exit()
+    }
+
+    process.once('SIGTERM', shutdown)
+    process.once('SIGINT', shutdown)
+    process.once('SIGHUP', shutdown)
+    process.once('SIGUSR2', shutdown) // by nodemon
+    process.on('beforeExit', shutdown) //> when event loop empties
+    process.on('message', (msg) => { if (msg.close||msg.exit) shutdown() })  // by `cds watch` on Windows
 
-    // graceful server shutdown
-    const close = () => server.close()
-    process.once('SIGTERM', close)
-    process.once('SIGINT', close)
-    process.once('SIGHUP', close)
-    process.once('SIGUSR2', close) // by nodemon
     return server
   })
 }
 
-
-function _local_server_js() {
+async function _local_server_js() {
   const _local = file => isfile(file) || isfile (path.join(cds.env.folders.srv,file))
   let server_js = process.env.CDS_TYPESCRIPT && _local('server.ts') || _local('server.js')
   if (server_js) {
-    log && log ('Loading server from', { file: local(server_js) })
-    const fn = require (server_js)
+    log ('Loading server from', { file: local(server_js) })
+    let fn = await cds.utils._import(server_js)
+    if (fn && fn.default)  fn = fn.default  // default ESM export
     return typeof fn === 'function' ? fn : cds.server
   }
 }
@@ -210,7 +236,8 @@ function _prepare_logging () { // NOSONAR
   // change `log` function to cds.log
   const LOG = cds.log('serve', { prefix:'cds' })
   log = LOG._info && LOG.info
-  if (!log) return
+  if (!log) return log = ()=>{}
+  debug = cds.debug('cli')
 
   const _timer = `[cds] - launched at ${new Date().toLocaleString()}, in`
   console.time (_timer)
@@ -229,8 +256,9 @@ function _prepare_logging () { // NOSONAR
 
   // print information about each provided service
   cds.on ('serving', (srv) => {
-    const details = { at: srv.path }
-    if (srv._source) details.impl = local(srv._source)
+    const details = {}
+    if (srv.path) details.path = srv.path
+    if (srv._source) details.impl = local( srv._source.startsWith('@sap') ? require.resolve(srv._source) : srv._source )
     log (`${srv.mocked ? 'mocking' : 'serving'} ${srv.name}`, details)
   })
 
@@ -239,7 +267,7 @@ function _prepare_logging () { // NOSONAR
     console.log ()
     log ('server listening on',{url})
     _timer && console.timeEnd (_timer)
-    if (process.stdin.isTTY) log (`[ terminate with ^C ]\n`)
+    if (process.stdin.isTTY) log (`[ terminate with ^C ]`)
   })
 }
 
@@ -268,8 +296,8 @@ function _in_memory (o) {
   const {env} = cds, db = env.requires.db
   if (o['in-memory'] || o['in-memory?'] && !db) {
     env.add ({ requires: { db: {
-      kind:'sqlite', ...env.requires.sqlite,
-      credentials:{database:':memory:'}
+      kind:'sqlite', ...env.requires.kinds.sqlite,
+      credentials: db?.credentials?.url ? {url:':memory:'} : {database:':memory:'}
     }}})
     return true
   }
@@ -285,15 +313,14 @@ function _with_mocks (o) {
     cds.on ('loaded', model => cds.deploy.include_external_entities_in(model))
     const mocks = cds.env.features.test_mocks && isfile ('test/mocked.js')
     if (mocks) cds.once ('served', ()=> {
-      log && log ('adding mock behaviours from', { file: local(mocks) })
+      log ('adding mock behaviours from', { file: local(mocks) })
       require(mocks)
     })
     return true
   }
 }
 
-
-const SECRETS = /(password)|(certificate)|(ca)|(clientsecret)/i // 'certificate' and 'ca' on HANA
+const SECRETS = /(password)|(certificate)|(ca)|(secret)|(key)/i // 'certificate' and 'ca' on HANA
 /** mascades password-like strings, also reducing clutter in output */
 function _redacted(cred) {
   if (!cred) return cred

package/bin/utils/log.js

@@ -1,41 +1,24 @@
-const { sortMessagesSeverityAware, deduplicateMessages } = require('@sap/cds-compiler')
-
 // sorts, filters, and writes compilation messages to console
 module.exports = (messages, options={}) => {
   const { format } = require('./term')
-  const level = _effectiveLogLevel (options)
+  const logLevel = options && options['log-level'] || require('../../lib').env.log.levels.cli || ''
+  const levels = {
+    debug: { Error:4, undefined:4, Warning:3, Info:2, Debug:1 },
+    info: { Error:4, undefined:4, Warning:3, Info:2 },
+    warn: { Error:4, undefined:4, Warning:3 },
+    error: { Error:4, undefined:4 },
+  } [logLevel.toLowerCase()] || { Error:4, undefined:4, Warning:3 }
   const log = options.log || console.error
 
   if (!Array.isArray (messages))  messages = [messages]
-  messages.forEach (m => { if (!m.severity)  m.severity = 'Error' })
-  messages = messages.filter (m => level.includes (m.severity))
-
-  deduplicateMessages(messages)
-  messages = sortMessagesSeverityAware (messages)
-
-  for (let m of messages) {
+  for (let m of messages.filter (m => m.severity in levels)) {
     // show stack for resolution issues since there the requiring code location is in the stack
-    const internalError = isInternalError(m)
-    const withStack = options.withStack || m.code === 'MODULE_NOT_FOUND' || internalError
-    const mf = format (m, m.severity, internalError, withStack)
+    // check for standard Error classes, but not Error itself
+    const internalError = m.name === 'EvalError' || m.name === 'InternalError' || m.name === 'RangeError'
+    || m.name === 'ReferenceError' || m.name === 'SyntaxError' || m.name === 'TypeError'
+    || m.name === 'URIError'
+    const mf = format (m, m.severity, internalError, true)
     log (mf)
   }
 }
-
-function _effectiveLogLevel (options) {
-  const logLevel = options && options['log-level'] || require('../../lib').env.log.levels.cli
-  if (/^debug$/i.test (logLevel))  return ['Error', 'Warning', 'Info', 'Debug']
-  else if (/^info$/i.test (logLevel))  return ['Error', 'Warning', 'Info']
-  else if (/^warn/i.test (logLevel))  return ['Error', 'Warning']
-  else if (/^error/i.test (logLevel))  return ['Error']
-  else return ['Error', 'Warning']
-}
-
-function isInternalError(e) {
-  // check for standard Error classes, but not Error itself
-  return e.name === 'EvalError' || e.name === 'InternalError' || e.name === 'RangeError'
-    || e.name === 'ReferenceError' || e.name === 'SyntaxError' || e.name === 'TypeError'
-    || e.name === 'URIError'
-}
-
 /* eslint no-console:off */

package/bin/version.js

@@ -2,7 +2,7 @@
 const { dirname, join, resolve } = require ('path')
 const { cwd } = require('process')
 module.exports = Object.assign(list_versions, {
-  flags: [ '--info', '--markdown', '--all', '--npm-list', '--npm-tree' ],
+  flags: [ '--info', '--markdown', '--all', '--npm-list', '--npm-tree', '--no-colors'],
   shortcuts: [ '-i', '-m','-a', '-ls', '-ll' ],
   info,
   help: `
@@ -41,15 +41,16 @@ function list_versions(args, options) { //NOSONAR
     console.log (cmd,'| grep', pattern)
     return require('child_process').exec(cmd, (e,stdout)=>{
       // if (e) console.error(e)
+      const replacement = (options['no-colors'] ? '$1 $2$3$4' : '\x1b[91m$1 \x1b[32m$2\x1b[0m\x1b[2m$3\x1b[32m$4\x1b[0m');
       for (let line of stdout.split(/\n/)) if (line.match(re)) console.log(
-        line.replace(/(@sap[^@]*)@([\S]+)( -> [\S]+)?(deduped)?/,'\x1b[91m$1 \x1b[32m$2\x1b[0m\x1b[2m$3\x1b[32m$4\x1b[0m')
+        line.replace(/(@sap[^@]*)@([\S]+)( -> [\S]+)?(deduped)?/,replacement)
       )
     })
   }
   const versions = info (options)
   if (options.markdown)  return _markdown (versions)
   if (options.info)  return _markdown (versions)
-  const mark = options.noColors ? s => s : require('./utils/term').info
+  const mark = options['no-colors'] ? s => s : require('./utils/term').info
   for (let each of Object.keys(versions).sort())  console.log(`${mark(each)}: ${versions[each]}`)
 }
 

package/common.cds

@@ -1,5 +1,22 @@
+/**
+ * Type for an association to Languages
+ *
+ * See https://cap.cloud.sap/docs/cds/common#type-language
+ */
 type Language : Association to sap.common.Languages;
+
+/**
+ * Type for an association to Currencies
+ *
+ * See https://cap.cloud.sap/docs/cds/common#type-currency
+ */
 type Currency : Association to sap.common.Currencies;
+
+/**
+ * Type for an association to Countries
+ *
+ * See https://cap.cloud.sap/docs/cds/common#type-country
+ */
 type Country : Association to sap.common.Countries;
 
 /**
@@ -7,22 +24,47 @@ type Country : Association to sap.common.Countries;
  * including built-in support for value lists in Fiori.
  */
 context sap.common {
-  entity Languages : CodeList {
-    key code : String(14) @(title : '{i18n>LanguageCode}');
+  /**
+   * Type for a language code
+   */
+  type Locale : String(14) @(title : '{i18n>LanguageCode}');
     //> length=14 is to accommodate values like these:
     // en_US_x_saptrc - (1Q) used as a technical SAP language code
     // en_US_x_sappsd - (2Q) used as a technical SAP language code
+
+  /**
+   * Code list for languages
+   *
+   * See https://cap.cloud.sap/docs/cds/common#entity-sapcommonlanguages
+   */
+  entity Languages : CodeList {
+    key code : Locale;
   }
 
+  /**
+   * Code list for countries
+   *
+   * See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncountries
+   */
   entity Countries : CodeList {
     key code : String(3) @(title : '{i18n>CountryCode}');
   }
 
+  /**
+   * Code list for currencies
+   *
+   * See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncurrencies
+   */
   entity Currencies : CodeList {
     key code   : String(3) @(title : '{i18n>CurrencyCode}');
         symbol : String(5) @(title : '{i18n>CurrencySymbol}');
   }
 
+  /**
+   * Aspect for a code list with name and description
+   *
+   * See https://cap.cloud.sap/docs/cds/common#aspect-sapcommoncodelist
+   */
   aspect CodeList @(
     cds.autoexpose,
     cds.persistence.skip : 'if-unused'
@@ -33,15 +75,19 @@ context sap.common {
 }
 
 
-/*
- * Aspect for entities with canonical universal IDs.
+/**
+ * Aspect for entities with canonical universal IDs
+ *
+ * See https://cap.cloud.sap/docs/cds/common#aspect-cuid
  */
 aspect cuid {
   key ID : UUID; //> automatically filled in
 }
 
-/*
- * Aspect to capture changes by user and name.
+/**
+ * Aspect to capture changes by user and name
+ *
+ * See https://cap.cloud.sap/docs/cds/common#aspect-managed
  */
 aspect managed {
   createdAt  : Timestamp @cds.on.insert : $now;
@@ -50,8 +96,10 @@ aspect managed {
   modifiedBy : User      @cds.on.insert : $user @cds.on.update : $user;
 }
 
-/*
- * Aspects for entities with temporal data.
+/**
+ * Aspect for entities with temporal data
+ *
+ * See https://cap.cloud.sap/docs/cds/common#aspect-temporal
  */
 aspect temporal {
   validFrom : Timestamp @cds.valid.from;
@@ -65,7 +113,7 @@ aspect temporal {
 type User : String(255);
 
 
-/*
+/**
  * Aspects for extensible entities.
  */
 aspect extensible {
@@ -128,16 +176,13 @@ annotate managed with {
 
 //---------------------------------------------------------------------------
 // Temporary Workarounds...
-
-// REVISIT: Remove support for @odata.on... and #... with @sap/cds ^6
-// REVISIT: change @odata.on... to @cds.on...
 // REVISIT: @cds.on... should automatically result in @readonly @Core.Computed
 
 annotate managed with {
-  modifiedAt @readonly  @odata.on.update : #now;
-  createdAt  @readonly  @odata.on.insert : #now;
-  createdBy  @readonly  @odata.on.insert : #user;
-  modifiedBy @readonly  @odata.on.update : #user;
+  modifiedAt @readonly;
+  createdAt  @readonly;
+  createdBy  @readonly;
+  modifiedBy @readonly;
 }
 
 //---------------------------------------------------------------------------

package/lib/compile/cdsc.js

@@ -1,8 +1,7 @@
 const cds = require ('../index')
 const {cdsc,odata,sql,features} = cds.env
 const constraints = {
-  assertIntegrity: features.assert_integrity,
-  assertIntegrityType: features.assert_integrity_type
+  assertIntegrity: features.assert_integrity
 }
 const compile = require ('@sap/cds-compiler')
 const _4cdsc = Symbol('_4cdsc')
@@ -66,6 +65,8 @@ const _options = {for: Object.assign (_options4, {
   },
 
   sql(o,_env) {
+    // REVISIT: compiler requires to only provide assertIntegrityType if defined
+    if(constraints.assertIntegrity) constraints.assertIntegrityType = features.assert_integrity_type
     return _options4 ({ ...constraints, ..._env||sql, ...o }, {
       sql_mapping  : 'names', //> legacy
       sqlDialect   : 'dialect', //> legacy

package/lib/compile/etc/_localized.js

@@ -7,9 +7,6 @@ const _locales_4sql = {
 
 const { _texts_entries, _localized_entries } = env.cdsc.cv2 || {}
 const _been_here = Symbol('is _localized')
-const _conf = env.requires.db || env.requires.sql
-const _on_sqlite = _conf.kind === 'sqlite' || _conf.dialect === 'sqlite'
-//> FIXME: we reliably need to now if we'll be on sqlite even before the connect happened
 
 
 
@@ -46,6 +43,8 @@ function unfold_csn (m) { // NOSONAR
 	DEBUG && DEBUG ('unfolding csn...')
 	const pass2 = []
 
+	const _conf = env.requires.db || env.requires.sql || env.requires.kinds && env.requires.kinds.sql
+	const _on_sqlite = _conf.kind === 'sqlite' || _conf.dialect === 'sqlite'
 	const _locales = _on_sqlite && _locales_4sql.sqlite
 
 	// Pass 1 - add localized.<locale> entities and views
@@ -96,18 +95,20 @@ function unfold_csn (m) { // NOSONAR
 }
 
 
-const $localized = '$$localized', _is_localized = (d,_path={}) => {
-	if (typeof d.own($localized) === 'boolean') return d.own($localized)
-	if (!d.elements || d.name.endsWith('.texts')) return d.set($localized,false)
-	// if (d.elements.texts && d.elements.texts.target === `${d.name}.texts`) return d.set($localized,true)
-	for (let each in d.elements) {
-		const e = d.elements [each]
-		if (e.localized || e._target && !(_path && e._target.name in _path) && _is_localized(e._target,Object.assign(_path, { [d.name]:1 }))) {
-			return d.set($localized,true)
+const _is_localized = (
+	!env.features._ucsn_ ? d => d.own('$localized') // as set by compiler in compile.for.odata
+	: (d,_path={}) => d.own('$localized', ()=>{    // calculate our own for effective CSNs
+		// if (d.elements.texts && d.elements.texts.target === `${d.name}.texts`) return d.set($localized,true)
+		if (!d.elements || d.name.endsWith('.texts')) return false
+		for (let each in d.elements) {
+			const e = d.elements [each]
+			if (e.localized || e._target && !(_path && e._target.name in _path) && _is_localized(e._target,Object.assign(_path, { [d.name]:1 }))) {
+				return true
+			}
 		}
-	}
-  return d.set($localized,false)
-}
+		return false
+	})
+)
 
 
 // feature-toggled exports

package/lib/compile/for/drafts.js

@@ -1,9 +1,8 @@
+let _unfold = (..._) => (_unfold = require ('@sap/cds-compiler/lib/transform/draft/odata')) (..._)
 const cds = require ('../../index')
 module.exports = function cds_compile_for_drafts (csn,o) {
   if (!cds.env.features._ucsn_) return cds.compile.for.odata (csn,o)
-  const unfold = cds_compile_for_drafts.unfold || (
-    cds_compile_for_drafts.unfold = require ('@sap/cds-compiler/lib/transform/draft/odata')
-  )
   csn = JSON.parse (JSON.stringify (csn)) // REVISIT: workaround for bad test setup
-  return unfold (csn,o||{})
+  csn = _unfold (csn,o||{})
+  return csn
 }