@salesforce/source-deploy-retrieve 5.0.0-orb.2 → 5.0.2

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

@@ -1 +1 @@
-{"version":3,"file":"mixedContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/mixedContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2DAAwD;AACxD,+BAA8C;AAC9C,yCAAwD;AACxD,2CAA4C;AAE5C,wDAAqD;AAErD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,yBAA0B,SAAQ,qCAAiB;IACpD,sBAAsB,CAAC,OAAmB;QAClD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;SAC9E;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA2B;QACjE,IAAI,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,WAAW,MAAK,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA,EAAE;YAClC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAQ,CAAC,WAAW,CAAC,EAAE,cAAO,CAAC,WAAW,CAAC,CAAC,CAAC;SACtF;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAClC,MAAM,IAAI,iCAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACxD;QAED,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;SACjC;aAAM;YACL,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,eAAQ,CAAC,WAAW,CAAC;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,WAAW;aACrB,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACO,iBAAiB,CAAC,IAAgB;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACxF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IACK,uBAAuB,CAAC,IAAgB;QAC9C,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,cAAO,CAAC,eAAe,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,eAAQ,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC3E,CAAC;CACF;AAhED,8DAgEC"}
+{"version":3,"file":"mixedContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/mixedContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAC9C,yCAAwD;AACxD,2CAA4C;AAE5C,wDAAqD;AACrD,2DAAwD;AAExD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,yBAA0B,SAAQ,qCAAiB;IACpD,sBAAsB,CAAC,OAAmB;QAClD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAA,eAAQ,EAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;SAC9E;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA2B;QACjE,IAAI,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,WAAW,MAAK,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA,EAAE;YAClC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,EAAE,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC,CAAC;SACtF;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAClC,MAAM,IAAI,iCAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACxD;QAED,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;SACjC;aAAM;YACL,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,WAAW;aACrB,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACO,iBAAiB,CAAC,IAAgB;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACxF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IACK,uBAAuB,CAAC,IAAgB;QAC9C,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,eAAQ,EAAC,eAAe,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC3E,CAAC;CACF;AAhED,8DAgEC"}

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceAdapterFactory = void 0;
+const errors_1 = require("../../errors");
+const forceIgnore_1 = require("../forceIgnore");
 const bundleSourceAdapter_1 = require("./bundleSourceAdapter");
 const decomposedSourceAdapter_1 = require("./decomposedSourceAdapter");
 const matchingContentSourceAdapter_1 = require("./matchingContentSourceAdapter");
 const mixedContentSourceAdapter_1 = require("./mixedContentSourceAdapter");
 const defaultSourceAdapter_1 = require("./defaultSourceAdapter");
