@salesforce/source-deploy-retrieve 5.8.2 → 5.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -0
- package/LICENSE.txt +1 -1
- package/lib/src/client/metadataApiRetrieve.d.ts +1 -1
- package/lib/src/client/metadataApiRetrieve.js +38 -9
- package/lib/src/client/metadataApiRetrieve.js.map +1 -1
- package/lib/src/client/metadataTransfer.d.ts +5 -1
- package/lib/src/client/metadataTransfer.js +33 -1
- package/lib/src/client/metadataTransfer.js.map +1 -1
- package/lib/src/client/types.d.ts +18 -0
- package/lib/src/client/types.js.map +1 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js +24 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js.map +1 -1
- package/lib/src/i18n/i18n.d.ts +1 -0
- package/lib/src/i18n/i18n.js +1 -0
- package/lib/src/i18n/i18n.js.map +1 -1
- package/lib/src/registry/metadataRegistry.json +1 -0
- package/lib/src/registry/registry.d.ts +1 -0
- package/lib/src/registry/types.d.ts +4 -0
- package/lib/src/resolve/sourceComponent.d.ts +1 -0
- package/lib/src/resolve/sourceComponent.js +22 -4
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,30 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [5.9.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.5...v5.9.0) (2022-01-04)
|
|
6
|
+
|
|
7
|
+
### Features
|
|
8
|
+
|
|
9
|
+
- add retrieve in mdapi format ([#519](https://github.com/forcedotcom/source-deploy-retrieve/issues/519)) ([4db9b18](https://github.com/forcedotcom/source-deploy-retrieve/commit/4db9b1813712617970c714f30d7d2f1ef2578a2f))
|
|
10
|
+
|
|
11
|
+
### [5.8.5](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.4...v5.8.5) (2022-01-04)
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
- can retrive COFT with COT automatically ([#517](https://github.com/forcedotcom/source-deploy-retrieve/issues/517)) ([7b9a464](https://github.com/forcedotcom/source-deploy-retrieve/commit/7b9a46483323921e69de88b086f602eaefa6f869))
|
|
16
|
+
|
|
17
|
+
### [5.8.4](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.3...v5.8.4) (2022-01-03)
|
|
18
|
+
|
|
19
|
+
### Bug Fixes
|
|
20
|
+
|
|
21
|
+
- add variable polling times based on comp. set ([#520](https://github.com/forcedotcom/source-deploy-retrieve/issues/520)) ([e97744f](https://github.com/forcedotcom/source-deploy-retrieve/commit/e97744f243d943c85ca8df22e004c278fbad0715))
|
|
22
|
+
|
|
23
|
+
### [5.8.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.2...v5.8.3) (2022-01-03)
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
- wrap error from fast-xml-parser when invalid xml parsed ([#518](https://github.com/forcedotcom/source-deploy-retrieve/issues/518)) ([407af67](https://github.com/forcedotcom/source-deploy-retrieve/commit/407af6754994b9b8b0484ee7a8dcb380ada2c554))
|
|
28
|
+
|
|
5
29
|
### [5.8.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.1...v5.8.2) (2021-12-16)
|
|
6
30
|
|
|
7
31
|
### [5.8.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.0...v5.8.1) (2021-12-15)
|
package/LICENSE.txt
CHANGED
|
@@ -35,8 +35,8 @@ export declare class MetadataApiRetrieve extends MetadataTransfer<MetadataApiRet
|
|
|
35
35
|
* checks to the org, unlike {@link MetadataApiDeploy.cancel}.
|
|
36
36
|
*/
|
|
37
37
|
cancel(): Promise<void>;
|
|
38
|
+
post(result: MetadataApiRetrieveStatus): Promise<RetrieveResult>;
|
|
38
39
|
protected pre(): Promise<AsyncResult>;
|
|
39
|
-
protected post(result: MetadataApiRetrieveStatus): Promise<RetrieveResult>;
|
|
40
40
|
private getPackageNames;
|
|
41
41
|
private getPackageOptions;
|
|
42
42
|
private extract;
|
|
@@ -7,6 +7,9 @@ exports.MetadataApiRetrieve = exports.RetrieveResult = void 0;
|
|
|
7
7
|
* Licensed under the BSD 3-Clause license.
|
|
8
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
9
|
*/
|
|
10
|
+
const path = require("path");
|
|
11
|
+
const fs = require("graceful-fs");
|
|
12
|
+
const unzipper = require("unzipper");
|
|
10
13
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
11
14
|
const convert_1 = require("../convert");
|
|
12
15
|
const collections_1 = require("../collections");
|
|
@@ -117,6 +120,33 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
117
120
|
async cancel() {
|
|
118
121
|
this.canceled = true;
|
|
119
122
|
}
|
|
123
|
+
async post(result) {
|
|
124
|
+
let components;
|
|
125
|
+
const isMdapiRetrieve = this.options.format === 'metadata';
|
|
126
|
+
if (result.status === types_1.RequestStatus.Succeeded) {
|
|
127
|
+
const zipFileContents = Buffer.from(result.zipFile, 'base64');
|
|
128
|
+
if (isMdapiRetrieve) {
|
|
129
|
+
const name = this.options.zipFileName || 'unpackaged.zip';
|
|
130
|
+
const zipFilePath = path.join(this.options.output, name);
|
|
131
|
+
fs.writeFileSync(zipFilePath, zipFileContents);
|
|
132
|
+
if (this.options.unzip) {
|
|
133
|
+
const dir = await unzipper.Open.buffer(zipFileContents);
|
|
134
|
+
const extractPath = path.join(this.options.output, path.parse(name).name);
|
|
135
|
+
await dir.extract({ path: extractPath });
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
components = await this.extract(zipFileContents);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
components !== null && components !== void 0 ? components : (components = new collections_1.ComponentSet(undefined, this.options.registry));
|
|
143
|
+
if (!isMdapiRetrieve) {
|
|
144
|
+
// This should only be done when retrieving source format since retrieving
|
|
145
|
+
// mdapi format has no conversion.
|
|
146
|
+
await this.maybeSaveTempDirectory('source', components);
|
|
147
|
+
}
|
|
148
|
+
return new RetrieveResult(result, components, this.components);
|
|
149
|
+
}
|
|
120
150
|
async pre() {
|
|
121
151
|
const packageNames = this.getPackageNames();
|
|
122
152
|
if (this.components.size === 0 && !(packageNames === null || packageNames === void 0 ? void 0 : packageNames.length)) {
|
|
@@ -131,20 +161,19 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
131
161
|
// otherwise don't - it causes errors if undefined or an empty array
|
|
132
162
|
if (packageNames === null || packageNames === void 0 ? void 0 : packageNames.length) {
|
|
133
163
|
requestBody.packageNames = packageNames;
|
|
164
|
+
// delete unpackaged when no components and metadata format to prevent
|
|
165
|
+
// sending an empty unpackaged manifest.
|
|
166
|
+
if (this.options.format === 'metadata' && this.components.size === 0) {
|
|
167
|
+
delete requestBody.unpackaged;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
if (this.options.singlePackage) {
|
|
171
|
+
requestBody.singlePackage = this.options.singlePackage;
|
|
134
172
|
}
|
|
135
173
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
136
174
|
// @ts-ignore required callback
|
|
137
175
|
return connection.metadata.retrieve(requestBody);
|
|
138
176
|
}
|
|
139
|
-
async post(result) {
|
|
140
|
-
let components;
|
|
141
|
-
if (result.status === types_1.RequestStatus.Succeeded) {
|
|
142
|
-
components = await this.extract(Buffer.from(result.zipFile, 'base64'));
|
|
143
|
-
}
|
|
144
|
-
components = components !== null && components !== void 0 ? components : new collections_1.ComponentSet(undefined, this.options.registry);
|
|
145
|
-
await this.maybeSaveTempDirectory('source', components);
|
|
146
|
-
return new RetrieveResult(result, components, this.components);
|
|
147
|
-
}
|
|
148
177
|
getPackageNames() {
|
|
149
178
|
var _a;
|
|
150
179
|
return (_a = this.getPackageOptions()) === null || _a === void 0 ? void 0 : _a.map((pkg) => pkg.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataApiRetrieve.js","sourceRoot":"","sources":["../../../src/client/metadataApiRetrieve.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"metadataApiRetrieve.js","sourceRoot":"","sources":["../../../src/client/metadataApiRetrieve.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export declare abstract class MetadataTransfer<Status extends MetadataRequestSta
|
|
|
35
35
|
pollStatus(options?: Partial<PollingClient.Options>): Promise<Result>;
|
|
36
36
|
/**
|
|
37
37
|
* Poll for the status of the metadata transfer request.
|
|
38
|
-
* Default frequency is
|
|
38
|
+
* Default frequency is based on the number of SourceComponents, n, in the transfer, it ranges from 100ms -> n
|
|
39
39
|
* Default timeout is 60 minutes.
|
|
40
40
|
*
|
|
41
41
|
* @param frequency Polling frequency in milliseconds.
|
|
@@ -50,6 +50,10 @@ export declare abstract class MetadataTransfer<Status extends MetadataRequestSta
|
|
|
50
50
|
protected maybeSaveTempDirectory(target: SfdxFileFormat, cs?: ComponentSet): Promise<void>;
|
|
51
51
|
protected getConnection(): Promise<Connection>;
|
|
52
52
|
private poll;
|
|
53
|
+
/**
|
|
54
|
+
* Based on the source components in the component set, it will return a polling frequency in milliseconds
|
|
55
|
+
*/
|
|
56
|
+
private calculatePollingFrequency;
|
|
53
57
|
abstract checkStatus(): Promise<Status>;
|
|
54
58
|
abstract cancel(): Promise<void>;
|
|
55
59
|
protected abstract pre(): Promise<AsyncResult>;
|
|
@@ -43,8 +43,9 @@ class MetadataTransfer {
|
|
|
43
43
|
return asyncResult;
|
|
44
44
|
}
|
|
45
45
|
async pollStatus(frequencyOrOptions, timeout) {
|
|
46
|
+
var _a, _b;
|
|
46
47
|
let pollingOptions = {
|
|
47
|
-
frequency: kit_1.Duration.milliseconds(
|
|
48
|
+
frequency: kit_1.Duration.milliseconds(this.calculatePollingFrequency()),
|
|
48
49
|
timeout: kit_1.Duration.minutes(60),
|
|
49
50
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
50
51
|
poll: this.poll.bind(this),
|
|
@@ -58,6 +59,10 @@ class MetadataTransfer {
|
|
|
58
59
|
if ((0, ts_types_1.isNumber)(timeout)) {
|
|
59
60
|
pollingOptions.timeout = kit_1.Duration.seconds(timeout);
|
|
60
61
|
}
|
|
62
|
+
// from the overloaded methods, there's a possibility frequency/timeout isn't set
|
|
63
|
+
// guarantee frequency and timeout are set
|
|
64
|
+
(_a = pollingOptions.frequency) !== null && _a !== void 0 ? _a : (pollingOptions.frequency = kit_1.Duration.milliseconds(this.calculatePollingFrequency()));
|
|
65
|
+
(_b = pollingOptions.timeout) !== null && _b !== void 0 ? _b : (pollingOptions.timeout = kit_1.Duration.minutes(60));
|
|
61
66
|
const pollingClient = await core_1.PollingClient.create(pollingOptions);
|
|
62
67
|
try {
|
|
63
68
|
this.logger.debug(`Polling for metadata transfer status. ID = ${this.id}`);
|
|
@@ -167,6 +172,33 @@ class MetadataTransfer {
|
|
|
167
172
|
this.logger.debug(`MDAPI status update: ${mdapiStatus.status}`);
|
|
168
173
|
return { completed, payload: mdapiStatus };
|
|
169
174
|
}
|
|
175
|
+
/**
|
|
176
|
+
* Based on the source components in the component set, it will return a polling frequency in milliseconds
|
|
177
|
+
*/
|
|
178
|
+
calculatePollingFrequency() {
|
|
179
|
+
var _a;
|
|
180
|
+
const size = ((_a = this.components) === null || _a === void 0 ? void 0 : _a.getSourceComponents().toArray().length) || 0;
|
|
181
|
+
// take a piece-wise approach to encapsulate discrete deployment sizes in polling frequencies that "feel" good when deployed
|
|
182
|
+
if (size === 0) {
|
|
183
|
+
// no component set size is possible for retrieve
|
|
184
|
+
return 1000;
|
|
185
|
+
}
|
|
186
|
+
else if (size <= 10) {
|
|
187
|
+
return 100;
|
|
188
|
+
}
|
|
189
|
+
else if (size <= 50) {
|
|
190
|
+
return 250;
|
|
191
|
+
}
|
|
192
|
+
else if (size <= 100) {
|
|
193
|
+
return 500;
|
|
194
|
+
}
|
|
195
|
+
else if (size <= 1000) {
|
|
196
|
+
return 1000;
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
return size;
|
|
200
|
+
}
|
|
201
|
+
}
|
|
170
202
|
}
|
|
171
203
|
exports.MetadataTransfer = MetadataTransfer;
|
|
172
204
|
//# sourceMappingURL=metadataTransfer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAAsC;AACtC,+BAA4B;AAC5B,2CAAwG;AACxG,yCAA2C;AAC3C,mDAAyD;AACzD,kCAAkC;AAClC,wCAA+D;AAC/D,sCAAkD;AAClD,gDAA8C;AAC9C,mCAAoG;
|
|
1
|
+
{"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { ComponentSet } from '../collections';
|
|
|
2
2
|
import { PackageTypeMembers } from '../collections/types';
|
|
3
3
|
import { SourcePath } from '../common/types';
|
|
4
4
|
import { MetadataComponent, SourceComponent } from '../resolve';
|
|
5
|
+
import { SfdxFileFormat } from '../convert';
|
|
5
6
|
export declare type RecordId = string;
|
|
6
7
|
export declare enum ComponentStatus {
|
|
7
8
|
Created = "Created",
|
|
@@ -272,6 +273,23 @@ export interface RetrieveOptions {
|
|
|
272
273
|
* A list of package names to retrieve, or package names and their retrieval locations.
|
|
273
274
|
*/
|
|
274
275
|
packageOptions?: PackageOptions;
|
|
276
|
+
/**
|
|
277
|
+
* The file format desired for the retrieved files.
|
|
278
|
+
*/
|
|
279
|
+
format?: SfdxFileFormat;
|
|
280
|
+
/**
|
|
281
|
+
* Specifies whether only a single package is being retrieved (true) or not (false).
|
|
282
|
+
* If false, then more than one package is being retrieved.
|
|
283
|
+
*/
|
|
284
|
+
singlePackage?: boolean;
|
|
285
|
+
/**
|
|
286
|
+
* The name of the retrieved zip file containing the source from the org. Only applies when `format: metadata`.
|
|
287
|
+
*/
|
|
288
|
+
zipFileName?: string;
|
|
289
|
+
/**
|
|
290
|
+
* Specifies whether to unzip the retrieved zip file. Only applies when `format: metadata`.
|
|
291
|
+
*/
|
|
292
|
+
unzip?: boolean;
|
|
275
293
|
}
|
|
276
294
|
export interface MetadataApiDeployOptions {
|
|
277
295
|
allowMissingFiles?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":";;;AAkBA,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,0CAAuB,CAAA;IACvB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACnB,CAAC,EANW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAM1B;AA+DD,IAAY,aAQX;AARD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,sDAAqC,CAAA;IACrC,kCAAiB,CAAA;IACjB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;AACvB,CAAC,EARW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAQxB;AAkJD,IAAK,eASJ;AATD,WAAK,eAAe;IAClB,gCAAa,CAAA;IACb,sCAAmB,CAAA;IACnB,4CAAyB,CAAA;IACzB,4DAAyC,CAAA;IACzC,0CAAuB,CAAA;IACvB,0DAAuC,CAAA;IACvC,wCAAqB,CAAA;IACrB,0CAAuB,CAAA;AACzB,CAAC,EATI,eAAe,KAAf,eAAe,QASnB"}
|
|
@@ -11,6 +11,7 @@ const path_1 = require("path");
|
|
|
11
11
|
const streams_1 = require("../streams");
|
|
12
12
|
const common_1 = require("../../common");
|
|
13
13
|
const collections_1 = require("../../collections");
|
|
14
|
+
const utils_1 = require("../../utils");
|
|
14
15
|
const baseMetadataTransformer_1 = require("./baseMetadataTransformer");
|
|
15
16
|
class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetadataTransformer {
|
|
16
17
|
// eslint-disable-next-line @typescript-eslint/require-await
|
|
@@ -58,7 +59,7 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
58
59
|
const childTypeId = (_a = type.children) === null || _a === void 0 ? void 0 : _a.directories[tagKey];
|
|
59
60
|
if (childTypeId) {
|
|
60
61
|
const childType = type.children.types[childTypeId];
|
|
61
|
-
const tagValues =
|
|
62
|
+
const tagValues = (0, utils_1.normalizeToArray)(tagValue);
|
|
62
63
|
for (const value of tagValues) {
|
|
63
64
|
const entryName = value.fullName || value.name;
|
|
64
65
|
const childComponent = {
|
|
@@ -71,6 +72,28 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
71
72
|
const source = new streams_1.JsToXml({
|
|
72
73
|
[childType.name]: Object.assign({ [common_1.XML_NS_KEY]: common_1.XML_NS_URL }, value),
|
|
73
74
|
});
|
|
75
|
+
/*
|
|
76
|
+
composedMetadata is a representation of the parent's xml
|
|
77
|
+
if there is no CustomObjectTranslation in the org, the composedMetadata will be 2 entries
|
|
78
|
+
the xml declaration, and a fields attribute, which points to the child CustomObjectFieldTranslation
|
|
79
|
+
because CustomObjectFieldTranslation is the only metadata type with 'requiresParent' = true we can
|
|
80
|
+
calculate if a CustomObjectTranslation was retrieved from the org (composedMetadata.length > 2), or,
|
|
81
|
+
if we'll have to write an empty CustomObjectTranslation file (composedMetadata.length <=2).
|
|
82
|
+
CustomObjectFieldTranslations are only addressable through their parent, and require a
|
|
83
|
+
CustomObjectTranslation file to be present
|
|
84
|
+
*/
|
|
85
|
+
if (childType.unaddressableWithoutParent && composedMetadata.length <= 2) {
|
|
86
|
+
parentXmlObject = {
|
|
87
|
+
[component.type.name]: '',
|
|
88
|
+
};
|
|
89
|
+
this.setDecomposedState(childComponent, {
|
|
90
|
+
foundMerge: false,
|
|
91
|
+
writeInfo: {
|
|
92
|
+
source: new streams_1.JsToXml(parentXmlObject),
|
|
93
|
+
output: this.getDefaultOutput(component),
|
|
94
|
+
},
|
|
95
|
+
});
|
|
96
|
+
}
|
|
74
97
|
// if there's nothing to merge with, push write operation now to default location
|
|
75
98
|
if (!mergeWith) {
|
|
76
99
|
writeInfos.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA4B;AAG5B,wCAAqC;AAErC,yCAAmF;AACnF,mDAAiD;AAGjD,uEAAoE;AAEpE,MAAa,6BAA8B,SAAQ,iDAAuB;IACxE,4DAA4D;IACrD,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACtD,IAAI,SAAS,CAAC,MAAM,EAAE;YACpB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;YAClD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5C,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;oBACrB,KAAK,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;iBAC3C;qBAAM;oBACL,KAAK,CAAC,UAAU,CAAC,GAAG;wBAClB,SAAS,EAAE,SAAS,CAAC,MAAM;wBAC3B,QAAQ,EAAE,IAAI,0BAAY,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;qBACvD,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;oBACpB,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,0BAAY,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;iBAChF;gBACD,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;gBACzC,IAAI,QAAQ,EAAE;oBACZ,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBACrB,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBACtC,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;SACJ;QACD,wEAAwE;QACxE,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;;QACjF,MAAM,UAAU,GAAgB,EAAE,CAAC;QACnC,MAAM,wBAAwB,GAAG,IAAI,0BAAY,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,EAAE,CAAC,CAAC;QAC5E,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;QACrD,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;QAE/C,IAAI,eAAwB,CAAC;QAC7B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAE1E,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,gBAAgB,EAAE;YACjD,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,QAAQ,0CAAE,WAAW,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,WAAW,EAAE;gBACf,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBACnD,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
package/lib/src/i18n/i18n.d.ts
CHANGED
package/lib/src/i18n/i18n.js
CHANGED
|
@@ -65,5 +65,6 @@ exports.messages = {
|
|
|
65
65
|
error_no_job_id: 'The %s operation is missing a job ID. Initialize an operation with an ID, or start a new job.',
|
|
66
66
|
tapi_deploy_component_limit_error: 'This deploy method only supports deploying one metadata component at a time',
|
|
67
67
|
warn_unresolved_source_for_components: 'The following components will not be deployed due to unresolved source: %s',
|
|
68
|
+
invalid_xml_parsing: 'error parsing %s due to:\n message: %s\n line: %s\n code: %s',
|
|
68
69
|
};
|
|
69
70
|
//# sourceMappingURL=i18n.js.map
|
package/lib/src/i18n/i18n.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../../src/i18n/i18n.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB;;;;;;;;;GASG;AACU,QAAA,QAAQ,GAAG;IACtB,eAAe,EAAE,iCAAiC;IAClD,kBAAkB,EAAE,gCAAgC;IACpD,sCAAsC,EAAE,yCAAyC;IACjF,6BAA6B,EAAE,mBAAmB;IAClD,mCAAmC,EAAE,kCAAkC;IACvE,+BAA+B,EAAE,0DAA0D;IAC3F,2BAA2B,EAAE,8CAA8C;IAC3E,0BAA0B,EAAE,qCAAqC;IACjE,mBAAmB,EAAE,mDAAmD;IACxE,sBAAsB,EAAE,kCAAkC;IAC1D,sCAAsC,EAAE,yBAAyB;IACjE,4BAA4B,EAAE,gCAAgC;IAC9D,6BAA6B,EAAE,sDAAsD;IACrF,0BAA0B,EAAE,qCAAqC;IACjE,2BAA2B,EAAE,2DAA2D;IACxF,2BAA2B,EAAE,yCAAyC;IACtE,oBAAoB,EAAE,iCAAiC;IACvD,uCAAuC,EAAE,gEAAgE;IACzG,yBAAyB,EAAE,sEAAsE;IACjG,2BAA2B,EAAE,yBAAyB;IACtD,qBAAqB,EAAE,6CAA6C;IACpE,yBAAyB,EAAE,iDAAiD;IAC5E,0BAA0B,EAAE,wCAAwC;IACpE,sCAAsC,EAAE,2CAA2C;IACnF,6BAA6B,EAAE,2DAA2D;IAC1F,mCAAmC,EAAE,mDAAmD;IACxF,4BAA4B,EAAE,8DAA8D;IAC5F,sBAAsB,EACpB,8UAA8U;IAChV,oBAAoB,EAAE,8BAA8B;IACpD,mCAAmC,EAAE,gFAAgF;IACrH,0BAA0B,EAAE,oEAAoE;IAChG,4BAA4B,EAAE,gCAAgC;IAC9D,4BAA4B,EAAE,gCAAgC;IAC9D,2BAA2B,EAAE,6BAA6B;IAC1D,iBAAiB,EAAE,sEAAsE;IACzF,wBAAwB,EAAE,6CAA6C;IACvE,6BAA6B,EAAE,6CAA6C;IAC5E,yBAAyB,EAAE,qDAAqD;IAChF,yBAAyB,EAAE,qDAAqD;IAChF,+BAA+B,EAAE,2CAA2C;IAC5E,qBAAqB,EAAE,mDAAmD;IAC1E,2CAA2C,EACzC,8GAA8G;IAChH,2CAA2C,EACzC,uFAAuF;IACzF,eAAe,EAAE,+FAA+F;IAChH,iCAAiC,EAAE,6EAA6E;IAChH,qCAAqC,EAAE,4EAA4E;
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../../src/i18n/i18n.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB;;;;;;;;;GASG;AACU,QAAA,QAAQ,GAAG;IACtB,eAAe,EAAE,iCAAiC;IAClD,kBAAkB,EAAE,gCAAgC;IACpD,sCAAsC,EAAE,yCAAyC;IACjF,6BAA6B,EAAE,mBAAmB;IAClD,mCAAmC,EAAE,kCAAkC;IACvE,+BAA+B,EAAE,0DAA0D;IAC3F,2BAA2B,EAAE,8CAA8C;IAC3E,0BAA0B,EAAE,qCAAqC;IACjE,mBAAmB,EAAE,mDAAmD;IACxE,sBAAsB,EAAE,kCAAkC;IAC1D,sCAAsC,EAAE,yBAAyB;IACjE,4BAA4B,EAAE,gCAAgC;IAC9D,6BAA6B,EAAE,sDAAsD;IACrF,0BAA0B,EAAE,qCAAqC;IACjE,2BAA2B,EAAE,2DAA2D;IACxF,2BAA2B,EAAE,yCAAyC;IACtE,oBAAoB,EAAE,iCAAiC;IACvD,uCAAuC,EAAE,gEAAgE;IACzG,yBAAyB,EAAE,sEAAsE;IACjG,2BAA2B,EAAE,yBAAyB;IACtD,qBAAqB,EAAE,6CAA6C;IACpE,yBAAyB,EAAE,iDAAiD;IAC5E,0BAA0B,EAAE,wCAAwC;IACpE,sCAAsC,EAAE,2CAA2C;IACnF,6BAA6B,EAAE,2DAA2D;IAC1F,mCAAmC,EAAE,mDAAmD;IACxF,4BAA4B,EAAE,8DAA8D;IAC5F,sBAAsB,EACpB,8UAA8U;IAChV,oBAAoB,EAAE,8BAA8B;IACpD,mCAAmC,EAAE,gFAAgF;IACrH,0BAA0B,EAAE,oEAAoE;IAChG,4BAA4B,EAAE,gCAAgC;IAC9D,4BAA4B,EAAE,gCAAgC;IAC9D,2BAA2B,EAAE,6BAA6B;IAC1D,iBAAiB,EAAE,sEAAsE;IACzF,wBAAwB,EAAE,6CAA6C;IACvE,6BAA6B,EAAE,6CAA6C;IAC5E,yBAAyB,EAAE,qDAAqD;IAChF,yBAAyB,EAAE,qDAAqD;IAChF,+BAA+B,EAAE,2CAA2C;IAC5E,qBAAqB,EAAE,mDAAmD;IAC1E,2CAA2C,EACzC,8GAA8G;IAChH,2CAA2C,EACzC,uFAAuF;IACzF,eAAe,EAAE,+FAA+F;IAChH,iCAAiC,EAAE,6EAA6E;IAChH,qCAAqC,EAAE,4EAA4E;IACnH,mBAAmB,EAAE,iEAAiE;CACvF,CAAC"}
|
|
@@ -83,6 +83,10 @@ export interface MetadataType {
|
|
|
83
83
|
* Whether the component is supported by the Metadata API and therefore should be included within a manifest.
|
|
84
84
|
*/
|
|
85
85
|
isAddressable?: boolean;
|
|
86
|
+
/**
|
|
87
|
+
* Whether the component requires the parent to be present when deploying/retrieving
|
|
88
|
+
*/
|
|
89
|
+
unaddressableWithoutParent?: boolean;
|
|
86
90
|
/**
|
|
87
91
|
* Whether or not components of the same type can be can be specified with the wildcard character, and by name in a manifest
|
|
88
92
|
*
|
|
@@ -74,6 +74,7 @@ export declare class SourceComponent implements MetadataComponent {
|
|
|
74
74
|
setMarkedForDelete(destructiveChangeType?: DestructiveChangesType | boolean): void;
|
|
75
75
|
private calculateRelativePath;
|
|
76
76
|
private parse;
|
|
77
|
+
private parseAndValidateXML;
|
|
77
78
|
private getDecomposedChildren;
|
|
78
79
|
private getNonDecomposedChildren;
|
|
79
80
|
private walk;
|
|
@@ -84,16 +84,16 @@ class SourceComponent {
|
|
|
84
84
|
async parseXml(xmlFilePath) {
|
|
85
85
|
const xml = xmlFilePath !== null && xmlFilePath !== void 0 ? xmlFilePath : this.xml;
|
|
86
86
|
if (xml) {
|
|
87
|
-
const contents = await this.tree.readFile(xml);
|
|
88
|
-
return this.
|
|
87
|
+
const contents = (await this.tree.readFile(xml)).toString();
|
|
88
|
+
return this.parseAndValidateXML(contents, xml);
|
|
89
89
|
}
|
|
90
90
|
return {};
|
|
91
91
|
}
|
|
92
92
|
parseXmlSync(xmlFilePath) {
|
|
93
93
|
const xml = xmlFilePath !== null && xmlFilePath !== void 0 ? xmlFilePath : this.xml;
|
|
94
94
|
if (xml) {
|
|
95
|
-
const contents = this.tree.readFileSync(xml);
|
|
96
|
-
return this.
|
|
95
|
+
const contents = this.tree.readFileSync(xml).toString();
|
|
96
|
+
return this.parseAndValidateXML(contents, xml);
|
|
97
97
|
}
|
|
98
98
|
return {};
|
|
99
99
|
}
|
|
@@ -191,6 +191,24 @@ class SourceComponent {
|
|
|
191
191
|
return parsed;
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
|
+
parseAndValidateXML(contents, path) {
|
|
195
|
+
try {
|
|
196
|
+
return this.parse(contents);
|
|
197
|
+
}
|
|
198
|
+
catch (e) {
|
|
199
|
+
// only attempt validating once there's an error to avoid the performance hit of validating every file
|
|
200
|
+
const validation = (0, fast_xml_parser_1.validate)(contents);
|
|
201
|
+
if (validation !== true) {
|
|
202
|
+
throw new errors_1.LibraryError('invalid_xml_parsing', [
|
|
203
|
+
path,
|
|
204
|
+
validation.err.msg,
|
|
205
|
+
validation.err.line.toString(),
|
|
206
|
+
validation.err.code,
|
|
207
|
+
]);
|
|
208
|
+
}
|
|
209
|
+
throw e;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
194
212
|
getDecomposedChildren(dirPath) {
|
|
195
213
|
const children = [];
|
|
196
214
|
for (const fsPath of this.walk(dirPath)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":"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"}
|