@sap/cds-dk 6.8.3 → 7.0.0

package/lib/init/template/templateBase.js

@@ -24,9 +24,21 @@ module.exports = class TemplateBase {
 
     /**
      * Returns an array of required templates. These templates will also be added if not already included.
-     * @returns an array with depending templates, might be empty or null
+     * @function getDependencies
+     * @returns {Array} Dependent facets. Default is an empty array.
      */
     getDependencies() {
+        return []
+    }
+
+    /**
+     * Returns an array of related facets that might change the result of applying the current facet.
+     * Important: there must not be circular relationships between facets.
+     * @function getRelatedFacets()
+     * @returns {Array} Related facets. Default is an empty array.
+     */
+    getRelatedFacets() {
+        return []
     }
 
     /**
@@ -72,6 +84,17 @@ module.exports = class TemplateBase {
 
     }
 
+    /**
+     * Executes steps for related facets that are set up for the project.
+     */
+    async runRelatedMerging() {
+        for (const facet of this.getRelatedFacets()) {
+            const Template = require('./'+facet)
+            const template = new Template(this.generator)
+            if (Template.hasFacet(await this.getEnv(), this.options)) await template.runDependentMerging()
+        }
+    }
+
     /**
      * @abstract
      * Executes the given template.

package/lib/init/template/toggles/files/package.json.hbs

@@ -1,20 +1,20 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "dependencies": {
-    "@sap/cds-mtxs": "^1"
+    "@sap/cds-mtxs": "^1.9"
   },
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
         "toggles": true
-      {{#cap.for}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

package/lib/init/template/toggles/index.js

@@ -1,6 +1,6 @@
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
-const { mergeJSON, sortDependencies } = require('../../util/merge')
+const { mergeJSON, sort } = require('../../util/merge')
 
 module.exports = class TogglesTemplate extends require('../templateBase') {
 
@@ -10,9 +10,9 @@ module.exports = class TogglesTemplate extends require('../templateBase') {
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { isNodejs , configFile} = projectDescriptor.cap
+    const { isNodejs , configFile} = projectDescriptor
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
-    if (isNodejs) await sortDependencies('package.json')
+    if (isNodejs) await sort('package.json', 'dependencies')
     await this.runDependentMerging()
   }
 }

package/lib/init/template/typer/files/gitignore

@@ -0,0 +1 @@
+@cds-models

package/lib/init/template/typer/files/package.json

@@ -0,0 +1,8 @@
+{
+  "devDependencies": {
+    "@cap-js/cds-typer": "^0"
+  },
+  "imports": {
+    "#cds-models/*": "./@cds-models/*/index.js"
+  }
+}

package/lib/init/template/typer/files/xsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "checkJs": true,
+    "moduleResolution": "nodenext",
+    "paths": {
+      "#cds-models/*": ["./@cds-models/*"]
+    }
+  }
+}

package/lib/init/template/typer/index.js

@@ -0,0 +1,36 @@
+const { join } = require('path')
+const { readProject } = require('../../util/projectReader')
+const { mergeJSON, mergeGitignore } = require('../../util/merge')
+const { TYPER } = require('../../constants').OPTIONS
+const { exists, read } = require('../../../cds').utils
+
+module.exports = class TyperTemplate extends require('../templateBase') {
+  async canRun() {
+    const projectDescriptor = await readProject(this.options)
+    if (projectDescriptor.isJava) {
+      console.warn(`WARNING: This appears to be a Java project. ${TYPER} facet is intended to be used in Node.js projects. Proceeding anyway`)
+    }
+    return true
+  }
+
+  async run() {
+    const template = name => join(__dirname, 'files', name)
+    const source = await read(template('xsconfig.json'))
+    let target = 'jsconfig.json'
+
+    if (exists('tsconfig.json')) {
+      source.compilerOptions.paths["#cds-models/*"][0] += '/index.ts'
+      target = 'tsconfig.json'
+    }
+    await mergeJSON('package.json', template('package.json'))
+    await mergeGitignore('.gitignore', template('gitignore'))
+    console.info('INFO: Adding this facet changed your .gitignore file to ignore generated types')
+    try {
+      await mergeJSON(target, source)
+    } catch (e) {
+      throw e instanceof SyntaxError
+        ? `SyntaxError in ${target}. This could indicate a JSON file with comments, which is not supported at this time. Remove all comments from ${target} and rerun or add the following entries manually:\n${JSON.stringify(source, null, 2)}`
+        : e
+    }    
+  }
+}

package/lib/init/template/xsuaa/files/mta.yaml.hbs

