@sap/cds 6.0.4 → 6.1.2

package/bin/build/provider/mtx-extension/index.js

@@ -0,0 +1,57 @@
+const path = require('path')
+const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
+const { FOLDER_GEN } = require('../../constants')
+const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
+
+class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
+    init() {
+        super.init()
+        if (this.buildOptions.root === this.buildOptions.target) {
+            this.task.dest = path.join(this.task.dest, FOLDER_GEN)
+        }
+    }
+
+    async build() {
+        const model = await this.model()
+        if (!model) {
+            return
+        }
+        const allFiles = []
+        const destExt = path.join(this.task.dest, 'ext')
+
+        const packageJson = path.join(destExt, 'package.json')
+        await this.copy(path.join(this.task.src, 'package.json')).to(packageJson)
+        allFiles.push(packageJson)
+
+        // extension CSN using parsed format
+        const options = { ...this.options(), flavor: 'parsed' }
+        const extCsn = await this.cds.load(this.resolveModel(), options)
+        if (extCsn.requires) {
+            extCsn.requires.length = 0
+        }
+        const csnFile = path.join(destExt, 'extension.csn')
+        await this.compileToJson(extCsn, csnFile)
+        allFiles.push(csnFile)
+
+        const i18n = await this.collectLanguageBundles(extCsn, destExt)
+        if (i18n) {
+            allFiles.push(i18n.file)
+        }
+
+        const files = Object.keys(await this.cds.deploy.resources(model))
+        if (files.length > 0) {
+            const dataDest = path.join(destExt, 'data')
+            await Promise.all(
+                files
+                    .filter(file => /\.csv$/.test(file))
+                    .map(csv => {
+                        const csvFile = path.join(dataDest, path.basename(csv))
+                        allFiles.push(csvFile)
+                        return this.copy(csv).to(csvFile)
+                    })
+            )
+        }
+        await new ResourcesTarBuilder(this).writeTarFile(allFiles, destExt, path.join(this.task.dest, 'extension.tgz'))
+    }
+}
+module.exports = MtxExtensionModuleBuilder

package/bin/build/provider/mtx-sidecar/index.js

@@ -1,18 +1,17 @@
-/* eslint-disable no-empty */
 const path = require('path')
-const { FOLDER_GEN } = require('../../constants')
-const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
+const fs = require('fs')
+const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
 const NodeCfModuleBuilder = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
-const { INFO } = require('../buildTaskHandlerInternal')
-const { relativePaths } = require('@sap/cds/bin/build/util')
+const { INFO, ERROR } = NodeCfModuleBuilder
+const { relativePaths, BuildError } = require('../../util')
 
 const DEFAULT_MAIN_FOLDER = "_main"
 
 class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
     get priority() {
         // should be scheduled after 'hana' build tasks are finished
-        return BuildTaskHandlerInternal.PRIORITY_MIN_VALUE
+        return NodeCfModuleBuilder.PRIORITY_MIN_VALUE
     }
     init() {
         super.init()
@@ -25,7 +24,7 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
      * Builds the mtx sidecar app consisting of:
      * - nodejs app model defined by the required sidecar services
      * - main app model defined by the build task's model options including feature models and resources TAR
-     * 
+     *
      * build.target=".": 'dest' -> 'model-provider/gen'
      * build.target="gen": 'dest' -> 'gen/model-provider'
      */
@@ -46,7 +45,7 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         const destSidecar = this.task.dest
         const destSidecarSrc = path.join(destSidecar, this.env.folders.srv)
         const model = this._compileSidecarSync(sidecarEnv)
-        await this.compileToJson(model, destSidecarSrc)
+        await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
         await this.collectLanguageBundles(model, destSidecarSrc)
         await this._copyProjectRootContent(this.task.src, destSidecar)
     }
