chore: clean up my implementation

forcedotcom · Aug 17, 2021 · dfde4a3 · dfde4a3
1 parent d208954
commit dfde4a3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/collections/componentSet.ts b/src/collections/componentSet.ts
@@ -265,10 +265,8 @@ export class ComponentSet extends LazyCollection<MetadataComponent> {
 
     const typeMap = new Map<string, string[]>();
     for (const key of components.keys()) {
-      // eslint-disable-next-line prefer-const
-      let [typeId, fullName] = key.split(ComponentSet.KEY_DELIMITER);
+      const [typeId, fullName] = key.split(ComponentSet.KEY_DELIMITER);
       let type = this.registry.getTypeByName(typeId);
-      fullName = type.fullName ?? fullName;
 
       if (type.folderContentType) {
         type = this.registry.getTypeByName(type.folderContentType);

diff --git a/src/registry/registry.json b/src/registry/registry.json
@@ -11,7 +11,7 @@
     "customlabels": {
       "id": "customlabels",
       "name": "CustomLabels",
-      "fullName": "CustomLabels",
+      "ignoreTypeName": true,
       "suffix": "labels",
       "directoryName": "labels",
       "inFolder": false,

diff --git a/src/registry/types.ts b/src/registry/types.ts
@@ -58,9 +58,10 @@ export interface MetadataType {
    */
   strictDirectoryName?: boolean;
   /**
-   * TBD.
+   * Whether or not to ignore the type names that's parsed from the file path. If true, the type's name
+   * will be used instead.
    */
-  fullName?: string;
+  ignoreTypeName?: boolean;
   /**
    * If the type is a folder type (container for components), the id of the type it is a container for.
    */

diff --git a/src/resolve/sourceComponent.ts b/src/resolve/sourceComponent.ts
@@ -218,8 +218,8 @@ export class SourceComponent implements MetadataComponent {
   }
 
   get fullName(): string {
-    if (this.type.fullName) {
-      return this.type.fullName;
+    if (this.type.ignoreTypeName) {
+      return this.type.name;
     }
     if (this.parent && this.type.ignoreParentName) {
       return this.name;