@salesforce/plugin-org 2.11.7 → 3.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +114 -114
- package/lib/commands/force/org/clone.d.ts +8 -8
- package/lib/commands/force/org/clone.js +65 -66
- package/lib/commands/force/org/clone.js.map +1 -1
- package/lib/commands/force/org/create.d.ts +18 -42
- package/lib/commands/force/org/create.js +104 -106
- package/lib/commands/force/org/create.js.map +1 -1
- package/lib/commands/force/org/delete.d.ts +5 -5
- package/lib/commands/force/org/delete.js +42 -44
- package/lib/commands/force/org/delete.js.map +1 -1
- package/lib/commands/force/org/status.d.ts +7 -7
- package/lib/commands/force/org/status.js +48 -50
- package/lib/commands/force/org/status.js.map +1 -1
- package/lib/commands/org/create/sandbox.d.ts +11 -11
- package/lib/commands/org/create/sandbox.js +106 -106
- package/lib/commands/org/create/sandbox.js.map +1 -1
- package/lib/commands/org/create/scratch.d.ts +20 -20
- package/lib/commands/org/create/scratch.js +140 -142
- package/lib/commands/org/create/scratch.js.map +1 -1
- package/lib/commands/org/delete/sandbox.d.ts +2 -2
- package/lib/commands/org/delete/sandbox.js +27 -28
- package/lib/commands/org/delete/sandbox.js.map +1 -1
- package/lib/commands/org/delete/scratch.d.ts +2 -2
- package/lib/commands/org/delete/scratch.js +26 -27
- package/lib/commands/org/delete/scratch.js.map +1 -1
- package/lib/commands/org/display.d.ts +5 -5
- package/lib/commands/org/display.js +33 -34
- package/lib/commands/org/display.js.map +1 -1
- package/lib/commands/org/list/metadata-types.d.ts +5 -5
- package/lib/commands/org/list/metadata-types.js +38 -40
- package/lib/commands/org/list/metadata-types.js.map +1 -1
- package/lib/commands/org/list/metadata.d.ts +6 -6
- package/lib/commands/org/list/metadata.js +39 -41
- package/lib/commands/org/list/metadata.js.map +1 -1
- package/lib/commands/org/list.d.ts +2 -2
- package/lib/commands/org/list.js +56 -57
- package/lib/commands/org/list.js.map +1 -1
- package/lib/commands/org/open.d.ts +7 -7
- package/lib/commands/org/open.js +65 -62
- package/lib/commands/org/open.js.map +1 -1
- package/lib/commands/org/resume/sandbox.d.ts +6 -6
- package/lib/commands/org/resume/sandbox.js +61 -61
- package/lib/commands/org/resume/sandbox.js.map +1 -1
- package/lib/commands/org/resume/scratch.d.ts +3 -3
- package/lib/commands/org/resume/scratch.js +35 -36
- package/lib/commands/org/resume/scratch.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -2
- package/lib/index.js.map +1 -1
- package/lib/shared/flags.d.ts +4 -1
- package/lib/shared/flags.js +10 -11
- package/lib/shared/flags.js.map +1 -1
- package/lib/shared/orgHighlighter.d.ts +1 -1
- package/lib/shared/orgHighlighter.js +4 -9
- package/lib/shared/orgHighlighter.js.map +1 -1
- package/lib/shared/orgHooks.js +1 -2
- package/lib/shared/orgHooks.js.map +1 -1
- package/lib/shared/orgListUtil.d.ts +1 -1
- package/lib/shared/orgListUtil.js +27 -31
- package/lib/shared/orgListUtil.js.map +1 -1
- package/lib/shared/orgTypes.js +2 -5
- package/lib/shared/orgTypes.js.map +1 -1
- package/lib/shared/sandboxCommandBase.d.ts +2 -2
- package/lib/shared/sandboxCommandBase.js +33 -28
- package/lib/shared/sandboxCommandBase.js.map +1 -1
- package/lib/shared/sandboxProgress.d.ts +1 -1
- package/lib/shared/sandboxProgress.js +11 -17
- package/lib/shared/sandboxProgress.js.map +1 -1
- package/lib/shared/sandboxReporter.js +5 -9
- package/lib/shared/sandboxReporter.js.map +1 -1
- package/lib/shared/sandboxRequest.d.ts +5 -0
- package/lib/shared/sandboxRequest.js +21 -20
- package/lib/shared/sandboxRequest.js.map +1 -1
- package/lib/shared/scratchOrgOutput.js +20 -31
- package/lib/shared/scratchOrgOutput.js.map +1 -1
- package/lib/shared/scratchOrgRequest.d.ts +1 -1
- package/lib/shared/scratchOrgRequest.js +4 -8
- package/lib/shared/scratchOrgRequest.js.map +1 -1
- package/lib/shared/stagedProgress.d.ts +1 -1
- package/lib/shared/stagedProgress.js +19 -19
- package/lib/shared/stagedProgress.js.map +1 -1
- package/lib/shared/timeUtils.js +10 -16
- package/lib/shared/timeUtils.js.map +1 -1
- package/lib/shared/utils.d.ts +9 -2
- package/lib/shared/utils.js +13 -14
- package/lib/shared/utils.js.map +1 -1
- package/oclif.lock +7993 -0
- package/oclif.manifest.json +1089 -687
- package/package.json +34 -53
|
@@ -1,18 +1,62 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2022, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
7
|
+
import { dirname } from 'node:path';
|
|
8
|
+
import { fileURLToPath } from 'node:url';
|
|
9
|
+
import { Flags } from '@salesforce/sf-plugins-core';
|
|
10
|
+
import { StateAggregator, Lifecycle, Messages, Org, SandboxEvents, SfError, } from '@salesforce/core';
|
|
11
|
+
import { Duration } from '@salesforce/kit';
|
|
12
|
+
import { SandboxCommandBase } from '../../../shared/sandboxCommandBase.js';
|
|
13
|
+
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
14
|
+
const messages = Messages.loadMessages('@salesforce/plugin-org', 'resume.sandbox');
|
|
15
|
+
export default class ResumeSandbox extends SandboxCommandBase {
|
|
16
|
+
static summary = messages.getMessage('summary');
|
|
17
|
+
static description = messages.getMessage('description');
|
|
18
|
+
static examples = messages.getMessages('examples');
|
|
19
|
+
static aliases = ['env:resume:sandbox'];
|
|
20
|
+
static deprecateAliases = true;
|
|
21
|
+
static flags = {
|
|
22
|
+
wait: Flags.duration({
|
|
23
|
+
char: 'w',
|
|
24
|
+
summary: messages.getMessage('flags.wait.summary'),
|
|
25
|
+
description: messages.getMessage('flags.wait.description'),
|
|
26
|
+
min: 0,
|
|
27
|
+
unit: 'minutes',
|
|
28
|
+
helpValue: '<minutes>',
|
|
29
|
+
defaultValue: 0,
|
|
30
|
+
}),
|
|
31
|
+
name: Flags.string({
|
|
32
|
+
char: 'n',
|
|
33
|
+
summary: messages.getMessage('flags.name.summary'),
|
|
34
|
+
parse: (name) => {
|
|
35
|
+
if (name.length > 10) {
|
|
36
|
+
throw messages.createError('error.SandboxNameLength', [name]);
|
|
37
|
+
}
|
|
38
|
+
return Promise.resolve(name);
|
|
39
|
+
},
|
|
40
|
+
exclusive: ['job-id'],
|
|
41
|
+
}),
|
|
42
|
+
'job-id': Flags.salesforceId({
|
|
43
|
+
startsWith: '0GR',
|
|
44
|
+
char: 'i',
|
|
45
|
+
summary: messages.getMessage('flags.id.summary'),
|
|
46
|
+
description: messages.getMessage('flags.id.description'),
|
|
47
|
+
exclusive: ['name'],
|
|
48
|
+
}),
|
|
49
|
+
'use-most-recent': Flags.boolean({
|
|
50
|
+
char: 'l',
|
|
51
|
+
summary: messages.getMessage('flags.use-most-recent.summary'),
|
|
52
|
+
}),
|
|
53
|
+
'target-org': Flags.optionalOrg({
|
|
54
|
+
char: 'o',
|
|
55
|
+
summary: messages.getMessage('flags.targetOrg.summary'),
|
|
56
|
+
description: messages.getMessage('flags.targetOrg.description'),
|
|
57
|
+
}),
|
|
58
|
+
};
|
|
59
|
+
flags;
|
|
16
60
|
async run() {
|
|
17
61
|
this.sandboxRequestConfig = await this.getSandboxRequestConfig();
|
|
18
62
|
this.flags = (await this.parse(ResumeSandbox)).flags;
|
|
@@ -50,9 +94,9 @@ class ResumeSandbox extends sandboxCommandBase_1.SandboxCommandBase {
|
|
|
50
94
|
throw messages.createError('error.NoSandboxNameOrJobId');
|
|
51
95
|
}
|
|
52
96
|
}
|
|
53
|
-
this.prodOrg = await
|
|
97
|
+
this.prodOrg = await Org.create({ aliasOrUsername: prodOrgUsername });
|
|
54
98
|
this.flags['target-org'] = this.prodOrg;
|
|
55
|
-
const lifecycle =
|
|
99
|
+
const lifecycle = Lifecycle.getInstance();
|
|
56
100
|
this.registerLifecycleListeners(lifecycle, {
|
|
57
101
|
isAsync: false,
|
|
58
102
|
alias: this.sandboxRequestData.alias,
|
|
@@ -76,19 +120,19 @@ class ResumeSandbox extends sandboxCommandBase_1.SandboxCommandBase {
|
|
|
76
120
|
this.debug('Calling create with ResumeSandboxRequest: %s ', sandboxReq);
|
|
77
121
|
try {
|
|
78
122
|
return await this.prodOrg.resumeSandbox(sandboxReq, {
|
|
79
|
-
wait: this.flags.wait ??
|
|
80
|
-
interval:
|
|
123
|
+
wait: this.flags.wait ?? Duration.seconds(0),
|
|
124
|
+
interval: Duration.seconds(30),
|
|
81
125
|
});
|
|
82
126
|
}
|
|
83
127
|
catch (err) {
|
|
84
128
|
this.spinner.stop();
|
|
85
129
|
if (this.latestSandboxProgressObj && this.pollingTimeOut) {
|
|
86
|
-
void lifecycle.emit(
|
|
130
|
+
void lifecycle.emit(SandboxEvents.EVENT_ASYNC_RESULT, undefined);
|
|
87
131
|
process.exitCode = 68;
|
|
88
132
|
return this.latestSandboxProgressObj;
|
|
89
133
|
}
|
|
90
134
|
else if (this.latestSandboxProgressObj &&
|
|
91
|
-
err instanceof
|
|
135
|
+
err instanceof SfError &&
|
|
92
136
|
err.name === 'SandboxCreateNotCompleteError') {
|
|
93
137
|
process.exitCode = 68;
|
|
94
138
|
return this.latestSandboxProgressObj;
|
|
@@ -126,63 +170,19 @@ class ResumeSandbox extends sandboxCommandBase_1.SandboxCommandBase {
|
|
|
126
170
|
async verifyIfAuthExists({ prodOrg, sandboxName, jobId, lifecycle, }) {
|
|
127
171
|
const sandboxProcessObject = await getSandboxProcessObject(prodOrg, sandboxName, jobId);
|
|
128
172
|
const sandboxUsername = `${prodOrg.getUsername()}.${sandboxProcessObject.SandboxName}`;
|
|
129
|
-
const exists = await (await
|
|
173
|
+
const exists = await (await StateAggregator.getInstance()).orgs.exists(sandboxUsername);
|
|
130
174
|
if (exists) {
|
|
131
175
|
this.latestSandboxProgressObj = sandboxProcessObject;
|
|
132
176
|
const resultEvent = {
|
|
133
177
|
sandboxProcessObj: this.latestSandboxProgressObj,
|
|
134
178
|
sandboxRes: { authUserName: sandboxUsername },
|
|
135
179
|
};
|
|
136
|
-
await lifecycle.emit(
|
|
180
|
+
await lifecycle.emit(SandboxEvents.EVENT_RESULT, resultEvent);
|
|
137
181
|
return true;
|
|
138
182
|
}
|
|
139
183
|
return false;
|
|
140
184
|
}
|
|
141
185
|
}
|
|
142
|
-
ResumeSandbox.summary = messages.getMessage('summary');
|
|
143
|
-
ResumeSandbox.description = messages.getMessage('description');
|
|
144
|
-
ResumeSandbox.examples = messages.getMessages('examples');
|
|
145
|
-
ResumeSandbox.aliases = ['env:resume:sandbox'];
|
|
146
|
-
ResumeSandbox.deprecateAliases = true;
|
|
147
|
-
ResumeSandbox.flags = {
|
|
148
|
-
wait: sf_plugins_core_1.Flags.duration({
|
|
149
|
-
char: 'w',
|
|
150
|
-
summary: messages.getMessage('flags.wait.summary'),
|
|
151
|
-
description: messages.getMessage('flags.wait.description'),
|
|
152
|
-
min: 0,
|
|
153
|
-
unit: 'minutes',
|
|
154
|
-
helpValue: '<minutes>',
|
|
155
|
-
defaultValue: 0,
|
|
156
|
-
}),
|
|
157
|
-
name: sf_plugins_core_1.Flags.string({
|
|
158
|
-
char: 'n',
|
|
159
|
-
summary: messages.getMessage('flags.name.summary'),
|
|
160
|
-
parse: (name) => {
|
|
161
|
-
if (name.length > 10) {
|
|
162
|
-
throw messages.createError('error.SandboxNameLength', [name]);
|
|
163
|
-
}
|
|
164
|
-
return Promise.resolve(name);
|
|
165
|
-
},
|
|
166
|
-
exclusive: ['job-id'],
|
|
167
|
-
}),
|
|
168
|
-
'job-id': sf_plugins_core_1.Flags.salesforceId({
|
|
169
|
-
startsWith: '0GR',
|
|
170
|
-
char: 'i',
|
|
171
|
-
summary: messages.getMessage('flags.id.summary'),
|
|
172
|
-
description: messages.getMessage('flags.id.description'),
|
|
173
|
-
exclusive: ['name'],
|
|
174
|
-
}),
|
|
175
|
-
'use-most-recent': sf_plugins_core_1.Flags.boolean({
|
|
176
|
-
char: 'l',
|
|
177
|
-
summary: messages.getMessage('flags.use-most-recent.summary'),
|
|
178
|
-
}),
|
|
179
|
-
'target-org': sf_plugins_core_1.Flags.optionalOrg({
|
|
180
|
-
char: 'o',
|
|
181
|
-
summary: messages.getMessage('flags.targetOrg.summary'),
|
|
182
|
-
description: messages.getMessage('flags.targetOrg.description'),
|
|
183
|
-
}),
|
|
184
|
-
};
|
|
185
|
-
exports.default = ResumeSandbox;
|
|
186
186
|
const getSandboxProcessObject = async (prodOrg, sandboxName, jobId) => {
|
|
187
187
|
const where = jobId ? `Id='${jobId}'` : `SandboxName='${sandboxName}'`;
|
|
188
188
|
const queryStr = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE ${where} AND Status != 'D'`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/sandbox.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
|
-
import { ScratchCreateResponse } from '../../../shared/orgTypes';
|
|
2
|
+
import { ScratchCreateResponse } from '../../../shared/orgTypes.js';
|
|
3
3
|
export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {
|
|
4
4
|
static readonly summary: string;
|
|
5
5
|
static readonly description: string;
|
|
@@ -7,8 +7,8 @@ export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {
|
|
|
7
7
|
static readonly aliases: string[];
|
|
8
8
|
static readonly deprecateAliases = true;
|
|
9
9
|
static readonly flags: {
|
|
10
|
-
'job-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
11
|
-
'use-most-recent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
10
|
+
'job-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
11
|
+
'use-most-recent': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
12
12
|
};
|
|
13
13
|
run(): Promise<ScratchCreateResponse>;
|
|
14
14
|
}
|
|
@@ -1,62 +1,61 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
7
|
+
import { strict as assert } from 'node:assert';
|
|
8
|
+
import { dirname } from 'node:path';
|
|
9
|
+
import { fileURLToPath } from 'node:url';
|
|
10
|
+
import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
|
|
11
|
+
import { Messages, scratchOrgResume, ScratchOrgCache, Lifecycle, scratchOrgLifecycleEventName, } from '@salesforce/core';
|
|
12
|
+
import { buildStatus } from '../../../shared/scratchOrgOutput.js';
|
|
13
|
+
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
14
|
+
const messages = Messages.loadMessages('@salesforce/plugin-org', 'resume_scratch');
|
|
15
|
+
export default class EnvResumeScratch extends SfCommand {
|
|
16
|
+
static summary = messages.getMessage('summary');
|
|
17
|
+
static description = messages.getMessage('description');
|
|
18
|
+
static examples = messages.getMessages('examples');
|
|
19
|
+
static aliases = ['env:resume:scratch'];
|
|
20
|
+
static deprecateAliases = true;
|
|
21
|
+
static flags = {
|
|
22
|
+
'job-id': Flags.salesforceId({
|
|
23
|
+
char: 'i',
|
|
24
|
+
length: 'both',
|
|
25
|
+
summary: messages.getMessage('flags.job-id.summary'),
|
|
26
|
+
description: messages.getMessage('flags.job-id.description'),
|
|
27
|
+
exactlyOne: ['use-most-recent', 'job-id'],
|
|
28
|
+
startsWith: '2SR',
|
|
29
|
+
}),
|
|
30
|
+
'use-most-recent': Flags.boolean({
|
|
31
|
+
char: 'r',
|
|
32
|
+
summary: messages.getMessage('flags.use-most-recent.summary'),
|
|
33
|
+
exactlyOne: ['use-most-recent', 'job-id'],
|
|
34
|
+
}),
|
|
35
|
+
};
|
|
16
36
|
async run() {
|
|
17
37
|
const { flags } = await this.parse(EnvResumeScratch);
|
|
18
|
-
const cache = await
|
|
19
|
-
const lifecycle =
|
|
38
|
+
const cache = await ScratchOrgCache.create();
|
|
39
|
+
const lifecycle = Lifecycle.getInstance();
|
|
20
40
|
const jobId = flags['use-most-recent'] ? cache.getLatestKey() : flags['job-id'];
|
|
21
41
|
if (!jobId && flags['use-most-recent'])
|
|
22
42
|
throw messages.createError('error.NoRecentJobId');
|
|
23
43
|
// oclif doesn't know that the exactlyOne flag will ensure that one of these is set, and there we definitely have a jobID.
|
|
24
|
-
(
|
|
44
|
+
assert(jobId);
|
|
25
45
|
const { hubBaseUrl } = cache.get(jobId);
|
|
26
46
|
let lastStatus;
|
|
27
|
-
lifecycle.on(
|
|
28
|
-
lastStatus =
|
|
47
|
+
lifecycle.on(scratchOrgLifecycleEventName, async (data) => {
|
|
48
|
+
lastStatus = buildStatus(data, hubBaseUrl);
|
|
29
49
|
this.spinner.status = lastStatus;
|
|
30
50
|
return Promise.resolve();
|
|
31
51
|
});
|
|
32
52
|
this.log();
|
|
33
53
|
this.spinner.start('Creating Scratch Org');
|
|
34
|
-
const { username, scratchOrgInfo, authFields, warnings } = await
|
|
54
|
+
const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgResume(jobId);
|
|
35
55
|
this.spinner.stop(lastStatus);
|
|
36
56
|
this.log();
|
|
37
57
|
this.logSuccess(messages.getMessage('success'));
|
|
38
58
|
return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
|
|
39
59
|
}
|
|
40
60
|
}
|
|
41
|
-
EnvResumeScratch.summary = messages.getMessage('summary');
|
|
42
|
-
EnvResumeScratch.description = messages.getMessage('description');
|
|
43
|
-
EnvResumeScratch.examples = messages.getMessages('examples');
|
|
44
|
-
EnvResumeScratch.aliases = ['env:resume:scratch'];
|
|
45
|
-
EnvResumeScratch.deprecateAliases = true;
|
|
46
|
-
EnvResumeScratch.flags = {
|
|
47
|
-
'job-id': sf_plugins_core_1.Flags.salesforceId({
|
|
48
|
-
char: 'i',
|
|
49
|
-
length: 'both',
|
|
50
|
-
summary: messages.getMessage('flags.job-id.summary'),
|
|
51
|
-
description: messages.getMessage('flags.job-id.description'),
|
|
52
|
-
exactlyOne: ['use-most-recent', 'job-id'],
|
|
53
|
-
startsWith: '2SR',
|
|
54
|
-
}),
|
|
55
|
-
'use-most-recent': sf_plugins_core_1.Flags.boolean({
|
|
56
|
-
char: 'r',
|
|
57
|
-
summary: messages.getMessage('flags.use-most-recent.summary'),
|
|
58
|
-
exactlyOne: ['use-most-recent', 'job-id'],
|
|
59
|
-
}),
|
|
60
|
-
};
|
|
61
|
-
exports.default = EnvResumeScratch;
|
|
62
61
|
//# sourceMappingURL=scratch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
declare const _default: {};
|
|
2
|
-
export
|
|
2
|
+
export default _default;
|
package/lib/index.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
7
|
+
export default {};
|
|
9
8
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAe,EAAE,CAAC"}
|
package/lib/shared/flags.d.ts
CHANGED
|
@@ -4,4 +4,7 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Returns the username so you can construct your own org.
|
|
6
6
|
*/
|
|
7
|
-
export declare const orgThatMightBeDeleted: import("@oclif/core/lib/interfaces/parser").FlagDefinition<string,
|
|
7
|
+
export declare const orgThatMightBeDeleted: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
|
|
8
|
+
multiple: false;
|
|
9
|
+
requiredOrDefaulted: true;
|
|
10
|
+
}>;
|
package/lib/shared/flags.js
CHANGED
|
@@ -1,27 +1,26 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2023, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const messages =
|
|
7
|
+
import { dirname } from 'node:path';
|
|
8
|
+
import { fileURLToPath } from 'node:url';
|
|
9
|
+
import { Flags } from '@oclif/core';
|
|
10
|
+
import { ConfigAggregator, StateAggregator, Messages, SfError } from '@salesforce/core';
|
|
11
|
+
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
12
|
+
const messages = Messages.loadMessages('@salesforce/plugin-org', 'delete');
|
|
14
13
|
const resolveUsername = async (usernameOrAlias) => {
|
|
15
|
-
const stateAggregator = await
|
|
14
|
+
const stateAggregator = await StateAggregator.getInstance();
|
|
16
15
|
// we have a value, but don't know if it's a username or an alias
|
|
17
16
|
if (usernameOrAlias)
|
|
18
17
|
return stateAggregator.aliases.resolveUsername(usernameOrAlias);
|
|
19
18
|
// we didn't get a value, so let's see if the config has a default target org
|
|
20
|
-
const configAggregator = await
|
|
19
|
+
const configAggregator = await ConfigAggregator.create();
|
|
21
20
|
const defaultUsernameOrAlias = configAggregator.getPropertyValue('target-org');
|
|
22
21
|
if (defaultUsernameOrAlias)
|
|
23
22
|
return stateAggregator.aliases.resolveUsername(defaultUsernameOrAlias);
|
|
24
|
-
throw new
|
|
23
|
+
throw new SfError(messages.getMessage('missingUsername'), 'MissingUsernameError');
|
|
25
24
|
};
|
|
26
25
|
/**
|
|
27
26
|
* Almost like the use case for the normal optional org flag,
|
|
@@ -29,7 +28,7 @@ const resolveUsername = async (usernameOrAlias) => {
|
|
|
29
28
|
*
|
|
30
29
|
* Returns the username so you can construct your own org.
|
|
31
30
|
*/
|
|
32
|
-
|
|
31
|
+
export const orgThatMightBeDeleted = Flags.custom({
|
|
33
32
|
char: 'o',
|
|
34
33
|
required: true,
|
|
35
34
|
deprecateAliases: true,
|
package/lib/shared/flags.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/shared/flags.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/shared/flags.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAExF,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC1E,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,QAAQ,CAAC,CAAC;AAE3E,MAAM,eAAe,GAAG,KAAK,EAAE,eAAwB,EAAmB,EAAE;IAC1E,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,CAAC;IAC5D,iEAAiE;IACjE,IAAI,eAAe;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IACrF,6EAA6E;IAC7E,MAAM,gBAAgB,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,CAAC;IACzD,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,YAAY,CAAuB,CAAC;IACrG,IAAI,sBAAsB;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC;IACnG,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,sBAAsB,CAAC,CAAC;AACpF,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC,MAAM,CAAC;IAChD,IAAI,EAAE,GAAG;IACT,QAAQ,EAAE,IAAI;IACd,gBAAgB,EAAE,IAAI;IACtB,OAAO,EAAE,CAAC,gBAAgB,EAAE,GAAG,CAAC;IAChC,KAAK,EAAE,KAAK,EAAE,KAAyB,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;IAClE,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,eAAe,EAAE;IACtC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,eAAe,EAAE;CAC3C,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { ExtendedAuthFields, FullyPopulatedScratchOrgFields } from './orgTypes';
|
|
1
|
+
import { ExtendedAuthFields, FullyPopulatedScratchOrgFields } from './orgTypes.js';
|
|
2
2
|
export declare const getStyledValue: (key: string, value: string) => string;
|
|
3
3
|
export declare const getStyledObject: <T extends ExtendedAuthFields | FullyPopulatedScratchOrgFields>(objectToStyle: T) => T;
|
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getStyledObject = exports.getStyledValue = void 0;
|
|
4
1
|
/*
|
|
5
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
6
3
|
* All rights reserved.
|
|
7
4
|
* Licensed under the BSD 3-Clause license.
|
|
8
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
6
|
*/
|
|
10
|
-
|
|
7
|
+
import chalk from 'chalk';
|
|
11
8
|
const styledProperties = new Map([
|
|
12
9
|
[
|
|
13
10
|
'status',
|
|
@@ -25,7 +22,7 @@ const styledProperties = new Map([
|
|
|
25
22
|
]),
|
|
26
23
|
],
|
|
27
24
|
]);
|
|
28
|
-
const getStyledValue = (key, value) => {
|
|
25
|
+
export const getStyledValue = (key, value) => {
|
|
29
26
|
if (!value)
|
|
30
27
|
return value;
|
|
31
28
|
const prop = styledProperties.get(key);
|
|
@@ -35,10 +32,8 @@ const getStyledValue = (key, value) => {
|
|
|
35
32
|
const chalkMethod = prop.get(value) ?? prop.get('else');
|
|
36
33
|
return chalkMethod(value);
|
|
37
34
|
};
|
|
38
|
-
|
|
39
|
-
const getStyledObject = (objectToStyle) => Object.fromEntries(Object.entries(objectToStyle).map(([key, value]) => [
|
|
35
|
+
export const getStyledObject = (objectToStyle) => Object.fromEntries(Object.entries(objectToStyle).map(([key, value]) => [
|
|
40
36
|
key,
|
|
41
|
-
typeof value === 'string' ?
|
|
37
|
+
typeof value === 'string' ? getStyledValue(key, value) : value,
|
|
42
38
|
]));
|
|
43
|
-
exports.getStyledObject = getStyledObject;
|
|
44
39
|
//# sourceMappingURL=orgHighlighter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orgHighlighter.js","sourceRoot":"","sources":["../../src/shared/orgHighlighter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orgHighlighter.js","sourceRoot":"","sources":["../../src/shared/orgHighlighter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAmC;IACjE;QACE,QAAQ;QACR,IAAI,GAAG,CAAC;YACN,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC;YACvB,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC;SACpB,CAAC;KACH;IACD;QACE,iBAAiB;QACjB,IAAI,GAAG,CAAC;YACN,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC;YAC1B,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC;YACvB,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC;SACpB,CAAC;KACH;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,KAAa,EAAU,EAAE;IACnE,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAExB,mFAAmF;IACnF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAK,IAAI,CAAC,GAAG,CAAC,MAAM,CAAiB,CAAC;IACzE,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAgE,aAAgB,EAAK,EAAE,CACpH,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IAClD,GAAG;IACH,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;CAC/D,CAAC,CACE,CAAC"}
|
package/lib/shared/orgHooks.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2021, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
7
|
+
export {};
|
|
9
8
|
//# sourceMappingURL=orgHooks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orgHooks.js","sourceRoot":"","sources":["../../src/shared/orgHooks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orgHooks.js","sourceRoot":"","sources":["../../src/shared/orgHooks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AuthInfo, Logger } from '@salesforce/core';
|
|
2
2
|
import { Record } from 'jsforce';
|
|
3
|
-
import { ScratchOrgInfoSObject, ExtendedAuthFields, ExtendedAuthFieldsScratch, FullyPopulatedScratchOrgFields } from './orgTypes';
|
|
3
|
+
import { ScratchOrgInfoSObject, ExtendedAuthFields, ExtendedAuthFieldsScratch, FullyPopulatedScratchOrgFields } from './orgTypes.js';
|
|
4
4
|
type OrgGroups = {
|
|
5
5
|
nonScratchOrgs: ExtendedAuthFields[];
|
|
6
6
|
scratchOrgs: ExtendedAuthFieldsScratch[];
|