@@ -1,26 +1,26 @@
 ---
 modules:
-  - name: {{cap.appName}}-srv
-    type: {{cap.language}}
-    path: {{& cap.srvPath}}
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
     requires:
-      - name: {{cap.appName}}-auth
+      - name: {{appName}}-auth
 
-{{#cap.isMultitenant}}
-  - name: {{cap.appName}}-mtx
+{{#isMultitenant}}
+  - name: {{appName}}-mtx
     type: nodejs
-    path: {{#cap.isNodejs}}gen/{{/cap.isNodejs}}mtx/sidecar
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
     requires:
-      - name: {{cap.appName}}-auth
-{{/cap.isMultitenant}}
+      - name: {{appName}}-auth
+{{/isMultitenant}}
 
 resources:
-  - name: {{cap.appName}}-auth
+  - name: {{appName}}-auth
     type: org.cloudfoundry.managed-service
     parameters:
       service: xsuaa
       service-plan: application
       path: ./xs-security.json
       config:
-        xsappname: {{cap.appName}}-${org}-${space}
-        tenant-mode: {{#cap.isMultitenant}}shared{{/cap.isMultitenant}}{{^cap.isMultitenant}}dedicated{{/cap.isMultitenant}}
+        xsappname: {{appName}}-${org}-${space}
+        tenant-mode: {{#isMultitenant}}shared{{/isMultitenant}}{{^isMultitenant}}dedicated{{/isMultitenant}}

package/lib/init/template/xsuaa/files/package.json.hbs

@@ -1,28 +1,28 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "dependencies": {
     "@sap/xssec": "^3",
     "passport": "^0"
   },
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
-      {{#cap.shortcut}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
+      {{#shortcut}}
         "auth": "xsuaa"
-      {{/cap.shortcut}}
-      {{^cap.shortcut}}
+      {{/shortcut}}
+      {{^shortcut}}
         "auth": {
           "kind": "xsuaa"
         }
-      {{/cap.shortcut}}
-      {{#cap.for}}
+      {{/shortcut}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

package/lib/init/template/xsuaa/files/values.yaml.hbs

@@ -1,16 +1,16 @@
 ---
-{{#cap.isMultitenant}}
+{{#isMultitenant}}
 sidecar:
   bindings:
     auth:
       serviceInstanceName: xsuaa
-{{/cap.isMultitenant}}
-{{#cap.hasApprouter}}
+{{/isMultitenant}}
+{{#hasApprouter}}
 approuter:
   bindings:
     auth:
       serviceInstanceName: xsuaa
-{{/cap.hasApprouter}}
+{{/hasApprouter}}
 srv:
   bindings:
     auth:
@@ -19,10 +19,10 @@ xsuaa:
   serviceOfferingName: xsuaa
   servicePlanName: application
   parameters:
-    xsappname: {{cap.appName}}
-    tenant-mode: {{#cap.isMultitenant}}shared{{/cap.isMultitenant}}{{^cap.isMultitenant}}dedicated{{/cap.isMultitenant}}
-{{#cap.hasApprouter}}
+    xsappname: {{appName}}
+    tenant-mode: {{#isMultitenant}}shared{{/isMultitenant}}{{^isMultitenant}}dedicated{{/isMultitenant}}
+{{#hasApprouter}}
     oauth2-configuration:
       redirect-uris:
       - https://*.<your-cluster-domain>/**
-{{/cap.hasApprouter}}
+{{/hasApprouter}}

package/lib/init/template/xsuaa/index.js

@@ -12,19 +12,23 @@ module.exports = class XsuaaTemplate extends require('../templateBase') {
         return env.requires?.auth?.kind === 'xsuaa'
     }
 
+    getRelatedFacets() {
+        return ['multitenancy', 'extensibility', 'enterprise-messaging']
+    }
+
     async run() {
         const projectDescriptor = await readProject(this.options)
-        const { configFile } = projectDescriptor.cap
-        projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.auth?.kind
+        const { configFile } = projectDescriptor
+        projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.auth?.kind
         await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor, { forceOverwrite: true })
         await this.runDependentMerging()
     }
 
     async runDependentMerging( context = {}) {
         const projectDescriptor = await readProject(this.options)
-        const { isMultitenant, isExtensible, hasMta, hasHelm, isJava, srvPath } = projectDescriptor.cap
+        const { isMultitenant, hasMta, hasHelm, isJava, srvPath } = projectDescriptor
 
-        const cds = require('../../../../lib/compile')
+        const cds = require('../../../../lib')
         const xsSecurity = await (async () => { try {
             const models = await cds.load(cds.env.folders.srv)
             return cds.compile.to.xsuaa(models)
@@ -80,20 +84,5 @@ module.exports = class XsuaaTemplate extends require('../templateBase') {
             )
             if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
-
-        // Re-applying the merging part of `cds add mtx` because cds.compile.to.xsuaa
-        // has overwritten the existing `xs-security.json`.
-        // TODO: Find a generic solution for situation like these.
-        if (isMultitenant) {
-            const MultitenancyTemplate = require(`../multitenancy`)
-            const multitenancyTemplate = new MultitenancyTemplate(this.generator)
-            await multitenancyTemplate.runDependentMerging(context)
-        }
-
-        if (isExtensible) {
-            const ExtensibilityTemplate = require(`../extensibility`)
-            const extensibilityTemplate = new ExtensibilityTemplate(this.generator)
-            await extensibilityTemplate.runDependentMerging(context)
-        }
     }
 }

package/lib/init/util/merge.js

@@ -1,6 +1,8 @@
 const YAML = require('@sap/cds-foss').yaml
 const { copy, read, write, exists } = require('../../cds').utils
 const { readYAML, writeYAML, readJSON } = require('../../util/fs')
+const { EOL } = require('node:os')
+
 
 function _isObject(item) {
   return item && typeof item === 'object' && !Array.isArray(item)
@@ -25,18 +27,35 @@ function _deepMerge(target, source) {
   return target ?? source
 }
 
-async function sortDependencies(packageJSONPath) {
-  const json = await read(packageJSONPath);
-  json.dependencies = Object.fromEntries(
-      Object.entries(json.dependencies).sort(([a],[b]) => a>b ? 1 : -1)
+async function sort(path, key) {
+  const json = await read(path)
+  json[key] = Object.fromEntries(
+      Object.entries(json[key]).sort(([a],[b]) => a>b ? 1 : -1)
   )
-  await write(packageJSONPath, json, { spaces: 2 });
+  await write(path, json, { spaces: 2 });
 }
 
+/**
+ * @param {string} into - file path to merge into
+ * @param {string | string[]} from - either path to file (string) or lines from source gitignore (string[])
+ * @returns {string[]} the lines of the updated .gitignore
+ */
+async function mergeGitignore (into, from) {
+    const source = typeof from === 'string' ? (await read(from)).split(EOL) : from
+  
+    if (typeof into === 'string' && !exists(into)) {
+      return write(into, source.join(EOL))
+    }
+  
+    const target = (await read(into)).split(EOL)
+    const enhanced = target.concat(source.filter(line => !target.includes(line)))
+    await write(into, enhanced.join(EOL))
+    return enhanced
+  }
+
 async function mergeJSON(into, from, projectDescriptor, semantics) {
     const source = typeof from === 'string' ? await readJSON(from, projectDescriptor) : from
 
-
     if (typeof into === 'string' && !exists(into)) {
         return write(into, source, { spaces: 2 })
     }
@@ -67,21 +86,21 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
         return /* has no YAML */
     }
 
-    const existenceMap = new Map, templateExistenceMap = new Map()
+    const entryMap = new Map, templateEntryMap = new Map()
 
     const { additions, overwrites, deletions, relationships } = semantics
-    additions?.forEach(existence => {
-        existenceMap.set(existence, undefined)
-        templateExistenceMap.set(existence, undefined)
+    additions?.forEach(entry => {
+        entryMap.set(entry, undefined)
+        templateEntryMap.set(entry, undefined)
     })
     deletions?.forEach(deletion => {
-        existenceMap.set(deletion.item, undefined)
+        entryMap.set(deletion.item, undefined)
     })
     relationships?.forEach(relationship => {
-        const [existence] = relationship.into
-        const [insertExistence] = relationship.insert
-        const hash = insertExistence + ' -> ' + existence
-        existenceMap.set(hash, undefined)
+        const [entry] = relationship.into
+        const [insertEntry] = relationship.insert
+        const hash = insertEntry + ' -> ' + entry
+        entryMap.set(hash, undefined)
     })
 
     let collectionStack = [target.contents]
@@ -90,8 +109,8 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
     const _getYAMLProperty = (object, keyPath) => keyPath.split('.').reduce((p, k) => p && p.get(k), object)
 
     const _validateWhere = (node, dict, index) => {
-        const _addToMap = existences => existences?.filter(existence => {
-                let where = existence.in
+        const _addToMap = entries => entries?.filter(entry => {
+                let where = entry.in
                 if (typeof where === 'string') return true // just a key path on the document root
                 else where = where[0] // a more complex list of constraints, a sequence/array is involved
                 const neededParent = dict.get(where)?.node
@@ -109,13 +128,13 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
         })
         if (additions) _addToMap(additions)
         if (deletions) _addToMap(deletions.map(deletion => deletion.item))
-        if (relationships) _addToMap(relationships?.map(({into: [existence]}) => existence).filter(e => e))
+        if (relationships) _addToMap(relationships?.map(({into: [entry]}) => entry).filter(e => e))
     }
 
     function _traverseYAMLNode(node, index, actions, templateNode) {
         let shifted = false
         if (YAML.isMap(node)) {
-            actions?.visitMap && actions.visitMap(node, index)
+            actions.visitMap?.(node, index)
             const [collection] = collectionStack
             if (YAML.isSeq(collection)) {
                 collectionStack.unshift(node)
@@ -135,7 +154,7 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
                 _traverseYAMLCollection(node, actions, templateNode)
             }
         } else if (node.value?.items || node.value && semantics.forceOverwrite) {
-            _traverseYAMLNode(node.value, index, actions, templateNode && templateNode.value)
+            _traverseYAMLNode(node.value, index, actions, templateNode?.value)
         }
 
         if (node.value?.items || shifted) {
@@ -152,11 +171,11 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
         // Map collection items to their semantic counterpart(s)
         collection.items.forEach((node, i) => {
             if (node.key) keyToIndex.set(node.key.value, i)
-            const existence = [...existenceMap.entries()].find(([,value]) => value?.node === node)
-            if (existence) {
-                const [existenceKey] = existence
-                const templateExistence = existenceKey && templateExistenceMap.get(existenceKey)
-                const templateIndex = templateExistence?.index
+            const entry = [...entryMap.entries()].find(([,value]) => value?.node === node)
+            if (entry) {
+                const [entryKey] = entry
+                const templateEntry = entryKey && templateEntryMap.get(entryKey)
+                const templateIndex = templateEntry?.index
                 if (templateIndex !== undefined) templateIndexToIndex.set(templateIndex, i)
             }
             if (!templateCollection) _traverseYAMLNode(node, i, actions)
@@ -172,7 +191,7 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
             } else if (YAML.isPair(templateNode)) {
                 const i = keyToIndex.get(templateNode.key.value)
                 const [collection] = collectionStack
-                const targetNode = collection.items && collection.items[i]
+                const targetNode = collection.items?.[i]
                 if (targetNode) {
                     _traverseYAMLNode(targetNode, templateIndex, actions, templateNode)
                 } else if (actions.mergePair) {
@@ -189,36 +208,32 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
     }
     _traverseYAMLCollection.bind(this)
 
-    // 1. Validate the existences in the template
+    // 1. Register the entries in the template
     _traverseYAMLNode(source.contents, null, {
-        visitMap: (node, index) => {
-            _validateWhere(node, templateExistenceMap, index)
-        }
+        visitMap: (node, index) => _validateWhere(node, templateEntryMap, index)
     })
 
-    // 2. Validate the existences in the project
+    // 2. Register the entries in the project
     _traverseYAMLNode(target.contents, null, {
-        visitMap: (node, index) => {
-            _validateWhere(node, existenceMap, index)
-        }
+        visitMap: (node, index) => _validateWhere(node, entryMap, index)
     })
 
-    // 3. Apply overwrites to already found existences
+    // 3. Apply overwrites to already found entries
     overwrites?.forEach(({ item, withValue }) => {
         const keyPath = Array.isArray(item) && typeof item[0] === 'string' ? item[0] : typeof item === 'string' ? item : item[1]
-        const inExistence = Array.isArray(item) && typeof item[0] === 'object' ? item[0] : typeof item === 'object' ? item : item[1]
-        const node = inExistence && existenceMap.get(inExistence) ? existenceMap.get(inExistence).node : collectionStack[collectionStack.length - 1]
+        const inEntry = Array.isArray(item) && typeof item[0] === 'object' ? item[0] : typeof item === 'object' ? item : item[1]
+        const node = inEntry && entryMap.get(inEntry) ? entryMap.get(inEntry).node : collectionStack[collectionStack.length - 1]
         const keys = keyPath.split('.')
         if (!node.getIn(keys)) return
         _getYAMLProperty(node, keys.slice(0, keys.length - 1).join('.'))
             .set(keys[keys.length - 1], withValue)
     })
 
-    // 4. Delete existences from the project (e.g. separate deployer module when adding mtx)
+    // 4. Delete entries from the project (e.g. separate deployer module when adding mtx)
     deletions?.forEach(({ item, relationships }) => {
-        const existence = existenceMap.get(item)
-        if (!existence) return
-        existence.collection.delete(existence.index)
+        const entry = entryMap.get(item)
+        if (!entry) return
+        entry.collection.delete(entry.index)
 
         relationships?.forEach(relationship => {
             const [allWithinKeyPath, inKeyPath, into] = relationship.allWithin
@@ -226,14 +241,14 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
             for (const child of parent.items) {
                 const grandchild = _getYAMLProperty(child, inKeyPath)
                 const i = grandchild?.items?.findIndex(node =>
-                    node.get(into) === _getProperty(existence.json, relationship.removeProperty)
+                    node.get(into) === _getProperty(entry.json, relationship.removeProperty)
                 ) ?? - 1
                 if (i > -1) grandchild.delete(i)
             }
         })
     })
 
-    // 5. Create missing existences and pairs
+    // 5. Create missing entries and pairs
     _traverseYAMLNode(target.contents, null, {
         mergePair: (collection, templateNode) => {
             if (YAML.isMap(collection)) {
@@ -245,8 +260,8 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
                 let [,parent] = collectionStack
                 additions?.filter(addition => {
                         if (typeof addition.in === 'string' || Array.isArray(addition.in) && typeof addition.in[0] === 'string') return true
-                        const inExistence = Array.isArray(addition.in) ? existenceMap.get(addition.in[0]) : existenceMap.get(addition.in)
-                        return inExistence?.node === parent
+                        const inEntry = Array.isArray(addition.in) ? entryMap.get(addition.in[0]) : entryMap.get(addition.in)
+                        return inEntry?.node === parent
                     })
                     .filter(addition => {
                         const keyPath = typeof addition.in === 'string' ? addition.in : Array.isArray(addition.in) && typeof addition.in[0] === 'string' ? addition.in[0] : addition.in[1]
@@ -255,20 +270,18 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
                         if (keys.length > 1) parent = collectionStack[keys.length]
                         return _getYAMLProperty(parent, keyPath) === targetNode
                     })
-                    .filter(item => !existenceMap.get(item))
+                    .filter(item => !entryMap.get(item))
                     .forEach(item => {
-                        const templateNode = templateExistenceMap.get(item).node
+                        const templateNode = templateEntryMap.get(item).node
                         item.at !== undefined ? targetNode.items.splice(item.at, 0, templateNode) : targetNode.add(templateNode)
                     })
             }
         },
     }, source.contents)
 
-    // 6. Re-validate the existences in the project
+    // 6. Re-register the entries in the project
     _traverseYAMLNode(target.contents, null, {
-        visitMap: (node, index) => {
-            _validateWhere(node, existenceMap, index)
-        }
+        visitMap: (node, index) => _validateWhere(node, entryMap, index)
     })
 
     // 7. Create missing relationships
@@ -278,22 +291,22 @@ async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
                 const targetJSON = YAML.parse(String(targetNode))
                 const relationship = semantics.relationships?.filter(r => r)
                     .find(relationship => {
-                        const [existence, keyPath] = relationship.into
-                        if (!existenceMap.get(existence)) return false
-                        const existingNode = _getYAMLProperty(existenceMap.get(existence).node, keyPath)
+                        const [entry, keyPath] = relationship.into
+                        if (!entryMap.get(entry)) return false
+                        const existingNode = _getYAMLProperty(entryMap.get(entry).node, keyPath)
                         return targetNode === existingNode
                 })
                 if (!relationship) return
 
                 const intoKey = relationship.into[relationship.into.length - 1]
-                const [existence, existenceKeyPath] = relationship.insert
-                const missingPairs = [existence]
+                const [entry, entryKeyPath] = relationship.insert
+                const missingPairs = [entry]
                     .filter(item =>
                         !targetJSON.some(targetItem =>
-                            _getProperty(existenceMap.get(item).json, existenceKeyPath) === targetItem[intoKey]
+                            _getProperty(entryMap.get(item).json, entryKeyPath) === targetItem[intoKey]
                         )
                     )
-                    .map(item => existenceMap.get(item).node.get(intoKey))
+                    .map(item => entryMap.get(item).node.get(intoKey))
                 missingPairs.forEach(pair => {
                     targetNode.add({ [intoKey]: pair })
                 })
@@ -347,7 +360,8 @@ async function removeFromYAMLArray(name, keyPath, aliasToRemove) {
 }
 
 module.exports = {
-  sortDependencies,
+  sort,
+  mergeGitignore,
   mergeJSON,
   mergeYAML,
   removeFromYAML,