@sap/cds 7.8.2 → 7.9.1

package/CHANGELOG.md

@@ -4,6 +4,51 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 7.9.1 - 2024-05-13
+
+### Fixed
+
+- `cds.compile.to.sql` doesn't fail for older compiler versions if `postgres` keywords aren't defined
+- `cds compile --to serviceinfo` no longer detects a Java project if there is a poml.xml file in a subfolder of `app/`
+- `acquireTimeoutMillis` is ensured if custom pool config is provided
+
+## Version 7.9.0 - 2024-04-30
+
+### Added
+
+- Option `cds.env.sql.transitive_localized_views: false` to skip generating transitive localized views for entities which don't have own localized elements, but only associations to such. Supported for Java and new database services in Node.js (ignored for old ones).
+- Option `cds.env.sql.native_hana_associations: false` to skip generating native HANA associations.
+- Running `cds compile --to sql` with `@cap-js/sqlite` installed now uses `session_context('$user.locale')` in generated DDL statements instead of generating static localized views for 'en', 'fr', and 'de' (same for `cds.deploy`).
+- `api`: export reserved keywords for postgres via `cds.compiler.to.sql.keywords.postgres`
+- Kind `legacy-hana` and profile `better-hana` for local testing scenarios.
+- Support for PDF files (MIME type `application/pdf`) when the `cds.env.features.odata_new_adapter` flag is set to `true`
+- Lean draft: Support for filtered compositions (remain in the document)
+- Support for `COUNT_DISTINCT` as OData data aggregation default method
+- Better support for `profiles` in cds schema for `package.json` and `.cdsrc.json`
+- Performance improvement for generating `@odata.context` url if `cds.features.odata_new_parser` is enabled
+- Alpha support for SAP Event Broker-based messaging (kind `event-broker`)
+
+### Changed
+
+- Deprecated *INSERT.into(...) **.as** (SELECT...)* → use *INSERT.into(...) **.entries** (SELECT...)* instead.
+- Default value of `cds.env.log.mask_headers` changed to `['/authorization/i', '/cookie/i', '/cert/i', '/ssl/i']` (adding `'/cert/i'` and `'/ssl/i'`)
+- Error messages for entities annotated with '@cds.autoexpose'
+- For Java apps `cds.sql.transitive_localized_views` now defaults to `false` to create less database views.
+- For Java apps `cdsc.betterSqliteSessionVariables` now defaults to `true` to enable session variables on H2 and SQLite by default.
+
+### Fixed
+
+- `cds.compile.to.yaml` produced invalid YAML for compacted lines
+- Handling of If-None-Match header for non-existing entity
+- Revert json schema for cds schemas to `draft-07` to prevent VS Code warnings about unsupported schema features.
+- Remote services: JSON representation of error shall include `request` and `response`
+- Aliasing of associated entity column in case of expand by CQN build with joins.
+- `$apply` scenarios when used alongside `cds.env.features.odata_new_adapter = true` and the new database layer
+- ETag handling combined with where restrictions
+- `cds compile --to hdbtabledata` now correctly supports CSV files using format `.texts_<lang>.csv`. Before the `include_filter` wasn't set in the generated `.hdbtabledata` files.
+- `cds` commands no longer crash when executed in the `@sap/cds` installation dir.
+- `cds.infer`: exposed association of query is inferred as `cds.Association` and not as it's target
+
 ## Version 7.8.2 - 2024-04-22
 
 ### Fixed

package/_i18n/i18n_ar.properties

@@ -70,6 +70,9 @@ LanguageCode=\u0631\u0645\u0632 \u0627\u0644\u0644\u063A\u0629
 #XTIT: Language Code Description
 LanguageCode.Description=\u0631\u0645\u0632 \u0627\u0644\u062F\u0648\u0644\u0629 \u0627\u0644\u0645\u062D\u062F\u062F \u062D\u0633\u0628 ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=\u0631\u0645\u0632 \u0627\u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0632\u0645\u0646\u064A\u0629
+
 #XTIT: User Identifier
 UserID=\u0645\u0639\u0631\u0641 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645
 

package/_i18n/i18n_cs.properties

@@ -70,6 +70,9 @@ LanguageCode=K\u00F3d jazyka
 #XTIT: Language Code Description
 LanguageCode.Description=K\u00F3d jazyka zadan\u00FD dle ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=K\u00F3d \u010Dasov\u00E9ho p\u00E1sma