-const errors_1 = require("../../errors");
-const forceIgnore_1 = require("../forceIgnore");
 var AdapterId;
 (function (AdapterId) {
     AdapterId["Bundle"] = "bundle";

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

@@ -1 +1 @@
-{"version":3,"file":"sourceAdapterFactory.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/sourceAdapterFactory.ts"],"names":[],"mappings":";;;AAOA,+DAA4D;AAC5D,uEAAoE;AACpE,iFAA8E;AAC9E,2EAAwE;AACxE,iEAA8D;AAC9D,yCAA6C;AAC7C,gDAA6C;AAI7C,IAAK,SAMJ;AAND,WAAK,SAAS;IACZ,8BAAiB,CAAA;IACjB,sCAAyB,CAAA;IACzB,gCAAmB,CAAA;IACnB,wDAA2C,CAAA;IAC3C,0CAA6B,CAAA;AAC/B,CAAC,EANI,SAAS,KAAT,SAAS,QAMb;AAED,MAAa,oBAAoB;IAI/B,YAAY,QAAwB,EAAE,IAAmB;QACvD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,UAAU,CAAC,IAAkB,EAAE,WAAW,GAAG,IAAI,yBAAW,EAAE;;QACnE,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAoB,CAAC;QACxD,QAAQ,SAAS,EAAE;YACjB,KAAK,SAAS,CAAC,MAAM;gBACnB,OAAO,IAAI,yCAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9E,KAAK,SAAS,CAAC,UAAU;gBACvB,OAAO,IAAI,iDAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAClF,KAAK,SAAS,CAAC,mBAAmB;gBAChC,OAAO,IAAI,2DAA4B,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvF,KAAK,SAAS,CAAC,YAAY;gBACzB,OAAO,IAAI,qDAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACpF,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E,KAAK,SAAS;gBACZ,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E;gBACE,MAAM,IAAI,sBAAa,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5E;IACH,CAAC;CACF;AA5BD,oDA4BC"}
+{"version":3,"file":"sourceAdapterFactory.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/sourceAdapterFactory.ts"],"names":[],"mappings":";;;AAOA,yCAA6C;AAC7C,gDAA6C;AAG7C,+DAA4D;AAC5D,uEAAoE;AACpE,iFAA8E;AAC9E,2EAAwE;AACxE,iEAA8D;AAE9D,IAAK,SAMJ;AAND,WAAK,SAAS;IACZ,8BAAiB,CAAA;IACjB,sCAAyB,CAAA;IACzB,gCAAmB,CAAA;IACnB,wDAA2C,CAAA;IAC3C,0CAA6B,CAAA;AAC/B,CAAC,EANI,SAAS,KAAT,SAAS,QAMb;AAED,MAAa,oBAAoB;IAI/B,YAAmB,QAAwB,EAAE,IAAmB;QAC9D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,UAAU,CAAC,IAAkB,EAAE,WAAW,GAAG,IAAI,yBAAW,EAAE;;QACnE,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAoB,CAAC;QACxD,QAAQ,SAAS,EAAE;YACjB,KAAK,SAAS,CAAC,MAAM;gBACnB,OAAO,IAAI,yCAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9E,KAAK,SAAS,CAAC,UAAU;gBACvB,OAAO,IAAI,iDAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAClF,KAAK,SAAS,CAAC,mBAAmB;gBAChC,OAAO,IAAI,2DAA4B,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvF,KAAK,SAAS,CAAC,YAAY;gBACzB,OAAO,IAAI,qDAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACpF,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E,KAAK,SAAS;gBACZ,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E;gBACE,MAAM,IAAI,sBAAa,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5E;IACH,CAAC;CACF;AA5BD,oDA4BC"}

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

@@ -7,36 +7,21 @@
  */
 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 index_1 = require("ignore/index");
