fix: allow CFTs to be retrieved across packages

forcedotcom · Oct 18, 2023 · ace0c0e · ace0c0e
1 parent 07d8ca9
commit ace0c0e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/src/convert/streams.ts b/src/convert/streams.ts
@@ -139,9 +139,6 @@ export class StandardWriter extends ComponentWriter {
         // queue is empty when that call exits and overall less memory is consumed.
         await Promise.all(
           chunk.writeInfos.map((info: WriteInfo) => {
-            // assertion logic: the rootDestination is required in this subclass of ComponentWriter but the super doesn't know that
-            // the eslint comment should remain until strictMode is fully implemented
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
             const fullDest = isAbsolute(info.output) ? info.output : join(this.rootDestination as string, info.output);
             if (!existsSync(fullDest)) {
               for (const ignoredPath of this.forceIgnoredPaths) {

diff --git a/src/registry/metadataRegistry.json b/src/registry/metadataRegistry.json
@@ -907,7 +907,7 @@
             "directoryName": "fields",
             "suffix": "fieldTranslation",
             "isAddressable": false,
-            "unaddressableWithoutParent": true,
+            "unaddressableWithoutParent": false,
             "uniqueIdElement": "name"
           }
         },

diff --git a/src/resolve/adapters/decomposedSourceAdapter.ts b/src/resolve/adapters/decomposedSourceAdapter.ts
@@ -89,8 +89,8 @@ export class DecomposedSourceAdapter extends MixedContentSourceAdapter {
       const childTypeId = this.type.children?.suffixes?.[metaXml.suffix];
       const triggerIsAChild = !!childTypeId;
       const strategy = this.type.strategies?.decomposition;
-
-      if (triggerIsAChild && this.type.children && !this.type.children.types[childTypeId].unaddressableWithoutParent) {
+      // look at changing this to see if the parent and child are addressable together
+      if (triggerIsAChild && this.type.children && !this.type.children.types[childTypeId].isAddressable) {
         if (strategy === DecompositionStrategy.FolderPerType || isResolvingSource) {
           let parent = component;
           if (!parent) {

diff --git a/yarn.lock b/yarn.lock
@@ -618,7 +618,7 @@
     typescript "^4.9.5"
     wireit "^0.9.5"
 
-"@salesforce/kit@^3.0.11", "@salesforce/kit@^3.0.13":
+"@salesforce/kit@^3.0.13":
   version "3.0.13"
   resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.13.tgz#10b47ad6e0e27c3a9f97eb6a5cdcfffa9ba1f163"
   integrity sha512-HLQ5L5bBi0tsMeH5ZHJAhHUpvNUNPQoNJt2O82Jf6C60GGsrlzwzQ5ONAHGNBgKSZ7HLr0UGL5xaA+hE9uOcgw==