@salesforce/plugin-settings 1.4.5 → 1.4.7

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.
@@ -32,7 +32,11 @@ class AliasSet extends alias_1.AliasCommand {
32
32
  return { alias, success: true, value };
33
33
  }
34
34
  catch (err) {
35
- const { name, message } = err;
35
+ const { name, message } = err instanceof Error
36
+ ? err
37
+ : typeof err === 'string'
38
+ ? new Error(err)
39
+ : { name: 'UnknownError', message: 'Unknown Error' };
36
40
  return { alias, success: false, error: { name, message }, value };
37
41
  }
38
42
  });
@@ -1 +1 @@
1
- {"version":3,"file":"set.js","sourceRoot":"","sources":["../../../src/commands/alias/set.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAAqE;AACrE,2CAAsE;AACtE,uCAAyD;AAEzD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,6BAA6B,EAAE,WAAW,CAAC,CAAC;AAEnF,MAAqB,QAAS,SAAQ,oBAA0B;IASvD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3B,MAAM,eAAe,GAAG,MAAM,sBAAe,CAAC,WAAW,EAAE,CAAC;QAE5D,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,QAAQ,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;QAExE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,IAAI,EAAE,IAAgB,CAAC,CAAC;QAEpD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5D,IAAI;gBACF,2HAA2H;gBAC3H,+BAA+B;gBAC/B,IAAI,CAAC,KAAK,EAAE;oBACV,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACtC;qBAAM;oBACL,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBAC3C;gBACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;aACxC;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAAc,CAAC;gBACzC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC;aACnE;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAElC,OAAO,OAAO,CAAC;IACjB,CAAC;;AAxCH,2BAyCC;AAxCe,gBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,oBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,iBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACnC,eAAM,GAAG,KAAK,CAAC,CAAC,sBAAsB;AACtC,gBAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC9B,yBAAgB,GAAG,IAAI,CAAC;AACxB,cAAK,GAAG,EAAE,QAAQ,EAAR,0BAAQ,EAAE,CAAC"}
1
+ {"version":3,"file":"set.js","sourceRoot":"","sources":["../../../src/commands/alias/set.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAAqE;AACrE,2CAA6D;AAC7D,uCAAyD;AAEzD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,6BAA6B,EAAE,WAAW,CAAC,CAAC;AAEnF,MAAqB,QAAS,SAAQ,oBAA0B;IASvD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3B,MAAM,eAAe,GAAG,MAAM,sBAAe,CAAC,WAAW,EAAE,CAAC;QAE5D,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,QAAQ,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;QAExE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,IAAI,EAAE,IAAgB,CAAC,CAAC;QAEpD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5D,IAAI;gBACF,2HAA2H;gBAC3H,+BAA+B;gBAC/B,IAAI,CAAC,KAAK,EAAE;oBACV,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACtC;qBAAM;oBACL,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBAC3C;gBACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;aACxC;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GACrB,GAAG,YAAY,KAAK;oBAClB,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ;wBACzB,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC;wBAChB,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;gBACzD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC;aACnE;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAElC,OAAO,OAAO,CAAC;IACjB,CAAC;;AA7CH,2BA8CC;AA7Ce,gBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,oBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,iBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACnC,eAAM,GAAG,KAAK,CAAC,CAAC,sBAAsB;AACtC,gBAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC9B,yBAAgB,GAAG,IAAI,CAAC;AACxB,cAAK,GAAG,EAAE,QAAQ,EAAR,0BAAQ,EAAE,CAAC"}
@@ -37,7 +37,11 @@ class AliasUnset extends alias_1.AliasCommand {
37
37
  return { alias, value, success: true };
38
38
  }
39
39
  catch (err) {
40
- const { name, message } = err;
40
+ const { name, message } = err instanceof Error
41
+ ? err
42
+ : typeof err === 'string'
43
+ ? new Error(err)
44
+ : { name: 'UnknownError', message: 'Unknown Error' };
41
45
  return { alias, value, success: false, error: { name, message } };
42
46
  }
43
47
  });
