@salesforce/source-deploy-retrieve 6.9.1 → 7.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/src/client/diagnosticUtil.d.ts +0 -2
- package/lib/src/client/diagnosticUtil.js +23 -25
- package/lib/src/client/diagnosticUtil.js.map +1 -1
- package/lib/src/client/index.d.ts +1 -2
- package/lib/src/client/index.js +1 -3
- package/lib/src/client/index.js.map +1 -1
- package/lib/src/client/metadataApiDeploy.d.ts +0 -6
- package/lib/src/client/metadataApiDeploy.js +49 -48
- package/lib/src/client/metadataApiDeploy.js.map +1 -1
- package/lib/src/client/metadataApiRetrieve.js +2 -0
- package/lib/src/client/metadataApiRetrieve.js.map +1 -1
- package/lib/src/client/types.d.ts +0 -92
- package/lib/src/client/types.js.map +1 -1
- package/lib/src/collections/componentSet.d.ts +9 -13
- package/lib/src/collections/componentSet.js +47 -46
- package/lib/src/collections/componentSet.js.map +1 -1
- package/lib/src/collections/componentSetBuilder.d.ts +3 -2
- package/lib/src/collections/componentSetBuilder.js +5 -1
- package/lib/src/collections/componentSetBuilder.js.map +1 -1
- package/lib/src/collections/lazyCollection.js +5 -0
- package/lib/src/collections/lazyCollection.js.map +1 -1
- package/lib/src/convert/convertContext.d.ts +3 -11
- package/lib/src/convert/convertContext.js +33 -27
- package/lib/src/convert/convertContext.js.map +1 -1
- package/lib/src/convert/metadataConverter.d.ts +0 -2
- package/lib/src/convert/metadataConverter.js +38 -37
- package/lib/src/convert/metadataConverter.js.map +1 -1
- package/lib/src/convert/streams.d.ts +1 -1
- package/lib/src/convert/streams.js +14 -13
- package/lib/src/convert/streams.js.map +1 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.d.ts +0 -2
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js +27 -29
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.d.ts +0 -3
- package/lib/src/convert/transformers/defaultMetadataTransformer.js +61 -61
- package/lib/src/convert/transformers/defaultMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.d.ts +0 -10
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js +34 -38
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js.map +1 -1
- package/lib/src/index.d.ts +1 -1
- package/lib/src/index.js +1 -2
- package/lib/src/index.js.map +1 -1
- package/lib/src/registry/coverage.js +1 -1
- package/lib/src/registry/coverage.js.map +1 -1
- package/lib/src/resolve/adapters/baseSourceAdapter.d.ts +0 -1
- package/lib/src/resolve/adapters/baseSourceAdapter.js +10 -8
- package/lib/src/resolve/adapters/baseSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/defaultSourceAdapter.js +4 -0
- package/lib/src/resolve/adapters/defaultSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.d.ts +0 -5
- package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.js +6 -8
- package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/matchingContentSourceAdapter.d.ts +0 -1
- package/lib/src/resolve/adapters/matchingContentSourceAdapter.js +4 -4
- package/lib/src/resolve/adapters/matchingContentSourceAdapter.js.map +1 -1
- package/lib/src/resolve/connectionResolver.js +5 -4
- package/lib/src/resolve/connectionResolver.js.map +1 -1
- package/lib/src/resolve/manifestResolver.d.ts +0 -1
- package/lib/src/resolve/manifestResolver.js +21 -21
- package/lib/src/resolve/manifestResolver.js.map +1 -1
- package/lib/src/resolve/metadataResolver.d.ts +0 -6
- package/lib/src/resolve/metadataResolver.js +7 -9
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/sourceComponent.d.ts +16 -16
- package/lib/src/resolve/sourceComponent.js +36 -38
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/lib/src/resolve/treeContainers.js +2 -1
- package/lib/src/resolve/treeContainers.js.map +1 -1
- package/lib/src/utils/fileSystemHandler.d.ts +0 -6
- package/lib/src/utils/fileSystemHandler.js +1 -15
- package/lib/src/utils/fileSystemHandler.js.map +1 -1
- package/lib/src/utils/index.d.ts +0 -1
- package/lib/src/utils/index.js +1 -3
- package/lib/src/utils/index.js.map +1 -1
- package/package.json +13 -22
- package/lib/src/client/deployStrategies/auraDeploy.d.ts +0 -12
- package/lib/src/client/deployStrategies/auraDeploy.js +0 -175
- package/lib/src/client/deployStrategies/auraDeploy.js.map +0 -1
- package/lib/src/client/deployStrategies/baseDeploy.d.ts +0 -21
- package/lib/src/client/deployStrategies/baseDeploy.js +0 -81
- package/lib/src/client/deployStrategies/baseDeploy.js.map +0 -1
- package/lib/src/client/deployStrategies/containerDeploy.d.ts +0 -15
- package/lib/src/client/deployStrategies/containerDeploy.js +0 -145
- package/lib/src/client/deployStrategies/containerDeploy.js.map +0 -1
- package/lib/src/client/deployStrategies/index.d.ts +0 -6
- package/lib/src/client/deployStrategies/index.js +0 -25
- package/lib/src/client/deployStrategies/index.js.map +0 -1
- package/lib/src/client/deployStrategies/lwcDeploy.d.ts +0 -9
- package/lib/src/client/deployStrategies/lwcDeploy.js +0 -125
- package/lib/src/client/deployStrategies/lwcDeploy.js.map +0 -1
- package/lib/src/client/retrieveUtil.d.ts +0 -4
- package/lib/src/client/retrieveUtil.js +0 -120
- package/lib/src/client/retrieveUtil.js.map +0 -1
- package/lib/src/client/toolingApi.d.ts +0 -29
- package/lib/src/client/toolingApi.js +0 -120
- package/lib/src/client/toolingApi.js.map +0 -1
|
@@ -38,7 +38,7 @@ class MetadataConverter {
|
|
|
38
38
|
if (output.packageName) {
|
|
39
39
|
cs.fullName = output.packageName;
|
|
40
40
|
}
|
|
41
|
-
packagePath =
|
|
41
|
+
packagePath = getPackagePath(output);
|
|
42
42
|
defaultDirectory = packagePath;
|
|
43
43
|
writer = new streams_1.StandardWriter(packagePath);
|
|
44
44
|
if (!isSource) {
|
|
@@ -46,14 +46,14 @@ class MetadataConverter {
|
|
|
46
46
|
tasks.push(graceful_fs_1.promises.writeFile(manifestPath, await cs.getPackageXml()), ...cs.getTypesOfDestructiveChanges().map(async (destructiveChangesType) =>
|
|
47
47
|
// for each of the destructive changes in the component set, convert and write the correct metadata
|
|
48
48
|
// to each manifest
|
|
49
|
-
graceful_fs_1.promises.writeFile((0, path_1.join)(packagePath,
|
|
49
|
+
graceful_fs_1.promises.writeFile((0, path_1.join)(packagePath, getDestructiveManifest(destructiveChangesType)), await cs.getPackageXml(4, destructiveChangesType))));
|
|
50
50
|
}
|
|
51
51
|
break;
|
|
52
52
|
case 'zip':
|
|
53
53
|
if (output.packageName) {
|
|
54
54
|
cs.fullName = output.packageName;
|
|
55
55
|
}
|
|
56
|
-
packagePath =
|
|
56
|
+
packagePath = getPackagePath(output);
|
|
57
57
|
defaultDirectory = packagePath;
|
|
58
58
|
writer = new streams_1.ZipWriter(packagePath);
|
|
59
59
|
if (!isSource) {
|
|
@@ -61,7 +61,10 @@ class MetadataConverter {
|
|
|
61
61
|
// for each of the destructive changes in the component set, convert and write the correct metadata
|
|
62
62
|
// to each manifest
|
|
63
63
|
for (const destructiveChangeType of cs.getTypesOfDestructiveChanges()) {
|
|
64
|
-
writer.addToZip(
|
|
64
|
+
writer.addToZip(
|
|
65
|
+
// TODO: can this be safely parallelized?
|
|
66
|
+
// eslint-disable-next-line no-await-in-loop
|
|
67
|
+
await cs.getPackageXml(4, destructiveChangeType), getDestructiveManifest(destructiveChangeType));
|
|
65
68
|
}
|
|
66
69
|
}
|
|
67
70
|
break;
|
|
@@ -94,43 +97,41 @@ class MetadataConverter {
|
|
|
94
97
|
throw new core_1.SfError(messages.getMessage('error_failed_convert', [e.message]), 'ConversionError', [], e);
|
|
95
98
|
}
|
|
96
99
|
}
|
|
97
|
-
getPackagePath(outputConfig) {
|
|
98
|
-
let packagePath;
|
|
99
|
-
const { genUniqueDir = true, outputDirectory, packageName, type } = outputConfig;
|
|
100
|
-
if (outputDirectory) {
|
|
101
|
-
if (packageName) {
|
|
102
|
-
packagePath = (0, path_1.join)(outputDirectory, packageName);
|
|
103
|
-
}
|
|
104
|
-
else {
|
|
105
|
-
if (genUniqueDir) {
|
|
106
|
-
packagePath = (0, path_1.join)(outputDirectory, `${MetadataConverter.DEFAULT_PACKAGE_PREFIX}_${Date.now()}`);
|
|
107
|
-
}
|
|
108
|
-
else {
|
|
109
|
-
packagePath = (0, path_1.normalize)(outputDirectory);
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
if (type === 'zip') {
|
|
113
|
-
packagePath += '.zip';
|
|
114
|
-
(0, fileSystemHandler_1.ensureDirectoryExists)((0, path_1.dirname)(packagePath));
|
|
115
|
-
}
|
|
116
|
-
else {
|
|
117
|
-
(0, fileSystemHandler_1.ensureDirectoryExists)(packagePath);
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
return packagePath;
|
|
121
|
-
}
|
|
122
|
-
getDestructiveManifest(destructiveChangesType) {
|
|
123
|
-
if (destructiveChangesType === collections_1.DestructiveChangesType.POST) {
|
|
124
|
-
return MetadataConverter.DESTRUCTIVE_CHANGES_POST_XML_FILE;
|
|
125
|
-
}
|
|
126
|
-
else if (destructiveChangesType === collections_1.DestructiveChangesType.PRE) {
|
|
127
|
-
return MetadataConverter.DESTRUCTIVE_CHANGES_PRE_XML_FILE;
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
100
|
}
|
|
131
101
|
exports.MetadataConverter = MetadataConverter;
|
|
132
102
|
MetadataConverter.PACKAGE_XML_FILE = 'package.xml';
|
|
133
103
|
MetadataConverter.DESTRUCTIVE_CHANGES_POST_XML_FILE = 'destructiveChangesPost.xml';
|
|
134
104
|
MetadataConverter.DESTRUCTIVE_CHANGES_PRE_XML_FILE = 'destructiveChangesPre.xml';
|
|
135
105
|
MetadataConverter.DEFAULT_PACKAGE_PREFIX = 'metadataPackage';
|
|
106
|
+
const getPackagePath = (outputConfig) => {
|
|
107
|
+
let packagePath;
|
|
108
|
+
const { genUniqueDir = true, outputDirectory, packageName, type } = outputConfig;
|
|
109
|
+
if (outputDirectory) {
|
|
110
|
+
if (packageName) {
|
|
111
|
+
packagePath = (0, path_1.join)(outputDirectory, packageName);
|
|
112
|
+
}
|
|
113
|
+
else if (genUniqueDir) {
|
|
114
|
+
packagePath = (0, path_1.join)(outputDirectory, `${MetadataConverter.DEFAULT_PACKAGE_PREFIX}_${Date.now()}`);
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
packagePath = (0, path_1.normalize)(outputDirectory);
|
|
118
|
+
}
|
|
119
|
+
if (type === 'zip') {
|
|
120
|
+
packagePath += '.zip';
|
|
121
|
+
(0, fileSystemHandler_1.ensureDirectoryExists)((0, path_1.dirname)(packagePath));
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
(0, fileSystemHandler_1.ensureDirectoryExists)(packagePath);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
return packagePath;
|
|
128
|
+
};
|
|
129
|
+
const getDestructiveManifest = (destructiveChangesType) => {
|
|
130
|
+
if (destructiveChangesType === collections_1.DestructiveChangesType.POST) {
|
|
131
|
+
return MetadataConverter.DESTRUCTIVE_CHANGES_POST_XML_FILE;
|
|
132
|
+
}
|
|
133
|
+
else if (destructiveChangesType === collections_1.DestructiveChangesType.PRE) {
|
|
134
|
+
return MetadataConverter.DESTRUCTIVE_CHANGES_PRE_XML_FILE;
|
|
135
|
+
}
|
|
136
|
+
};
|
|
136
137
|
//# sourceMappingURL=metadataConverter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAgD;AAChD,2CAAqD;AACrD,6CAAuC;AAEvC,kEAAmE;AAEnE,gDAAsE;AACtE,0CAA6C;AAC7C,uCAAqG;AAGrG,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE;IAC1E,sBAAsB;IACtB,yCAAyC;CAC1C,CAAC,CAAC;AAEH,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,MAAM,EAAE,GAAG,KAAK,YAAY,0BAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,0BAAY,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1F,MAAM,UAAU,GACd,CAAC,KAAK,YAAY,0BAAY,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CACjF,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,KAAK,KAAK,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAG,YAAY,KAAK,QAAQ,CAAC;YAC3C,MAAM,KAAK,GAAyB,EAAE,CAAC;YAEvC,IAAI,MAAkC,CAAC;YACvC,IAAI,QAAsB,CAAC;YAC3B,IAAI,WAAuB,CAAC;YAC5B,IAAI,gBAA4B,CAAC;YAEjC,QAAQ,MAAM,CAAC,IAAI,EAAE;gBACnB,KAAK,WAAW;oBACd,IAAI,MAAM,CAAC,WAAW,EAAE;wBACtB,EAAE,CAAC,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC;qBAClC;oBACD,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,11 +46,11 @@ export declare class ZipWriter extends ComponentWriter {
|
|
|
46
46
|
private zip;
|
|
47
47
|
private buffers;
|
|
48
48
|
constructor(rootDestination?: SourcePath);
|
|
49
|
+
get buffer(): Buffer | undefined;
|
|
49
50
|
_write(chunk: WriterFormat, encoding: string, callback: (err?: Error) => void): Promise<void>;
|
|
50
51
|
_final(callback: (err?: Error) => void): Promise<void>;
|
|
51
52
|
addToZip(contents: string | Readable | Buffer, path: SourcePath): void;
|
|
52
53
|
private getOutputStream;
|
|
53
|
-
get buffer(): Buffer | undefined;
|
|
54
54
|
}
|
|
55
55
|
/**
|
|
56
56
|
* Convenient wrapper to serialize a js object to XML content. Implemented as a stream
|
|
@@ -23,16 +23,14 @@ const convertContext_1 = require("./convertContext");
|
|
|
23
23
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
24
24
|
const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr', ['error_convert_invalid_format']);
|
|
25
25
|
exports.pipeline = (0, util_1.promisify)(stream_1.pipeline);
|
|
26
|
-
const stream2buffer = async (stream) => {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
});
|
|
35
|
-
};
|
|
26
|
+
const stream2buffer = async (stream) => new Promise((resolve, reject) => {
|
|
27
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
28
|
+
const buf = Array();
|
|
29
|
+
stream.on('data', (chunk) => buf.push(chunk));
|
|
30
|
+
stream.on('end', () => resolve(Buffer.concat(buf)));
|
|
31
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
32
|
+
stream.on('error', (err) => reject(`error converting stream - ${err}`));
|
|
33
|
+
});
|
|
36
34
|
exports.stream2buffer = stream2buffer;
|
|
37
35
|
class ComponentReader extends stream_1.Readable {
|
|
38
36
|
constructor(components) {
|
|
@@ -47,6 +45,9 @@ class ComponentReader extends stream_1.Readable {
|
|
|
47
45
|
}
|
|
48
46
|
this.push(null);
|
|
49
47
|
}
|
|
48
|
+
// preserved to isolate from other classes in this file
|
|
49
|
+
// componentReader should go away (see note in handbook)
|
|
50
|
+
// eslint-disable-next-line class-methods-use-this
|
|
50
51
|
*createIterator(components) {
|
|
51
52
|
for (const component of components) {
|
|
52
53
|
yield component;
|
|
@@ -188,6 +189,9 @@ class ZipWriter extends ComponentWriter {
|
|
|
188
189
|
this.buffers = [];
|
|
189
190
|
void (0, exports.pipeline)(this.zip, this.getOutputStream());
|
|
190
191
|
}
|
|
192
|
+
get buffer() {
|
|
193
|
+
return Buffer.concat(this.buffers);
|
|
194
|
+
}
|
|
191
195
|
async _write(chunk, encoding, callback) {
|
|
192
196
|
let err;
|
|
193
197
|
try {
|
|
@@ -238,9 +242,6 @@ class ZipWriter extends ComponentWriter {
|
|
|
238
242
|
return bufferWritable;
|
|
239
243
|
}
|
|
240
244
|
}
|
|
241
|
-
get buffer() {
|
|
242
|
-
return Buffer.concat(this.buffers);
|
|
243
|
-
}
|
|
244
245
|
}
|
|
245
246
|
exports.ZipWriter = ZipWriter;
|
|
246
247
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA2D;AAC3D,mCAAuF;AACvF,+BAAiC;AACjC,2CAAqD;AACrD,uCAA6D;AAC7D,6CAA4D;AAE5D,qDAA4C;AAC5C,2CAA0C;AAC1C,wCAA+D;AAC/D,sCAAiD;AAGjD,kEAA8D;AAC9D,iDAA4D;AAC5D,qDAAkD;AAGlD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC;AAEjG,QAAA,QAAQ,GAAG,IAAA,gBAAS,EAAC,iBAAU,CAAC,CAAC;AAEvC,MAAM,aAAa,GAAG,KAAK,EAAE,MAAc,EAAmB,EAAE
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA2D;AAC3D,mCAAuF;AACvF,+BAAiC;AACjC,2CAAqD;AACrD,uCAA6D;AAC7D,6CAA4D;AAE5D,qDAA4C;AAC5C,2CAA0C;AAC1C,wCAA+D;AAC/D,sCAAiD;AAGjD,kEAA8D;AAC9D,iDAA4D;AAC5D,qDAAkD;AAGlD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC;AAEjG,QAAA,QAAQ,GAAG,IAAA,gBAAS,EAAC,iBAAU,CAAC,CAAC;AAEvC,MAAM,aAAa,GAAG,KAAK,EAAE,MAAc,EAAmB,EAAE,CACrE,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IACtC,8DAA8D;IAC9D,MAAM,GAAG,GAAG,KAAK,EAAO,CAAC;IACzB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpD,4EAA4E;IAC5E,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,6BAA6B,GAAG,EAAE,CAAC,CAAC,CAAC;AAC1E,CAAC,CAAC,CAAC;AARQ,QAAA,aAAa,iBAQrB;AACL,MAAa,eAAgB,SAAQ,iBAAQ;IAG3C,YAAmB,UAAqC;QACtD,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAEM,KAAK;QACV,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtB,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SACzB;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED,uDAAuD;IACvD,wDAAwD;IACxD,kDAAkD;IAC1C,CAAC,cAAc,CAAC,UAAqC;QAC3D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,MAAM,SAAS,CAAC;SACjB;IACH,CAAC;CACF;AAzBD,0CAyBC;AAED,MAAa,kBAAmB,SAAQ,kBAAS;IAO/C,YACE,YAA4B,EAC5B,QAAwB,EACxB,QAAuB,EACvB,gBAAyB;QAEzB,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAZd,YAAO,GAAG,IAAI,+BAAc,EAAE,CAAC;QAa7C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,IAAI,yCAA0B,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjF,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,KAAsB,EACtB,QAAgB,EAChB,QAAkD;QAElD,IAAI,GAAU,CAAC;QACf,MAAM,UAAU,GAAgB,EAAE,CAAC;QAEnC,mDAAmD;QACnD,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE;YAC9B,IAAI;gBACF,MAAM,QAAQ,GAAgC,EAAE,CAAC;gBACjD,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBAClE,WAAW,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;gBACrD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBAC5D,QAAQ,IAAI,CAAC,YAAY,EAAE;oBACzB,KAAK,QAAQ;wBACX,IAAI,SAAS,EAAE;4BACb,KAAK,MAAM,cAAc,IAAI,SAAS,EAAE;gCACtC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;6BAClE;yBACF;wBACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;4BACzB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;yBAClD;wBACD,MAAM;oBACR,KAAK,UAAU;wBACb,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;wBACnD,MAAM;oBACR;wBACE,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,8BAA8B,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;iBAC/G;gBACD,8DAA8D;gBAC9D,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;aAC7E;YAAC,OAAO,CAAC,EAAE;gBACV,GAAG,GAAG,CAAU,CAAC;aAClB;SACF;QAED,QAAQ,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAClD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAC,QAAmD;QACrE,IAAI,GAAU,CAAC;QACf,IAAI;YACF,IAAI,KAAK,EAAE,MAAM,eAAe,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBACzF,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aACxD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,GAAG,CAAU,CAAC;SAClB;QACD,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;CACF;AA7ED,gDA6EC;AAED,MAAsB,eAAgB,SAAQ,iBAAQ;IAIpD,YAAmB,eAA4B;QAC7C,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAJvB,sBAAiB,GAAiB,IAAI,GAAG,EAAU,CAAC;QAKzD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;CACF;AARD,0CAQC;AAED,MAAa,cAAe,SAAQ,eAAe;IAKjD,YAAmB,eAA2B,EAAE,QAAQ,GAAG,IAAI,0BAAgB,EAAE;QAC/E,KAAK,CAAC,eAAe,CAAC,CAAC;QALlB,cAAS,GAAsB,EAAE,CAAC;QAMvC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,KAAmB,EAAE,QAAgB,EAAE,QAA+B;QACxF,IAAI,GAAU,CAAC;QACf,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,IAAI;gBACF,MAAM,SAAS,GAAa,EAAE,CAAC;gBAC/B,iFAAiF;gBACjF,wFAAwF;gBACxF,2EAA2E;gBAC3E,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAe,EAAE,EAAE;oBACvC,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;oBACjG,IAAI,CAAC,IAAA,wBAAU,EAAC,QAAQ,CAAC,EAAE;wBACzB,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,iBAAiB,EAAE;4BAChD,IACE,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;gCAChD,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC,EAClD;gCACA,OAAO;6BACR;yBACF;qBACF;oBACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBACxC,OAAO;qBACR;oBACD,sFAAsF;oBACtF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;wBAC3D,6DAA6D;wBAC7D,2CAA2C;wBAC3C,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;4BAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;4BAClE,OAAO;yBACR;wBACD,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC1B;oBACD,IAAA,oCAAgB,EAAC,QAAQ,CAAC,CAAC;oBAC3B,OAAO,IAAA,gBAAQ,EAAC,IAAI,CAAC,MAAM,EAAE,IAAA,+BAAiB,EAAC,QAAQ,CAAC,CAAC,CAAC;gBAC5D,CAAC,CAAC,CACH,CAAC;gBAEF,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACvB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,CAAC,EAAE;gBACV,GAAG,GAAG,CAAU,CAAC;aAClB;SACF;QACD,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;CACF;AA3DD,wCA2DC;AAED,MAAa,SAAU,SAAQ,eAAe;IAO5C,YAAmB,eAA4B;QAC7C,KAAK,CAAC,eAAe,CAAC,CAAC;QAPzB,mEAAmE;QACnE,0EAA0E;QAC1E,gFAAgF;QACxE,QAAG,GAAa,IAAA,iBAAa,EAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7D,YAAO,GAAa,EAAE,CAAC;QAI7B,KAAK,IAAA,gBAAQ,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,IAAW,MAAM;QACf,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,KAAmB,EAAE,QAAgB,EAAE,QAA+B;QACxF,IAAI,GAAU,CAAC;QACf,IAAI;YACF,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;gBACvC,kGAAkG;gBAClG,0EAA0E;gBAC1E,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE;oBAC7E,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;iBAC1D;gBACD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAa,EAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC7D,wHAAwH;gBACxH,IAAI,cAAc,CAAC,MAAM,EAAE;oBACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;iBACxD;gBACD,qFAAqF;gBACrF,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YAC3D,CAAC,CAAC,CACH,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,GAAG,CAAU,CAAC;SAClB;QACD,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAA+B;QACjD,IAAI,GAAU,CAAC;QACf,IAAI;YACF,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;SAC3B;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,GAAG,CAAU,CAAC;SAClB;QACD,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAEM,QAAQ,CAAC,QAAoC,EAAE,IAAgB;QACpE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAEO,eAAe;QACrB,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,OAAO,IAAA,+BAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SAChD;aAAM;YACL,MAAM,cAAc,GAAG,IAAI,iBAAQ,EAAE,CAAC;YACtC,gDAAgD;YAChD,cAAc,CAAC,MAAM,GAAG,CAAC,KAAa,EAAE,QAAgB,EAAE,EAAc,EAAQ,EAAE;gBAChF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzB,EAAE,EAAE,CAAC;YACP,CAAC,CAAC;YACF,OAAO,cAAc,CAAC;SACvB;IACH,CAAC;CACF;AApED,8BAoEC;AAED;;;;GAIG;AACH,MAAa,OAAQ,SAAQ,iBAAQ;IAGnC,YAAmB,SAAkB;QACnC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,KAAK;QACV,MAAM,MAAM,GAAG,IAAI,2BAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;QACnH,MAAM,UAAU,GAAG,iBAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAW,CAAC,CAAC;QAC3E,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;CACF;AAdD,0BAcC"}
|
|
@@ -4,7 +4,6 @@ import { BaseMetadataTransformer } from './baseMetadataTransformer';
|
|
|
4
4
|
export declare class DecomposedMetadataTransformer extends BaseMetadataTransformer {
|
|
5
5
|
toMetadataFormat(component: SourceComponent): Promise<WriteInfo[]>;
|
|
6
6
|
toSourceFormat(component: SourceComponent, mergeWith?: SourceComponent): Promise<WriteInfo[]>;
|
|
7
|
-
private getComposedMetadataEntries;
|
|
8
7
|
/**
|
|
9
8
|
* Helper for setting the decomposed transaction state
|
|
10
9
|
*
|
|
@@ -13,5 +12,4 @@ export declare class DecomposedMetadataTransformer extends BaseMetadataTransform
|
|
|
13
12
|
*/
|
|
14
13
|
private setDecomposedState;
|
|
15
14
|
private getDecomposedState;
|
|
16
|
-
private getDefaultOutput;
|
|
17
15
|
}
|
|
@@ -53,7 +53,7 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
53
53
|
const { type, fullName: parentFullName } = component;
|
|
54
54
|
const forceIgnore = component.getForceIgnore();
|
|
55
55
|
let parentXmlObject;
|
|
56
|
-
const composedMetadata = await
|
|
56
|
+
const composedMetadata = await getComposedMetadataEntries(component);
|
|
57
57
|
for (const [tagKey, tagValue] of composedMetadata) {
|
|
58
58
|
const childTypeId = type.children?.directories[tagKey];
|
|
59
59
|
if (childTypeId) {
|
|
@@ -67,7 +67,7 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
67
67
|
parent: component,
|
|
68
68
|
};
|
|
69
69
|
// only process child types that aren't forceignored
|
|
70
|
-
if (forceIgnore.accepts(
|
|
70
|
+
if (forceIgnore.accepts(getDefaultOutput(childComponent))) {
|
|
71
71
|
const source = new streams_1.JsToXml({
|
|
72
72
|
[childType.name]: Object.assign({ [common_1.XML_NS_KEY]: common_1.XML_NS_URL }, value),
|
|
73
73
|
});
|
|
@@ -89,7 +89,7 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
89
89
|
foundMerge: false,
|
|
90
90
|
writeInfo: {
|
|
91
91
|
source: new streams_1.JsToXml(parentXmlObject),
|
|
92
|
-
output:
|
|
92
|
+
output: getDefaultOutput(component),
|
|
93
93
|
},
|
|
94
94
|
});
|
|
95
95
|
}
|
|
@@ -97,7 +97,7 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
97
97
|
if (!mergeWith) {
|
|
98
98
|
writeInfos.push({
|
|
99
99
|
source,
|
|
100
|
-
output:
|
|
100
|
+
output: getDefaultOutput(childComponent),
|
|
101
101
|
});
|
|
102
102
|
}
|
|
103
103
|
// if the merge parent has a child that can be merged with, push write
|
|
@@ -117,22 +117,20 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
117
117
|
foundMerge: false,
|
|
118
118
|
writeInfo: {
|
|
119
119
|
source,
|
|
120
|
-
output:
|
|
120
|
+
output: getDefaultOutput(childComponent),
|
|
121
121
|
},
|
|
122
122
|
});
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
|
-
else {
|
|
127
|
+
else if (tagKey !== common_1.XML_NS_KEY) {
|
|
128
128
|
// tag entry isn't a child type, so add it to the parent xml
|
|
129
|
-
if (
|
|
130
|
-
|
|
131
|
-
parentXmlObject = { [type.name]: { [common_1.XML_NS_KEY]: common_1.XML_NS_URL } };
|
|
132
|
-
}
|
|
133
|
-
const tagGroup = parentXmlObject[type.name];
|
|
134
|
-
tagGroup[tagKey] = tagValue;
|
|
129
|
+
if (!parentXmlObject) {
|
|
130
|
+
parentXmlObject = { [type.name]: { [common_1.XML_NS_KEY]: common_1.XML_NS_URL } };
|
|
135
131
|
}
|
|
132
|
+
const tagGroup = parentXmlObject[type.name];
|
|
133
|
+
tagGroup[tagKey] = tagValue;
|
|
136
134
|
}
|
|
137
135
|
}
|
|
138
136
|
const parentState = this.getDecomposedState(component);
|
|
@@ -141,7 +139,7 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
141
139
|
if (!mergeWith) {
|
|
142
140
|
writeInfos.push({
|
|
143
141
|
source: parentSource,
|
|
144
|
-
output:
|
|
142
|
+
output: getDefaultOutput(component),
|
|
145
143
|
});
|
|
146
144
|
}
|
|
147
145
|
else if (mergeWith.xml) {
|
|
@@ -156,18 +154,13 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
156
154
|
foundMerge: false,
|
|
157
155
|
writeInfo: {
|
|
158
156
|
source: parentSource,
|
|
159
|
-
output:
|
|
157
|
+
output: getDefaultOutput(component),
|
|
160
158
|
},
|
|
161
159
|
});
|
|
162
160
|
}
|
|
163
161
|
}
|
|
164
162
|
return writeInfos;
|
|
165
163
|
}
|
|
166
|
-
async getComposedMetadataEntries(component) {
|
|
167
|
-
const composedMetadata = (await component.parseXml())[component.type.name];
|
|
168
|
-
// composedMetadata might be undefined if you call toSourceFormat() from a non-source-backed Component
|
|
169
|
-
return composedMetadata ? Object.entries(composedMetadata) : [];
|
|
170
|
-
}
|
|
171
164
|
/**
|
|
172
165
|
* Helper for setting the decomposed transaction state
|
|
173
166
|
*
|
|
@@ -185,16 +178,21 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
185
178
|
const key = `${forComponent.type.name}#${forComponent.fullName}`;
|
|
186
179
|
return this.context.decomposition.state[key];
|
|
187
180
|
}
|
|
188
|
-
getDefaultOutput(component) {
|
|
189
|
-
const { parent, fullName, type } = component;
|
|
190
|
-
const [baseName, childName] = fullName.split('.');
|
|
191
|
-
const baseComponent = (parent ?? component);
|
|
192
|
-
let output = `${childName ?? baseName}.${component.type.suffix}${common_1.META_XML_SUFFIX}`;
|
|
193
|
-
if (parent?.type.strategies.decomposition === "folderPerType" /* DecompositionStrategy.FolderPerType */) {
|
|
194
|
-
output = (0, path_1.join)(type.directoryName, output);
|
|
195
|
-
}
|
|
196
|
-
return (0, path_1.join)(baseComponent.getPackageRelativePath(baseName, 'source'), output);
|
|
197
|
-
}
|
|
198
181
|
}
|
|
199
182
|
exports.DecomposedMetadataTransformer = DecomposedMetadataTransformer;
|
|
183
|
+
const getComposedMetadataEntries = async (component) => {
|
|
184
|
+
const composedMetadata = (await component.parseXml())[component.type.name];
|
|
185
|
+
// composedMetadata might be undefined if you call toSourceFormat() from a non-source-backed Component
|
|
186
|
+
return composedMetadata ? Object.entries(composedMetadata) : [];
|
|
187
|
+
};
|
|
188
|
+
const getDefaultOutput = (component) => {
|
|
189
|
+
const { parent, fullName, type } = component;
|
|
190
|
+
const [baseName, childName] = fullName.split('.');
|
|
191
|
+
const baseComponent = (parent ?? component);
|
|
192
|
+
let output = `${childName ?? baseName}.${component.type.suffix}${common_1.META_XML_SUFFIX}`;
|
|
193
|
+
if (parent?.type.strategies.decomposition === "folderPerType" /* DecompositionStrategy.FolderPerType */) {
|
|
194
|
+
output = (0, path_1.join)(type.directoryName, output);
|
|
195
|
+
}
|
|
196
|
+
return (0, path_1.join)(baseComponent.getPackageRelativePath(baseName, 'source'), output);
|
|
197
|
+
};
|
|
200
198
|
//# sourceMappingURL=decomposedMetadataTransformer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA4B;AAE5B,yCAA8C;AAE9C,wCAAqC;AAErC,yCAAmF;AACnF,mDAAiD;AAGjD,uEAAoE;AAEpE,MAAa,6BAA8B,SAAQ,iDAAuB;IACxE,4DAA4D;IACrD,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACtD,IAAI,SAAS,CAAC,MAAM,EAAE;YACpB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;YAClD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5C,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;oBACrB,KAAK,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;iBAC3C;qBAAM;oBACL,KAAK,CAAC,UAAU,CAAC,GAAG;wBAClB,SAAS,EAAE,SAAS,CAAC,MAAM;wBAC3B,QAAQ,EAAE,IAAI,0BAAY,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;qBACvD,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;oBACpB,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,0BAAY,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;iBAChF;gBACD,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;gBACzC,IAAI,QAAQ,EAAE;oBACZ,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBACrB,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBACtC,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;SACJ;QACD,wEAAwE;QACxE,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;QACjF,MAAM,UAAU,GAAgB,EAAE,CAAC;QACnC,MAAM,wBAAwB,GAAG,IAAI,0BAAY,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAC5E,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;QACrD,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;QAE/C,IAAI,eAAwB,CAAC;QAC7B,MAAM,gBAAgB,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,4 @@ import { BaseMetadataTransformer } from './baseMetadataTransformer';
|
|
|
11
11
|
export declare class DefaultMetadataTransformer extends BaseMetadataTransformer {
|
|
12
12
|
toMetadataFormat(component: SourceComponent): Promise<WriteInfo[]>;
|
|
13
13
|
toSourceFormat(component: SourceComponent, mergeWith?: SourceComponent): Promise<WriteInfo[]>;
|
|
14
|
-
private getWriteInfos;
|
|
15
|
-
private getContentSourceDestination;
|
|
16
|
-
private getXmlDestination;
|
|
17
14
|
}
|
|
@@ -20,80 +20,80 @@ const ORIGINAL_SUFFIX_REGEX = new RegExp('(.)([a-zA-Z]+)(' + common_1.META_XML_S
|
|
|
20
20
|
* files as-is.
|
|
21
21
|
*/
|
|
22
22
|
class DefaultMetadataTransformer extends baseMetadataTransformer_1.BaseMetadataTransformer {
|
|
23
|
-
// eslint-disable-next-line @typescript-eslint/require-await
|
|
23
|
+
// eslint-disable-next-line @typescript-eslint/require-await, class-methods-use-this
|
|
24
24
|
async toMetadataFormat(component) {
|
|
25
|
-
return
|
|
25
|
+
return getWriteInfos(component, 'metadata');
|
|
26
26
|
}
|
|
27
|
-
// eslint-disable-next-line @typescript-eslint/require-await
|
|
27
|
+
// eslint-disable-next-line @typescript-eslint/require-await, class-methods-use-this
|
|
28
28
|
async toSourceFormat(component, mergeWith) {
|
|
29
|
-
return
|
|
29
|
+
return getWriteInfos(component, 'source', mergeWith);
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
output: this.getContentSourceDestination(source, targetFormat, component, mergeWith),
|
|
38
|
-
});
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
if (component.xml) {
|
|
31
|
+
}
|
|
32
|
+
exports.DefaultMetadataTransformer = DefaultMetadataTransformer;
|
|
33
|
+
const getWriteInfos = (component, targetFormat, mergeWith) => {
|
|
34
|
+
const writeInfos = [];
|
|
35
|
+
if (component.content) {
|
|
36
|
+
for (const source of component.walkContent()) {
|
|
42
37
|
writeInfos.push({
|
|
43
|
-
source: component.tree.stream(
|
|
44
|
-
output:
|
|
38
|
+
source: component.tree.stream(source),
|
|
39
|
+
output: getContentSourceDestination(source, targetFormat, component, mergeWith),
|
|
45
40
|
});
|
|
46
41
|
}
|
|
47
|
-
return writeInfos;
|
|
48
42
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
43
|
+
if (component.xml) {
|
|
44
|
+
writeInfos.push({
|
|
45
|
+
source: component.tree.stream(component.xml),
|
|
46
|
+
output: getXmlDestination(targetFormat, component, mergeWith),
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
return writeInfos;
|
|
50
|
+
};
|
|
51
|
+
// assumes component has content
|
|
52
|
+
const getContentSourceDestination = (source, targetFormat, component, mergeWith) => {
|
|
53
|
+
if (mergeWith?.content) {
|
|
54
|
+
if (component.tree.isDirectory(component.content)) {
|
|
55
|
+
const relative = (0, utils_1.trimUntil)(source, (0, path_1.basename)(component.content));
|
|
56
|
+
return (0, path_1.join)((0, path_1.dirname)(mergeWith.content), relative);
|
|
57
57
|
}
|
|
58
|
-
return
|
|
58
|
+
return mergeWith.content;
|
|
59
|
+
}
|
|
60
|
+
return component.getPackageRelativePath(source, targetFormat);
|
|
61
|
+
};
|
|
62
|
+
// assumes component has xml
|
|
63
|
+
const getXmlDestination = (targetFormat, component, mergeWith) => {
|
|
64
|
+
if (mergeWith?.xml && targetFormat === 'source') {
|
|
65
|
+
return mergeWith.xml;
|
|
59
66
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
67
|
+
const { folderContentType, suffix, legacySuffix } = component.type;
|
|
68
|
+
let xmlDestination = component.getPackageRelativePath(component.xml, targetFormat);
|
|
69
|
+
// quirks:
|
|
70
|
+
// - append or strip the -meta.xml suffix to the path if there's no content and if it's not DigitalExperienceBundle
|
|
71
|
+
// for folder components:
|
|
72
|
+
// - remove file extension but preserve -meta.xml suffix if folder type and to 'metadata format'
|
|
73
|
+
// - insert file extension behind the -meta.xml suffix if folder type and to 'source format'
|
|
74
|
+
if (!component.content && !['digitalexperiencebundle'].includes(component.type.id)) {
|
|
75
|
+
if (targetFormat === 'metadata') {
|
|
76
|
+
xmlDestination = folderContentType
|
|
77
|
+
? xmlDestination.replace(`.${suffix}`, '')
|
|
78
|
+
: xmlDestination.slice(0, xmlDestination.lastIndexOf(common_1.META_XML_SUFFIX));
|
|
64
79
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
// for folder components:
|
|
70
|
-
// - remove file extension but preserve -meta.xml suffix if folder type and to 'metadata format'
|
|
71
|
-
// - insert file extension behind the -meta.xml suffix if folder type and to 'source format'
|
|
72
|
-
if (!component.content && !['digitalexperiencebundle'].includes(component.type.id)) {
|
|
73
|
-
if (targetFormat === 'metadata') {
|
|
74
|
-
xmlDestination = folderContentType
|
|
75
|
-
? xmlDestination.replace(`.${suffix}`, '')
|
|
76
|
-
: xmlDestination.slice(0, xmlDestination.lastIndexOf(common_1.META_XML_SUFFIX));
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
79
|
-
xmlDestination = folderContentType
|
|
80
|
-
? xmlDestination.replace(common_1.META_XML_SUFFIX, `.${suffix}${common_1.META_XML_SUFFIX}`)
|
|
81
|
-
: `${xmlDestination}${common_1.META_XML_SUFFIX}`;
|
|
82
|
-
}
|
|
80
|
+
else {
|
|
81
|
+
xmlDestination = folderContentType
|
|
82
|
+
? xmlDestination.replace(common_1.META_XML_SUFFIX, `.${suffix}${common_1.META_XML_SUFFIX}`)
|
|
83
|
+
: `${xmlDestination}${common_1.META_XML_SUFFIX}`;
|
|
83
84
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
else {
|
|
89
|
-
xmlDestination = xmlDestination.replace(ORIGINAL_SUFFIX_REGEX, '.' + suffix + common_1.META_XML_SUFFIX);
|
|
90
|
-
}
|
|
85
|
+
}
|
|
86
|
+
else if (suffix) {
|
|
87
|
+
if (component.type.name === 'Document' && targetFormat === 'metadata') {
|
|
88
|
+
xmlDestination = xmlDestination.replace(new RegExp('.' + suffix + common_1.META_XML_SUFFIX + '$'), '.' + (0, utils_1.extName)(component.content) + common_1.META_XML_SUFFIX);
|
|
91
89
|
}
|
|
92
|
-
|
|
93
|
-
xmlDestination = xmlDestination.replace(
|
|
90
|
+
else {
|
|
91
|
+
xmlDestination = xmlDestination.replace(ORIGINAL_SUFFIX_REGEX, '.' + suffix + common_1.META_XML_SUFFIX);
|
|
94
92
|
}
|
|
95
|
-
return xmlDestination;
|
|
96
93
|
}
|
|
97
|
-
|
|
98
|
-
|
|
94
|
+
if (legacySuffix && suffix && xmlDestination.includes(legacySuffix)) {
|
|
95
|
+
xmlDestination = xmlDestination.replace(legacySuffix, suffix);
|
|
96
|
+
}
|
|
97
|
+
return xmlDestination;
|
|
98
|
+
};
|
|
99
99
|
//# sourceMappingURL=defaultMetadataTransformer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA+C;AAC/C,yCAA2D;AAG3D,uCAAiD;AACjD,uEAAoE;AAEpE,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,iBAAiB,GAAG,wBAAe,GAAG,IAAI,CAAC,CAAC;AAErF;;;;;;GAMG;AACH,MAAa,0BAA2B,SAAQ,iDAAuB;IACrE,
|
|
1
|
+
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,6 @@ import { SourceComponent } from '../../resolve';
|
|
|
3
3
|
import { BaseMetadataTransformer } from './baseMetadataTransformer';
|
|
4
4
|
export declare class StaticResourceMetadataTransformer extends BaseMetadataTransformer {
|
|
5
5
|
static readonly ARCHIVE_MIME_TYPES: Set<string>;
|
|
6
|
-
private static readonly DEFAULT_CONTENT_TYPE;
|
|
7
|
-
private static readonly FALLBACK_TYPE_MAP;
|
|
8
6
|
toMetadataFormat(component: SourceComponent): Promise<WriteInfo[]>;
|
|
9
7
|
toSourceFormat(component: SourceComponent, mergeWith?: SourceComponent): Promise<WriteInfo[]>;
|
|
10
8
|
/**
|
|
@@ -16,12 +14,4 @@ export declare class StaticResourceMetadataTransformer extends BaseMetadataTrans
|
|
|
16
14
|
* @private
|
|
17
15
|
*/
|
|
18
16
|
private pipeline;
|
|
19
|
-
private getBaseContentPath;
|
|
20
|
-
/**
|
|
21
|
-
* "Expanded" refers to a component whose content file is a zip file, and its current
|
|
22
|
-
* state is unzipped.
|
|
23
|
-
*/
|
|
24
|
-
private componentIsExpandedArchive;
|
|
25
|
-
private getContentType;
|
|
26
|
-
private getExtensionFromType;
|
|
27
17
|
}
|