@salesforce/plugin-settings 1.4.6 → 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":"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"}
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,34 +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
+ const responses = [];
18
19
  if (!argv || argv.length === 0) {
19
20
  throw messages.createError('error.NoConfigKeysFound');
20
21
  }
21
22
  const aggregator = await core_1.ConfigAggregator.create();
22
23
  for (const configName of argv) {
23
24
  try {
24
- this.pushSuccess(aggregator.getInfo(configName));
25
+ responses.push((0, config_1.buildSuccessMsg)(aggregator.getInfo(configName)));
25
26
  }
26
27
  catch (err) {
27
- const error = err;
28
- if (error.name.includes('UnknownConfigKeyError') && !this.jsonEnabled()) {
29
- const suggestion = this.calculateSuggestion(configName);
28
+ if (err instanceof Error && err.name.includes('UnknownConfigKeyError') && !this.jsonEnabled()) {
29
+ const suggestion = (0, config_1.calculateSuggestion)(configName);
30
30
  // eslint-disable-next-line no-await-in-loop
31
31
  const answer = (await this.confirm(messages.getMessage('didYouMean', [suggestion]), 10 * 1000)) ?? false;
32
32
  if (answer) {
33
- this.pushSuccess(aggregator.getInfo(suggestion, false));
33
+ responses.push((0, config_1.buildSuccessMsg)(aggregator.getInfo(suggestion, false)));
34
34
  }
35
35
  }
36
36
  else {
37
- this.pushFailure(configName, err);
37
+ responses.push((0, config_1.buildFailureMsg)(configName, err));
38
+ process.exitCode = 1;
38
39
  }
39
40
  }
40
41
  }
41
- this.output('Get Config', flags.verbose);
42
- return this.responses;
42
+ (0, config_1.output)(new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }), responses, 'get', flags.verbose);
43
+ return responses;
43
44
  }
44
45
  }
45
46
  exports.Get = Get;
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/config/get.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,iEAA8D;AAC9D,2CAA8D;AAC9D,yCAAmF;AAEnF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,6BAA6B,EAAE,YAAY,CAAC,CAAC;AAEpF,MAAa,GAAI,SAAQ,sBAA8B;IAgB9C,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,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,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;aAClD;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,KAAK,GAAG,GAAY,CAAC;gBAC3B,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;oBACvE,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;oBACxD,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,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;qBACzD;iBACF;qBAAM;oBACL,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,GAAY,CAAC,CAAC;iBAC5C;aACF;SACF;QAED,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAEzC,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,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
+ {"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,16 +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
16
  const aggregator = await core_1.ConfigAggregator.create();
17
- aggregator.getConfigInfo().forEach((c) => {
18
- this.pushSuccess(c);
19
- });
20
- if (!this.jsonEnabled()) {
21
- this.output('List Config', true);
22
- }
23
- 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;
24
20
  }
25
21
  }
