@jayree/sfdx-plugin-manifest 2.7.4 → 2.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +28 -0
- package/README.md +83 -66
- package/lib/SDR-extra/utils/localGitRepo.js +1 -1
- package/lib/SDR-extra/utils/localGitRepo.js.map +1 -1
- package/lib/commands/jayree/manifest/beta/git/diff.d.ts +8 -6
- package/lib/commands/jayree/manifest/beta/git/diff.js +11 -11
- package/lib/commands/jayree/manifest/beta/git/diff.js.map +1 -1
- package/lib/commands/jayree/manifest/cleanup.d.ts +11 -9
- package/lib/commands/jayree/manifest/cleanup.js +78 -18
- package/lib/commands/jayree/manifest/cleanup.js.map +1 -1
- package/lib/commands/jayree/manifest/generate.d.ts +18 -11
- package/lib/commands/jayree/manifest/generate.js +57 -48
- package/lib/commands/jayree/manifest/generate.js.map +1 -1
- package/lib/commands/jayree/manifest/git/diff.d.ts +17 -11
- package/lib/commands/jayree/manifest/git/diff.js +479 -55
- package/lib/commands/jayree/manifest/git/diff.js.map +1 -1
- package/messages/{gitdiffbeta.md → gitdiff.md} +7 -0
- package/messages/manifestcleanup.md +21 -0
- package/messages/manifestgenerate.md +43 -0
- package/oclif.manifest.json +121 -262
- package/package.json +19 -20
- package/lib/jayreeSfdxCommand.d.ts +0 -8
- package/lib/jayreeSfdxCommand.js +0 -26
- package/lib/jayreeSfdxCommand.js.map +0 -1
- package/lib/utils/gitdiff.d.ts +0 -57
- package/lib/utils/gitdiff.js +0 -442
- package/lib/utils/gitdiff.js.map +0 -1
- package/lib/utils/manifest.d.ts +0 -1
- package/lib/utils/manifest.js +0 -66
- package/lib/utils/manifest.js.map +0 -1
- package/messages/gitdiff.json +0 -12
- package/messages/manifestcleanup.json +0 -6
- package/messages/manifestgenerate.json +0 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,31 @@
|
|
|
1
|
+
## [2.8.1](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.8.0...v2.8.1) (2023-02-03)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** bump @oclif/core from 2.0.7 to 2.0.8 ([#554](https://github.com/jayree/sfdx-plugin-manifest/issues/554)) ([f74ea1c](https://github.com/jayree/sfdx-plugin-manifest/commit/f74ea1c5853baef38287580e5b5687f77c87c20e))
|
|
7
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 7.7.6 to 7.8.0 ([#556](https://github.com/jayree/sfdx-plugin-manifest/issues/556)) ([69b7336](https://github.com/jayree/sfdx-plugin-manifest/commit/69b7336fd0ae4516d07d57d0205d9676cef1d345))
|
|
8
|
+
* **deps:** bump fast-xml-parser from 4.0.15 to 4.1.1 ([#549](https://github.com/jayree/sfdx-plugin-manifest/issues/549)) ([c8262dc](https://github.com/jayree/sfdx-plugin-manifest/commit/c8262dc72c813c798df3b0839e97df7f3f85913d))
|
|
9
|
+
|
|
10
|
+
# [2.8.0](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.7.4...v2.8.0) (2023-01-30)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* **deps:** bump @oclif/core from 1.25.0 to 2.0.7 ([6c3fae2](https://github.com/jayree/sfdx-plugin-manifest/commit/6c3fae296a8f4249f6f928e628f1883d27ea9303))
|
|
16
|
+
* **deps:** bump @salesforce/kit from 1.8.3 to 1.8.4 ([#543](https://github.com/jayree/sfdx-plugin-manifest/issues/543)) ([a42453b](https://github.com/jayree/sfdx-plugin-manifest/commit/a42453b0227c4dc1e4af87acd26df2ba734fa8d3))
|
|
17
|
+
* **deps:** bump @salesforce/sf-plugins-core from 1.22.2 to 1.22.3 ([#540](https://github.com/jayree/sfdx-plugin-manifest/issues/540)) ([da26f45](https://github.com/jayree/sfdx-plugin-manifest/commit/da26f4573c2794ba38145245e72c4519db925937))
|
|
18
|
+
* **deps:** bump @salesforce/sf-plugins-core from 1.22.3 to 2.0.1 ([980797c](https://github.com/jayree/sfdx-plugin-manifest/commit/980797cdea9406f57ff218b0959f5e79e324e703))
|
|
19
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 7.7.5 to 7.7.6 ([#544](https://github.com/jayree/sfdx-plugin-manifest/issues/544)) ([eb9db65](https://github.com/jayree/sfdx-plugin-manifest/commit/eb9db651efece7cf6db317ec280c9468fe539933))
|
|
20
|
+
* **deps:** bump @salesforce/ts-types from 1.7.2 to 1.7.3 ([#547](https://github.com/jayree/sfdx-plugin-manifest/issues/547)) ([cf5e568](https://github.com/jayree/sfdx-plugin-manifest/commit/cf5e56832450117553f5e75fcc8c7e950f0c34e1))
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
### Features
|
|
24
|
+
|
|
25
|
+
* **manifest:cleanup:** convert to new SfCommand ([9ecabda](https://github.com/jayree/sfdx-plugin-manifest/commit/9ecabda4ebcf30b3a5279e404f1190b2c20d3e38))
|
|
26
|
+
* **manifest:generate:** convert to new SfCommand ([8bfcc2a](https://github.com/jayree/sfdx-plugin-manifest/commit/8bfcc2ac7a5e3dcbe8258b7b73023ffb73ce14eb))
|
|
27
|
+
* **manifest:git:diff:** convert to new SfCommand ([fe7f913](https://github.com/jayree/sfdx-plugin-manifest/commit/fe7f9137c2fa01cd3308da179bcf3d2d6e5ab7a2))
|
|
28
|
+
|
|
1
29
|
## [2.7.4](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.7.3...v2.7.4) (2023-01-27)
|
|
2
30
|
|
|
3
31
|
|
package/README.md
CHANGED
|
@@ -32,8 +32,8 @@ USAGE
|
|
|
32
32
|
[--destructive-changes-only]
|
|
33
33
|
|
|
34
34
|
ARGUMENTS
|
|
35
|
-
REF1
|
|
36
|
-
REF2
|
|
35
|
+
REF1 Base commit or branch.
|
|
36
|
+
REF2 Commit or branch to compare to the base commit.
|
|
37
37
|
|
|
38
38
|
FLAGS
|
|
39
39
|
-d, --source-dir=<value>... Path to the local source files to include in the manifest.
|
|
@@ -99,130 +99,147 @@ FLAG DESCRIPTIONS
|
|
|
99
99
|
The location can be an absolute path or relative to the current working directory.
|
|
100
100
|
```
|
|
101
101
|
|
|
102
|
-
_See code: [src/commands/jayree/manifest/beta/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.
|
|
102
|
+
_See code: [src/commands/jayree/manifest/beta/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.8.1/src/commands/jayree/manifest/beta/git/diff.ts)_
|
|
103
103
|
|
|
104
104
|
### `sfdx jayree:manifest:cleanup`
|
|
105
105
|
|
|
106
|
-
|
|
106
|
+
Removes those tags from a manifest file that are present in a second manifest file.
|
|
107
107
|
|
|
108
108
|
```
|
|
109
109
|
USAGE
|
|
110
|
-
$ sfdx jayree:manifest:cleanup
|
|
111
|
-
trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
|
|
110
|
+
$ sfdx jayree:manifest:cleanup -f <value> [--json] [-x <value>]
|
|
112
111
|
|
|
113
112
|
FLAGS
|
|
114
|
-
-f, --file=<value>
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
--
|
|
119
|
-
this command invocation
|
|
113
|
+
-f, --file=<value> (required) Path to the second 'cleanup' manifest file.
|
|
114
|
+
-x, --manifest=<value> Path to the manifest file.
|
|
115
|
+
|
|
116
|
+
GLOBAL FLAGS
|
|
117
|
+
--json Format output as json.
|
|
120
118
|
|
|
121
119
|
DESCRIPTION
|
|
122
|
-
|
|
120
|
+
Removes those tags from a manifest file that are present in a second manifest file.
|
|
121
|
+
|
|
123
122
|
Use this command to remove components or metadata types from a manifes file.
|
|
123
|
+
|
|
124
124
|
If the 'cleanup' manifest file (--file) doesn't exist, a template file is created, which can then be modified.
|
|
125
125
|
|
|
126
126
|
EXAMPLES
|
|
127
127
|
$ sfdx jayree:manifest:cleanup --manifest=package.xml --file=packageignore.xml
|
|
128
128
|
```
|
|
129
129
|
|
|
130
|
-
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.
|
|
130
|
+
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.8.1/src/commands/jayree/manifest/cleanup.ts)_
|
|
131
131
|
|
|
132
132
|
### `sfdx jayree:manifest:generate`
|
|
133
133
|
|
|
134
|
-
|
|
134
|
+
Generate a complete manifest file form the specified org.
|
|
135
135
|
|
|
136
136
|
```
|
|
137
137
|
USAGE
|
|
138
|
-
$ sfdx jayree:manifest:generate
|
|
139
|
-
[
|
|
138
|
+
$ sfdx jayree:manifest:generate -o <value> [--json] [--api-version <value>] [-q <value>] [-c] [-w] [--include-flow-versions]
|
|
139
|
+
[-f <value>] [--exclude-managed | --exclude-all]
|
|
140
140
|
|
|
141
141
|
FLAGS
|
|
142
|
-
-
|
|
143
|
-
-
|
|
144
|
-
|
|
145
|
-
-
|
|
146
|
-
-
|
|
147
|
-
|
|
148
|
-
-
|
|
149
|
-
|
|
150
|
-
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
--
|
|
154
|
-
api requests made by this command
|
|
155
|
-
--includeflowversions include flow versions as with api
|
|
156
|
-
version 43.0
|
|
157
|
-
--json format output as json
|
|
158
|
-
--loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL) [default: warn] logging level for
|
|
159
|
-
this command invocation
|
|
142
|
+
-c, --match-case Enable 'match case' for the quickfilter.
|
|
143
|
+
-f, --file=<value> Write to 'file' instead of stdout.
|
|
144
|
+
-o, --target-org=<value> (required) Username or alias of the target org.
|
|
145
|
+
-q, --quick-filter=<value>... Metadata type, member or file path to filter on.
|
|
146
|
+
-w, --match-whole-word Enable 'match whole word' for the quickfilter.
|
|
147
|
+
--api-version=<value> Override the api version used for api requests made by this command
|
|
148
|
+
--exclude-all Exclude all packages from output.
|
|
149
|
+
--exclude-managed Exclude managed packages from output.
|
|
150
|
+
--include-flow-versions Include flow versions as with api version 43.0.
|
|
151
|
+
|
|
152
|
+
GLOBAL FLAGS
|
|
153
|
+
--json Format output as json.
|
|
160
154
|
|
|
161
155
|
DESCRIPTION
|
|
162
|
-
|
|
156
|
+
Generate a complete manifest file form the specified org.
|
|
157
|
+
|
|
163
158
|
Use this command to generate a manifest file based on an existing org.
|
|
164
159
|
|
|
165
160
|
EXAMPLES
|
|
166
161
|
$ sfdx jayree:manifest:generate --targetusername myOrg@example.com
|
|
167
|
-
|
|
168
162
|
<?xml version='1.0' encoding='UTF-8'?>
|
|
169
|
-
|
|
170
163
|
<Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
|
|
171
164
|
```
|
|
172
165
|
|
|
173
|
-
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.
|
|
166
|
+
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.8.1/src/commands/jayree/manifest/generate.ts)_
|
|
174
167
|
|
|
175
168
|
### `sfdx jayree:manifest:git:diff`
|
|
176
169
|
|
|
177
|
-
|
|
170
|
+
Create a project manifest and destructiveChanges manifest that lists the metadata components you want to deploy or delete based on changes in your git history.
|
|
178
171
|
|
|
179
172
|
```
|
|
180
173
|
USAGE
|
|
181
|
-
$ sfdx jayree:manifest:git:diff [
|
|
182
|
-
|
|
174
|
+
$ sfdx jayree:manifest:git:diff [REF1] [REF2] [--json] [-d <value>] [--output-dir <value>]
|
|
175
|
+
[--destructive-changes-only]
|
|
183
176
|
|
|
184
177
|
ARGUMENTS
|
|
185
|
-
REF1
|
|
186
|
-
REF2
|
|
178
|
+
REF1 Base commit or branch.
|
|
179
|
+
REF2 Commit or branch to compare to the base commit.
|
|
187
180
|
|
|
188
181
|
FLAGS
|
|
189
|
-
-d, --
|
|
190
|
-
|
|
191
|
-
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
--json format output as json
|
|
196
|
-
--loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL) [default: warn] logging level for
|
|
197
|
-
this command invocation
|
|
182
|
+
-d, --source-dir=<value>... Path to the local source files to include in the manifest.
|
|
183
|
+
--destructive-changes-only Create a destructiveChanges manifest only.
|
|
184
|
+
--output-dir=<value> Directory to save the created manifest files.
|
|
185
|
+
|
|
186
|
+
GLOBAL FLAGS
|
|
187
|
+
--json Format output as json.
|
|
198
188
|
|
|
199
189
|
DESCRIPTION
|
|
200
|
-
|
|
190
|
+
Create a project manifest and destructiveChanges manifest that lists the metadata components you want to deploy or
|
|
191
|
+
delete based on changes in your git history.
|
|
192
|
+
|
|
201
193
|
Use this command to create a manifest and destructiveChanges manifest file based on the difference (git diff) of two
|
|
202
194
|
git refs.
|
|
203
195
|
|
|
204
|
-
You can use all ways to spell <commit> which are valid for 'git diff'.
|
|
205
|
-
(See https://git-scm.com/docs/git-diff)
|
|
196
|
+
You can use all ways to spell <commit> which are valid for 'git diff' (See https://git-scm.com/docs/git-diff).
|
|
206
197
|
|
|
207
198
|
EXAMPLES
|
|
208
|
-
|
|
199
|
+
Uses the changes between two arbitrary <commit>.
|
|
209
200
|
|
|
210
|
-
|
|
201
|
+
$ sfdx jayree:manifest:git:diff <commit> <commit>
|
|
202
|
+
$ sfdx jayree:manifest:git:diff <commit>..<commit>
|
|
211
203
|
|
|
212
|
-
|
|
204
|
+
Uses the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both
|
|
205
|
+
<commit>.
|
|
213
206
|
|
|
214
|
-
|
|
207
|
+
$ sfdx jayree:manifest:git:diff <commit>...<commit>
|
|
215
208
|
|
|
216
|
-
|
|
209
|
+
Uses the diff of what is unique in branchB (REF2) and unique in branchA (REF1).
|
|
210
|
+
|
|
211
|
+
$ sfdx jayree:manifest:git:diff branchA..branchB
|
|
212
|
+
|
|
213
|
+
Uses the diff of what is unique in branchB (REF2).
|
|
214
|
+
|
|
215
|
+
$ sfdx jayree:manifest:git:diff branchA...branchB
|
|
216
|
+
|
|
217
|
+
Specify the flags before or after the REF args
|
|
218
|
+
|
|
219
|
+
$ sfdx jayree:manifest:git:diff --output-dir package <commit> <commit>
|
|
220
|
+
$ sfdx jayree:manifest:git:diff <commit> <commit> --output-dir package
|
|
221
|
+
|
|
222
|
+
If you specify the 'source-dir' flag before the REF args, use '--' to separate the args from the 'source-dir'
|
|
223
|
+
values.
|
|
224
|
+
|
|
225
|
+
$ sfdx jayree:manifest:git:diff --source-dir force-app -- <commit> <commit>
|
|
217
226
|
|
|
218
|
-
|
|
227
|
+
FLAG DESCRIPTIONS
|
|
228
|
+
-d, --source-dir=<value>... Path to the local source files to include in the manifest.
|
|
229
|
+
|
|
230
|
+
The supplied path can be to a single file (in which case the operation is applied to only one file) or to a folder
|
|
231
|
+
(in which case the operation is applied to all metadata types in the directory and its subdirectories).
|
|
232
|
+
|
|
233
|
+
You can specify this flag more than once.
|
|
234
|
+
|
|
235
|
+
--destructive-changes-only Create a destructiveChanges manifest only.
|
|
219
236
|
|
|
220
|
-
|
|
237
|
+
Use this flag to create a 'destructiveChanges.xml' and a blank 'package.xml'.
|
|
221
238
|
|
|
222
|
-
|
|
239
|
+
--output-dir=<value> Directory to save the created manifest files.
|
|
223
240
|
|
|
224
|
-
|
|
241
|
+
The location can be an absolute path or relative to the current working directory.
|
|
225
242
|
```
|
|
226
243
|
|
|
227
|
-
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.
|
|
244
|
+
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.8.1/src/commands/jayree/manifest/git/diff.ts)_
|
|
228
245
|
<!-- commandsstop -->
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
import util from 'util';
|
|
7
|
+
import util from 'node:util';
|
|
8
8
|
import path from 'node:path';
|
|
9
9
|
import git from 'isomorphic-git';
|
|
10
10
|
import { Lifecycle } from '@salesforce/core';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localGitRepo.js","sourceRoot":"","sources":["../../../src/SDR-extra/utils/localGitRepo.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"localGitRepo.js","sourceRoot":"","sources":["../../../src/SDR-extra/utils/localGitRepo.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { ArgInput } from '@oclif/core/lib/interfaces';
|
|
2
1
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
3
2
|
import { Optional } from '@salesforce/ts-types';
|
|
4
3
|
export interface GitDiffCommandResult {
|
|
@@ -15,13 +14,16 @@ export default class GitDiffCommand extends SfCommand<GitDiffCommandResult> {
|
|
|
15
14
|
static readonly summary: string;
|
|
16
15
|
static readonly description: string;
|
|
17
16
|
static readonly examples: string[];
|
|
18
|
-
static readonly args:
|
|
17
|
+
static readonly args: {
|
|
18
|
+
ref1: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
|
|
19
|
+
ref2: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
|
|
20
|
+
};
|
|
19
21
|
static readonly requiresProject = true;
|
|
20
22
|
static readonly flags: {
|
|
21
|
-
'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
22
|
-
'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
|
|
23
|
-
'output-dir': import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
24
|
-
'destructive-changes-only': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
23
|
+
'api-version': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
24
|
+
'source-dir': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
25
|
+
'output-dir': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
26
|
+
'destructive-changes-only': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
25
27
|
};
|
|
26
28
|
private outputDir;
|
|
27
29
|
private manifestName;
|
|
@@ -10,6 +10,7 @@ import { Messages } from '@salesforce/core';
|
|
|
10
10
|
import fs from 'fs-extra';
|
|
11
11
|
import { DestructiveChangesType } from '@salesforce/source-deploy-retrieve';
|
|
12
12
|
import { SfCommand, Flags, orgApiVersionFlagWithDeprecations, arrayWithDeprecation } from '@salesforce/sf-plugins-core';
|
|
13
|
+
import { Args } from '@oclif/core';
|
|
13
14
|
import { getString } from '@salesforce/ts-types';
|
|
14
15
|
import { ComponentSetExtra } from '../../../../../SDR-extra/index.js';
|
|
15
16
|
// eslint-disable-next-line no-underscore-dangle
|
|
@@ -17,8 +18,9 @@ const __filename = fileURLToPath(import.meta.url);
|
|
|
17
18
|
// eslint-disable-next-line no-underscore-dangle
|
|
18
19
|
const __dirname = dirname(__filename);
|
|
19
20
|
Messages.importMessagesDirectory(__dirname);
|
|
20
|
-
const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', '
|
|
21
|
+
const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'gitdiff');
|
|
21
22
|
export default class GitDiffCommand extends SfCommand {
|
|
23
|
+
// eslint-disable-next-line sf-plugin/should-parse-flags
|
|
22
24
|
async run() {
|
|
23
25
|
await this.createManifest();
|
|
24
26
|
return this.formatResult();
|
|
@@ -103,17 +105,15 @@ export default class GitDiffCommand extends SfCommand {
|
|
|
103
105
|
GitDiffCommand.summary = messages.getMessage('summary');
|
|
104
106
|
GitDiffCommand.description = messages.getMessage('description');
|
|
105
107
|
GitDiffCommand.examples = messages.getMessages('examples');
|
|
106
|
-
GitDiffCommand.args =
|
|
107
|
-
{
|
|
108
|
-
name: 'ref1',
|
|
108
|
+
GitDiffCommand.args = {
|
|
109
|
+
ref1: Args.string({
|
|
109
110
|
required: true,
|
|
110
|
-
description: '
|
|
111
|
-
},
|
|
112
|
-
{
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
];
|
|
111
|
+
description: messages.getMessage('args.ref1.description'),
|
|
112
|
+
}),
|
|
113
|
+
ref2: Args.string({
|
|
114
|
+
description: messages.getMessage('args.ref2.description'),
|
|
115
|
+
}),
|
|
116
|
+
};
|
|
117
117
|
GitDiffCommand.requiresProject = true;
|
|
118
118
|
GitDiffCommand.flags = {
|
|
119
119
|
'api-version': orgApiVersionFlagWithDeprecations,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../../src/commands/jayree/manifest/beta/git/diff.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../../src/commands/jayree/manifest/beta/git/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
static description: string;
|
|
5
|
-
static examples: string[];
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
|
+
export default class CleanupManifest extends SfCommand<void> {
|
|
3
|
+
static readonly summary: string;
|
|
4
|
+
static readonly description: string;
|
|
5
|
+
static readonly examples: string[];
|
|
6
|
+
static readonly requiresProject = true;
|
|
7
|
+
static readonly flags: {
|
|
8
|
+
manifest: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
9
|
+
file: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
10
|
+
};
|
|
10
11
|
run(): Promise<void>;
|
|
12
|
+
private cleanupManifestFile;
|
|
11
13
|
}
|
|
@@ -4,23 +4,26 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
import os from 'os';
|
|
8
7
|
import { dirname } from 'node:path';
|
|
9
8
|
import { fileURLToPath } from 'node:url';
|
|
10
|
-
import { flags } from '@salesforce/command';
|
|
11
9
|
import { Messages } from '@salesforce/core';
|
|
10
|
+
import { CLIError } from '@oclif/core/lib/parser/errors.js';
|
|
11
|
+
import chalk from 'chalk';
|
|
12
12
|
import fs from 'fs-extra';
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
13
|
+
import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
|
|
14
|
+
import { ensureArray } from '@salesforce/kit';
|
|
15
|
+
import { XMLParser, XMLBuilder } from 'fast-xml-parser';
|
|
16
|
+
import { XML_DECL, XML_NS_KEY, XML_NS_URL } from '@salesforce/source-deploy-retrieve/lib/src/common/index.js';
|
|
15
17
|
// eslint-disable-next-line no-underscore-dangle
|
|
16
18
|
const __filename = fileURLToPath(import.meta.url);
|
|
17
19
|
// eslint-disable-next-line no-underscore-dangle
|
|
18
20
|
const __dirname = dirname(__filename);
|
|
19
21
|
Messages.importMessagesDirectory(__dirname);
|
|
20
22
|
const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'manifestcleanup');
|
|
21
|
-
export default class CleanupManifest extends
|
|
23
|
+
export default class CleanupManifest extends SfCommand {
|
|
22
24
|
async run() {
|
|
23
|
-
const
|
|
25
|
+
const { flags } = await this.parse(CleanupManifest);
|
|
26
|
+
const file = flags['file'];
|
|
24
27
|
if (!(await fs.pathExists(file))) {
|
|
25
28
|
await fs.ensureFile(file);
|
|
26
29
|
await fs.writeFile(file, `<?xml version="1.0" encoding="UTF-8"?>
|
|
@@ -51,27 +54,84 @@ export default class CleanupManifest extends JayreeSfdxCommand {
|
|
|
51
54
|
<version>52.0</version>
|
|
52
55
|
</Package>
|
|
53
56
|
`);
|
|
54
|
-
this.
|
|
57
|
+
this.log(`Cleanup manifest file template '${file}' was created`);
|
|
55
58
|
}
|
|
56
59
|
else {
|
|
57
|
-
await
|
|
60
|
+
if (!(await fs.pathExists(flags['manifest']))) {
|
|
61
|
+
throw new CLIError(`The following error occurred:\n ${chalk.dim('Missing required flag manifest')}`);
|
|
62
|
+
}
|
|
63
|
+
await this.cleanupManifestFile(flags['manifest'], file);
|
|
58
64
|
}
|
|
59
65
|
return;
|
|
60
66
|
}
|
|
67
|
+
async cleanupManifestFile(manifest, ignoreManifest) {
|
|
68
|
+
const { packageTypeMembers: manifestTypeMembers, version } = parseManifest(fs.readFileSync(manifest, 'utf8'));
|
|
69
|
+
this.log(`apply '${ignoreManifest}' to '${manifest}'`);
|
|
70
|
+
const typeMap = new Map();
|
|
71
|
+
manifestTypeMembers.forEach((value) => {
|
|
72
|
+
typeMap.set(value.name, ensureArray(value.members));
|
|
73
|
+
});
|
|
74
|
+
const { packageTypeMembers: ignoreTypeMembers } = parseManifest(fs.readFileSync(ignoreManifest, 'utf8'));
|
|
75
|
+
ignoreTypeMembers.forEach((types) => {
|
|
76
|
+
if (typeMap.get(types.name)) {
|
|
77
|
+
const packageTypeMembers = ensureArray(types.members);
|
|
78
|
+
if (packageTypeMembers.includes('*') && packageTypeMembers.length > 1) {
|
|
79
|
+
const includemembers = packageTypeMembers.slice();
|
|
80
|
+
includemembers.splice(includemembers.indexOf('*'), 1);
|
|
81
|
+
const includedmembers = typeMap.get(types.name).filter((value) => includemembers.includes(value));
|
|
82
|
+
if (includedmembers.length) {
|
|
83
|
+
this.log('include only members ' + includedmembers.toString() + ' for type ' + types.name);
|
|
84
|
+
typeMap.set(types.name, includedmembers);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
if (packageTypeMembers.includes('*') && packageTypeMembers.length === 1) {
|
|
88
|
+
this.log('exclude all members for type ' + types.name);
|
|
89
|
+
typeMap.delete(types.name);
|
|
90
|
+
}
|
|
91
|
+
if (!packageTypeMembers.includes('*')) {
|
|
92
|
+
const includedmembers = typeMap.get(types.name).filter((value) => !packageTypeMembers.includes(value));
|
|
93
|
+
typeMap.set(types.name, includedmembers);
|
|
94
|
+
}
|
|
95
|
+
packageTypeMembers.forEach((member) => {
|
|
96
|
+
if (member.startsWith('!')) {
|
|
97
|
+
typeMap.get(types.name).push(member.substring(1));
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
const typeMembers = [];
|
|
103
|
+
for (const [typeName, members] of typeMap.entries()) {
|
|
104
|
+
if (members.length) {
|
|
105
|
+
typeMembers.push({ name: typeName, members });
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
await fs.writeFile(manifest, js2Manifest({ Package: { types: typeMembers, version } }));
|
|
109
|
+
}
|
|
61
110
|
}
|
|
62
|
-
CleanupManifest.
|
|
63
|
-
CleanupManifest.
|
|
64
|
-
CleanupManifest.
|
|
65
|
-
|
|
111
|
+
CleanupManifest.summary = messages.getMessage('summary');
|
|
112
|
+
CleanupManifest.description = messages.getMessage('description');
|
|
113
|
+
CleanupManifest.examples = messages.getMessages('examples');
|
|
114
|
+
CleanupManifest.requiresProject = true;
|
|
115
|
+
CleanupManifest.flags = {
|
|
116
|
+
manifest: Flags.file({
|
|
66
117
|
char: 'x',
|
|
67
|
-
|
|
118
|
+
summary: messages.getMessage('flags.manifest.summary'),
|
|
68
119
|
}),
|
|
69
|
-
file:
|
|
120
|
+
file: Flags.file({
|
|
70
121
|
char: 'f',
|
|
71
|
-
|
|
122
|
+
required: true,
|
|
123
|
+
summary: messages.getMessage('flags.file.summary'),
|
|
72
124
|
}),
|
|
73
125
|
};
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
126
|
+
function parseManifest(xmlData) {
|
|
127
|
+
const parser = new XMLParser({ stopNodes: ['version'], parseTagValue: false });
|
|
128
|
+
const { Package: { types, version }, } = parser.parse(xmlData);
|
|
129
|
+
const packageTypeMembers = ensureArray(types);
|
|
130
|
+
return { packageTypeMembers, version };
|
|
131
|
+
}
|
|
132
|
+
function js2Manifest(jsData) {
|
|
133
|
+
const js2Xml = new XMLBuilder({ format: true, indentBy: ' ', ignoreAttributes: false });
|
|
134
|
+
jsData.Package[XML_NS_KEY] = XML_NS_URL;
|
|
135
|
+
return XML_DECL.concat(js2Xml.build(jsData));
|
|
136
|
+
}
|
|
77
137
|
//# sourceMappingURL=cleanup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/cleanup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/cleanup.ts"],"names":[],"mappings":"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"}
|