@sap/cds 5.4.6 → 5.5.0

package/bin/build/provider/java-cf/index.js

@@ -4,10 +4,8 @@ const path = require('path')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const { isOldJavaStack, BuildError } = require('../../util')
 
-const { BUILD_OPTION_OUTPUT_MODE, ODATA_VERSION, ODATA_VERSION_V2,
-    OUTPUT_MODE_RESULT_ONLY, FILE_EXT_CDS, SKIP_ASSERT_COMPILER_V2 } = require('../../constants')
+const { BUILD_OPTION_OUTPUT_MODE, ODATA_VERSION, ODATA_VERSION_V2, OUTPUT_MODE_RESULT_ONLY, FILE_EXT_CDS, SKIP_ASSERT_COMPILER_V2, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN } = require('../../constants')
 const { INFO } = require('../../buildTaskHandler')
-const DEBUG = process.env.DEBUG
 
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
 
@@ -45,9 +43,13 @@ class JavaCfModuleBuilder extends BuildTaskHandlerEdmx {
             return this._result
         }
 
-        const odata = await this._compileCsn(model, this.task.options.compileDest, odataOptions)
-        await this.compileEdmx(odata, this.task.options.compileDest, odataOptions)
+        const odata = await this._compileForOdata(model, this.task.options.compileDest, odataOptions)
+        await this.compileToEdmx(odata, this.task.options.compileDest, odataOptions)
 
+        if (this.hasBuildOption(CONTENT_LANGUAGE_BUNDLES, true)) {
+            // collect and write language bundles into single i18n.json file
+            await this.collectLanguageBundles(model, this.task.dest)
+        }
         if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
             await this._copyNativeContent(src, dest)
         }
@@ -59,9 +61,7 @@ class JavaCfModuleBuilder extends BuildTaskHandlerEdmx {
             await super.clean()
             return
         }
-        if (DEBUG) {
-            this.logger.log(`Deleting build target folder ${this.task.options.compileDest}`)
-        }
+        this.logger._debug && this.logger.debug(`Deleting build target folder ${this.task.options.compileDest}`)
         await fs.remove(this.task.options.compileDest)
     }
 
@@ -76,7 +76,7 @@ class JavaCfModuleBuilder extends BuildTaskHandlerEdmx {
         })
     }
 
