@salesforce/source-deploy-retrieve 12.19.3 → 12.19.5
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/lib/src/convert/convertContext/decomposedPermissionSetFinalizer.js +21 -4
- package/lib/src/convert/convertContext/decomposedPermissionSetFinalizer.js.map +1 -1
- package/lib/src/convert/transformers/decomposedPermissionSetTransformer.js +28 -6
- package/lib/src/convert/transformers/decomposedPermissionSetTransformer.js.map +1 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.js +17 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.js.map +1 -1
- package/package.json +4 -4
|
@@ -9,6 +9,7 @@ exports.DecomposedPermissionSetFinalizer = void 0;
|
|
|
9
9
|
*/
|
|
10
10
|
const node_path_1 = require("node:path");
|
|
11
11
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
12
|
+
const kit_1 = require("@salesforce/kit");
|
|
12
13
|
const constants_1 = require("../../common/constants");
|
|
13
14
|
const streams_1 = require("../streams");
|
|
14
15
|
const transactionFinalizer_1 = require("./transactionFinalizer");
|
|
@@ -32,6 +33,25 @@ class DecomposedPermissionSetFinalizer extends transactionFinalizer_1.ConvertTra
|
|
|
32
33
|
}
|
|
33
34
|
const agg = [];
|
|
34
35
|
this.transactionState.parentToChild.forEach((children, parent) => {
|
|
36
|
+
// iterate over children and build PermissionSet data structure
|
|
37
|
+
const permset = new Map();
|
|
38
|
+
for (const child of children) {
|
|
39
|
+
for (const [key, value] of Object.entries(child)) {
|
|
40
|
+
const existingEntry = permset.get(key);
|
|
41
|
+
if (existingEntry) {
|
|
42
|
+
if (Array.isArray(value)) {
|
|
43
|
+
permset.set(key, existingEntry.concat(value));
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
existingEntry.push(value);
|
|
47
|
+
permset.set(key, existingEntry);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
permset.set(key, (0, kit_1.ensureArray)(value));
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
35
55
|
agg.push({
|
|
36
56
|
component: {
|
|
37
57
|
type: (0, ts_types_1.ensure)(this.permissionSetType, 'DecomposedPermissionSetFinalizer should have set PermissionSetType'),
|
|
@@ -41,12 +61,9 @@ class DecomposedPermissionSetFinalizer extends transactionFinalizer_1.ConvertTra
|
|
|
41
61
|
{
|
|
42
62
|
output: (0, node_path_1.join)((0, ts_types_1.ensure)(this.permissionSetType?.directoryName, 'directoryName missing from PermissionSet type'), `${parent}.permissionset`),
|
|
43
63
|
source: new streams_1.JsToXml({
|
|
44
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
45
64
|
PermissionSet: {
|
|
46
65
|
[constants_1.XML_NS_KEY]: constants_1.XML_NS_URL,
|
|
47
|
-
...Object.
|
|
48
|
-
// sort the children by fullName
|
|
49
|
-
...Object.values(children.sort((a, b) => ((a.fullName ?? '') > (b.fullName ?? '') ? -1 : 1)))),
|
|
66
|
+
...Object.fromEntries(permset),
|
|
50
67
|
},
|
|
51
68
|
}),
|
|
52
69
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedPermissionSetFinalizer.js","sourceRoot":"","sources":["../../../../src/convert/convertContext/decomposedPermissionSetFinalizer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAiC;AACjC,mDAA4D;
|
|
1
|
+
{"version":3,"file":"decomposedPermissionSetFinalizer.js","sourceRoot":"","sources":["../../../../src/convert/convertContext/decomposedPermissionSetFinalizer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAiC;AACjC,mDAA4D;AAE5D,yCAA8C;AAE9C,sDAAgE;AAChE,wCAAqC;AAErC,iEAAqE;AASrE;;;;;GAKG;AACH,MAAa,gCAAiC,SAAQ,kDAA+C;IAC5F,gBAAgB,GAAuB;QAC5C,aAAa,EAAE,IAAI,GAAG,EAAE;KACzB,CAAC;IAEF,2IAA2I;IACpI,iBAAiB,CAAgB;IAExC,0CAA0C;IAC1C,+FAA+F;IACxF,KAAK,CAAC,QAAQ,CAAC,gBAAyB;QAC7C,IAAI,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACnD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,GAAG,GAAmB,EAAE,CAAC;QAC/B,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;YAC/D,+DAA+D;YAC/D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;YAC7C,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;gBAC7B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACjD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACvC,IAAI,aAAa,EAAE,CAAC;wBAClB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;4BACzB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;wBAChD,CAAC;6BAAM,CAAC;4BACN,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;wBAClC,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAA,iBAAW,EAAU,KAAK,CAAC,CAAC,CAAC;oBAChD,CAAC;gBACH,CAAC;YACH,CAAC;YACD,GAAG,CAAC,IAAI,CAAC;gBACP,SAAS,EAAE;oBACT,IAAI,EAAE,IAAA,iBAAM,EAAC,IAAI,CAAC,iBAAiB,EAAE,oEAAoE,CAAC;oBAC1G,QAAQ,EAAE,IAAA,uBAAY,EAAC,MAAM,CAAC;iBAC/B;gBACD,UAAU,EAAE;oBACV;wBACE,MAAM,EAAE,IAAA,gBAAI,EACV,IAAA,iBAAM,EAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,EAAE,+CAA+C,CAAC,EAC9F,GAAG,MAAM,gBAAgB,CAC1B;wBACD,MAAM,EAAE,IAAI,iBAAO,CAAC;4BAClB,aAAa,EAAE;gCACb,CAAC,sBAAU,CAAC,EAAE,sBAAU;gCACxB,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;6BAC/B;yBACF,CAAC;qBACH;iBACF;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AA1DD,4EA0DC"}
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.DecomposedPermissionSetTransformer = void 0;
|
|
10
10
|
const node_path_1 = require("node:path");
|
|
11
11
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
12
|
+
const kit_1 = require("@salesforce/kit");
|
|
12
13
|
const path_1 = require("../../utils/path");
|
|
13
14
|
const decomposed_1 = require("../../utils/decomposed");
|
|
14
15
|
const resolve_1 = require("../../resolve");
|
|
@@ -77,6 +78,7 @@ class DecomposedPermissionSetTransformer extends baseMetadataTransformer_1.BaseM
|
|
|
77
78
|
.filter(decomposedMetadataTransformer_1.hasChildTypeId)
|
|
78
79
|
.map(decomposedMetadataTransformer_1.addChildType)
|
|
79
80
|
.map((child) => toInfoContainer(mergeWith)(component)(child.childType)(child.tagValue))
|
|
81
|
+
.flat()
|
|
80
82
|
.filter((0, decomposedMetadataTransformer_1.forceIgnoreAllowsComponent)(forceIgnore));
|
|
81
83
|
const writeInfosForChildren = combineChildWriteInfos([
|
|
82
84
|
// children whose type don't have a directory assigned will be written to the top level, separate them into individual WriteInfo[] with only one entry
|
|
@@ -155,10 +157,7 @@ const combineChildWriteInfos = (containers) => {
|
|
|
155
157
|
/** returns a data structure with lots of context information in it - this is also where the name of the file/component is calculated */
|
|
156
158
|
const toInfoContainer = (mergeWith) => (parent) => (childType) => (tagValue) => {
|
|
157
159
|
const tagEntry = Array.isArray(tagValue) ? tagValue : [tagValue];
|
|
158
|
-
const
|
|
159
|
-
? (tagEntry.at(0)?.[childType.uniqueIdElement]).split('.')[0]
|
|
160
|
-
: parent.name;
|
|
161
|
-
return {
|
|
160
|
+
const buildInfoContainer = (entryName, value) => ({
|
|
162
161
|
parentComponent: parent,
|
|
163
162
|
entryName,
|
|
164
163
|
childComponent: {
|
|
@@ -166,8 +165,31 @@ const toInfoContainer = (mergeWith) => (parent) => (childType) => (tagValue) =>
|
|
|
166
165
|
type: childType,
|
|
167
166
|
parent,
|
|
168
167
|
},
|
|
169
|
-
value
|
|
168
|
+
value,
|
|
170
169
|
mergeWith,
|
|
171
|
-
};
|
|
170
|
+
});
|
|
171
|
+
// ObjectSettings, ObjectPermission (object), FieldPermission (field),
|
|
172
|
+
// RecordTypeVisibility (recordType), TabSetting (tab)
|
|
173
|
+
if (childType.directoryName) {
|
|
174
|
+
const infoContainers = new Map();
|
|
175
|
+
tagEntry.map((entry) => {
|
|
176
|
+
let entryName = entry[childType.uniqueIdElement].split('.')[0];
|
|
177
|
+
// If the object name starts with `standard-`, we need to remove the prefix
|
|
178
|
+
if (entryName.startsWith('standard-')) {
|
|
179
|
+
entryName = entryName.replace('standard-', '');
|
|
180
|
+
}
|
|
181
|
+
const infoContainer = infoContainers.get(entryName);
|
|
182
|
+
if (infoContainer) {
|
|
183
|
+
// Add to the value of the existing InfoContainer
|
|
184
|
+
// @ts-expect-error this is either JsonMap or JsonArray
|
|
185
|
+
infoContainer.value = (0, kit_1.ensureArray)(infoContainer.value).concat(entry);
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
infoContainers.set(entryName, buildInfoContainer(entryName, entry));
|
|
189
|
+
}
|
|
190
|
+
});
|
|
191
|
+
return Array.from(infoContainers.values());
|
|
192
|
+
}
|
|
193
|
+
return [buildInfoContainer(parent.name, tagValue)];
|
|
172
194
|
};
|
|
173
195
|
//# sourceMappingURL=decomposedPermissionSetTransformer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedPermissionSetTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedPermissionSetTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAAiC;AACjC,mDAAsE;
|
|
1
|
+
{"version":3,"file":"decomposedPermissionSetTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedPermissionSetTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAAiC;AACjC,mDAAsE;AACtE,yCAA8C;AAE9C,2CAAyD;AACzD,uDAAyD;AAEzD,2CAAwE;AACxE,wCAAqC;AAErC,yCAAwF;AACxF,uEAAoE;AACpE,mFAOyC;AAGzC,MAAa,kCAAmC,SAAQ,iDAAuB;IAC7E;;;;;OAKG;IACH,4DAA4D;IACrD,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACtD,4BAA4B;QAC5B,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,iBAAiB,KAAK,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QACxG,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QACzC,sHAAsH;QACtH,MAAM,MAAM;QACV,2BAA2B;QAC3B,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,yBAAyB,CAAC;YAChD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI,yBAAe,CAAC;gBAClB,wDAAwD;gBACxD,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI;gBACvB,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,yBAAyB,CAAC;gBACtG,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,iBAAiB;aAC7D,CAAC,CAAC;QAET,CAAC,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,iDAAiD;YACjD,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACtF,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,aAAa;qBAChE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAE;qBACrB,IAAI,CAAC,IAAA,4BAAe,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAkB,CAAC;gBAC9E,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACvF,IAAA,4BAAe,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAkB;iBACpE,CAAC,CAAC;QACT,CAAC,CAAC,CAAC;QAEH,wEAAwE;QACxE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,SAAS,EAAuB;QACvE,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;QAE/C,0EAA0E;QAC1E,8EAA8E;QAC9E,IAAI,WAAW,CAAC,MAAM,CAAC,IAAA,6CAAa,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;YAC5D,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,gBAAgB,GAAG,MAAM,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAErE,MAAM,eAAe,GAAW;YAC9B,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACrB,CAAC,mBAAU,CAAC,EAAE,mBAAU;gBACxB,GAAG,MAAM,CAAC,WAAW,CACnB,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAC9G;aACF;SACF,CAAC;QAEF,MAAM,gBAAgB,GAAG,gBAAgB;aACtC,MAAM,CAAC,8CAAc,CAAC;aACtB,GAAG,CAAC,4CAAY,CAAC;aACjB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,QAAmB,CAAC,CAAC;aACjG,IAAI,EAAE;aACN,MAAM,CAAC,IAAA,0DAA0B,EAAC,WAAW,CAAC,CAAC,CAAC;QAEnD,MAAM,qBAAqB,GAAG,sBAAsB,CAAC;YACnD,sJAAsJ;YACtJ,wDAAwD;YACxD,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACvF,kIAAkI;YAClI,2FAA2F;YAC3F,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC;SACpE,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,SAAS;YAClC,CAAC,CAAC;gBACE;oBACE,MAAM,EAAE,IAAA,gBAAI,EACV,IAAA,uBAAY,EAAC,SAAS,CAAC,OAAO,CAAC,EAC/B,GAAG,SAAS,CAAC,IAAI,IAAI,IAAA,uBAAY,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,wBAAe,EAAE,CAC7E;oBACD,MAAM,EAAE,IAAI,iBAAO,CAAC,eAAe,CAAC;iBACrC;aACF;YACH,CAAC,CAAC,IAAA,yDAAyB,EAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,CAAC;QAEjF,OAAO,CAAC,GAAG,qBAAqB,EAAE,GAAG,kBAAkB,CAAC,CAAC;IAC3D,CAAC;CACF;AA/FD,gFA+FC;AACD,+FAA+F;AAC/F,MAAM,0BAA0B,GAAG,KAAK,EAAE,SAA0B,EAA+B,EAAE;AACnG,sGAAsG;AACtG,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CACzE,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAoB,EAAoB,EAAE,CAAC,CAAC;IAC5D,MAAM;IACN,QAAQ;IACR,UAAU,EAAE,SAAS,CAAC,IAAI;IAC1B,WAAW,EAAE,IAAA,gDAAgB,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;CAChE,CAAC,CACH,CAAC;AAEJ,2DAA2D;AAC3D,MAAM,gBAAgB,GAAG,CAAC,SAA4B,EAAc,EAAE;IACpE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IAC7C,MAAM,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,6GAA6G;IAC7G,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3D,MAAM,MAAM,GAAG,IAAA,gBAAI,EACjB,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAChE,GAAG,SAAS,IAAI,QAAQ,IAAI,IAAA,uBAAY,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,wBAAe,EAAE,CACpF,CAAC;IACF,OAAO,IAAA,gBAAI,EAAC,IAAA,4BAAqB,EAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;AAC3G,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,UAAkB,EAAE,IAAqB,EAAE,gBAAyC,EAAW,EAAE,CACpH,IAAI,iBAAO,CAAC;IACV,mEAAmE;IACnE,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,CACzB,EAAE,EACF,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClB,CAAC,gBAAgB;YACf,6GAA6G;YAC7G,0DAA0D;aACzD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/D,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK;KAC1B,CAAC,CAAC,CACJ;CACF,CAAC,CAAC;AACL,MAAM,sBAAsB,GAAG,CAAC,UAA6B,EAAe,EAAE;IAC5E,qDAAqD;IACrD,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,UAAU,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;QACpC,8EAA8E;QAC9E,4DAA4D;QAC5D,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAA2B,CAAC;QAC5D,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1B,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YAClC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC;YAClD,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,CACjD,CAAC;QAEF,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAChC,0FAA0F;YAC1F,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CACrC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAqC,CAC7E,CAAC;YACF,iFAAiF;YACjF,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;YAEzC,UAAU,CAAC,IAAI,CAAC;gBACd,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC;gBAC9E,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;oBACxB,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC;oBAC7B,CAAC,CAAC,IAAA,gBAAI,EACF,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,EACvC,SAAS,CAAC,IAAI,CAAC,aAAa,EAC5B,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,IAAA,uBAAY,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,wBAAe,EAAE,CAChF;aACN,CAAC,CAAC;YACH,OAAO;QACT,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,wIAAwI;AACxI,MAAM,eAAe,GACnB,CAAC,SAAsC,EAAE,EAAE,CAC3C,CAAC,MAAuB,EAAE,EAAE,CAC5B,CAAC,SAAuB,EAAE,EAAE,CAC5B,CAAC,QAAiB,EAAmB,EAAE;IACrC,MAAM,QAAQ,GAAc,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAE5E,MAAM,kBAAkB,GAAG,CAAC,SAAiB,EAAE,KAAc,EAAiB,EAAE,CAAC,CAAC;QAChF,eAAe,EAAE,MAAM;QACvB,SAAS;QACT,cAAc,EAAE;YACd,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,IAAI,SAAS,EAAE;YAC3C,IAAI,EAAE,SAAS;YACf,MAAM;SACP;QACD,KAAK;QACL,SAAS;KACV,CAAC,CAAC;IAEH,sEAAsE;IACtE,sDAAsD;IACtD,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,cAAc,GAAG,IAAI,GAAG,EAAyB,CAAC;QACxD,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACrB,IAAI,SAAS,GAAI,KAAK,CAAC,SAAS,CAAC,eAAgB,CAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5E,2EAA2E;YAC3E,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBACtC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YACjD,CAAC;YACD,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpD,IAAI,aAAa,EAAE,CAAC;gBAClB,iDAAiD;gBACjD,uDAAuD;gBACvD,aAAa,CAAC,KAAK,GAAG,IAAA,iBAAW,EAAC,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YACtE,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AACrD,CAAC,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.DefaultMetadataTransformer = void 0;
|
|
4
7
|
/*
|
|
@@ -8,6 +11,8 @@ exports.DefaultMetadataTransformer = void 0;
|
|
|
8
11
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
12
|
*/
|
|
10
13
|
const node_path_1 = require("node:path");
|
|
14
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
15
|
+
const node_path_2 = require("node:path");
|
|
11
16
|
const messages_1 = require("@salesforce/core/messages");
|
|
12
17
|
const lifecycle_1 = require("@salesforce/core/lifecycle");
|
|
13
18
|
const constants_1 = require("../../common/constants");
|
|
@@ -53,7 +58,18 @@ const getContentSourceDestination = (source, targetFormat, component, mergeWith)
|
|
|
53
58
|
if (component.content && component.tree.isDirectory(component.content)) {
|
|
54
59
|
// DEs are always inside a dir.
|
|
55
60
|
if (component.type.strategies?.adapter === 'digitalExperience') {
|
|
56
|
-
|
|
61
|
+
const parts = source.split(node_path_2.sep);
|
|
62
|
+
const file = parts.pop() ?? '';
|
|
63
|
+
const dir = (0, node_path_1.join)(mergeWith.content, parts.pop() ?? '');
|
|
64
|
+
if (source.endsWith('content.json') ||
|
|
65
|
+
source.endsWith('_meta.json') ||
|
|
66
|
+
!(node_fs_1.default.existsSync(dir) && node_fs_1.default.statSync(dir).isDirectory())) {
|
|
67
|
+
return (0, node_path_1.join)(mergeWith.content, (0, node_path_1.basename)(source));
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
// if a directory exists with the same name as source, merge into there
|
|
71
|
+
return (0, node_path_1.join)(dir, file);
|
|
72
|
+
}
|
|
57
73
|
}
|
|
58
74
|
else {
|
|
59
75
|
const relative = (0, path_1.trimUntil)(source, (0, node_path_1.basename)(component.content));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "12.19.
|
|
3
|
+
"version": "12.19.5",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"node": ">=18.0.0"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@salesforce/core": "^8.
|
|
28
|
+
"@salesforce/core": "^8.10.2",
|
|
29
29
|
"@salesforce/kit": "^3.2.3",
|
|
30
30
|
"@salesforce/ts-types": "^2.0.12",
|
|
31
31
|
"@salesforce/types": "^1.3.0",
|
|
@@ -51,8 +51,8 @@
|
|
|
51
51
|
"@types/mime": "2.0.3",
|
|
52
52
|
"@types/minimatch": "^5.1.2",
|
|
53
53
|
"deep-equal-in-any-order": "^1.1.19",
|
|
54
|
-
"esbuild": "^0.
|
|
55
|
-
"eslint-plugin-sf-plugin": "^1.20.
|
|
54
|
+
"esbuild": "^0.25.3",
|
|
55
|
+
"eslint-plugin-sf-plugin": "^1.20.22",
|
|
56
56
|
"mocha-junit-reporter": "^1.23.3",
|
|
57
57
|
"mocha-snap": "^5.0.0",
|
|
58
58
|
"ts-morph": "^24.0.0",
|