+
 #XTIT: User Identifier
 UserID=ID u\u017Eivatele
 

package/_i18n/i18n_da.properties

@@ -70,6 +70,9 @@ LanguageCode=Sprogkode
 #XTIT: Language Code Description
 LanguageCode.Description=Sprogkode som angivet af ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Tidszonekode
+
 #XTIT: User Identifier
 UserID=Bruger-ID
 

package/_i18n/i18n_es_MX.properties

@@ -70,6 +70,9 @@ LanguageCode=C\u00F3digo de idioma
 #XTIT: Language Code Description
 LanguageCode.Description=C\u00F3digo de idioma seg\u00FAn especificado por ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=C\u00F3digo de zona horaria
+
 #XTIT: User Identifier
 UserID=ID de usuario
 

package/_i18n/i18n_fi.properties

@@ -70,6 +70,9 @@ LanguageCode=Kielikoodi
 #XTIT: Language Code Description
 LanguageCode.Description=ISO 639-1:n mukainen kielikoodi
 
+#XTIT Time zone code
+TimeZoneCode=Aikavy\u00F6hykekoodi
+
 #XTIT: User Identifier
 UserID=K\u00E4ytt\u00E4j\u00E4tunnus
 

package/_i18n/i18n_hu.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=P\u00E9nznem k\u00F3dja ISO 4217 szerint
 #XTIT: Currency Symbol
 CurrencySymbol=P\u00E9nznem szimb\u00F3luma
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=P\u00E9nznem seg\u00E9degys\u00E9g-h\u00E1nyadok
+
 #XTIT: Country/Region
 Country=Orsz\u00E1g/r\u00E9gi\u00F3
 
@@ -67,6 +70,9 @@ LanguageCode=Nyelvk\u00F3d
 #XTIT: Language Code Description
 LanguageCode.Description=P\u00E9nznem k\u00F3dja ISO 639-1 szerint
 
+#XTIT Time zone code
+TimeZoneCode=Id\u0151z\u00F3na k\u00F3dja
+
 #XTIT: User Identifier
 UserID=Felhaszn\u00E1l\u00F3azonos\u00EDt\u00F3
 

package/_i18n/i18n_ko.properties

@@ -70,6 +70,9 @@ LanguageCode=\uC5B8\uC5B4 \uCF54\uB4DC
 #XTIT: Language Code Description
 LanguageCode.Description=ISO 639-1\uC5D0\uC11C \uC9C0\uC815\uD55C \uC5B8\uC5B4 \uCF54\uB4DC
 
+#XTIT Time zone code
+TimeZoneCode=\uC2DC\uAC04\uB300 \uCF54\uB4DC
+
 #XTIT: User Identifier
 UserID=\uC0AC\uC6A9\uC790 ID
 

package/_i18n/i18n_ms.properties

@@ -70,6 +70,9 @@ LanguageCode=Kod Bahasa
 #XTIT: Language Code Description
 LanguageCode.Description=Kod bahasa seperti yang dinyatakan dalam ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Kod Zon Waktu
+
 #XTIT: User Identifier
 UserID=ID Pengguna
 

package/_i18n/i18n_nl.properties

@@ -70,6 +70,9 @@ LanguageCode=Taalcode
 #XTIT: Language Code Description
 LanguageCode.Description=Taalcode zoals gespecificeerd door ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Code tijdzone
+
 #XTIT: User Identifier
 UserID=Gebruikers-ID
 

package/_i18n/i18n_no.properties

@@ -70,6 +70,9 @@ LanguageCode=Spr\u00E5kkode
 #XTIT: Language Code Description
 LanguageCode.Description=Spr\u00E5kkode som definert i ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Kode for tidssone
+
 #XTIT: User Identifier
 UserID=Bruker-ID
 

package/_i18n/i18n_ro.properties

@@ -70,6 +70,9 @@ LanguageCode=Cod de limb\u0103
 #XTIT: Language Code Description
 LanguageCode.Description=Cod de limb\u0103 a\u0219a cum este specificat de ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Cod fus orar
+
 #XTIT: User Identifier
 UserID=ID utilizator
 

package/_i18n/i18n_sv.properties

