@salesforce/source-deploy-retrieve 5.0.3 → 5.1.3
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 -4
- package/lib/src/registry/metadataRegistry.json +14 -8
- package/lib/src/registry/registry.d.ts +12 -6
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js +19 -16
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map +1 -1
- package/lib/src/resolve/metadataResolver.d.ts +1 -0
- package/lib/src/resolve/metadataResolver.js +27 -13
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/treeContainers.d.ts +8 -0
- package/lib/src/resolve/treeContainers.js +25 -0
- package/lib/src/resolve/treeContainers.js.map +1 -1
- package/package.json +2 -5
package/CHANGELOG.md
CHANGED
|
@@ -2,19 +2,35 @@
|
|
|
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.
|
|
5
|
+
### [5.1.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.1.2...v5.1.3) (2021-11-02)
|
|
6
|
+
|
|
7
|
+
### [5.1.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.1.1...v5.1.2) (2021-10-29)
|
|
8
|
+
|
|
9
|
+
### [5.1.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.1.0...v5.1.1) (2021-10-28)
|
|
6
10
|
|
|
7
11
|
|
|
8
12
|
### Bug Fixes
|
|
9
13
|
|
|
10
|
-
*
|
|
14
|
+
* ensure component.content is always assigned ([#485](https://github.com/forcedotcom/source-deploy-retrieve/issues/485)) ([d77f475](https://github.com/forcedotcom/source-deploy-retrieve/commit/d77f47502634206ac59181362b7f17da82ed01e7))
|
|
11
15
|
|
|
12
|
-
|
|
16
|
+
## [5.1.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.0.3...v5.1.0) (2021-10-28)
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
### Features
|
|
13
20
|
|
|
21
|
+
* construct virtual tree from array of paths ([#480](https://github.com/forcedotcom/source-deploy-retrieve/issues/480)) ([99954dc](https://github.com/forcedotcom/source-deploy-retrieve/commit/99954dc731d078e99283eed940b98ee63688a024))
|
|
22
|
+
|
|
23
|
+
### [5.0.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.0.2...v5.0.3) (2021-10-28)
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
- keys split into 2 strings, which allows # in fullName ([#474](https://github.com/forcedotcom/source-deploy-retrieve/issues/474)) ([79aec1f](https://github.com/forcedotcom/source-deploy-retrieve/commit/79aec1f7af6db21ee498721f425b122a53f14310))
|
|
28
|
+
|
|
29
|
+
### [5.0.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.0.1...v5.0.2) (2021-10-28)
|
|
14
30
|
|
|
15
31
|
### Bug Fixes
|
|
16
32
|
|
|
17
|
-
|
|
33
|
+
- doesn't call Object.entries on undefined ([#484](https://github.com/forcedotcom/source-deploy-retrieve/issues/484)) ([089198e](https://github.com/forcedotcom/source-deploy-retrieve/commit/089198e7e1472724951765c2bca7be7003609b64))
|
|
18
34
|
|
|
19
35
|
### [5.0.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.0.0...v5.0.1) (2021-10-21)
|
|
20
36
|
|
|
@@ -61,10 +61,10 @@
|
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"suffixes": {
|
|
64
|
-
"
|
|
64
|
+
"labels": "customlabel"
|
|
65
65
|
},
|
|
66
66
|
"directories": {
|
|
67
|
-
"
|
|
67
|
+
"labels": "customlabel"
|
|
68
68
|
}
|
|
69
69
|
},
|
|
70
70
|
"strategies": {
|
|
@@ -516,6 +516,9 @@
|
|
|
516
516
|
},
|
|
517
517
|
"suffixes": {
|
|
518
518
|
"formSection": "formsection"
|
|
519
|
+
},
|
|
520
|
+
"directories": {
|
|
521
|
+
"formSections": "formsection"
|
|
519
522
|
}
|
|
520
523
|
}
|
|
521
524
|
},
|
|
@@ -676,7 +679,7 @@
|
|
|
676
679
|
"workflowsend": {
|
|
677
680
|
"id": "workflowsend",
|
|
678
681
|
"name": "WorkflowSend",
|
|
679
|
-
"xmlElementName": "
|
|
682
|
+
"xmlElementName": "send",
|
|
680
683
|
"uniqueIdElement": "fullName",
|
|
681
684
|
"directoryName": "workflowSends",
|
|
682
685
|
"suffix": "workflowSend"
|
|
@@ -709,6 +712,7 @@
|
|
|
709
712
|
},
|
|
710
713
|
"directories": {
|
|
711
714
|
"workflowFieldUpdates": "workflowfieldupdate",
|
|
715
|
+
"workflowKnowledgePublishs": "workflowknowledgepublish",
|
|
712
716
|
"workflowTasks": "workflowtask",
|
|
713
717
|
"workflowAlerts": "workflowalert",
|
|
714
718
|
"workflowSends": "workflowsend",
|
|
@@ -1072,6 +1076,7 @@
|
|
|
1072
1076
|
"name": "WaveTemplateBundle",
|
|
1073
1077
|
"directoryName": "waveTemplates",
|
|
1074
1078
|
"inFolder": false,
|
|
1079
|
+
"strictDirectoryName": true,
|
|
1075
1080
|
"strategies": {
|
|
1076
1081
|
"adapter": "bundle"
|
|
1077
1082
|
}
|
|
@@ -1242,7 +1247,9 @@
|
|
|
1242
1247
|
},
|
|
1243
1248
|
"directories": {
|
|
1244
1249
|
"sharingOwnerRules": "sharingownerrule",
|
|
1245
|
-
"sharingCriteriaRules": "sharingcriteriarule"
|
|
1250
|
+
"sharingCriteriaRules": "sharingcriteriarule",
|
|
1251
|
+
"sharingGuestRules": "sharingguestrule",
|
|
1252
|
+
"sharingTerritoryRules": "sharingterritoryrule"
|
|
1246
1253
|
}
|
|
1247
1254
|
}
|
|
1248
1255
|
},
|
|
@@ -2086,6 +2093,9 @@
|
|
|
2086
2093
|
},
|
|
2087
2094
|
"suffixes": {
|
|
2088
2095
|
"workSkillRoutingAttribute": "workskillroutingattribute"
|
|
2096
|
+
},
|
|
2097
|
+
"directories": {
|
|
2098
|
+
"workSkillRoutingAttributes": "workskillroutingattribute"
|
|
2089
2099
|
}
|
|
2090
2100
|
}
|
|
2091
2101
|
},
|
|
@@ -2610,9 +2620,7 @@
|
|
|
2610
2620
|
"suffixes": {
|
|
2611
2621
|
"ai": "aiapplication",
|
|
2612
2622
|
"aiapplicationconfig": "aiapplicationconfig",
|
|
2613
|
-
"mlprediction": "mlPrediction",
|
|
2614
2623
|
"mlDataDefinition": "mldatadefinition",
|
|
2615
|
-
"sites": "customsite",
|
|
2616
2624
|
"icon": "icon",
|
|
2617
2625
|
"businessProcessGroup": "businessprocessgroup",
|
|
2618
2626
|
"model": "discoveryaimodel",
|
|
@@ -2630,7 +2638,6 @@
|
|
|
2630
2638
|
"decisionTableDatasetLink": "decisiontabledatasetlink",
|
|
2631
2639
|
"briefcaseDefinition": "briefcasedefinition",
|
|
2632
2640
|
"batchProcessJobDefinition": "batchprocessjobdefinition",
|
|
2633
|
-
"webstoretemplate": "webstoretemplate",
|
|
2634
2641
|
"acctMgrTargetSetting": "acctmgrtargetsettings",
|
|
2635
2642
|
"dataSourceObject": "datasourceobject",
|
|
2636
2643
|
"externalDataConnector": "externaldataconnector",
|
|
@@ -2642,7 +2649,6 @@
|
|
|
2642
2649
|
"installedPackage": "installedpackage",
|
|
2643
2650
|
"labels": "customlabels",
|
|
2644
2651
|
"navigationMenu": "navigationmenu",
|
|
2645
|
-
"resource": "staticresource",
|
|
2646
2652
|
"scf": "scontrol",
|
|
2647
2653
|
"crt": "certificate",
|
|
2648
2654
|
"messageChannel": "lightningmessagechannel",
|
|
@@ -64,10 +64,10 @@ export declare const registry: Readonly<{
|
|
|
64
64
|
};
|
|
65
65
|
};
|
|
66
66
|
suffixes: {
|
|
67
|
-
|
|
67
|
+
labels: string;
|
|
68
68
|
};
|
|
69
69
|
directories: {
|
|
70
|
-
|
|
70
|
+
labels: string;
|
|
71
71
|
};
|
|
72
72
|
};
|
|
73
73
|
strategies: {
|
|
@@ -520,6 +520,9 @@ export declare const registry: Readonly<{
|
|
|
520
520
|
suffixes: {
|
|
521
521
|
formSection: string;
|
|
522
522
|
};
|
|
523
|
+
directories: {
|
|
524
|
+
formSections: string;
|
|
525
|
+
};
|
|
523
526
|
};
|
|
524
527
|
};
|
|
525
528
|
flexipage: {
|
|
@@ -712,6 +715,7 @@ export declare const registry: Readonly<{
|
|
|
712
715
|
};
|
|
713
716
|
directories: {
|
|
714
717
|
workflowFieldUpdates: string;
|
|
718
|
+
workflowKnowledgePublishs: string;
|
|
715
719
|
workflowTasks: string;
|
|
716
720
|
workflowAlerts: string;
|
|
717
721
|
workflowSends: string;
|
|
@@ -1075,6 +1079,7 @@ export declare const registry: Readonly<{
|
|
|
1075
1079
|
name: string;
|
|
1076
1080
|
directoryName: string;
|
|
1077
1081
|
inFolder: boolean;
|
|
1082
|
+
strictDirectoryName: boolean;
|
|
1078
1083
|
strategies: {
|
|
1079
1084
|
adapter: string;
|
|
1080
1085
|
};
|
|
@@ -1246,6 +1251,8 @@ export declare const registry: Readonly<{
|
|
|
1246
1251
|
directories: {
|
|
1247
1252
|
sharingOwnerRules: string;
|
|
1248
1253
|
sharingCriteriaRules: string;
|
|
1254
|
+
sharingGuestRules: string;
|
|
1255
|
+
sharingTerritoryRules: string;
|
|
1249
1256
|
};
|
|
1250
1257
|
};
|
|
1251
1258
|
};
|
|
@@ -2090,6 +2097,9 @@ export declare const registry: Readonly<{
|
|
|
2090
2097
|
suffixes: {
|
|
2091
2098
|
workSkillRoutingAttribute: string;
|
|
2092
2099
|
};
|
|
2100
|
+
directories: {
|
|
2101
|
+
workSkillRoutingAttributes: string;
|
|
2102
|
+
};
|
|
2093
2103
|
};
|
|
2094
2104
|
};
|
|
2095
2105
|
timesheettemplate: {
|
|
@@ -2613,9 +2623,7 @@ export declare const registry: Readonly<{
|
|
|
2613
2623
|
suffixes: {
|
|
2614
2624
|
ai: string;
|
|
2615
2625
|
aiapplicationconfig: string;
|
|
2616
|
-
mlprediction: string;
|
|
2617
2626
|
mlDataDefinition: string;
|
|
2618
|
-
sites: string;
|
|
2619
2627
|
icon: string;
|
|
2620
2628
|
businessProcessGroup: string;
|
|
2621
2629
|
model: string;
|
|
@@ -2633,7 +2641,6 @@ export declare const registry: Readonly<{
|
|
|
2633
2641
|
decisionTableDatasetLink: string;
|
|
2634
2642
|
briefcaseDefinition: string;
|
|
2635
2643
|
batchProcessJobDefinition: string;
|
|
2636
|
-
webstoretemplate: string;
|
|
2637
2644
|
acctMgrTargetSetting: string;
|
|
2638
2645
|
dataSourceObject: string;
|
|
2639
2646
|
externalDataConnector: string;
|
|
@@ -2645,7 +2652,6 @@ export declare const registry: Readonly<{
|
|
|
2645
2652
|
installedPackage: string;
|
|
2646
2653
|
labels: string;
|
|
2647
2654
|
navigationMenu: string;
|
|
2648
|
-
resource: string;
|
|
2649
2655
|
scf: string;
|
|
2650
2656
|
crt: string;
|
|
2651
2657
|
messageChannel: string;
|
|
@@ -70,31 +70,34 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
|
|
|
70
70
|
if (metaXml) {
|
|
71
71
|
const pathToContent = this.trimPathToContent(trigger);
|
|
72
72
|
const childTypeId = this.type.children.suffixes[metaXml.suffix];
|
|
73
|
-
|
|
74
|
-
const triggerIsAChild = !!childTypeId && this.type.children.types[childTypeId].isAddressable !== false;
|
|
73
|
+
const triggerIsAChild = !!childTypeId;
|
|
75
74
|
const strategy = this.type.strategies.decomposition;
|
|
76
|
-
if (triggerIsAChild
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
parent
|
|
80
|
-
|
|
81
|
-
|
|
75
|
+
if (triggerIsAChild) {
|
|
76
|
+
if (strategy === "folderPerType" /* FolderPerType */ || isResolvingSource) {
|
|
77
|
+
let parent = component;
|
|
78
|
+
if (!parent) {
|
|
79
|
+
parent = new sourceComponent_1.SourceComponent({
|
|
80
|
+
name: (0, utils_1.baseName)(pathToContent),
|
|
81
|
+
type: this.type,
|
|
82
|
+
}, this.tree, this.forceIgnore);
|
|
83
|
+
}
|
|
84
|
+
parent.content = pathToContent;
|
|
85
|
+
return new sourceComponent_1.SourceComponent({
|
|
86
|
+
name: metaXml.fullName,
|
|
87
|
+
type: this.type.children.types[childTypeId],
|
|
88
|
+
xml: trigger,
|
|
89
|
+
parent,
|
|
82
90
|
}, this.tree, this.forceIgnore);
|
|
83
91
|
}
|
|
84
|
-
parent.content = pathToContent;
|
|
85
|
-
return new sourceComponent_1.SourceComponent({
|
|
86
|
-
name: metaXml.fullName,
|
|
87
|
-
type: this.type.children.types[childTypeId],
|
|
88
|
-
xml: trigger,
|
|
89
|
-
parent,
|
|
90
|
-
}, this.tree, this.forceIgnore);
|
|
91
92
|
}
|
|
92
|
-
|
|
93
|
+
else {
|
|
93
94
|
if (!component) {
|
|
94
95
|
// This is most likely metadata found within a CustomObject folder that is not a
|
|
95
96
|
// child type of CustomObject. E.g., Layout, SharingRules, ApexClass.
|
|
96
97
|
throw new errors_1.TypeInferenceError('error_unexpected_child_type', [trigger, this.type.name]);
|
|
97
98
|
}
|
|
99
|
+
}
|
|
100
|
+
if (component) {
|
|
98
101
|
component.content = pathToContent;
|
|
99
102
|
}
|
|
100
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":";;;AAOA,wDAAqD;AACrD,uCAAqE;AAErE,yCAAkD;AAClD,2EAAwE;AAExE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAa,uBAAwB,SAAQ,qDAAyB;IAAtE;;QACY,cAAS,GAAG,IAAI,CAAC;QACjB,wBAAmB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ export declare class MetadataResolver {
|
|
|
35
35
|
* @param fsPath File path of a potential metadata xml file
|
|
36
36
|
*/
|
|
37
37
|
private parseAsRootMetadataXml;
|
|
38
|
+
private resolveTypeFromStrictFolder;
|
|
38
39
|
private resolveType;
|
|
39
40
|
/**
|
|
40
41
|
* Whether or not a directory that represents a single component should be resolved as one,
|
|
@@ -129,21 +129,35 @@ class MetadataResolver {
|
|
|
129
129
|
parseAsRootMetadataXml(fsPath) {
|
|
130
130
|
return !!(0, utils_1.parseMetadataXml)(fsPath);
|
|
131
131
|
}
|
|
132
|
+
resolveTypeFromStrictFolder(fsPath) {
|
|
133
|
+
const pathParts = fsPath.split(path_1.sep);
|
|
134
|
+
// first, filter out types that don't appear in the path
|
|
135
|
+
// then iterate using for/of to allow for early break
|
|
136
|
+
return this.registry
|
|
137
|
+
.getStrictFolderTypes()
|
|
138
|
+
.filter((type) =>
|
|
139
|
+
// the type's directory is in the path, AND
|
|
140
|
+
pathParts.includes(type.directoryName) &&
|
|
141
|
+
// types with folders only have folder components living at the top level.
|
|
142
|
+
// if the fsPath is a folder component, let a future strategy deal with it
|
|
143
|
+
(!type.inFolder || (0, utils_1.parentName)(fsPath) !== type.directoryName))
|
|
144
|
+
.find((type) => {
|
|
145
|
+
var _a, _b, _c;
|
|
146
|
+
// any of the following 3 options is considered a good match
|
|
147
|
+
// mixedContent and bundles don't have a suffix to match
|
|
148
|
+
return ['mixedContent', 'bundle'].includes((_a = type.strategies) === null || _a === void 0 ? void 0 : _a.adapter) ||
|
|
149
|
+
// the suffix matches the type we think it is
|
|
150
|
+
(type.suffix && fsPath.endsWith(`${type.suffix}`)) ||
|
|
151
|
+
// the type has children and the path also includes THAT directory
|
|
152
|
+
(((_b = type.children) === null || _b === void 0 ? void 0 : _b.types) &&
|
|
153
|
+
Object.values((_c = type.children) === null || _c === void 0 ? void 0 : _c.types)
|
|
154
|
+
.map((childType) => childType.directoryName)
|
|
155
|
+
.some((dirName) => pathParts.includes(dirName)));
|
|
156
|
+
});
|
|
157
|
+
}
|
|
132
158
|
resolveType(fsPath) {
|
|
133
|
-
let resolvedType;
|
|
134
159
|
// attempt 1 - check if the file is part of a component that requires a strict type folder
|
|
135
|
-
|
|
136
|
-
for (const type of this.registry.getStrictFolderTypes()) {
|
|
137
|
-
if (pathParts.has(type.directoryName)) {
|
|
138
|
-
// types with folders only have folder components living at the top level.
|
|
139
|
-
// if the fsPath is a folder component, let a future strategy deal with it
|
|
140
|
-
// const isFolderType = this.getTypeFromName(typeId).inFolder;
|
|
141
|
-
if (!type.inFolder || (0, utils_1.parentName)(fsPath) !== type.directoryName) {
|
|
142
|
-
resolvedType = type;
|
|
143
|
-
}
|
|
144
|
-
break;
|
|
145
|
-
}
|
|
146
|
-
}
|
|
160
|
+
let resolvedType = this.resolveTypeFromStrictFolder(fsPath);
|
|
147
161
|
// attempt 2 - check if it's a metadata xml file
|
|
148
162
|
if (!resolvedType) {
|
|
149
163
|
const parsedMetaXml = (0, utils_1.parseMetadataXml)(fsPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAoD;AACpD,sCAA+C;AAC/C,oCAAiE;AACjE,+DAA4D;AAG5D,0EAAuE;AACvE,+CAA4C;AAE5C,qDAAsE;AAEtE;;;;GAIG;AACH,MAAa,gBAAgB;IAM3B;;;OAGG;IACH,YACU,WAAW,IAAI,+BAAc,EAAE,EAC/B,OAAsB,IAAI,oCAAmB,EAAE,EAC/C,mBAAmB,IAAI;QAFvB,aAAQ,GAAR,QAAQ,CAAuB;QAC/B,SAAI,GAAJ,IAAI,CAA2C;QAC/C,qBAAgB,GAAhB,gBAAgB,CAAO;QAE/B,IAAI,CAAC,oBAAoB,GAAG,IAAI,2CAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1E,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACI,qBAAqB,CAAC,MAAc,EAAE,eAA8B;QACzE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC7B,MAAM,IAAI,2BAAkB,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;SAC9D;QAED,uDAAuD;QACvD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,yBAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,yBAAW,EAAE,CAAC;QAEjG,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,EAAE;YAC9E,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;SACrE;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtD,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,CAAC;IAEO,8BAA8B,CAAC,GAAW,EAAE,eAA8B;QAChF,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAsB,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QAEzB,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAChC,OAAO,UAAU,CAAC;SACnB;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;YAC/C,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAE/B,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACtB,SAAS;aACV;YAED,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;gBACjC,IAAI,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,EAAE;oBAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;oBACtD,IAAI,SAAS,IAAI,CAAC,CAAC,eAAe,IAAI,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE;wBACrE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAC3B,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;qBAC3B;iBACF;qBAAM;oBACL,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBACvB;aACF;iBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAClC,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACvD,IAAI,SAAS,EAAE;oBACb,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;wBACtD,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAC3B,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;qBAC/B;yBAAM;wBACL,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE;4BAC3C,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gCAC9B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;6BACxB;yBACF;qBACF;oBACD,mFAAmF;oBACnF,gFAAgF;oBAChF,MAAM,OAAO,GAAG,IAAA,eAAQ,EAAC,IAAA,cAAO,EAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;oBACtF,IAAI,SAAS,CAAC,IAAI,CAAC,mBAAmB,IAAI,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE;wBAClF,OAAO,UAAU,CAAC;qBACnB;iBACF;aACF;SACF;QAED,KAAK,MAAM,SAAS,IAAI,QAAQ,EAAE;YAChC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,8BAA8B,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;SACrF;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,gBAAgB,CAAC,MAAc,EAAE,iBAA0B;QACjE,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACnC,oDAAoD;YACpD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACnC,OAAO;SACR;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,IAAI,EAAE;YACR,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC7E,wEAAwE;YACxE,kEAAkE;YAClE,yBAAyB;YACzB,MAAM,aAAa,GACjB,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;gBACnC,iBAAiB;gBACjB,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC;gBACvC,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;YACtC,OAAO,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;SACpF;QACD,MAAM,IAAI,2BAAkB,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAC;IACrE,CAAC;IAED;;;;OAIG;IACK,sBAAsB,CAAC,MAAc;QAC3C,OAAO,CAAC,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAEO,2BAA2B,CAAC,MAAc;QAChD,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QACpC,wDAAwD;QACxD,qDAAqD;QACrD,OAAO,IAAI,CAAC,QAAQ;aACjB,oBAAoB,EAAE;aACtB,MAAM,CACL,CAAC,IAAI,EAAE,EAAE;QACP,2CAA2C;QAC3C,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;YACtC,0EAA0E;YAC1E,0EAA0E;YAC1E,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAA,kBAAU,EAAC,MAAM,CAAC,KAAK,IAAI,CAAC,aAAa,CAAC,CAChE;aACA,IAAI,CACH,CAAC,IAAI,EAAE,EAAE;;YACP,4DAA4D;YAC5D,wDAAwD;YACxD,OAAA,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC;gBAC7D,6CAA6C;gBAC7C,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBAClD,kEAAkE;gBAClE,CAAC,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,KAAK;oBACnB,MAAM,CAAC,MAAM,CAAC,MAAA,IAAI,CAAC,QAAQ,0CAAE,KAAK,CAAC;yBAChC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC;yBAC3C,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;SAAA,CACvD,CAAC;IACN,CAAC;IAEO,WAAW,CAAC,MAAc;QAChC,0FAA0F;QAC1F,IAAI,YAAY,GAAG,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;QAE5D,gDAAgD;QAChD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,aAAa,EAAE;gBACjB,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;aACpE;SACF;QAED,iDAAiD;QACjD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,cAAc,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;YAC7D,IAAI,cAAc,EAAE;gBAClB,iFAAiF;gBACjF,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,KAAK,cAAc,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC1G;SACF;QAED,+DAA+D;QAC/D,IAAI,CAAC,YAAY,EAAE;YACjB,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAA,eAAO,EAAC,MAAM,CAAC,CAAC,CAAC;SAC/D;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;;;;;;;OAQG;IACK,2BAA2B,CAAC,OAAe;QACjD,IAAI,aAAa,GAAG,IAAI,CAAC;QAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,IAAI,EAAE;YACR,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YACzC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;YACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACxD,IACE,kBAAkB,KAAK,CAAC,CAAC;gBACzB,KAAK,CAAC,MAAM,GAAG,YAAY,IAAI,kBAAkB;gBACjD,4DAA4D;gBAC5D,IAAI,CAAC,QAAQ,EACb;gBACA,aAAa,GAAG,KAAK,CAAC;aACvB;SACF;aAAM;YACL,aAAa,GAAG,KAAK,CAAC;SACvB;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACK,yBAAyB,CAAC,MAAc;QAC9C,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAA,eAAO,EAAC,MAAM,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,wEAAwE;IAChE,4BAA4B;QAClC,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE;YACnC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;SACpG;QACD,OAAO,IAAI,CAAC,yBAAyB,CAAC;IACxC,CAAC;IAED;;;;;;;OAOG;IACK,wBAAwB,CAAC,MAAc;QAC7C,IAAI,UAAkB,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;QAClE,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;YAChC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpB,MAAM,sBAAsB,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBACnE,kEAAkE;gBAClE,4DAA4D;gBAC5D,sBAAsB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;oBACtC,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAG,GAAG,OAAO,GAAG,UAAG,EAAE,CAAC,EAAE;wBAC7C,UAAU,GAAG,OAAO,CAAC;qBACtB;gBACH,CAAC,CAAC,CAAC;aACJ;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,UAAU,CAAC,MAAc;QAC/B,OAAO,CACL,CAAC,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAChH,CAAC;IACJ,CAAC;CACF;AA5QD,4CA4QC"}
|
|
@@ -102,6 +102,14 @@ export declare class VirtualTreeContainer extends TreeContainer {
|
|
|
102
102
|
private tree;
|
|
103
103
|
private fileContents;
|
|
104
104
|
constructor(virtualFs: VirtualDirectory[]);
|
|
105
|
+
/**
|
|
106
|
+
* Designed for recreating virtual files from deleted files where the only information we have is the file's former location
|
|
107
|
+
* Any use of MetadataResolver was trying to access the non-existent files and throwing
|
|
108
|
+
*
|
|
109
|
+
* @param paths full paths to files
|
|
110
|
+
* @returns VirtualTreeContainer
|
|
111
|
+
*/
|
|
112
|
+
static fromFilePaths(paths: string[]): VirtualTreeContainer;
|
|
105
113
|
isDirectory(fsPath: string): boolean;
|
|
106
114
|
exists(fsPath: string): boolean;
|
|
107
115
|
readDirectory(fsPath: string): string[];
|
|
@@ -150,6 +150,31 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
150
150
|
this.fileContents = new Map();
|
|
151
151
|
this.populate(virtualFs);
|
|
152
152
|
}
|
|
153
|
+
/**
|
|
154
|
+
* Designed for recreating virtual files from deleted files where the only information we have is the file's former location
|
|
155
|
+
* Any use of MetadataResolver was trying to access the non-existent files and throwing
|
|
156
|
+
*
|
|
157
|
+
* @param paths full paths to files
|
|
158
|
+
* @returns VirtualTreeContainer
|
|
159
|
+
*/
|
|
160
|
+
static fromFilePaths(paths) {
|
|
161
|
+
// a map to reduce array iterations
|
|
162
|
+
const virtualDirectoryByFullPath = new Map();
|
|
163
|
+
paths.map((filename) => {
|
|
164
|
+
var _a;
|
|
165
|
+
const splits = filename.split(path_1.sep);
|
|
166
|
+
for (let i = 0; i < splits.length - 1; i++) {
|
|
167
|
+
const fullPathSoFar = splits.slice(0, i + 1).join(path_1.sep);
|
|
168
|
+
const existing = virtualDirectoryByFullPath.get(fullPathSoFar);
|
|
169
|
+
virtualDirectoryByFullPath.set(fullPathSoFar, {
|
|
170
|
+
dirPath: fullPathSoFar,
|
|
171
|
+
// only add to children if we don't already have it
|
|
172
|
+
children: Array.from(new Set((_a = existing === null || existing === void 0 ? void 0 : existing.children) !== null && _a !== void 0 ? _a : []).add(splits[i + 1])),
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
});
|
|
176
|
+
return new VirtualTreeContainer(Array.from(virtualDirectoryByFullPath.values()));
|
|
177
|
+
}
|
|
153
178
|
isDirectory(fsPath) {
|
|
154
179
|
if (this.exists(fsPath)) {
|
|
155
180
|
return this.tree.has(fsPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+
|
|
1
|
+
{"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.1.3",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
7
7
|
"license": "BSD-3-Clause",
|
|
8
8
|
"homepage": "https://github.com/forcedotcom/source-deploy-retrieve#readme",
|
|
9
|
-
"repository":
|
|
10
|
-
"type": "git",
|
|
11
|
-
"url": "git+https://github.com/forcedotcom/source-deploy-retrieve.git"
|
|
12
|
-
},
|
|
9
|
+
"repository": "forcedotcom/source-deploy-retrieve",
|
|
13
10
|
"bugs": {
|
|
14
11
|
"url": "https://github.com/forcedotcom/source-deploy-retrieve/issues"
|
|
15
12
|
},
|