fix: improve metadata detection

forcedotcom · Nov 4, 2024 · e45beb6 · e45beb6
1 parent 0d94198
commit e45beb6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/collections/componentSetBuilder.ts b/src/collections/componentSetBuilder.ts
@@ -152,7 +152,7 @@ export class ComponentSetBuilder {
       if (resolvedComponents.forceIgnoredPaths) {
         // if useFsForceIgnore = true, then we won't be able to resolve a forceignored path,
         // which we need to do to get the ignored source component
-        const resolver = new MetadataResolver(registry, undefined, true);
+        const resolver = new MetadataResolver(registry, undefined, false);
 
         for (const ignoredPath of resolvedComponents.forceIgnoredPaths ?? []) {
           resolver.getComponentsFromPath(ignoredPath).map((ignored) => {

diff --git a/src/resolve/metadataResolver.ts b/src/resolve/metadataResolver.ts
@@ -369,8 +369,12 @@ const resolveType =
  */
 const parseAsContentMetadataXml =
   (registry: RegistryAccess) =>
-  (fsPath: string): boolean =>
-    Boolean(registry.getTypeBySuffix(extName(fsPath)));
+  (fsPath: string): boolean => {
+    const suffixType = registry.getTypeBySuffix(extName(fsPath));
+    if (!suffixType) return false;
+
+    return fsPath.split(sep).includes(suffixType.directoryName);
+  };
 
 /**
  * If this file should be considered as a metadata file then return the metadata type