@salesforce/plugin-deploy-retrieve 1.5.2 → 1.5.5

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.
Files changed (38) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/README.md +141 -13
  3. package/lib/commands/deploy/metadata/preview.d.ts +17 -0
  4. package/lib/commands/deploy/metadata/preview.js +86 -0
  5. package/lib/commands/deploy/metadata/preview.js.map +1 -0
  6. package/lib/commands/deploy/metadata/quick.js +2 -3
  7. package/lib/commands/deploy/metadata/quick.js.map +1 -1
  8. package/lib/commands/deploy.d.ts +1 -1
  9. package/lib/commands/deploy.js +20 -12
  10. package/lib/commands/deploy.js.map +1 -1
  11. package/lib/commands/retrieve/metadata/preview.d.ts +14 -0
  12. package/lib/commands/retrieve/metadata/preview.js +63 -0
  13. package/lib/commands/retrieve/metadata/preview.js.map +1 -0
  14. package/lib/commands/retrieve/metadata.js +22 -19
  15. package/lib/commands/retrieve/metadata.js.map +1 -1
  16. package/lib/utils/deploy.js +17 -17
  17. package/lib/utils/deploy.js.map +1 -1
  18. package/lib/utils/metadataDeployer.d.ts +2 -2
  19. package/lib/utils/metadataDeployer.js +9 -7
  20. package/lib/utils/metadataDeployer.js.map +1 -1
  21. package/lib/utils/output.d.ts +1 -1
  22. package/lib/utils/output.js +19 -30
  23. package/lib/utils/output.js.map +1 -1
  24. package/lib/utils/previewOutput.d.ts +30 -0
  25. package/lib/utils/previewOutput.js +199 -0
  26. package/lib/utils/previewOutput.js.map +1 -0
  27. package/lib/utils/progressBar.js +1 -2
  28. package/lib/utils/progressBar.js.map +1 -1
  29. package/messages/deploy.md +36 -0
  30. package/messages/deploy.metadata.md +9 -1
  31. package/messages/deploy.metadata.preview.md +93 -0
  32. package/messages/deploy.metadata.validate.md +1 -1
  33. package/messages/previewMessages.md +39 -0
  34. package/messages/retrieve.metadata.preview.md +59 -0
  35. package/oclif.manifest.json +1 -1
  36. package/package.json +31 -29
  37. package/schemas/deploy-metadata-preview.json +72 -0
  38. package/schemas/retrieve-metadata-preview.json +72 -0
package/lib/commands/retrieve/metadata.js CHANGED
@@ -28,29 +28,32 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
28
28
  ignoreConflicts: flags['ignore-conflicts'],
29
29
  });
30
30
  const isChanges = !flags['source-dir'] && !flags['manifest'] && !flags['metadata'];
31
- const componentSet = isChanges
32
- ? await stl.maybeApplyRemoteDeletesToLocal()
33
- : await source_deploy_retrieve_1.ComponentSetBuilder.build({
34
- apiversion: flags['api-version'],
35
- sourcepath: flags['source-dir'],
36
- packagenames: flags['package-name'],
37
- manifest: flags.manifest && {
38
- manifestPath: flags.manifest,
39
- directoryPaths: await (0, project_1.getPackageDirs)(),
40
- },
41
- metadata: flags.metadata && {
42
- metadataEntries: flags.metadata,
43
- directoryPaths: await (0, project_1.getPackageDirs)(),
44
- },
45
- });
31
+ const { componentSetFromNonDeletes, fileResponsesFromDelete } = isChanges
32
+ ? await stl.maybeApplyRemoteDeletesToLocal(true)
33
+ : {
34
+ componentSetFromNonDeletes: await source_deploy_retrieve_1.ComponentSetBuilder.build({
35
+ apiversion: flags['api-version'],
36
+ sourcepath: flags['source-dir'],
37
+ packagenames: flags['package-name'],
38
+ manifest: flags.manifest && {
39
+ manifestPath: flags.manifest,
40
+ directoryPaths: await (0, project_1.getPackageDirs)(),
41
+ },
42
+ metadata: flags.metadata && {
43
+ metadataEntries: flags.metadata,
44
+ directoryPaths: await (0, project_1.getPackageDirs)(),
45
+ },
46
+ }),
47
+ fileResponsesFromDelete: [],
48
+ };
46
49
  // stl sets version based on config/files--if the command overrides it, we need to update
47
50
  if (isChanges && flags['api-version']) {
48
- componentSet.apiVersion = flags['api-version'];
51
+ componentSetFromNonDeletes.apiVersion = flags['api-version'];
49
52
  }