-    async _compileCsn(model, csnDest, compileOptions) {
+    async _compileForOdata(model, csnDest, compileOptions) {
         // csn for service providers
         const odataOptions = {
             ...this._options4odata(),
@@ -84,21 +84,11 @@ class JavaCfModuleBuilder extends BuildTaskHandlerEdmx {
         }
         const odataModel = this.cds.compile.for.odata(model, odataOptions)
 
-        // This will als add a @source annotation containing the relative path to the origin .cds source file.
-        // The @source annotation is required for correct custom handler resolution if no @impl annotation has been defined as
-        // custom service handler implementations are relative to the origin .cds source files.
-        // For staging builds (task.src !== task.dest) the csn.json file that is served at runtime is copied into a corresponding srv subfolder.
-        // As a consequence the src folder name has to be included in the @source file name while for inplace builds (task.src === task.dest) this is not the case.
-        // This ensures that the paths are relative to the cwd when executing cds run.
-        const jsonOptions = {
-            cwd: this.buildOptions.root,
-            src: this.task.src === this.task.dest ? this.task.src : this.buildOptions.root
-        }
-        const extCsn = this.cds.compile.to.json(odataModel, jsonOptions)
-        this._result.csn = JSON.parse(extCsn)
-
-        if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
-            await this.write(extCsn).to(path.join(csnDest, 'csn.json'))
+        // adding csn to build result containing @source and _where persisted properties
+        if (this.hasBuildOption(CONTENT_DEFAULT_CSN, true)) { //default true or undefined
+            await this.compileToJson(model, csnDest)
+        } else {
+            await this.compileToJson(odataModel, csnDest)
         }
         return odataModel
     }

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

@@ -1,22 +1,22 @@
 /* eslint-disable no-empty */
 const { fs } = require('@sap/cds-foss')
 const path = require('path')
-const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
-const BuildTaskProviderInternal = require('../buildTaskProviderInternal')
 const { BUILD_TASK_HANA, FOLDER_GEN } = require('../../constants')
 const { WARNING } = require('../../buildTaskHandler')
-const DEBUG = process.env.DEBUG
+const BuildTaskProviderInternal = require("../buildTaskProviderInternal")
+const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 
 const FOLDER_SDC = "sdc"
 const FOLDER_NODE_MODULES = "node_modules"
 const FOLDER_TEMPLATES = "tpl"
 
-class MtxModuleBuilder extends BuildTaskHandlerInternal {
+class MtxModuleBuilder extends BuildTaskHandlerEdmx {
     get priority() {
         // should be scheduled after all other build tasks are finished
-        return BuildTaskHandlerInternal.PRIORITY_MIN_VALUE
+        return BuildTaskHandlerEdmx.PRIORITY_MIN_VALUE
     }
     init() {
+        super.init()
         if (this.buildOptions.root === this.buildOptions.target) {
             this.task.dest = path.join(this.task.dest, FOLDER_GEN, FOLDER_SDC)
         } else {
@@ -38,19 +38,19 @@ class MtxModuleBuilder extends BuildTaskHandlerInternal {
         // copy base model sources
         await Promise.all(model.$sources.map(src => {
             if (src.includes(FOLDER_NODE_MODULES)) {
-                return this.copy(src).to(path.join(this.task.dest, src.substr(src.indexOf(FOLDER_NODE_MODULES))))
+                return this.copy(src).to(src.substr(src.indexOf(FOLDER_NODE_MODULES)))
             } else {
                 const relSrc = path.relative(this.buildOptions.root, src)
                 if (relSrc.startsWith("..")) {
-                    this.logger.warn(`[cds] - model file is out of project scope, skipping file ${src}`)
+                    this.logger.warn(`model file is out of project scope, skipping file ${src}`)
                     return Promise.resolve()
                 }
-                return this.copy(src).to(path.join(this.task.dest, relSrc))
+                return this.copy(src).to(relSrc)
             }
         }))
 
         // collect and write language bundles into single i18n.json file
-        await this.copyLanguageBundles(model, this.task.dest)
+        await this.collectLanguageBundles(model, this.task.dest)
 
         // copy native hana content and templates
         await this._copyNativeContent(this.task.src, this.task.dest, tenantDbPath)
@@ -62,9 +62,7 @@ class MtxModuleBuilder extends BuildTaskHandlerInternal {
             // delete entire folder 'gen'
             const genDest = path.dirname(this.task.dest)
             if (path.basename(genDest) === FOLDER_GEN) {
-                if (DEBUG) {
-                    this.logger.log(`Deleting build target folder ${genDest}`)
-                }
+                this.logger._debug && this.logger.debug(`Deleting build target folder ${genDest}`)
                 await fs.remove(genDest)
             }
         }
@@ -207,9 +205,9 @@ class MtxModuleBuilder extends BuildTaskHandlerInternal {
         if (!tenantDbPath) {
             tenantDbPath = path.join(this.buildOptions.root, this.env.folders.db)
             if (hanaDbPaths.length === 0) {
-                this.pushMessage(`[cds] - no 'hana' build task found, use default location '${tenantDbPath}'`, WARNING)
+                this.pushMessage(`no 'hana' build task found, use default location '${tenantDbPath}'`, WARNING)
             } else {
-                this.pushMessage(`[cds] - no 'hana' build task found matching model scope '${this.task.options.model}', use default location '${tenantDbPath}'`, WARNING)
+                this.pushMessage(`no 'hana' build task found matching model scope '${this.task.options.model}', use default location '${tenantDbPath}'`, WARNING)
             }
         }
         return tenantDbPath

package/bin/build/provider/node-cf/index.js

@@ -4,15 +4,19 @@ const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const { getHanaDbModuleDescriptor, getServiceModuleDescriptor } = require('../../mtaUtil')
 const { BuildError } = require('../../util')
 const { BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY, ODATA_VERSION, ODATA_VERSION_V2,
-    BUILD_NODEJS_EDMX_GENERAION, BUILD_TASK_HANA, FOLDER_GEN } = require('../../constants')
+    BUILD_TASK_HANA, FOLDER_GEN, BUILD_NODEJS_EDMX_GENERAION, EDMX_GENERATION, SKIP_PACKAGE_JSON_GENERATION, SKIP_MANIFEST_GENERATION, CONTENT_EDMX, CONTENT_MANIFEST, CONTENT_PACKAGE_JSON } = require('../../constants')
 const { WARNING } = require('../../buildTaskHandler')
 
-const DEBUG = process.env.DEBUG
 const FILE_NAME_MANIFEST_YML = "manifest.yml"
 
 class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
     init() {
         super.init()
+        // set unified option values in order to easy access later on
+        this.task.options[CONTENT_EDMX] = this.hasBuildOption(CONTENT_EDMX, true) || this.hasCdsEnvOption(BUILD_NODEJS_EDMX_GENERAION, true) || this.hasBuildOption(EDMX_GENERATION, true) ? true : false
+        this.task.options[CONTENT_MANIFEST] = !this.hasBuildOption(CONTENT_MANIFEST, false) && !this.hasBuildOption(SKIP_MANIFEST_GENERATION, true) ? true : false
+        this.task.options[CONTENT_PACKAGE_JSON] = !this.hasBuildOption(CONTENT_PACKAGE_JSON, false) && !this.hasBuildOption(SKIP_PACKAGE_JSON_GENERATION, true) ? true : false
+
         if (this.task.options.compileDest) {
             throw new BuildError("Option not supported - compileDest")
         }
@@ -31,36 +35,20 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
             return this._result
         }
 
-        // This will als add a @source annotation containing the relative path to the origin .cds source file.
-        // The @source annotation is required for correct custom handler resolution if no @impl annotation has been defined as
-        // custom service handler implementations are relative to the origin .cds source files.
-        // For staging builds (task.src !== task.dest) the csn.json file that is served at runtime is copied into a corresponding srv subfolder.
-        // As a consequence the src folder name has to be included in the @source file name while for inplace builds (task.src === task.dest) this is not the case.
-        // This ensures that the paths are relative to the cwd when executing cds run.
-        const jsonOptions = {
-            cwd: this.buildOptions.root,
-            src: this.task.src === this.task.dest ? this.task.src : this.buildOptions.root
-        }
-        const extCsn = this.cds.compile.to.json(model, jsonOptions)
-
-        const extModel = JSON.parse(extCsn)
-        this._result.csn = extModel
-
-        if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
-            await this.write(extCsn).to(path.join(this.destGen, "csn.json"))
-        }
+        // adding csn to build result containing @source and _where persisted properties
+        await this.compileToJson(model, this.destGen)
 
         // collect and write language bundles into single i18n.json file
-        await this.copyLanguageBundles(model, this.destGen)
+        await this.collectLanguageBundles(model, this.destGen)
 
-        if (this.hasCdsEnvOption(BUILD_NODEJS_EDMX_GENERAION, true) || this.hasBuildOption('edmxGeneration', true)) {
-            await this.compileEdmx(model, this.destGen)
+        if (this.hasBuildOption(CONTENT_EDMX, true)) {
+            await this.compileToEdmx(model, this.destGen)
         }
 
         if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
             await this._copyNativeContent(this.task.src, this.isStagingBuild() ? this.destGen : path.dirname(this.destGen))
 
-            if (!this.task.options.skipManifestGeneration) {
+            if (this.hasBuildOption(CONTENT_MANIFEST, true)) {
                 await Promise.all([this._writeManifestYml(), this._writeCfIgnore()])
             }
         }
@@ -72,9 +60,7 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
         if (this.buildOptions.target === this.buildOptions.root) {
             // delete the entire 'task.dest' folder otherwise, for details see #constructor
             // - the value of the folder 'src' has been appended to the origin 'task.dest' dir
-            if (DEBUG) {
-                this.logger.log(`Deleting build target folder ${this.destGen}`)
-            }
+            this.logger._debug && this.logger.debug(`Deleting build target folder ${this.destGen}`)
             await fs.remove(this.isStagingBuild() ? this.task.dest : this.destGen)
         }
     }
@@ -102,7 +88,7 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
             if (/\.js$|\.properties$/.test(entry)) {
                 return true
             }
-            if (/package\.json$/.test(entry) && !this.task.options.skipPackageJsonGeneration) {
+            if (/package\.json$/.test(entry) && this.hasBuildOption(CONTENT_PACKAGE_JSON, true)) {
                 packageJsonCopy = true
                 return true
             }
@@ -126,7 +112,7 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
             let changed = false
             Object.keys(deps).forEach(key => {
                 if (typeof deps[key] === 'string' && deps[key].startsWith('.') || deps[key].startsWith('file:')) {
-                    this.logger.log(`[cds] - ${this.task.for}: removing file dependency '${deps[key]}' from ${path.relative(this.buildOptions.root, file)}`)
+                    this.logger.log(`${this.task.for}: removing file dependency '${deps[key]}' from ${path.relative(this.buildOptions.root, file)}`)
                     delete deps[key]
                     changed = true
                 }
@@ -136,8 +122,8 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
         function _addEnginesField(content) {
             if (!content.engines || !content.engines.node) {
                 const { engines } = require('../../../../package.json')
-                this.logger.log(`[cds] - ${this.task.for}: adding node engines version to package.json ${engines}`)
                 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
@@ -193,8 +179,8 @@ class NodeCfModuleBuilder extends BuildTaskHandlerEdmx {
         if (hanaBuildTask) {
             const dbModuleDescriptor = await getHanaDbModuleDescriptor(this.buildOptions.root, path.basename(hanaBuildTask.src), this.logger)
             hanaServiceBinding = `      - ${dbModuleDescriptor.hdiServiceName}`
-        } else if (DEBUG) {
-            this.logger.log("[cds] - generating manifest.yml without HANA service binding, using sqlite database")
+        } else {
+            this.logger.debug("generating manifest.yml without HANA service binding, using sqlite database")
         }
 
         try {

package/bin/cds.js

@@ -40,9 +40,9 @@ const cli = { //NOSONAR
     }
 
     function add (k,v) { options[k.slice(2)] = v || true }
-    function add_global (k,v) {
+    function add_global (k,v='') {
       if (k === '--production') return process.env.NODE_ENV = 'production'
-      if (k === '--profile') return process.env.NODE_ENV = v.split(',')
+      if (k === '--profile') return process.env.CDS_ENV = v.split(',')
       if (k === '--odata') v = { flavor:v }
       let e=env || (env={}), path = k.slice(2).split('-')
       while (path.length > 1) { let p = path.shift(); e = e[p]||(e[p]={}) }
@@ -54,10 +54,10 @@ const cli = { //NOSONAR
   },
 
   errorHandlers () {
-    const _error = (e) => { cli.log(e.errors || e, { 'log-level': (cds.env.log && cds.env.log.levels && cds.env.log.levels.cli) || 'warn' }); _exit(1) }
+    const _error = (e) => { cli.log(e.errors || e, { 'log-level': cds.env.log.levels.cli }); _exit(1) }
     const _exit = (c) => { console.log(); process.exit(c) }
-    process.on ('unhandledRejection', _error)
-    process.on ('uncaughtException', _error)
+    cds.repl || process.on ('unhandledRejection', _error)
+    cds.repl || process.on ('uncaughtException', _error)
     process.on ('SIGTERM',_exit)
     process.on ('SIGHUP',_exit)
     process.on ('SIGINT',_exit)

package/bin/serve.js

@@ -124,7 +124,7 @@ module.exports = Object.assign ( serve, {
 
 
 const cds = require('../lib'), { exists, isfile, local, path } = cds.utils
-
+let log = console.log // provisional logger, see _prepareLogging
 
 /**
  * The main function which dispatches into the respective usage variants.
@@ -145,7 +145,7 @@ async function serve (all=[], o={}) { // NOSONAR
   // handle --watch and --project
   if (o.watch)  return _watch (o.project,o)   // cds serve --watch <project>
   if (o.project) _chdir_to (o.project)      // cds run --project <project>
-  if (!o.silent) _prepare_logging (o)
+  if (!o.silent) _prepare_logging ()
 
   // The following things are meant for dev mode, which can be overruled by feature flagse...
   const {features} = cds.env
@@ -192,43 +192,46 @@ 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) {
-    console.log ('[cds] - Loading server from', { file: local(server_js) })
+    log && log ('Loading server from', { file: local(server_js) })
     const fn = require (server_js)
     return typeof fn === 'function' ? fn : cds.error `${local(server_js)} must export a function`
   }
 }
 
 
-function _prepare_logging (o) { // NOSONAR
+function _prepare_logging () { // NOSONAR
+  // change `log` function to cds.log
+  const LOG = cds.log('serve', { prefix:'cds' })
+  log = LOG._info && LOG.info
 
-  const _timer = '[cds] - launched in'
-  console.time (_timer)
-  console.log()
+  const _timer = log && `[cds] - launched at ${new Date().toLocaleString()}, in`
+  _timer && console.time (_timer)
 
   // print information when model is loaded
   cds.on ('loaded', (model)=>{
-    console.log (`[cds] - model loaded from ${model.$sources.length} file(s):\n\x1b[2m`)
-    for (let each of model.$sources)  console.log (' ', local(each))
-    console.log ('\x1b[0m')
+    log && log (`model loaded from ${model.$sources.length} file(s):\n\x1b[2m`)
+    for (let each of model.$sources)  log && console.log (' ', local(each))
+    log && console.log ('\x1b[0m')
   })
 
   // print information about each connected service
   cds.on ('connect', ({name,kind,options:{use,credentials}})=>{
-    console.log (`[cds] - connect to ${name} > ${use||kind}`, _redacted(credentials))
+    log && log (`connect to ${name} > ${use||kind}`, _redacted(credentials))
   })
 
   // print information about each provided service
   cds.on ('serving', (srv) => {
     const details = { at: srv.path }
     if (srv._source) details.impl = local(srv._source)
-    console.log (`[cds] - ${srv.mocked ? 'mocking' : 'serving'} ${srv.name}`, details)
+    log && log (`${srv.mocked ? 'mocking' : 'serving'} ${srv.name}`, details)
   })
 
   // print info when we are finally on air
   cds.once ('listening', ({url})=>{
-    console.log ('\n[cds] - server listening on',{url})
-    console.timeEnd (_timer)
-    if (process.stdin.isTTY) console.log (`[ terminate with ^C ]\n`)
+    log && console.log ()
+    log && log ('server listening on',{url})
+    _timer && console.timeEnd (_timer)
+    if (process.stdin.isTTY) log && log (`[ terminate with ^C ]\n`)
   })
 
   return cds
@@ -264,7 +267,7 @@ function _in_memory (o) {
     }}})
     return true
   }
-  if (db && db.credentials && db.credentials.database === ':memory:') {
+  if (db && db.credentials && (db.credentials.database || db.credentials.url) === ':memory:') {
     return true
   }
 }
@@ -277,7 +280,7 @@ 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', ()=> {
-      console.log ('[cds] - adding mock behaviours from', { file: local(mocks) })
+      log && log ('adding mock behaviours from', { file: local(mocks) })
       require(mocks)
     })
     return true
@@ -285,14 +288,17 @@ function _with_mocks (o) {
 }
 
 
+const SECRETS = /(password)|(certificate)|(ca)|(clientsecret)/i // 'certificate' and 'ca' on HANA
 /** mascades password-like strings, also reducing clutter in output */
 function _redacted(cred) {
-  const secrets = /(password)|(certificate)|(ca)/i // 'certificate' and 'ca' on HANA
-  const newCred = Object.assign({}, cred)
-  Object.keys(newCred)
-    .filter((k) => typeof newCred[k] === 'string' && secrets.test(k))
-    .forEach((k) => (newCred[k] = '...'))
-  return newCred
+  if (cred === null) return cred
+  if (Array.isArray(cred)) return cred.map(_redacted)
+  if (typeof cred === 'object') {
+    const newCred = Object.assign({}, cred)
+    Object.keys(newCred).forEach(k => (typeof newCred[k] === 'string' && SECRETS.test(k)) ? (newCred[k] = '...') : (newCred[k] = _redacted(newCred[k])))
+    return newCred
+  }
+  return cred
 }
 
 /* eslint no-console:off */

package/bin/version.js

@@ -54,7 +54,6 @@ function info(o) {
   const main = _findPackage (require.main.filename)
   return {
     ..._versions4(main, {}, true),  // usually sap/cds-dk or sap/cds
-    ..._versions4(o.all && '@sap/cds-sidecar-client', {}, null, o),
     ..._versions4('@sap/eslint-plugin-cds', {}, null, o),
     ..._versions4(process.cwd(), {}, null, o),
     ..._versions4('..', {}, null, o),

package/lib/compile/etc/_localized.js

@@ -6,12 +6,7 @@ const _locales_4sql = {
 }
 
 // FIXME: we reliably need to now if we'll be on sqlite even before the connect happened
-const _on_sqlite = () => {
-	const db = env.requires.db
-	if (db) return db.kind === 'sqlite' || (db.kind === 'sql' && db.use === 'sqlite')
-	return env.env === 'development'
-}
-
+const _on_sqlite = (env.requires.db || env.requires.sql).dialect === 'sqlite'
 const { _texts_entries, _localized_entries } = env.cdsc.cv2 || {}
 const _been_here = Symbol('is _localized')
 
@@ -50,17 +45,17 @@ function unfold_csn (m) { // NOSONAR
 	DEBUG && console.trace ('unfolding csn...')
 	const pass2 = []
 
-	const _locales = _on_sqlite() && _locales_4sql.sqlite
+	const _locales = _on_sqlite && _locales_4sql.sqlite
 
 	// Pass 1 - add localized.<locale> entities and views
 	for (let each in m.definitions) {
 		const d = m.definitions [each]
 		// Add <entry>_texts proxies for all <entry>.texts entities
-		if (_texts_entries && each.endsWith('.texts')) {
+		if (_texts_entries !== false && each.endsWith('.texts')) {
 			_add_proxy4 (d, each.slice(0,-6)+'_texts')
 		}
 		// Add localized.<entry> for all entities marked as .$localized
-		if (_localized_entries && d.own('$localized')) {
+		if (_localized_entries !== false && d.own('$localized')) {
 			let x = _add_proxy4 (d,`localized.${each}`)
 			if (x) pass2.push ([x])
 			// if running on sqlite add additional localized.<locale>. views

package/lib/compile/for/sql.js

@@ -1,7 +1,10 @@
 /** REVISIT: uses internal APIs to restore compile.for.sql in SNAPI */
 const compile = require ('@sap/cds-compiler/lib/backends')
+let _compile
 
 module.exports = function cds_compile_for_sql (src,o) {
-  const {csn} = compile.toSqlWithCsn (src,{...o,csn:true})
-  return csn
+  _compile = _compile || compile.toSqlWithCsn || compile.for_sql
+  // for_sql directly returns a CSN and not an object with a csn property
+  const res = _compile(src,{...o,csn:true})
+  return res.csn || res
 }

package/lib/compile/parse.js

@@ -1,32 +1,39 @@
 const cdsc = require ('@sap/cds-compiler')
 const cds = require ('../index')
 
-
 /** cds.parse is both, a namespace and a shortcut for cds.parse.cdl */
 const cds_parse = (src,o) => cds.compile (src,o,'parsed')
 const parse = module.exports = Object.assign (cds_parse, {
 
-  CDL: (...args) => tagged(cds.parse.cdl, ...args),
-  CQL: (...args) => tagged(cds.parse.cql, ...args),
-  CXL: (...args) => tagged(cds.parse.expr, ...args),
+  CDL: (...args) => tagged(parse.cdl, ...args),
+  CQL: (...args) => tagged(parse.cql, ...args),
+  CXL: (...args) => tagged(parse.expr, ...args),
 
   cdl: cds_parse,
-  cql: x => { try { return cdsc.parse.cql(x,undefined,{messages:[]}) }
-    catch(e) { // improve error message
-      e.message = e.message.replace('<query>.cds:',`In '${e.cql = x}' at `)
-      throw e
-    }
-  },
+  cql: x => { try { return cdsc.parse.cql(x,undefined,{messages:[]}) } catch(e) {
+    e.message = e.message.replace('<query>.cds:',`In '${e.cql = x}' at `)
+    throw e // with improved error message
+  }},
   path: (x,...values) => {
-    if (x && x.raw) return tagged (cds.parse.path,x,...values)
-    if (/^[A-Za-z_0-9.$]+$/.test(x)) return {ref:[x]}
-    let {SELECT} = cds.parse.cql('SELECT from '+x)
+    if (x && x.raw) return tagged (parse.path,x,...values)
+    if (/^[A-Za-z_$][A-Za-z_0-9.$]*$/.test(x)) return {ref:[x]}
+    let {SELECT} = parse.cql('SELECT from '+x)
     return SELECT.from
   },
-  expr: x => { try { return cdsc.parse.expr(x,undefined,{messages:[]}) }
-    catch(e) { // improve error message
+  column: x => {
+    let as = /\s+as\s+(\w+)$/i.exec(x)
+    if (as) {
+      let col = parse.expr(x.slice(0,as.index)); col.as = as[1]
+      return col
+    }
+    else return parse.expr(x)
+  },
+  expr: x => {
+    if (typeof x !== 'string') throw cds.error.expected `${{x}} to be an expression string`
+    if (x in keywords) return {ref:[x]}
+    try { return cdsc.parse.expr(x,undefined,{messages:[]}) } catch(e) {
       e.message = e.message.replace('<expr>.cds:1:',`In '${e.expr = x}' at `)
-      throw e
+      throw e // with improved error message
     }
   },
   xpr: x => { const y = parse.expr(x); return y.xpr || [y] },
@@ -68,4 +75,5 @@ const merge = (o,values) => {
   return o
 }
 
-const cxn4 = x => x.SELECT || x.ref || x.xpr || x.val || x.list || x.func ? x : {val:x}
+const cxn4 = x => x.SELECT || x.ref || x.xpr || x.val !== undefined|| x.list || x.func ? x : {val:x}
+const keywords = { KEY:1, key:1, SELECT:1, select:1 }

package/lib/compile/to/srvinfo.js

@@ -74,7 +74,8 @@ module.exports = (model, options={}) => {
       if (file) {
         const yaml = cds.load.yaml(file)
         for (let {cds} of Array.isArray(yaml) ? yaml : [yaml]) {
-          if (cds) return cds['odata-v4.endpoint.path'] || cds['odata-v2.endpoint.path']
+          if (cds && cds['odata-v4.endpoint.path'])  return cds['odata-v4.endpoint.path']
+          if (cds && cds['odata-v2.endpoint.path'])  return cds['odata-v2.endpoint.path']
         }
         return 'odata/v4/'
       }

package/lib/connect/bindings.js

@@ -12,8 +12,9 @@ module.exports = class Bindings {
     static get registry(){ return registry }
 
     static then(r,e) {
+        const LOG = cds.log('serve', { prefix:'cds' })
         const bindings = new Bindings
-        cds.prependOnceListener ('connect', ()=> console.log ('[cds] - connect using bindings from:', { registry }))
+        cds.prependOnceListener ('connect', ()=> LOG._info && LOG.info ('connect using bindings from:', { registry }))
         cds.once('listening', ({url})=> bindings.export (cds.service.providers, url))
         return bindings.import() .then (r,e)
     }