@salesforce/plugin-deploy-retrieve 3.3.1 → 3.5.0
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/README.md +1530 -2
- package/lib/commands/project/convert/mdapi.js +3 -2
- package/lib/commands/project/convert/mdapi.js.map +1 -1
- package/lib/commands/project/convert/source.js +4 -2
- package/lib/commands/project/convert/source.js.map +1 -1
- package/lib/commands/project/delete/source.d.ts +1 -15
- package/lib/commands/project/delete/source.js +130 -173
- package/lib/commands/project/delete/source.js.map +1 -1
- package/lib/commands/project/deploy/cancel.d.ts +1 -0
- package/lib/commands/project/deploy/cancel.js +11 -1
- package/lib/commands/project/deploy/cancel.js.map +1 -1
- package/lib/commands/project/generate/manifest.js +1 -0
- package/lib/commands/project/generate/manifest.js.map +1 -1
- package/lib/commands/project/retrieve/start.js +11 -2
- package/lib/commands/project/retrieve/start.js.map +1 -1
- package/lib/formatters/deleteResultFormatter.js +4 -9
- package/lib/formatters/deleteResultFormatter.js.map +1 -1
- package/lib/formatters/deployResultFormatter.d.ts +6 -3
- package/lib/formatters/deployResultFormatter.js +28 -20
- package/lib/formatters/deployResultFormatter.js.map +1 -1
- package/lib/formatters/metadataRetrieveResultFormatter.js +2 -2
- package/lib/formatters/metadataRetrieveResultFormatter.js.map +1 -1
- package/lib/formatters/retrieveResultFormatter.js +7 -3
- package/lib/formatters/retrieveResultFormatter.js.map +1 -1
- package/lib/utils/conflicts.js +4 -3
- package/lib/utils/conflicts.js.map +1 -1
- package/lib/utils/deploy.js +8 -3
- package/lib/utils/deploy.js.map +1 -1
- package/lib/utils/manifestCache.d.ts +2 -2
- package/lib/utils/manifestCache.js +4 -2
- package/lib/utils/manifestCache.js.map +1 -1
- package/lib/utils/metadataTypes.d.ts +7 -0
- package/lib/utils/metadataTypes.js +14 -0
- package/lib/utils/metadataTypes.js.map +1 -0
- package/lib/utils/output.d.ts +5 -4
- package/lib/utils/output.js +16 -15
- package/lib/utils/output.js.map +1 -1
- package/lib/utils/previewOutput.js +7 -7
- package/lib/utils/previewOutput.js.map +1 -1
- package/lib/utils/types.d.ts +1 -0
- package/lib/utils/types.js +1 -0
- package/lib/utils/types.js.map +1 -1
- package/npm-shrinkwrap.json +9924 -14761
- package/oclif.lock +1024 -3192
- package/oclif.manifest.json +436 -426
- package/package.json +15 -16
- package/schemas/project-delete-source.json +8 -8
- package/schemas/project-deploy-cancel.json +8 -8
- package/schemas/project-deploy-quick.json +8 -8
- package/schemas/project-deploy-report.json +8 -8
- package/schemas/project-deploy-resume.json +8 -8
- package/schemas/project-deploy-start.json +8 -8
- package/schemas/project-deploy-validate.json +8 -8
package/lib/utils/conflicts.js
CHANGED
|
@@ -6,12 +6,13 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { ux } from '@oclif/core';
|
|
8
8
|
export const writeConflictTable = (conflicts) => {
|
|
9
|
-
// Interfaces cannot be casted to Record<string, unknown> so we have to cast to unknown first
|
|
10
|
-
// See https://github.com/microsoft/TypeScript/issues/15300
|
|
11
9
|
if (!conflicts || conflicts.length === 0) {
|
|
12
10
|
return;
|
|
13
11
|
}
|
|
14
|
-
ux.table(
|
|
12
|
+
ux.table(
|
|
13
|
+
// Interfaces cannot be used as Record<string, unknown> so we have to make it a concrete type
|
|
14
|
+
// See https://github.com/microsoft/TypeScript/issues/15300
|
|
15
|
+
conflicts.map((c) => ({ state: c.state, fullName: c.fullName, type: c.type, filePath: c.filePath })), {
|
|
15
16
|
state: { header: 'STATE' },
|
|
16
17
|
fullName: { header: 'FULL NAME' },
|
|
17
18
|
type: { header: 'TYPE' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../src/utils/conflicts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,SAA8B,EAAQ,EAAE;IACzE,
|
|
1
|
+
{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../src/utils/conflicts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,SAA8B,EAAQ,EAAE;IACzE,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO;IACT,CAAC;IACD,EAAE,CAAC,KAAK;IACN,6FAA6F;IAC7F,2DAA2D;IAC3D,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EACpG;QACE,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;QAC1B,QAAQ,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE;QACjC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;QACxB,QAAQ,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE;KAClC,EACD,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;AACJ,CAAC,CAAC"}
|
package/lib/utils/deploy.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { ConfigAggregator, Messages, Org, SfError, SfProject } from '@salesforce/core';
|
|
8
8
|
import { Duration } from '@salesforce/kit';
|
|
9
|
-
import { ComponentSet, ComponentSetBuilder, MetadataApiDeploy, RequestStatus, } from '@salesforce/source-deploy-retrieve';
|
|
9
|
+
import { ComponentSet, ComponentSetBuilder, MetadataApiDeploy, RegistryAccess, RequestStatus, } from '@salesforce/source-deploy-retrieve';
|
|
10
10
|
import { SourceTracking } from '@salesforce/source-tracking';
|
|
11
11
|
import ConfigMeta, { ConfigVars } from '../configMeta.js';
|
|
12
12
|
import { getPackageDirs, getSourceApiVersion } from './project.js';
|
|
@@ -31,7 +31,7 @@ export async function buildComponentSet(opts, stl) {
|
|
|
31
31
|
/** localChangesAsComponentSet returned an array to support multiple sequential deploys.
|
|
32
32
|
* `sf` chooses not to support this so we force one ComponentSet
|
|
33
33
|
*/
|
|
34
|
-
const cs = (await stl.localChangesAsComponentSet(false))[0] ?? new ComponentSet();
|
|
34
|
+
const cs = (await stl.localChangesAsComponentSet(false))[0] ?? new ComponentSet(undefined, stl.registry);
|
|
35
35
|
// stl produces a cs with api version already set. command might have specified a version.
|
|
36
36
|
if (opts['api-version']) {
|
|
37
37
|
cs.apiVersion = opts['api-version'];
|
|
@@ -54,12 +54,14 @@ export async function buildComponentSet(opts, stl) {
|
|
|
54
54
|
}
|
|
55
55
|
: {}),
|
|
56
56
|
...(opts.metadata ? { metadata: { metadataEntries: opts.metadata, directoryPaths: await getPackageDirs() } } : {}),
|
|
57
|
+
projectDir: stl?.projectPath,
|
|
57
58
|
});
|
|
58
59
|
}
|
|
59
60
|
export async function executeDeploy(opts, bin = 'sf', project, id, throwOnEmpty = false) {
|
|
60
61
|
const apiOptions = buildApiOptions(opts);
|
|
61
62
|
let deploy;
|
|
62
63
|
let componentSet;
|
|
64
|
+
let registry;
|
|
63
65
|
const org = await Org.create({ aliasOrUsername: opts['target-org'] });
|
|
64
66
|
// for mdapi deploys, use the passed in api-version.
|
|
65
67
|
const usernameOrConnection = org.getConnection(opts['metadata-dir'] ? opts['api-version'] : undefined);
|
|
@@ -88,6 +90,7 @@ export async function executeDeploy(opts, bin = 'sf', project, id, throwOnEmpty
|
|
|
88
90
|
subscribeSDREvents: true,
|
|
89
91
|
ignoreConflicts: opts['ignore-conflicts'],
|
|
90
92
|
});
|
|
93
|
+
registry = stl.registry;
|
|
91
94
|
componentSet = await buildComponentSet(opts, stl);
|
|
92
95
|
if (componentSet.size === 0) {
|
|
93
96
|
if (opts['source-dir'] ?? opts.manifest ?? opts.metadata ?? throwOnEmpty) {
|
|
@@ -111,7 +114,9 @@ export async function executeDeploy(opts, bin = 'sf', project, id, throwOnEmpty
|
|
|
111
114
|
throw new SfError('The deploy id is not available.');
|
|
112
115
|
}
|
|
113
116
|
// does not apply to mdapi deploys
|
|
114
|
-
const manifestPath = componentSet
|
|
117
|
+
const manifestPath = componentSet
|
|
118
|
+
? await writeManifest(deploy.id, componentSet, registry ?? new RegistryAccess())
|
|
119
|
+
: undefined;
|
|
115
120
|
await DeployCache.set(deploy.id, { ...opts, manifest: manifestPath });
|
|
116
121
|
return { deploy, componentSet };
|
|
117
122
|
}
|
package/lib/utils/deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/utils/deploy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEnB,iBAAiB,EAEjB,aAAa,GACd,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,GAAG,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;AAElG,MAAM,cAAc,GAAG,QAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,iBAAiB,CAAC,CAAC;AAoCtG,MAAM,UAAU,aAAa,CAAC,SAAgC,EAAE,KAAyB;IACvF,OAAO,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,iBAAiB,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,wBAA2C;IAC1E,MAAM,GAAG,GAAG,wBAAwB,IAAI,CAAC,MAAM,gBAAgB,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAC1G,MAAM,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE,KAAK,CAAC;IACjF,OAAO,gBAAgB,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAA4B,EAAE,GAAoB;IACxF,4FAA4F;IAC5F,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,EAAE,CAAC;QACnE;;WAEG;QACH,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/utils/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ComponentSet } from '@salesforce/source-deploy-retrieve';
|
|
1
|
+
import { ComponentSet, RegistryAccess } from '@salesforce/source-deploy-retrieve';
|
|
2
2
|
/** Give it a jobId, ComponentSet it will write the manifest file
|
|
3
3
|
* returns the file path it wrote to */
|
|
4
|
-
export declare const writeManifest: (jobId: string, componentSet: ComponentSet) => Promise<string>;
|
|
4
|
+
export declare const writeManifest: (jobId: string, componentSet: ComponentSet, registry: RegistryAccess) => Promise<string>;
|
|
5
5
|
export declare const maybeDestroyManifest: (jobId: string) => Promise<void>;
|
|
@@ -9,10 +9,11 @@ import { homedir } from 'node:os';
|
|
|
9
9
|
import * as fs from 'node:fs';
|
|
10
10
|
import { ComponentSet } from '@salesforce/source-deploy-retrieve';
|
|
11
11
|
import { Global } from '@salesforce/core';
|
|
12
|
+
import { isNonDecomposedCustomLabels } from './metadataTypes.js';
|
|
12
13
|
const MANIFEST_CACHE_DIR = 'manifestCache';
|
|
13
14
|
/** Give it a jobId, ComponentSet it will write the manifest file
|
|
14
15
|
* returns the file path it wrote to */
|
|
15
|
-
export const writeManifest = async (jobId, componentSet) => {
|
|
16
|
+
export const writeManifest = async (jobId, componentSet, registry) => {
|
|
16
17
|
const types = new Set((await componentSet.getObject()).Package.types.map((t) => t.name));
|
|
17
18
|
// when we write a manifest, we will omit the CustomLabels component since it's redundant with the individual labels.
|
|
18
19
|
// this makes the use of the manifest in report/resume/etc accurate in certain mpd scenarios where it would otherwise pull in ALL labels from every dir
|
|
@@ -25,9 +26,10 @@ export const writeManifest = async (jobId, componentSet) => {
|
|
|
25
26
|
// cs.filter doesn't return the SAME component set, it just returns a new one...
|
|
26
27
|
// and so when we set anything on the component set that was passed in, it won't be set on the filtered one
|
|
27
28
|
// so, we create a new CS, and set the values from the original
|
|
28
|
-
const cs = new ComponentSet(componentSet.filter((c) => c
|
|
29
|
+
const cs = new ComponentSet(componentSet.filter((c) => !isNonDecomposedCustomLabels(c)), registry);
|
|
29
30
|
cs.sourceApiVersion = componentSet.sourceApiVersion;
|
|
30
31
|
cs.apiVersion = componentSet.apiVersion;
|
|
32
|
+
cs.projectDirectory = componentSet.projectDirectory;
|
|
31
33
|
xml = await cs.getPackageXml();
|
|
32
34
|
}
|
|
33
35
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifestCache.js","sourceRoot":"","sources":["../../src/utils/manifestCache.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"manifestCache.js","sourceRoot":"","sources":["../../src/utils/manifestCache.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAkB,MAAM,oCAAoC,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAE3C;uCACuC;AACvC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,KAAa,EACb,YAA0B,EAC1B,QAAwB,EACP,EAAE;IACnB,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACzF,qHAAqH;IACrH,uJAAuJ;IACvJ,oDAAoD;IACpD,2JAA2J;IAC3J,qJAAqJ;IACrJ,gEAAgE;IAEhE,IAAI,GAAW,CAAC;IAChB,IAAI,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1D,gFAAgF;QAChF,2GAA2G;QAC3G,+DAA+D;QAE/D,MAAM,EAAE,GAAG,IAAI,YAAY,CACzB,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,EAC3D,QAAQ,CACT,CAAC;QAEF,EAAE,CAAC,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;QACpD,EAAE,CAAC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;QACxC,EAAE,CAAC,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;QAEpD,GAAG,GAAG,MAAM,EAAE,CAAC,aAAa,EAAE,CAAC;IACjC,CAAC;SAAM,CAAC;QACN,GAAG,GAAG,MAAM,YAAY,CAAC,aAAa,EAAE,CAAC;IAC3C,CAAC;IACD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC3C,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,KAAa,EAAiB,EAAE;IACzE,IAAI,CAAC;QACH,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,uBAAuB;IACzB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,KAAa,EAAU,EAAE,CACpD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,eAAe,EAAE,kBAAkB,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { MetadataComponent, SourceComponent } from '@salesforce/source-deploy-retrieve';
|
|
2
|
+
/** true if it's the original, nonDecomposed CustomLabel(s) type (either the parent or the child). This returns false for customRegistry if they've overridden the type */
|
|
3
|
+
export declare const isNonDecomposedCustomLabelsOrCustomLabel: (cmp: SourceComponent | MetadataComponent) => boolean;
|
|
4
|
+
/** true if it's the original, nonDecomposed CustomLabels (the parent). This returns false for customRegistry if they've overridden the type */
|
|
5
|
+
export declare const isNonDecomposedCustomLabels: (cmp: SourceComponent | MetadataComponent) => boolean;
|
|
6
|
+
/** true if it's the original, nonDecomposed CustomLabels (the parent). This returns false for customRegistry if they've overridden the type */
|
|
7
|
+
export declare const isNonDecomposedCustomLabel: (cmp: SourceComponent | MetadataComponent) => boolean;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) 2023, salesforce.com, inc.
|
|
3
|
+
* All rights reserved.
|
|
4
|
+
* Licensed under the BSD 3-Clause license.
|
|
5
|
+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
|
+
*/
|
|
7
|
+
/** true if it's the original, nonDecomposed CustomLabel(s) type (either the parent or the child). This returns false for customRegistry if they've overridden the type */
|
|
8
|
+
export const isNonDecomposedCustomLabelsOrCustomLabel = (cmp) => [cmp, cmp.parent].some(isDecomposed);
|
|
9
|
+
/** true if it's the original, nonDecomposed CustomLabels (the parent). This returns false for customRegistry if they've overridden the type */
|
|
10
|
+
export const isNonDecomposedCustomLabels = (cmp) => isDecomposed(cmp);
|
|
11
|
+
/** true if it's the original, nonDecomposed CustomLabels (the parent). This returns false for customRegistry if they've overridden the type */
|
|
12
|
+
export const isNonDecomposedCustomLabel = (cmp) => isDecomposed(cmp.parent);
|
|
13
|
+
const isDecomposed = (cmp) => cmp?.type.strategies?.transformer === 'nonDecomposed';
|
|
14
|
+
//# sourceMappingURL=metadataTypes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadataTypes.js","sourceRoot":"","sources":["../../src/utils/metadataTypes.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,2KAA2K;AAC3K,MAAM,CAAC,MAAM,wCAAwC,GAAG,CAAC,GAAwC,EAAW,EAAE,CAC5G,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAEvC,gJAAgJ;AAChJ,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,GAAwC,EAAW,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;AAEpH,gJAAgJ;AAChJ,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,GAAwC,EAAW,EAAE,CAC9F,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAE3B,MAAM,YAAY,GAAG,CAAC,GAAyC,EAAW,EAAE,CAC1E,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,KAAK,eAAe,CAAC"}
|
package/lib/utils/output.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { FileResponse,
|
|
1
|
+
import { FileResponse, FileResponseSuccess } from '@salesforce/source-deploy-retrieve';
|
|
2
2
|
export declare function tableHeader(message: string): string;
|
|
3
|
-
export declare
|
|
3
|
+
export declare const makePathRelative: <T extends FileResponse>(fr: T) => T;
|
|
4
4
|
/**
|
|
5
5
|
* Sorts file responds by type, then by filePath, then by fullName
|
|
6
6
|
*/
|
|
7
|
-
export declare
|
|
8
|
-
|
|
7
|
+
export declare const fileResponseSortFn: (i: FileResponse, j: FileResponse) => number;
|
|
8
|
+
/** oclif table doesn't like "interface" but likes "type". SDR exports an interface */
|
|
9
|
+
export declare const getFileResponseSuccessProps: (s: FileResponseSuccess) => Pick<FileResponseSuccess, 'filePath' | 'fullName' | 'state' | 'type'>;
|
|
9
10
|
export declare function error(message: string): string;
|
|
10
11
|
export declare function success(message: string): string;
|
|
11
12
|
export declare const check: string;
|
package/lib/utils/output.js
CHANGED
|
@@ -10,25 +10,26 @@ import { StandardColors } from '@salesforce/sf-plugins-core';
|
|
|
10
10
|
export function tableHeader(message) {
|
|
11
11
|
return chalk.blue.bold(message);
|
|
12
12
|
}
|
|
13
|
-
export
|
|
14
|
-
const relative = fileResponses.map((file) => file.filePath ? { ...file, filePath: path.relative(process.cwd(), file.filePath) } : file);
|
|
15
|
-
return relative;
|
|
16
|
-
}
|
|
13
|
+
export const makePathRelative = (fr) => fr.filePath ? { ...fr, filePath: path.relative(process.cwd(), fr.filePath) } : fr;
|
|
17
14
|
/**
|
|
18
15
|
* Sorts file responds by type, then by filePath, then by fullName
|
|
19
16
|
*/
|
|
20
|
-
export
|
|
21
|
-
|
|
22
|
-
if (i.
|
|
23
|
-
|
|
24
|
-
return i.fullName > j.fullName ? 1 : -1;
|
|
25
|
-
}
|
|
26
|
-
return i?.filePath > j?.filePath ? 1 : -1;
|
|
17
|
+
export const fileResponseSortFn = (i, j) => {
|
|
18
|
+
if (i.type === j.type && i.filePath && j.filePath) {
|
|
19
|
+
if (i.filePath === j.filePath) {
|
|
20
|
+
return i.fullName > j.fullName ? 1 : -1;
|
|
27
21
|
}
|
|
28
|
-
return i
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
|
|
22
|
+
return i?.filePath > j?.filePath ? 1 : -1;
|
|
23
|
+
}
|
|
24
|
+
return i.type > j.type ? 1 : -1;
|
|
25
|
+
};
|
|
26
|
+
/** oclif table doesn't like "interface" but likes "type". SDR exports an interface */
|
|
27
|
+
export const getFileResponseSuccessProps = (s) => ({
|
|
28
|
+
filePath: s.filePath,
|
|
29
|
+
fullName: s.fullName,
|
|
30
|
+
type: s.type,
|
|
31
|
+
state: s.state,
|
|
32
|
+
});
|
|
32
33
|
export function error(message) {
|
|
33
34
|
return StandardColors.error(chalk.bold(message));
|
|
34
35
|
}
|
package/lib/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAqE,EAAK,EAAK,EAAE,CAC/G,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACpF;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAe,EAAE,CAAe,EAAU,EAAE;IAC7E,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClD,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC9B,OAAO,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,CAAC,EAAE,QAAQ,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,wFAAwF;AACxF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,CAAsB,EACiD,EAAE,CAAC,CAAC;IAC3E,QAAQ,EAAE,CAAC,CAAC,QAAQ;IACpB,QAAQ,EAAE,CAAC,CAAC,QAAQ;IACpB,IAAI,EAAE,CAAC,CAAC,IAAI;IACZ,KAAK,EAAE,CAAC,CAAC,KAAK;CACf,CAAC,CAAC;AAEH,MAAM,UAAU,KAAK,CAAC,OAAe;IACnC,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAe;IACrC,OAAO,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC"}
|
|
@@ -9,7 +9,7 @@ import { ux } from '@oclif/core';
|
|
|
9
9
|
import { StandardColors } from '@salesforce/sf-plugins-core';
|
|
10
10
|
import chalk from 'chalk';
|
|
11
11
|
import { Messages } from '@salesforce/core';
|
|
12
|
-
import { DestructiveChangesType, MetadataResolver, VirtualTreeContainer, } from '@salesforce/source-deploy-retrieve';
|
|
12
|
+
import { DestructiveChangesType, MetadataResolver, VirtualTreeContainer, RegistryAccess, } from '@salesforce/source-deploy-retrieve';
|
|
13
13
|
import { filePathsFromMetadataComponent } from '@salesforce/source-deploy-retrieve/lib/src/utils/filePathGenerator.js';
|
|
14
14
|
import { isSourceComponentWithXml } from './types.js';
|
|
15
15
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
@@ -17,9 +17,9 @@ const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'pr
|
|
|
17
17
|
const ensureAbsolutePath = (f) => (isAbsolute(f) ? f : resolve(f));
|
|
18
18
|
// borrowed from STL populateFilesPaths.
|
|
19
19
|
// TODO: this goes in SDR maybe?
|
|
20
|
-
const resolvePaths = (filenames) => {
|
|
20
|
+
const resolvePaths = (filenames, registry) => {
|
|
21
21
|
// component set generated from the filenames on all local changes
|
|
22
|
-
const resolver = new MetadataResolver(
|
|
22
|
+
const resolver = new MetadataResolver(registry, VirtualTreeContainer.fromFilePaths(filenames), false);
|
|
23
23
|
const sourceComponents = filenames
|
|
24
24
|
.flatMap((filename) => {
|
|
25
25
|
try {
|
|
@@ -47,9 +47,9 @@ const calculateDeployOperation = (destructiveChangesType) => {
|
|
|
47
47
|
};
|
|
48
48
|
const getNonIgnoredConflicts = (files) => files.filter((f) => f.conflict && !f.ignored);
|
|
49
49
|
const willGo = (previewFile) => !previewFile.conflict && !previewFile.ignored;
|
|
50
|
-
const getWillDeploy = (files) => files.filter((f) =>
|
|
51
|
-
const getWillRetrieve = (files) => files.filter((f) =>
|
|
52
|
-
const getWillDelete = (files) => files.filter((f) =>
|
|
50
|
+
const getWillDeploy = (files) => files.filter(willGo).filter((f) => f.operation === 'deploy');
|
|
51
|
+
const getWillRetrieve = (files) => files.filter(willGo).filter((f) => f.operation === 'retrieve');
|
|
52
|
+
const getWillDelete = (files) => files.filter(willGo).filter((f) => f.operation && ['deletePre', 'deletePost'].includes(f.operation));
|
|
53
53
|
// relative paths are easier on tables
|
|
54
54
|
const columns = { type: {}, fullName: {}, projectRelativePath: { header: 'Path' } };
|
|
55
55
|
const makeKey = ({ type, fullName }) => `${type.name}#${fullName}`;
|
|
@@ -111,7 +111,7 @@ export const compileResults = ({ componentSet, projectPath, filesWithConflicts,
|
|
|
111
111
|
operation: 'deletePre',
|
|
112
112
|
})));
|
|
113
113
|
// Source backed components won't appear in the ComponentSet if ignored
|
|
114
|
-
const ignoredSourceComponents = resolvePaths([...(componentSet.forceIgnoredPaths ?? [])]).map((resolved) => ({
|
|
114
|
+
const ignoredSourceComponents = resolvePaths([...(componentSet.forceIgnoredPaths ?? [])], new RegistryAccess(undefined, projectPath)).map((resolved) => ({
|
|
115
115
|
...resolved,
|
|
116
116
|
...(resolved.path ? { projectRelativePath: relative(projectPath, resolved.path) } : {}),
|
|
117
117
|
conflict: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"previewOutput.js","sourceRoot":"","sources":["../../src/utils/previewOutput.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAEL,sBAAsB,EAEtB,gBAAgB,EAChB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"previewOutput.js","sourceRoot":"","sources":["../../src/utils/previewOutput.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/types.d.ts
CHANGED
|
@@ -64,4 +64,5 @@ export declare const isSourceComponentWithXml: (sc: unknown) => sc is SourceComp
|
|
|
64
64
|
};
|
|
65
65
|
export declare const isSdrFailure: (fileResponse: FileResponse) => fileResponse is FileResponseFailure;
|
|
66
66
|
export declare const isSdrSuccess: (fileResponse: FileResponse) => fileResponse is FileResponseSuccess;
|
|
67
|
+
export declare const isFileResponseDeleted: (fileResponse: FileResponseSuccess) => boolean;
|
|
67
68
|
export {};
|
package/lib/utils/types.js
CHANGED
|
@@ -33,4 +33,5 @@ export const isSourceComponent = (sc) => isObject(sc) &&
|
|
|
33
33
|
export const isSourceComponentWithXml = (sc) => isSourceComponent(sc) && 'xml' in sc && typeof sc.xml === 'string';
|
|
34
34
|
export const isSdrFailure = (fileResponse) => fileResponse.state === ComponentStatus.Failed;
|
|
35
35
|
export const isSdrSuccess = (fileResponse) => fileResponse.state !== ComponentStatus.Failed;
|
|
36
|
+
export const isFileResponseDeleted = (fileResponse) => fileResponse.state === ComponentStatus.Deleted;
|
|
36
37
|
//# sourceMappingURL=types.js.map
|
package/lib/utils/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,eAAe,GAQhB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAEnE,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,oCAAuB,CAAA;IACvB,oDAAuC,CAAA;IACvC,4CAA+B,CAAA;IAC/B,kDAAqC,CAAA;AACvC,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAED,MAAM,CAAN,IAAY,GAGX;AAHD,WAAY,GAAG;IACb,oBAAa,CAAA;IACb,oBAAa,CAAA;AACf,CAAC,EAHW,GAAG,KAAH,GAAG,QAGd;AA0DD,oEAAoE;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAW,EAAyB,EAAE,CACtE,QAAQ,CAAC,EAAE,CAAC;IACZ,MAAM,IAAI,EAAE;IACZ,OAAO,EAAE,CAAC,IAAI,KAAK,QAAQ;IAC3B,EAAE,CAAC,IAAI,KAAK,IAAI;IAChB,MAAM,IAAI,EAAE,CAAC,IAAI;IACjB,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ;IAChC,UAAU,IAAI,EAAE;IAChB,0EAA0E;IAC1E,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAElC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EAAW,EAA2C,EAAE,CAC/F,iBAAiB,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC;AAErE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA0B,EAAuC,EAAE,CAC9F,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA0B,EAAuC,EAAE,CAC9F,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,eAAe,GAQhB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAEnE,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,oCAAuB,CAAA;IACvB,oDAAuC,CAAA;IACvC,4CAA+B,CAAA;IAC/B,kDAAqC,CAAA;AACvC,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAED,MAAM,CAAN,IAAY,GAGX;AAHD,WAAY,GAAG;IACb,oBAAa,CAAA;IACb,oBAAa,CAAA;AACf,CAAC,EAHW,GAAG,KAAH,GAAG,QAGd;AA0DD,oEAAoE;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAW,EAAyB,EAAE,CACtE,QAAQ,CAAC,EAAE,CAAC;IACZ,MAAM,IAAI,EAAE;IACZ,OAAO,EAAE,CAAC,IAAI,KAAK,QAAQ;IAC3B,EAAE,CAAC,IAAI,KAAK,IAAI;IAChB,MAAM,IAAI,EAAE,CAAC,IAAI;IACjB,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ;IAChC,UAAU,IAAI,EAAE;IAChB,0EAA0E;IAC1E,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAElC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EAAW,EAA2C,EAAE,CAC/F,iBAAiB,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC;AAErE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA0B,EAAuC,EAAE,CAC9F,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA0B,EAAuC,EAAE,CAC9F,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,YAAiC,EAAW,EAAE,CAClF,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,OAAO,CAAC"}
|