@@ -56,11 +55,12 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
      * @param {object} sidecarEnv cds env based on the sidecar dir
      */
     async _buildMainApp(sidecarEnv) {
-        let main = sidecarEnv.requires['cds.xt.ModelProviderService']?.root
-        if (!main) {
-            throw new Error("Invalid sidecar configuration - {\"model-provider\": \"in-sidecar\"} configuration missing")
+        if (sidecarEnv.requires['cds.xt.ModelProviderService']?.kind !== 'in-sidecar') {
+            throw new Error("Invalid MTX sidecar configuration - \"cds.xt.ModelProviderService\": \"in-sidecar\" missing")
         }
+        let main = sidecarEnv.requires['cds.xt.ModelProviderService']?.root
         const profiles = this.env.get("profiles") || []
+
         if (!profiles.includes("production") && !profiles.includes("prod")) {
             main = DEFAULT_MAIN_FOLDER
             // root should represent the production use case and not development
@@ -78,7 +78,10 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
 
         // create resources TAR
         // resources are determined based on available database build task, SQLite as fallback
-        await new ResourcesTarProvider(this).writeTar(destMain, csn)
+        await new ResourcesTarProvider(this).createTar(destMain, csn)
+
+        // copy package.json and .cdsrc.json from project root
+        await this._copyMainConfigFiles(this.cds.root, destMain)
     }
 
     /**
@@ -91,20 +94,45 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         try {
             this.cds.root = this.task.src
             this.cds.env = sidecarEnv
-            let modelPaths = this.cds.resolve('*', false)
-            modelPaths = this.cds.resolve(modelPaths)
-            if (!modelPaths || modelPaths.length === 0) {
-                throw new Error("No model found for MTX sidecar app")
+            const modelPaths = this.cds.resolve('*', false)
+            const modelFilePaths = this.cds.resolve(modelPaths)
+
+            if (!modelFilePaths || modelFilePaths.length === 0) {
+                throw new BuildError("No model found for MTX sidecar app")
             }
-            this._logger._debug && this._logger.debug(`sidecar model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
+            // candidate for strict mode support
+            // entries for @sap/** model paths are missing if the module hasn't been installed, e.g. @sap/cds-mtxs
+            const missingModels = modelPaths.filter(p => {
+                if (p.startsWith('@sap/')) {
+                    const files = this.cds.resolve(p)
+                    return !files || files.length === 0
+                }
+            })
+            if (missingModels.length > 0) {
+                this.pushMessage(`Some model paths could not be resolved. Make sure the npm modules have been installed: ${missingModels.join(', ')}`, ERROR)
+            }
+            this._logger._debug && this._logger.debug(`sidecar model: ${relativePaths(this.buildOptions.root, modelFilePaths).join(", ")}`)
 
             // synchronous compilation
-            return this.cds.load(modelPaths, { sync: true, ...this.options() })
+            return this.cds.load(modelFilePaths, { sync: true, ...this.options() })
         } finally {
             // restore project scope
             this.cds.root = this.buildOptions.root
             this.cds.env = env
         }
     }
+
+    async _copyMainConfigFiles(src, dest) {
+        const packageJson = path.join(src, 'package.json')
+        const cdsrcJson = path.join(src, '.cdsrc.json')
+        const promises = []
+        if (fs.existsSync(packageJson)) {
+            promises.push(this.copy(packageJson).to(path.join(dest, 'package.json')))
+        }
+        if (fs.existsSync(cdsrcJson)) {
+            promises.push(this.copy(cdsrcJson).to(path.join(dest, '.cdsrc.json')))
+        }
+        return promises
+    }
 }
 module.exports = MtxSidecarModuleBuilder

package/bin/build/provider/nodejs/index.js

@@ -3,10 +3,10 @@ const path = require('path')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const { BuildError } = require('../../util')
 const { BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY, ODATA_VERSION, ODATA_VERSION_V2, FOLDER_GEN, BUILD_NODEJS_EDMX_GENERAION, EDMX_GENERATION,
-    SKIP_PACKAGE_JSON_GENERATION, CONTENT_EDMX, CONTENT_PACKAGE_JSON, CONTENT_PACKAGELOCK_JSON, CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON } = require('../../constants')
-const { WARNING } = require('../../buildTaskHandler')
+    SKIP_PACKAGE_JSON_GENERATION, CONTENT_EDMX, CONTENT_PACKAGE_JSON, CONTENT_PACKAGELOCK_JSON, CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, SEMVER_REGEX } = require('../../constants')
+const { WARNING, ERROR } = BuildTaskHandlerEdmx
 
-class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
+class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
     init() {
         super.init()
         // set unified option values in order to ease access later on
@@ -28,6 +28,12 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
         this.destSrv = this.isStagingBuild() ? path.resolve(this.task.dest, this.env.folders.srv) : path.join(this.task.dest, FOLDER_GEN)
     }
 
+    options() {
+        const options = super.options(), {cds} = this
+        if (cds.requires.extensibility || cds.requires.toggles) options.flavor = 'xtended'
+        return options
+    }
+
     async build() {
         const destSrv = this.isStagingBuild() ? this.destSrv : path.resolve(this.destSrv, this.env.folders.srv)
         const destRoot = this.isStagingBuild() ? this.task.dest : this.destSrv
@@ -48,7 +54,8 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
         await this.collectAllLanguageBundles(dictionary, sources, destSrv, destRoot)
 
         if (this.hasBuildOption(CONTENT_EDMX, true)) {
-            await this.compileToEdmx(dictionary.base, this.destSrv)
+            const m = await this.cds.load(sources.base, super.options()) // REVISIT: Quick hack to get inferred model as expected by cds.compile.to.edmx()
+            await this.compileToEdmx(m, this.destSrv)
         }
 
         if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
@@ -77,11 +84,11 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
     }
 
     /**
-     * Copy files from the given <em>src</em>' folder (e.g. 'project/srv') to either <em>destRoot</em> (e.g. 'project/gen/srv') 
+     * Copy files from the given <em>src</em>' folder (e.g. 'project/srv') to either <em>destRoot</em> (e.g. 'project/gen/srv')
      * or <em>destSrv</em> (e.g. 'project/gen/srv/srv') folders according to the file semantics.
-     * Files with project semantics like 'package.json' or '.npmrc' file are copied to <em>destRoot</em> while others like '.js' service handlers 
+     * Files with project semantics like 'package.json' or '.npmrc' file are copied to <em>destRoot</em> while others like '.js' service handlers
      * are copied to <em>destSrv</em>.
-     * @param {*} src 
+     * @param {*} src
      * @param {*} destRoot - folder name representing the app root folder (e.g. gen/srv)
      * @param {*} destSrv - folder name representing the app sub-folder (e.g. gen/srv/srv)
      * @returns the list of files that have been copied
@@ -98,7 +105,8 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
                 // TODO shall not copy language bundles - return !/(\/|\\)(node_modules|_i18n)(\/|\\)?$/.test(entry)
                 return !/(\/|\\)node_modules(\/|\\)?$/.test(entry)
             }
-            if (srvRootBlockList.test(entry)) {
+            // make sure the file exists on srv root level - see https://github.tools.sap/cap/issues/issues/12077
+            if (srvRootBlockList.test(entry) && path.dirname(entry) === src) {
                 srvRootFileNames.push(path.basename(entry))
                 return false
             }
@@ -125,8 +133,8 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
     /**
      * Copy dedicated files (files with project semantics like package.json, .npmrc, .cdsrc, etc.)
      * from the given <em>src</em> folder (e.g. 'project') into the given <em>dest</em> folder (e.g. 'project/gen/srv')
-     * @param {*} src 
-     * @param {*} dest 
+     * @param {*} src
+     * @param {*} dest
      * @param {*} filter - copy file if filter function returns true
      */
     async _copyProjectRootContent(src, dest, filter) {
@@ -163,12 +171,18 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
     async _modifyPackageJson(file) {
         function _addEnginesField(content) {
             if (!content.engines || !content.engines.node) {
+                // use minimum node version of @sap/cds
                 const { engines } = require('../../../../package.json')
                 if (engines && engines.node) {
                     this.logger.log(`${this.task.for}: adding node engines version to package.json ${engines.node}`)
                     content.engines = content.engines || {}
-                    content.engines.node = engines.node
-                    return true
+                    const nodeVersion = NodejsModuleBuilder._convertToClosedVersionRange(engines.node)
+                    if (nodeVersion) {
+                        content.engines.node = nodeVersion
+                        return true
+                    } else {
+                        this.pushMessage(`Invalid node version defined in engines definition for @sap/cds ${engines.node} - skip node engines definition`, ERROR)
+                    }
                 }
             }
             return false
@@ -184,6 +198,13 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
             await this.write(content).to(file)
         }
     }
+
+    static _convertToClosedVersionRange(rtVersion) {
+        rtVersion = rtVersion.trim()
+        if (rtVersion.match(SEMVER_REGEX)) {
+            return rtVersion.replace(SEMVER_REGEX, '^$2$3$4')
+        }
+    }
 }
 
-module.exports = NodeCfModuleBuilder
+module.exports = NodejsModuleBuilder

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

@@ -77,7 +77,12 @@ class CfUtil {
     async _cfRequest(urlPath, queryObj, bodyObj) {
         if (queryObj) {
             const entries = Object.entries(queryObj);
-            const queryStr = entries.map((entry) => `${entry[0]}=${encodeURIComponent(entry[1])}`).join('&');
+            const queryStr = entries.map(([key, value]) => {
+                // commas cause problems in cf curl when not double encoded
+                value = value.replace(/,/g, encodeURIComponent(','));
+                return `${key}=${encodeURIComponent(value)}`;
+            }).join('&');
+
             urlPath = urlPath + `?${queryStr}`;
         }
 
@@ -125,7 +130,7 @@ class CfUtil {
     async getCfTargetFromCli() {
         const result = await this._cfRun('target');
         return {
-            apiEndpoint: this._extract(result, /api endpoint\s*:\s*(.+)/i, `CF API endpoint is missing. Use 'cf login' to login.`),
+            apiEndpoint: this._extract(result, /api endpoint\s*:\s*([^\s]+)/i, `CF API endpoint is missing. Use 'cf login' to login.`),
             user: this._extract(result, /user\s*:\s*(.+)/i, `CF user is missing. Use 'cf login' to login.`),
             org: this._extract(result, /org\s*:\s*(.+)/i, `CF org is missing. Use 'cf target -o <ORG> to specify.`),
             space: this._extract(result, /space\s*:\s*(.+)/i, `CF space is missing. Use 'cf target -s <SPACE>' to specify.`),

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

@@ -35,7 +35,7 @@ class HanaDeployer {
     this.logger = logger;
 
     this.logger.log(`${bold('Starting deploy to SAP HANA ...')}`);
-    if (vcapFile)  {
+    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
@@ -49,9 +49,9 @@ class HanaDeployer {
 
     const { buildResults } = await this._build(buildTaskOptions, model);
 
-    let vcapServices;
+    let vcapFileEnv;
     if (vcapFile) {
-      vcapServices = await this._loadVCAPServices(vcapFile);
+      vcapFileEnv = await this._loadDefaultEnv(vcapFile);
     }
 
     for (const buildResult of buildResults) {
@@ -71,7 +71,7 @@ class HanaDeployer {
         serviceKeyName = cfServiceInstanceKeyName;
         serviceName = serviceName || cfServiceInstanceName;
 
-        vcapServices = this._getVCAPServicesEntry(cfServiceInstanceName, serviceKey);
+        vcapFileEnv = this._getVCAPServicesEntry(cfServiceInstanceName, serviceKey);
 
         if (!noSave && !bindCallback) {
           await this._addInstanceToDefaultEnvJson([currentModelFolder, projectPath], cfServiceInstanceName, serviceKey);
@@ -95,7 +95,7 @@ class HanaDeployer {
         });
       }
 
-      await hdiDeployUtil.deploy(currentModelFolder, vcapServices, hdiOptions);
+      await hdiDeployUtil.deploy(currentModelFolder, vcapFileEnv, hdiOptions);
 
       if (bindCallback) {
         const args = [path.relative(projectPath, buildResult.task.src)];
@@ -204,16 +204,12 @@ class HanaDeployer {
   }
 
 
-  async _loadVCAPServices(vcapFile) {
+  async _loadDefaultEnv(defaultEnvFile) {
     try {
-      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.`);
-      }
-
-      return content.VCAP_SERVICES;
+      const content = await fs.readFile(defaultEnvFile);
+      return JSON.parse(content);
     } catch (err) {
-      throw new Error(`Error reading vcap file: ${err.message}`);
+      throw new Error(`Error reading default env file: ${err.message}`);
     }
   }
 
@@ -237,13 +233,10 @@ class HanaDeployer {
       }
 
       const hanaEntry = this._getVCAPServicesEntry(serviceInstanceName, serviceKey)
-      defaultEnvJson.VCAP_SERVICES = {
-        ...defaultEnvJson.VCAP_SERVICES,
-        ...hanaEntry
-      }
+      Object.assign(defaultEnvJson, hanaEntry);
 
       this.logger.log(`Writing ${defaultEnvJsonPath}`);
-      await fs.mkdir(path.dirname(defaultEnvJsonPath), {recursive: true})
+      await fs.mkdir(path.dirname(defaultEnvJsonPath), { recursive: true })
       await fs.writeFile(defaultEnvJsonPath, JSON.stringify(defaultEnvJson, null, 2));
     }
   }
@@ -251,13 +244,15 @@ class HanaDeployer {
 
   _getVCAPServicesEntry(serviceInstanceName, serviceKey) {
     return {
-      hana: [
-        {
-          name: serviceInstanceName,
-          tags: ['hana'],
-          credentials: serviceKey
-        }
-      ]
+      VCAP_SERVICES: {
+        hana: [
+          {
+            name: serviceInstanceName,
+            tags: ['hana'],
+            credentials: serviceKey
+          }
+        ]
+      }
     };
   }
 

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

@@ -20,7 +20,10 @@ class HdiDeployUtil {
         await this._executeDeploy(dbDir, env, logger);
     }
 
-    async deploy(dbDir, vcapServices, options = {}) {
+    async deploy(dbDir, vcapEnv, options) {
+        vcapEnv = vcapEnv || {}; // handles null and undefined
+        options = options || {};
+
         LOG.log();
         LOG.log(`Deploying to HANA from ${dbDir}`);
 
@@ -34,7 +37,15 @@ class HdiDeployUtil {
             deployerEnv = hdiDeployLib.clean_env(deployerEnv);
         }
 
-        deployerEnv.VCAP_SERVICES = JSON.stringify(vcapServices);
+        if (vcapEnv.VCAP_SERVICES) {
+            deployerEnv.VCAP_SERVICES = JSON.stringify(vcapEnv.VCAP_SERVICES);
+        }
+        if (vcapEnv.SERVICE_REPLACEMENTS) {
+            deployerEnv.SERVICE_REPLACEMENTS = JSON.stringify(vcapEnv.SERVICE_REPLACEMENTS);
+        }
+        if (vcapEnv.TARGET_CONTAINER) {
+            deployerEnv.TARGET_CONTAINER = vcapEnv.TARGET_CONTAINER;
+        }
 
         if (options.autoUndeploy) {
             LOG.log(`Hdi deployer automatically undeploys deleted resources using --auto-undeploy.`);

package/bin/serve.js

@@ -181,7 +181,7 @@ async function serve (all=[], o={}) { // NOSONAR
     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)
+    if (plugin.activate) await plugin.activate(each)
   }
 
   // bootstrap server from project-local server.js or from @sap/cds/server.js
@@ -258,16 +258,19 @@ function _prepare_logging () { // NOSONAR
   cds.on ('serving', (srv) => {
     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 )
+    if (srv._source && !srv._source.startsWith('@sap'))
+      details.impl = local(srv._source)
     log (`${srv.mocked ? 'mocking' : 'serving'} ${srv.name}`, details)
   })
 
+  cds.on ('served', ()=> console.log())
+
   // print info when we are finally on air
   cds.once ('listening', ({url})=>{
-    console.log ()
+    console.log()
     log ('server listening on',{url})
     _timer && console.timeEnd (_timer)
-    if (process.stdin.isTTY) log (`[ terminate with ^C ]`)
+    if (process.stdin.isTTY) log (`[ terminate with ^C ]\n`)
   })
 }
 

package/lib/compile/extend.js

@@ -1,8 +1,18 @@
+const compile = require ('./cds-compile')
 const { extend } = require ('../lazy')
-const compile = require ('./index')
 
-module.exports = o => o.definitions ? { with(...exts) {
-  const all = { 'base.csn': JSON.stringify(o) }
-  exts.forEach ((x,i)=> all[i+'.csn'] = JSON.stringify(x))
-  return compile (all)
+module.exports = o => o.definitions ? { with(...csns) {
+
+  const csn=o, merged = { definitions: {}, extensions: [] }
+  for (const { definitions, extensions } of csns) {
+    if (definitions) Object.assign(merged.definitions, definitions)
+    if (extensions) merged.extensions.push(...extensions)
+  }
+  const extended = compile({
+    'base.csn': compile.to.json(csn),
+    'ext.csn': compile.to.json(merged)
+  })
+  extended.$sources = csn.$sources // required to load resources like i18n later on
+  return extended
+
 }} : extend(o)

package/lib/compile/minify.js

@@ -35,7 +35,7 @@ module.exports = function cds_minify (csn, _roots) { // IMPORTANT: don't add cds
   }
   function _visit (d) {
     if (typeof d === 'string') {
-      if (isInReservedNamespace(d)) return
+      if (cds.compiler.model.isInReservedNamespace(d)) return
       else d = all[d]
     } else if (d.ref) return d.ref.reduce((p,n) => {
       let d = (p.elements || csn.definitions[p.target].elements)[n.id || n] // > n.id -> view with parameters
@@ -61,18 +61,4 @@ module.exports = function cds_minify (csn, _roots) { // IMPORTANT: don't add cds
   return minified
 }
 
-/**
- * TODO - keep in sync with @sap/cds-compiler. Use their public API once it is available!
- * Checks whether the given absolute path is inside a reserved namespace.
- *
- * @param {string} absolute
- * @returns {boolean}
- */
-function isInReservedNamespace(absolute) {
-  return absolute.startsWith( 'cds.') &&
-    !absolute.match(/^cds\.foundation(\.|$)/) &&
-    !absolute.match(/^cds\.outbox(\.|$)/) && // Requested by Node runtime
-    !absolute.match(/^cds\.xt(\.|$)/); // Requested by Mtx
-}
-
 const _minified = Symbol('minified')

package/lib/compile/parse.js

@@ -56,7 +56,7 @@ const tagged = (parse, strings, ...values) => {
     all[2*i] = s
     all[2*i+1] = v instanceof cds.entity ? v.name : ':'+i
     if (typeof v === 'string' && s.endsWith(' like ') && !v.includes('%')) values[i] = `%${v}%`
-    if (Array.isArray(v) && s.endsWith(' in ')) values[i] = {list: v.map(cxn4)}
+    if (Array.isArray(v) && s.toLowerCase().endsWith(' in ')) values[i] = {list: v.map(cxn4)}
   }
   all[2*i] = strings[i]
   return merge (parse(all.join('')), values)

package/lib/compile/resolve.js

@@ -20,7 +20,7 @@ module.exports = exports = function cds_resolve (model, o={}) { // NOSONAR
   if (model === '*') return _resolve_all(o,this)
   if (Array.isArray(model)) {
     const resolved = [... new Set(model)] .reduce ((prev,next) => prev.concat (this.resolve(next,o)||[]), [])
-    return o.dry || o === false ? resolved : _resolved (resolved)
+    return o.dry || o === false ? [...new Set(resolved.flat())] : _resolved (resolved)
   }
   if (model.endsWith('/*')) return _resolve_subdirs_in(model,o,this)
 
@@ -69,7 +69,7 @@ const _required = (cds,env=cds.env) => Object.values(env.requires) .map (r => r.
 const _resolve = require('module')._resolveFilename
 
 function _resolve_all (o,cds) {
-  const {roots} = o.env || cds.env; if (o.dry || o === false)  return [ ...roots, ..._required(cds) ]
+  const {roots} = o.env || cds.env; if (o.dry || o === false)  return [ ...roots, ...new Set(_required(cds).flat()) ]
   const cache = o.cache || exports.cache
   const cached = cache['*']; if (cached) return cached
   cache['*'] = [] // important to avoid endless recursion on '*'

package/lib/compile/to/srvinfo.js

@@ -69,21 +69,23 @@ module.exports = (model, options={}) => {
 
   function _javaPrefix() {
     let is_java
+    const javaPrefixDefault = 'odata/v4/'
     for (let s of model.$sources) {
       const file = isfile (join (s,'../src/main/resources/application.yaml'))
       if (file) {
         const yaml = cds.load.yaml(file)
-        for (let {cds} of Array.isArray(yaml) ? yaml : [yaml]) {
+        for (let yamlDoc of Array.isArray(yaml) ? yaml : [yaml]) {
+          const cds = yamlDoc?.cds;
           if (!cds)   continue
           return cds['odataV4.endpoint.path']  || cds['odataV2.endpoint.path'] // https://cap.cloud.sap/docs/java/application-services#configure-base-path
               || cds['odata-v4.endpoint.path'] || cds['odata-v2.endpoint.path'] // older/intermediate config, keep for backward compatibility
-
+              || javaPrefixDefault
         }
-        return 'odata/v4/'
+        return javaPrefixDefault
       }
       else if (isfile (join(s,'../pom.xml'))) is_java = true
     }
-    return is_java && 'odata/v4/'
+    return is_java && javaPrefixDefault
   }
 
 }

package/lib/{deploy.js → dbs/cds-deploy.js}

@@ -1,4 +1,4 @@
-const cds = require('./index'), { local, inspect } = cds.utils
+const cds = require('../index'), { local, inspect } = cds.utils
 const DEBUG = cds.debug('deploy')
 /* eslint-disable no-console */
 
@@ -111,7 +111,7 @@ exports.create = async function (db, csn=db.model, o) {
       console.log(); for (let each of drops) console.log(each)
       console.log(); for (let each of creates) console.log(each,'\n')
       return
-    } else return db.tx (async tx => {
+    } else return db.run (async tx => {
       await tx.run(drops)
       await tx.run(creates)
       return true
@@ -120,8 +120,9 @@ exports.create = async function (db, csn=db.model, o) {
 }
 
 
-exports.init = (db, csn=db.model, log=()=>{}) => db.tx (async tx => {
-  const resources = await exports.resources(csn), inits=[]
+exports.init = (db, csn=db.model, log=()=>{}) => db.run (async tx => {
+  const resources = await exports.resources(csn, {testdata: cds.env.features.test_data})
+  const inits=[]
   for (let [file,e] of Object.entries(resources)) {
     if (e === '*') { // init.js/ts
       let x = await cds.utils._import(file);  if (!x) continue
@@ -143,9 +144,9 @@ exports.init = (db, csn=db.model, log=()=>{}) => db.tx (async tx => {
 })
 
 
-exports.resources = async function (csn) {
+exports.resources = async function (csn, opts) {
   if (!csn || !csn.definitions) csn = await cds.load (csn||'*') .then (cds.minify)
-  const folders = await exports.resources.folders(csn)
+  const folders = await exports.resources.folders(csn, opts)
   const found={}, ts = process.env.CDS_TYPESCRIPT
   for (let folder of folders) {
     // fetching init.js files
@@ -173,11 +174,11 @@ exports.resources = async function (csn) {
 }
 
 
-exports.resources.folders = async function (csn) {
+exports.resources.folders = async function (csn, o={}) {
   if (!csn || !csn.definitions) csn = await cds.load (csn||'*') .then (cds.minify)
   const folders = new Set (csn.$sources.map (path.dirname) .filter (f => f !== cds.home))
   if (cds.env.folders.db) folders.add (path.resolve(cds.root, cds.env.folders.db))
-  if (cds.env.features.test_data) folders.add (path.resolve(cds.root,'test/'))
+  if (o.testdata) folders.add (path.resolve(cds.root,'test/'))
   return folders
 }