@salesforce/source-deploy-retrieve 5.9.2 → 5.9.6
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 +20 -0
- package/lib/src/client/metadataApiDeploy.js +4 -0
- package/lib/src/client/metadataApiDeploy.js.map +1 -1
- package/lib/src/collections/types.d.ts +1 -1
- package/lib/src/convert/convertContext.d.ts +23 -27
- package/lib/src/convert/convertContext.js +100 -107
- package/lib/src/convert/convertContext.js.map +1 -1
- package/lib/src/convert/metadataConverter.js +2 -10
- package/lib/src/convert/metadataConverter.js.map +1 -1
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.d.ts +0 -2
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js +11 -31
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js.map +1 -1
- package/lib/src/registry/metadataRegistry.json +10 -0
- package/lib/src/registry/nonSupportedTypes.js +0 -1
- package/lib/src/registry/nonSupportedTypes.js.map +1 -1
- package/lib/src/registry/registry.d.ts +10 -0
- package/lib/src/registry/registryAccess.d.ts +10 -0
- package/lib/src/registry/registryAccess.js +21 -8
- package/lib/src/registry/registryAccess.js.map +1 -1
- package/lib/src/registry/types.d.ts +4 -0
- package/lib/src/resolve/forceIgnore.d.ts +0 -1
- package/lib/src/resolve/forceIgnore.js +12 -3
- package/lib/src/resolve/forceIgnore.js.map +1 -1
- package/package.json +4 -3
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,26 @@
|
|
|
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.6](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.5...v5.9.6) (2022-02-07)
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
- warn and convert on windows seps in .forceignore ([#557](https://github.com/forcedotcom/source-deploy-retrieve/issues/557)) ([a9700d7](https://github.com/forcedotcom/source-deploy-retrieve/commit/a9700d7132b891525459ee98b4a70dcdc066716e))
|
|
10
|
+
|
|
11
|
+
### [5.9.5](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.4...v5.9.5) (2022-01-31)
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
- convert CFT ([#558](https://github.com/forcedotcom/source-deploy-retrieve/issues/558)) ([4978247](https://github.com/forcedotcom/source-deploy-retrieve/commit/4978247f57b7db8e6b08c96d7a985dad67dc0dbc))
|
|
16
|
+
|
|
17
|
+
### [5.9.4](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.3...v5.9.4) (2022-01-24)
|
|
18
|
+
|
|
19
|
+
### [5.9.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.2...v5.9.3) (2022-01-20)
|
|
20
|
+
|
|
21
|
+
### Bug Fixes
|
|
22
|
+
|
|
23
|
+
- custom label merging ([2d5ded2](https://github.com/forcedotcom/source-deploy-retrieve/commit/2d5ded2f45242535061d545dc7de56d12630bce2))
|
|
24
|
+
|
|
5
25
|
### [5.9.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.1...v5.9.2) (2022-01-12)
|
|
6
26
|
|
|
7
27
|
### [5.9.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.0...v5.9.1) (2022-01-05)
|
|
@@ -176,6 +176,10 @@ class DeployResult {
|
|
|
176
176
|
// strip document extension from fullName
|
|
177
177
|
message.fullName = (0, path_1.join)((0, path_1.dirname)(message.fullName), (0, path_1.basename)(message.fullName, (0, path_1.extname)(message.fullName)));
|
|
178
178
|
break;
|
|
179
|
+
// Treat emailTemplateFolder as EmailFolder
|
|
180
|
+
case registry_1.registry.types.emailtemplatefolder.name:
|
|
181
|
+
message.componentType = registry_1.registry.types.emailfolder.name;
|
|
182
|
+
break;
|
|
179
183
|
default:
|
|
180
184
|
}
|
|
181
185
|
return message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ export interface FromManifestOptions extends OptionalTreeRegistryOptions {
|
|
|
41
41
|
*/
|
|
42
42
|
resolveSourcePaths?: string[];
|
|
43
43
|
/**
|
|
44
|
-
* By default, wildcard members
|
|
44
|
+
* By default, wildcard members encountered in the manifest are added to the set
|
|
45
45
|
* e.g. `{ fullName: '*', type: 'ApexClass' }`. If `resolveSourcePaths` is set,
|
|
46
46
|
* wildcard components are not added to the final set, but are used in the filter
|
|
47
47
|
* when resolving source-backed components to match all components with the wildcard
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { JsonMap } from '@salesforce/ts-types';
|
|
2
2
|
import { ComponentSet } from '../collections';
|
|
3
|
-
import { MetadataComponent, SourceComponent } from '../resolve';
|
|
3
|
+
import { MetadataComponent, SourceComponent, NodeFSTreeContainer, TreeContainer } from '../resolve';
|
|
4
4
|
import { WriteInfo, WriterFormat } from './types';
|
|
5
5
|
declare abstract class ConvertTransactionFinalizer<T> {
|
|
6
6
|
protected abstract transactionState: T;
|
|
@@ -47,17 +47,9 @@ declare class DecompositionFinalizer extends ConvertTransactionFinalizer<Decompo
|
|
|
47
47
|
finalize(): Promise<WriterFormat[]>;
|
|
48
48
|
}
|
|
49
49
|
export interface NonDecompositionState {
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
childrenByUniqueElement: Map<string, JsonMap>;
|
|
51
|
+
exampleComponent: SourceComponent;
|
|
52
52
|
}
|
|
53
|
-
declare type ChildIndex = {
|
|
54
|
-
[componentKey: string]: {
|
|
55
|
-
parent: SourceComponent;
|
|
56
|
-
children: {
|
|
57
|
-
[childName: string]: JsonMap;
|
|
58
|
-
};
|
|
59
|
-
};
|
|
60
|
-
};
|
|
61
53
|
/**
|
|
62
54
|
* Merges child components that share the same parent in the conversion pipeline
|
|
63
55
|
* into a single file.
|
|
@@ -66,33 +58,37 @@ declare type ChildIndex = {
|
|
|
66
58
|
*/
|
|
67
59
|
declare class NonDecompositionFinalizer extends ConvertTransactionFinalizer<NonDecompositionState> {
|
|
68
60
|
protected transactionState: NonDecompositionState;
|
|
69
|
-
|
|
61
|
+
protected mergeMap: Map<string, Map<string, JsonMap>>;
|
|
62
|
+
protected parentComponentMap: Map<string, SourceComponent>;
|
|
63
|
+
protected tree: TreeContainer;
|
|
64
|
+
finalize(defaultDirectory: string, tree?: NodeFSTreeContainer): Promise<WriterFormat[]>;
|
|
65
|
+
private initChildMapping;
|
|
70
66
|
/**
|
|
71
|
-
*
|
|
72
|
-
* - finding any "unprocessed components" (nondecomposed metadata types can exist in multiple locations under the same name so we have to find all components that could potentially claim children)
|
|
73
|
-
* - removing any children from the unclaimed state that have been claimed by the unprocessed components
|
|
74
|
-
* - removing any children from the unclaimed state that have already been claimed by a prent in the claimed state
|
|
75
|
-
* - merging the remaining unclaimed children into the default parent component (either the component that matches the defaultDirectory or the first parent component)
|
|
67
|
+
* check both top-level maps and make sure there are defaults
|
|
76
68
|
*/
|
|
77
|
-
private
|
|
69
|
+
private ensureDefaults;
|
|
78
70
|
/**
|
|
79
|
-
* Returns the
|
|
71
|
+
* Returns all the components of the incoming type in the project.
|
|
80
72
|
*
|
|
81
|
-
*
|
|
73
|
+
* Some components are not resolved during component resolution.
|
|
82
74
|
* This typically only happens when a specific source path was resolved. This is problematic for
|
|
83
75
|
* nondecomposed metadata types (like CustomLabels) because we need to know the location of each
|
|
84
|
-
* child type before recomposing the final xml.
|
|
85
|
-
*
|
|
76
|
+
* child type before recomposing the final xml.
|
|
77
|
+
* The labels could belong in any of the files OR need to go in the default location which already contains labels
|
|
78
|
+
*/
|
|
79
|
+
private getAllComponentsOfType;
|
|
80
|
+
/**
|
|
81
|
+
* Populate the mergeMap with all the children of all the local components
|
|
86
82
|
*/
|
|
87
|
-
private
|
|
83
|
+
private initMergeMap;
|
|
88
84
|
/**
|
|
89
|
-
*
|
|
85
|
+
* Return a json object that's built up from the mergeMap children
|
|
90
86
|
*/
|
|
91
|
-
private getChildrenOfUnprocessedComponents;
|
|
92
87
|
private recompose;
|
|
88
|
+
/**
|
|
89
|
+
* Return the default filepath for new metadata of this type
|
|
90
|
+
*/
|
|
93
91
|
private getDefaultOutput;
|
|
94
|
-
private getClaimedChildrenNames;
|
|
95
|
-
private getParentsOfClaimedChildren;
|
|
96
92
|
}
|
|
97
93
|
/**
|
|
98
94
|
* A state manager over the course of a single metadata conversion call.
|
|
@@ -9,10 +9,10 @@ exports.ConvertContext = void 0;
|
|
|
9
9
|
*/
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
12
|
-
const kit_1 = require("@salesforce/kit");
|
|
13
12
|
const common_1 = require("../common");
|
|
14
13
|
const collections_1 = require("../collections");
|
|
15
14
|
const utils_1 = require("../utils");
|
|
15
|
+
const resolve_1 = require("../resolve");
|
|
16
16
|
const streams_1 = require("./streams");
|
|
17
17
|
class ConvertTransactionFinalizer {
|
|
18
18
|
setState(props) {
|
|
@@ -132,142 +132,135 @@ class NonDecompositionFinalizer extends ConvertTransactionFinalizer {
|
|
|
132
132
|
constructor() {
|
|
133
133
|
super(...arguments);
|
|
134
134
|
this.transactionState = {
|
|
135
|
-
|
|
136
|
-
|
|
135
|
+
childrenByUniqueElement: new Map(),
|
|
136
|
+
exampleComponent: undefined,
|
|
137
137
|
};
|
|
138
|
+
// filename => (childName => childXml)
|
|
139
|
+
this.mergeMap = new Map();
|
|
140
|
+
// filename => sourceComponent
|
|
141
|
+
this.parentComponentMap = new Map();
|
|
138
142
|
}
|
|
139
|
-
async finalize(defaultDirectory) {
|
|
140
|
-
await this.finalizeState(defaultDirectory);
|
|
143
|
+
async finalize(defaultDirectory, tree = new resolve_1.NodeFSTreeContainer()) {
|
|
141
144
|
const writerData = [];
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
writerData.push({
|
|
145
|
-
component: parent,
|
|
146
|
-
writeInfos: [{ source: new streams_1.JsToXml(recomposedXmlObj), output: parent.xml }],
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
|
-
for (const { parent, children } of Object.values(this.state.unclaimed)) {
|
|
150
|
-
const recomposedXmlObj = await this.recompose(Object.values(children), parent);
|
|
151
|
-
writerData.push({
|
|
152
|
-
component: parent,
|
|
153
|
-
writeInfos: [{ source: new streams_1.JsToXml(recomposedXmlObj), output: this.getDefaultOutput(parent) }],
|
|
154
|
-
});
|
|
145
|
+
if (this.transactionState.childrenByUniqueElement.size === 0) {
|
|
146
|
+
return writerData;
|
|
155
147
|
}
|
|
148
|
+
this.tree = tree;
|
|
149
|
+
// nondecomposed metadata types can exist in multiple locations under the same name
|
|
150
|
+
// so we have to find all components that could potentially match inbound components
|
|
151
|
+
const allNonDecomposed = this.getAllComponentsOfType(defaultDirectory, this.transactionState.exampleComponent.type.name);
|
|
152
|
+
// prepare 3 maps to simplify component merging
|
|
153
|
+
await this.initMergeMap(allNonDecomposed);
|
|
154
|
+
this.parentComponentMap = new Map(allNonDecomposed.map((c) => [c.xml, c]));
|
|
155
|
+
const childNameToParentFilePath = this.initChildMapping();
|
|
156
|
+
// we'll merge any new labels into the default location
|
|
157
|
+
const defaultKey = (0, path_1.join)(defaultDirectory, this.getDefaultOutput(this.transactionState.exampleComponent));
|
|
158
|
+
this.ensureDefaults(defaultKey);
|
|
159
|
+
// put the incoming components into the mergeMap. Keep track of any files we need to write
|
|
160
|
+
const filesToWrite = new Set();
|
|
161
|
+
this.state.childrenByUniqueElement.forEach((child, childUniqueElement) => {
|
|
162
|
+
var _a;
|
|
163
|
+
const parentKey = (_a = childNameToParentFilePath.get(childUniqueElement)) !== null && _a !== void 0 ? _a : defaultKey;
|
|
164
|
+
const parentItemMap = this.mergeMap.get(parentKey);
|
|
165
|
+
parentItemMap.set(childUniqueElement, child);
|
|
166
|
+
filesToWrite.add(parentKey);
|
|
167
|
+
});
|
|
168
|
+
// use the mergeMap to return the writables
|
|
169
|
+
this.mergeMap.forEach((children, parentKey) => {
|
|
170
|
+
if (filesToWrite.has(parentKey)) {
|
|
171
|
+
const parentSourceComponent = this.parentComponentMap.get(parentKey);
|
|
172
|
+
const recomposedXmlObj = this.recompose(children, parentSourceComponent);
|
|
173
|
+
writerData.push({
|
|
174
|
+
component: parentSourceComponent,
|
|
175
|
+
writeInfos: [{ source: new streams_1.JsToXml(recomposedXmlObj), output: parentKey }],
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
});
|
|
156
179
|
return writerData;
|
|
157
180
|
}
|
|
181
|
+
initChildMapping() {
|
|
182
|
+
const output = new Map();
|
|
183
|
+
this.mergeMap.forEach((children, parentKey) => {
|
|
184
|
+
children.forEach((child, childName) => {
|
|
185
|
+
output.set(childName, parentKey);
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
return output;
|
|
189
|
+
}
|
|
158
190
|
/**
|
|
159
|
-
*
|
|
160
|
-
* - finding any "unprocessed components" (nondecomposed metadata types can exist in multiple locations under the same name so we have to find all components that could potentially claim children)
|
|
161
|
-
* - removing any children from the unclaimed state that have been claimed by the unprocessed components
|
|
162
|
-
* - removing any children from the unclaimed state that have already been claimed by a prent in the claimed state
|
|
163
|
-
* - merging the remaining unclaimed children into the default parent component (either the component that matches the defaultDirectory or the first parent component)
|
|
191
|
+
* check both top-level maps and make sure there are defaults
|
|
164
192
|
*/
|
|
165
|
-
|
|
166
|
-
if (
|
|
167
|
-
|
|
193
|
+
ensureDefaults(defaultKey) {
|
|
194
|
+
if (!this.mergeMap.has(defaultKey)) {
|
|
195
|
+
// If project has no files of this type, there won't be anything from allNonDecomposed.
|
|
196
|
+
this.mergeMap.set(defaultKey, new Map());
|
|
168
197
|
}
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
for (const [key, childIndex] of Object.entries(this.state.unclaimed)) {
|
|
178
|
-
const pruned = Object.entries(childIndex.children).reduce((result, [childName, childXml]) => {
|
|
179
|
-
return !claimedChildren.includes(childName) ? Object.assign(result, { [childName]: childXml }) : result;
|
|
180
|
-
}, {});
|
|
181
|
-
delete this.state.unclaimed[key];
|
|
182
|
-
if (this.state.claimed[defaultComponentKey]) {
|
|
183
|
-
this.state.claimed[defaultComponentKey].children = Object.assign({}, this.state.claimed[defaultComponentKey].children, pruned);
|
|
184
|
-
}
|
|
198
|
+
if (!this.parentComponentMap.has(defaultKey)) {
|
|
199
|
+
// it's possible to get here if there are no files of this type in the project.
|
|
200
|
+
// we don't have any SourceComponent to reference except the new incoming ones
|
|
201
|
+
// so this creates a "default" component with the correct path for the xml file
|
|
202
|
+
this.parentComponentMap.set(defaultKey, {
|
|
203
|
+
...this.transactionState.exampleComponent,
|
|
204
|
+
xml: defaultKey,
|
|
205
|
+
});
|
|
185
206
|
}
|
|
186
207
|
}
|
|
187
208
|
/**
|
|
188
|
-
* Returns the
|
|
209
|
+
* Returns all the components of the incoming type in the project.
|
|
189
210
|
*
|
|
190
|
-
*
|
|
211
|
+
* Some components are not resolved during component resolution.
|
|
191
212
|
* This typically only happens when a specific source path was resolved. This is problematic for
|
|
192
213
|
* nondecomposed metadata types (like CustomLabels) because we need to know the location of each
|
|
193
|
-
* child type before recomposing the final xml.
|
|
194
|
-
*
|
|
214
|
+
* child type before recomposing the final xml.
|
|
215
|
+
* The labels could belong in any of the files OR need to go in the default location which already contains labels
|
|
195
216
|
*/
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
return [];
|
|
199
|
-
}
|
|
200
|
-
const parents = this.getParentsOfClaimedChildren();
|
|
201
|
-
const filterSet = new collections_1.ComponentSet(parents);
|
|
202
|
-
const { tree } = parents[0];
|
|
217
|
+
getAllComponentsOfType(defaultDirectory, componentType) {
|
|
218
|
+
// assumes that defaultDir is one level below project dir
|
|
203
219
|
const projectDir = (0, path_1.resolve)((0, path_1.dirname)(defaultDirectory));
|
|
204
|
-
const
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
});
|
|
209
|
-
const fsPaths = tree
|
|
210
|
-
.readDirectory(projectDir)
|
|
211
|
-
.map((p) => (0, path_1.join)(projectDir, p))
|
|
212
|
-
.filter((p) => {
|
|
213
|
-
const dirName = (0, path_1.basename)(p);
|
|
214
|
-
// Only return directories that are likely to be a project directory
|
|
215
|
-
return (tree.isDirectory(p) &&
|
|
216
|
-
!dirName.startsWith('.') &&
|
|
217
|
-
dirName !== 'config' &&
|
|
218
|
-
dirName !== 'node_modules' &&
|
|
219
|
-
!parentDirs.includes(dirName));
|
|
220
|
-
});
|
|
221
|
-
const unprocessedComponents = collections_1.ComponentSet.fromSource({ fsPaths, include: filterSet })
|
|
222
|
-
.getSourceComponents()
|
|
223
|
-
.filter((component) => !this.state.claimed[component.xml]);
|
|
220
|
+
const unprocessedComponents = collections_1.ComponentSet.fromSource({
|
|
221
|
+
fsPaths: [projectDir],
|
|
222
|
+
include: new collections_1.ComponentSet([{ fullName: '*', type: componentType }]),
|
|
223
|
+
tree: this.tree,
|
|
224
|
+
}).getSourceComponents();
|
|
224
225
|
return unprocessedComponents.toArray();
|
|
225
226
|
}
|
|
226
227
|
/**
|
|
227
|
-
*
|
|
228
|
+
* Populate the mergeMap with all the children of all the local components
|
|
228
229
|
*/
|
|
229
|
-
async
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
const
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
}
|
|
238
|
-
|
|
230
|
+
async initMergeMap(allComponentsOfType) {
|
|
231
|
+
// A function we can parallelize since we have to parseXml for each local file
|
|
232
|
+
const getMappedChildren = async (component) => {
|
|
233
|
+
const results = await Promise.all(component.getChildren().map(async (child) => {
|
|
234
|
+
const childXml = await child.parseXml();
|
|
235
|
+
return [(0, ts_types_1.getString)(childXml, child.type.uniqueIdElement), childXml];
|
|
236
|
+
}));
|
|
237
|
+
return new Map(results);
|
|
238
|
+
};
|
|
239
|
+
const result = await Promise.all(allComponentsOfType.map(async (c) => [c.xml, await getMappedChildren(c)]));
|
|
240
|
+
this.mergeMap = new Map(result);
|
|
239
241
|
}
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
242
|
+
/**
|
|
243
|
+
* Return a json object that's built up from the mergeMap children
|
|
244
|
+
*/
|
|
245
|
+
recompose(children, parentSourceComponent) {
|
|
246
|
+
// for CustomLabels, that's `labels`
|
|
244
247
|
const groupName = parentSourceComponent.type.directoryName;
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
if (!parent[groupName]) {
|
|
252
|
-
parent[groupName] = [];
|
|
253
|
-
}
|
|
254
|
-
const group = (0, utils_1.normalizeToArray)(parent[groupName]);
|
|
255
|
-
group.push(child);
|
|
256
|
-
}
|
|
257
|
-
return parentXmlObj;
|
|
248
|
+
return {
|
|
249
|
+
[parentSourceComponent.type.name]: {
|
|
250
|
+
[common_1.XML_NS_KEY]: common_1.XML_NS_URL,
|
|
251
|
+
[groupName]: Array.from(children.values()),
|
|
252
|
+
},
|
|
253
|
+
};
|
|
258
254
|
}
|
|
255
|
+
/**
|
|
256
|
+
* Return the default filepath for new metadata of this type
|
|
257
|
+
*/
|
|
259
258
|
getDefaultOutput(component) {
|
|
260
259
|
const { fullName } = component;
|
|
261
260
|
const [baseName] = fullName.split('.');
|
|
262
261
|
const output = `${baseName}.${component.type.suffix}${common_1.META_XML_SUFFIX}`;
|
|
263
262
|
return (0, path_1.join)(component.getPackageRelativePath('', 'source'), output);
|
|
264
263
|
}
|
|
265
|
-
getClaimedChildrenNames() {
|
|
266
|
-
return Object.values(this.state.claimed).reduce((x, y) => x.concat(Object.keys(y.children)), []);
|
|
267
|
-
}
|
|
268
|
-
getParentsOfClaimedChildren() {
|
|
269
|
-
return Object.values(this.state.claimed).reduce((x, y) => x.concat([y.parent]), []);
|
|
270
|
-
}
|
|
271
264
|
}
|
|
272
265
|
/**
|
|
273
266
|
* A state manager over the course of a single metadata conversion call.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertContext.js","sourceRoot":"","sources":["../../../src/convert/convertContext.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+
|
|
1
|
+
{"version":3,"file":"convertContext.js","sourceRoot":"","sources":["../../../src/convert/convertContext.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAC9C,mDAAqE;AACrE,sCAAoE;AACpE,gDAA8C;AAC9C,oCAA4C;AAE5C,wCAAoG;AACpG,uCAAoC;AAGpC,MAAe,2BAA2B;IAGjC,QAAQ,CAAC,KAAyB;QACvC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/B,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;CAGF;AAeD;;;GAGG;AACH,MAAM,sBAAuB,SAAQ,2BAA+C;IAApF;;QACY,qBAAgB,GAAuB,EAAE,CAAC;QAEpD,2FAA2F;QAC3F,gDAAgD;QACxC,mBAAc,GAAG,IAAI,GAAG,EAAmB,CAAC;IA2EtD,CAAC;IAzEQ,KAAK,CAAC,QAAQ;QACnB,MAAM,UAAU,GAAmB,EAAE,CAAC;QACtC,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACvE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAChE,UAAU,CAAC,IAAI,CAAC;gBACd,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE;oBACV;wBACE,MAAM,EAAE,IAAI,iBAAO,CAAC,gBAAgB,CAAC;wBACrC,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;qBACpF;iBACF;aACF,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,QAAsB,EAAE,MAAuB;QACrE,8FAA8F;QAC9F,4FAA4F;QAC5F,IAAI,SAAkB,CAAC;QACvB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,wCAAsC,EAAE;YAC5E,SAAS,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SAChD;QAED,MAAM,YAAY,GAChB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,kCAAqC;YACvE,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE7C,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;YAC5B,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;YAC/C,MAAM,oBAAoB,GAAG,KAAwB,CAAC;YAEtD,IAAI,MAAe,CAAC;YACpB,IAAI,SAAS,EAAE;gBACb,mEAAmE;gBACnE,mEAAmE;gBACnE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE;oBACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;iBACpG;gBACD,MAAM,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;aACrG;iBAAM;gBACL,MAAM,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,CAAC;aAChD;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC;YAExD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE;gBAC7B,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAU,CAAC,EAAE,mBAAU,EAAE,CAAC;aACzD;YAED,sDAAsD;YACtD,IAAI,IAAA,oBAAS,EAAC,aAAa,EAAE,mBAAU,CAAC,EAAE;gBACxC,kGAAkG;gBAClG,OAAQ,aAAyB,CAAC,mBAAU,CAAC,CAAC;aAC/C;YAED,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,CAAY,CAAC;YAEtD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;gBACzB,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;aAC3B;YAED,kHAAkH;YAClH,MAAM,KAAK,GAAG,IAAA,wBAAgB,EAAC,SAAS,CAAC,SAAS,CAAC,CAAc,CAAC;YAElE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAC3B;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAUD;;;;GAIG;AACH,MAAM,sBAAuB,SAAQ,2BAA+C;IAApF;;QACY,qBAAgB,GAAuB,EAAE,CAAC;IAgBtD,CAAC;IAdC,4DAA4D;IACrD,KAAK,CAAC,QAAQ;;QACnB,MAAM,UAAU,GAAmB,EAAE,CAAC;QAEtC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;YAC9D,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;gBAC3B,UAAU,CAAC,IAAI,CAAC;oBACd,SAAS,EAAE,MAAA,WAAW,CAAC,MAAM,CAAC,MAAM,mCAAI,WAAW,CAAC,MAAM;oBAC1D,UAAU,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC;iBACpC,CAAC,CAAC;aACJ;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAUD;;;;;GAKG;AACH,MAAM,yBAA0B,SAAQ,2BAAkD;IAA1F;;QACY,qBAAgB,GAA0B;YAClD,uBAAuB,EAAE,IAAI,GAAG,EAAE;YAClC,gBAAgB,EAAE,SAAS;SAC5B,CAAC;QAEF,sCAAsC;QAC5B,aAAQ,GAAG,IAAI,GAAG,EAAgC,CAAC;QAE7D,8BAA8B;QACpB,uBAAkB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAiJpE,CAAC;IA9IQ,KAAK,CAAC,QAAQ,CAAC,gBAAwB,EAAE,IAAI,GAAG,IAAI,6BAAmB,EAAE;QAC9E,MAAM,UAAU,GAAmB,EAAE,CAAC;QAEtC,IAAI,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,IAAI,KAAK,CAAC,EAAE;YAC5D,OAAO,UAAU,CAAC;SACnB;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,mFAAmF;QACnF,oFAAoF;QACpF,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAClD,gBAAgB,EAChB,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CACjD,CAAC;QAEF,+CAA+C;QAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC1C,IAAI,CAAC,kBAAkB,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,MAAM,yBAAyB,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE1D,uDAAuD;QACvD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAEhC,2FAA2F;QAC3F,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;;YACvE,MAAM,SAAS,GAAG,MAAA,yBAAyB,CAAC,GAAG,CAAC,kBAAkB,CAAC,mCAAI,UAAU,CAAC;YAClF,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACnD,aAAa,CAAC,GAAG,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;YAC7C,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,2CAA2C;QAC3C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE;YAC5C,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBAC/B,MAAM,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;gBACzE,UAAU,CAAC,IAAI,CAAC;oBACd,SAAS,EAAE,qBAAqB;oBAChC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,iBAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;iBAC3E,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,gBAAgB;QACtB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QACzC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE;YAC5C,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;gBACpC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,UAAkB;QACvC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAClC,uFAAuF;YACvF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,EAAmB,CAAC,CAAC;SAC3D;QACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAC5C,+EAA+E;YAC/E,8EAA8E;YAC9E,+EAA+E;YAC/E,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE;gBACtC,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB;gBACzC,GAAG,EAAE,UAAU;aACG,CAAC,CAAC;SACvB;IACH,CAAC;IAED;;;;;;;;OAQG;IACK,sBAAsB,CAAC,gBAAwB,EAAE,aAAqB;QAC5E,yDAAyD;QACzD,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,gBAAgB,CAAC,CAAC,CAAC;QACtD,MAAM,qBAAqB,GAAG,0BAAY,CAAC,UAAU,CAAC;YACpD,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,OAAO,EAAE,IAAI,0BAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;YACnE,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC,mBAAmB,EAAE,CAAC;QACzB,OAAO,qBAAqB,CAAC,OAAO,EAAE,CAAC;IACzC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY,CAAC,mBAAsC;QAC/D,8EAA8E;QAC9E,MAAM,iBAAiB,GAAG,KAAK,EAAE,SAA0B,EAAiC,EAAE;YAC5F,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAA8B,EAAE;gBACtE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACxC,OAAO,CAAC,IAAA,oBAAS,EAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;YACrE,CAAC,CAAC,CACH,CAAC;YACF,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,mBAAmB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAA2C,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CACnH,CAAC;QAEF,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,SAAS,CAAC,QAA8B,EAAE,qBAAsC;QACtF,oCAAoC;QACpC,MAAM,SAAS,GAAG,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC;QAC3D,OAAO;YACL,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACjC,CAAC,mBAAU,CAAC,EAAE,mBAAU;gBACxB,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aAC3C;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,SAA0B;QACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;QAC/B,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,GAAG,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,wBAAe,EAAE,CAAC;QAExE,OAAO,IAAA,WAAI,EAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;CACF;AAED;;GAEG;AACH,MAAa,cAAc;IAA3B;QACkB,kBAAa,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC7C,kBAAa,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC7C,qBAAgB,GAAG,IAAI,yBAAyB,EAAE,CAAC;IAUrE,CAAC;IARC,4DAA4D;IACrD,KAAK,CAAC,CAAC,iBAAiB,CAAC,gBAAyB;QACvD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACxC,IAAI,MAAM,YAAY,2BAA2B,EAAE;gBACjD,MAAM,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;aACzC;SACF;IACH,CAAC;CACF;AAbD,wCAaC"}
|
|
@@ -21,16 +21,8 @@ class MetadataConverter {
|
|
|
21
21
|
async convert(comps, targetFormat, output) {
|
|
22
22
|
var _a;
|
|
23
23
|
try {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
if (comps instanceof collections_1.ComponentSet) {
|
|
27
|
-
cs = comps;
|
|
28
|
-
components = Array.from(comps.getSourceComponents());
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
cs = new collections_1.ComponentSet(comps, this.registry);
|
|
32
|
-
components = comps;
|
|
33
|
-
}
|
|
24
|
+
const cs = comps instanceof collections_1.ComponentSet ? comps : new collections_1.ComponentSet(comps, this.registry);
|
|
25
|
+
const components = (comps instanceof collections_1.ComponentSet ? Array.from(comps.getSourceComponents()) : comps).filter((comp) => comp.type.isAddressable !== false);
|
|
34
26
|
let manifestContents;
|
|
35
27
|
const isSource = targetFormat === 'source';
|
|
36
28
|
const tasks = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAgD;AAChD,6CAAuC;AAEvC,kEAAmE;AACnE,sCAA0D;AAE1D,gDAAsE;AACtE,0CAA6C;AAC7C,uCAAsH;AAGtH,MAAa,iBAAiB;IAQ5B,YAAmB,QAAQ,GAAG,IAAI,yBAAc,EAAE;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IACM,KAAK,CAAC,OAAO,CAClB,KAA+C,EAC/C,YAA4B,EAC5B,MAA2B;;QAE3B,IAAI;YACF,
|
|
1
|
+
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,4 @@ import { DecomposedMetadataTransformer } from './decomposedMetadataTransformer';
|
|
|
9
9
|
*/
|
|
10
10
|
export declare class NonDecomposedMetadataTransformer extends DecomposedMetadataTransformer {
|
|
11
11
|
toSourceFormat(component: SourceComponent, mergeWith?: SourceComponent): Promise<WriteInfo[]>;
|
|
12
|
-
private setStateForClaimed;
|
|
13
|
-
private setStateForUnclaimed;
|
|
14
12
|
}
|
|
@@ -17,47 +17,27 @@ const decomposedMetadataTransformer_1 = require("./decomposedMetadataTransformer
|
|
|
17
17
|
* - CustomLabels
|
|
18
18
|
*/
|
|
19
19
|
class NonDecomposedMetadataTransformer extends decomposedMetadataTransformer_1.DecomposedMetadataTransformer {
|
|
20
|
+
// streams uses mergeWith for all types. Removing it would break the interface
|
|
21
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
20
22
|
async toSourceFormat(component, mergeWith) {
|
|
21
|
-
|
|
23
|
+
// this will only include the incoming (retrieved) labels, not the local file
|
|
22
24
|
const parentXml = await component.parseXml();
|
|
23
25
|
const xmlPathToChildren = `${component.type.name}.${component.type.directoryName}`;
|
|
24
26
|
const incomingChildrenXml = (0, utils_1.normalizeToArray)((0, ts_types_1.get)(parentXml, xmlPathToChildren));
|
|
25
|
-
|
|
26
|
-
const claimedChildren = children.map((c) => c.name);
|
|
27
|
+
// presumes they only have 1 child!
|
|
27
28
|
const [childTypeId] = Object.keys(component.type.children.types);
|
|
28
29
|
const { uniqueIdElement } = component.type.children.types[childTypeId];
|
|
29
|
-
for (const child of incomingChildrenXml) {
|
|
30
|
-
const childName = (0, ts_types_1.getString)(child, uniqueIdElement);
|
|
31
|
-
if (claimedChildren.includes(childName)) {
|
|
32
|
-
this.setStateForClaimed(mergeWith, childName, child);
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
this.setStateForUnclaimed(component, childName, child);
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
return [];
|
|
39
|
-
}
|
|
40
|
-
setStateForClaimed(parent, childName, child) {
|
|
41
30
|
this.context.nonDecomposition.setState((state) => {
|
|
42
|
-
var _a
|
|
43
|
-
|
|
44
|
-
const updatedChildren = Object.assign({}, existingChildren, { [childName]: child });
|
|
45
|
-
state.claimed[parent.xml] = Object.assign((_c = state.claimed[parent.xml]) !== null && _c !== void 0 ? _c : {}, {
|
|
46
|
-
parent,
|
|
47
|
-
children: updatedChildren,
|
|
48
|
-
});
|
|
31
|
+
var _a;
|
|
32
|
+
(_a = state.exampleComponent) !== null && _a !== void 0 ? _a : (state.exampleComponent = component);
|
|
49
33
|
});
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
const existingChildren = (_b = (_a = state.unclaimed[parent.xml]) === null || _a === void 0 ? void 0 : _a.children) !== null && _b !== void 0 ? _b : {};
|
|
55
|
-
const updatedChildren = Object.assign({}, existingChildren, { [childName]: child });
|
|
56
|
-
state.unclaimed[parent.xml] = Object.assign((_c = state.unclaimed[parent.xml]) !== null && _c !== void 0 ? _c : {}, {
|
|
57
|
-
parent,
|
|
58
|
-
children: updatedChildren,
|
|
34
|
+
incomingChildrenXml.map((child) => {
|
|
35
|
+
const childName = (0, ts_types_1.getString)(child, uniqueIdElement);
|
|
36
|
+
this.context.nonDecomposition.setState((state) => {
|
|
37
|
+
state.childrenByUniqueElement.set(childName, child);
|
|
59
38
|
});
|
|
60
39
|
});
|
|
40
|
+
return [];
|
|
61
41
|
}
|
|
62
42
|
}
|
|
63
43
|
exports.NonDecomposedMetadataTransformer = NonDecomposedMetadataTransformer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAA+D;AAE/D,uCAA+C;AAE/C,mFAAgF;AAEhF;;;;;GAKG;AACH,MAAa,gCAAiC,SAAQ,6DAA6B;
|
|
1
|
+
{"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAA+D;AAE/D,uCAA+C;AAE/C,mFAAgF;AAEhF;;;;;GAKG;AACH,MAAa,gCAAiC,SAAQ,6DAA6B;IACjF,+EAA+E;IAC/E,6DAA6D;IACtD,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;QACjF,6EAA6E;QAC7E,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,iBAAiB,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnF,MAAM,mBAAmB,GAAG,IAAA,wBAAgB,EAAC,IAAA,cAAG,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAc,CAAC;QAC7F,mCAAmC;QACnC,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEvE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;YAC/C,MAAA,KAAK,CAAC,gBAAgB,oCAAtB,KAAK,CAAC,gBAAgB,GAAK,SAAS,EAAC;QACvC,CAAC,CAAC,CAAC;QAEH,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC/C,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAzBD,4EAyBC"}
|
|
@@ -1921,6 +1921,16 @@
|
|
|
1921
1921
|
"strictDirectoryName": false,
|
|
1922
1922
|
"folderContentType": "emailtemplate"
|
|
1923
1923
|
},
|
|
1924
|
+
"emailtemplatefolder": {
|
|
1925
|
+
"id": "emailtemplatefolder",
|
|
1926
|
+
"name": "EmailTemplateFolder",
|
|
1927
|
+
"suffix": "emailTemplateFolder",
|
|
1928
|
+
"directoryName": "email",
|
|
1929
|
+
"inFolder": false,
|
|
1930
|
+
"strictDirectoryName": false,
|
|
1931
|
+
"folderContentType": "emailtemplate",
|
|
1932
|
+
"aliasFor": "emailfolder"
|
|
1933
|
+
},
|
|
1924
1934
|
"inboundnetworkconnection": {
|
|
1925
1935
|
"id": "inboundnetworkconnection",
|
|
1926
1936
|
"name": "InboundNetworkConnection",
|
|
@@ -30,7 +30,6 @@ exports.settings = [
|
|
|
30
30
|
'botSettings', // have not successfully deployed this because of licensing errors when deploying settings
|
|
31
31
|
];
|
|
32
32
|
exports.metadataTypes = [
|
|
33
|
-
'EmailTemplateFolder',
|
|
34
33
|
// things that don't show up in describe so far
|
|
35
34
|
'PicklistValue',
|
|
36
35
|
'AppointmentAssignmentPolicy',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonSupportedTypes.js","sourceRoot":"","sources":["../../../src/registry/nonSupportedTypes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH;;;;;KAKK;AACQ,QAAA,QAAQ,GAAG;IACtB,mEAAmE;IACnE,uBAAuB;IACvB,gBAAgB;IAChB,gBAAgB;IAChB,mBAAmB;IACnB,cAAc;IACd,8BAA8B;IAC9B,2BAA2B;IAC3B,oBAAoB;IACpB,gBAAgB;IAChB,iBAAiB;CAClB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,aAAa,EAAE,0FAA0F;CAC1G,CAAC;AACW,QAAA,aAAa,GAAG;IAC3B
|
|
1
|
+
{"version":3,"file":"nonSupportedTypes.js","sourceRoot":"","sources":["../../../src/registry/nonSupportedTypes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH;;;;;KAKK;AACQ,QAAA,QAAQ,GAAG;IACtB,mEAAmE;IACnE,uBAAuB;IACvB,gBAAgB;IAChB,gBAAgB;IAChB,mBAAmB;IACnB,cAAc;IACd,8BAA8B;IAC9B,2BAA2B;IAC3B,oBAAoB;IACpB,gBAAgB;IAChB,iBAAiB;CAClB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,aAAa,EAAE,0FAA0F;CAC1G,CAAC;AACW,QAAA,aAAa,GAAG;IAC3B,+CAA+C;IAC/C,eAAe;IACf,6BAA6B;IAC7B,oBAAoB;IACpB,0BAA0B;IAC1B,eAAe;IACf,4BAA4B;IAC5B,6BAA6B;IAC7B,iCAAiC;IACjC,aAAa;IACb,eAAe;CAChB,CAAC;AAEK,MAAM,sBAAsB,GAAG,CAAC,IAAwB,EAAW,EAAE;;IAC1E,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS,CAAA,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IAED,IACE,CAAA,MAAA,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,0CAAE,MAAM;QACzC,gBAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA,EAAA,CAAC,EAChF;QACA,OAAO,IAAI,CAAC;KACb;IACD,OAAO,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS,CAAC,QAAQ,KAAI,gBAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA,EAAA,CAAC,CAAC;AACvH,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC"}
|
|
@@ -1924,6 +1924,16 @@ export declare const registry: Readonly<{
|
|
|
1924
1924
|
strictDirectoryName: boolean;
|
|
1925
1925
|
folderContentType: string;
|
|
1926
1926
|
};
|
|
1927
|
+
emailtemplatefolder: {
|
|
1928
|
+
id: string;
|
|
1929
|
+
name: string;
|
|
1930
|
+
suffix: string;
|
|
1931
|
+
directoryName: string;
|
|
1932
|
+
inFolder: boolean;
|
|
1933
|
+
strictDirectoryName: boolean;
|
|
1934
|
+
folderContentType: string;
|
|
1935
|
+
aliasFor: string;
|
|
1936
|
+
};
|
|
1927
1937
|
inboundnetworkconnection: {
|
|
1928
1938
|
id: string;
|
|
1929
1939
|
name: string;
|
|
@@ -6,6 +6,7 @@ export declare class RegistryAccess {
|
|
|
6
6
|
private registry;
|
|
7
7
|
private strictFolderTypes;
|
|
8
8
|
private folderContentTypes;
|
|
9
|
+
private aliasTypes;
|
|
9
10
|
constructor(registry?: MetadataRegistry);
|
|
10
11
|
/**
|
|
11
12
|
* Query a metadata type by its name.
|
|
@@ -46,5 +47,14 @@ export declare class RegistryAccess {
|
|
|
46
47
|
* @returns An array of metadata type objects that have folder content
|
|
47
48
|
*/
|
|
48
49
|
getFolderContentTypes(): MetadataType[];
|
|
50
|
+
/**
|
|
51
|
+
* Query for the types that have the aliasFor property defined.
|
|
52
|
+
* E.g., EmailTemplateFolder
|
|
53
|
+
*
|
|
54
|
+
* @see {@link MetadataType.aliasFor}
|
|
55
|
+
*
|
|
56
|
+
* @returns An array of metadata type objects that have aliasFor
|
|
57
|
+
*/
|
|
58
|
+
getAliasTypes(): MetadataType[];
|
|
49
59
|
get apiVersion(): string;
|
|
50
60
|
}
|
|
@@ -36,7 +36,10 @@ class RegistryAccess {
|
|
|
36
36
|
if (!this.registry.types[lower]) {
|
|
37
37
|
throw new errors_1.RegistryError('error_missing_type_definition', lower);
|
|
38
38
|
}
|
|
39
|
-
|
|
39
|
+
// redirect via alias
|
|
40
|
+
return this.registry.types[lower].aliasFor
|
|
41
|
+
? this.registry.types[this.registry.types[lower].aliasFor]
|
|
42
|
+
: this.registry.types[lower];
|
|
40
43
|
}
|
|
41
44
|
/**
|
|
42
45
|
* Query a metadata type by its file suffix.
|
|
@@ -58,7 +61,8 @@ class RegistryAccess {
|
|
|
58
61
|
* @returns The first metadata type object that fulfills the predicate
|
|
59
62
|
*/
|
|
60
63
|
findType(predicate) {
|
|
61
|
-
|
|
64
|
+
const firstMatch = Object.values(this.registry.types).find(predicate);
|
|
65
|
+
return firstMatch.aliasFor ? this.registry.types[firstMatch.aliasFor] : firstMatch;
|
|
62
66
|
}
|
|
63
67
|
/**
|
|
64
68
|
* Query the types that require a strict parent directory
|
|
@@ -83,15 +87,24 @@ class RegistryAccess {
|
|
|
83
87
|
*/
|
|
84
88
|
getFolderContentTypes() {
|
|
85
89
|
if (!this.folderContentTypes) {
|
|
86
|
-
this.folderContentTypes =
|
|
87
|
-
for (const type of Object.values(this.registry.types)) {
|
|
88
|
-
if (type.folderContentType) {
|
|
89
|
-
this.folderContentTypes.push(type);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
90
|
+
this.folderContentTypes = Object.values(this.registry.types).filter((type) => type.folderContentType && !type.aliasFor);
|
|
92
91
|
}
|
|
93
92
|
return this.folderContentTypes;
|
|
94
93
|
}
|
|
94
|
+
/**
|
|
95
|
+
* Query for the types that have the aliasFor property defined.
|
|
96
|
+
* E.g., EmailTemplateFolder
|
|
97
|
+
*
|
|
98
|
+
* @see {@link MetadataType.aliasFor}
|
|
99
|
+
*
|
|
100
|
+
* @returns An array of metadata type objects that have aliasFor
|
|
101
|
+
*/
|
|
102
|
+
getAliasTypes() {
|
|
103
|
+
if (!this.aliasTypes) {
|
|
104
|
+
this.aliasTypes = Object.values(this.registry.types).filter((type) => type.aliasFor);
|
|
105
|
+
}
|
|
106
|
+
return this.aliasTypes;
|
|
107
|
+
}
|
|
95
108
|
get apiVersion() {
|
|
96
109
|
return this.registry.apiVersion;
|
|
97
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registryAccess.js","sourceRoot":"","sources":["../../../src/registry/registryAccess.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,sCAA0C;AAC1C,yCAAyD;AAGzD;;GAEG;AACH,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"registryAccess.js","sourceRoot":"","sources":["../../../src/registry/registryAccess.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,sCAA0C;AAC1C,yCAAyD;AAGzD;;GAEG;AACH,MAAa,cAAc;IAOzB,YAAmB,WAA6B,mBAAe;QAC7D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,IAAY;;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,QAAQ,0CAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3E,IAAI,SAAS,EAAE;gBACb,OAAO,SAAS,CAAC;aAClB;YACD,MAAM,IAAI,sBAAa,CAAC,qCAAqC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;SACvF;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,IAAI,sBAAa,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;SACjE;QACD,qBAAqB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ;YACxC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;YAC1D,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACI,eAAe,CAAC,MAAc;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SACnC;IACH,CAAC;IAED;;;;;;OAMG;IACI,QAAQ,CAAC,SAA0C;QACxD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtE,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IACrF,CAAC;IAED;;;;;;OAMG;IACI,oBAAoB;QACzB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAC5E,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CACxC,CAAC;SACH;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;;;;;;;OAOG;IACI,qBAAqB;QAC1B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CACjE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,QAAQ,CACnD,CAAC;SACH;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED;;;;;;;OAOG;IACI,aAAa;QAClB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtF;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;CACF;AAhHD,wCAgHC"}
|
|
@@ -97,6 +97,10 @@ export interface MetadataType {
|
|
|
97
97
|
```
|
|
98
98
|
*/
|
|
99
99
|
supportsWildcardAndName?: boolean;
|
|
100
|
+
/**
|
|
101
|
+
* Whenever this type is requested, return the aliasFor type instead
|
|
102
|
+
*/
|
|
103
|
+
aliasFor?: string;
|
|
100
104
|
/**
|
|
101
105
|
* Type definitions for child types, if the type has any.
|
|
102
106
|
*
|
|
@@ -10,16 +10,25 @@ exports.ForceIgnore = void 0;
|
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const index_1 = require("ignore/index");
|
|
12
12
|
const graceful_fs_1 = require("graceful-fs");
|
|
13
|
+
const core_1 = require("@salesforce/core");
|
|
13
14
|
const fileSystemHandler_1 = require("../utils/fileSystemHandler");
|
|
14
15
|
class ForceIgnore {
|
|
15
16
|
constructor(forceIgnorePath = '') {
|
|
16
17
|
this.DEFAULT_IGNORE = ['**/*.dup', '**/.*', '**/package2-descriptor.json', '**/package2-manifest.json'];
|
|
17
18
|
try {
|
|
18
|
-
|
|
19
|
+
let contents = (0, graceful_fs_1.readFileSync)(forceIgnorePath, 'utf-8');
|
|
19
20
|
// check if file `.forceignore` exists
|
|
20
|
-
if (
|
|
21
|
+
if (contents !== undefined) {
|
|
22
|
+
// check for windows style separators (\) and warn
|
|
23
|
+
if (contents.includes('\\')) {
|
|
24
|
+
const lifecycle = core_1.Lifecycle.getInstance();
|
|
25
|
+
// cannot await a method in a constructor
|
|
26
|
+
void lifecycle.emitWarning('Your .forceignore file incorrectly uses the backslash ("\\") as a folder separator; it should use the slash ("/") instead. We currently accept both separators, but we plan to stop supporting the backslash soon.');
|
|
27
|
+
// TODO: change this in v56 to only emit warning but NOT fix file
|
|
28
|
+
contents = contents.replace(/\\/g, '/');
|
|
29
|
+
}
|
|
21
30
|
// add the default ignore paths, and then parse the .forceignore file
|
|
22
|
-
this.parser = (0, index_1.default)().add(`${
|
|
31
|
+
this.parser = (0, index_1.default)().add(`${contents}\n${this.DEFAULT_IGNORE.join('\n')}`);
|
|
23
32
|
this.forceIgnoreDirectory = (0, path_1.dirname)(forceIgnorePath);
|
|
24
33
|
}
|
|
25
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA+C;AAC/C,wCAA8C;AAC9C,6CAA2C;
|
|
1
|
+
{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA+C;AAC/C,wCAA8C;AAC9C,6CAA2C;AAC3C,2CAA6C;AAE7C,kEAAsD;AAEtD,MAAa,WAAW;IAOtB,YAAmB,eAAe,GAAG,EAAE;QAF/B,mBAAc,GAAa,CAAC,UAAU,EAAE,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,CAAC,CAAC;QAGnH,IAAI;YACF,IAAI,QAAQ,GAAG,IAAA,0BAAY,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACtD,sCAAsC;YACtC,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC1B,kDAAkD;gBAClD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAC3B,MAAM,SAAS,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;oBAC1C,yCAAyC;oBACzC,KAAK,SAAS,CAAC,WAAW,CACxB,oNAAoN,CACrN,CAAC;oBACF,iEAAiE;oBACjE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;iBACzC;gBAED,qEAAqE;gBACrE,IAAI,CAAC,MAAM,GAAG,IAAA,eAAM,GAAE,CAAC,GAAG,CAAC,GAAG,QAAQ,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC7E,IAAI,CAAC,oBAAoB,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;aACtD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,4BAA4B;SAC7B;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,IAAgB;QAC1C,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAClC,MAAM,iBAAiB,GAAG,IAAA,4BAAQ,EAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,iBAAiB,EAAE;YACrB,wBAAwB,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;SACpF;QACD,OAAO,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,IAAI;YACF,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SACzE;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,OAAO,CAAC,MAAkB;QAC/B,IAAI;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SAC1E;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;;AA9DH,kCA+DC;AA9DwB,qBAAS,GAAG,cAAc,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "5.9.
|
|
3
|
+
"version": "5.9.6",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"node": ">=12.0.0"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@salesforce/core": "2.
|
|
27
|
+
"@salesforce/core": "2.33.1",
|
|
28
28
|
"@salesforce/kit": "^1.5.0",
|
|
29
29
|
"@salesforce/ts-types": "^1.4.2",
|
|
30
30
|
"archiver": "^5.3.0",
|
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
"@salesforce/ts-sinon": "^1.1.2",
|
|
43
43
|
"@types/archiver": "^5.1.1",
|
|
44
44
|
"@types/deep-equal-in-any-order": "^1.0.1",
|
|
45
|
+
"@types/jsforce": "^1.9.38",
|
|
45
46
|
"@types/mime": "2.0.3",
|
|
46
47
|
"@types/mkdirp": "0.5.2",
|
|
47
48
|
"@types/shelljs": "^0.8.9",
|
|
@@ -70,7 +71,7 @@
|
|
|
70
71
|
"nyc": "^15.1.0",
|
|
71
72
|
"prettier": "^2.0.5",
|
|
72
73
|
"pretty-quick": "^3.1.0",
|
|
73
|
-
"shelljs": "0.8.
|
|
74
|
+
"shelljs": "0.8.5",
|
|
74
75
|
"shx": "^0.3.2",
|
|
75
76
|
"sinon": "10.0.0",
|
|
76
77
|
"ts-node": "^10.3.0",
|