@salesforce/source-deploy-retrieve 5.0.0-orb.5 → 5.0.0

package/lib/src/registry/registryAccess.js

@@ -67,7 +67,28 @@ class RegistryAccess {
      * @returns An array of metadata type objects that require strict parent folder names
      */
     getStrictFolderTypes() {
-        return Object.values(this.registry.strictDirectoryNames).map((typeId) => this.registry.types[typeId]);
+        if (!this.strictFolderTypes) {
+            this.strictFolderTypes = Object.values(this.registry.strictDirectoryNames).map((typeId) => this.registry.types[typeId]);
+        }
+        return this.strictFolderTypes;
+    }
+    /**
+     * Query for the types that have the folderContentType property defined.
+     * E.g., reportFolder, dashboardFolder, documentFolder, emailFolder
+     * @see {@link MetadataType.folderContentType}
+     *
+     * @returns An array of metadata type objects that have folder content
+     */
+    getFolderContentTypes() {
+        if (!this.folderContentTypes) {
+            this.folderContentTypes = [];
+            for (const type of Object.values(this.registry.types)) {
+                if (type.folderContentType) {
+                    this.folderContentTypes.push(type);
+                }
+            }
+        }
+        return this.folderContentTypes;
     }
     get apiVersion() {
         return this.registry.apiVersion;

package/lib/src/registry/registryAccess.js.map

@@ -1 +1 @@
-{"version":3,"file":"registryAccess.js","sourceRoot":"","sources":["../../../src/registry/registryAccess.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAyD;AACzD,sCAA0C;AAG1C;;GAEG;AACH,MAAa,cAAc;IAGzB,YAAY,WAA6B,mBAAe;QACtD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,IAAY;;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,SAAS,SAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,QAAQ,0CAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3E,IAAI,SAAS,EAAE;gBACb,OAAO,SAAS,CAAC;aAClB;YACD,MAAM,IAAI,sBAAa,CAAC,qCAAqC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;SACvF;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,IAAI,sBAAa,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;SACjE;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED;;;;;OAKG;IACI,eAAe,CAAC,MAAc;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SACnC;IACH,CAAC;IAED;;;;;;OAMG;IACI,QAAQ,CAAC,SAA0C;QACxD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;OAKG;IACI,oBAAoB;QACzB,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAC1D,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CACxC,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;CACF;AApED,wCAoEC"}
+{"version":3,"file":"registryAccess.js","sourceRoot":"","sources":["../../../src/registry/registryAccess.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAyD;AACzD,sCAA0C;AAG1C;;GAEG;AACH,MAAa,cAAc;IAMzB,YAAY,WAA6B,mBAAe;QACtD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,IAAY;;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,SAAS,SAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,QAAQ,0CAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3E,IAAI,SAAS,EAAE;gBACb,OAAO,SAAS,CAAC;aAClB;YACD,MAAM,IAAI,sBAAa,CAAC,qCAAqC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;SACvF;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,IAAI,sBAAa,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;SACjE;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED;;;;;OAKG;IACI,eAAe,CAAC,MAAc;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SACnC;IACH,CAAC;IAED;;;;;;OAMG;IACI,QAAQ,CAAC,SAA0C;QACxD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;OAKG;IACI,oBAAoB;QACzB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAC5E,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CACxC,CAAC;SACH;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;;;;;;OAMG;IACI,qBAAqB;QAC1B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;YAC7B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACrD,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBAC1B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACpC;aACF;SACF;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;CACF;AA7FD,wCA6FC"}

package/lib/src/registry/types.d.ts

@@ -66,6 +66,10 @@ export interface MetadataType {
      * If the parent name should be ignored when constructing the type's fullName
      */
     ignoreParentName?: boolean;
+    /**
+     * The XML element name for the type in the xml file used for constructing child components.
+     */
+    xmlElementName?: string;
     /**
      * When converting deploying source, this will update the suffix in the output or temporary directory (metadata format)
      * Use this, along with additional suffix keys in the registry, to support incorrect suffixes from existing code
@@ -75,6 +79,20 @@ export interface MetadataType {
      * The xml attribute used as the unique identifier when parsing the xml
      */
     uniqueIdElement?: string;
+    /**
+     * Whether the component is supported by the Metadata API and therefore should be included within a manifest.
+     */
+    isAddressable?: boolean;
+    /**
+     * Whether or not components of the same type can be can be specified with the wildcard character, and by name in a manifest
+     *
+     ```
+     <members>*</members>
+     <members>Account</members>
+     <name>CustomObject</name>
+     ```
+     */
+    supportsWildcardAndName?: boolean;
     /**
      * Type definitions for child types, if the type has any.
      *
@@ -144,4 +162,33 @@ export declare const enum TransformerStrategy {
     StaticResource = "staticResource",
     NonDecomposed = "nonDecomposed"
 }
+/**
+ * Subset of an item from the Metadata Coverage Report
+ */
+export interface CoverageObjectType {
+    scratchDefinitions: {
+        professional: string;
+        group: string;
+        enterprise: string;
+        developer: string;
+    };
+    channels: {
+        metadataApi: boolean;
+        sourceTracking: boolean;
+        toolingApi: boolean;
+    };
+}
+/**
+ * The structure returned by the metadata coverage report
+ */
+export interface CoverageObject {
+    types: {
+        [key: string]: CoverageObjectType;
+    };
+    versions: {
+        selected: number;
+        max: number;
+        min: number;
+    };
+}
 export {};

package/lib/src/registry/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/registry/types.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AA0HH;;GAEG;AACH,IAAkB,qBASjB;AATD,WAAkB,qBAAqB;IACrC;;OAEG;IACH,8CAAqB,CAAA;IACrB;;OAEG;IACH,wDAA+B,CAAA;AACjC,CAAC,EATiB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAStC;AAED;;GAEG;AACH,IAAkB,qBAKjB;AALD,WAAkB,qBAAqB;IACrC;;OAEG;IACH,kDAAyB,CAAA;AAC3B,CAAC,EALiB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAKtC;AAED;;GAEG;AACH,IAAkB,mBAKjB;AALD,WAAkB,mBAAmB;IACnC,4CAAqB,CAAA;IACrB,gDAAyB,CAAA;IACzB,wDAAiC,CAAA;IACjC,sDAA+B,CAAA;AACjC,CAAC,EALiB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAKpC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/registry/types.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AA6IH;;GAEG;AACH,IAAkB,qBASjB;AATD,WAAkB,qBAAqB;IACrC;;OAEG;IACH,8CAAqB,CAAA;IACrB;;OAEG;IACH,wDAA+B,CAAA;AACjC,CAAC,EATiB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAStC;AAED;;GAEG;AACH,IAAkB,qBAKjB;AALD,WAAkB,qBAAqB;IACrC;;OAEG;IACH,kDAAyB,CAAA;AAC3B,CAAC,EALiB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAKtC;AAED;;GAEG;AACH,IAAkB,mBAKjB;AALD,WAAkB,mBAAmB;IACnC,4CAAqB,CAAA;IACrB,gDAAyB,CAAA;IACzB,wDAAiC,CAAA;IACjC,sDAA+B,CAAA;AACjC,CAAC,EALiB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAKpC"}

package/lib/src/resolve/adapters/baseSourceAdapter.d.ts

@@ -40,6 +40,7 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
      */
     private parseAsContentMetadataXml;
     private parseAsFolderMetadataXml;
+    private calculateName;
     /**
      * Determine the related root metadata xml when the path given to `getComponent` isn't one.
      *

package/lib/src/resolve/adapters/baseSourceAdapter.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseSourceAdapter = void 0;
 const utils_1 = require("../../utils");
 const errors_1 = require("../../errors");
-const path_1 = require("../../utils/path");
 const forceIgnore_1 = require("../forceIgnore");
-const path_2 = require("path");
+const path_1 = require("path");
 const treeContainers_1 = require("../treeContainers");
 const sourceComponent_1 = require("../sourceComponent");
 const registry_1 = require("../../registry");
@@ -35,13 +34,13 @@ class BaseSourceAdapter {
         }
         let component;
         if (rootMetadata) {
-            const componentName = this.type.folderType
-                ? `${path_1.parentName(rootMetadata.path)}/${rootMetadata.fullName}`
-                : rootMetadata.fullName;
             component = new sourceComponent_1.SourceComponent({
-                name: componentName,
+                name: this.calculateName(rootMetadata),
                 type: this.type,
                 xml: rootMetadata.path,
+                parentType: this.type.folderType
+                    ? this.registry.getTypeByName(this.type.folderType)
+                    : undefined,
             }, this.tree, this.forceIgnore);
         }
         return this.populate(path, component, isResolvingSource);
@@ -64,9 +63,9 @@ class BaseSourceAdapter {
         if (metaXml) {
             let isRootMetadataXml = false;
             if (this.type.strictDirectoryName) {
-                const parentPath = path_2.dirname(path);
-                const typeDirName = path_2.basename(this.type.inFolder ? path_2.dirname(parentPath) : parentPath);
-                const nameMatchesParent = path_2.basename(parentPath) === metaXml.fullName;
+                const parentPath = path_1.dirname(path);
+                const typeDirName = path_1.basename(this.type.inFolder ? path_1.dirname(parentPath) : parentPath);
+                const nameMatchesParent = path_1.basename(parentPath) === metaXml.fullName;
                 const inTypeDir = typeDirName === this.type.directoryName;
                 // if the parent folder name matches the fullName OR parent folder name is
                 // metadata type's directory name, it's a root metadata xml.
@@ -95,25 +94,58 @@ class BaseSourceAdapter {
      * @param path File path of a metadata component
      */
     parseAsContentMetadataXml(path) {
-        const parentPath = path_2.dirname(path);
-        const parts = parentPath.split(path_2.sep);
+        // InFolder metadata can be nested more than 1 level beneath its
+        // associated directoryName.
+        if (this.type.inFolder) {
+            const fullName = utils_1.parseNestedFullName(path, this.type.directoryName);
+            if (fullName) {
+                return { fullName, suffix: this.type.suffix, path };
+            }
+        }
+        const parentPath = path_1.dirname(path);
+        const parts = parentPath.split(path_1.sep);
         const typeFolderIndex = parts.lastIndexOf(this.type.directoryName);
-        const allowedIndex = this.type.inFolder ? parts.length - 2 : parts.length - 1;
+        // nestedTypes (ex: territory2) have a folderType equal to their type but are themselves
+        // in a folder per metadata item, with child folders for rules/territories
+        const allowedIndex = this.type.folderType === this.type.id ? parts.length - 2 : parts.length - 1;
         if (typeFolderIndex !== allowedIndex) {
             return undefined;
         }
-        const match = path_2.basename(path).match(/(.+)\.(.+)/);
+        const match = path_1.basename(path).match(/(.+)\.(.+)/);
         if (match && this.type.suffix === match[2]) {
             return { fullName: match[1], suffix: match[2], path: path };
         }
     }
     parseAsFolderMetadataXml(fsPath) {
-        const match = path_2.basename(fsPath).match(/(.+)-meta\.xml$/);
-        const parts = fsPath.split(path_2.sep);
+        const match = path_1.basename(fsPath).match(/(.+)-meta\.xml$/);
+        const parts = fsPath.split(path_1.sep);
         if (match && !match[1].includes('.') && parts.length > 1) {
             return { fullName: match[1], suffix: undefined, path: fsPath };
         }
     }
+    // Given a MetadataXml, build a fullName from the path and type.
+    calculateName(rootMetadata) {
+        const { directoryName, inFolder, folderType, folderContentType } = this.type;
+        // inFolder types (report, dashboard, emailTemplate, document) and their folder
+        // container types (reportFolder, dashboardFolder, emailFolder, documentFolder)
+        if (inFolder || folderContentType) {
+            return utils_1.parseNestedFullName(rootMetadata.path, directoryName);
+        }
+        // not using folders?  then name is fullname
+        if (!folderType) {
+            return rootMetadata.fullName;
+        }
+        const grandparentType = this.registry.getTypeByName(folderType);
+        // type is nested inside another type (ex: Territory2Model).  So the names are modelName.ruleName or modelName.territoryName
+        if (grandparentType.folderType && grandparentType.folderType !== this.type.id) {
+            const splits = rootMetadata.path.split(path_1.sep);
+            return `${splits[splits.indexOf(grandparentType.directoryName) + 1]}.${rootMetadata.fullName}`;
+        }
+        // this is the top level of nested types (ex: in a Territory2Model, the Territory2Model)
+        if (grandparentType.folderType === this.type.id) {
+            return rootMetadata.fullName;
+        }
+    }
 }
 exports.BaseSourceAdapter = BaseSourceAdapter;
 //# sourceMappingURL=baseSourceAdapter.js.map

package/lib/src/resolve/adapters/baseSourceAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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"}

package/lib/src/resolve/adapters/decomposedSourceAdapter.js

@@ -76,7 +76,8 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
         if (metaXml) {
             const pathToContent = this.trimPathToContent(trigger);
             const childTypeId = this.type.children.suffixes[metaXml.suffix];
-            const triggerIsAChild = !!childTypeId;
+            // If the child is explicitly not addressable, return the parent SourceComponent.
+            const triggerIsAChild = !!childTypeId && this.type.children.types[childTypeId].isAddressable !== false;
             const strategy = this.type.strategies.decomposition;
             if (triggerIsAChild &&
                 (strategy === "folderPerType" /* FolderPerType */ || isResolvingSource)) {

package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":"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"}

package/lib/src/resolve/forceIgnore.d.ts

@@ -3,9 +3,7 @@ export declare class ForceIgnore {
     static readonly FILE_NAME = ".forceignore";
     private readonly parser;
     private readonly forceIgnoreDirectory;
-    private readonly gitignoreParser;
     private readonly contents?;
-    private readonly useNewParser;
     private DEFAULT_IGNORE;
     constructor(forceIgnorePath?: string);
     /**
@@ -18,7 +16,4 @@ export declare class ForceIgnore {
     static findAndCreate(seed: SourcePath): ForceIgnore;
     denies(fsPath: SourcePath): boolean;
     accepts(fsPath: SourcePath): boolean;
-    private parseContents;
-    private resolveConflict;
-    private emitWarning;
 }

package/lib/src/resolve/forceIgnore.js

@@ -9,13 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ForceIgnore = void 0;
 const index_1 = require("ignore/index");
 const path_1 = require("path");
-const fs_1 = require("fs");
+const graceful_fs_1 = require("graceful-fs");
 const fileSystemHandler_1 = require("../utils/fileSystemHandler");
-// @ts-ignore this doesn't have typings
-const gitignoreParser = require("gitignore-parser");
-const core_1 = require("@salesforce/core");
-let warn = true;
-const troubleEmittedForPattern = new Set();
 class ForceIgnore {
     constructor(forceIgnorePath = '') {
         this.DEFAULT_IGNORE = [
@@ -25,18 +20,13 @@ class ForceIgnore {
             '**/package2-manifest.json',
         ];
         try {
-            this.contents = fs_1.readFileSync(forceIgnorePath, 'utf-8');
-            // add the default ignore paths, and then parse the .forceignore file
-            // DO NOT CALL parseContents FOR THE NEW PARSER
-            // the new library handles it's own unix/windows file path separators, let it handle it
-            this.parser = index_1.default().add(`${this.contents}\n${this.DEFAULT_IGNORE.join('\n')}`);
-            // TODO: START REMOVE AFTER GITIGNORE-PARSER DEPRECATED
-            // add the default and send to the old gitignore-parser
-            this.gitignoreParser = gitignoreParser.compile(this.parseContents(this.contents));
-            this.forceIgnoreDirectory = path_1.dirname(forceIgnorePath);
-            // read the file to determine which parser to use
-            this.useNewParser = this.contents.includes('# .forceignore v2');
-            // END REMOVE
+            this.contents = graceful_fs_1.readFileSync(forceIgnorePath, 'utf-8');
+            // check if file `.forceignore` exists
+            if (this.contents !== undefined) {
+                // add the default ignore paths, and then parse the .forceignore file
+                this.parser = index_1.default().add(`${this.contents}\n${this.DEFAULT_IGNORE.join('\n')}`);
+                this.forceIgnoreDirectory = path_1.dirname(forceIgnorePath);
+            }
         }
         catch (e) {
             // TODO: log no force ignore
@@ -59,18 +49,7 @@ class ForceIgnore {
     }
     denies(fsPath) {
         try {
-            // AFTER GITIGNORE-PARSER DEPRECATED, change this to `return this.parser.ignores(relative(this.forceIgnoreDirectory, fsPath));`
-            let denies = false;
-            let fctResult = false;
-            // if there's a parser, and we're not trying to .forceignore the .forceignore
-            const relativePath = path_1.relative(this.forceIgnoreDirectory, fsPath);
-            if (this.parser && this.gitignoreParser && !!relativePath) {
-                denies = this.parser.ignores(relativePath);
-                fctResult = this.gitignoreParser.denies(relativePath);
-                // send to look for differences, analytics
-                this.resolveConflict(denies, fctResult, relativePath);
-            }
-            return this.useNewParser ? denies : fctResult;
+            return this.parser.ignores(path_1.relative(this.forceIgnoreDirectory, fsPath));
         }
         catch (e) {
             return false;
@@ -78,72 +57,12 @@ class ForceIgnore {
     }
     accepts(fsPath) {
         try {
-            // AFTER GITIGNORE-PARSER DEPRECATED, change this to `return !this.parser.ignores(relative(this.forceIgnoreDirectory, fsPath));`
-            let accepts = true;
-            let fctResult = true;
-            const relativePath = path_1.relative(this.forceIgnoreDirectory, fsPath);
-            if (this.parser && this.gitignoreParser && !!relativePath) {
-                accepts = !this.parser.ignores(relativePath);
-                fctResult = this.gitignoreParser.accepts(relativePath);
-                // send to look for differences, analytics
-                this.resolveConflict(accepts, fctResult, relativePath);
-            }
-            return this.useNewParser ? accepts : fctResult;
+            return !this.parser.ignores(path_1.relative(this.forceIgnoreDirectory, fsPath));
         }
         catch (e) {
             return true;
         }
     }
-    // REMOVE THIS AFTER GITIGNORE-PARSER DEPRECATED
-    parseContents(contents) {
-        return contents
-            .split('\n')
-            .map((line) => line.trim())
-            .map((line) => line.replace(/[\\\/]/g, path_1.sep))
-            .map((line) => line.replace(/^\\/, ''))
-            .join('\n');
-    }
-    // AFTER GITIGNORE-PARSER DEPRECATED, remove this method
-    resolveConflict(newLibraryResults, oldLibraryResults, fsPath) {
-        const ignoreItems = this.contents.split('\n');
-        const troubledIgnoreLines = new Set();
-        if (newLibraryResults !== oldLibraryResults && ignoreItems) {
-            ignoreItems
-                .filter((ignoreItem) => ignoreItem.length)
-                .forEach((ignoreItem) => {
-                // we need to run the both of the compilers for a single line to find the problem entry
-                const gitignoreResult = gitignoreParser
-                    .compile(this.parseContents(ignoreItem))
-                    .accepts(fsPath);
-                const ignoreResult = !index_1.default().add([ignoreItem]).ignores(fsPath);
-                // print the warning only once per forceignore line item
-                if (ignoreResult !== gitignoreResult && !troubledIgnoreLines.has(ignoreItem)) {
-                    // only show the warning once, it could come from denies() or accepts()
-                    if (warn) {
-                        warn = false;
-                        this.emitWarning('We\'re replacing the current ".forceignore" parser with one that uses the same patterns as "git" uses with ".gitignore". Until we remove the old one, both parsers are available. But we recommend you start using the new parser soon by adding this line to the top of your ".forceignore" file:  "# .forceignore v2". Read about the new ".gitgnore" pattern format here: https://git-scm.com/docs/gitignore. Then fix the following lines in your ".forceignore" file because they don\'t adhere to the new formatting rules.');
-                    }
-                    if (!troubleEmittedForPattern.has(ignoreItem)) {
-                        troubleEmittedForPattern.add(ignoreItem);
-                        this.emitWarning('\t' + ignoreItem);
-                    }
-                }
-                troubledIgnoreLines.add(ignoreItem);
-            });
-            // send analytics, if they exist.
-            core_1.Lifecycle.getInstance().emit('telemetry', {
-                eventName: 'FORCE_IGNORE_DIFFERENCE',
-                content: this.contents,
-                oldLibraryResults,
-                newLibraryResults,
-                ignoreLines: Array.from(troubledIgnoreLines),
-                file: fsPath,
-            });
-        }
-    }
-    emitWarning(warning) {
-        process.emitWarning(warning);
-    }
 }
 exports.ForceIgnore = ForceIgnore;
 ForceIgnore.FILE_NAME = '.forceignore';

package/lib/src/resolve/forceIgnore.js.map

@@ -1 +1 @@
-{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,wCAA8C;AAC9C,+BAAoD;AACpD,2BAAkC;AAElC,kEAAsD;AACtD,uCAAuC;AACvC,oDAAoD;AACpD,2CAA6C;AAE7C,IAAI,IAAI,GAAG,IAAI,CAAC;AAChB,MAAM,wBAAwB,GAAG,IAAI,GAAG,EAAU,CAAC;AAEnD,MAAa,WAAW;IAgBtB,YAAmB,eAAe,GAAG,EAAE;QAP/B,mBAAc,GAAa;YACjC,UAAU;YACV,OAAO;YACP,6BAA6B;YAC7B,2BAA2B;SAC5B,CAAC;QAGA,IAAI;YACF,IAAI,CAAC,QAAQ,GAAG,iBAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACvD,qEAAqE;YACrE,+CAA+C;YAC/C,uFAAuF;YACvF,IAAI,CAAC,MAAM,GAAG,eAAM,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClF,uDAAuD;YACvD,uDAAuD;YACvD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,oBAAoB,GAAG,cAAO,CAAC,eAAe,CAAC,CAAC;YAErD,iDAAiD;YACjD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;YAChE,aAAa;SACd;QAAC,OAAO,CAAC,EAAE;YACV,4BAA4B;SAC7B;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,IAAgB;QAC1C,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAClC,MAAM,iBAAiB,GAAG,4BAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,iBAAiB,EAAE;YACrB,wBAAwB,GAAG,WAAI,CAAC,cAAO,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;SACpF;QACD,OAAO,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,IAAI;YACF,+HAA+H;YAC/H,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,IAAI,SAAS,GAAG,KAAK,CAAC;YACtB,6EAA6E;YAC7E,MAAM,YAAY,GAAG,eAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;YACjE,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,YAAY,EAAE;gBACzD,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC3C,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACtD,0CAA0C;gBAC1C,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;aACvD;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;SAC/C;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,OAAO,CAAC,MAAkB;QAC/B,IAAI;YACF,gIAAgI;YAChI,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,MAAM,YAAY,GAAG,eAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;YACjE,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,YAAY,EAAE;gBACzD,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC7C,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBACvD,0CAA0C;gBAC1C,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;aACxD;YAED,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;SAChD;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,gDAAgD;IACxC,aAAa,CAAC,QAAgB;QACpC,OAAO,QAAQ;aACZ,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC1B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAG,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;aACtC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,wDAAwD;IAChD,eAAe,CACrB,iBAA0B,EAC1B,iBAA0B,EAC1B,MAAc;QAEd,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,mBAAmB,GAAgB,IAAI,GAAG,EAAU,CAAC;QAE3D,IAAI,iBAAiB,KAAK,iBAAiB,IAAI,WAAW,EAAE;YAC1D,WAAW;iBACR,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;iBACzC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;gBACtB,uFAAuF;gBACvF,MAAM,eAAe,GAAG,eAAe;qBACpC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;qBACvC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACnB,MAAM,YAAY,GAAG,CAAC,eAAM,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACjE,wDAAwD;gBACxD,IAAI,YAAY,KAAK,eAAe,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;oBAC5E,uEAAuE;oBACvE,IAAI,IAAI,EAAE;wBACR,IAAI,GAAG,KAAK,CAAC;wBACb,IAAI,CAAC,WAAW,CACd,mgBAAmgB,CACpgB,CAAC;qBACH;oBACD,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;wBAC7C,wBAAwB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBACzC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC;qBACrC;iBACF;gBACD,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;YAEL,iCAAiC;YACjC,gBAAS,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;gBACxC,SAAS,EAAE,yBAAyB;gBACpC,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,iBAAiB;gBACjB,iBAAiB;gBACjB,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;gBAC5C,IAAI,EAAE,MAAM;aACb,CAAC,CAAC;SACJ;IACH,CAAC;IACO,WAAW,CAAC,OAAe;QACjC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;;AApJH,kCAqJC;AApJwB,qBAAS,GAAG,cAAc,CAAC"}
+{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,wCAA8C;AAC9C,+BAA+C;AAC/C,6CAA2C;AAE3C,kEAAsD;AAEtD,MAAa,WAAW;IAatB,YAAmB,eAAe,GAAG,EAAE;QAP/B,mBAAc,GAAa;YACjC,UAAU;YACV,OAAO;YACP,6BAA6B;YAC7B,2BAA2B;SAC5B,CAAC;QAGA,IAAI;YACF,IAAI,CAAC,QAAQ,GAAG,0BAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACvD,sCAAsC;YACtC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAC/B,qEAAqE;gBACrE,IAAI,CAAC,MAAM,GAAG,eAAM,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAClF,IAAI,CAAC,oBAAoB,GAAG,cAAO,CAAC,eAAe,CAAC,CAAC;aACtD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,4BAA4B;SAC7B;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,IAAgB;QAC1C,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAClC,MAAM,iBAAiB,GAAG,4BAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,iBAAiB,EAAE;YACrB,wBAAwB,GAAG,WAAI,CAAC,cAAO,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;SACpF;QACD,OAAO,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,IAAI;YACF,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SACzE;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,OAAO,CAAC,MAAkB;QAC/B,IAAI;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SAC1E;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;;AAzDH,kCA0DC;AAzDwB,qBAAS,GAAG,cAAc,CAAC"}

package/lib/src/resolve/manifestResolver.d.ts

@@ -22,4 +22,5 @@ export declare class ManifestResolver {
     private registry;
     constructor(tree?: TreeContainer, registry?: RegistryAccess);
     resolve(manifestPath: string): Promise<ResolveManifestResult>;
+    private isNestedInFolder;
 }

package/lib/src/resolve/manifestResolver.js

@@ -39,18 +39,40 @@ class ManifestResolver {
             const apiVersion = parsedManifest.version;
             for (const typeMembers of packageTypeMembers) {
                 const typeName = typeMembers.name;
-                for (const fullName of utils_1.normalizeToArray(typeMembers.members)) {
-                    let type = this.registry.getTypeByName(typeName);
-                    // if there is no / delimiter and it's a type in folders, infer folder component
-                    if (type.folderType && !fullName.includes('/')) {
-                        type = this.registry.getTypeByName(type.folderType);
+                const type = this.registry.getTypeByName(typeName);
+                const parentType = type.folderType ? this.registry.getTypeByName(type.folderType) : undefined;
+                const members = utils_1.normalizeToArray(typeMembers.members);
+                for (const fullName of members) {
+                    let mdType = type;
+                    if (this.isNestedInFolder(fullName, type, parentType, members)) {
+                        mdType = parentType;
                     }
-                    components.push({ fullName, type });
+                    components.push({ fullName, type: mdType });
                 }
             }
             return { components, apiVersion };
         });
     }
+    // Use the folderType instead of the type from the manifest when:
+    //  1. InFolder types: (report, dashboard, emailTemplate, document)
+    //    1a. type.inFolder === true (from registry.json) AND
+    //    1b. The fullName doesn't contain a forward slash character AND
+    //    1c. The fullName with a slash appended is contained in another member entry
+    // OR
+    //  2. Non-InFolder, folder types: (territory2, territory2Model, territory2Type, territory2Rule)
+    //    2a. type.inFolder !== true (from registry.json) AND
+    //    2b. type.folderType has a value (from registry.json) AND
+    //    2c. This type's parent type has a folderType that doesn't match its ID.
+    isNestedInFolder(fullName, type, parentType, members) {
+        // Quick short-circuit for non-folderTypes
+        if (!type.folderType) {
+            return false;
+        }
+        const isInFolderType = type.inFolder;
+        const isNestedInFolder = !fullName.includes('/') || members.some((m) => m.includes(`${fullName}/`));
+        const isNonMatchingFolder = parentType && parentType.folderType !== parentType.id;
+        return (isInFolderType && isNestedInFolder) || (!isInFolderType && isNonMatchingFolder);
+    }
 }
 exports.ManifestResolver = ManifestResolver;
 //# sourceMappingURL=manifestResolver.js.map

package/lib/src/resolve/manifestResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifestResolver.js","sourceRoot":"","sources":["../../../src/resolve/manifestResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;AAEH,0CAA6C;AAC7C,qDAAsE;AAEtE,qDAAoD;AACpD,oCAA4C;AA4B5C;;GAEG;AACH,MAAa,gBAAgB;IAI3B,YAAY,OAAsB,IAAI,oCAAmB,EAAE,EAAE,QAAQ,GAAG,IAAI,yBAAc,EAAE;QAC1F,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEY,OAAO,CAAC,YAAoB;;YACvC,MAAM,UAAU,GAAwB,EAAE,CAAC;YAE3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAEpD,MAAM,cAAc,GAA0B,uBAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACtE,SAAS,EAAE,CAAC,SAAS,CAAC;aACvB,CAAC,CAAC,OAAO,CAAC;YACX,MAAM,kBAAkB,GAAG,wBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAClE,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC;YAE1C,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE;gBAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;gBAClC,KAAK,MAAM,QAAQ,IAAI,wBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;oBAC5D,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACjD,gFAAgF;oBAChF,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBAC9C,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;qBACrD;oBACD,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;iBACrC;aACF;YAED,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;QACpC,CAAC;KAAA;CACF;AAlCD,4CAkCC"}
+{"version":3,"file":"manifestResolver.js","sourceRoot":"","sources":["../../../src/resolve/manifestResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;AAEH,0CAA2D;AAC3D,qDAAsE;AAEtE,qDAAoD;AACpD,oCAA4C;AA4B5C;;GAEG;AACH,MAAa,gBAAgB;IAI3B,YAAY,OAAsB,IAAI,oCAAmB,EAAE,EAAE,QAAQ,GAAG,IAAI,yBAAc,EAAE;QAC1F,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEY,OAAO,CAAC,YAAoB;;YACvC,MAAM,UAAU,GAAwB,EAAE,CAAC;YAE3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAEpD,MAAM,cAAc,GAA0B,uBAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACtE,SAAS,EAAE,CAAC,SAAS,CAAC;aACvB,CAAC,CAAC,OAAO,CAAC;YACX,MAAM,kBAAkB,GAAG,wBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAClE,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC;YAE1C,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE;gBAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACnD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9F,MAAM,OAAO,GAAG,wBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBAEtD,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE;oBAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;oBAClB,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;wBAC9D,MAAM,GAAG,UAAU,CAAC;qBACrB;oBACD,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;iBAC7C;aACF;YAED,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;QACpC,CAAC;KAAA;IAED,iEAAiE;IACjE,mEAAmE;IACnE,yDAAyD;IACzD,oEAAoE;IACpE,iFAAiF;IACjF,KAAK;IACL,gGAAgG;IAChG,yDAAyD;IACzD,8DAA8D;IAC9D,6EAA6E;IACrE,gBAAgB,CACtB,QAAgB,EAChB,IAAkB,EAClB,UAAwB,EACxB,OAAiB;QAEjB,0CAA0C;QAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;QACrC,MAAM,gBAAgB,GACpB,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC;QAC7E,MAAM,mBAAmB,GAAG,UAAU,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC;QAElF,OAAO,CAAC,cAAc,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,cAAc,IAAI,mBAAmB,CAAC,CAAC;IAC1F,CAAC;CACF;AAlED,4CAkEC"}

package/lib/src/resolve/metadataResolver.d.ts

@@ -7,16 +7,18 @@ import { ComponentSet } from '../collections';
  * @internal
  */
 export declare class MetadataResolver {
+    private registry;
+    private tree;
+    private useFsForceIgnore;
     forceIgnoredPaths: Set<string>;
     private forceIgnore;
     private sourceAdapterFactory;
-    private tree;
-    private registry;
+    private folderContentTypeDirNames;
     /**
      * @param registry Custom registry data
      * @param tree `TreeContainer` to traverse with
      */
-    constructor(registry?: RegistryAccess, tree?: TreeContainer);
+    constructor(registry?: RegistryAccess, tree?: TreeContainer, useFsForceIgnore?: boolean);
     /**
      * Get the metadata component(s) from a file path.
      *
@@ -49,9 +51,11 @@ export declare class MetadataResolver {
      * @param fsPath File path of a potential content metadata file
      */
     private parseAsContentMetadataXml;
+    private getFolderContentTypeDirNames;
     /**
      * Identify metadata xml for a folder component:
      *    .../email/TestFolder-meta.xml
+     *    .../reports/foo/bar-meta.xml
      *
      * Do not match this pattern:
      *    .../tabs/TestFolder.tab-meta.xml

package/lib/src/resolve/metadataResolver.js

@@ -23,9 +23,10 @@ class MetadataResolver {
      * @param registry Custom registry data
      * @param tree `TreeContainer` to traverse with
      */
-    constructor(registry = new registryAccess_1.RegistryAccess(), tree = new treeContainers_1.NodeFSTreeContainer()) {
+    constructor(registry = new registryAccess_1.RegistryAccess(), tree = new treeContainers_1.NodeFSTreeContainer(), useFsForceIgnore = true) {
         this.registry = registry;
         this.tree = tree;
+        this.useFsForceIgnore = useFsForceIgnore;
         this.sourceAdapterFactory = new sourceAdapterFactory_1.SourceAdapterFactory(this.registry, tree);
         this.forceIgnoredPaths = new Set();
     }
@@ -39,7 +40,10 @@ class MetadataResolver {
         if (!this.tree.exists(fsPath)) {
             throw new errors_1.TypeInferenceError('error_path_not_found', fsPath);
         }
-        this.forceIgnore = forceIgnore_1.ForceIgnore.findAndCreate(fsPath);
+        // use the default ignore if we aren't using a real one
+        this.forceIgnore = this.useFsForceIgnore
+            ? forceIgnore_1.ForceIgnore.findAndCreate(fsPath)
+            : new forceIgnore_1.ForceIgnore();
         if (this.tree.isDirectory(fsPath) && !this.resolveDirectoryAsComponent(fsPath)) {
             return this.getComponentsFromPathRecursive(fsPath, inclusiveFilter);
         }
@@ -199,19 +203,40 @@ class MetadataResolver {
     parseAsContentMetadataXml(fsPath) {
         return !!this.registry.getTypeBySuffix(utils_1.extName(fsPath));
     }
+    // Get the array of directoryNames for types that have folderContentType
+    getFolderContentTypeDirNames() {
+        if (!this.folderContentTypeDirNames) {
+            this.folderContentTypeDirNames = this.registry
+                .getFolderContentTypes()
+                .map((t) => t.directoryName);
+        }
+        return this.folderContentTypeDirNames;
+    }
     /**
      * Identify metadata xml for a folder component:
      *    .../email/TestFolder-meta.xml
+     *    .../reports/foo/bar-meta.xml
      *
      * Do not match this pattern:
      *    .../tabs/TestFolder.tab-meta.xml
      */
     parseAsFolderMetadataXml(fsPath) {
+        let folderName;
         const match = path_1.basename(fsPath).match(/(.+)-meta\.xml/);
         if (match && !match[1].includes('.')) {
             const parts = fsPath.split(path_1.sep);
-            return parts.length > 1 ? parts[parts.length - 2] : undefined;
+            if (parts.length > 1) {
+                const folderContentTypesDirs = this.getFolderContentTypeDirNames();
+                // check if the path contains a folder content name as a directory
+                // e.g., `/reports/` and if it does return that folder name.
+                folderContentTypesDirs.some((dirName) => {
+                    if (fsPath.includes(`${path_1.sep}${dirName}${path_1.sep}`)) {
+                        folderName = dirName;
+                    }
+                });
+            }
         }
+        return folderName;
     }
     isMetadata(fsPath) {
         return (!!utils_1.parseMetadataXml(fsPath) ||