@@ -1 +1 @@
1
- {"version":3,"file":"unset.js","sourceRoot":"","sources":["../../../src/commands/alias/unset.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAA8D;AAC9D,2CAAsE;AACtE,uCAAyD;AAEzD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,6BAA6B,EAAE,aAAa,CAAC,CAAC;AAErF,MAAqB,UAAW,SAAQ,oBAA0B;IAmBzD,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,eAAe,GAAG,MAAM,sBAAe,CAAC,WAAW,EAAE,CAAC;QAC5D,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAEjD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,IAAiB,CAAC;QAEvE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,IAAI,KAAK,CAAC,GAAG,EAAE;gBACb,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,CAAC;gBACvD,OAAO,EAAE,CAAC;aACX;YACD,kDAAkD;YAClD,MAAM,QAAQ,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;SAClD;QAED,uEAAuE;QACvE,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;YAC7G,OAAO,EAAE,CAAC;SACX;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACrC,6EAA6E;YAC7E,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI;gBACF,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;aACxC;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAAc,CAAC;gBACzC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;aACnE;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAEpC,OAAO,OAAO,CAAC;IACjB,CAAC;;AA1DH,6BA2DC;AA1De,kBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,sBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,mBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACnC,iBAAM,GAAG,KAAK,CAAC,CAAC,sBAAsB;AACtC,kBAAO,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAChC,2BAAgB,GAAG,IAAI,CAAC;AACjC,gBAAK,GAAG;IACpB,QAAQ,EAAR,0BAAQ;IACR,GAAG,EAAE,uBAAK,CAAC,OAAO,CAAC;QACjB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACjD,IAAI,EAAE,GAAG;KACV,CAAC;IACF,WAAW,EAAE,uBAAK,CAAC,OAAO,CAAC;QACzB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;QACvD,IAAI,EAAE,GAAG;KACV,CAAC;CACH,CAAC"}
1
+ {"version":3,"file":"unset.js","sourceRoot":"","sources":["../../../src/commands/alias/unset.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
- import { ConfigCommand, ConfigResponses } from '../../config';
2
- export declare class Get extends ConfigCommand<ConfigResponses> {
1
+ import { SfCommand } from '@salesforce/sf-plugins-core';
2
+ import { ConfigResponses } from '../../config';
3
+ export declare class Get extends SfCommand<ConfigResponses> {
3
4
  static readonly description: string;
4
5
  static readonly summary: string;
5
6
  static readonly examples: string[];
@@ -12,52 +12,35 @@ const core_1 = require("@salesforce/core");
12
12
  const config_1 = require("../../config");
13
13
  core_1.Messages.importMessagesDirectory(__dirname);
14
14
  const messages = core_1.Messages.loadMessages('@salesforce/plugin-settings', 'config.get');
15
- class Get extends config_1.ConfigCommand {
15
+ class Get extends sf_plugins_core_1.SfCommand {
16
16
  async run() {
17
17
  const { argv, flags } = await this.parse(Get);
18
- // instantiate a SfdxConfigAggregator to get the restDeploy <-> org-metadata-rest-deploy deprecation linked
19
- await core_1.SfdxConfigAggregator.create({});
18
+ const responses = [];
20
19
  if (!argv || argv.length === 0) {
21
20
  throw messages.createError('error.NoConfigKeysFound');
22
21
  }
23
22
  const aggregator = await core_1.ConfigAggregator.create();
24
23
  for (const configName of argv) {
25
24
  try {
26
- this.pushSuccess(aggregator.getInfo(configName, true));
25
+ responses.push((0, config_1.buildSuccessMsg)(aggregator.getInfo(configName)));
27
26
  }
28
27
  catch (err) {
29
- const error = err;
30
- if (error.message.includes('Deprecated config name')) {
31
- // because we've caught the deprecated error, the 'newKey' property will be set
32
- const info = aggregator.getInfo(aggregator.getPropertyMeta(configName).newKey);
33
- // deprecated key, so we'll get the replacement and return the value
34
- this.responses.push({
35
- name: info.key,
36
- key: configName,
37
- value: info.value,
38
- deprecated: true,
39
- location: info.location,
40
- path: info.path,
41
- error,
42
- message: error.message,
43
- success: true,
44
- });
45
- }
46
- else if (error.name.includes('UnknownConfigKeyError') && !this.jsonEnabled()) {
47
- const suggestion = this.calculateSuggestion(configName);
28
+ if (err instanceof Error && err.name.includes('UnknownConfigKeyError') && !this.jsonEnabled()) {
29
+ const suggestion = (0, config_1.calculateSuggestion)(configName);
48
30
  // eslint-disable-next-line no-await-in-loop
49
31
  const answer = (await this.confirm(messages.getMessage('didYouMean', [suggestion]), 10 * 1000)) ?? false;
50
32
  if (answer) {
51
- this.pushSuccess(aggregator.getInfo(suggestion, false));
33
+ responses.push((0, config_1.buildSuccessMsg)(aggregator.getInfo(suggestion, false)));
52
34
  }
53
35
  }
54
36
  else {
55
- this.pushFailure(configName, err);
37
+ responses.push((0, config_1.buildFailureMsg)(configName, err));
38
+ process.exitCode = 1;
56
39
  }
57
40
  }
58
41
  }
59
- this.output('Get Config', flags.verbose);
60
- return this.responses;
42
+ (0, config_1.output)(new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }), responses, 'get', flags.verbose);
43
+ return responses;
61
44
  }
62
45
  }
63
46
  exports.Get = Get;
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/config/get.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/config/get.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,iEAA6E;AAC7E,2CAA8D;AAC9D,yCAOsB;AAEtB,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,6BAA6B,EAAE,YAAY,CAAC,CAAC;AAEpF,MAAa,GAAI,SAAQ,2BAA0B;IAgB1C,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAoB,EAAE,CAAC;QACtC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,QAAQ,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;SACvD;QAED,MAAM,UAAU,GAAG,MAAM,uBAAgB,CAAC,MAAM,EAAE,CAAC;QAEnD,KAAK,MAAM,UAAU,IAAI,IAAgB,EAAE;YACzC,IAAI;gBACF,SAAS,CAAC,IAAI,CAAC,IAAA,wBAAe,EAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;aACjE;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;oBAC7F,MAAM,UAAU,GAAG,IAAA,4BAAmB,EAAC,UAAU,CAAC,CAAC;oBACnD,4CAA4C;oBAC5C,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC;oBACzG,IAAI,MAAM,EAAE;wBACV,SAAS,CAAC,IAAI,CAAC,IAAA,wBAAe,EAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;qBACxE;iBACF;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,IAAA,wBAAe,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;iBACtB;aACF;SACF;QAED,IAAA,eAAM,EAAC,IAAI,oBAAE,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACrF,OAAO,SAAS,CAAC;IACnB,CAAC;;AA7CH,kBA8CC;AA7CwB,eAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,WAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,YAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,WAAO,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAC/B,oBAAgB,GAAG,IAAI,CAAC;AACxB,UAAM,GAAG,KAAK,CAAC;AACf,SAAK,GAAG;IAC7B,QAAQ,EAAR,0BAAQ;IACR,OAAO,EAAE,uBAAK,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;KACtD,CAAC;CACH,CAAC;AAEY,iCAA6B,GAAG,4BAAmB,CAAC"}
@@ -1,11 +1,12 @@
1
- import { ConfigCommand, ConfigResponses } from '../../config';
2
- export default class List extends ConfigCommand<ConfigResponses> {
1
+ import { SfCommand } from '@salesforce/sf-plugins-core';
2
+ import { ConfigResponses } from '../../config';
3
+ export default class List extends SfCommand<ConfigResponses> {
3
4
  static readonly description: string;
4
5
  static readonly summary: string;
5
6
  static readonly examples: string[];
6
7
  static readonly aliases: string[];
7
8
  static readonly deprecateAliases = true;
8
- static flags: {
9
+ static readonly flags: {
9
10
  loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
10
11
  };
11
12
  run(): Promise<ConfigResponses>;
@@ -11,17 +11,12 @@ const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
11
11
  const config_1 = require("../../config");
12
12
  core_1.Messages.importMessagesDirectory(__dirname);
13
13
  const messages = core_1.Messages.loadMessages('@salesforce/plugin-settings', 'config.list');
14
- class List extends config_1.ConfigCommand {
14
+ class List extends sf_plugins_core_1.SfCommand {
15
15
  async run() {
16
- await core_1.SfdxConfigAggregator.create({});
17
16
  const aggregator = await core_1.ConfigAggregator.create();
18
- aggregator.getConfigInfo().forEach((c) => {
19
- this.pushSuccess(c);
20
- });
21
- if (!this.jsonEnabled()) {
22
- this.output('List Config', true);
23
- }
24
- return this.responses;
17
+ const responses = aggregator.getConfigInfo().map((c) => (0, config_1.buildSuccessMsg)(c));
18
+ (0, config_1.output)(new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }), responses, 'list', true);
19
+ return responses;
25
20
  }
26
21
  }
27
22
  exports.default = List;
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/config/list.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,2CAAoF;AACpF,iEAAuD;AACvD,yCAA8D;AAE9D,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,6BAA6B,EAAE,aAAa,CAAC,CAAC;AAErF,MAAqB,IAAK,SAAQ,sBAA8B;IAQvD,KAAK,CAAC,GAAG;QACd,MAAM,2BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,MAAM,uBAAgB,CAAC,MAAM,EAAE,CAAC;QAEnD,UAAU,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;SAClC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;;AApBH,uBAqBC;AApBwB,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,YAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,aAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,YAAO,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAChC,qBAAgB,GAAG,IAAI,CAAC;AACjC,UAAK,GAAG,EAAE,QAAQ,EAAR,0BAAQ,EAAE,CAAC"}
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/config/list.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,2CAA8D;AAC9D,iEAAsE;AACtE,yCAAwE;AAExE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,6BAA6B,EAAE,aAAa,CAAC,CAAC;AAErF,MAAqB,IAAK,SAAQ,2BAA0B;IAQnD,KAAK,CAAC,GAAG;QACd,MAAM,UAAU,GAAG,MAAM,uBAAgB,CAAC,MAAM,EAAE,CAAC;QAEnD,MAAM,SAAS,GAAG,UAAU,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,wBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;QAE5E,IAAA,eAAM,EAAC,IAAI,oBAAE,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7E,OAAO,SAAS,CAAC;IACnB,CAAC;;AAhBH,uBAiBC;AAhBwB,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,YAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,aAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,YAAO,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAChC,qBAAgB,GAAG,IAAI,CAAC;AACxB,UAAK,GAAG,EAAE,QAAQ,EAAR,0BAAQ,EAAE,CAAC"}
@@ -1,9 +1,10 @@
1
- import { ConfigCommand, Msg } from '../../config';
2
- export type SetConfigCommandResult = {
1
+ import { SfCommand } from '@salesforce/sf-plugins-core';
2
+ import { Msg } from '../../config';
3
+ export type SetOrUnsetConfigCommandResult = {
3
4
  successes: Msg[];
4
5
  failures: Msg[];
5
6
  };
6
- export declare class Set extends ConfigCommand<SetConfigCommandResult> {
7
+ export declare class Set extends SfCommand<SetOrUnsetConfigCommandResult> {
7
8
  static readonly description: string;
8
9
  static readonly summary: string;
9
10
  static readonly examples: string[];
@@ -15,7 +16,5 @@ export declare class Set extends ConfigCommand<SetConfigCommandResult> {
15
16
  global: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
16
17
  };
17
18
  static configurationVariablesSection: import("@oclif/core").HelpSection;
18
- private setResponses;
19
- run(): Promise<SetConfigCommandResult>;
20
- protected pushFailure(name: string, err: string | Error, value?: string): void;
19
+ run(): Promise<SetOrUnsetConfigCommandResult>;
21
20
  }
@@ -12,106 +12,61 @@ const core_1 = require("@salesforce/core");
12
12
  const config_1 = require("../../config");
13
13
  core_1.Messages.importMessagesDirectory(__dirname);
14
14
  const messages = core_1.Messages.loadMessages('@salesforce/plugin-settings', 'config.set');
15
- class Set extends config_1.ConfigCommand {
16
- constructor() {
17
- super(...arguments);
18
- this.setResponses = { successes: [], failures: [] };
19
- }
15
+ class Set extends sf_plugins_core_1.SfCommand {
20
16
  async run() {
21
17
  const { args, argv, flags } = await this.parse(Set);
22
18
  const config = await loadConfig(flags.global);
19
+ const responses = { successes: [], failures: [] };
23
20
  if (!argv.length)
24
21
  throw messages.createError('error.ArgumentsRequired');
25
22
  const parsed = (0, sf_plugins_core_1.parseVarArgs)(args, argv);
26
- for (const name of Object.keys(parsed)) {
27
- const value = parsed[name];
23
+ for (const [name, value] of Object.entries(parsed)) {
24
+ let resolvedName = name;
28
25
  try {
26
+ // this needs to be inside the try/catch because it can throw an error
27
+ resolvedName = this.configAggregator.getPropertyMeta(name)?.newKey ?? name;
29
28
  if (!value) {
30
29
  // Push a failure if users are try to unset a value with `set=`.
31
- this.pushFailure(name, messages.createError('error.ValueRequired'), value);
30
+ responses.failures.push((0, config_1.buildFailureMsg)(name, messages.createError('error.ValueRequired'), value));
32
31
  }
33
32
  else {
34
33
  // core's builtin config validation requires synchronous functions but there's
35
34
  // currently no way to validate an org synchronously. Therefore, we have to manually
36
35
  // validate the org here and manually set the error message if it fails
37
36
  // eslint-disable-next-line no-await-in-loop
38
- if (isOrgKey(name) && value)
37
+ if (isOrgKey(resolvedName) && value)
39
38
  await validateOrg(value);
40
- config.set(name, value);
41
- this.setResponses.successes.push({ name, value, success: true });
39
+ config.set(resolvedName, value);
40
+ responses.successes.push({ name: resolvedName, value, success: true });
42
41
  }
43
42
  }
44
- catch (err) {
45
- const error = err;
46
- if (error.name === 'DeprecatedConfigKeyError') {
47
- const newKey = core_1.Config.getPropertyConfigMeta(name)?.key ?? name;
48
- try {
49
- config.set(newKey, value);
50
- this.setResponses.successes.push({
51
- name,
52
- value,
53
- success: true,
54
- error,
55
- message: error.message.replace(/\.\.$/, '.'),
56
- });
57
- }
58
- catch (e) {
59
- const secondError = e;
60
- // if that deprecated value was also set to an invalid value
61
- this.setResponses.failures.push({
62
- name,
63
- key: name,
64
- success: false,
65
- value,
66
- error: secondError,
67
- message: secondError.message.replace(/\.\.$/, '.'),
68
- });
69
- }
70
- }
71
- else if (error.name.includes('UnknownConfigKeyError')) {
43
+ catch (error) {
44
+ if (error instanceof Error && error.name.includes('UnknownConfigKeyError')) {
72
45
  if (this.jsonEnabled()) {
73
- process.exitCode = 1;
74
- this.setResponses.failures.push({
75
- name,
76
- value,
77
- success: false,
78
- error,
79
- message: error.message.replace(/\.\.$/, '.'),
80
- });
46
+ responses.failures.push((0, config_1.buildFailureMsg)(resolvedName, error, value));
81
47
  }
82
48
  else {
83
- const suggestion = this.calculateSuggestion(name);
49
+ const suggestion = (0, config_1.calculateSuggestion)(name);
84
50
  // eslint-disable-next-line no-await-in-loop
85
51
  const answer = (await this.confirm(messages.getMessage('didYouMean', [suggestion]), 10 * 1000)) ?? false;
86
- if (answer) {
52
+ if (answer && value) {
87
53
  const key = core_1.Config.getPropertyConfigMeta(suggestion)?.key ?? suggestion;
88
54
  config.set(key, value);
89
- this.setResponses.successes.push({ name: key, value, success: true });
55
+ responses.successes.push({ name: key, value, success: true });
90
56
  }
91
57
  }
92
58
  }
93
59
  else {
94
- this.pushFailure(name, err, value);
60
+ responses.failures.push((0, config_1.buildFailureMsg)(resolvedName, error, value));
95
61
  }
96
62
  }
97
63
  }
98
64
  await config.write();
99
- if (!this.jsonEnabled()) {
100
- this.responses = [...this.setResponses.successes, ...this.setResponses.failures];
101
- this.output('Set Config', false);
65
+ if (responses.failures.length) {
66
+ process.exitCode = 1;
102
67
  }
103
- return this.setResponses;
104
- }
105
- pushFailure(name, err, value) {
106
- const error = core_1.SfError.wrap(err);
107
- this.setResponses.failures.push({
108
- name,
109
- success: false,
110
- value,
111
- error,
112
- message: error.message.replace(/\.\.$/, '.'),
113
- });
114
- process.exitCode = 1;
68
+ (0, config_1.output)(new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }), [...responses.successes, ...responses.failures], 'set');
69
+ return responses;
115
70
  }
116
71
  }
117
72
  exports.Set = Set;
@@ -131,7 +86,6 @@ Set.flags = {
131
86
  Set.configurationVariablesSection = config_1.CONFIG_HELP_SECTION;
132
87
  const loadConfig = async (global) => {
133
88
  try {
134
- await core_1.SfdxConfigAggregator.create({});
135
89
  const config = await core_1.Config.create(core_1.Config.getDefaultOptions(global));
136
90
  await config.read();
137
91
  return config;
@@ -1 +1 @@
1
- {"version":3,"file":"set.js","sourceRoot":"","sources":["../../../src/commands/config/set.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"set.js","sourceRoot":"","sources":["../../../src/commands/config/set.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
- import { ConfigCommand } from '../../config';
2
- import { SetConfigCommandResult } from './set';
3
- export declare class UnSet extends ConfigCommand<SetConfigCommandResult> {
1
+ import { SfCommand } from '@salesforce/sf-plugins-core';
2
+ import { SetOrUnsetConfigCommandResult } from './set';
3
+ export declare class UnSet extends SfCommand<SetOrUnsetConfigCommandResult> {
4
4
  static readonly description: string;
5
5
  static readonly summary: string;
6
6
  static readonly examples: string[];
@@ -12,7 +12,6 @@ export declare class UnSet extends ConfigCommand<SetConfigCommandResult> {
12
12
  loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
13
13
  global: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
14
14
  };
15
- private unsetResponses;
16
- run(): Promise<SetConfigCommandResult>;
17
- protected pushFailure(name: string, err: string | Error, value?: string): void;
15
+ private responses;
16
+ run(): Promise<SetOrUnsetConfigCommandResult>;
18
17
  }
@@ -12,14 +12,13 @@ const core_1 = require("@salesforce/core");
12
12
  const config_1 = require("../../config");
13
13
  core_1.Messages.importMessagesDirectory(__dirname);
14
14
  const messages = core_1.Messages.loadMessages('@salesforce/plugin-settings', 'config.unset');
15
- class UnSet extends config_1.ConfigCommand {
15
+ class UnSet extends sf_plugins_core_1.SfCommand {
16
16
  constructor() {
17
17
  super(...arguments);
18
- this.unsetResponses = { successes: [], failures: [] };
18
+ this.responses = { successes: [], failures: [] };
19
19
  }
20
20
  async run() {
21
21
  const { argv, flags } = await this.parse(UnSet);
22
- await core_1.SfdxConfigAggregator.create({});
23
22
  if (!argv || argv.length === 0) {
24
23
  throw messages.createError('error.NoConfigKeysFound');
25
24
  }
@@ -27,28 +26,18 @@ class UnSet extends config_1.ConfigCommand {
27
26
  await config.read();
28
27
  for (const key of argv) {
29
28
  try {
30
- config.unset(key);
31
- this.unsetResponses.successes.push({ name: key, success: true });
29
+ const resolvedName = this.configAggregator.getPropertyMeta(key)?.newKey ?? key;
30
+ config.unset(resolvedName);
31
+ this.responses.successes.push({ name: resolvedName, success: true });
32
32
  }
33
- catch (err) {
34
- const error = err;
35
- if (error.message.includes('Deprecated config name')) {
36
- const meta = core_1.Config.getPropertyConfigMeta(key);
37
- config.unset(meta?.key ?? key);
38
- this.unsetResponses.successes.push({
39
- name: key,
40
- success: true,
41
- error,
42
- message: error.message.replace(/\.\.$/, '.'),
43
- });
44
- }
45
- else if (error.name.includes('UnknownConfigKeyError') && !this.jsonEnabled()) {
46
- const suggestion = this.calculateSuggestion(key);
33
+ catch (error) {
34
+ if (error instanceof Error && error.name.includes('UnknownConfigKeyError') && !this.jsonEnabled()) {
35
+ const suggestion = (0, config_1.calculateSuggestion)(key);
47
36
  // eslint-disable-next-line no-await-in-loop
48
37
  const answer = (await this.confirm(messages.getMessage('didYouMean', [suggestion]), 10 * 1000)) ?? false;
49
38
  if (answer) {
50
39
  config.unset(suggestion);
51
- this.unsetResponses.successes.push({
40
+ this.responses.successes.push({
52
41
  name: suggestion,
53
42
  success: true,
54
43
  error,
@@ -57,25 +46,14 @@ class UnSet extends config_1.ConfigCommand {
57
46
  }
58
47
  }
59
48
  else {
60
- this.pushFailure(key, err);
49
+ this.responses.failures.push((0, config_1.buildFailureMsg)(key, error));
50
+ process.exitCode = 1;
61
51
  }
62
52
  }
63
53
  }
64
54
  await config.write();
65
- this.responses = [...this.unsetResponses.successes, ...this.unsetResponses.failures];
66
- this.output('Unset Config', false);
67
- return this.unsetResponses;
68
- }
69
- pushFailure(name, err, value) {
70
- const error = core_1.SfError.wrap(err);
71
- this.unsetResponses.failures.push({
72
- name,
73
- success: false,
74
- value,
75
- error,
76
- message: error.message.replace(/\.\.$/, '.'),
77
- });
78
- process.exitCode = 1;
55
+ (0, config_1.output)(new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }), [...this.responses.successes, ...this.responses.failures], 'unset');
56
+ return this.responses;
79
57
  }
80
58
  }
81
59
  exports.UnSet = UnSet;
@@ -1 +1 @@
1
- {"version":3,"file":"unset.js","sourceRoot":"","sources":["../../../src/commands/config/unset.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"unset.js","sourceRoot":"","sources":["../../../src/commands/config/unset.ts"],"names":[],"mappings":"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"}
package/lib/config.d.ts CHANGED
@@ -1,8 +1,8 @@
1
- import { SfCommand } from '@salesforce/sf-plugins-core';
1
+ import { Ux } from '@salesforce/sf-plugins-core';
2
2
  import { ConfigInfo } from '@salesforce/core';
3
3
  export type Msg = {
4
4
  name: string;
5
- value?: string;
5
+ value?: string | boolean | number | null;
6
6
  success: boolean;
7
7
  location?: string;
8
8
  path?: string;
@@ -21,10 +21,7 @@ export type Msg = {
21
21
  };
22
22
  export type ConfigResponses = Msg[];
23
23
  export declare const CONFIG_HELP_SECTION: import("@oclif/core").HelpSection;
24
- export declare abstract class ConfigCommand<T> extends SfCommand<T> {
25
- protected responses: ConfigResponses;
26
- calculateSuggestion(userEnteredConfig: string): string;
27
- protected pushSuccess(configInfo: ConfigInfo): void;
28
- protected pushFailure(name: string, err: string | Error, value?: string): void;
29
- protected output(title: string, verbose: boolean): void;
30
- }
24
+ export declare const calculateSuggestion: (userEnteredConfig: string) => string;
25
+ export declare const buildFailureMsg: (name: string, err: unknown, value?: string) => Msg;
26
+ export declare const buildSuccessMsg: (configInfo: ConfigInfo) => Msg;
27
+ export declare const output: (ux: Ux, responses: Msg[], command: 'set' | 'unset' | 'list' | 'get', verbose?: boolean) => void;