26
22
  exports.default = List;
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/config/list.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,2CAA8D;AAC9D,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,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;;AAnBH,uBAoBC;AAnBwB,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,26 +12,22 @@ 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)) {
28
24
  let resolvedName = name;
29
25
  try {
30
26
  // this needs to be inside the try/catch because it can throw an error
31
27
  resolvedName = this.configAggregator.getPropertyMeta(name)?.newKey ?? name;
32
28
  if (!value) {
33
29
  // Push a failure if users are try to unset a value with `set=`.
34
- this.pushFailure(name, messages.createError('error.ValueRequired'), value);
30
+ responses.failures.push((0, config_1.buildFailureMsg)(name, messages.createError('error.ValueRequired'), value));
35
31
  }
36
32
  else {
37
33
  // core's builtin config validation requires synchronous functions but there's
@@ -41,55 +37,36 @@ class Set extends config_1.ConfigCommand {
41
37
  if (isOrgKey(resolvedName) && value)
42
38
  await validateOrg(value);
43
39
  config.set(resolvedName, value);
44
- this.setResponses.successes.push({ name: resolvedName, value, success: true });
40
+ responses.successes.push({ name: resolvedName, value, success: true });
45
41
  }
46
42
  }
47
- catch (err) {
48
- const error = err;
49
- if (error.name.includes('UnknownConfigKeyError')) {
43
+ catch (error) {
44
+ if (error instanceof Error && error.name.includes('UnknownConfigKeyError')) {
50
45
  if (this.jsonEnabled()) {
51
- process.exitCode = 1;
52
- this.setResponses.failures.push({
53
- name,
54
- value,
55
- success: false,
56
- error,
57
- message: error.message.replace(/\.\.$/, '.'),
58
- });
46
+ responses.failures.push((0, config_1.buildFailureMsg)(resolvedName, error, value));
59
47
  }
60
48
  else {
61
- const suggestion = this.calculateSuggestion(name);
49
+ const suggestion = (0, config_1.calculateSuggestion)(name);
62
50
  // eslint-disable-next-line no-await-in-loop
63
51
  const answer = (await this.confirm(messages.getMessage('didYouMean', [suggestion]), 10 * 1000)) ?? false;
64
- if (answer) {
52
+ if (answer && value) {
65
53
  const key = core_1.Config.getPropertyConfigMeta(suggestion)?.key ?? suggestion;
66
54
  config.set(key, value);
67
- this.setResponses.successes.push({ name: key, value, success: true });
55
+ responses.successes.push({ name: key, value, success: true });
68
56
  }
69
57
  }
70
58
  }
71
59
  else {
72
- this.pushFailure(resolvedName, err, value);
60
+ responses.failures.push((0, config_1.buildFailureMsg)(resolvedName, error, value));
73
61
  }
74
62
  }
75
63
  }
76
64
  await config.write();
77
- if (!this.jsonEnabled()) {
78
- this.responses = [...this.setResponses.successes, ...this.setResponses.failures];
79
- this.output('Set Config', false);
65
+ if (responses.failures.length) {
66
+ process.exitCode = 1;
80
67
  }
81
- return this.setResponses;
82
- }
83
- pushFailure(name, err, value) {
84
- const error = core_1.SfError.wrap(err);
85
- this.setResponses.failures.push({
86
- name,
87
- success: false,
88
- value,
89
- error,
90
- message: error.message.replace(/\.\.$/, '.'),
91
- });
92
- 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;
93
70
  }
94
71
  }
95
72
  exports.Set = Set;
@@ -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,10 +12,10 @@ 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);
@@ -28,17 +28,16 @@ class UnSet extends config_1.ConfigCommand {
28
28
  try {
29
29
  const resolvedName = this.configAggregator.getPropertyMeta(key)?.newKey ?? key;
30
30
  config.unset(resolvedName);
31
- this.unsetResponses.successes.push({ name: resolvedName, success: true });
31
+ this.responses.successes.push({ name: resolvedName, success: true });
32
32
  }
33
- catch (err) {
34
- const error = err;
35
- if (error.name.includes('UnknownConfigKeyError') && !this.jsonEnabled()) {
36
- 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);
37
36
  // eslint-disable-next-line no-await-in-loop
38
37
  const answer = (await this.confirm(messages.getMessage('didYouMean', [suggestion]), 10 * 1000)) ?? false;
39
38
  if (answer) {
40
39
  config.unset(suggestion);
41
- this.unsetResponses.successes.push({
40
+ this.responses.successes.push({
42
41
  name: suggestion,
43
42
  success: true,
44
43
  error,
@@ -47,25 +46,14 @@ class UnSet extends config_1.ConfigCommand {
47
46
  }
48
47
  }
49
48
  else {
50
- this.pushFailure(key, err);
49
+ this.responses.failures.push((0, config_1.buildFailureMsg)(key, error));
50
+ process.exitCode = 1;
51
51
  }
52
52
  }
53
53
  }
54
54
  await config.write();
55
- this.responses = [...this.unsetResponses.successes, ...this.unsetResponses.failures];
56
- this.output('Unset Config', false);
57
- return this.unsetResponses;
58
- }
59
- pushFailure(name, err, value) {
60
- const error = core_1.SfError.wrap(err);
61
- this.unsetResponses.failures.push({
62
- name,
63
- success: false,
64
- value,
65
- error,
66
- message: error.message.replace(/\.\.$/, '.'),
67
- });
68
- 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;
69
57
  }
70
58
  }
71
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;
package/lib/config.js CHANGED
@@ -6,81 +6,93 @@
6
6
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.ConfigCommand = exports.CONFIG_HELP_SECTION = void 0;
10
- const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
9
+ exports.output = exports.buildSuccessMsg = exports.buildFailureMsg = exports.calculateSuggestion = exports.CONFIG_HELP_SECTION = void 0;
11
10
  const core_1 = require("@salesforce/core");
12
- const sf_plugins_core_2 = require("@salesforce/sf-plugins-core");
11
+ const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
13
12
  const Levenshtein = require("fast-levenshtein");
14
- exports.CONFIG_HELP_SECTION = (0, sf_plugins_core_2.toHelpSection)('CONFIGURATION VARIABLES', ...new Set(core_1.Config.getAllowedProperties().map((k) => k.newKey ?? k.key)));
15
- class ConfigCommand extends sf_plugins_core_1.SfCommand {
16
- constructor() {
17
- super(...arguments);
18
- this.responses = [];
19
- }
20
- // eslint-disable-next-line class-methods-use-this
21
- calculateSuggestion(userEnteredConfig) {
22
- // we'll use this array to keep track of which key is the closest to the users entered value.
23
- // keys closer to the index 0 will be a closer guess than keys indexed further from 0
24
- // an entry at 0 would be a direct match, an entry at 1 would be a single character off, etc.
25
- const index = [];
26
- core_1.Config.getAllowedProperties()
27
- .map((k) => k.newKey ?? k.key)
28
- .map((k) => (index[Levenshtein.get(userEnteredConfig, k)] = k));
29
- return index.find((item) => item !== undefined) ?? '';
13
+ const ts_types_1 = require("@salesforce/ts-types");
14
+ exports.CONFIG_HELP_SECTION = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', ...new Set(core_1.Config.getAllowedProperties().map((k) => k.newKey ?? k.key)));
15
+ const calculateSuggestion = (userEnteredConfig) => {
16
+ // we'll use this array to keep track of which key is the closest to the users entered value.
17
+ // keys closer to the index 0 will be a closer guess than keys indexed further from 0
18
+ // an entry at 0 would be a direct match, an entry at 1 would be a single character off, etc.
19
+ const index = [];
20
+ core_1.Config.getAllowedProperties()
21
+ .map((k) => k.newKey ?? k.key)
22
+ .map((k) => (index[Levenshtein.get(userEnteredConfig, k)] = k));
23
+ return index.find((item) => item !== undefined) ?? '';
24
+ };
25
+ exports.calculateSuggestion = calculateSuggestion;
26
+ const buildFailureMsg = (name, err, value) => {
27
+ const error = core_1.SfError.wrap(typeof err !== 'string' && !(err instanceof Error) ? 'Unknown error' : err);
28
+ return {
29
+ name,
30
+ success: false,
31
+ value,
32
+ error,
33
+ message: error.message.replace(/\.\.$/, '.'),
34
+ };
35
+ };
36
+ exports.buildFailureMsg = buildFailureMsg;
37
+ const buildSuccessMsg = (configInfo) => {
38
+ if (Array.isArray(configInfo.value)) {
39
+ throw new core_1.SfError(`Config ${configInfo.key} is an Array. It should be a primitive.`);
30
40
  }
31
- pushSuccess(configInfo) {
32
- this.responses.push({
33
- name: configInfo.key,
34
- key: configInfo.key,
35
- value: configInfo.value,
36
- path: configInfo.path,
37
- success: true,
38
- location: configInfo.location,
39
- });
41
+ if ((0, ts_types_1.isJsonMap)(configInfo.value)) {
42
+ throw new core_1.SfError(`Config ${configInfo.key} is an Object. It should be a primitive.`);
40
43
  }
41
- pushFailure(name, err, value) {
42
- const error = core_1.SfError.wrap(err);
43
- this.responses.push({
44
- name,
45
- success: false,
46
- value,
47
- error,
48
- message: error.message.replace(/\.\.$/, '.'),
49
- });
50
- process.exitCode = 1;
44
+ return {
45
+ name: configInfo.key,
46
+ key: configInfo.key,
47
+ value: configInfo.value,
48
+ path: configInfo.path,
49
+ success: true,
50
+ location: configInfo.location,
51
+ };
52
+ };
53
+ exports.buildSuccessMsg = buildSuccessMsg;
54
+ const output = (ux, responses, command, verbose = false) => {
55
+ if (!ux.outputEnabled) {
56
+ return;
51
57
  }
52
- output(title, verbose) {
53
- if (this.responses.length === 0) {
54
- this.log('No results found');
55
- return;
56
- }
57
- const columns = {
58
- name: { header: 'Name' },
59
- };
60
- if (!title.includes('Unset')) {
61
- columns.value = {
62
- header: 'Value',
63
- get: (row) => row.value ?? '',
64
- };
65
- }
66
- if (!title.includes('List')) {
67
- columns.success = { header: 'Success' };
68
- }
69
- if (verbose) {
70
- columns.location = {
71
- header: 'Location',
72
- get: (row) => row.location ?? '',
73
- };
74
- }
75
- if (this.responses.some((msg) => msg.error)) {
76
- columns.message = {
77
- header: 'Message',
78
- get: (row) => row.message ?? '',
79
- };
80
- this.responses.map((msg) => (msg.message = msg.error?.message));
81
- }
82
- this.table(this.responses, columns, { title });
58
+ if (responses.length === 0) {
59
+ ux.log('No results found');
60
+ return;
83
61
  }
84
- }
85
- exports.ConfigCommand = ConfigCommand;
62
+ ux.table(responses, {
63
+ name: { header: 'Name' },
64
+ ...(verbose
65
+ ? {
66
+ location: {
67
+ header: 'Location',
68
+ get: (row) => row.location ?? '',
69
+ },
70
+ }
71
+ : {}),
72
+ ...(command === 'unset'
73
+ ? {}
74
+ : {
75
+ value: {
76
+ header: 'Value',
77
+ get: (row) => row.value,
78
+ },
79
+ }),
80
+ ...(command === 'list' ? {} : { success: { header: 'Success' } }),
81
+ ...(responses.some((msg) => msg.error)
82
+ ? {
83
+ message: {
84
+ header: 'Message',
85
+ get: (row) => row.error?.message ?? '',
86
+ },
87
+ }
88
+ : {}),
89
+ }, { title: commandToTitleMapping[command] });
90
+ };
91
+ exports.output = output;
92
+ const commandToTitleMapping = {
93
+ set: 'Set Config',
94
+ unset: 'Unset Config',
95
+ list: 'List Config',
96
+ get: 'Get Config',
97
+ };
86
98
  //# sourceMappingURL=config.js.map
package/lib/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
@@ -41,15 +41,14 @@ function loadConfigMeta(plugin) {
41
41
  }
42
42
  const hook = ({ config }) => {
43
43
  const flattenedConfigMetas = (config.plugins || [])
44
- .map((plugin) => {
44
+ .flatMap((plugin) => {
45
45
  const configMeta = loadConfigMeta(plugin);
46
46
  if (!configMeta) {
47
47
  log.info(`No config meta found for ${plugin.name}`);
48
48
  }
49
49
  return configMeta;
50
50
  })
51
- .filter(ts_types_1.isObject)
52
- .flat();
51
+ .filter(ts_types_1.isObject);
53
52
  if (flattenedConfigMetas.length) {
54
53
  core_2.Config.addAllowedProperties(flattenedConfigMetas);
55
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"load_config_meta.js","sourceRoot":"","sources":["../../../src/hooks/init/load_config_meta.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAGH,sCAAqC;AACrC,2CAAsE;AACtE,mDAAqD;AAErD,MAAM,GAAG,GAAG,aAAM,CAAC,aAAa,CAAC,kCAAkC,CAAC,CAAC;AACrE,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAE1C,SAAS,cAAc,CAAC,MAAyB;IAC/C,IAAI,yBAA6C,CAAC;IAElD,IAAI;QACF,MAAM,cAAc,GAAG,IAAA,cAAG,EAAC,MAAM,EAAE,eAAe,oBAAoB,EAAE,EAAE,IAAI,CAAC,CAAC;QAEhF,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YACtC,OAAO;SACR;QAED,MAAM,YAAY,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEzD,uDAAuD;QACvD,yBAAyB,GAAG,YAAY,IAAI,cAAc,CAAC;KAC5D;IAAC,MAAM;QACN,OAAO;KACR;IAED,IAAI,CAAC,yBAAyB,EAAE;QAC9B,OAAO;KACR;IAED,IAAI;QACF,uGAAuG;QACvG,MAAM,oBAAoB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;QAEhE,2GAA2G;QAC3G,OAAO,oBAAoB,EAAE,OAAO,IAAI,oBAAoB,CAAC;KAC9D;IAAC,MAAM;QACN,GAAG,CAAC,KAAK,CAAC,yCAAyC,yBAAyB,EAAE,CAAC,CAAC;QAChF,OAAO;KACR;AACH,CAAC;AAED,MAAM,IAAI,GAAiB,CAAC,EAAE,MAAM,EAAE,EAAiB,EAAE;IACvD,MAAM,oBAAoB,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;SAChD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,EAAE;YACf,GAAG,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SACrD;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;SACD,MAAM,CAAC,mBAAQ,CAAC;SAChB,IAAI,EAAE,CAAC;IAEV,IAAI,oBAAoB,CAAC,MAAM,EAAE;QAC/B,aAAM,CAAC,oBAAoB,CAAC,oBAA4C,CAAC,CAAC;KAC3E;IACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"load_config_meta.js","sourceRoot":"","sources":["../../../src/hooks/init/load_config_meta.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAGH,sCAAqC;AACrC,2CAAsE;AACtE,mDAAqD;AAErD,MAAM,GAAG,GAAG,aAAM,CAAC,aAAa,CAAC,kCAAkC,CAAC,CAAC;AACrE,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAE1C,SAAS,cAAc,CAAC,MAAyB;IAC/C,IAAI,yBAA6C,CAAC;IAElD,IAAI;QACF,MAAM,cAAc,GAAG,IAAA,cAAG,EAAC,MAAM,EAAE,eAAe,oBAAoB,EAAE,EAAE,IAAI,CAAC,CAAC;QAEhF,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YACtC,OAAO;SACR;QAED,MAAM,YAAY,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEzD,uDAAuD;QACvD,yBAAyB,GAAG,YAAY,IAAI,cAAc,CAAC;KAC5D;IAAC,MAAM;QACN,OAAO;KACR;IAED,IAAI,CAAC,yBAAyB,EAAE;QAC9B,OAAO;KACR;IAED,IAAI;QACF,uGAAuG;QACvG,MAAM,oBAAoB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;QAEhE,2GAA2G;QAC3G,OAAO,oBAAoB,EAAE,OAAO,IAAI,oBAAoB,CAAC;KAC9D;IAAC,MAAM;QACN,GAAG,CAAC,KAAK,CAAC,yCAAyC,yBAAyB,EAAE,CAAC,CAAC;QAChF,OAAO;KACR;AACH,CAAC;AAED,MAAM,IAAI,GAAiB,CAAC,EAAE,MAAM,EAAE,EAAiB,EAAE;IACvD,MAAM,oBAAoB,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;SAChD,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,EAAE;YACf,GAAG,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SACrD;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;SACD,MAAM,CAAqB,mBAAQ,CAAC,CAAC;IAExC,IAAI,oBAAoB,CAAC,MAAM,EAAE;QAC/B,aAAM,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;KACnD;IACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC"}
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.4.6",
2
+ "version": "1.4.7",
3
3
  "commands": {
4
4
  "alias:list": {
5
5
  "id": "alias:list",
package/package.json CHANGED
@@ -1,25 +1,25 @@
1
1
  {
2
2
  "name": "@salesforce/plugin-settings",
3
3
  "description": "configure the Salesforce CLI",
4
- "version": "1.4.6",
4
+ "version": "1.4.7",
5
5
  "author": "Salesforce",
6
6
  "bugs": "https://github.com/forcedotcom/cli/issues",
7
7
  "dependencies": {
8
8
  "@oclif/core": "^2.8.2",
9
- "@salesforce/core": "^3.35.0",
10
- "@salesforce/sf-plugins-core": "^2.3.0",
9
+ "@salesforce/core": "^3.36.1",
10
+ "@salesforce/sf-plugins-core": "^2.4.0",
11
11
  "fast-levenshtein": "^3.0.0",
12
12
  "tslib": "^2"
13
13
  },
14
14
  "devDependencies": {
15
- "@oclif/plugin-command-snapshot": "^3.3.10",
16
- "@oclif/test": "^2.3.11",
17
- "@salesforce/cli-plugins-testkit": "^3.3.3",
15
+ "@oclif/plugin-command-snapshot": "^3.3.13",
16
+ "@oclif/test": "^2.3.17",
17
+ "@salesforce/cli-plugins-testkit": "^3.3.6",
18
18
  "@salesforce/dev-config": "^3.1.0",
19
- "@salesforce/dev-scripts": "^4.3.0",
19
+ "@salesforce/dev-scripts": "^4.3.1",
20
20
  "@salesforce/kit": "^1.8.5",
21
21
  "@salesforce/plugin-command-reference": "^2.2.8",
22
- "@salesforce/plugin-deploy-retrieve": "^1.8.14",
22
+ "@salesforce/plugin-deploy-retrieve": "^1.8.18",
23
23
  "@salesforce/prettier-config": "^0.0.2",
24
24
  "@salesforce/ts-sinon": "^1.4.4",
25
25
  "@salesforce/ts-types": "^1.7.1",
@@ -27,24 +27,24 @@
27
27
  "@types/fast-levenshtein": "^0.0.2",
28
28
  "@types/fs-extra": "^9.0.13",
29
29
  "@types/shelljs": "^0.8.12",
30
- "@typescript-eslint/eslint-plugin": "^5.57.0",
31
- "@typescript-eslint/parser": "^5.48.0",
30
+ "@typescript-eslint/eslint-plugin": "^5.59.2",
31
+ "@typescript-eslint/parser": "^5.59.1",
32
32
  "chai": "^4.3.7",
33
- "eslint": "^8.39.0",
33
+ "eslint": "^8.40.0",
34
34
  "eslint-config-prettier": "^8.8.0",
35
- "eslint-config-salesforce": "^1.1.1",
35
+ "eslint-config-salesforce": "^1.2.0",
36
36
  "eslint-config-salesforce-license": "^0.2.0",
37
37
  "eslint-config-salesforce-typescript": "^1.1.1",
38
38
  "eslint-plugin-header": "^3.1.1",
39
39
  "eslint-plugin-import": "^2.27.5",
40
40
  "eslint-plugin-jsdoc": "^39.9.1",
41
- "eslint-plugin-sf-plugin": "^1.14.0",
41
+ "eslint-plugin-sf-plugin": "^1.15.1",
42
42
  "fs-extra": "^10.1.0",
43
43
  "husky": "^7.0.4",
44
44
  "mocha": "^9.2.2",
45
45
  "nyc": "^15.1.0",
46
- "oclif": "^3.8.1",
47
- "prettier": "^2.8.7",
46
+ "oclif": "^3.9.0",
47
+ "prettier": "^2.8.8",
48
48
  "pretty-quick": "^3.1.3",
49
49
  "shelljs": "^0.8.5",
50
50
  "shx": "0.3.4",
@@ -15,7 +15,7 @@
15
15
  "type": "string"
16
16
  },
17
17
  "value": {
18
- "type": "string"
18
+ "type": ["string", "boolean", "number", "null"]
19
19
  },
20
20
  "success": {
21
21
  "type": "boolean"
@@ -15,7 +15,7 @@
15
15
  "type": "string"
16
16
  },
17
17
  "value": {
18
- "type": "string"
18
+ "type": ["string", "boolean", "number", "null"]
19
19
  },
20
20
  "success": {
21
21
  "type": "boolean"
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "$schema": "http://json-schema.org/draft-07/schema#",
3
- "$ref": "#/definitions/SetConfigCommandResult",
3
+ "$ref": "#/definitions/SetOrUnsetConfigCommandResult",
4
4
  "definitions": {
5
- "SetConfigCommandResult": {
5
+ "SetOrUnsetConfigCommandResult": {
6
6
  "type": "object",
7
7
  "properties": {
8
8
  "successes": {
@@ -28,7 +28,7 @@
28
28
  "type": "string"
29
29
  },
30
30
  "value": {
31
- "type": "string"
31
+ "type": ["string", "boolean", "number", "null"]
32
32
  },
33
33
  "success": {
34
34
  "type": "boolean"
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "$schema": "http://json-schema.org/draft-07/schema#",
3
- "$ref": "#/definitions/SetConfigCommandResult",
3
+ "$ref": "#/definitions/SetOrUnsetConfigCommandResult",
4
4
  "definitions": {
5
- "SetConfigCommandResult": {
5
+ "SetOrUnsetConfigCommandResult": {
6
6
  "type": "object",
7
7
  "properties": {
8
8
  "successes": {
@@ -28,7 +28,7 @@
28
28
  "type": "string"
29
29
  },
30
30
  "value": {
31
- "type": "string"
31
+ "type": ["string", "boolean", "number", "null"]
32
32
  },
33
33
  "success": {
34
34
  "type": "boolean"