@@ -70,6 +70,9 @@ LanguageCode=Spr\u00E5kkod
 #XTIT: Language Code Description
 LanguageCode.Description=Spr\u00E5kkod enligt ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Tidszonskod
+
 #XTIT: User Identifier
 UserID=Anv\u00E4ndar-ID
 

package/_i18n/i18n_th.properties

@@ -70,6 +70,9 @@ LanguageCode=\u0E23\u0E2B\u0E31\u0E2A\u0E20\u0E32\u0E29\u0E32
 #XTIT: Language Code Description
 LanguageCode.Description=\u0E23\u0E2B\u0E31\u0E2A\u0E20\u0E32\u0E29\u0E32\u0E15\u0E32\u0E21\u0E17\u0E35\u0E48\u0E23\u0E30\u0E1A\u0E38\u0E43\u0E19 ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=\u0E23\u0E2B\u0E31\u0E2A\u0E40\u0E02\u0E15\u0E40\u0E27\u0E25\u0E32
+
 #XTIT: User Identifier
 UserID=ID \u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49
 

package/_i18n/i18n_tr.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=ISO 4217'ye g\u00F6re belirtilen para birimi kodu
 #XTIT: Currency Symbol
 CurrencySymbol=Para birimi sembol\u00FC
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Para biriminin k\u00FC\u00E7\u00FCk birim kesirleri
+
 #XTIT: Country/Region
 Country=\u00DClke/b\u00F6lge
 
@@ -67,6 +70,9 @@ LanguageCode=Dil kodu
 #XTIT: Language Code Description
 LanguageCode.Description=ISO 639-1'e g\u00F6re belirtilen dil kodu
 
+#XTIT Time zone code
+TimeZoneCode=Saat dilimi kodu
+
 #XTIT: User Identifier
 UserID=Kullan\u0131c\u0131 tan\u0131t\u0131c\u0131s\u0131
 

package/_i18n/i18n_zh_TW.properties

@@ -70,6 +70,9 @@ LanguageCode=\u8A9E\u8A00\u4EE3\u78BC
 #XTIT: Language Code Description
 LanguageCode.Description=\u5DF2\u6309 ISO 639-1 \u6307\u5B9A\u516C\u53F8\u4EE3\u78BC
 
+#XTIT Time zone code
+TimeZoneCode=\u6642\u5340\u4EE3\u78BC
+
 #XTIT: User Identifier
 UserID=\u4F7F\u7528\u8005 ID
 

package/bin/serve.js