+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 = [
-            '**/*.dup',
-            '**/.*',
-            '**/package2-descriptor.json',
-            '**/package2-manifest.json',
-        ];
+        this.DEFAULT_IGNORE = ['**/*.dup', '**/.*', '**/package2-descriptor.json', '**/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 = (0, 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 = (0, index_1.default)().add(`${this.contents}\n${this.DEFAULT_IGNORE.join('\n')}`);
+                this.forceIgnoreDirectory = (0, path_1.dirname)(forceIgnorePath);
+            }
         }
         catch (e) {
             // TODO: log no force ignore
@@ -51,26 +36,15 @@ class ForceIgnore {
      */
     static findAndCreate(seed) {
         let potentialForceIgnorePath = '';
-        const projectConfigPath = fileSystemHandler_1.searchUp(seed, ForceIgnore.FILE_NAME);
+        const projectConfigPath = (0, fileSystemHandler_1.searchUp)(seed, ForceIgnore.FILE_NAME);
         if (projectConfigPath) {
-            potentialForceIgnorePath = path_1.join(path_1.dirname(projectConfigPath), ForceIgnore.FILE_NAME);
+            potentialForceIgnorePath = (0, path_1.join)((0, path_1.dirname)(projectConfigPath), ForceIgnore.FILE_NAME);
         }
         return new ForceIgnore(potentialForceIgnorePath);
     }
     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((0, path_1.relative)(this.forceIgnoreDirectory, fsPath));
         }
         catch (e) {
             return false;
@@ -78,72 +52,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((0, 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":"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"}
+{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA+C;AAC/C,wCAA8C;AAC9C,6CAA2C;AAE3C,kEAAsD;AAEtD,MAAa,WAAW;IAQtB,YAAmB,eAAe,GAAG,EAAE;QAF/B,mBAAc,GAAa,CAAC,UAAU,EAAE,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,CAAC,CAAC;QAGnH,IAAI;YACF,IAAI,CAAC,QAAQ,GAAG,IAAA,0BAAY,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACvD,sCAAsC;YACtC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAC/B,qEAAqE;gBACrE,IAAI,CAAC,MAAM,GAAG,IAAA,eAAM,GAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAClF,IAAI,CAAC,oBAAoB,GAAG,IAAA,cAAO,EAAC,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,IAAA,4BAAQ,EAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,iBAAiB,EAAE;YACrB,wBAAwB,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,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,IAAA,eAAQ,EAAC,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,IAAA,eAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SAC1E;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;;AApDH,kCAqDC;AApDwB,qBAAS,GAAG,cAAc,CAAC"}

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

@@ -1,6 +1,6 @@
 export { MetadataResolver } from './metadataResolver';
 export { ManifestResolver } from './manifestResolver';
-export { TreeContainer, NodeFSTreeContainer, VirtualTreeContainer, ZipTreeContainer, } from './treeContainers';
+export { TreeContainer, NodeFSTreeContainer, VirtualTreeContainer, ZipTreeContainer } from './treeContainers';
 export { SourceComponent } from './sourceComponent';
 export { MetadataComponent, MetadataMember, ComponentLike, MetadataXml, VirtualFile, VirtualDirectory, SourceAdapter, } from './types';
 export { ForceIgnore } from './forceIgnore';

package/lib/src/resolve/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ForceIgnore = exports.SourceComponent = exports.ZipTreeContainer = exports.VirtualTreeContainer = exports.NodeFSTreeContainer = exports.TreeContainer = exports.ManifestResolver = exports.MetadataResolver = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resolve/index.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,mDAK0B;AAJxB,+GAAA,aAAa,OAAA;AACb,qHAAA,mBAAmB,OAAA;AACnB,sHAAA,oBAAoB,OAAA;AACpB,kHAAA,gBAAgB,OAAA;AAElB,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AAUxB,6CAA4C;AAAnC,0GAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resolve/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,mDAA8G;AAArG,+GAAA,aAAa,OAAA;AAAE,qHAAA,mBAAmB,OAAA;AAAE,sHAAA,oBAAoB,OAAA;AAAE,kHAAA,gBAAgB,OAAA;AACnF,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AAUxB,6CAA4C;AAAnC,0GAAA,WAAW,OAAA"}

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

@@ -5,21 +5,12 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManifestResolver = void 0;
-const registry_1 = require("../registry");
-const treeContainers_1 = require("./treeContainers");
 const fast_xml_parser_1 = require("fast-xml-parser");
+const registry_1 = require("../registry");
 const utils_1 = require("../utils");
+const treeContainers_1 = require("./treeContainers");
 /**
  * Resolve MetadataComponents from a manifest file (package.xml)
  */
@@ -28,28 +19,48 @@ class ManifestResolver {
         this.tree = tree;
         this.registry = registry;
     }
-    resolve(manifestPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const components = [];
-            const file = yield this.tree.readFile(manifestPath);
-            const parsedManifest = fast_xml_parser_1.parse(file.toString(), {
-                stopNodes: ['version'],
-            }).Package;
-            const packageTypeMembers = utils_1.normalizeToArray(parsedManifest.types);
-            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);
-                    }
-                    components.push({ fullName, type });
+    async resolve(manifestPath) {
+        const components = [];
+        const file = await this.tree.readFile(manifestPath);
+        const parsedManifest = (0, fast_xml_parser_1.parse)(file.toString(), {
+            stopNodes: ['version'],
+        }).Package;
+        const packageTypeMembers = (0, utils_1.normalizeToArray)(parsedManifest.types);
+        const apiVersion = parsedManifest.version;
+        for (const typeMembers of packageTypeMembers) {
+            const typeName = typeMembers.name;
+            const type = this.registry.getTypeByName(typeName);
+            const parentType = type.folderType ? this.registry.getTypeByName(type.folderType) : undefined;
+            const members = (0, 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: mdType });
             }
-            return { components, apiVersion };
-        });
+        }
+        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 metadataRegistry.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 metadataRegistry.json) AND
+    //    2b. type.folderType has a value (from metadataRegistry.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;

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,qDAAoD;AACpD,0CAA2D;AAC3D,oCAA4C;AAC5C,qDAAsE;AA6BtE;;GAEG;AACH,MAAa,gBAAgB;IAI3B,YAAmB,OAAsB,IAAI,oCAAmB,EAAE,EAAE,QAAQ,GAAG,IAAI,yBAAc,EAAE;QACjG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,YAAoB;QACvC,MAAM,UAAU,GAAwB,EAAE,CAAC;QAE3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAEpD,MAAM,cAAc,GAClB,IAAA,uBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;YACxB,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CACF,CAAC,OAAO,CAAC;QACV,MAAM,kBAAkB,GAAG,IAAA,wBAAgB,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC;QAE1C,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE;YAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;YAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9F,MAAM,OAAO,GAAG,IAAA,wBAAgB,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAEtD,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE;gBAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;gBAClB,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;oBAC9D,MAAM,GAAG,UAAU,CAAC;iBACrB;gBACD,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;aAC7C;SACF;QAED,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACpC,CAAC;IAED,iEAAiE;IACjE,mEAAmE;IACnE,iEAAiE;IACjE,oEAAoE;IACpE,iFAAiF;IACjF,KAAK;IACL,gGAAgG;IAChG,iEAAiE;IACjE,sEAAsE;IACtE,6EAA6E;IACrE,gBAAgB,CAAC,QAAgB,EAAE,IAAkB,EAAE,UAAwB,EAAE,OAAiB;QACxG,0CAA0C;QAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;QACrC,MAAM,gBAAgB,GAAG,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;QACpG,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;AA9DD,4CA8DC"}

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

