@sap/cds 5.8.4 → 5.9.0

package/bin/cds.js

@@ -13,19 +13,22 @@ const cli = { //NOSONAR
     }
     require('util').inspect.defaultOptions = { colors: !!process.stderr.isTTY, depth:11 }
     if (!argv.length) argv = process.argv.slice(3)
-    if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
     if (process.env.NODE_ENV !== 'test')  this.errorHandlers()
-    const task = this.load(cmd)
-    if (!task)  return _requires_cdsdk (cmd)
-    return task.apply (this, this.args(task,argv))
+    if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
+    let task = this.load ('./'+cmd)
+    if (task)  return task.apply (this, this.args(task,argv))
+
+    // delegate to cds-dk for rest of commands (usually shortcuts like `cds c`)
+    const dk = _requireDk('cds')
+    return dk ? dk.exec(cmd, ...argv) : _die_needsDk (cmd)
   },
 
   load (cmd) {
-    return _require ('./'+cmd)
-      || _require ('@sap/cds-dk/bin/'+cmd) // if dk is in installed modules
-      || _require (_npmGlobalModules()+'/@sap/cds-dk/bin/'+cmd)  // needed for running cds in npm scripts
+    return _require ('./'+cmd) || _requireDk (cmd)
   },
 
+  help (cmd) { return this.exec ('help', cmd) },
+
   args (task, argv) {
 
     const { options:o=[], flags:f=[], shortcuts:s=[] } = task
@@ -62,10 +65,6 @@ const cli = { //NOSONAR
     const _exit = (c) => { console.log(); process.exit(c) }
     cds.repl || process.on ('unhandledRejection', _error)
     cds.repl || process.on ('uncaughtException', _error)
-    process.on ('SIGTERM',_exit)
-    process.on ('SIGHUP',_exit)
-    process.on ('SIGINT',_exit)
-    process.on ('SIGUSR2',_exit) // by nodemon
   },
 
   get log() { return this.log = require('./utils/log') }
@@ -76,7 +75,13 @@ const _require = (id,o) => {
   return require (resolved)
 }
 
-const _requires_cdsdk = (cmd) => {
+const _requireDk = (cmd) => {
+  const { npmGlobalModules } = require('./utils/modules')
+  return _require ('@sap/cds-dk/bin/'+cmd) // if dk is in installed modules
+    || _require (npmGlobalModules()+'/@sap/cds-dk/bin/'+cmd)  // needed for running cds in npm scripts
+}
+
+const _die_needsDk = (cmd) => {
   const dk = {add:1,build:1,compile:1,deploy:1,env:1,eval:1,help:1,import:1,init:1,repl:1,watch:1}
   let message
   if (!cmd) { message = `
@@ -95,12 +100,6 @@ const _requires_cdsdk = (cmd) => {
   return console.error (message)
 }
 
-const _npmGlobalModules = () => {
-  try {
-    return require ('child_process').execSync('npm root -g').toString().trim()
-  } catch (err) { return }
-}
-
 module.exports = Object.assign ((..._) => cli.exec(..._), cli)
 if (!module.parent)  cli.exec()
 /* eslint no-console:off */

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

@@ -26,7 +26,10 @@ class CfUtil {
 
     async _cfRun(...args) {
         const cmdLine = `${CF_COMMAND} ${args.join(' ')}`;
-        DEBUG && console.time(cmdLine);
+        if (DEBUG) {
+            console.time(cmdLine);
+            LOG.debug('>>> ' + cmdLine);
+        }
 
         try {
             return await new Promise((resolve, reject) => {
@@ -43,6 +46,7 @@ class CfUtil {
                 });
 
                 child.on('error', (err) => {
+                    DEBUG && LOG.debug(`${stdout}\n${stderr}`);
                     if (err.code === 'ENOENT') {
                         reject(new Error(`Command ${bold(CF_COMMAND)} not found. Make sure to install the Cloud Foundry Command Line Interface.`));
                     } else {
@@ -51,6 +55,7 @@ class CfUtil {
                 });
 
                 child.on('close', (code) => {
+                    DEBUG && LOG.debug(`${stdout}\n${stderr}`);
                     if (!code) {
                         resolve(stdout.trim());
                     } else {
@@ -87,36 +92,28 @@ class CfUtil {
         return result;
     }
 
-    _extract(string, pattern, defaultValue) {
-        const array = string.split(/[\n\r]+/);
-        for (let line of array) {
-            const match = line.match(pattern);
-            if (match) {
-                return match[1];
-            }
-        }
-
-        if (typeof defaultValue === 'undefined') {
-            throw Error(`Pattern not found: ${pattern}`);
-        } else {
-            return defaultValue;
+    _extract(string, pattern, errorMsg) {
+        const match = string.match(pattern);
+        if (!match || !match[1]) {
+            throw new Error(errorMsg);
         }
+        return match[1];
     }
 
     async getCfTargetFromCli() {
         const result = await this._cfRun('target');
 
         return {
-            apiEndpoint: this._extract(result, /api endpoint:\s+(.*)$/i),
-            user: this._extract(result, /user:\s+(.*)$/i),
-            org: this._extract(result, /org:\s+(.*)$/i),
-            space: this._extract(result, /space:\s+(.*)$/i),
+            apiEndpoint: this._extract(result, /api endpoint\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.`),
         };
     }
 
     async getCfSpaceInfo() {
         if (!this.spaceInfo) {
-            LOG.debug('getting space info');
+            DEBUG && LOG.debug('getting space info');
 
             const target = await this.getCfTargetFromCli();
 

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

@@ -36,7 +36,7 @@ class HanaDeployer {
 
     this.logger.log(`${bold('Starting deploy to SAP HANA ...')}`);
     if (bindCallback) {
-      this.logger.log('Using advanced mode');
+      this.logger.log('Using cds bind');
     }
     this.logger.log();
 
@@ -181,7 +181,10 @@ class HanaDeployer {
   async _build(buildTaskOptions, model) {
     buildTaskOptions = buildTaskOptions || {
       root: process.env._TEST_CWD || process.cwd(),
-      cli: true
+      cli: true,
+      cmdOptions: {
+        for: buildConstants.BUILD_TASK_HANA
+      }
     };
 
     if (typeof model === 'string') {
@@ -190,31 +193,11 @@ class HanaDeployer {
 
     this.logger.log(`Creating build tasks`);
     const buildTaskFactory = new BuildTaskFactory(null, cds);
-    const allTasks = await buildTaskFactory.getTasks(buildTaskOptions);
-
-    const hanaTasks = allTasks.filter((task => {
-      return task.for === buildConstants.BUILD_TASK_HANA && (!model || model.includes(task.src));
-    }));
-
-    let srcFolder = cds.env.folders.db || 'db';
-    if (Array.isArray(srcFolder)) {
-      srcFolder = srcFolder[0] || 'db';
-    }
-
-    if (hanaTasks.length === 0) {
-      hanaTasks.push({
-        for: buildConstants.BUILD_TASK_HANA,
-        src: srcFolder,
-        options: {
-          model: cds.env.requires.db && cds.env.requires.db.model || cds.resolve('*', false)
-        }
-      });
-    }
-
+    const hanaTasks = await buildTaskFactory.getTasks(buildTaskOptions);
     this.logger.log(`Running build`);
 
     const buildResults = await new BuildTaskEngine().processTasks(hanaTasks, buildTaskOptions);
-    return { buildResults, allTasks }
+    return { buildResults, hanaTasks }
   }
 
 

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

@@ -16,6 +16,10 @@ class HdiDeployUtil {
         this.deployerVersionSpec = '^4'
     }
 
+    async deployTenant(dbDir, env, logger) {
+        await this._executeDeploy(dbDir, env, logger);
+    }
+
     async deploy(dbDir, vcapServices, options = {}) {
         LOG.log();
         LOG.log(`Deploying to HANA from ${dbDir}`);
@@ -85,18 +89,18 @@ Add it either as a devDependency using 'npm install -D ${this.deployerName}' or
     async _npmSearchPaths(cwd) {
         const npmRootCall = await execAsync('npm root -g');
         const globalNodeModules = npmRootCall.stdout.toString().trim();
-        return [cwd, globalNodeModules]
+        return [cwd, globalNodeModules, '@sap/hdi-deploy']
     }
 
 
-    async _executeDeploy(dbDir, env) {
+    async _executeDeploy(dbDir, env, logger) {
         const hdiDeployLib = await this._getHdiDeployLib(dbDir);
         return new Promise((resolve, reject) => {
             const callbacks = {
-                stderrCB: error => LOG.error(error.toString())
+                stderrCB: error => (logger || LOG).error(error.toString())
             }
             if (LOG.level !== SILENT) {
-                callbacks.stdoutCB = (data) => console.log(data.toString());
+                callbacks.stdoutCB = (data) => (logger || LOG).log(data.toString());
             }
 
             hdiDeployLib.deploy(dbDir, env, (error, response) => {

package/bin/mtx/in-cds.js

@@ -1,9 +1,9 @@
 const cds = require('../build/cds')
-if (cds.requires.multitenancy) try {
+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) {
+} catch(e) {   
    if (e.code === 'MODULE_NOT_FOUND') throw new Error('Error serving MTX APIs: @sap/cds-mtx is not installed')
    else throw e
 }

package/bin/serve.js

@@ -9,7 +9,7 @@ module.exports = Object.assign ( serve, {
         '--mocked', '--with-mocks', '--with-bindings',
         '--watch',
     ],
-    shortcuts: [ '-s', undefined, '-2', '-a', '-w', '-p' ],
+    shortcuts: [ '-s', undefined, '-2', '-a', '-w', undefined, '-p' ],
     help: `
 # SYNOPSIS
 
@@ -183,6 +183,13 @@ async function serve (all=[], o={}) { // NOSONAR
     }
     server.listening ? _started(server) : server.once('listening',_started)
     server.on ('error',_reject) // startup errors like EADDRINUSE
+
+    // 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
   })
 }
@@ -216,8 +223,8 @@ function _prepare_logging () { // NOSONAR
   })
 
   // print information about each connected service
-  cds.on ('connect', ({name,kind,options:{use,credentials}})=>{
-    log (`connect to ${name} > ${use||kind}`, credentials ? _redacted(credentials) : '')
+  cds.on ('connect', ({name,kind,options:{use,credentials,impl}})=>{
+    log (`connect to ${name} > ${use||kind||impl}`, credentials ? _redacted(credentials) : '')
   })
 
   // print information about each provided service

package/bin/utils/modules.js

@@ -0,0 +1,7 @@
+module.exports = {
+  npmGlobalModules: function() {
+    try {
+      return require ('child_process').execSync('npm root -g').toString().trim()
+    } catch (err) { return }
+  }
+}

package/bin/version.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-console */
 const { dirname, join, resolve } = require ('path')
+const { cwd } = require('process')
 module.exports = Object.assign(list_versions, {
   flags: [ '--info', '--markdown', '--all', '--npm-list', '--npm-tree' ],
   shortcuts: [ '-i', '-m','-a', '-ls', '-ll' ],
@@ -31,6 +32,8 @@ module.exports = Object.assign(list_versions, {
 
 `})
 
+const MISSING = '-- missing --'
+
 function list_versions(args, options) { //NOSONAR
   if (options['npm-list'] || options['npm-tree']) {
     let [pattern] = args, re = pattern ? RegExp(pattern) : /@sap\/cd[rs]|@sap\/eslint-plugin-cds/
@@ -51,13 +54,16 @@ function list_versions(args, options) { //NOSONAR
 }
 
 function info(o) {
+  const { npmGlobalModules } = require('./utils/modules');
   const main = _findPackage (require.main.filename)
   return {
     ..._versions4(main, {}, true),  // usually sap/cds-dk or sap/cds
     ..._versions4('@sap/cds-dk', {}, null, o),  // make sure cds-dk is there, cds-maven-plugin uses it
+    ..._versions4('@sap/cds-dk', {}, null, {...o, label: '@sap/cds-dk (global)', pkg: join(npmGlobalModules(), '@sap/cds-dk')}),
     ..._versions4('@sap/eslint-plugin-cds', {}, null, o),
     ..._versions4(process.cwd(), {}, null, o),
     ..._versions4('..', {}, null, o),
+    ..._findMTX(),
     'Node.js': process.version,
     'home': __dirname.slice(0,-4)
   }
@@ -66,13 +72,21 @@ function info(o) {
 function _versions4 (pkg_name, info, parent, o={}) {
   if (!pkg_name)  return info
   try {
-    const pkg = require(join(pkg_name, 'package.json'))
-    info[pkg.name] = pkg.version
+    let path = join(o.pkg || pkg_name, 'package.json')
+    if(o.here) {
+      // path.join(['./', x]) is immediately resolved to x.
+      // Calling require() on that will then follow the standard (global) module resolution strategy.
+      // If we want to look into a directory relative to CWD,
+      // turning it into a global path is the most convenient way.
+      path = join(cwd(), path)
+    }
+    const pkg = require(path)
+    info[o.label || pkg.name] = pkg.version
     if (!parent || o.all) for (let d in pkg.dependencies) { // recurse sap packages in dependencies...
       if (!(d in info) && d.startsWith('@sap/')) _versions4(d, info, pkg.name, o)
     }
   } catch (e) {
-    if (e.code !== 'MODULE_NOT_FOUND') info[pkg_name] = '-- missing --'  // unknown error
+    if (e.code !== 'MODULE_NOT_FOUND') info[pkg_name] = MISSING  // unknown error
     // require fails for indirect packages if node_modules layout is nested, e.g. on Windows.
     // Try one more time with nested node_modules dir.
     else if (parent) _versions4(parent + '/node_modules/' + pkg_name, info)
@@ -117,3 +131,42 @@ function _findPackage (dir) {
     return _findPackage (dirname (dir))
   }
 }
+
+function _findMTX() {
+  // looks for any occurrence of cds-mtx.
+  // In node projects, cds-mtx can be resolved via _versions4 like all the other SAP modules
+  // In Java-flavoured projects cds-mtx may be deployed through a separate node project
+  // with just sidecar in it. So we can not rely on the global require() resolution strategy
+  // and will as a fallback...
+  // (1) ...look for an MTX project within cds.env
+  // (2) ...look within a few preselected subdirectories which often contain MTX projects
+  const cds = require('../lib')
+  const cdsmtx = '@sap/cds-mtx'
+  let res = _versions4 (cdsmtx, {}, null)
+
+  if (res[cdsmtx] === undefined) {
+    // not resolvable -> look in cds.env
+    if ('build' in cds.env && 'tasks' in cds.env.build) {
+      let i = 0
+      while (res[cdsmtx] === undefined && i < cds.env.build.tasks.length) {
+        const task = cds.env.build.tasks[i]
+        if ('for' in task && task.for === 'mtx' && 'dest' in task) {
+          res = _versions4 (join(task.dest, 'node_modules', cdsmtx), {}, null, {here: true})
+        }
+        i++
+      }
+    }
+
+    // mtx still not found via cds.env? Try looking in well-known subdirectories
+    const folders = cds.env.folders
+                    ? [cds.env.folders.db, cds.env.folders.srv].filter(d => d)
+                    : []
+    let i = 0
+    while(res[cdsmtx] === undefined && i < folders.length) {
+      res = _versions4 (join(folders[i], 'node_modules', cdsmtx), {}, null, {here: true})
+      i++
+    }
+    res[cdsmtx] = res[cdsmtx] || MISSING
+  }
+  return res
+}

package/lib/compile/cdsc.js

@@ -1,4 +1,5 @@
-const {cdsc,odata,sql,hana,features} = require ('../index').env
+const cds = require ('../index')
+const {cdsc,odata,sql,features} = cds.env
 const constraints = {
   assertIntegrity: features.assert_integrity,
   assertIntegrityType: features.assert_integrity_type
@@ -75,7 +76,11 @@ const _options = {for: Object.assign (_options4, {
   },
 
   hana(o) {
-    let cdsc = this.sql (o,hana)
+    let cdsc = this.sql (o, cds.env.hana) // returns clone
+    cdsc.sqlChangeMode = cdsc.journal && cdsc.journal['change-mode']
+    cdsc.disableHanaComments = !cdsc.comments
+    delete cdsc.journal // cleanup avoiding side effects
+    delete cdsc.comments
     return cdsc
   },
 
@@ -100,7 +105,25 @@ const _options = {for: Object.assign (_options4, {
  */
 module.exports = exports = {__proto__:compile, _options,
   for: {__proto__: compile.for,
-    odata: (csn,o) => compile.for.odata  (csn, _options.for.odata(o)),
+    odata: (csn,o) => {
+      if (features.ucsn) {
+        const { cloneCsn } = require('@sap/cds-compiler/lib/model/csnUtils') // REVISIT: This should be done by the compiler
+        if (compile.version() >= "2.12.1") {
+          const generateDrafts = require('@sap/cds-compiler/lib/transform/draft/odata')
+          const compiled = generateDrafts(cloneCsn(csn, {}), { messages: [] })
+          compiled.meta._4odata = true
+          return compiled
+        } else {
+            // not yet in compiler branch, can't add drafts
+            const cloned = cloneCsn(csn, {})
+            cloned.meta._4odata = true
+            return cloned
+        }
+      }
+      const compiled = compile.for.odata  (csn, _options.for.odata(o))
+      compiled.meta._4odata = true
+      return compiled
+    },
   },
   to: {__proto__: compile.to,
     edmx: Object.assign ((csn,o) => compile.to.edmx (csn, _options.for.edm(o)), {

package/lib/compile/etc/_localized.js

@@ -5,10 +5,11 @@ const _locales_4sql = {
 	plain  : env.i18n.for_sql || [],
 }
 
-// FIXME: we reliably need to now if we'll be on sqlite even before the connect happened
-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')
+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
 
 
 
@@ -18,11 +19,11 @@ const _been_here = Symbol('is _localized')
  */
 function unfold_ddl (ddl, csn, o={}) { // NOSONAR
 	const _locales = _locales_4sql[o.dialect]; if (!_locales)  return ddl
-	const localized_views = ddl.filter (each => each.startsWith ('CREATE VIEW localized_'))
-	for (let localized_view of localized_views) {
-		for (let locale of _locales) ddl.push (localized_view
+	const localized_views = ddl.filter (each => each.startsWith('CREATE VIEW localized_'))
+	for (const localized_view of localized_views) {
+		for (const locale of _locales) ddl.push (localized_view
 			.replace (/localized_/g, `localized_${locale}_`)
-			.replace (/\.locale = 'en'/, `.locale = '${locale}'`)
+			.replace (/\.locale = 'en'/g, `.locale = '${locale}'`)
 		)
 	}
 	DEBUG && localized_views.length && DEBUG ('Added localized views to DDL for', csn.$sources)
@@ -48,33 +49,31 @@ function unfold_csn (m) { // NOSONAR
 	const _locales = _on_sqlite && _locales_4sql.sqlite
 
 	// Pass 1 - add localized.<locale> entities and views
-	for (let each in cds.linked(m).definitions) {
+	for (const each in cds.linked(m).definitions) {
 		const d = m.definitions [each]
 		// Add <entry>_texts proxies for all <entry>.texts entities
 		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 !== false && d.own('$localized')) {
-			let x = _add_proxy4 (d,`localized.${each}`)
-			if (x) pass2.push ([x])
+		// Add localized.<entry> for all entities having localized views in db
+		if (_localized_entries !== false && _is_localized(d)) {
+			_add_proxy4 (d,`localized.${each}`, x => pass2.push([x]))
 			// if running on sqlite add additional localized.<locale>. views
-			if (_locales) for (let locale of _locales) {
-				let x = _add_proxy4 (d,`localized.${locale}.${each}`)
-				if (x) pass2.push ([x,locale])
+			if (_locales) for (const locale of _locales) {
+				_add_proxy4 (d,`localized.${locale}.${each}`, x => pass2.push([x,locale]))
 			}
 		}
 	}
 
 	// Pass 2 - redirect associations/compositions in elements to localized.<locale> targets
-	for (let [x,locale] of pass2) {
+	for (const [x,locale] of pass2) {
 		let overlayed = null
-		for (let each in x.elements) {
-			let e = x.elements [each]
-			if (e._target && e._target.$localized) {
-				let elements = overlayed || (overlayed = x.elements = {__proto__:x.elements})
-				let target = locale ? `localized.${locale}.${e.target}` : `localized.${e.target}`
-				let _target = m.definitions[target]
+		for (const each in x.elements) {
+			const e = x.elements [each]
+			if (e._target && _is_localized(e._target)) {
+				const elements = overlayed || (overlayed = x.elements = {__proto__:x.elements})
+				const target = locale ? `localized.${locale}.${e.target}` : `localized.${e.target}`
+				const _target = m.definitions[target]
 				if (_target) {
 					elements[each] = Object.defineProperty ({__proto__:e,target},'_target',{value:_target})
 					DEBUG && DEBUG ('overriding:', each, ':', elements[each], 'in', { entity: x.name })
@@ -88,12 +87,24 @@ function unfold_csn (m) { // NOSONAR
 	DEBUG && pass2.length && DEBUG ('Added localized views for sqlite to csn for', m.$sources)
 	return Object.defineProperty (m, _been_here, {value:true})
 
-	function _add_proxy4 (d, name) {
+	function _add_proxy4 (d, name, callback) {
 		if (name in m.definitions) return DEBUG && DEBUG ('NOT overriding existing:', name)
-		let x = {__proto__:d, name }
-		DEBUG && DEBUG ('adding proxy:', x)
+		const x = {__proto__:d, name };   DEBUG && DEBUG ('adding proxy:', x)
 		Object.defineProperty (m.definitions, name, {value:x,writable:true,configurable:true})
-		return x
+		if (callback) callback(x)
+	}
+}
+
+
+const $localized = '$$localized', _is_localized = (d,_path) => {
+	if (d.own($localized)) return true
+	if (!d.elements || d.name.endsWith('.texts')) return 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,{..._path, [d.name]:1 })) {
+			return d.set($localized,true)
+		}
 	}
 }
 

package/lib/compile/etc/csv.js

@@ -17,14 +17,14 @@ function parse (csv) {
   for (let line of lines) {
     if (!rows.length && _ignoreLine (line))  continue
     if (!sep)  [sep] = SEPARATOR.exec(line)||[';']
-    const values=[]; let val, currCol=0, c, inString=false
+    const values=[]; let val, currCol=0, c, inString=false, quoted=false
     for (let i=0; i<line.length; ) {
       c = line[i++]
       if (c === sep && !inString) {  // separator
         currCol++
         if (!rows.length && val !== undefined)  headers.push (currCol)     // skip column if header value is empty
-        if (headers.includes(currCol))  values.push (_value4(val)) // skip value if column was skipped
-        val = undefined //> start new val
+        if (headers.includes(currCol))  values.push (_value4(val, quoted)) // skip value if column was skipped
+        val = undefined, quoted = false //> start new val
       }
       else if (c === '"' && val === undefined) { // start quoted string
         val = ''
@@ -32,7 +32,7 @@ function parse (csv) {
       }
       else if (c === '"' && inString) { // within quoted string
         if (line[i] === '"')  val += line[i++]  // escape quote:  "" > "
-        else inString = false // stop string
+        else inString = false, quoted = true // stop string
       }
       else {  // normal char
         if (val === undefined)  val = ''
@@ -42,16 +42,16 @@ function parse (csv) {
     // remaining value
     currCol++
     if (!rows.length && val !== undefined)  headers.push(currCol)  // skip column if header value is empty
-    if ((val !== undefined || c === sep) && headers.includes(currCol))  values.push (_value4(val))
+    if ((val !== undefined || c === sep) && headers.includes(currCol))  values.push (_value4(val, quoted))
     if (values.length > 0)  rows.push (values)
   }
   return rows
 }
 
-function _value4 (val) { //NOSONAR
+function _value4 (val, quoted = false) { //NOSONAR
   if (val)  val = val.trim()
-  if (val === 'true') return true
-  if (val === 'false') return false
+  if (!quoted && val === 'true') return true
+  if (!quoted && val === 'false') return false
   else return val
 }
 

package/lib/compile/for/drafts.js

@@ -0,0 +1,9 @@
+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||{})
+}

package/lib/compile/for/java.js

@@ -0,0 +1,16 @@
+const cds = require ('../../index')
+const _cached = Symbol('for Java')
+
+module.exports = function cds_compile_for_java (csn,o) {
+  if (!csn) return
+  const cached = csn[_cached]; if (cached) return cached
+  csn = cds.minify (csn)
+  csn = cds.compile.for.drafts (csn,o)
+  // Add a parsed _where clause for @restrict.{grant,where} annotations
+  if (csn.definitions) for (let {'@restrict':rr} of Object.values(csn.definitions)) if (rr) {
+    for (let r of rr) if (r.grant && r.where) try {
+      r._where = JSON.stringify (cds.parse.xpr(r.where))
+    } catch(e){/* ignored */}
+  }
+  return csn[_cached] = csn
+}

package/lib/compile/for/nodejs.js

@@ -0,0 +1,12 @@
+const cds = require ('../../index')
+const _cached = Symbol('for Node.js')
+
+module.exports = function cds_compile_for_nodejs (csn,o) {
+  if (!csn) return
+  const cached = csn[_cached]; if (cached) return cached
+  csn = cds.minify (csn)
+  csn = cds.compile.for.drafts (csn,o) //> creates a partial copy -> avoid any cds.linked() before
+  csn = cds.compile._localized.unfold_csn (csn)
+  csn = cds.linked (csn)
+  return csn[_cached] = csn
+}

package/lib/compile/for/odata.js

@@ -13,4 +13,4 @@ module.exports = function cds_compile_for_odata (csn,_o) {
   return _4odata
 }
 
-const _is_odata = csn => csn.meta && csn.meta.transformation === 'odata'
+const _is_odata = csn => csn.meta && csn.meta._4odata

package/lib/compile/index.js

@@ -9,6 +9,9 @@ const {lazified} = require ('../lazy'); require = lazified (module)  // eslint-d
 const compile = module.exports = Object.assign (cds_compile, {
 
   for: lazified ({
+    java: require('./for/java'),
+    nodejs: require('./for/nodejs'),
+    drafts: require('./for/drafts'),
     odata: require('./for/odata'),
     sql: require('./for/sql'),
   }),