feat: support decomposed components across multiple directories #224
Conversation
src/convert/convertTransaction.ts
Outdated
| private async recompose(children: SourceComponent[], baseXmlObj: any): Promise<JsonMap> { | ||
| for (const child of children) { | ||
| const { directoryName: groupNode } = child.type; | ||
| const { name: parentName } = child.parent.type; | ||
| const childContents = (await child.parseXml())[child.type.name]; | ||
| if (!baseXmlObj[parentName]) { | ||
| baseXmlObj[parentName] = { '@_xmlns': XML_NS_URL }; | ||
| } | ||
|
|
||
| if (!baseXmlObj[parentName][groupNode]) { | ||
| baseXmlObj[parentName][groupNode] = []; | ||
| } | ||
| (baseXmlObj[parentName][groupNode] as JsonArray).push(childContents); | ||
| } | ||
| return baseXmlObj; | ||
| } |
There was a problem hiding this comment.
Moved this logic from the source adapter to the finalizer since its only used here now
|
|
||
| return [DecomposedMetadataTransformer.createParentWriteInfo(component, recomposedXmlObj)]; | ||
| // noop since the finalizer will push the writes to the component writer | ||
| return []; |
There was a problem hiding this comment.
toMetadataFormat now only ever contributes to the convert transaction and doesn't directly create write infos anymore.
| type: this.type, | ||
| }, | ||
| this.tree, | ||
| this.forceIgnore | ||
| ); | ||
| } | ||
| parent.content = pathToContent; |
There was a problem hiding this comment.
We now assign the CustomObject bundle path to the content property, like how bundle types work. This is so that even if there isn't a CustomObject xml, we can walk the folder to see all the children present.
src/collections/types.ts
Outdated
| registry?: RegistryAccess; | ||
| } | ||
|
|
||
| export interface FromSourceOptions extends ComponentSetOptions { | ||
| filter?: Iterable<ComponentLike> | ComponentSet; | ||
| resolveChildrenWithParent?: boolean; |
There was a problem hiding this comment.
This new option allows us to directly include children in component resolution when we encounter parent components
| @@ -0,0 +1,131 @@ | |||
| /* | |||
There was a problem hiding this comment.
This is a refactor of the ConvertTransaction concept, but performs the same job
| for await (const finalizerResult of this.context.executeFinalizers()) { | ||
| finalizerResult.forEach((result) => this.push(result)); |
There was a problem hiding this comment.
could simplify this
There was a problem hiding this comment.
Oh sorry, I meant that I did simplify it. push is a stream method.
| public static async recompose( | ||
| children: SourceComponent[], | ||
| baseXmlObj: XmlJson = {} | ||
| ): Promise<JsonMap> { | ||
| for (const child of children) { | ||
| const { directoryName: groupNode } = child.type; | ||
| const { name: parentName } = child.parent.type; | ||
| const childContents = (await child.parseXml())[child.type.name]; | ||
| if (!baseXmlObj[parentName]) { | ||
| baseXmlObj[parentName] = { '@_xmlns': XML_NS_URL }; | ||
| } | ||
|
|
||
| if (!baseXmlObj[parentName][groupNode]) { | ||
| baseXmlObj[parentName][groupNode] = []; | ||
| } | ||
| (baseXmlObj[parentName][groupNode] as JsonArray).push(childContents); | ||
| } | ||
| return baseXmlObj; | ||
| } | ||
|
|
||
| public static createParentWriteInfo(trigger: SourceComponent, xmlObject: JsonMap): WriteInfo { | ||
| return { | ||
| source: new JsToXml(xmlObject), | ||
| output: join(trigger.type.directoryName, `${trigger.fullName}.${trigger.type.suffix}`), | ||
| }; | ||
| } |
There was a problem hiding this comment.
Moved this logic to the RecompositionFinalizer in ConvertContext
|
Apologies for the big change - feature was a bit complex |
What does this PR do?
Supports the use case of dividing a single decomposed component across different folders (package directories). For instance - a CustomObject can have some of its fields in one package, while the rest of its parts live in another.
What issues does this PR fix or reference?
@W-8527909@