@sap/cds 6.1.2 → 6.1.3

package/CHANGELOG.md

@@ -4,6 +4,21 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 6.1.3 - 2022-09-13
+
+### Added
+
+- Configuration to change maximum body size in bytes for remote requests: `cds.env.remote.max_body_length: 1000` sets it to 1 MB
+
+### Changed
+
+- For structured input, foreign keys are generated as non-enumerable properties on application-service layer
+
+### Fixed
+
+- Deep insert/update/upsert requests where the key of an association is provided in a structured format will not be rejected anymore if the target has default or mandatory fields
+- For some configurations, mtxs services were bootstrapped twice
+
 ## Version 6.1.2 - 2022-09-05
 
 ### Fixed

package/libx/_runtime/cds-services/adapter/odata-v4/utils/readAfterWrite.js

@@ -4,8 +4,6 @@ const {
   Request,
   ql: { SELECT }
 } = cds
-const LOG = cds.log()
-const { normalizeError } = require('../../../../common/error/frontend')
 
 const { getDeepSelect, getSimpleSelectCQN } = require('./handlerUtils')
 const { hasDeepUpdate } = require('../../../../common/composition/update')

package/libx/_runtime/cds-services/services/utils/compareJson.js

@@ -155,7 +155,9 @@ const _skipToMany = (entity, prop) => {
 }
 
 const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity) => {
-  for (const prop in newEntry) {
+  // On app-service layer, generated foreign keys are not enumerable,
+  // include them here too.
+  for (const prop of Object.getOwnPropertyNames(newEntry)) {
     if (keys.includes(prop)) {
       _addKeysToResult(result, prop, newEntry, oldEntry)
       continue

package/libx/_runtime/cds-services/util/assert.js

@@ -277,6 +277,9 @@ const checkIfAssocDeep = (element, value, req) => {
     // managed to one
     Object.keys(value).forEach(prop => {
       if (typeof value[prop] !== 'object') {
+        const foreignKey = element._foreignKeys.find(fk => fk.childElement.name === prop)
+        if (foreignKey) return
+
         const key = element.keys.find(element => element.ref[0] === prop)
         if (key) return
 

package/libx/_runtime/common/generic/input.js

@@ -11,6 +11,7 @@ const cds = require('../../cds')
 const LOG = cds.log('app')
 const { enrichDataWithKeysFromWhere } = require('../utils/keys')
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
+const propagateForeignKeys = require('../utils/propagateForeignKeys')
 const { checkInputConstraints, assertTargets } = require('../../cds-services/util/assert')
 const getTemplate = require('../utils/template')
 const templateProcessor = require('../utils/templateProcessor')
@@ -126,6 +127,11 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
   const { row, key, element, isRoot } = elementInfo
   category = _getSimpleCategory(category)
 
+  if (category === 'propagateForeignKeys') {
+    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition, { enumerable: false })
+    return
+  }
+
   // remember mandatory
   if (category === 'mandatory') {
     value.mandatory = true
@@ -186,6 +192,11 @@ const _pick = element => {
   // collect actions to apply
   const categories = []
 
+  // REVISIT: element._foreignKeys.length seems to be a very broad check
+  if (element.isAssociation && element._foreignKeys.length) {
+    categories.push({ category: 'propagateForeignKeys' })
+  }
+
   if (element['@assert.range'] || element['@assert.enum'] || element['@assert.format']) {
     categories.push('assert')
   }
@@ -241,7 +252,10 @@ async function _handler(req) {
   if (!req.query) return // FIXME: the code below expects req.query to be defined
   if (!req.target) return
 
-  const template = getTemplate('app-input', this, req.target, { pick: _pick })
+  const template = getTemplate('app-input', this, req.target, {
+    pick: _pick,
+    ignore: element => element._isAssociationStrict
+  })
   if (template.elements.size === 0) return
 
   const errors = []
@@ -301,7 +315,8 @@ const _processActionFunctionRow = (row, param, key, errors, event, service) => {
 
   // structured
   const template = getTemplate('app-input-operation', service, param, {
-    pick: _pick
+    pick: _pick,
+    ignore: element => element._isAssociationStrict
   })
 
   if (template && template.elements.size) {

package/libx/_runtime/common/generic/put.js

@@ -64,7 +64,10 @@ function _handler(req) {
   const { elements } = req.target
   for (const k in req.data) if (k in elements && elements[k]['@Core.MediaType']) return
 
-  const template = getTemplate('app-put', this, req.target, { pick: _pick })
+  const template = getTemplate('app-put', this, req.target, {
+    pick: _pick,
+    ignore: element => element._isAssociationStrict
+  })
   if (template.elements.size === 0) return
 
   // REVISIT: req.data should point into req.query

package/libx/_runtime/common/generic/temporal.js

@@ -1,5 +1,4 @@
 const cds = require('../../cds')
-const LOG = cds.log('app')
 
 const _getDateFromQueryOptions = str => {
   if (str) {
@@ -11,8 +10,6 @@ const _getDateFromQueryOptions = str => {
 
 const _isDate = dateStr => !dateStr.includes(':')
 const _isTimestamp = dateStr => dateStr.includes('.')
-const _isWarningRequired = (warning, queryOptions) =>
-  !warning && queryOptions && (queryOptions['sap-valid-from'] || queryOptions['sap-valid-to'])
 const _isAsOfNow = queryOptions =>
   !queryOptions || (!queryOptions['sap-valid-at'] && !queryOptions['sap-valid-to'] && !queryOptions['sap-valid-from'])
 

package/libx/_runtime/common/utils/propagateForeignKeys.js

@@ -0,0 +1,122 @@
+const cds = require('../../cds')
+
+const { prefixForStruct } = require('../../common/utils/csn')
+
+const _autoGenerate = e => e && e.isUUID && e.key
+
+const _set = (row, value, element, enumerable) => {
+  if (!element.parent.elements[element.name]) return // only when in model
+  if (!enumerable && element.foreignKeySource) {
+    // only for foreign keys
+    Object.defineProperty(row, element.name, {
+      get() {
+        return value
+      },
+      set(v) {
+        // Make sure that it becomes enumerable again if set manually afterwards
+        Object.defineProperty(row, element.name, { value: v, configurable: true, enumerable: true })
+      },
+      enumerable: false,
+      configurable: true
+    })
+  } else {
+    row[element.name] = value
+  }
+}
+
+const _generateParentField = ({ parentElement }, row, enumerable) => {
+  if (_autoGenerate(parentElement) && !row[parentElement.name]) {
+    _set(row, cds.utils.uuid(), parentElement, enumerable)
+  }
+}
+
+const _generateChildField = ({ deep, childElement }, childRow, enumerable) => {
+  if (deep) {
+    _generateChildField(deep.propagation, childRow[deep.targetName], enumerable)
+  } else if (_autoGenerate(childElement) && childRow && !childRow[childElement.name]) {
+    _set(childRow, cds.utils.uuid(), childElement, enumerable)
+  }
+}
+
+const _getNestedVal = (row, prefix) => {
+  let val = row
+  const splitted = prefix.split('_')
+  splitted.pop() // remove last `_`
+  let k = ''
+
+  while (splitted.length > 0) {
+    k += splitted.shift()
+    if (k in val) {
+      val = val[k]
+      k = ''
+    } else {
+      k += '_'
+    }
+  }
+
+  return val
+}
+
+const _propagateToChild = ({ parentElement, childElement, parentFieldValue }, row, childRow, enumerable) => {
+  if (!childElement || !childElement.parent.elements[childElement.name]) return
+  if (parentElement) {
+    const prefix = prefixForStruct(parentElement)
+    if (prefix) {
+      const nested = _getNestedVal(row, prefix)
+      _set(childRow, nested[parentElement.name], childElement, enumerable)
+    } else {
+      _set(childRow, row[parentElement.name], childElement, enumerable)
+    }
+  } else if (parentFieldValue !== undefined) {
+    _set(childRow, parentFieldValue, childElement, enumerable)
+  }
+}
+
+const _propagateToParent = ({ parentElement, childElement, deep }, childRow, row, enumerable) => {
+  if (deep) {
+    _propagateToParent(deep.propagation, childRow[deep.targetName], childRow, enumerable)
+  }
+  if (parentElement && childElement && childRow && childElement.name in childRow) {
+    _set(row, childRow[childElement.name], parentElement, enumerable)
+  }
+}
+
+module.exports = (
+  tKey,
+  row,
+  foreignKeyPropagations,
+  isCompositionEffective,
+  { deleteAssocs = false, enumerable = true } = {}
+) => {
+  if (!row || !(tKey in row)) return
+  if (row[tKey] === null) {
+    for (const foreignKeyPropagation of foreignKeyPropagations) {
+      if (!foreignKeyPropagation.fillChild) {
+        _set(row, null, foreignKeyPropagation.parentElement, enumerable)
+      }
+    }
+    if (deleteAssocs && !isCompositionEffective) delete row[tKey]
+    return
+  }
+
+  const childRows = Array.isArray(row[tKey]) ? row[tKey] : [row[tKey]]
+
+  for (const childRow of childRows) {
+    if (!childRow) return
+
+    for (const foreignKeyPropagation of foreignKeyPropagations) {
+      if (foreignKeyPropagation.fillChild) {
+        // propagate or generate in parent
+        const pk = foreignKeyPropagation.parentElement && foreignKeyPropagation.parentElement.name
+        if (pk && !(pk in row)) _propagateToParent(foreignKeyPropagation, childRow, row, enumerable)
+        if (!(pk in row)) _generateParentField(foreignKeyPropagation, row, enumerable)
+
+        if (isCompositionEffective) _propagateToChild(foreignKeyPropagation, row, childRow, enumerable)
+      } else {
+        _generateChildField(foreignKeyPropagation, childRow, enumerable)
+        _propagateToParent(foreignKeyPropagation, childRow, row, enumerable)
+      }
+    }
+  }
+  if (deleteAssocs && !isCompositionEffective) delete row[tKey]
+}

package/libx/_runtime/common/utils/template.js

@@ -67,7 +67,7 @@ const _getNextTarget = (model, element, currentPath = []) => {
  * @param {object} targetEntity The target entity which needs to be traversed
  * @param {object} callbacks
  * @param {function} callbacks.pick Callback function to pick elements. If it returns a truthy value, the element will be picked. The returned value is part of the template.
- * @param {function} callbacks.ignore Callback function to ignore elements. If it returns a truthy value, the element will be ignored.
+ * @param {function} callbacks.ignore Callback function to ignore the target of an element. If it returns a truthy value, the element's target will be ignored.
  * @param {object} [parent=null] The parent entity
  * @param {Map} [_entityMap] This parameter is an implementation side-effect — don't use it
  * @param {array} [targetPath=[]]
@@ -92,8 +92,6 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
 
   for (const elementName in elements) {
     const element = elements[elementName]
-    if (ignore && ignore(element, targetEntity, parent)) continue
-
     _pick(pick, element, targetEntity, parent, templateElements, elementName)
 
     if (element.items) {
@@ -101,6 +99,7 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
     }
 
     const { nextTargetName, nextTarget } = _getNextTarget(model, element, currentPath)
+    if (ignore && ignore(element)) continue
     const nextTargetCached = _entityMap.get(nextTargetName)
 
     if (nextTargetCached) {

package/libx/_runtime/db/generic/input.js

@@ -14,7 +14,7 @@ const cds = require('../../cds')
 const normalizeTimeData = require('../utils/normalizeTimeData')
 
 const { enrichDataWithKeysFromWhere } = require('../../common/utils/keys')
-const propagateForeignKeys = require('../utils/propagateForeignKeys')
+const propagateForeignKeys = require('../../common/utils/propagateForeignKeys')
 const getTemplate = require('../../common/utils/template')
 const templateProcessor = require('../../common/utils/templateProcessor')
 
@@ -32,8 +32,8 @@ const _processComplexCategory = ({ row, key, val, category, req, element }) => {
   category = category.category
 
   // propagate keys
-  if (category === 'propagateForeignKeys' && key in row) {
-    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition)
+  if (category === 'propagateForeignKeys') {
+    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition, { deleteAssocs: true })
     return
   }
 

package/libx/_runtime/fiori/generic/new.js

@@ -1,11 +1,9 @@
 const cds = require('../../cds')
-const { INSERT, SELECT, UPDATE } = cds.ql
+const { INSERT, UPDATE } = cds.ql
 
 const onDraftActivate = require('./activate')._handler
 const { isNavigationToMany } = require('../utils/req')
-const { getKeysCondition } = require('../utils/where')
 const { ensureDraftsSuffix } = require('../utils/handler')
-const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _getUpdateDraftAdminCQN = ({ user, timestamp }, draftUUID) => {
   return UPDATE('DRAFT.DraftAdministrativeData')

package/libx/_runtime/fiori/generic/patch.js

@@ -1,13 +1,7 @@
 const cds = require('../../cds')
 const { UPDATE, SELECT } = cds.ql
 
-const {
-  getUpdateDraftAdminCQN,
-  removeDraftUUIDIfNecessary,
-  ensureDraftsSuffix,
-  ensureNoDraftsSuffix,
-  addColumnAlias
-} = require('../utils/handler')
+const { getUpdateDraftAdminCQN, ensureDraftsSuffix, ensureNoDraftsSuffix, addColumnAlias } = require('../utils/handler')
 const { getKeysCondition } = require('../utils/where')
 const { getColumns } = require('../../cds-services/services/utils/columns')
 const { DRAFT_COLUMNS_CQN } = require('../../common/constants/draft')

package/libx/_runtime/remote/utils/client.js

@@ -24,8 +24,8 @@ const _sanitizeHeaders = headers => {
 
 const _executeHttpRequest = async ({ requestConfig, destination, destinationOptions, jwt }) => {
   const { executeHttpRequestWithOrigin } = cloudSdk()
-
   const destinationName = typeof destination === 'string' && destination
+
   if (destinationName) {
     destination = { destinationName, ...(resolveDestinationOptions(destinationOptions, jwt) || {}) }
   } else if (destination.forwardAuthToken) {
@@ -59,7 +59,13 @@ const _executeHttpRequest = async ({ requestConfig, destination, destinationOpti
 
   // cloud sdk requires a new mechanism to differentiate the priority of headers
   // "custom" keeps the highest priority as before
-  requestConfig = { ...requestConfig, headers: { custom: { ...requestConfig.headers } } }
+  requestConfig = {
+    ...(cds.env?.remote?.max_body_length && { maxBodyLength: cds.env.remote.max_body_length }),
+    ...requestConfig,
+    headers: {
+      custom: { ...requestConfig.headers }
+    }
+  }
 
   return executeHttpRequestWithOrigin(destination, requestConfig, requestOptions)
 }
@@ -145,10 +151,12 @@ function _defineProperty(obj, property, value) {
     const map = (..._) => _defineProperty(_map.call(obj, ..._), property, value)
     props.map = { value: map, enumerable: false, configurable: true, writable: true }
   }
+
   props[property] = { value: value, enumerable: false, configurable: true, writable: true }
   for (const prop in props) {
     Object.defineProperty(obj, prop, props[prop])
   }
+
   return obj
 }
 
@@ -156,14 +164,17 @@ function _normalizeMetadata(prefix, data, results) {
   const target = results !== undefined ? results : data
   if (typeof target !== 'object' || target === null) return target
   const metadataKeys = Object.keys(data).filter(k => prefix.test(k))
+
   for (const k of metadataKeys) {
     const $ = k.replace(prefix, '$')
     _defineProperty(target, $, data[k])
     delete target[k]
   }
+
   if (Array.isArray(target)) {
     return target.map(row => _normalizeMetadata(prefix, row))
   }
+
   // check properties for all and prop.results for odata v2
   for (const [key, value] of Object.entries(target)) {
     if (value && typeof value === 'object') {
@@ -171,6 +182,7 @@ function _normalizeMetadata(prefix, data, results) {
       target[key] = _normalizeMetadata(prefix, value, nestedResults)
     }
   }
+
   return target
 }
 const _getPurgedRespActionFunc = (data, returnType) => {
@@ -181,6 +193,7 @@ const _getPurgedRespActionFunc = (data, returnType) => {
       return data[key]
     }
   }
+
   return data
 }
 
@@ -198,6 +211,7 @@ const _purgeODataV2 = (data, target, returnType, reqHeaders) => {
     ieee754Compatible,
     exponentialDecimals
   )
+
   return _normalizeMetadata(/^__/, data, convertedResponse)
 }
 
@@ -217,6 +231,7 @@ const _getSanitizedError = (e, reqOptions, options = { suppressRemoteResponseBod
     url: e.config ? e.config.baseURL + e.config.url : reqOptions.url,
     headers: e.config ? e.config.headers : reqOptions.headers
   }
+
   if (options.batchRequest) {
     e.request.body = reqOptions.data
   }
@@ -227,9 +242,11 @@ const _getSanitizedError = (e, reqOptions, options = { suppressRemoteResponseBod
       statusText: e.response.statusText,
       headers: e.response.headers
     }
+
     if (e.response.data && !options.suppressRemoteResponseBody) {
       response.body = e.response.data
     }
+
     e.response = response
   }
 
@@ -270,12 +287,7 @@ const run = async (
     response = await _executeHttpRequest({ requestConfig, destination, destinationOptions, jwt })
   } catch (e) {
     // > axios received status >= 400 -> gateway error
-    const msg =
-      (e.response &&
-        e.response.data &&
-        e.response.data.error &&
-        ((e.response.data.error.message && e.response.data.error.message.value) || e.response.data.error.message)) ||
-      e.message
+    const msg = e?.response?.data?.error?.message?.value ?? e?.response?.data?.error?.message ?? e.message
     e.message = msg ? 'Error during request to remote service: \n' + msg : 'Request to remote service failed.'
 
     const sanitizedError = _getSanitizedError(e, requestConfig, {
@@ -284,7 +296,6 @@ const run = async (
 
     const err = Object.assign(new Error(e.message), { statusCode: 502, reason: sanitizedError })
     LOG._warn && LOG.warn(err)
-
     throw err
   }
 
@@ -312,7 +323,6 @@ const run = async (
     })
 
     LOG._warn && LOG.warn(err)
-
     throw err
   }
 
@@ -331,6 +341,7 @@ const run = async (
     if (responseDataSplitted[1].startsWith('HTTP/1.1 2')) {
       response.data = contentJSON
     }
+
     if (responseDataSplitted[1].startsWith('HTTP/1.1 4') || responseDataSplitted[1].startsWith('HTTP/1.1 5')) {
       const innerError = contentJSON.error || contentJSON
       innerError.status = Number(responseDataSplitted[1].match(/HTTP.*(\d{3})/m)[1])
@@ -357,6 +368,7 @@ const run = async (
     }
     return _purgeODataV4(response.data)
   }
+
   return response.data
 }
 
@@ -368,6 +380,7 @@ const getJwt = req => {
       return token[1]
     }
   }
+
   return null
 }
 
@@ -382,9 +395,11 @@ const _cqnToReqOptions = (query, service, req) => {
       .replace(/\( /g, '(')
       .replace(/ \)/g, ')')
   }
+
   if (queryObject.method !== 'GET' && queryObject.method !== 'HEAD') {
     reqOptions.data = kind === 'odata-v2' ? convertV2PayloadData(queryObject.body, req.target) : queryObject.body
   }
+
   return reqOptions
 }
 
@@ -395,9 +410,11 @@ const _stringToReqOptions = (query, data, target) => {
     method: cleanQuery.substring(0, blankIndex).toUpperCase(),
     url: encodeURI(formatPath(cleanQuery.substring(blankIndex, cleanQuery.length).trim()))
   }
+
   if (data && reqOptions.method !== 'GET' && reqOptions.method !== 'HEAD') {
     reqOptions.data = this.kind === 'odata-v2' ? Object.assign({}, convertV2PayloadData(data, target)) : data
   }
+
   return reqOptions
 }
 
@@ -412,10 +429,12 @@ const _pathToReqOptions = (method, path, data, target) => {
     // normalize in case parts[2] already starts with /
     url = url.replace(/^\/\//, '/')
   }
+
   const reqOptions = { method, url }
   if (data && reqOptions.method !== 'GET' && reqOptions.method !== 'HEAD') {
     reqOptions.data = this.kind === 'odata-v2' ? Object.assign({}, convertV2PayloadData(data, target)) : data
   }
+
   return reqOptions
 }
 

package/libx/rest/middleware/input.js

@@ -1,10 +1,9 @@
 // const cds = require('../../_runtime/cds')
 const getTemplate = require('../../_runtime/common/utils/template')
 const templateProcessor = require('../../_runtime/common/utils/templateProcessor')
-const { checkStaticElementByKey, assertNotNullError } = require('../../_runtime/cds-services/util/assert')
+const { checkStaticElementByKey } = require('../../_runtime/cds-services/util/assert')
 const { MULTIPLE_ERRORS } = require('../../_runtime/common/error/constants')
 
-
 //
 // REVISIT: We need to decipher what we are doing here...
 //
@@ -20,7 +19,7 @@ const _picker = () => {
 }
 
 const _processorFn = errors => {
-  return ({ row, key, plain: categories, target, element }) => {
+  return ({ row, key, plain: categories, target }) => {
     // REVISIT move validation to generic asserter => see PR 717
     if (categories['static_validation'] && row[key] != null) {
       const validations = checkStaticElementByKey(target, key, row[key])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

package/srv/extensibility-service.cds

@@ -1,5 +1,5 @@
+// using { cds.xt.TAR } from './model-provider'; //> IMPORTANT: don't add this as it will cause services loaded twice
 using { cds.xt.Extensions } from './extensions';
-using { cds.xt.TAR } from './model-provider';
 
 @protocol: 'rest'
 @(requires : 'authenticated-user')
@@ -8,7 +8,8 @@ service cds.xt.ExtensibilityService @(path:'/-/cds/extensibility', impl:'@sap/cd
   // TODO: async jobs
 
   type ActivationLevel : Extensions:activated;
-  type CSN: String; // REVISIT: should reuse cds.xt.CSN
+  type TAR : LargeBinary;
+  type CSN : String; // REVISIT: should reuse cds.xt.CSN
   type CSN_OR_CDL: String;
 
   // UIFLEX API
@@ -46,7 +47,7 @@ service cds.xt.ExtensibilityService @(path:'/-/cds/extensibility', impl:'@sap/cd
 
   @(requires : ['cds.ExtensionDeveloper'])
   action push (
-    extension : TAR,
+    extension : LargeBinary, // REVISIT: Using TAR here leads to a strange type check failure
     tag       : Extensions:tag
     // activate  : ActivationLevel
   );

package/srv/mtx.js

@@ -8,19 +8,28 @@ class MTXServices extends cds.Service { async init(){
   }
   // else...
   DEBUG && DEBUG ('bootstrapping MTX services...')
+  let defs = cds.model.definitions
   let sources = []
-  if (cds.requires.multitenancy) {
-    if (!('cds.xt.DeploymentService' in cds.requires)) {
-      sources.push('@sap/cds-mtxs/srv/deployment-service')
-      if (!('cds.xt.SaasProvisioningService' in cds.requires)) sources.push('@sap/cds-mtxs/srv/cf/saas-provisioning-service')
-    }
+
+  if (cds.requires.multitenancy && !('cds.xt.SaasProvisioningService' in defs)) {
+    sources.push('@sap/cds-mtxs/srv/cf/saas-provisioning-service')
+    sources.push('@sap/cds/srv/model-provider')
+  }
+
+  if (cds.requires.multitenancy && !('cds.xt.DeploymentService' in defs)) {
+    sources.push('@sap/cds-mtxs/srv/deployment-service')
+    sources.push('@sap/cds/srv/model-provider')
   }
-  if (cds.requires.extensibility) {
-    if (!('cds.xt.ExtensibilityService' in cds.requires)) sources.push('@sap/cds/srv/extensibility-service')
+
+  if (cds.requires.extensibility && !('cds.xt.ExtensibilityService' in defs)) {
+    sources.push('@sap/cds/srv/extensibility-service')
+    sources.push('@sap/cds/srv/model-provider')
   }
-  if (cds.requires.toggles) {
-    if (!('cds.xt.ModelProviderService' in cds.requires)) sources.push('@sap/cds/srv/model-provider')
+
+  if (cds.requires.toggles && !('cds.xt.ModelProviderService' in defs)) {
+    sources.push('@sap/cds/srv/model-provider')
   }
+
   let models = cds.resolve(sources); if (!models) return
   let base = cds.model.$sources; models = models.filter(m => !base.includes(m))
   if (models.length) return cds.serve(models).in(cds.app)

package/libx/_runtime/db/utils/propagateForeignKeys.js

@@ -1,93 +0,0 @@
-const cds = require('../../cds')
-
-const { prefixForStruct } = require('../../common/utils/csn')
-
-const _autoGenerate = e => e && e.isUUID && e.key
-
-const _generateParentField = ({ parentElement }, row) => {
-  if (_autoGenerate(parentElement) && !row[parentElement.name]) {
-    row[parentElement.name] = cds.utils.uuid()
-  }
-}
-
-const _generateChildField = ({ deep, childElement }, childRow) => {
-  if (deep) {
-    _generateChildField(deep.propagation, childRow[deep.targetName])
-  } else if (_autoGenerate(childElement) && childRow && !childRow[childElement.name]) {
-    childRow[childElement.name] = cds.utils.uuid()
-  }
-}
-
-const _getNestedVal = (row, prefix) => {
-  let val = row
-  const splitted = prefix.split('_')
-  splitted.pop() // remove last `_`
-  let k = ''
-
-  while (splitted.length > 0) {
-    k += splitted.shift()
-    if (k in val) {
-      val = val[k]
-      k = ''
-    } else {
-      k += '_'
-    }
-  }
-
-  return val
-}
-
-const _propagateToChid = ({ parentElement, childElement, parentFieldValue }, row, childRow) => {
-  if (!childElement) return
-  if (parentElement) {
-    const prefix = prefixForStruct(parentElement)
-    if (prefix) {
-      const nested = _getNestedVal(row, prefix)
-      childRow[childElement.name] = nested[parentElement.name]
-    } else {
-      childRow[childElement.name] = row[parentElement.name]
-    }
-  } else if (parentFieldValue !== undefined) {
-    childRow[childElement.name] = parentFieldValue
-  }
-}
-
-const _propagateToParent = ({ parentElement, childElement, deep }, childRow, row) => {
-  if (deep) {
-    _propagateToParent(deep.propagation, childRow[deep.targetName], childRow)
-  }
-  if (parentElement && childElement && childRow && childElement.name in childRow) {
-    row[parentElement.name] = childRow[childElement.name]
-  }
-}
-
-module.exports = (tKey, row, foreignKeyPropagations, isCompositionEffective) => {
-  if (row[tKey] === null) {
-    for (const foreignKeyPropagation of foreignKeyPropagations) {
-      if (!foreignKeyPropagation.fillChild) row[foreignKeyPropagation.parentElement.name] = null
-    }
-    if (!isCompositionEffective) delete row[tKey]
-    return
-  }
-
-  const childRows = Array.isArray(row[tKey]) ? row[tKey] : [row[tKey]]
-
-  for (const childRow of childRows) {
-    if (!childRow) return
-
-    for (const foreignKeyPropagation of foreignKeyPropagations) {
-      if (foreignKeyPropagation.fillChild) {
-        // propagate or generate in parent
-        const pk = foreignKeyPropagation.parentElement && foreignKeyPropagation.parentElement.name
-        if (pk && !(pk in row)) _propagateToParent(foreignKeyPropagation, childRow, row)
-        if (!(pk in row)) _generateParentField(foreignKeyPropagation, row)
-
-        if (isCompositionEffective) _propagateToChid(foreignKeyPropagation, row, childRow)
-      } else {
-        _generateChildField(foreignKeyPropagation, childRow)
-        _propagateToParent(foreignKeyPropagation, childRow, row)
-      }
-    }
-  }
-  if (!isCompositionEffective) delete row[tKey]
-}