50
53
  this.spinner.status = messages.getMessage('spinner.sending', [
51
- componentSet.sourceApiVersion || componentSet.apiVersion,
54
+ componentSetFromNonDeletes.sourceApiVersion ?? componentSetFromNonDeletes.apiVersion,
52
55
  ]);
53
- const retrieve = await componentSet.retrieve({
56
+ const retrieve = await componentSetFromNonDeletes.retrieve({
54
57
  usernameOrConnection: flags['target-org'].getUsername(),
55
58
  merge: true,
56
59
  output: this.project.getDefaultPackage().fullPath,
@@ -70,7 +73,7 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
70
73
  await retrieve.start();
71
74
  const result = await retrieve.pollStatus(500, flags.wait.seconds);
72
75
  this.spinner.stop();
73
- const formatter = new output_1.RetrieveResultFormatter(result, flags['package-name']);
76
+ const formatter = new output_1.RetrieveResultFormatter(result, flags['package-name'], fileResponsesFromDelete);
74
77
  if (!this.jsonEnabled()) {
75
78
  if (result.response.status === 'Succeeded') {
76
79
  await formatter.display();
package/lib/commands/retrieve/metadata.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/commands/retrieve/metadata.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/commands/retrieve/metadata.ts"],"names":[],"mappings":"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"}
package/lib/utils/deploy.js CHANGED
@@ -20,30 +20,29 @@ const cacheMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve',
20
20
  'error.NoRecentJobId',
21
21
  'error.InvalidJobId',
22
22
  ]);
23
- const trackingMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve', 'tracking', ['error.noChanges']);
23
+ const deployMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve', 'deploy.metadata', [
24
+ 'error.nothingToDeploy',
25
+ 'error.nothingToDeploy.Actions',
26
+ ]);
24
27
  function validateTests(testLevel, tests) {
25
- if (testLevel === types_1.TestLevel.RunSpecifiedTests && (tests !== null && tests !== void 0 ? tests : []).length === 0)
28
+ if (testLevel === types_1.TestLevel.RunSpecifiedTests && (tests ?? []).length === 0)
26
29
  return false;
27
30
  return true;
28
31
  }
29
32
  exports.validateTests = validateTests;
30
33
  async function resolveApi() {
31
- var _a;
32
34
  const agg = await core_1.ConfigAggregator.create({ customConfigMeta: configMeta_1.default });
33
- const restDeployConfig = (_a = agg.getInfo(configMeta_1.ConfigVars.ORG_METADATA_REST_DEPLOY)) === null || _a === void 0 ? void 0 : _a.value;
35
+ const restDeployConfig = agg.getInfo(configMeta_1.ConfigVars.ORG_METADATA_REST_DEPLOY)?.value;
34
36
  return restDeployConfig === 'true' ? types_1.API.REST : types_1.API.SOAP;
35
37
  }
36
38
  exports.resolveApi = resolveApi;
37
39
  async function buildComponentSet(opts, stl) {
38
- // if you specify nothing, you'll get the changes, like sfdx push
39
- if (!opts['source-dir'] && !opts.manifest && !opts.metadata) {
40
+ // if you specify nothing, you'll get the changes, like sfdx push, as long as there's an stl
41
+ if (!opts['source-dir'] && !opts.manifest && !opts.metadata && stl) {
40
42
  /** localChangesAsComponentSet returned an array to support multiple sequential deploys.
41
- * `sf` does not support this so we force one ComponentSet
43
+ * `sf` chooses not to support this so we force one ComponentSet
42
44
  */
43
- const [cs] = await stl.localChangesAsComponentSet(false);
44
- if (!cs) {
45
- throw new core_1.SfError(trackingMessages.getMessage('error.noChanges'));
46
- }
45
+ const cs = (await stl.localChangesAsComponentSet(false))?.[0] ?? new source_deploy_retrieve_1.ComponentSet();
47
46
  // stl produces a cs with api version already set. command might have specified a version.
48
47
  if (opts['api-version']) {
49
48
  cs.apiVersion = opts['api-version'];
@@ -67,8 +66,7 @@ async function buildComponentSet(opts, stl) {
67
66
  }
68
67
  exports.buildComponentSet = buildComponentSet;
69
68
  async function executeDeploy(opts, project, id) {
70
- var _a, _b;
71
- project !== null && project !== void 0 ? project : (project = await core_1.SfProject.resolve());
69
+ project ?? (project = await core_1.SfProject.resolve());
72
70
  const apiOptions = {
73
71
  checkOnly: opts['dry-run'] || false,
74
72
  ignoreWarnings: opts['ignore-warnings'] || false,
@@ -82,7 +80,7 @@ async function executeDeploy(opts, project, id) {
82
80
  const org = await core_1.Org.create({ aliasOrUsername: opts['target-org'] });
83
81
  const usernameOrConnection = org.getConnection();
84
82
  // instantiate source tracking
85
- // stl will decide, based on the org's properties, what to do
83
+ // stl will decide, based on the org's properties, what needs to be done
86
84
  const stl = await source_tracking_1.SourceTracking.create({
87
85
  org,
88
86
  project,
@@ -105,6 +103,9 @@ async function executeDeploy(opts, project, id) {
105
103
  }
106
104
  else {
107
105
  componentSet = await buildComponentSet(opts, stl);
106
+ if (componentSet.size === 0) {
107
+ throw new core_1.SfError(deployMessages.getMessage('error.nothingToDeploy'), 'NothingToDeploy', deployMessages.getMessages('error.nothingToDeploy.Actions'));
108
+ }
108
109
  deploy = id
109
110
  ? new source_deploy_retrieve_1.MetadataApiDeploy({ id, usernameOrConnection, components: componentSet })
110
111
  : await componentSet.deploy({
@@ -112,16 +113,15 @@ async function executeDeploy(opts, project, id) {
112
113
  apiOptions,
113
114
  });
114
115
  }
115
- await DeployCache.set(deploy.id, { ...opts, wait: (_b = (_a = opts.wait) === null || _a === void 0 ? void 0 : _a.minutes) !== null && _b !== void 0 ? _b : 33 });
116
+ await DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
116
117
  return { deploy, componentSet };
117
118
  }
118
119
  exports.executeDeploy = executeDeploy;
119
120
  async function cancelDeploy(opts, id) {
120
- var _a, _b;
121
121
  const org = await core_1.Org.create({ aliasOrUsername: opts['target-org'] });
122
122
  const deploy = new source_deploy_retrieve_1.MetadataApiDeploy({ usernameOrConnection: org.getUsername(), id });
123
123
  const componentSet = await buildComponentSet({ ...opts });
124
- await DeployCache.set(deploy.id, { ...opts, wait: (_b = (_a = opts.wait) === null || _a === void 0 ? void 0 : _a.minutes) !== null && _b !== void 0 ? _b : 33 });
124
+ await DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
125
125
  await deploy.cancel();
126
126
  return poll(org, deploy.id, opts.wait, componentSet);
127
127
  }
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,2CAU0B;AAC1B,yCAA2C;AAE3C,+EAO4C;AAC5C,iEAA6D;AAC7D,8CAAuD;AACvD,uCAAgE;AAChE,mCAAmD;AACnD,6CAAmD;AACnD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,aAAa,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,OAAO,EAAE;IACjF,qBAAqB;IACrB,oBAAoB;CACrB,CAAC,CAAC;AACH,MAAM,gBAAgB,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,UAAU,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;AA0B9G,SAAgB,aAAa,CAAC,SAAoB,EAAE,KAAyB;IAC3E,IAAI,SAAS,KAAK,iBAAS,CAAC,iBAAiB,IAAI,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1F,OAAO,IAAI,CAAC;AACd,CAAC;AAHD,sCAGC;AAEM,KAAK,UAAU,UAAU;;IAC9B,MAAM,GAAG,GAAG,MAAM,uBAAgB,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,oBAAU,EAAE,CAAC,CAAC;IAC5E,MAAM,gBAAgB,GAAG,MAAA,GAAG,CAAC,OAAO,CAAC,uBAAU,CAAC,wBAAwB,CAAC,0CAAE,KAAK,CAAC;IACjF,OAAO,gBAAgB,KAAK,MAAM,CAAC,CAAC,CAAC,WAAG,CAAC,IAAI,CAAC,CAAC,CAAC,WAAG,CAAC,IAAI,CAAC;AAC3D,CAAC;AAJD,gCAIC;AAEM,KAAK,UAAU,iBAAiB,CAAC,IAA4B,EAAE,GAAoB;IACxF,iEAAiE;IACjE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;QAC3D;;WAEG;QACH,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,EAAE,EAAE;YACP,MAAM,IAAI,cAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC;SACnE;QACD,2FAA2F;QAC3F,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE;YACvB,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;YACpC,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;SAC3C;QACD,OAAO,EAAE,CAAC;KACX;IAED,OAAO,4CAAmB,CAAC,KAAK,CAAC;QAC/B,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC;QAC/B,gBAAgB,EAAE,MAAM,IAAA,6BAAmB,GAAE;QAC7C,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC;QAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI;YACzB,YAAY,EAAE,IAAI,CAAC,QAAQ;YAC3B,cAAc,EAAE,MAAM,IAAA,wBAAc,GAAE;SACvC;QACD,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI;YACzB,eAAe,EAAE,IAAI,CAAC,QAAQ;YAC9B,cAAc,EAAE,MAAM,IAAA,wBAAc,GAAE;SACvC;KACF,CAAC,CAAC;AACL,CAAC;AA/BD,8CA+BC;AAEM,KAAK,UAAU,aAAa,CACjC,IAA4B,EAC5B,OAAmB,EACnB,EAAW;;IAEX,OAAO,aAAP,OAAO,cAAP,OAAO,IAAP,OAAO,GAAK,MAAM,gBAAS,CAAC,OAAO,EAAE,EAAC;IACtC,MAAM,UAAU,GAAG;QACjB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK;QACnC,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,KAAK;QAChD,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,WAAG,CAAC,IAAI;QAC3B,eAAe,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK;QAChD,QAAQ,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QAC1B,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC;KAC9B,CAAC;IAEF,IAAI,MAAyB,CAAC;IAC9B,IAAI,YAA0B,CAAC;IAE/B,MAAM,GAAG,GAAG,MAAM,UAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACtE,MAAM,oBAAoB,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC;IACjD,8BAA8B;IAC9B,6DAA6D;IAC7D,MAAM,GAAG,GAAG,MAAM,gCAAc,CAAC,MAAM,CAAC;QACtC,GAAG;QACH,OAAO;QACP,kBAAkB,EAAE,IAAI;QACxB,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAC;KAC1C,CAAC,CAAC;IAEH,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE;QACxB,IAAI,EAAE,EAAE;YACN,MAAM,GAAG,IAAI,0CAAiB,CAAC,EAAE,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC;SAC9D;aAAM;YACL,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YAChF,MAAM,GAAG,IAAI,0CAAiB,CAAC;gBAC7B,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI;gBAChC,oBAAoB;gBACpB,UAAU,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,KAAK,EAAE;aAC9E,CAAC,CAAC;YACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;SACtB;KACF;SAAM;QACL,YAAY,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,GAAG,EAAE;YACT,CAAC,CAAC,IAAI,0CAAiB,CAAC,EAAE,EAAE,EAAE,oBAAoB,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;YAC/E,CAAC,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC;gBACxB,oBAAoB;gBACpB,UAAU;aACX,CAAC,CAAC;KACR;IAED,MAAM,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,OAAO,mCAAI,EAAE,EAAE,CAAC,CAAC;IAC9E,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAClC,CAAC;AArDD,sCAqDC;AAEM,KAAK,UAAU,YAAY,CAAC,IAA4B,EAAE,EAAU;;IACzE,MAAM,GAAG,GAAG,MAAM,UAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,IAAI,0CAAiB,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACtF,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IAE1D,MAAM,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,OAAO,mCAAI,EAAE,EAAE,CAAC,CAAC;IAE9E,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;IACtB,OAAO,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AACvD,CAAC;AATD,oCASC;AAEM,KAAK,UAAU,iBAAiB,CAAC,IAA4B,EAAE,EAAU;IAC9E,MAAM,GAAG,GAAG,MAAM,UAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,IAAI,0CAAiB,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACtF,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;IACtB,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;AAC3B,CAAC;AALD,8CAKC;AAEM,KAAK,UAAU,IAAI,CAAC,GAAQ,EAAE,EAAU,EAAE,IAAc,EAAE,YAA0B;IACzF,MAAM,MAAM,GAAG,KAAK,IAA2B,EAAE;QAC/C,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,GAAyC,CAAC;QAC/D,OAAO,IAAI,qCAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IACtD,CAAC,CAAC;IAEF,MAAM,IAAI,GAA0B;QAClC,SAAS,EAAE,cAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;QACtC,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,KAAK,IAA2B,EAAE;YACtC,MAAM,YAAY,GAAG,MAAM,MAAM,EAAE,CAAC;YACpC,OAAO;gBACL,SAAS,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI;gBACrC,OAAO,EAAE,YAAkC;aAC5C,CAAC;QACJ,CAAC;KACF,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,oBAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvD,OAAO,aAAa,CAAC,SAAS,EAAsC,CAAC;AACvE,CAAC;AApBD,oBAoBC;AAED,SAAgB,iBAAiB,CAAC,MAAoB,EAAE,KAAK,GAAG,KAAK;IACnE,IAAI,KAAK,EAAE;QACT,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,sCAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACnE;IAED,OAAO,gCAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC;AAND,8CAMC;AAED,SAAgB,cAAc,CAAC,MAAqB;IAClD,OAAO;QACL,sCAAa,CAAC,SAAS;QACvB,sCAAa,CAAC,MAAM;QACpB,sCAAa,CAAC,gBAAgB;QAC9B,sCAAa,CAAC,QAAQ;KACvB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC;AAPD,wCAOC;AAED,MAAa,WAAY,SAAQ,gBAA2C;IACnE,MAAM,CAAC,WAAW;QACvB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC7B,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,WAAW,CAAC,WAAW,EAAE;YACnC,WAAW,EAAE,aAAM,CAAC,eAAe;YACnC,GAAG,EAAE,cAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SACtB,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAA6B;QAChE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAW;QACnC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,GAAY;QAClD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACvB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEM,aAAa,CAAC,aAAsB,EAAE,GAAqB,EAAE,eAAe,GAAG,IAAI;QACxF,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC5E,IAAI,CAAC,KAAK,IAAI,aAAa;YAAE,MAAM,aAAa,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAEpF,IAAI,eAAe,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvC,MAAM,aAAa,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;SAChE;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,aAAa,CAAC,KAAa;QAChC,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;aAAM,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE;YAC9B,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;SACrD;aAAM;YACL,MAAM,aAAa,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;SAChE;IACH,CAAC;IAEM,GAAG,CAAC,KAAa;QACtB,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC;CACF;AAzDD,kCAyDC"}
1
+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/utils/deploy.ts"],"names":[],"mappings":"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"}
package/lib/utils/metadataDeployer.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { NamedPackageDir } from '@salesforce/core';
2
- import { Deployable, Deployer } from '@salesforce/sf-plugins-core';
2
+ import { Deployable, Deployer, DeployerResult } from '@salesforce/sf-plugins-core';
3
3
  import { TestLevel } from './types';
4
4
  export interface MetadataDeployOptions extends Deployer.Options {
5
5
  testLevel?: TestLevel;
@@ -24,7 +24,7 @@ export declare class MetadataDeployer extends Deployer {
24
24
  constructor(packages: NamedPackageDir[]);
25
25
  getName(): string;
26
26
  setup(flags: Deployer.Flags, options: MetadataDeployOptions): Promise<MetadataDeployOptions>;
27
- deploy(): Promise<void>;
27
+ deploy<R extends DeployerResult>(): Promise<void | R>;
28
28
  promptForUsername(): Promise<string>;
29
29
  promptForTestLevel(): Promise<TestLevel>;
30
30
  }
package/lib/utils/metadataDeployer.js CHANGED
@@ -75,13 +75,12 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
75
75
  return MetadataDeployer.NAME;
76
76
  }
77
77
  async setup(flags, options) {
78
- var _a;
79
78
  if (flags.interactive) {
80
79
  this.testLevel = await this.promptForTestLevel();
81
80
  this.username = await this.promptForUsername();
82
81
  }
83
82
  else {
84
- if ((_a = options.directories) === null || _a === void 0 ? void 0 : _a.length) {
83
+ if (options.directories?.length) {
85
84
  const directories = options.directories || [];
86
85
  const selected = this.deployables.filter((d) => directories.includes(d.getPath()));
87
86
  this.selectDeployables(selected);
@@ -114,10 +113,13 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
114
113
  concise: false,
115
114
  });
116
115
  formatter.display();
116
+ const deployerResult = {
117
+ exitCode: (0, deploy_1.determineExitCode)(result),
118
+ };
119
+ return deployerResult;
117
120
  }
118
121
  async promptForUsername() {
119
- var _a;
120
- const aliasOrUsername = (_a = core_1.ConfigAggregator.getValue(core_1.OrgConfigProperties.TARGET_ORG)) === null || _a === void 0 ? void 0 : _a.value;
122
+ const aliasOrUsername = core_1.ConfigAggregator.getValue(core_1.OrgConfigProperties.TARGET_ORG)?.value;
121
123
  const stateAggregator = await core_1.StateAggregator.getInstance();
122
124
  await stateAggregator.orgs.readAll();
123
125
  const allAliases = stateAggregator.aliases.getAll();
@@ -126,7 +128,7 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
126
128
  if (aliasOrUsername) {
127
129
  targetOrgAuth = (await core_1.AuthInfo.listAllAuthorizations((a) => a.username === aliasOrUsername || a.aliases.some((alias) => alias === aliasOrUsername))).find((a) => a);
128
130
  if (targetOrgAuth) {
129
- if (targetOrgAuth === null || targetOrgAuth === void 0 ? void 0 : targetOrgAuth.isExpired) {
131
+ if (targetOrgAuth?.isExpired) {
130
132
  const continueAnswer = await this.prompt([
131
133
  {
132
134
  name: 'continue',
@@ -143,7 +145,7 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
143
145
  }
144
146
  }
145
147
  }
146
- if (!aliasOrUsername || (targetOrgAuth === null || targetOrgAuth === void 0 ? void 0 : targetOrgAuth.isExpired)) {
148
+ if (!aliasOrUsername || targetOrgAuth?.isExpired) {
147
149
  const promises = (await core_1.AuthInfo.listAllAuthorizations((orgAuth) => !orgAuth.error && orgAuth.isExpired !== true)).map(async (orgAuth) => {
148
150
  const stat = await stateAggregator.orgs.stat(orgAuth.username);
149
151
  const timestamp = stat ? new Date(stat.mtimeMs) : new Date();
@@ -170,7 +172,7 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
170
172
  choices: (0, sf_plugins_core_1.generateTableChoices)(columns, options, false),
171
173
  },
172
174
  ]);
173
- if (targetOrgAuth === null || targetOrgAuth === void 0 ? void 0 : targetOrgAuth.isExpired) {
175
+ if (targetOrgAuth?.isExpired) {
174
176
  const setTargetOrg = await this.prompt([
175
177
  {
176
178
  name: 'save',
package/lib/utils/metadataDeployer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"metadataDeployer.js","sourceRoot":"","sources":["../../src/utils/metadataDeployer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"metadataDeployer.js","sourceRoot":"","sources":["../../src/utils/metadataDeployer.ts"],"names":[],"mappings":"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"}
package/lib/utils/output.d.ts CHANGED
@@ -64,7 +64,7 @@ export declare class RetrieveResultFormatter implements Formatter<RetrieveResult
64
64
  private result;
65
65
  private packageNames;
66
66
  private files;
67
- constructor(result: RetrieveResult, packageNames: string[]);
67
+ constructor(result: RetrieveResult, packageNames?: string[], deleteResponses?: FileResponse[]);
68
68
  getJson(): RetrieveResultJson;
69
69
  display(): Promise<void>;
70
70
  private displaySuccesses;
package/lib/utils/output.js CHANGED
@@ -29,7 +29,7 @@ function success(message) {
29
29
  function table(responses, columns, options) {
30
30
  // Interfaces cannot be casted to Record<string, unknown> so we have to cast to unknown first
31
31
  // See https://github.com/microsoft/TypeScript/issues/15300
32
- core_1.CliUx.ux.table(responses, columns, options !== null && options !== void 0 ? options : {});
32
+ core_1.CliUx.ux.table(responses, columns, options ?? {});
33
33
  }
34
34
  function colorStatus(status) {
35
35
  if (status === source_deploy_retrieve_1.RequestStatus.Succeeded)
@@ -56,7 +56,7 @@ function sortFileResponses(fileResponses) {
56
56
  if (i.filePath === j.filePath) {
57
57
  return i.fullName > j.fullName ? 1 : -1;
58
58
  }
59
- return (i === null || i === void 0 ? void 0 : i.filePath) > (j === null || j === void 0 ? void 0 : j.filePath) ? 1 : -1;
59
+ return i?.filePath > j?.filePath ? 1 : -1;
60
60
  }
61
61
  return i.type > j.type ? 1 : -1;
62
62
  });
@@ -79,7 +79,6 @@ function toArray(entryOrArray) {
79
79
  }
80
80
  exports.toArray = toArray;
81
81
  function getVersionMessage(action, componentSet, api) {
82
- var _a;
83
82
  // commands pass in the.componentSet, which may not exist in some tests or mdapi deploys
84
83
  if (!componentSet) {
85
84
  return `*** ${action} with ${api} ***`;
@@ -92,7 +91,7 @@ function getVersionMessage(action, componentSet, api) {
92
91
  if (!componentSet.sourceApiVersion ||
93
92
  !componentSet.apiVersion ||
94
93
  componentSet.sourceApiVersion === componentSet.apiVersion) {
95
- return `*** ${action} with ${api} API v${(_a = componentSet.apiVersion) !== null && _a !== void 0 ? _a : componentSet.sourceApiVersion} ***`;
94
+ return `*** ${action} with ${api} API v${componentSet.apiVersion ?? componentSet.sourceApiVersion} ***`;
96
95
  }
97
96
  // has both but they don't match
98
97
  return `*** ${action} v${componentSet.sourceApiVersion} metadata with ${api} API v${componentSet.apiVersion} connection ***`;
@@ -100,10 +99,9 @@ function getVersionMessage(action, componentSet, api) {
100
99
  exports.getVersionMessage = getVersionMessage;
101
100
  class DeployResultFormatter {
102
101
  constructor(result, flags) {
103
- var _a;
104
102
  this.result = result;
105
103
  this.flags = flags;
106
- this.absoluteFiles = sortFileResponses((_a = this.result.getFileResponses()) !== null && _a !== void 0 ? _a : []);
104
+ this.absoluteFiles = sortFileResponses(this.result.getFileResponses() ?? []);
107
105
  this.relativeFiles = asRelativePaths(this.absoluteFiles);
108
106
  this.testLevel = this.flags['test-level'] || types_1.TestLevel.NoTestRun;
109
107
  this.verbosity = this.determineVerbosity();
@@ -133,7 +131,7 @@ class DeployResultFormatter {
133
131
  }
134
132
  displaySuccesses() {
135
133
  const successes = this.relativeFiles.filter((f) => f.state !== 'Failed');
136
- if (!successes.length)
134
+ if (!successes.length || this.result.response.status === source_deploy_retrieve_1.RequestStatus.Failed)
137
135
  return;
138
136
  const columns = {
139
137
  state: { header: 'State' },
@@ -175,7 +173,6 @@ class DeployResultFormatter {
175
173
  table(deletions, columns, options);
176
174
  }
177
175
  displayTestResults() {
178
- var _a, _b, _c, _d;
179
176
  if (this.testLevel === types_1.TestLevel.NoTestRun) {
180
177
  core_1.CliUx.ux.log();
181
178
  return;
@@ -187,10 +184,10 @@ class DeployResultFormatter {
187
184
  }
188
185
  core_1.CliUx.ux.log();
189
186
  core_1.CliUx.ux.log(tableHeader('Test Results Summary'));
190
- const passing = (_a = this.result.response.numberTestsCompleted) !== null && _a !== void 0 ? _a : 0;
191
- const failing = (_b = this.result.response.numberTestErrors) !== null && _b !== void 0 ? _b : 0;
192
- const total = (_c = this.result.response.numberTestsTotal) !== null && _c !== void 0 ? _c : 0;
193
- const time = (_d = this.result.response.details.runTestResult.totalTime) !== null && _d !== void 0 ? _d : 0;
187
+ const passing = this.result.response.numberTestsCompleted ?? 0;
188
+ const failing = this.result.response.numberTestErrors ?? 0;
189
+ const total = this.result.response.numberTestsTotal ?? 0;
190
+ const time = this.result.response.details.runTestResult.totalTime ?? 0;
194
191
  core_1.CliUx.ux.log(`Passing: ${passing}`);
195
192
  core_1.CliUx.ux.log(`Failing: ${failing}`);
196
193
  core_1.CliUx.ux.log(`Total: ${total}`);
@@ -198,8 +195,7 @@ class DeployResultFormatter {
198
195
  core_1.CliUx.ux.log(`Time: ${time}`);
199
196
  }
200
197
  displayVerboseTestSuccesses() {
201
- var _a;
202
- const successes = toArray((_a = this.result.response.details.runTestResult) === null || _a === void 0 ? void 0 : _a.successes);
198
+ const successes = toArray(this.result.response.details.runTestResult?.successes);
203
199
  if (successes.length > 0) {
204
200
  const testSuccesses = sortTestResults(successes);
205
201
  core_1.CliUx.ux.log();
@@ -211,11 +207,10 @@ class DeployResultFormatter {
211
207
  }
212
208
  }
213
209
  displayVerboseTestFailures() {
214
- var _a, _b;
215
210
  if (!this.result.response.numberTestErrors)
216
211
  return;
217
- const failures = toArray((_a = this.result.response.details.runTestResult) === null || _a === void 0 ? void 0 : _a.failures);
218
- const failureCount = (_b = this.result.response.details.runTestResult) === null || _b === void 0 ? void 0 : _b.numFailures;
212
+ const failures = toArray(this.result.response.details.runTestResult?.failures);
213
+ const failureCount = this.result.response.details.runTestResult?.numFailures;
219
214
  const testFailures = sortTestResults(failures);
220
215
  core_1.CliUx.ux.log();
221
216
  core_1.CliUx.ux.log(error(`Test Failures [${failureCount}]`));
@@ -229,8 +224,7 @@ class DeployResultFormatter {
229
224
  }
230
225
  }
231
226
  displayVerboseTestCoverage() {
232
- var _a;
233
- const codeCoverage = toArray((_a = this.result.response.details.runTestResult) === null || _a === void 0 ? void 0 : _a.codeCoverage);
227
+ const codeCoverage = toArray(this.result.response.details.runTestResult?.codeCoverage);
234
228
  if (codeCoverage.length) {
235
229
  const coverage = codeCoverage.sort((a, b) => {
236
230
  return a.name.toUpperCase() > b.name.toUpperCase() ? 1 : -1;
@@ -317,8 +311,7 @@ class DeployCancelResultFormatter {
317
311
  this.result = result;
318
312
  }
319
313
  getJson() {
320
- var _a;
321
- return { ...this.result.response, files: (_a = this.result.getFileResponses()) !== null && _a !== void 0 ? _a : [] };
314
+ return { ...this.result.response, files: this.result.getFileResponses() ?? [] };
322
315
  }
323
316
  display() {
324
317
  if (this.result.response.status === source_deploy_retrieve_1.RequestStatus.Canceled) {
@@ -345,11 +338,10 @@ class AsyncDeployCancelResultFormatter {
345
338
  }
346
339
  exports.AsyncDeployCancelResultFormatter = AsyncDeployCancelResultFormatter;
347
340
  class RetrieveResultFormatter {
348
- constructor(result, packageNames) {
349
- var _a;
341
+ constructor(result, packageNames = [], deleteResponses = []) {
350
342
  this.result = result;
351
343
  this.packageNames = packageNames;
352
- this.files = sortFileResponses(asRelativePaths((_a = this.result.getFileResponses()) !== null && _a !== void 0 ? _a : []));
344
+ this.files = sortFileResponses(asRelativePaths((this.result.getFileResponses() ?? []).concat(deleteResponses)));
353
345
  }
354
346
  getJson() {
355
347
  return { ...this.result.response, files: this.files };
@@ -375,7 +367,7 @@ class RetrieveResultFormatter {
375
367
  }
376
368
  async displayPackages() {
377
369
  const packages = await this.getPackages();
378
- if (packages === null || packages === void 0 ? void 0 : packages.length) {
370
+ if (packages?.length) {
379
371
  const columns = {
380
372
  name: { header: 'Package Name' },
381
373
  fullPath: { header: 'Converted Location' },
@@ -387,14 +379,11 @@ class RetrieveResultFormatter {
387
379
  }
388
380
  }
389
381
  async getPackages() {
390
- var _a;
391
- const packages = [];
392
382
  const projectPath = await core_2.SfProject.resolveProjectPath();
393
- (_a = this.packageNames) === null || _a === void 0 ? void 0 : _a.forEach((name) => {
383
+ return this.packageNames.map((name) => {
394
384
  const packagePath = path.join(projectPath, name);
395
- packages.push({ name, path: packagePath, fullPath: path.resolve(packagePath) });
385
+ return { name, path: packagePath, fullPath: path.resolve(packagePath) };
396
386
  });
397
- return packages;
398
387
  }
399
388
  }
400
389
  exports.RetrieveResultFormatter = RetrieveResultFormatter;
package/lib/utils/output.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"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"}
package/lib/utils/previewOutput.d.ts ADDED
@@ -0,0 +1,30 @@
1
+ import { ComponentSet, ForceIgnore, SourceComponent } from '@salesforce/source-deploy-retrieve';
2
+ import { SourceTracking } from '@salesforce/source-tracking';
3
+ declare type BaseOperation = 'deploy' | 'retrieve';
4
+ export declare type PreviewFile = {
5
+ fullName: string;
6
+ type: string;
7
+ conflict: boolean;
8
+ ignored: boolean;
9
+ path?: string;
10
+ projectRelativePath?: string;
11
+ operation?: BaseOperation | 'deletePost' | 'deletePre';
12
+ };
13
+ export interface PreviewResult {
14
+ ignored: PreviewFile[];
15
+ conflicts: PreviewFile[];
16
+ toDeploy: PreviewFile[];
17
+ toDelete: PreviewFile[];
18
+ toRetrieve: PreviewFile[];
19
+ }
20
+ export declare const compileResults: ({ componentSet, projectPath, filesWithConflicts, forceIgnore, baseOperation, remoteDeletes, }: {
21
+ componentSet: ComponentSet;
22
+ projectPath: string;
23
+ filesWithConflicts: Set<string>;
24
+ forceIgnore: ForceIgnore;
25
+ baseOperation: BaseOperation;
26
+ remoteDeletes?: SourceComponent[];
27
+ }) => PreviewResult;
28
+ export declare const printTables: (result: PreviewResult, baseOperation: BaseOperation) => void;
29
+ export declare const getConflictFiles: (stl?: SourceTracking, ignore?: boolean) => Promise<Set<string>>;
30
+ export {};