@@ -1,22 +1,25 @@
-import { SourceComponent } from './sourceComponent';
-import { TreeContainer } from './treeContainers';
 import { RegistryAccess } from '../registry/registryAccess';
 import { ComponentSet } from '../collections';
+import { SourceComponent } from './sourceComponent';
+import { TreeContainer } from './treeContainers';
 /**
  * Resolver for metadata type and component objects.
+ *
  * @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,12 +52,14 @@ 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
+     * .../email/TestFolder-meta.xml
+     * .../reports/foo/bar-meta.xml
      *
      * Do not match this pattern:
-     *    .../tabs/TestFolder.tab-meta.xml
+     * .../tabs/TestFolder.tab-meta.xml
      */
     private parseAsFolderMetadataXml;
     private isMetadata;

package/lib/src/resolve/metadataResolver.js

@@ -10,12 +10,13 @@ exports.MetadataResolver = void 0;
 const path_1 = require("path");
 const errors_1 = require("../errors");
 const utils_1 = require("../utils");
+const registryAccess_1 = require("../registry/registryAccess");
 const sourceAdapterFactory_1 = require("./adapters/sourceAdapterFactory");
 const forceIgnore_1 = require("./forceIgnore");
 const treeContainers_1 = require("./treeContainers");
-const registryAccess_1 = require("../registry/registryAccess");
 /**
  * Resolver for metadata type and component objects.
+ *
  * @internal
  */
 class MetadataResolver {
@@ -23,9 +24,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 +41,8 @@ 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);
         }
