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

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

@@ -4,6 +4,8 @@ import { MetadataRegistry, MetadataType } from './types';
  */
 export declare class RegistryAccess {
     private registry;
+    private strictFolderTypes;
+    private folderContentTypes;
     constructor(registry?: MetadataRegistry);
     /**
      * Query a metadata type by its name.
@@ -29,10 +31,20 @@ export declare class RegistryAccess {
     findType(predicate: (type: MetadataType) => boolean): MetadataType;
     /**
      * Query the types that require a strict parent directory
+     *
      * @see {@link MetadataType.strictDirectoryName}
      *
      * @returns An array of metadata type objects that require strict parent folder names
      */
     getStrictFolderTypes(): MetadataType[];
+    /**
+     * 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(): MetadataType[];
     get apiVersion(): string;
 }

package/lib/src/registry/registryAccess.js

@@ -7,8 +7,8 @@ exports.RegistryAccess = void 0;
  * 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
  */
-const registry_1 = require("./registry");
 const errors_1 = require("../errors");
+const registry_1 = require("./registry");
 /**
  * Container for querying metadata registry data.
  */
@@ -62,12 +62,35 @@ class RegistryAccess {
     }
     /**
      * Query the types that require a strict parent directory
+     *
      * @see {@link MetadataType.strictDirectoryName}
      *
      * @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,sCAA0C;AAC1C,yCAAyD;AAGzD;;GAEG;AACH,MAAa,cAAc;IAMzB,YAAmB,WAA6B,mBAAe;QAC7D,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,GAAG,MAAA,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;;;;;;OAMG;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;;;;;;;OAOG;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,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;CACF;AA/FD,wCA+FC"}

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

@@ -6,39 +6,4 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransformerStrategy = exports.RecompositionStrategy = exports.DecompositionStrategy = void 0;
-/**
- * Strategy names for handling component decomposition.
- */
-var DecompositionStrategy;
-(function (DecompositionStrategy) {
-    /**
-     * Elements of child types are decomposed to the same folder the parent object is in.
-     */
-    DecompositionStrategy["TopLevel"] = "topLevel";
-    /**
-     * Elements of child types are decomposed into folders of their respective types.
-     */
-    DecompositionStrategy["FolderPerType"] = "folderPerType";
-})(DecompositionStrategy = exports.DecompositionStrategy || (exports.DecompositionStrategy = {}));
-/**
- * Strategy names for handling component recomposition.
- */
-var RecompositionStrategy;
-(function (RecompositionStrategy) {
-    /**
-     * The parent object should start as an empty object when recomposing the child types
-     */
-    RecompositionStrategy["StartEmpty"] = "startEmpty";
-})(RecompositionStrategy = exports.RecompositionStrategy || (exports.RecompositionStrategy = {}));
-/**
- * Strategy names for the type of transformation to use for metadata types.
- */
-var TransformerStrategy;
-(function (TransformerStrategy) {
-    TransformerStrategy["Standard"] = "standard";
-    TransformerStrategy["Decomposed"] = "decomposed";
-    TransformerStrategy["StaticResource"] = "staticResource";
-    TransformerStrategy["NonDecomposed"] = "nonDecomposed";
-})(TransformerStrategy = exports.TransformerStrategy || (exports.TransformerStrategy = {}));
 //# sourceMappingURL=types.js.map

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"}

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

@@ -1,4 +1,4 @@
-import { SourceAdapter, MetadataXml } from '../types';
+import { MetadataXml, SourceAdapter } from '../types';
 import { ForceIgnore } from '../forceIgnore';
 import { TreeContainer } from '../treeContainers';
 import { SourceComponent } from '../sourceComponent';
@@ -34,12 +34,13 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
      * for a component, parse the name and return it. This allows matching files in metadata
      * format such as:
      *
-     *   .../tabs/MyTab.tab
+     * .../tabs/MyTab.tab
      *
      * @param path File path of a metadata component
      */
     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

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseSourceAdapter = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * 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
+ */
+const path_1 = require("path");
 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 treeContainers_1 = require("../treeContainers");
 const sourceComponent_1 = require("../sourceComponent");
 const registry_1 = require("../../registry");
@@ -27,7 +32,7 @@ class BaseSourceAdapter {
         if (!rootMetadata) {
             const rootMetadataPath = this.getRootMetadataXmlPath(path);
             if (rootMetadataPath) {
-                rootMetadata = utils_1.parseMetadataXml(rootMetadataPath);
+                rootMetadata = (0, utils_1.parseMetadataXml)(rootMetadataPath);
             }
         }
         if (rootMetadata && this.forceIgnore.denies(rootMetadata.path)) {
@@ -35,13 +40,11 @@ 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);
@@ -60,13 +63,13 @@ class BaseSourceAdapter {
      * @param path File path of a metadata component
      */
     parseAsRootMetadataXml(path) {
-        const metaXml = utils_1.parseMetadataXml(path);
+        const metaXml = (0, utils_1.parseMetadataXml)(path);
         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 = (0, path_1.dirname)(path);
+                const typeDirName = (0, path_1.basename)(this.type.inFolder ? (0, path_1.dirname)(parentPath) : parentPath);
+                const nameMatchesParent = (0, 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.
@@ -90,30 +93,63 @@ class BaseSourceAdapter {
      * for a component, parse the name and return it. This allows matching files in metadata
      * format such as:
      *
-     *   .../tabs/MyTab.tab
+     * .../tabs/MyTab.tab
      *
      * @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 = (0, utils_1.parseNestedFullName)(path, this.type.directoryName);
+            if (fullName) {
+                return { fullName, suffix: this.type.suffix, path };
+            }
+        }
+        const parentPath = (0, 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 = new RegExp(/(.+)\.(.+)/).exec((0, path_1.basename)(path));
         if (match && this.type.suffix === match[2]) {
-            return { fullName: match[1], suffix: match[2], path: path };
+            return { fullName: match[1], suffix: match[2], path };
         }
     }
     parseAsFolderMetadataXml(fsPath) {
-        const match = path_2.basename(fsPath).match(/(.+)-meta\.xml$/);
-        const parts = fsPath.split(path_2.sep);
+        const match = new RegExp(/(.+)-meta\.xml$/).exec((0, path_1.basename)(fsPath));
+        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 (0, 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":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAE9C,uCAAoE;AACpE,yCAAqD;AACrD,gDAA6C;AAC7C,sDAAuE;AACvE,wDAAqD;AAErD,6CAA8D;AAE9D,MAAsB,iBAAiB;IAarC,YACE,IAAkB,EAClB,QAAQ,GAAG,IAAI,yBAAc,EAAE,EAC/B,cAA2B,IAAI,yBAAW,EAAE,EAC5C,OAAsB,IAAI,oCAAmB,EAAE;QAXjD;;;WAGG;QACO,cAAS,GAAG,KAAK,CAAC;QAClB,wBAAmB,GAAG,IAAI,CAAC;QAQnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,YAAY,CAAC,IAAgB,EAAE,iBAAiB,GAAG,IAAI;QAC5D,IAAI,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC3D,IAAI,gBAAgB,EAAE;gBACpB,YAAY,GAAG,IAAA,wBAAgB,EAAC,gBAAgB,CAAC,CAAC;aACnD;SACF;QACD,IAAI,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YAC9D,MAAM,IAAI,8BAAqB,CAAC,8BAA8B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;SAC5F;QAED,IAAI,SAA0B,CAAC;QAC/B,IAAI,YAAY,EAAE;YAChB,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;gBACtC,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,YAAY,CAAC,IAAI;gBACtB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;aACjG,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACI,wBAAwB;QAC7B,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED;;;;;;OAMG;IACO,sBAAsB,CAAC,IAAgB;QAC/C,MAAM,OAAO,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC;QACvC,IAAI,OAAO,EAAE;YACX,IAAI,iBAAiB,GAAG,KAAK,CAAC;YAC9B,IAAI,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBACjC,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBACpF,MAAM,iBAAiB,GAAG,IAAA,eAAQ,EAAC,UAAU,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC;gBACpE,MAAM,SAAS,GAAG,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;gBAC1D,0EAA0E;gBAC1E,4DAA4D;gBAC5D,iBAAiB,GAAG,iBAAiB,IAAI,SAAS,CAAC;aACpD;iBAAM;gBACL,iBAAiB,GAAG,IAAI,CAAC;aAC1B;YACD,OAAO,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;SAChD;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,iBAAiB,EAAE;YACrB,OAAO,iBAAiB,CAAC;SAC1B;QAED,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE;YACpC,OAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;SAC7C;IACH,CAAC;IAED;;;;;;;;OAQG;IACK,yBAAyB,CAAC,IAAgB;QAChD,gEAAgE;QAChE,4BAA4B;QAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACtB,MAAM,QAAQ,GAAG,IAAA,2BAAmB,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACpE,IAAI,QAAQ,EAAE;gBACZ,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;aACrD;SACF;QAED,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QACpC,MAAM,eAAe,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACnE,wFAAwF;QACxF,0EAA0E;QAC1E,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAEjG,IAAI,eAAe,KAAK,YAAY,EAAE;YACpC,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;YAC1C,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;SACvD;IACH,CAAC;IAEO,wBAAwB,CAAC,MAAkB;QACjD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAChC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACxD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAChE;IACH,CAAC;IAED,gEAAgE;IACxD,aAAa,CAAC,YAAyB;QAC7C,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAE7E,+EAA+E;QAC/E,+EAA+E;QAC/E,IAAI,QAAQ,IAAI,iBAAiB,EAAE;YACjC,OAAO,IAAA,2BAAmB,EAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC9D;QAED,4CAA4C;QAC5C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,YAAY,CAAC,QAAQ,CAAC;SAC9B;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAEhE,4HAA4H;QAC5H,IAAI,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YAC7E,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;YAC5C,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;SAChG;QACD,wFAAwF;QACxF,IAAI,eAAe,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YAC/C,OAAO,YAAY,CAAC,QAAQ,CAAC;SAC9B;IACH,CAAC;CAqBF;AA1LD,8CA0LC"}

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

@@ -1,6 +1,6 @@
-import { MixedContentSourceAdapter } from './mixedContentSourceAdapter';
 import { SourcePath } from '../../common';
 import { SourceComponent } from '../sourceComponent';
+import { MixedContentSourceAdapter } from './mixedContentSourceAdapter';
 /**
  * Handles _bundle_ types. A bundle component has all its source files, including the
  * root metadata xml, contained in its own directory.

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

@@ -1,12 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BundleSourceAdapter = void 0;
-/*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * 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
- */
 const mixedContentSourceAdapter_1 = require("./mixedContentSourceAdapter");
 /**
  * Handles _bundle_ types. A bundle component has all its source files, including the

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

@@ -1 +1 @@
-{"version":3,"file":"bundleSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/bundleSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2EAAwE;AAIxE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,mBAAoB,SAAQ,qDAAyB;IAAlE;;QACY,cAAS,GAAG,IAAI,CAAC;IA2B7B,CAAC;IAzBC;;;;;;;;;;;;;;;;;OAiBG;IACO,QAAQ,CAAC,OAAmB,EAAE,SAA2B;;QACjE,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,QAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,0CAAE,MAAM,CAAA,EAAE;YAC/E,oEAAoE;YACpE,OAAO;SACR;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;CACF;AA5BD,kDA4BC"}
+{"version":3,"file":"bundleSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/bundleSourceAdapter.ts"],"names":[],"mappings":";;;AAQA,2EAAwE;AAExE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,mBAAoB,SAAQ,qDAAyB;IAAlE;;QACY,cAAS,GAAG,IAAI,CAAC;IA2B7B,CAAC;IAzBC;;;;;;;;;;;;;;;;;OAiBG;IACO,QAAQ,CAAC,OAAmB,EAAE,SAA2B;;QACjE,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,0CAAE,MAAM,CAAA,EAAE;YAC/E,oEAAoE;YACpE,OAAO;SACR;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;CACF;AA5BD,kDA4BC"}

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

@@ -1,6 +1,6 @@
-import { MixedContentSourceAdapter } from './mixedContentSourceAdapter';
 import { SourcePath } from '../../common';
 import { SourceComponent } from '../sourceComponent';
+import { MixedContentSourceAdapter } from './mixedContentSourceAdapter';
 /**
  * Handles decomposed types. A flavor of mixed content where a component can
  * have additional -meta.xml files that represent child components of the main

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

@@ -1,16 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DecomposedSourceAdapter = void 0;
-/*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * 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
- */
-const mixedContentSourceAdapter_1 = require("./mixedContentSourceAdapter");
 const sourceComponent_1 = require("../sourceComponent");
 const utils_1 = require("../../utils");
 const errors_1 = require("../../errors");
+const mixedContentSourceAdapter_1 = require("./mixedContentSourceAdapter");
 /**
  * Handles decomposed types. A flavor of mixed content where a component can
  * have additional -meta.xml files that represent child components of the main
@@ -50,13 +44,13 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
         if (!rootMetadata) {
             const rootMetadataPath = this.getRootMetadataXmlPath(path);
             if (rootMetadataPath) {
-                rootMetadata = utils_1.parseMetadataXml(rootMetadataPath);
+                rootMetadata = (0, utils_1.parseMetadataXml)(rootMetadataPath);
             }
         }
         let component;
         if (rootMetadata) {
             const componentName = this.type.folderType
-                ? `${utils_1.parentName(rootMetadata.path)}/${rootMetadata.fullName}`
+                ? `${(0, utils_1.parentName)(rootMetadata.path)}/${rootMetadata.fullName}`
                 : rootMetadata.fullName;
             component = new sourceComponent_1.SourceComponent({
                 name: componentName,
@@ -72,18 +66,18 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
      * `BaseSourceAdapter`, and return the child component instead.
      */
     populate(trigger, component, isResolvingSource) {
-        const metaXml = utils_1.parseMetadataXml(trigger);
+        const metaXml = (0, utils_1.parseMetadataXml)(trigger);
         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)) {
+            if (triggerIsAChild && (strategy === "folderPerType" /* FolderPerType */ || isResolvingSource)) {
                 let parent = component;
                 if (!parent) {
                     parent = new sourceComponent_1.SourceComponent({
-                        name: utils_1.baseName(pathToContent),
+                        name: (0, utils_1.baseName)(pathToContent),
                         type: this.type,
                     }, this.tree, this.forceIgnore);
                 }

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/adapters/defaultSourceAdapter.d.ts

@@ -1,6 +1,6 @@
-import { BaseSourceAdapter } from './baseSourceAdapter';
 import { SourcePath } from '../../common';
 import { SourceComponent } from '../sourceComponent';
+import { BaseSourceAdapter } from './baseSourceAdapter';
 /**
  * The default source adapter. Handles simple types with no additional content.
  *

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

@@ -1,12 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultSourceAdapter = void 0;
-/*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * 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
- */
 const baseSourceAdapter_1 = require("./baseSourceAdapter");
 /**
  * The default source adapter. Handles simple types with no additional content.

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

@@ -1 +1 @@
-{"version":3,"file":"defaultSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/defaultSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2DAAwD;AAIxD;;;;;;;;;;;;;GAaG;AACH,MAAa,oBAAqB,SAAQ,qCAAiB;IAA3D;;QACY,wBAAmB,GAAG,KAAK,CAAC;IAaxC,CAAC;IAXC,0BAA0B;IAChB,sBAAsB,CAAC,OAAe;QAC9C,0EAA0E;QAC1E,+EAA+E;QAC/E,4CAA4C;QAC5C,OAAO,OAAO,CAAC;IACjB,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAdD,oDAcC"}
+{"version":3,"file":"defaultSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/defaultSourceAdapter.ts"],"names":[],"mappings":";;;AAQA,2DAAwD;AAExD;;;;;;;;;;;;;GAaG;AACH,MAAa,oBAAqB,SAAQ,qCAAiB;IAA3D;;QACY,wBAAmB,GAAG,KAAK,CAAC;IAaxC,CAAC;IAXC,0BAA0B;IAChB,sBAAsB,CAAC,OAAe;QAC9C,0EAA0E;QAC1E,+EAA+E;QAC/E,4CAA4C;QAC5C,OAAO,OAAO,CAAC;IACjB,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAdD,oDAcC"}

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseSourceAdapter = exports.DefaultSourceAdapter = exports.DecomposedSourceAdapter = exports.MixedContentSourceAdapter = exports.BundleSourceAdapter = exports.MatchingContentSourceAdapter = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/index.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,+EAA8E;AAArE,4IAAA,4BAA4B,OAAA;AACrC,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAC5B,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA;AAClC,qEAAoE;AAA3D,kIAAA,uBAAuB,OAAA;AAChC,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA;AAC7B,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+EAA8E;AAArE,4IAAA,4BAA4B,OAAA;AACrC,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAC5B,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA;AAClC,qEAAoE;AAA3D,kIAAA,uBAAuB,OAAA;AAChC,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA;AAC7B,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA"}

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

@@ -1,6 +1,6 @@
-import { BaseSourceAdapter } from './baseSourceAdapter';
 import { SourcePath } from '../../common';
 import { SourceComponent } from '../sourceComponent';
+import { BaseSourceAdapter } from './baseSourceAdapter';
 /**
  * Handles types with a single content file with a matching file extension.
  *

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

@@ -7,10 +7,10 @@ exports.MatchingContentSourceAdapter = void 0;
  * 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
  */
-const baseSourceAdapter_1 = require("./baseSourceAdapter");
 const errors_1 = require("../../errors");
 const common_1 = require("../../common");
 const path_1 = require("../../utils/path");
+const baseSourceAdapter_1 = require("./baseSourceAdapter");
 /**
  * Handles types with a single content file with a matching file extension.
  *
@@ -54,7 +54,7 @@ class MatchingContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter
         return fsPath.slice(0, fsPath.lastIndexOf(common_1.META_XML_SUFFIX));
     }
     extensionMatchesType(fsPath) {
-        return this.registry.getTypeBySuffix(path_1.extName(fsPath)) === this.type;
+        return this.registry.getTypeBySuffix((0, path_1.extName)(fsPath)) === this.type;
     }
 }
 exports.MatchingContentSourceAdapter = MatchingContentSourceAdapter;

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

@@ -1 +1 @@
-{"version":3,"file":"matchingContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/matchingContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2DAAwD;AACxD,yCAA+E;AAC/E,yCAA2D;AAC3D,2CAA2C;AAG3C;;;;;;;;;;;;;;GAcG;AACH,MAAa,4BAA6B,SAAQ,qCAAiB;IACvD,sBAAsB,CAAC,OAAmB;QAClD,OAAO,GAAG,OAAO,GAAG,wBAAe,EAAE,CAAC;IACxC,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,IAAI,UAAsB,CAAC;QAE3B,IAAI,SAAS,CAAC,GAAG,KAAK,OAAO,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;gBAC5B,UAAU,GAAG,MAAM,CAAC;aACrB;SACF;aAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;YAC7C,UAAU,GAAG,OAAO,CAAC;SACtB;QAED,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,iCAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACxD;aAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC9C,MAAM,IAAI,8BAAqB,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;SACzF;QAED,SAAS,CAAC,OAAO,GAAG,UAAU,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,mBAAmB,CAAC,MAAkB;QAC5C,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,wBAAe,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEO,oBAAoB,CAAC,MAAkB;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAO,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC;IACtE,CAAC;CACF;AAlCD,oEAkCC"}
+{"version":3,"file":"matchingContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/matchingContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAA+E;AAC/E,yCAA2D;AAC3D,2CAA2C;AAE3C,2DAAwD;AAExD;;;;;;;;;;;;;;GAcG;AACH,MAAa,4BAA6B,SAAQ,qCAAiB;IACvD,sBAAsB,CAAC,OAAmB;QAClD,OAAO,GAAG,OAAO,GAAG,wBAAe,EAAE,CAAC;IACxC,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,IAAI,UAAsB,CAAC;QAE3B,IAAI,SAAS,CAAC,GAAG,KAAK,OAAO,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;gBAC5B,UAAU,GAAG,MAAM,CAAC;aACrB;SACF;aAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;YAC7C,UAAU,GAAG,OAAO,CAAC;SACtB;QAED,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,iCAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACxD;aAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC9C,MAAM,IAAI,8BAAqB,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;SACzF;QAED,SAAS,CAAC,OAAO,GAAG,UAAU,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,mBAAmB,CAAC,MAAkB;QAC5C,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,wBAAe,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEO,oBAAoB,CAAC,MAAkB;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC;IACtE,CAAC;CACF;AAlCD,oEAkCC"}

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

@@ -1,6 +1,6 @@
-import { BaseSourceAdapter } from './baseSourceAdapter';
 import { SourcePath } from '../../common';
 import { SourceComponent } from '../sourceComponent';
+import { BaseSourceAdapter } from './baseSourceAdapter';
 /**
  * Handles types with mixed content. Mixed content means there are one or more additional
  * file(s) associated with a component with any file extension. Even an entire folder

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

@@ -7,11 +7,11 @@ exports.MixedContentSourceAdapter = void 0;
  * 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
  */
-const baseSourceAdapter_1 = require("./baseSourceAdapter");
 const path_1 = require("path");
 const errors_1 = require("../../errors");
 const path_2 = require("../../utils/path");
 const sourceComponent_1 = require("../sourceComponent");
+const baseSourceAdapter_1 = require("./baseSourceAdapter");
 /**
  * Handles types with mixed content. Mixed content means there are one or more additional
  * file(s) associated with a component with any file extension. Even an entire folder
@@ -40,14 +40,14 @@ class MixedContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
     getRootMetadataXmlPath(trigger) {
         if (this.ownFolder) {
             const componentRoot = this.trimPathToContent(trigger);
-            return this.tree.find('metadataXml', path_1.basename(componentRoot), componentRoot);
+            return this.tree.find('metadataXml', (0, path_1.basename)(componentRoot), componentRoot);
         }
         return this.findMetadataFromContent(trigger);
     }
     populate(trigger, component) {
         let contentPath = this.trimPathToContent(trigger);
         if (contentPath === (component === null || component === void 0 ? void 0 : component.xml)) {
-            contentPath = this.tree.find('content', path_2.baseName(contentPath), path_1.dirname(contentPath));
+            contentPath = this.tree.find('content', (0, path_2.baseName)(contentPath), (0, path_1.dirname)(contentPath));
         }
         if (!this.tree.exists(contentPath)) {
             throw new errors_1.ExpectedSourceFilesError(this.type, trigger);
@@ -57,7 +57,7 @@ class MixedContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
         }
         else {
             component = new sourceComponent_1.SourceComponent({
-                name: path_2.baseName(contentPath),
+                name: (0, path_2.baseName)(contentPath),
                 type: this.type,
                 content: contentPath,
             }, this.tree, this.forceIgnore);
@@ -87,8 +87,8 @@ class MixedContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
      */
     findMetadataFromContent(path) {
         const rootContentPath = this.trimPathToContent(path);
-        const rootTypeDirectory = path_1.dirname(rootContentPath);
-        const contentFullName = path_2.baseName(rootContentPath);
+        const rootTypeDirectory = (0, path_1.dirname)(rootContentPath);
+        const contentFullName = (0, path_2.baseName)(rootContentPath);
         return this.tree.find('metadataXml', contentFullName, rootTypeDirectory);
     }
 }