sfdx-git-delta 4.9.0 → 4.12.0

package/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [4.12.0](https://github.com/scolladon/sfdx-git-delta/compare/v4.11.0...v4.12.0) (2021-12-17)
+
+
+### Features
+
+* add WaveComponent ([#220](https://github.com/scolladon/sfdx-git-delta/issues/220)) ([bcacdaa](https://github.com/scolladon/sfdx-git-delta/commit/bcacdaaa2c65675b9afbe5e8c51886528fa43c5e))
+
+
+### Bug Fixes
+
+* implement new metadata handling for Bot ([#226](https://github.com/scolladon/sfdx-git-delta/issues/226)) ([cd8267e](https://github.com/scolladon/sfdx-git-delta/commit/cd8267e4d83219aab2746b808968b6c4c8186f5b))
+
+## [4.11.0](https://github.com/scolladon/sfdx-git-delta/compare/v4.10.0...v4.11.0) (2021-11-24)
+
+
+### Features
+
+* add support for defining an --include file ([#210](https://github.com/scolladon/sfdx-git-delta/issues/210)) ([a1f2738](https://github.com/scolladon/sfdx-git-delta/commit/a1f273806c91f9d8c12f8aeabc44dd5b02247736))
+
+## [4.10.0](https://github.com/scolladon/sfdx-git-delta/compare/v4.9.1...v4.10.0) (2021-11-15)
+
+
+### Features
+
+* add CODEOWNERS and branch protection ([#204](https://github.com/scolladon/sfdx-git-delta/issues/204)) ([07ce5d6](https://github.com/scolladon/sfdx-git-delta/commit/07ce5d67a35c2028d00fabb4500c0f2dc0a71774))
+* add PlatformEventSubscriberConfig support for APIs 51 and above ([#203](https://github.com/scolladon/sfdx-git-delta/issues/203)) ([0a7a59e](https://github.com/scolladon/sfdx-git-delta/commit/0a7a59e1ddf55d1db017ac51307d6a582edb1f54))
+
+### [4.9.1](https://github.com/scolladon/sfdx-git-delta/compare/v4.9.0...v4.9.1) (2021-10-13)
+
+
+### Bug Fixes
+
+* issue when filtering same file name for different metadata ([#196](https://github.com/scolladon/sfdx-git-delta/issues/196)) ([ca7488b](https://github.com/scolladon/sfdx-git-delta/commit/ca7488b2a4c566dec3094b9f37300ba72ccfb0e8))
+
 ## [4.9.0](https://github.com/scolladon/sfdx-git-delta/compare/v4.8.1...v4.9.0) (2021-09-10)
 
 

package/README.md

@@ -1,6 +1,4 @@
-[![NPM](https://nodei.co/npm-dl/sfdx-git-delta.png)](https://nodei.co/npm/sfdx-git-delta/) [![HitCount](http://hits.dwyl.com/scolladon/sfdx-git-delta.svg)](http://hits.dwyl.com/scolladon/sfdx-git-delta)
-
-# SFDX-Git-Delta ![Actions Status](https://github.com/scolladon/sfdx-git-delta/workflows/CI/badge.svg) [![Maintainability](https://api.codeclimate.com/v1/badges/95619399c7bb2cf60da4/maintainability)](https://codeclimate.com/github/scolladon/sfdx-git-delta/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/95619399c7bb2cf60da4/test_coverage)](https://codeclimate.com/github/scolladon/sfdx-git-delta/test_coverage) [![Known Vulnerabilities](https://snyk.io//test/github/scolladon/sfdx-git-delta/badge.svg?targetFile=package.json)](https://snyk.io//test/github/scolladon/sfdx-git-delta?targetFile=package.json)
+# SFDX-Git-Delta ![Actions Status](https://github.com/scolladon/sfdx-git-delta/workflows/CI/badge.svg) [![npm](https://badgen.net/npm/v/sfdx-git-delta)](https://badgen.net/npm/v/sfdx-git-delta) [![Maintainability](https://api.codeclimate.com/v1/badges/95619399c7bb2cf60da4/maintainability)](https://codeclimate.com/github/scolladon/sfdx-git-delta/maintainability) [![Code Coverage](https://codecov.io/gh/scolladon/sfdx-git-delta/branch/master/graph/badge.svg?token=92T8XKKBHN)](https://codecov.io/gh/scolladon/sfdx-git-delta) [![Known Vulnerabilities](https://snyk.io//test/github/scolladon/sfdx-git-delta/badge.svg?targetFile=package.json)](https://snyk.io//test/github/scolladon/sfdx-git-delta?targetFile=package.json) [![downloads](https://badgen.net/npm/dw/sfdx-git-delta)](https://badgen.net/npm/dw/sfdx-git-delta)
 
 Generate the sfdx content in source format and destructive change from two git commits.
 
@@ -65,9 +63,9 @@ Pro tips: If you are in the process of building your CI/CD pipeline, make sure y
 
 ## How to install it?
 
-### Option #1 (recommended) - Install as a Salesforce CLI plugin (sgd:source:delta):
+### Install as a Salesforce CLI plugin (sgd:source:delta):
 
-You can use SGD as a Salesforce CLI plugin (`sfdx sgd:source:delta`), and this is now the recommended approach to get SGD:
+SGD is a Salesforce CLI plugin (`sfdx sgd:source:delta`). Run the following command to install it:
 
 ```sh
 sfdx plugins:install sfdx-git-delta
@@ -77,10 +75,7 @@ Because this plugin is not signed, you will get a warning saying that "This plug
 
 If you run your CI/CD jobs inside a Docker image, you can add the plugin to your image. Here is an example of a Dockerfile including the SGD plugin: https://github.com/mehdisfdc/sfdx-cli-gitlab
 
-### Option #2 (legacy) - Install as the sgd command
-
-Before the Salesforce CLI plugin was available, the old way to use this tool was through the `sgd` command (as described in the [old README](https://github.com/scolladon/sfdx-git-delta/blob/1093db6bd19eb48905db8f9aa5db086aa6707613/README.md)).
-It is now recommended to use `sfdx sgd:source:delta`, but if you feel nostalgic about the `sgd` command, you can still get it through yarn (or npm): `yarn sfdx-git-delta@latest -g`
+⚠️ The Salesforce CLI plugin is now the only supported way to install SGD. There used to be another way to install it directly through yarn or npm. The legacy `sgd` command is now deprecated and will be decommissioned soon.
 
 ### Prerequisites
 
@@ -93,25 +88,29 @@ If you encounter this issue while having installed the correct version of node o
 ## How to use it?
 
 <!-- commands -->
-* [`sfdx sgd:source:delta -f <string> [-t <string>] [-r <filepath>] [-i <filepath>] [-D <filepath>] [-s <filepath>] [-W] [-o <filepath>] [-a <number>] [-d] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-sgdsourcedelta--f-string--t-string--r-filepath--i-filepath--d-filepath--s-filepath--w--o-filepath--a-number--d---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
+* [`sfdx sgd:source:delta -f <string> [-t <string>] [-r <filepath>] [-i <filepath>] [-D <filepath>] [-s <filepath>] [-W] [-o <filepath>] [-a <number>] [-d] [-n <filepath>] [-N <filepath>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-sgdsourcedelta--f-string--t-string--r-filepath--i-filepath--d-filepath--s-filepath--w--o-filepath--a-number--d--n-filepath--n-filepath---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
 
-## `sfdx sgd:source:delta -f <string> [-t <string>] [-r <filepath>] [-i <filepath>] [-D <filepath>] [-s <filepath>] [-W] [-o <filepath>] [-a <number>] [-d] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
+## `sfdx sgd:source:delta -f <string> [-t <string>] [-r <filepath>] [-i <filepath>] [-D <filepath>] [-s <filepath>] [-W] [-o <filepath>] [-a <number>] [-d] [-n <filepath>] [-N <filepath>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
 Generate the sfdx content in source format and destructive change from two git commits
 
 ```
 USAGE
-  $ sfdx sgd:source:delta -f <string> [-t <string>] [-r <filepath>] [-i <filepath>] [-D <filepath>] [-s <filepath>] [-W] 
-  [-o <filepath>] [-a <number>] [-d] [--json] [--loglevel 
+  $ sfdx sgd:source:delta -f <string> [-t <string>] [-r <filepath>] [-i <filepath>] [-D <filepath>] [-s <filepath>] [-W]
+   [-o <filepath>] [-a <number>] [-d] [-n <filepath>] [-N <filepath>] [--json] [--loglevel 
   trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
 
 OPTIONS
-  -D, --ignore-destructive=ignore-destructive                                       ignore file to use
+  -D, --ignore-destructive=ignore-destructive                                       file listing paths to explicitly
+                                                                                    ignore for any destructive actions
+
+  -N, --include-destructive=include-destructive                                     file listing paths to explicitly
+                                                                                    include for any destructive actions
 
   -W, --ignore-whitespace                                                           ignore git diff whitespace (space,
                                                                                     tab, eol) changes
 
-  -a, --api-version=api-version                                                     [default: 52] salesforce API version
+  -a, --api-version=api-version                                                     [default: 53] salesforce API version
 
   -d, --generate-delta                                                              generate delta files in [--output]
                                                                                     folder
@@ -120,7 +119,11 @@ OPTIONS
                                                                                     diff is done [git rev-list
                                                                                     --max-parents=0 HEAD]
 
-  -i, --ignore=ignore                                                               ignore file to use
+  -i, --ignore=ignore                                                               file listing paths to explicitly
+                                                                                    ignore for any diff actions
+
+  -n, --include=include                                                             file listing paths to explicitly
+                                                                                    include for any diff actions
 
   -o, --output=output                                                               [default: ./output] source package
                                                                                     specific output
@@ -139,7 +142,7 @@ OPTIONS
                                                                                     this command invocation
 ```
 
-_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v4.9.0/src/commands/sgd/source/delta.ts)_
+_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v4.12.0/src/commands/sgd/source/delta.ts)_
 <!-- commandsstop -->
 
 ### Important note for Windows users:
@@ -288,7 +291,7 @@ and will not be used to add member in `package.xml` nor `destructiveChanges.xml`
 
 But, sometimes you may need to have two different ignore policies for generating the `package.xml` and `destructiveChanges.xml` files. This is where the `--ignore-destructive [-D]` option comes handy!
 
-Use the `--ignore-destructive` parameter to specify a dedicated ignore file to handle deletions (resulting in metadata listed in the `destructiveChanges.xml` output). In orther words, this will override the `--ignore [-i]` parameter for deleted items.
+Use the `--ignore-destructive` parameter to specify a dedicated ignore file to handle deletions (resulting in metadata listed in the `destructiveChanges.xml` output). In other words, this will override the `--ignore [-i]` parameter for deleted items.
 
 For example, consider a repository containing multiple sub-folders (force-app/main,force-app/sample, etc) and a commit deleting the Custom\_\_c object from one folder and modifying the Custom\_\_c object from another folder. This event will be treated has a Modification and a Deletion. By default, the Custom\_\_c object would appear in the `package.xml` and in `destructiveChanges.xml`, which could be a little bit inconsistent and can break the CI/CD build. This is a situation where your may want to use the `--ignore-destructive [-D]` parameter! Add the Custom\_\_c object pattern in an ignore file and pass it in the CLI parameter:
 
@@ -302,6 +305,23 @@ $ sfdx sgd:source:delta --from commit --ignore-destructive destructiveignore
 
 Note that in a situation where only the `--ignore [-i]` parameter is specified (and `--ignore-destructive [-D]` is not specified), then the plugin will ignore items matching `--ignore [-i]` parameter in all situations: Addition, Modification and Deletion.
 
+### Explicitly including specific files for inclusion or destruction regardless of diff:
+
+The `--include [-n]` parameter allows you to specify a file based on [micromatch glob matching](https://github.com/micromatch/micromatch) used to explicitly include the specific files, regardless whether they have diffed or not. Similar to the `--ignore` flag, this file defines a list of glob file matchers to indicate which `git` aware files should always be included in the `package.xml` package. Every matching the pattern from the include file specified in the `--include [-n]` will be included by SGD.
+
+As with `--ignore`, sometimes you may need to have two different include policies for generating the `package.xml` and `destructiveChanges.xml` files. This is where the `--include-destructive [-N]` option comes handy!
+
+Use the `--include-destructive` parameter to specify a dedicated include file to handle deletions (resulting in metadata listed in the `destructiveChanges.xml` output). Here, you will indicate which files explicitly should be included in the `destructiveChanges.xml`.
+
+For example, consider a repository containing multiple sub-folders (force-app/main,force-app/sample, etc) and the CI/CD platform generates a new file `force-app/generated/foo` that should not be included in the `source:deploy` command. You can create a file with a line matching this new file and specify this file using the `--include-destructive [-N]` parameter.
+
+```sh
+# destructiveinclude
+*generated/foo
+
+$ sfdx sgd:source:delta --from commit --include-destructive destructiveinclude
+
+```
 
 ### Scoping delta generation to a specific folder
 
@@ -328,7 +348,7 @@ $ tree
 $ sfdx sgd:source:delta --from commit --source force-app/unpackaged
 ```
 
->The ignored patterns specified using `--ignore [-i]` and `--ignore-destructive [-D]` still apply.
+> The ignored patterns specified using `--ignore [-i]` and `--ignore-destructive [-D]` still apply.
 
 ### Generate a comma-separated list of the added and modified Apex classes:
 
@@ -369,13 +389,14 @@ console.log(JSON.stringify(work))
  */
 ```
 
-## Built With [![dependencies Status](https://david-dm.org/scolladon/sfdx-git-delta/status.svg)](https://david-dm.org/scolladon/sfdx-git-delta) [![devDependencies Status](https://david-dm.org/scolladon/sfdx-git-delta/dev-status.svg)](https://david-dm.org/scolladon/sfdx-git-delta?type=dev)
+## Built With
 
 - [commander](https://github.com/tj/commander.js/) - The complete solution for node.js command-line interfaces, inspired by Ruby's commander.
 - [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) - Validate XML, Parse XML to JS/JSON and vise versa, or parse XML to Nimn rapidly without C/C++ based libraries and no callback
 - [fs-extra](https://github.com/jprichardson/node-fs-extra) - Node.js: extra methods for the fs object like copy(), remove(), mkdirs().
 - [ignore](https://github.com/kaelzhang/node-ignore#readme) - is a manager, filter and parser which implemented in pure JavaScript according to the .gitignore spec 2.22.1.
 - [xmlbuilder](https://github.com/oozcitak/xmlbuilder-js) - An XML builder for node.js similar to java-xmlbuilder.
+- [micromatch](https://github.com/micromatch/micromatch) - a file glob matcher utility
 
 ## Versioning
 

package/bin/cli

@@ -32,6 +32,8 @@ const options = program
   )
   .option('-r, --repo [dir]', messages.repoFlag, CliHelper.REPO_DEFAULT_VALUE)
   .option('-d, --generate-delta', messages.deltaFlag)
+  .option('-n, --include', messages.includeFlag)
+  .option('-N, --include-destructive', messages.includeDestructiveFlag)
   .parse(process.argv)
   .opts()
 

package/lib/commands/sgd/source/delta.d.ts

@@ -13,6 +13,8 @@ export default class SourceDeltaGenerate extends SfdxCommand {
         output: flags.Discriminated<flags.String>;
         'api-version': flags.Discriminated<flags.Number>;
         'generate-delta': flags.Discriminated<flags.Boolean<boolean>>;
+        include: flags.Discriminated<flags.String>;
+        'include-destructive': flags.Discriminated<flags.String>;
     };
     run(): Promise<AnyJson>;
 }

package/lib/commands/sgd/source/delta.js

@@ -32,6 +32,8 @@ class SourceDeltaGenerate extends command_1.SfdxCommand {
                 repo: this.flags.repo,
                 ignoreWhitespace: this.flags['ignore-whitespace'],
                 generateDelta: this.flags['generate-delta'],
+                include: this.flags.include,
+                includeDestructive: this.flags['include-destructive'],
             });
             output.warnings = (_a = jobResult === null || jobResult === void 0 ? void 0 : jobResult.warnings) === null || _a === void 0 ? void 0 : _a.map(warning => warning.message);
         }
@@ -93,5 +95,13 @@ SourceDeltaGenerate.flagsConfig = {
         char: 'd',
         description: messages.getMessage('deltaFlag'),
     }),
+    include: command_1.flags.filepath({
+        char: 'n',
+        description: messages.getMessage('includeFlag'),
+    }),
+    'include-destructive': command_1.flags.filepath({
+        char: 'N',
+        description: messages.getMessage('includeDestructiveFlag'),
+    }),
 };
 //# sourceMappingURL=delta.js.map

package/lib/commands/sgd/source/delta.js.map

@@ -1 +1 @@
-{"version":3,"file":"delta.js","sourceRoot":"","sources":["../../../../src/commands/sgd/source/delta.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"delta.js","sourceRoot":"","sources":["../../../../src/commands/sgd/source/delta.ts"],"names":[],"mappings":"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"}

package/lib/main.js

@@ -3,7 +3,7 @@ const PackageConstructor = require('./utils/packageConstructor');
 const TypeHandlerFactory = require('./service/typeHandlerFactory');
 const metadataManager = require('./metadata/metadataManager');
 const CLIHelper = require('./utils/cliHelper');
-const repoGitDiff = require('./utils/repoGitDiff');
+const RepoGitDiff = require('./utils/repoGitDiff');
 const fse = require('fs-extra');
 const path = require('path');
 const DESTRUCTIVE_CHANGES_FILE_NAME = 'destructiveChanges';
@@ -13,7 +13,10 @@ module.exports = config => {
     const cliHelper = new CLIHelper(config);
     cliHelper.validateConfig();
     const metadata = metadataManager.getDefinition('directoryName', config.apiVersion);
-    const lines = repoGitDiff(config, metadata);
+    const repoGitDiffHelper = new RepoGitDiff(config, metadata);
+    const filteredLines = repoGitDiffHelper.getFilteredDiff();
+    const includedLines = repoGitDiffHelper.getIncludedFiles();
+    const lines = [...filteredLines, ...includedLines];
     const work = treatDiff(config, lines, metadata);
     treatPackages(work.diffs, config, metadata);
     return work;

package/lib/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.js"],"names":[],"mappings":"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"}

package/lib/metadata/a48.json

@@ -1164,6 +1164,21 @@
         "suffix": "mlDomain",
         "xmlName": "MlDomain"
     },
+    {
+        "directoryName": "discovery",
+        "inFolder": false,
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "model",
+                "xmlName": "DiscoveryAIModel"
+            },
+            {
+                "suffix": "goal",
+                "xmlName": "DiscoveryGoal"
+            }
+        ]
+    },
     {
         "directoryName": "wave",
         "inFolder": false,
@@ -1173,6 +1188,10 @@
                 "suffix": "wapp",
                 "xmlName": "WaveApplication"
             },
+            {
+                "suffix": "wcomp",
+                "xmlName": "WaveComponent"
+            },
             {
                 "suffix": "wdf",
                 "xmlName": "WaveDataflow"
@@ -1206,22 +1225,19 @@
         "xmlName": "WaveTemplateBundle"
     },
     {
-        "childXmlNames": [
-            "BotVersion"
-        ],
-        "directoryName": "bot",
-        "inFolder": false,
-        "metaFile": false,
-        "suffix": "bot",
-        "xmlName": "Bot"
-    },
-    {
-        "directoryName": "bot.botVersions",
+        "directoryName": "bots",
         "inFolder": false,
-        "metaFile": false,
-        "parentXmlName": "Bot",
-        "xmlName": "BotVersion",
-        "xmlTag": "botVersions"
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "bot",
+                "xmlName": "Bot"
+            },
+            {
+                "suffix": "botVersion",
+                "xmlName": "BotVersion"
+            }
+        ]
     },
     {
         "directoryName": "workflows.alerts",

package/lib/metadata/v46.json

@@ -917,6 +917,21 @@
         "suffix": "mlDomain",
         "xmlName": "MlDomain"
     },
+    {
+        "directoryName": "discovery",
+        "inFolder": false,
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "model",
+                "xmlName": "DiscoveryAIModel"
+            },
+            {
+                "suffix": "goal",
+                "xmlName": "DiscoveryGoal"
+            }
+        ]
+    },
     {
         "directoryName": "wave",
         "inFolder": false,
@@ -926,6 +941,10 @@
                 "suffix": "wapp",
                 "xmlName": "WaveApplication"
             },
+            {
+                "suffix": "wcomp",
+                "xmlName": "WaveComponent"
+            },
             {
                 "suffix": "wdf",
                 "xmlName": "WaveDataflow"
@@ -959,22 +978,19 @@
         "xmlName": "WaveTemplateBundle"
     },
     {
-        "childXmlNames": [
-            "BotVersion"
-        ],
-        "directoryName": "bot",
-        "inFolder": false,
-        "metaFile": false,
-        "suffix": "bot",
-        "xmlName": "Bot"
-    },
-    {
-        "directoryName": "bot.botVersions",
+        "directoryName": "bots",
         "inFolder": false,
-        "metaFile": false,
-        "parentXmlName": "Bot",
-        "xmlName": "BotVersion",
-        "xmlTag": "botVersions"
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "bot",
+                "xmlName": "Bot"
+            },
+            {
+                "suffix": "botVersion",
+                "xmlName": "BotVersion"
+            }
+        ]
     },
     {
         "directoryName": "workflows.alerts",

package/lib/metadata/v47.json

@@ -1143,6 +1143,21 @@
         "suffix": "mlDomain",
         "xmlName": "MlDomain"
     },
+    {
+        "directoryName": "discovery",
+        "inFolder": false,
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "model",
+                "xmlName": "DiscoveryAIModel"
+            },
+            {
+                "suffix": "goal",
+                "xmlName": "DiscoveryGoal"
+            }
+        ]
+    },
     {
         "directoryName": "wave",
         "inFolder": false,
@@ -1152,6 +1167,10 @@
                 "suffix": "wapp",
                 "xmlName": "WaveApplication"
             },
+            {
+                "suffix": "wcomp",
+                "xmlName": "WaveComponent"
+            },
             {
                 "suffix": "wdf",
                 "xmlName": "WaveDataflow"
@@ -1185,22 +1204,19 @@
         "xmlName": "WaveTemplateBundle"
     },
     {
-        "childXmlNames": [
-            "BotVersion"
-        ],
-        "directoryName": "bot",
-        "inFolder": false,
-        "metaFile": false,
-        "suffix": "bot",
-        "xmlName": "Bot"
-    },
-    {
-        "directoryName": "bot.botVersions",
+        "directoryName": "bots",
         "inFolder": false,
-        "metaFile": false,
-        "parentXmlName": "Bot",
-        "xmlName": "BotVersion",
-        "xmlTag": "botVersions"
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "bot",
+                "xmlName": "Bot"
+            },
+            {
+                "suffix": "botVersion",
+                "xmlName": "BotVersion"
+            }
+        ]
     },
     {
         "directoryName": "workflows.alerts",

package/lib/metadata/v49.json

@@ -1157,6 +1157,21 @@
         "suffix": "mlDomain",
         "xmlName": "MlDomain"
     },
+    {
+        "directoryName": "discovery",
+        "inFolder": false,
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "model",
+                "xmlName": "DiscoveryAIModel"
+            },
+            {
+                "suffix": "goal",
+                "xmlName": "DiscoveryGoal"
+            }
+        ]
+    },
     {
         "directoryName": "wave",
         "inFolder": false,
@@ -1166,6 +1181,10 @@
                 "suffix": "wapp",
                 "xmlName": "WaveApplication"
             },
+            {
+                "suffix": "wcomp",
+                "xmlName": "WaveComponent"
+            },
             {
                 "suffix": "wdf",
                 "xmlName": "WaveDataflow"
@@ -1199,22 +1218,19 @@
         "xmlName": "WaveTemplateBundle"
     },
     {
-        "childXmlNames": [
-            "BotVersion"
-        ],
-        "directoryName": "bot",
-        "inFolder": false,
-        "metaFile": false,
-        "suffix": "bot",
-        "xmlName": "Bot"
-    },
-    {
-        "directoryName": "bot.botVersions",
+        "directoryName": "bots",
         "inFolder": false,
-        "metaFile": false,
-        "parentXmlName": "Bot",
-        "xmlName": "BotVersion",
-        "xmlTag": "botVersions"
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "bot",
+                "xmlName": "Bot"
+            },
+            {
+                "suffix": "botVersion",
+                "xmlName": "BotVersion"
+            }
+        ]
     },
     {
         "directoryName": "workflows.alerts",

package/lib/metadata/v50.json

@@ -1157,6 +1157,21 @@
         "suffix": "mlDomain",
         "xmlName": "MlDomain"
     },