@@ -300,26 +300,26 @@ function _prepare_logging () { // NOSONAR
   // print config deprecation warnings
   if (cds.env.features.deprecated !== 'off') {
     cds.once ('listening', () => {
-      // Remove with cds 8
+      // Remove with cds^8
       if (cds.env.drafts?.cancellationTimeout)
         cds.utils.deprecated({
           old: 'cds.drafts.cancellationTimeout',
           use: 'cds.fiori.draft_lock_timeout with adapted value'
         })
     
-      // Remove with cds 8
+      // Remove with cds^8
       if (!cds.env.fiori.lean_draft)
         cds.utils.deprecated({ old: 'cds.fiori.lean_draft' })
       
-      // Remove with cds 8
+      // Remove with cds^8
       if (!cds.requires.middlewares)
         cds.utils.deprecated({ old: 'cds.requires.middlewares' })
 
-      // Remove with cds 8
+      // Remove with cds^8
       if (cds.env.features.serve_on_root)
         cds.utils.deprecated({ old: 'cds.features.serve_on_root', use: '@path annotation or adapt your consumers' })
 
-      // Remove with cds 8
+      // Remove with cds^8
       if (cds.env.features.stream_compat)
         cds.utils.deprecated({ old: 'cds.features.stream_compat' })
     })

package/lib/auth/basic-auth.js

@@ -31,7 +31,7 @@ module.exports = function basic_auth (options) {
   function login (reason='') {
     const req=this, res=req.res
     // REVISIT: this json response is needed to be OData compliant. however, we should probably throw an error anyway so that a custom error middleware can get invoked.
-    res.set('WWW-Authenticate', `Basic realm="Users"`).status(401).json({ error: { code: '401', message: 'Unauthorized' } })
+    res.set('www-authenticate', `Basic realm="Users"`).status(401).json({ error: { code: '401', message: 'Unauthorized' } })
     LOG.info (req.method, decodeURIComponent(req.path), '>', res.statusCode, res.statusMessage, ...(!reason ? [] : ['-', reason]))
   }
 }

package/lib/compile/cdsc.js

@@ -61,21 +61,48 @@ const _options = {for: Object.assign (_options4, {
     })
   },
 
-  sql(o,_env) {
+  sql (_o, _env, _conf = cds.requires.db || cds.requires.kinds.sql) {
     // REVISIT: compiler requires to only provide assertIntegrityType if defined
-    let { assert_integrity } = cds.env.features
-    let constraints = assert_integrity && { assertIntegrityType: assert_integrity.toUpperCase() }
-    return _options4 ({ ...constraints, ..._env||cds.env.sql, ...o }, {
+    if (_o?._4sql) return _o
+    const o = _options4 ({ ..._env||cds.env.sql, ..._o, _4sql: true }, {
       sql_mapping  : 'names', //> legacy
       sqlDialect   : 'dialect', //> legacy
       sqlMapping   : 'names',
       dialect      : 'sqlDialect',
       names        : (o,v) => v !== 'plain' ? o.sqlMapping = v : undefined,
     })
+    if (_conf?.impl === '@cap-js/sqlite') {
+      o.fewerLocalizedViews = !cds.env.sql.transitive_localized_views
+      o.betterSqliteSessionVariables = true
+      // REVISIT: compiler only considers o.betterSqliteSessionVariables if o.sqlDialect == 'sqlite'.
+      // Yet, dialect: 'plain' is configured in cap/sflight -> below is a dirty hack which overrides that.
+      // We should rather have a proper way to configure the dialect in the cap/sflight project, and/or
+      // have a better way to handle o.betterSqliteSessionVariables in compiler, independent of dialect.
+      if (!_o?.dialect && (!cds.env.sql.dialect || cds.env.sql.dialect === 'plain')) o.sqlDialect = 'sqlite'
+    }
+    else if (_conf?.impl === '@cap-js/hana') {
+      o.fewerLocalizedViews = !cds.env.sql.transitive_localized_views
+      o.withHanaAssociations = cds.env.sql.native_hana_associations
+    }
+    else if (!cds.db && !cds.requires.db)  { // e.g. for Java
+      o.fewerLocalizedViews = !cds.env.sql.transitive_localized_views
+      o.withHanaAssociations = cds.env.sql.native_hana_associations
+      if (_conf?.impl === '@cap-js/sqlite') {
+        o.betterSqliteSessionVariables = true
+        // REVISIT: compiler only considers o.betterSqliteSessionVariables if o.sqlDialect == 'sqlite'.
+        // Yet, dialect: 'plain' is configured in cap/sflight -> below is a dirty hack which overrides that.
+        // We should rather have a proper way to configure the dialect in the cap/sflight project, and/or
+        // have a better way to handle o.betterSqliteSessionVariables in compiler, independent of dialect.
+        if (!_o?.dialect && (!cds.env.sql.dialect || cds.env.sql.dialect === 'plain')) o.sqlDialect = 'sqlite'
+      }
+    }
+    // console.trace(o)
+    if (cds.env.features.assert_integrity) o.assertIntegrityType = cds.env.features.assert_integrity.toUpperCase()
+    return o
   },
 
   hana(o) {
-    let cdsc = this.sql (o, cds.env.hana) // returns clone
+    let cdsc = this.sql (o, cds.env.hana, cds.requires.kinds.hana) // returns clone
     cdsc.sqlChangeMode ??= cdsc.journal && cdsc.journal['change-mode']
     cdsc.disableHanaComments ??= !cdsc.comments
     delete cdsc.journal // cleanup avoiding side effects
@@ -138,4 +165,4 @@ module.exports = exports = {__proto__:compile, _options,
       compile.to.cdl // smart* functions
     ),
   },
-}
+}

package/lib/compile/etc/_localized.js

@@ -11,14 +11,15 @@ const _been_here = Symbol('is _localized')
 
 
 /**
- * In case of, for each localized_<view> we get from the compiler,
- * create additional views localized_<locale>_<views>
+ * In case of old SQLite service, for each localized_<view> we get from the
+ * compiler, create additional views localized_<locale>_<views>
  */
 function unfold_ddl (ddl, csn, o={}) { // NOSONAR
+	if (o.betterSqliteSessionVariables) return ddl
+	if (o.fewerLocalizedViews) return ddl
 	const _locales = _locales_4sql[o.dialect]; if (!_locales)  return ddl
 	const localized_views = ddl.filter (each => each.startsWith('CREATE VIEW localized_') || each.startsWith('DROP VIEW localized_'))
 	// REVISIT: analyze ddl statements. Problem is with schevo calling this function containing only drops
-	if (o.sqlDialect === 'sqlite' && o.betterSqliteSessionVariables) return ddl
 	for (const localized_view of localized_views) {
 		for (const locale of _locales) ddl.push (localized_view
 			.replace (/localized_/g, `localized_${locale}_`)
@@ -45,9 +46,16 @@ 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
+	// REVISIT: Fixing $localized obtained from compiler when fewerLocalizedViews is set
+	const o = cds.compiler._options.for.sql()
+	if (o.fewerLocalizedViews) for (let each in m.definitions) {
+		const d = m.definitions [each]
+		if (d.$localized && d.elements && !d.elements.localized) delete d.$localized
+	}
+
+	const _conf = env.requires.db || env.requires.sql || env.requires.kinds.sql
 	const _on_sqlite = _conf.kind === 'sqlite' || _conf.dialect === 'sqlite'
-	const _locales = _on_sqlite && _locales_4sql.sqlite
+	const _locales = !o.fewerLocalizedViews && !o.betterSqliteSessionVariables && _on_sqlite && _locales_4sql.sqlite
 
 	// Pass 1 - add localized.<locale> entities and views
 	for (const each in cds.linked(m).definitions) {
@@ -60,7 +68,6 @@ function unfold_csn (m) { // NOSONAR
 		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 (_conf?.impl === '@cap-js/sqlite') continue
 			if (_locales) for (const locale of _locales) {
 				_add_proxy4 (d,`localized.${locale}.${each}`, x => pass2.push([x,locale]))
 			}
@@ -73,7 +80,7 @@ function unfold_csn (m) { // NOSONAR
 		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 elements = overlayed ??= x.elements = {__proto__:x.elements}
 				const target = locale ? `localized.${locale}.${e.target}` : `localized.${e.target}`
 				const _target = m.definitions[target]
 				if (_target) {

package/lib/compile/for/lean_drafts.js

@@ -107,8 +107,16 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
       draft['@Capabilities.NavigationRestrictions.RestrictedProperties'] = undefined
 
     // Recursively add drafts for compositions
+    let _2manies
     for (const each in draft.elements) {
       const e = draft.elements[each]
+      // add @odata.draft.enclosed to filtered compositions
+      if (e.$enclosed) {
+        e['@odata.draft.enclosed'] = true
+      } else if (e.$filtered) { //> REVISIT: remove with cds^8
+        _2manies ??= Object.keys(draft.elements).map(k => draft.elements[k]).filter(c => c.isComposition && c.is2many)
+        if (_2manies.find(c => c.name !== e.name && c.target.replace(/\.drafts$/, '') === e.target)) e['@odata.draft.enclosed'] = true
+      }
       const newEl = Object.create(e)
       if (
         e.isComposition ||
@@ -135,6 +143,7 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
 
       draft.elements[each] = newEl
     }
+
     return draft
   }
 

package/lib/compile/to/edm-files.js

@@ -0,0 +1,116 @@
+const { Worker, parentPort, isMainThread, workerData } = require('node:worker_threads')
+const cds = require('../../index.js'), { path, local, read, exists } = cds.utils
+const TRACE = cds.debug('trace')
+const LOG = cds.log('cds|edmx')
+const OUT = process.env.cds_test_temp || path.join (cds.root,'_out')
+
+// -----------------------------------------------------------------------
+//
+//   Main Thread Part
+//
+
+if (isMainThread) {
+
+  module.exports = exports = (csn, tenant, features) => {
+    const defs = Object.entries(csn.definitions), protocols = cds.service.protocols
+    const services = defs.filter(([,d]) => d.kind === 'service' && 'odata' in protocols.for(d)).map(([k]) => k)
+    if (!services.length) return LOG.debug (`No service definitions found in given model(s).`)
+    let dir = path.join (OUT, tenant||'', features||'')
+    LOG.info ('generating edmx files to', { dir: local(dir) }, '\n')
+    return GENERATE ({ csn, dir, services })
+  }
+
+  const GENERATE = _generate_using_workers // for running in worker threads
+  // const GENERATE = _generate_edmxs      // for running in main thread
+
+  // eslint-disable-next-line no-inner-declarations
+  async function _generate_using_workers (workerData) {
+    await new Promise((resolve, reject) => new Worker (__filename, { workerData })
+    .on('error', reject)
+    .on('message', msg => {
+      if (msg.error) return reject (new cds.error(msg.error))
+      if (msg === 'done') return resolve()
+      else LOG.debug (msg)
+    }))
+    exports.get = _read_generated_edmx4
+  }
+
+  // eslint-disable-next-line no-inner-declarations
+  function _read_generated_edmx4 (srv, kind='edmx', { tenant, features }={}) {
+    let dir = path.join (OUT, tenant||'', features||'')
+    let file = path.join (dir, srv.definition.name+'.'+kind)
+    if (!exists(file)) throw new Error (`No generated edm(x) file found at: ${file}`)
+    return read (file)
+  }
+
+  exports.dir = OUT
+}
+
+
+
+// -----------------------------------------------------------------------
+//
+//   Worker Thread Part
+//
+
+
+if (!isMainThread) _generate_edmxs (workerData)
+.catch (e => parentPort.postMessage({ error: e }))
+.then (() => parentPort.postMessage('done'))
+
+
+async function _generate_edmxs ({ csn, dir, services }) {
+
+  const { mkdir, writeFile } = cds.utils.fs.promises
+  await mkdir (dir, { recursive: true })
+  const cdsc = cds.compiler
+  const promises = []
+
+  TRACE?.time(`cdsc.generate edmxs`.padEnd(22))
+
+  // call cdsc.to.odata to generate edm/xs
+  let odataVersion = cds.env.odata.version
+  let suffixes = { edmx: '.edmx' }
+  let compile = cdsc.to.edmx // default is edmx only
+  if (!cds.env.features.odata_new_adapter) {
+    compile = cdsc.to.odata // edmx and edm.json
+    suffixes.edm = '.edm.json'
+  }
+
+  let result = compile.all (csn, { serviceNames: services, messages:[] })
+
+  // write edmx files to disk
+  for (let [name,x] of Object.entries(result[odataVersion])) {
+    for (let suffix in suffixes) {
+      let content = suffix === 'edmx'? x[suffix] : JSON.stringify (x[suffix], minify);
+      let file = path.join (dir, name + suffixes[suffix])
+      let p = writeFile (file, content)
+        .then (() => parentPort?.postMessage ({ generated: local(file) }))
+      promises.push(p)
+    }
+  }
+  await Promise.all (promises)
+  TRACE?.timeEnd(`cdsc.generate edmxs`.padEnd(22))
+  return true
+}
+
+
+function minify (k,v) {
+  if (k === '$ReferentialConstraint') return
+  if (k === '$Reference') return
+  if (k === '$OnDelete') return
+  if (k === '$MaxLength') return
+  if (k === '$Annotations') {
+    const v2 = {}
+    for (let a in v) {
+      const a1=v[a], a2 = {}
+      for (let p in a1) {
+        if (!/^@(UI|Common|Analytics|Core.Description|Core.Operation|Capabilities.Navigation|Measures|Validation)/.test(p)) a2[p] = a1[p]
+      }
+      if (Object.keys(a2).length) v2[a] = a2
+    }
+    return v2
+  }
+  // if (k === '$Type' && v === 'Edm.Guid') return
+  else return v
+}

package/lib/compile/to/edm.js

@@ -69,4 +69,11 @@ function* _many (suffix, all, callback = x=>x) {
   for (let file in all) yield [ callback(all[file]), { file, suffix } ]
 }
 
-module.exports = Object.assign (cds_compile_to_edm, { x: cds_compile_to_edmx })
+module.exports = exports = cds_compile_to_edm
+cds_compile_to_edm.x = cds_compile_to_edmx
+if (cds.env.features.pre_compile_edmxs) {
+  cds_compile_to_edmx.files = require('./edm-files')
+} else {
+  cds_compile_to_edmx.files = ()=> null
+}
+cds_compile_to_edmx.files.get = ()=> null

package/lib/compile/to/hdbtabledata.js

@@ -61,7 +61,7 @@ async function _tabledata4(dir, csvFile, model, baseDir, naming) {
 
   // add a locale filter for mono-lingual files that refer to generated text tables
   if (entity.elements.locale) {
-    const locale = /_texts_(.+)\.csv$/.test(csvFile) ? RegExp.$1 : null
+    const locale = /[._]texts_(.+)\.csv$/.test(csvFile) ? RegExp.$1 : null
     if (locale) {
       const localeKey = getElementCdsPersistenceName(entity.elements.locale.name/*usually 'LOCALE'*/, naming, 'hana');
       _import.import_settings.include_filter.push({ [localeKey]: locale })
@@ -83,7 +83,7 @@ async function _tabledata4(dir, csvFile, model, baseDir, naming) {
 function _entity4(name, csn) {
   const entity = csn.definitions[name]
   if (!entity) {
-    if (/(.+)[._]texts_?/.test(name)) { // 'Books_texts', 'Books_texts_de'
+    if (/(.+)[._]texts_?/.test(name)) { // 'Books_texts', 'Books_texts_de', 'Books.texts', 'Books.texts_de'
       const base = csn.definitions[RegExp.$1]
       if (base && base.elements && base.elements.texts) {
         return _entity4(base.elements.texts.target, csn)
@@ -119,7 +119,7 @@ function _csvDirs(sources) {
 
 function _csvs(filename, _, allFiles) {
   if (filename[0] === '-' || !filename.endsWith('.csv')) return false
-  // ignores 'Books_texts.csv' if there is any 'Books_texts_LANG.csv'
+  // ignores 'Books_texts.csv'|'Books.texts.csv' if there is any 'Books_texts_LANG.csv'|'Books.texts_LANG.csv'
   if (/(.*)[._]texts\.csv$/.test(filename)) {
     const basename = RegExp.$1
     const monoLangFiles = allFiles.filter(file => new RegExp(basename + '_texts_').test(file))

package/lib/compile/to/sql.js

@@ -1,6 +1,7 @@
 const cds = require ('../..')
 const cdsc = require ('../cdsc')
-const keywords = require("@sap/cds-compiler").to.sql.sqlite.keywords
+const sqliteKeywords = cdsc.to.sql.sqlite.keywords
+const postgresKeywords = cdsc.to.sql.postgres?.keywords // requires @sap/cds-compiler >= 4.8.0
 const { unfold_ddl } = require ('../etc/_localized')
 const TRACE = cds.debug('trace')
 
@@ -53,5 +54,6 @@ module.exports = Object.assign (cds_compile_to_sql, {
   hdbcds: cds_compile_to_hdbcds,
   hdbtable: cds_compile_to_hdbtable,
   delta: cds_compile_to_deltaSql,
-  sqlite: { keywords },
+  sqlite: { keywords: sqliteKeywords },
+  postgres: { keywords: postgresKeywords },
 })

package/lib/compile/to/srvinfo.js

@@ -8,7 +8,7 @@ module.exports = (model, options={}) => {
 
   const result = []
   const isNodeProject = _isNodeProject(options.root || cds.root)
-  const javaPrefix = _javaPrefix()
+  const javaPrefix = _javaPrefix(options.root || cds.root)
   const isJavaProject = !!javaPrefix
 
   cds.linked(model) .all ('service')
@@ -85,11 +85,12 @@ module.exports = (model, options={}) => {
     }
   }
 
-  function _javaPrefix() {
+  function _javaPrefix(root) {
     let is_java
     const javaPrefixDefault = 'odata/v4/'
-    for (let s of model.$sources) {
-      const file = isfile (join (s,'../src/main/resources/application.yaml'))
+    const roots = [ cds.env.folders.db, cds.env.folders.srv ].map(d => join(root, d))
+    for (let r of roots) {
+      const file = isfile (join (r,'../src/main/resources/application.yaml'))
       if (file) {
         const yaml = cds.load.yaml(file)
         for (let yamlDoc of Array.isArray(yaml) ? yaml : [yaml]) {
@@ -103,7 +104,7 @@ module.exports = (model, options={}) => {
         }
         return javaPrefixDefault
       }
-      else if (isfile (join(s,'../pom.xml'))) is_java = true
+      else if (isfile (join(r,'../pom.xml'))) is_java = true
     }
     return is_java && javaPrefixDefault
   }