@sap/cds-dk 10.1.1 → 10.2.0

package/bin/serve.js

@@ -3,13 +3,12 @@ const { DIR } = require('./completion');
 const serve = require(_local('@sap/cds/bin/serve'))
 module.exports = Object.assign(serve, {
   staticCompletions: () => ({
-    '_':      DIR(),
-    '--from': DIR(),
-    '-f':     DIR(),
-    '--with': DIR(),
-    '-w':     DIR(),
-    '--to':   ['odata', 'fiori', 'rest'],
-    '-2':     ['odata', 'fiori', 'rest'],
+    '_':         DIR(),
+    '--from':    DIR(),
+    '-f':        DIR(),
+    '--with':    DIR(),
+    '--to':      ['odata', 'fiori', 'rest'],
+    '--service': ['all'],
   }),
 })
 

package/bin/up.js

@@ -149,9 +149,14 @@ async function up() {
     }
   }
 
+  const packageJson = exists('package.json') ? await read('package.json') : {}
+  const workspaces = Array.isArray(packageJson.workspaces) ? packageJson.workspaces : packageJson.workspaces?.packages ?? []
+  const appFolder = cds.env.folders.app.replace(/\/$/, '')
   for (const { app } of apps) {
     const appPath = path.join(cds.root, cds.env.folders.app, app)
-    if (exists(path.join(appPath, 'package.json'))) {
+    const workspacePath = path.join(appFolder, app).replace(/\\/g, '/')
+    const isWorkspace = workspaces.includes(`${appFolder}/*`) || workspaces.includes(workspacePath)
+    if (!isWorkspace && exists(path.join(appPath, 'package.json'))) {
       if (!exists(path.join(appPath, 'package-lock.json'))) {
         run(`npm i --prefix ${appPath}`)
       } else if (process.env.CI) {
@@ -214,7 +219,7 @@ async function up() {
 
     }
 
-    if (project.hasAppFrontend) {
+    if (project.hasAppFrontend || project.hasHtml5Repo) {
       const html5DeployerResources = join(cds.root, html5DeployerPath, 'resources')
       let isRootApp = true;
 

package/bin/upgrade/steps/install.js

@@ -25,7 +25,7 @@ function runCommand(cmd, args, cwd) {
   });
 }
 
-// Which package.json directories does a root `npm install` NOT cover?
+// Which package.json directories does a root `npm upgrade` NOT cover?
 // A tracked package.json is covered by root install iff (a) it lives inside
 // cds.root and (b) the root package.json's `workspaces` array reaches it via
 // collectWorkspacePackageJsons. Anything else (e.g. mtx/sidecar outside the
@@ -50,11 +50,11 @@ async function extraInstallDirs(ctx, cds) {
 }
 
 async function runNpmInstalls(ctx, cds) {
-  const rootCode = await runCommand('npm', ['install'], cds.root);
+  const rootCode = await runCommand('npm', ['upgrade'], cds.root);
   if (rootCode !== 0) return rootCode;
   const extras = await extraInstallDirs(ctx, cds);
   for (const dir of extras) {
-    const code = await runCommand('npm', ['install'], dir);
+    const code = await runCommand('npm', ['upgrade'], dir);
     if (code !== 0) return code;
   }
   return 0;
@@ -71,7 +71,7 @@ async function runInstall(ctx, cds) {
 
   if (ctx.project.isNode && nodeWorkPending) {
     let accept = false, asked = true;
-    try { accept = await askYesNo('Delete lock files and run `npm install` now?'); }
+    try { accept = await askYesNo('Delete lock files and run `npm upgrade` now?'); }
     catch (e) {
       if (e instanceof NonTTYError) asked = false;
       else throw e;
@@ -81,11 +81,11 @@ async function runInstall(ctx, cds) {
       const code = await runNpmInstalls(ctx, cds);
       nodeRan = true;
       if (code !== 0) {
-        console.log(error('✗ npm install failed. Please resolve and re-run.'));
+        console.log(error('✗ npm upgrade failed. Please resolve and re-run.'));
         aborted = true;
       }
     } else if (asked) {
-      console.log('To finish, delete lock files and run: npm install');
+      console.log('To finish, delete lock files and run: npm upgrade');
     }
   }
 

package/bin/watch/index.js

@@ -106,6 +106,7 @@ const ignoreDefaults = [
   /@types/,
   /@cds-models/,
   new RegExp(`app${escapedSep}.+?${escapedSep}webapp`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}src${escapedSep}`),
   new RegExp(`app${escapedSep}.+?${escapedSep}.*\\.json`),
   new RegExp(`app${escapedSep}.+?${escapedSep}dist${escapedSep}`),
   new RegExp(`app${escapedSep}.+?${escapedSep}target${escapedSep}`),

package/lib/build/index.js

@@ -183,19 +183,23 @@ async function applyCommonTaskDefaults(tasks) {
 
 async function filterTasksForCli(tasks, runner) {
     const options = runner.options
-    let resultTasks = tasks.filter(task => {
-        return (!options.for || options.for === task.for)
+    const buildTaskTypes = options.for && [...new Set(options.for.split(',').map(value => value.trim()).filter(Boolean))]
+    let resultTasks = tasks.filter(task => (!buildTaskTypes || buildTaskTypes.includes(task.for))
             && (!options.src || options.src === task.src)
-    })
-    if (resultTasks.length === 0) {
-        if (options.for) {
-            const task = getTask({ for: options.for }, runner.plugins)
+    )
+    if (buildTaskTypes) {
+        const missingTaskTypes = buildTaskTypes.filter(type => !resultTasks.some(task => task.for === type))
+        for (const type of missingTaskTypes) {
+            const task = getTask({ for: type }, runner.plugins)
             if (options.src) task.src = options.src
             resultTasks.push(task)
+        }
+        if (missingTaskTypes.length) {
             applyCliOptions(resultTasks, options)
             await applyTaskDefaults(resultTasks, runner)
         }
-    } else if (resultTasks.length <= tasks.length) {
+    }
+    if (resultTasks.length > 0 && resultTasks.length <= tasks.length) {
         tasks.length = 0
         resultTasks.forEach(task => tasks.push(task))
         resultTasks = tasks

package/lib/build/plugins/featureToggles.js

@@ -9,7 +9,7 @@ module.exports = class FeatureTogglesBuildPlugin extends require('./internal') {
         const sources = filterFeaturePaths(csn, this.task.options.model || this.task.src)
         const dictionary = { base: null, features: null }
 
-        if (sources.features) {
+        if (Object.keys(sources.features).length) {
             // create base model as the given CSN is containing all features
             dictionary.base = await cds.load(sources.base, this.options())
         } else {
@@ -20,7 +20,7 @@ module.exports = class FeatureTogglesBuildPlugin extends require('./internal') {
         const csnStr = await this.compileToJson(dictionary.base, path.join(destBase, DEFAULT_CSN_FILE_NAME))
         const csnModel = JSON.parse(csnStr)
         csnModel.meta = csn.meta
-        if (sources.features) {
+        if (Object.keys(sources.features).length) {
             dictionary.features = await this._compileFeatures(sources.features, destBase, destFts, dictionary.base)
         }
         return { dictionary, sources }

package/lib/build/plugins/hana/index.js

@@ -357,7 +357,7 @@ module.exports = class HanaBuildPlugin extends require('../internal') {
         const wsMigrationTables = new Set()
         if (journalEntities.length) {
             for (const entity of journalEntities) {
-                if (entity['$location']?.file && wsPaths.some(wsPath => path.resolve(cds.root, entity['$location'].file).startsWith(wsPath))) {
+                if (entity['$location']?.file && wsPaths.some(wsPath => path.resolve(cds.root, entity['$location'].file).startsWith(wsPath + path.sep))) {
                     wsMigrationTables.add(getMigrationTableName(entity, model))
                 }
             }

package/lib/build/plugins/helm/files/subcharts/web-application/Chart.yaml

@@ -5,4 +5,4 @@ name: web-application
 sources:
 - https://github.tools.sap/unified-runtime/web-application
 type: application
-version: 2.1.0
+version: 2.6.0

package/lib/build/plugins/helm/files/subcharts/web-application/templates/_helpers.tpl

@@ -3,8 +3,12 @@
 {{/*
 */}}
 {{- define "web-application.internal.bindingName" -}}
+{{- if and .params .params.serviceBindingNameOverride }}
+{{- tpl .params.serviceBindingNameOverride .root }}
+{{- else }}
 {{- printf "%s-%s" (include "web-application.fullname" .root ) .name }}
 {{- end }}
+{{- end }}
 
 {{/*
 Create chart name and version as used by the chart label.
@@ -98,6 +102,9 @@ Service Binding secret volumes
 - name: {{ $name }}
   secret:
     secretName: {{ tpl $secretName $ }}
+    {{- if $params.optional }}
+    optional: {{ $params.optional }}
+    {{- end }}
 {{- end }}
 {{- end }}
 

package/lib/build/plugins/helm/files/subcharts/web-application/templates/api-rule.yaml

@@ -21,6 +21,7 @@ spec:
   service:
     name: {{ include "web-application.fullname" . }}
     port: {{ .Values.port }}
+  timeout: {{ .Values.expose.timeout }}
   rules:
     {{- tpl (toYaml .Values.expose.rules) $ | nindent 4 }}
   {{- if .Values.expose.corsPolicy }}

package/lib/build/plugins/helm/files/subcharts/web-application/templates/service-binding.yaml

@@ -7,15 +7,15 @@
 apiVersion: services.cloud.sap.com/v1
 kind: ServiceBinding
 metadata:
-  name: {{ include "web-application.internal.bindingName" (dict "root" $ "name" $name) }}
+  name: {{ include "web-application.internal.bindingName" (dict "root" $ "name" $name "params" $mergedParams) }}
   labels: {{- include "web-application.labels" $ | nindent 4 }}
 spec:
-  serviceInstanceName: {{include "web-application.internal.serviceInstanceName" (dict "binding" $mergedParams "root" $) }}
+  serviceInstanceName: {{ include "web-application.internal.serviceInstanceName" (dict "binding" $mergedParams "root" $) }}
   {{- if $mergedParams.secretKey }}
   secretKey: {{ $mergedParams.secretKey }}
   {{- end }}
   {{- if $mergedParams.serviceInstanceNamespace }}
-  serviceInstanceNamespace: {{ $mergedParams.serviceInstanceNamespace }}
+  serviceInstanceNamespace: {{ tpl $mergedParams.serviceInstanceNamespace $ }}
   {{- end }}
   {{- if $mergedParams.externalName }}
   externalName: {{ $mergedParams.externalName }}
@@ -24,7 +24,7 @@ spec:
   secretName: {{ tpl $mergedParams.secretName $ }}
   {{- end }}
   {{- if $mergedParams.parameters }}
-  parameters: {{ $mergedParams.parameters | toYaml | nindent 4 }}
+  parameters: {{ tpl ($mergedParams.parameters | toYaml) $ | nindent 4 }}
   {{- end }}
   {{- if $mergedParams.parametersFrom }}
   parametersFrom: {{ tpl ($mergedParams.parametersFrom | toYaml) $ | nindent 4 }}

package/lib/build/plugins/helm/files/subcharts/web-application/values.schema.json

@@ -595,6 +595,10 @@
                     "$id": "#/properties/expose/properties/gateway",
                     "type": "string"
                 },
+                "timeout": {
+                    "$id": "#/properties/expose/properties/timeout",
+                    "type": "integer"
+                },
                 "APIRule": {
                     "$id": "#/properties/expose/properties/APIRule",
                     "type": "object",
@@ -789,6 +793,9 @@
                             "properties": {
                                 "fromSecret": {
                                     "type": "string"
+                                },
+                                "optional": {
+                                    "type": "boolean"
                                 }
                             }
                         },
@@ -805,6 +812,9 @@
                                 "serviceInstanceNamespace": {
                                     "type": "string"
                                 },
+                                "serviceBindingNameOverride": {
+                                    "type": "string"
+                                },
                                 "externalName": {
                                     "type": "string"
                                 },
@@ -848,6 +858,9 @@
                                 },
                                 "credentialsRotationPolicy": {
                                     "type": "object"
+                                },
+                                "optional": {
+                                    "type": "boolean"
                                 }
                             },
                             "dependencies": {

package/lib/build/plugins/helm/files/subcharts/web-application/values.yaml

@@ -14,7 +14,7 @@ global:
     _internal:
       web-application:
         versions:
-          2.1.0: true
+          2.6.0: true
 ## Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 
@@ -58,6 +58,7 @@ additionalVolumes: []
 # - name: my-volume
 #   secret:
 #     secretName: my-secret
+#     optional: true # make the volume optional
 #   volumeMount:
 #     mountPath: /etc/mysecret
 #     readOnly: true
@@ -171,6 +172,9 @@ expose:
   enabled: true
   # Use this istio gateway for incoming traffic.
   gateway: kyma-system/kyma-gateway
+  # Specifies the timeout for HTTP requests in seconds for all rules
+  # https://kyma-project.io/external-content/api-gateway/docs/user/custom-resources/apirule/04-10-apirule-custom-resource.html#timeout
+  timeout: 180
   ## Custom Istio Gateway to use with the VirtualService created using the TENANT_HOST_PATTERN.
   ## If your TENANT_HOST_PATTERN uses top level domain for the tenants (like tenant-name.<provider>.<cluster-domain>), you need to create custom Certificate and Gateway since the default Kyma Gateway will not work.
   # tenantGateway: tenants-gateway.my-ns.svc.cluster.local
@@ -268,9 +272,11 @@ bindings:
 #       enabled: false
 #   hana:
 #     serviceInstanceName: hana-manual
+#     serviceBindingNameOverride: hana-manual-binding # override the default generated name
 #     secretTemplate: -> see https://github.com/SAP/sap-btp-service-operator?tab=readme-ov-file#custom-formats
 #   portal:
 #     fromSecret: manual-secret # user-provided-service
+#     optional: true # make the binding optional
 
 ## Annotations to add to objects
 annotations:

package/lib/build/plugins/internal.js

@@ -132,36 +132,10 @@ module.exports = class InternalBuildPlugin extends require('./plugin') {
         // bundleDest might be null
         if (bundleDest && Object.keys(bundles).length > 0) {
             await this.write(bundles).to(file)
-            // also collect and write messages from plugins
-            await this.collectMessageBundles(bundleDest, model)
             return { file, bundles }
         }
         return null
     }
-
-    /**
-     * Collect and write message bundles from CAP plugins into messages.properties files.
-     * @param {string} bundleDest
-     * @param {Object} model - passed for signature consistency with subclass overrides; not used here
-     * as Java does not require neighborhood resolution of plugin i18n files.
-     */
-    // eslint-disable-next-line no-unused-vars
-    async collectMessageBundles(bundleDest, model) {
-        const messageBundle = cds.i18n.bundle4('messages')
-        const messagesData = messageBundle.translations4?.(cds.env.i18n.languages) ?? {}
-
-        // Write messages.properties files for each locale
-        for (const [locale, messages] of Object.entries(messagesData)) {
-            if (Object.keys(messages).length > 0) {
-                const fileName = locale ? `messages_${locale}.properties` : 'messages.properties'
-                const filePath = path.join(bundleDest, fileName)
-                const content = Object.entries(messages)
-                    .map(([key, value]) => `${key}=${value}`)
-                    .join('\n') + '\n'
-                await this.write(content).to(filePath)
-            }
-        }
-    }
 }
 
 // Emits the 'compile.for.runtime' event, as the produced CSN is for runtime usage.

package/lib/build/plugins/java/index.js

@@ -25,10 +25,14 @@ module.exports = class JavaBuildPlugin extends require('../edmx') {
     async build() {
         const compileDest = this.task.options.compileDest
         const { src, dest } = this.task
-        const model = await this.model()
+        let model = await this.model()
         if (!model) {
             return
         }
+        const minify = cds.env.build?.minify
+        if (minify) {
+            model = cds.minify(model, minify === true ? undefined : minify)
+        }
         await this._compileForJava(model, compileDest)
 
         if (!this.hasBuildOption(CONTENT_EDMX, false)) {

package/lib/build/plugins/nodejs/index.js

@@ -10,6 +10,7 @@ const DEBUG = cds.debug('cli|build')
 const NODE_ENGINE_VERSION = '^24'
 const { exec } = require('node:child_process')
 const pexec = require('node:util').promisify(exec)
+const escapeLineBreaks = value => value.replace(/\r/g, '\\u000D').replace(/\n/g, '\\u000A')
 
 module.exports = class NodejsBuildPlugin extends require('../edmx') {
 
@@ -47,11 +48,15 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
             this.pushMessage("OData v2 is not supported by node runtime. Make sure to define OData v2 in cds configuration.", SEVERITY_WARNING)
         }
         // by default model contains all features
-        const model = await this.model()
+        let model = await this.model()
         if (!model && !this.context.options[OPTION_WS_PACK]) {
             return
         }
         if (model) {
+            const minify = cds.env.build?.minify
+            if (minify) {
+                model = cds.minify(model, minify === true ? undefined : minify)
+            }
             const { dictionary, sources } = await this.compileAll(model, destSrv, destRoot)
             // collect and write language bundles into single i18n.json file
             // await this.collectAllLanguageBundles(dictionary, sources, destRoot, destRoot)
@@ -353,15 +358,19 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
         return Array.isArray(parsed) ? parsed : Object.values(parsed)
     }
 
-    // Override to pass model for neighborhood resolution of plugin i18n files.
-    // Cannot be done in InternalBuildPlugin because Java relies on the model-less behaviour.
+    async collectLanguageBundles(model, bundleDest) {
+        const result = await super.collectLanguageBundles(model, bundleDest)
+        if (result) await this.collectMessageBundles(bundleDest, model)
+        return result
+    }
+
     async collectMessageBundles(bundleDest, model) {
         const messageBundle = cds.i18n.bundle4('messages', { model })
         const messagesData = messageBundle.translations4?.(cds.env.i18n.languages) ?? {}
         for (const [locale, messages] of Object.entries(messagesData)) {
             if (Object.keys(messages).length > 0) {
                 const fileName = locale ? `messages_${locale}.properties` : 'messages.properties'
-                const content = Object.entries(messages).map(([k, v]) => `${k}=${v}`).join('\n') + '\n'
+                const content = Object.entries(messages).map(([k, v]) => `${k}=${escapeLineBreaks(v)}`).join('\n') + '\n'
                 await this.write(content).to(path.join(bundleDest, fileName))
             }
         }

package/lib/build/util.js

@@ -241,11 +241,10 @@ function findWorkspaceRoot(currentPath, depth = 0) {
 }
 
 /**
- * This JavaScript function filterFeaturePaths is used to filter and categorize file paths
- * from a given model into two categories: base and features.
- * @param {*} model - represents a data model. It's expected to have a $sources property which is an array of file paths.
- * @param {*} modelPaths - an array of file paths.
- * @returns
+ * Filters and categorizes file paths from a given model into base and feature paths.
+ * @param {import('@sap/cds').csn.CSN & { $sources: string[] }} model
+ * @param {string | string[]} modelPaths
+ * @returns {{ base: string[], features: Record<string, string[]> }}
  */
 function filterFeaturePaths(model, modelPaths) {
     const ftsName = path.dirname(cds.env.features.folders || 'fts/*')

package/lib/cds.js

@@ -11,10 +11,16 @@ module.exports = Object.defineProperties (cds, {
 
 function _local (id, ...morePaths) {
   return require(require.resolve (id, {paths:[
-    process.cwd(), // project-local module is preferred
+    _cwd(),         // project-local module is preferred
     __dirname,      // otherwise from our own dependencies
     ...morePaths
-  ]}))
+  ].filter(Boolean)})) // drop empty paths (e.g. _cwd()/_npmRoot() fallbacks); require.resolve expects real paths
+}
+
+function _cwd() {
+  // process.cwd() throws ENOENT (uv_cwd) when the cwd was deleted
+  try { return process.cwd() }
+  catch (e) { if (e.code === 'ENOENT') return '' }
 }
 
 function _npmRoot() {

package/lib/env/schemas/cds-rc.js

@@ -76,6 +76,11 @@ module.exports = {
                         }
                     },
                     properties: {
+                        minify: {
+                            type: ["boolean", "object"],
+                            description: "Minify the model before compilation.",
+                            default: false
+                        },
                         target: {
                             type: "string",
                             description: "Specify the folder which contains generated build results. Defaults to './gen'.",

package/lib/import/importapi.js

@@ -2,7 +2,6 @@ let cds = require('../cds');
 let { path } = cds.utils;
 let common = require('./common');
 let odata = require('./odata');
-let openapi = require('./openapi');
 let messages = require('./message').getMessages();
 
 module.exports = Object.assign(cds_import, {
@@ -81,15 +80,15 @@ async function cds_import_from_edmx(filepath, options = { keepNamespace: false }
 
 /**
  * This is the import API function to generate CSN from openapi files.
+ * cds11: remove once @cap-js/openapi is a required project dependency
  * @param {string} filepath
  * - a single valid filepath
  * @returns {object} CSN
  */
 async function cds_import_from_openapi(filepath, options = {}) {
-    // validates the input file
     filepath = await common.isValidInputFile(path.resolve(process.cwd(), filepath));
     const src = await common.getContentFromFile(filepath);
-    let csn = openapi.openAPI2csn(src);
+    let csn = require('@cap-js/openapi').import.openAPI2csn(src);
     options.inputFileKind = 'rest';
     return csn;
 }

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [25],
-    MAVEN_ARCHETYPE_VERSION: '5.1.1',
+    MAVEN_ARCHETYPE_VERSION: '5.2.0',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

package/lib/init/index.js

@@ -1,7 +1,7 @@
 
 const { readdirSync } = require('node:fs')
 const { basename, join, relative, resolve } = require('node:path')
-const { OPTIONS, COMMAND_INIT } = require('./constants'), { JAVA, COMPLETION } = OPTIONS
+const { OPTIONS, COMMAND_INIT } = require('./constants'), { JAVA, NODEJS, COMPLETION } = OPTIONS
 const validate = require('./validate')
 const cmd = require('../util/command')
 
@@ -113,7 +113,11 @@ module.exports = class CDSGenerator {
             throw `in your home directory, use 'cds init <project>'`
         }
         const { options } = cds.cli
-        this.cwd = options.cwd || process.cwd();
+        if (cds.cli.command !== COMMAND_INIT && options.workspace === true) {
+            throw 'the --workspace argument must not be empty'
+        }
+        const cwd = options.cwd || process.cwd()
+        this.cwd = options.workspace ? resolve(cwd, options.workspace) : cwd
         cds.root = resolve(this.cwd, projectName || '.');
         this.projectName = basename(cds.root);
 
@@ -184,7 +188,8 @@ module.exports = class CDSGenerator {
         }
 
         if (cds.cli.command === COMMAND_INIT) {
-            console.log ('Successfully initialized CAP project')
+            const runtime = options.add.has(JAVA) || options.add.has(NODEJS)
+            console.log (`Successfully initialized CAP project${runtime ? '' : ` without a runtime. Choose one with ${BOLD+'cds add nodejs'+RESET} or ${BOLD+'cds add java'+RESET}.`}`)
             let relativeProjectPath = relative(this.cwd, cds.root)
             if (relativeProjectPath)
                 console.log ('Continue with:', BOLD +'code', relativeProjectPath, RESET)

package/lib/init/merge.js

@@ -165,8 +165,28 @@ async function _mergeYAML(into, from, project, semantics = {}) {
             t.value = s.value
         }
     }
+    const deleteEntries = entries => {
+        for (const { item, key, relationships: refs } of entries) {
+            const seq = locate(target, item.in)
+            const node = locate(target, item)
+            if (!YAML.isSeq(seq) || !node) continue
+            const removed = node.toJSON()
+            key ? node.deleteIn(path(key)) : seq.delete(seq.items.indexOf(node))
+            for (const { removeProperty, allWithin } of refs ?? []) {
+                const [parentPath, childPath, prop] = allWithin
+                for (const parent of locate(target, parentPath)?.items ?? []) {
+                    const list = parent.getIn(path(childPath))
+                    const i = list?.items?.findIndex(n => n.get?.(prop) === removed[removeProperty]) ?? -1
+                    if (i > -1) list.delete(i)
+                }
+            }
+        }
+    }
     mergeNode(target.contents, source.contents)
 
+    // Deletions: remove the matched node (or a sub-key), then cascade-remove references to it.
+    deleteEntries(deletions.filter(({ key }) => !key))
+
     // Placement: add matched (and relationship-referenced) template entries not already present.
     const isEntry = e => e && typeof e === 'object' && !Array.isArray(e) && e.in !== undefined
     const insertNode = ins => Array.isArray(ins) ? (ins.length === 1 ? ins[0] : undefined) : ins
@@ -208,22 +228,7 @@ async function _mergeYAML(into, from, project, semantics = {}) {
         }
     }
 
-    // Deletions: remove the matched node (or a sub-key), then cascade-remove references to it.
-    for (const { item, key, relationships: refs } of deletions) {
-        const seq = locate(target, item.in)
-        const node = locate(target, item)
-        if (!YAML.isSeq(seq) || !node) continue
-        const removed = node.toJSON()
-        key ? node.deleteIn(path(key)) : seq.delete(seq.items.indexOf(node))
-        for (const { removeProperty, allWithin } of refs ?? []) {
-            const [parentPath, childPath, prop] = allWithin
-            for (const parent of locate(target, parentPath)?.items ?? []) {
-                const list = parent.getIn(path(childPath))
-                const i = list?.items?.findIndex(n => n.get?.(prop) === removed[removeProperty]) ?? -1
-                if (i > -1) list.delete(i)
-            }
-        }
-    }
+    deleteEntries(deletions.filter(({ key }) => key))
 
     typeof into === 'string' && await writeYAML(into, target)
     return target
@@ -349,4 +354,3 @@ module.exports.merge = (...src) => {
  * @property {Deletion[]} [deletions] - matched nodes (or sub-keys) to delete
  * @property {Relationship[]} [relationships] - relationships to wire into target sequences
  */
-

package/lib/init/plugin.js

@@ -46,7 +46,7 @@ module.exports = class Plugin {
     /**
      * Runs the combine operations for interoperability with other plugins.
      * @param {string} [facet] This plugin's facet name, forwarded to `readProject(facet)`
-     *   so `add<Facet>` accessors can tell whether this facet is the one being added.
+     *   so `affected()` can tell whether this facet is the one being added.
      */
     async combine(facet) { } // eslint-disable-line no-unused-vars