+    {
+        "directoryName": "discovery",
+        "inFolder": false,
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "model",
+                "xmlName": "DiscoveryAIModel"
+            },
+            {
+                "suffix": "goal",
+                "xmlName": "DiscoveryGoal"
+            }
+        ]
+    },
     {
         "directoryName": "wave",
         "inFolder": false,
@@ -1166,6 +1181,10 @@
                 "suffix": "wapp",
                 "xmlName": "WaveApplication"
             },
+            {
+                "suffix": "wcomp",
+                "xmlName": "WaveComponent"
+            },
             {
                 "suffix": "wdf",
                 "xmlName": "WaveDataflow"
@@ -1199,22 +1218,19 @@
         "xmlName": "WaveTemplateBundle"
     },
     {
-        "childXmlNames": [
-            "BotVersion"
-        ],
-        "directoryName": "bot",
-        "inFolder": false,
-        "metaFile": false,
-        "suffix": "bot",
-        "xmlName": "Bot"
-    },
-    {
-        "directoryName": "bot.botVersions",
+        "directoryName": "bots",
         "inFolder": false,
-        "metaFile": false,
-        "parentXmlName": "Bot",
-        "xmlName": "BotVersion",
-        "xmlTag": "botVersions"
+        "metaFile": true,
+        "content": [
+            {
+                "suffix": "bot",
+                "xmlName": "Bot"
+            },
+            {
+                "suffix": "botVersion",
+                "xmlName": "BotVersion"
+            }
+        ]
     },
     {
         "directoryName": "workflows.alerts",