@@ -54,7 +57,7 @@ class MetadataResolver {
             return components;
         }
         for (const file of this.tree.readDirectory(dir)) {
-            const fsPath = path_1.join(dir, file);
+            const fsPath = (0, path_1.join)(dir, file);
             if (ignore.has(fsPath)) {
                 continue;
             }
@@ -86,15 +89,15 @@ class MetadataResolver {
                     }
                     // don't traverse further if not in a root type directory. performance optimization
                     // for mixed content types and ensures we don't add duplicates of the component.
-                    const typeDir = path_1.basename(path_1.dirname(component.type.inFolder ? path_1.dirname(fsPath) : fsPath));
+                    const typeDir = (0, path_1.basename)((0, path_1.dirname)(component.type.inFolder ? (0, path_1.dirname)(fsPath) : fsPath));
                     if (component.type.strictDirectoryName && typeDir !== component.type.directoryName) {
                         return components;
                     }
                 }
             }
         }
-        for (const dir of dirQueue) {
-            components.push(...this.getComponentsFromPathRecursive(dir, inclusiveFilter));
+        for (const directory of dirQueue) {
+            components.push(...this.getComponentsFromPathRecursive(directory, inclusiveFilter));
         }
         return components;
     }
@@ -124,7 +127,7 @@ class MetadataResolver {
      * @param fsPath File path of a potential metadata xml file
      */
     parseAsRootMetadataXml(fsPath) {
-        return !!utils_1.parseMetadataXml(fsPath);
+        return !!(0, utils_1.parseMetadataXml)(fsPath);
     }
     resolveType(fsPath) {
         let resolvedType;
@@ -135,7 +138,7 @@ class MetadataResolver {
                 // types with folders only have folder components living at the top level.
                 // if the fsPath is a folder component, let a future strategy deal with it
                 // const isFolderType = this.getTypeFromName(typeId).inFolder;
-                if (!type.inFolder || utils_1.parentName(fsPath) !== type.directoryName) {
+                if (!type.inFolder || (0, utils_1.parentName)(fsPath) !== type.directoryName) {
                     resolvedType = type;
                 }
                 break;
@@ -143,7 +146,7 @@ class MetadataResolver {
         }
         // attempt 2 - check if it's a metadata xml file
         if (!resolvedType) {
-            const parsedMetaXml = utils_1.parseMetadataXml(fsPath);
+            const parsedMetaXml = (0, utils_1.parseMetadataXml)(fsPath);
             if (parsedMetaXml) {
                 resolvedType = this.registry.getTypeBySuffix(parsedMetaXml.suffix);
             }
@@ -158,7 +161,7 @@ class MetadataResolver {
         }
         // attempt 3 - try treating the file extension name as a suffix
         if (!resolvedType) {
-            resolvedType = this.registry.getTypeBySuffix(utils_1.extName(fsPath));
+            resolvedType = this.registry.getTypeBySuffix((0, utils_1.extName)(fsPath));
         }
         return resolvedType;
     }
@@ -197,26 +200,43 @@ class MetadataResolver {
      * @param fsPath File path of a potential content metadata file
      */
     parseAsContentMetadataXml(fsPath) {
-        return !!this.registry.getTypeBySuffix(utils_1.extName(fsPath));
+        return !!this.registry.getTypeBySuffix((0, 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
+     * .../email/TestFolder-meta.xml
+     * .../reports/foo/bar-meta.xml
      *
      * Do not match this pattern:
-     *    .../tabs/TestFolder.tab-meta.xml
+     * .../tabs/TestFolder.tab-meta.xml
      */
     parseAsFolderMetadataXml(fsPath) {
-        const match = path_1.basename(fsPath).match(/(.+)-meta\.xml/);
+        let folderName;
+        const match = new RegExp(/(.+)-meta\.xml/).exec((0, path_1.basename)(fsPath));
         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) ||
-            this.parseAsContentMetadataXml(fsPath) ||
-            !!this.parseAsFolderMetadataXml(fsPath));
+        return (!!(0, utils_1.parseMetadataXml)(fsPath) || this.parseAsContentMetadataXml(fsPath) || !!this.parseAsFolderMetadataXml(fsPath));
     }
 }
 exports.MetadataResolver = MetadataResolver;

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

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