@jayree/sfdx-plugin-manifest 2.2.10 → 2.3.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +30 -0
- package/LICENSE.txt +2 -2
- package/README.md +4 -4
- package/lib/commands/jayree/manifest/cleanup.d.ts +1 -1
- package/lib/commands/jayree/manifest/cleanup.js +13 -16
- package/lib/commands/jayree/manifest/cleanup.js.map +1 -1
- package/lib/commands/jayree/manifest/generate.d.ts +2 -2
- package/lib/commands/jayree/manifest/generate.js +21 -24
- package/lib/commands/jayree/manifest/generate.js.map +1 -1
- package/lib/commands/jayree/manifest/git/diff.d.ts +1 -1
- package/lib/commands/jayree/manifest/git/diff.js +40 -51
- package/lib/commands/jayree/manifest/git/diff.js.map +1 -1
- package/lib/hooks/changelog.js +19 -23
- package/lib/hooks/changelog.js.map +1 -1
- package/lib/index.js +2 -4
- package/lib/index.js.map +1 -1
- package/lib/jayreeSfdxCommand.js +5 -9
- package/lib/jayreeSfdxCommand.js.map +1 -1
- package/lib/utils/gitdiff.d.ts +2 -2
- package/lib/utils/gitdiff.js +61 -76
- package/lib/utils/gitdiff.js.map +1 -1
- package/lib/utils/manifest.js +19 -27
- package/lib/utils/manifest.js.map +1 -1
- package/messages/gitdiff.json +11 -0
- package/oclif.manifest.json +1 -1
- package/package.json +28 -27
- package/messages/gitdiff.js +0 -20
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,33 @@
|
|
|
1
|
+
## [2.3.1](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.3.0...v2.3.1) (2022-09-21)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** bump @oclif/core from 1.16.1 to 1.16.3 ([216b626](https://github.com/jayree/sfdx-plugin-manifest/commit/216b626492407f3ed28a67de73513eb9dac81d1e))
|
|
7
|
+
* **deps:** bump @salesforce/kit from 1.6.0 to 1.6.1 ([b0605fe](https://github.com/jayree/sfdx-plugin-manifest/commit/b0605fea7239cf808d17effec9f2452514262610))
|
|
8
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 6.7.0 to 6.8.0 ([7c9bfca](https://github.com/jayree/sfdx-plugin-manifest/commit/7c9bfcaa3d91f9294577589ff3b7b1c4681200fc))
|
|
9
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 6.8.0 to 6.8.1 ([52486bd](https://github.com/jayree/sfdx-plugin-manifest/commit/52486bd6d37cbef4b81bb80d6cdb2c17dd400c94))
|
|
10
|
+
* **deps:** bump @salesforce/ts-types from 1.5.20 to 1.5.21 ([a94fc4f](https://github.com/jayree/sfdx-plugin-manifest/commit/a94fc4f2daa84cedfe30b97f85150b07c3fdbdc1))
|
|
11
|
+
* **deps:** bump fast-xml-parser from 4.0.9 to 4.0.10 ([360bf42](https://github.com/jayree/sfdx-plugin-manifest/commit/360bf42440db0433489daf52aa64e39fa1df7a7b))
|
|
12
|
+
|
|
13
|
+
# [2.3.0](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.2.10...v2.3.0) (2022-09-08)
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
### Bug Fixes
|
|
17
|
+
|
|
18
|
+
* **deps:** bump @oclif/core from 1.13.10 to 1.16.0 ([c4b4bec](https://github.com/jayree/sfdx-plugin-manifest/commit/c4b4bec2c97d6857b2c1c8bbc3648fd15ac4aae9))
|
|
19
|
+
* **deps:** bump @oclif/core from 1.16.0 to 1.16.1 ([e8c8488](https://github.com/jayree/sfdx-plugin-manifest/commit/e8c848876f1371d8ee36fdeaf6c738c7e009b0ac))
|
|
20
|
+
* **deps:** bump @salesforce/kit from 1.5.45 to 1.6.0 ([712f64b](https://github.com/jayree/sfdx-plugin-manifest/commit/712f64ba1dc7f858419072ab0933428936e37856))
|
|
21
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 6.3.0 to 6.5.0 ([9c5ce03](https://github.com/jayree/sfdx-plugin-manifest/commit/9c5ce030017497b89e13301af86ce427d807dd21))
|
|
22
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 6.5.0 to 6.7.0 ([95f721e](https://github.com/jayree/sfdx-plugin-manifest/commit/95f721e3f834408fd1b85b7354e065bb3d0d528c))
|
|
23
|
+
* **deps:** bump isomorphic-git from 1.19.1 to 1.21.0 ([9eae30d](https://github.com/jayree/sfdx-plugin-manifest/commit/9eae30d028bce8e3ea70ada4d9c4a1c7f9402a05))
|
|
24
|
+
* **deps:** bump listr2 from 5.0.2 to 5.0.5 ([7462e79](https://github.com/jayree/sfdx-plugin-manifest/commit/7462e79356ea670a8848c89e7fc5e4bec34a0058))
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
### Features
|
|
28
|
+
|
|
29
|
+
* move to ESM ([6eb55f1](https://github.com/jayree/sfdx-plugin-manifest/commit/6eb55f18522515ca0a20fae00824bd8d8a7b3818))
|
|
30
|
+
|
|
1
31
|
## [2.2.10](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.2.9...v2.2.10) (2022-08-11)
|
|
2
32
|
|
|
3
33
|
|
package/LICENSE.txt
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
Copyright (c)
|
|
1
|
+
Copyright (c) 2022, jayree
|
|
2
2
|
All rights reserved.
|
|
3
3
|
|
|
4
4
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
@@ -9,4 +9,4 @@ Redistribution and use in source and binary forms, with or without modification,
|
|
|
9
9
|
|
|
10
10
|
* Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
|
11
11
|
|
|
12
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
12
|
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
package/README.md
CHANGED
|
@@ -22,7 +22,7 @@ $ sfdx plugins:install @jayree/sfdx-plugin-manifest
|
|
|
22
22
|
$ sfdx jayree:[COMMAND]
|
|
23
23
|
running command...
|
|
24
24
|
$ sfdx plugins
|
|
25
|
-
@jayree/sfdx-plugin-manifest 2.
|
|
25
|
+
@jayree/sfdx-plugin-manifest 2.3.1
|
|
26
26
|
$ sfdx help jayree:[COMMAND]
|
|
27
27
|
USAGE
|
|
28
28
|
$ sfdx jayree:COMMAND
|
|
@@ -65,7 +65,7 @@ EXAMPLES
|
|
|
65
65
|
$ sfdx jayree:manifest:cleanup --manifest=package.xml --file=packageignore.xml
|
|
66
66
|
```
|
|
67
67
|
|
|
68
|
-
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.
|
|
68
|
+
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.3.1/src/commands/jayree/manifest/cleanup.ts)_
|
|
69
69
|
|
|
70
70
|
### `sfdx jayree:manifest:generate`
|
|
71
71
|
|
|
@@ -109,7 +109,7 @@ EXAMPLES
|
|
|
109
109
|
<Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
|
|
110
110
|
```
|
|
111
111
|
|
|
112
|
-
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.
|
|
112
|
+
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.3.1/src/commands/jayree/manifest/generate.ts)_
|
|
113
113
|
|
|
114
114
|
### `sfdx jayree:manifest:git:diff`
|
|
115
115
|
|
|
@@ -163,5 +163,5 @@ EXAMPLES
|
|
|
163
163
|
uses the diff of what is unique in branchB (REF2)
|
|
164
164
|
```
|
|
165
165
|
|
|
166
|
-
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.
|
|
166
|
+
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.3.1/src/commands/jayree/manifest/git/diff.ts)_
|
|
167
167
|
<!-- commandsstop -->
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FlagsConfig } from '@salesforce/command';
|
|
2
2
|
import { AnyJson } from '@salesforce/ts-types';
|
|
3
|
-
import { JayreeSfdxCommand } from '../../../jayreeSfdxCommand';
|
|
3
|
+
import { JayreeSfdxCommand } from '../../../jayreeSfdxCommand.js';
|
|
4
4
|
export default class CleanupManifest extends JayreeSfdxCommand {
|
|
5
5
|
static description: string;
|
|
6
6
|
static examples: string[];
|
|
@@ -1,20 +1,18 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
/*
|
|
4
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2022, jayree
|
|
5
3
|
* All rights reserved.
|
|
6
4
|
* Licensed under the BSD 3-Clause license.
|
|
7
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
8
6
|
*/
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const messages =
|
|
17
|
-
class CleanupManifest extends
|
|
7
|
+
import os from 'os';
|
|
8
|
+
import { flags } from '@salesforce/command';
|
|
9
|
+
import { Messages } from '@salesforce/core';
|
|
10
|
+
import fs from 'fs-extra';
|
|
11
|
+
import { JayreeSfdxCommand } from '../../../jayreeSfdxCommand.js';
|
|
12
|
+
import { cleanupManifestFile } from '../../../utils/manifest.js';
|
|
13
|
+
Messages.importMessagesDirectory(new URL('./', import.meta.url).pathname);
|
|
14
|
+
const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'manifestcleanup');
|
|
15
|
+
export default class CleanupManifest extends JayreeSfdxCommand {
|
|
18
16
|
async run() {
|
|
19
17
|
const file = this.getFlag('file');
|
|
20
18
|
if (!(await fs.pathExists(file))) {
|
|
@@ -50,20 +48,19 @@ class CleanupManifest extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
50
48
|
this.ux.log(`Cleanup manifest file template '${file}' was created`);
|
|
51
49
|
}
|
|
52
50
|
else {
|
|
53
|
-
await
|
|
51
|
+
await cleanupManifestFile(this.getFlag('manifest'), file);
|
|
54
52
|
}
|
|
55
53
|
return {};
|
|
56
54
|
}
|
|
57
55
|
}
|
|
58
|
-
exports.default = CleanupManifest;
|
|
59
56
|
CleanupManifest.description = messages.getMessage('commandDescription');
|
|
60
57
|
CleanupManifest.examples = messages.getMessage('examples').split(os.EOL);
|
|
61
58
|
CleanupManifest.flagsConfig = {
|
|
62
|
-
manifest:
|
|
59
|
+
manifest: flags.filepath({
|
|
63
60
|
char: 'x',
|
|
64
61
|
description: messages.getMessage('manifestFlagDescription'),
|
|
65
62
|
}),
|
|
66
|
-
file:
|
|
63
|
+
file: flags.filepath({
|
|
67
64
|
char: 'f',
|
|
68
65
|
description: messages.getMessage('fileFlagDescription'),
|
|
69
66
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/cleanup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/cleanup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,KAAK,EAAe,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,QAAQ,CAAC,uBAAuB,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;AAE1E,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,iBAAiB,CAAC,CAAC;AAE1F,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,iBAAiB;IAoBrD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAS,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;YAChC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,EAAE,CAAC,SAAS,CAChB,IAAI,EACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BP,CACM,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,mCAAmC,IAAI,eAAe,CAAC,CAAC;SACrE;aAAM;YACL,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAS,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;SACnE;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;;AA3Da,2BAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAExD,wBAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AAEtD,2BAAW,GAAgB;IAC1C,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;QACvB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;KAC5D,CAAC;IACF,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;KACxD,CAAC;CACH,CAAC;AAEe,gCAAgB,GAAG,KAAK,CAAC;AACzB,sCAAsB,GAAG,KAAK,CAAC;AAC/B,+BAAe,GAAG,IAAI,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { FlagsConfig } from '@salesforce/command';
|
|
2
|
-
import { FileProperties, ListMetadataQuery } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
|
|
2
|
+
import { FileProperties, ListMetadataQuery } from '@salesforce/source-deploy-retrieve/lib/src/client/types.js';
|
|
3
3
|
import { Connection } from '@salesforce/core';
|
|
4
4
|
import { PackageManifestObject } from '@salesforce/source-deploy-retrieve';
|
|
5
|
-
import { JayreeSfdxCommand } from '../../../jayreeSfdxCommand';
|
|
5
|
+
import { JayreeSfdxCommand } from '../../../jayreeSfdxCommand.js';
|
|
6
6
|
export interface QueryResult {
|
|
7
7
|
size: number;
|
|
8
8
|
totalSize: number;
|
|
@@ -1,22 +1,20 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
/*
|
|
4
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2022, jayree
|
|
5
3
|
* All rights reserved.
|
|
6
4
|
* Licensed under the BSD 3-Clause license.
|
|
7
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
8
6
|
*/
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const registryAccess = new
|
|
17
|
-
|
|
18
|
-
const messages =
|
|
19
|
-
class GeneratePackageXML extends
|
|
7
|
+
import os from 'os';
|
|
8
|
+
import { flags } from '@salesforce/command';
|
|
9
|
+
import { Messages } from '@salesforce/core';
|
|
10
|
+
import { RegistryAccess, ComponentSet } from '@salesforce/source-deploy-retrieve';
|
|
11
|
+
import { ensureArray } from '@salesforce/kit';
|
|
12
|
+
import fs from 'fs-extra';
|
|
13
|
+
import { JayreeSfdxCommand } from '../../../jayreeSfdxCommand.js';
|
|
14
|
+
const registryAccess = new RegistryAccess();
|
|
15
|
+
Messages.importMessagesDirectory(new URL('./', import.meta.url).pathname);
|
|
16
|
+
const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'manifestgenerate');
|
|
17
|
+
export default class GeneratePackageXML extends JayreeSfdxCommand {
|
|
20
18
|
// eslint-disable-next-line complexity
|
|
21
19
|
async run() {
|
|
22
20
|
await this.org.refreshAuth();
|
|
@@ -33,7 +31,7 @@ class GeneratePackageXML extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
33
31
|
((component.namespacePrefix &&
|
|
34
32
|
(all.includes(component.manageableState) || component.manageableState === undefined)) ||
|
|
35
33
|
all.includes(component.manageableState))));
|
|
36
|
-
let componentSet = await
|
|
34
|
+
let componentSet = await ComponentSet.fromConnection({
|
|
37
35
|
usernameOrConnection: this.cacheConnection,
|
|
38
36
|
componentFilter,
|
|
39
37
|
});
|
|
@@ -98,7 +96,7 @@ class GeneratePackageXML extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
98
96
|
if (!apiVersion) {
|
|
99
97
|
apiVersion = this.cacheConnection.getApiVersion();
|
|
100
98
|
}
|
|
101
|
-
members = (
|
|
99
|
+
members = ensureArray((await this.cacheConnection.metadata.list(query, apiVersion)));
|
|
102
100
|
}
|
|
103
101
|
catch (error) {
|
|
104
102
|
members = [];
|
|
@@ -107,35 +105,34 @@ class GeneratePackageXML extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
107
105
|
return members;
|
|
108
106
|
}
|
|
109
107
|
}
|
|
110
|
-
exports.default = GeneratePackageXML;
|
|
111
108
|
GeneratePackageXML.description = messages.getMessage('commandDescription');
|
|
112
109
|
GeneratePackageXML.examples = messages.getMessage('examples').split(os.EOL);
|
|
113
110
|
GeneratePackageXML.flagsConfig = {
|
|
114
|
-
quickfilter:
|
|
111
|
+
quickfilter: flags.array({
|
|
115
112
|
char: 'q',
|
|
116
113
|
description: messages.getMessage('quickfilterFlagDescription'),
|
|
117
114
|
}),
|
|
118
|
-
matchcase:
|
|
115
|
+
matchcase: flags.boolean({
|
|
119
116
|
char: 'c',
|
|
120
117
|
description: messages.getMessage('matchCaseFlagDescription'),
|
|
121
118
|
}),
|
|
122
|
-
matchwholeword:
|
|
119
|
+
matchwholeword: flags.boolean({
|
|
123
120
|
char: 'w',
|
|
124
121
|
description: messages.getMessage('matchWholeWordFlagDescription'),
|
|
125
122
|
}),
|
|
126
|
-
includeflowversions:
|
|
123
|
+
includeflowversions: flags.boolean({
|
|
127
124
|
description: messages.getMessage('includeflowversionsDescription'),
|
|
128
125
|
}),
|
|
129
|
-
file:
|
|
126
|
+
file: flags.string({
|
|
130
127
|
char: 'f',
|
|
131
128
|
description: messages.getMessage('fileFlagDescription'),
|
|
132
129
|
}),
|
|
133
|
-
excludemanaged:
|
|
130
|
+
excludemanaged: flags.boolean({
|
|
134
131
|
char: 'x',
|
|
135
132
|
description: messages.getMessage('excludeManagedFlagDescription'),
|
|
136
133
|
exclusive: ['excludeall'],
|
|
137
134
|
}),
|
|
138
|
-
excludeall:
|
|
135
|
+
excludeall: flags.boolean({
|
|
139
136
|
char: 'a',
|
|
140
137
|
description: messages.getMessage('excludeAllFlagDescription'),
|
|
141
138
|
exclusive: ['excludemanaged'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/generate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ArgInput } from '@oclif/core/lib/interfaces';
|
|
2
2
|
import { FlagsConfig } from '@salesforce/command';
|
|
3
3
|
import { AnyJson } from '@salesforce/ts-types';
|
|
4
|
-
import { JayreeSfdxCommand } from '../../../../jayreeSfdxCommand';
|
|
4
|
+
import { JayreeSfdxCommand } from '../../../../jayreeSfdxCommand.js';
|
|
5
5
|
export default class GitDiff extends JayreeSfdxCommand {
|
|
6
6
|
static description: string;
|
|
7
7
|
static examples: string[];
|
|
@@ -1,32 +1,22 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
/*
|
|
4
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2022, jayree
|
|
5
3
|
* All rights reserved.
|
|
6
4
|
* Licensed under the BSD 3-Clause license.
|
|
7
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
8
6
|
*/
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const messages =
|
|
21
|
-
const logger = new
|
|
22
|
-
// workaround until listr2 can catch emitWarnings with v4.0
|
|
23
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
24
|
-
const original = process.emitWarning;
|
|
25
|
-
process.emitWarning = (warning) => {
|
|
26
|
-
process.once('beforeExit', () => {
|
|
27
|
-
return original(warning);
|
|
28
|
-
});
|
|
29
|
-
};
|
|
7
|
+
import os from 'os';
|
|
8
|
+
import { join, dirname, relative } from 'path';
|
|
9
|
+
import { flags } from '@salesforce/command';
|
|
10
|
+
import { Messages } from '@salesforce/core';
|
|
11
|
+
import fs from 'fs-extra';
|
|
12
|
+
import { Logger, Listr } from 'listr2';
|
|
13
|
+
import kit from '@salesforce/kit';
|
|
14
|
+
import { NodeFSTreeContainer, DestructiveChangesType, } from '@salesforce/source-deploy-retrieve';
|
|
15
|
+
import { JayreeSfdxCommand } from '../../../../jayreeSfdxCommand.js';
|
|
16
|
+
import { getGitResults, createVirtualTreeContainer, fixComponentSetChilds, getGitDiff, debug, ensureOSPath, getGitArgsFromArgv, } from '../../../../utils/gitdiff.js';
|
|
17
|
+
Messages.importMessagesDirectory(new URL('./', import.meta.url).pathname);
|
|
18
|
+
const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'gitdiff');
|
|
19
|
+
const logger = new Logger({ useIcons: false });
|
|
30
20
|
// eslint-disable-next-line @typescript-eslint/require-await
|
|
31
21
|
const unexpectedArgument = async (input) => {
|
|
32
22
|
if (input.includes('-')) {
|
|
@@ -35,25 +25,25 @@ const unexpectedArgument = async (input) => {
|
|
|
35
25
|
}
|
|
36
26
|
return input;
|
|
37
27
|
};
|
|
38
|
-
class GitDiff extends
|
|
28
|
+
export default class GitDiff extends JayreeSfdxCommand {
|
|
39
29
|
async run() {
|
|
40
30
|
this.destructiveChangesOnly = this.getFlag('destructivechangesonly');
|
|
41
31
|
this.outputDir = this.getFlag('outputdir');
|
|
42
32
|
this.projectRoot = this.project.getPath();
|
|
43
|
-
this.sfdxProjectFolders = this.project.getPackageDirectories().map((p) =>
|
|
33
|
+
this.sfdxProjectFolders = this.project.getPackageDirectories().map((p) => ensureOSPath(p.path));
|
|
44
34
|
this.sourceApiVersion = (await this.project.retrieveSfProjectJson()).getContents().sourceApiVersion;
|
|
45
|
-
this.destructiveChanges =
|
|
46
|
-
this.manifest =
|
|
47
|
-
|
|
35
|
+
this.destructiveChanges = join(this.projectRoot, this.outputDir, 'destructiveChanges.xml');
|
|
36
|
+
this.manifest = join(this.projectRoot, this.outputDir, 'package.xml');
|
|
37
|
+
debug({
|
|
48
38
|
outputDir: this.outputDir,
|
|
49
39
|
projectRoot: this.projectRoot,
|
|
50
40
|
sfdxProjectFolders: this.sfdxProjectFolders,
|
|
51
41
|
});
|
|
52
42
|
const isContentTypeJSON = kit.env.getString('SFDX_CONTENT_TYPE', '').toUpperCase() === 'JSON';
|
|
53
43
|
this.isOutputEnabled = !(process.argv.find((arg) => arg === '--json') || isContentTypeJSON);
|
|
54
|
-
const gitArgs = await
|
|
55
|
-
|
|
56
|
-
const tasks = new
|
|
44
|
+
const gitArgs = await getGitArgsFromArgv(this.args.ref1, this.args.ref2, this.argv, this.projectRoot);
|
|
45
|
+
debug({ gitArgs });
|
|
46
|
+
const tasks = new Listr([
|
|
57
47
|
{
|
|
58
48
|
title: 'Analyze sfdx-project',
|
|
59
49
|
task: (ctx, task) => {
|
|
@@ -64,7 +54,7 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
64
54
|
{
|
|
65
55
|
title: `Execute 'git --no-pager diff --name-status --no-renames ${gitArgs.refString}'`,
|
|
66
56
|
task: async (ctx, task) => {
|
|
67
|
-
this.gitLines = await
|
|
57
|
+
this.gitLines = await getGitDiff(this.sfdxProjectFolders, gitArgs.ref1, gitArgs.ref2, this.projectRoot);
|
|
68
58
|
task.output = `Changed files: ${this.gitLines.length}`;
|
|
69
59
|
},
|
|
70
60
|
options: { persistentOutput: true },
|
|
@@ -76,7 +66,7 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
76
66
|
{
|
|
77
67
|
title: `ref1: ${gitArgs.ref1}`,
|
|
78
68
|
task: async () => {
|
|
79
|
-
this.ref1VirtualTreeContainer = await
|
|
69
|
+
this.ref1VirtualTreeContainer = await createVirtualTreeContainer(gitArgs.ref1, this.projectRoot, this.gitLines.filter((l) => l.status === 'M').map((l) => l.path));
|
|
80
70
|
},
|
|
81
71
|
},
|
|
82
72
|
{
|
|
@@ -84,8 +74,8 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
84
74
|
task: async () => {
|
|
85
75
|
this.ref2VirtualTreeContainer =
|
|
86
76
|
gitArgs.ref2 !== ''
|
|
87
|
-
? await
|
|
88
|
-
: new
|
|
77
|
+
? await createVirtualTreeContainer(gitArgs.ref2, this.projectRoot, this.gitLines.filter((l) => l.status === 'M').map((l) => l.path))
|
|
78
|
+
: new NodeFSTreeContainer();
|
|
89
79
|
},
|
|
90
80
|
},
|
|
91
81
|
], { concurrent: true }),
|
|
@@ -94,11 +84,11 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
94
84
|
title: 'Analyze git diff results',
|
|
95
85
|
skip: () => !this.gitLines.length,
|
|
96
86
|
task: async (ctx, task) => {
|
|
97
|
-
const { manifest, output } = await
|
|
87
|
+
const { manifest, output } = await getGitResults(this.gitLines, this.ref1VirtualTreeContainer, this.ref2VirtualTreeContainer, this.destructiveChangesOnly);
|
|
98
88
|
task.output = `Added: ${output.counts.added}, Deleted: ${output.counts.deleted}, Modified: ${output.counts.modified}, Unchanged: ${output.counts.unchanged}, Ignored: ${output.counts.ignored}${output.counts.error ? `, Errors: ${output.counts.error}` : ''}`;
|
|
99
89
|
this.outputErrors = output.errors;
|
|
100
|
-
|
|
101
|
-
this.componentSet =
|
|
90
|
+
debug({ manifest });
|
|
91
|
+
this.componentSet = fixComponentSetChilds(manifest);
|
|
102
92
|
this.componentSet.sourceApiVersion = this.sourceApiVersion;
|
|
103
93
|
},
|
|
104
94
|
options: { persistentOutput: true },
|
|
@@ -107,7 +97,7 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
107
97
|
// title: 'Error output',
|
|
108
98
|
skip: () => !this.outputErrors?.length,
|
|
109
99
|
task: (ctx, task) => {
|
|
110
|
-
|
|
100
|
+
debug({ errors: this.outputErrors });
|
|
111
101
|
const moreErrors = this.outputErrors.splice(5);
|
|
112
102
|
for (const message of this.outputErrors) {
|
|
113
103
|
task.output = `Error: ${message}`;
|
|
@@ -121,19 +111,19 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
121
111
|
skip: () => !this.componentSet?.size,
|
|
122
112
|
task: (ctx, task) => task.newListr([
|
|
123
113
|
{
|
|
124
|
-
title:
|
|
114
|
+
title: relative(this.projectRoot, this.manifest),
|
|
125
115
|
task: async () => {
|
|
126
|
-
await fs.ensureDir(
|
|
116
|
+
await fs.ensureDir(dirname(this.manifest));
|
|
127
117
|
await fs.writeFile(this.manifest, await this.componentSet.getPackageXml());
|
|
128
118
|
},
|
|
129
119
|
options: { persistentOutput: true },
|
|
130
120
|
},
|
|
131
121
|
{
|
|
132
|
-
title:
|
|
122
|
+
title: relative(this.projectRoot, this.destructiveChanges),
|
|
133
123
|
skip: () => !this.componentSet.getTypesOfDestructiveChanges().length,
|
|
134
124
|
task: async () => {
|
|
135
|
-
await fs.ensureDir(
|
|
136
|
-
await fs.writeFile(this.destructiveChanges, await this.componentSet.getPackageXml(undefined,
|
|
125
|
+
await fs.ensureDir(dirname(this.destructiveChanges));
|
|
126
|
+
await fs.writeFile(this.destructiveChanges, await this.componentSet.getPackageXml(undefined, DestructiveChangesType.POST));
|
|
137
127
|
},
|
|
138
128
|
options: { persistentOutput: true },
|
|
139
129
|
},
|
|
@@ -142,24 +132,23 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
142
132
|
], {
|
|
143
133
|
rendererOptions: { showTimer: true, collapse: false, lazy: true, collapseErrors: false },
|
|
144
134
|
rendererSilent: !this.isOutputEnabled,
|
|
145
|
-
rendererFallback:
|
|
135
|
+
rendererFallback: debug.enabled,
|
|
146
136
|
});
|
|
147
137
|
try {
|
|
148
138
|
await tasks.run();
|
|
149
139
|
return {
|
|
150
|
-
destructiveChanges: this.componentSet?.getObject(
|
|
140
|
+
destructiveChanges: this.componentSet?.getObject(DestructiveChangesType.POST),
|
|
151
141
|
manifest: this.componentSet?.getObject(),
|
|
152
142
|
};
|
|
153
143
|
}
|
|
154
144
|
catch (e) {
|
|
155
|
-
if (
|
|
145
|
+
if (debug.enabled && this.isOutputEnabled) {
|
|
156
146
|
logger.fail(e.message);
|
|
157
147
|
}
|
|
158
148
|
throw e;
|
|
159
149
|
}
|
|
160
150
|
}
|
|
161
151
|
}
|
|
162
|
-
exports.default = GitDiff;
|
|
163
152
|
GitDiff.description = messages.getMessage('commandDescription');
|
|
164
153
|
GitDiff.examples = messages.getMessage('examples').split(os.EOL);
|
|
165
154
|
GitDiff.args = [
|
|
@@ -179,12 +168,12 @@ GitDiff.args = [
|
|
|
179
168
|
},
|
|
180
169
|
];
|
|
181
170
|
GitDiff.flagsConfig = {
|
|
182
|
-
outputdir:
|
|
171
|
+
outputdir: flags.string({
|
|
183
172
|
char: 'o',
|
|
184
173
|
description: messages.getMessage('outputdir'),
|
|
185
174
|
default: '',
|
|
186
175
|
}),
|
|
187
|
-
destructivechangesonly:
|
|
176
|
+
destructivechangesonly: flags.boolean({
|
|
188
177
|
char: 'd',
|
|
189
178
|
description: messages.getMessage('destructivechangesonly'),
|
|
190
179
|
default: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/manifest/git/diff.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/manifest/git/diff.ts"],"names":[],"mappings":"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"}
|