fix: filter aliased folder types in SDRMetadataAdapter

README.md

@@ -89,7 +89,7 @@ sf project deploy start -x package/package.xml --post-destructive-changes destru
 
 - **Automate destructive deployments**: build the destructiveChanges.xml from the deleted (or renamed) metadata
 
-Have a look at this post on the Salesforce Developers Blog to dive into it: [Optimizing Unpackaged Deployments Using a Delta Generation Tool](https://developer.salesforce.com/blogs/2021/01/optimizing-unpackaged-deployments-using-a-delta-generation-tool.html).
+Have a look at this post on the Salesforce Developers Blog to dive into it: [Optimizing Unpackaged Deployments Using a Delta Generation Tool](https://developer.salesforce.com/blogs/2021/01/optimizing-unpackaged-deployments-using-a-delta-generation-tool).
 
 ![delta_principle](img/delta_principles.png)
 

__tests__/functional/delta.nut.ts

@@ -71,7 +71,7 @@ describe('sgd source delta NUTS', () => {
     const destructiveChangesLineCount = await getFileLineNumber(
       'e2e/expected/destructiveChanges/destructiveChanges.xml'
     )
-    expect(packageLineCount).to.equal(236)
+    expect(packageLineCount).to.equal(240)
     expect(destructiveChangesLineCount).to.equal(141)
     expect(result).to.include('"status": 0')
   })

__tests__/integration/sdr.test.ts

@@ -94,5 +94,24 @@ describe('SDRMetadataAdapter', () => {
       expect(lwc).toBeDefined()
       expect(lwc?.metaFile).toBe(true)
     })
+
+    it('Given real SDR registry with EmailTemplateFolder alias, When converting, Then EmailTemplate is present and EmailTemplateFolder is excluded', () => {
+      // Arrange
+      const adapter = new SDRMetadataAdapter()
+
+      // Act
+      const metadata = adapter.toInternalMetadata()
+      const emailTemplate = metadata.find(
+        (m: Metadata) => m.xmlName === 'EmailTemplate'
+      )
+      const emailTemplateFolder = metadata.find(
+        (m: Metadata) => m.xmlName === 'EmailTemplateFolder'
+      )
+
+      // Assert
+      expect(emailTemplate).toBeDefined()
+      expect(emailTemplate?.directoryName).toBe('email')
+      expect(emailTemplateFolder).toBeUndefined()
+    })
   })
 })

__tests__/integration/services.test.ts

@@ -476,6 +476,21 @@ const testContext = [
     new Set(['FeatureParameterDateTest']),
     'FeatureParameterDate',
   ],
+  [
+    'force-app/main/default/email/TestFolder/TestEmail.email',
+    new Set(['TestFolder/TestEmail']),
+    'EmailTemplate',
+  ],
+  [
+    'force-app/main/default/email/TestFolder/TestEmail.email-meta.xml',
+    new Set(['TestFolder/TestEmail']),
+    'EmailTemplate',
+  ],
+  [
+    'force-app/main/default/email/TestFolder.emailFolder-meta.xml',
+    new Set(['TestFolder']),
+    'EmailTemplate',
+  ],
 ]
 const existingFiles = [
   'force-app/main/default/permissionsets/Admin/Admin.permissionset-meta.xml',

__tests__/unit/lib/metadata/sdrMetadataAdapter.test.ts

@@ -154,6 +154,93 @@ describe('SDRMetadataAdapter', () => {
         const report = metadata.find(m => m.xmlName === 'Report')
         expect(report).toBeDefined()
       })
+
+      it('Given SDR type with aliasFor pointing to a known folder type, When converting, Then it is excluded', () => {
+        // Arrange
+        const mockRegistry: MockRegistry = {
+          types: {
+            emailtemplate: {
+              id: 'emailtemplate',
+              name: 'EmailTemplate',
+              directoryName: 'email',
+              inFolder: true,
+              folderType: 'emailfolder',
+              suffix: 'email',
+            },
+            emailfolder: {
+              id: 'emailfolder',
+              name: 'EmailFolder',
+              directoryName: 'email',
+              suffix: 'emailFolder',
+            },
+            emailtemplatefolder: {
+              id: 'emailtemplatefolder',
+              name: 'EmailTemplateFolder',
+              directoryName: 'email',
+              suffix: 'emailTemplateFolder',
+              aliasFor: 'emailfolder',
+            },
+          },
+        }
+        const adapter = new SDRMetadataAdapter(mockRegistry as never)
+
+        // Act
+        const metadata = adapter.toInternalMetadata()
+
+        // Assert
+        const emailTemplateFolder = metadata.find(
+          m => m.xmlName === 'EmailTemplateFolder'
+        )
+        expect(emailTemplateFolder).toBeUndefined()
+        const emailTemplate = metadata.find(m => m.xmlName === 'EmailTemplate')
+        expect(emailTemplate).toBeDefined()
+      })
+
+      it('Given SDR type with aliasFor pointing to a non-folder type, When converting, Then it is NOT excluded', () => {
+        // Arrange
+        const mockRegistry: MockRegistry = {
+          types: {
+            sometype: {
+              id: 'sometype',
+              name: 'SomeType',
+              directoryName: 'some',
+              suffix: 'some',
+            },
+            aliastype: {
+              id: 'aliastype',
+              name: 'AliasType',
+              directoryName: 'some',
+              suffix: 'alias',
+              aliasFor: 'sometype',
+            },
+          },
+        }
+        const adapter = new SDRMetadataAdapter(mockRegistry as never)
+
+        // Act
+        const metadata = adapter.toInternalMetadata()
+
+        // Assert
+        const aliasType = metadata.find(m => m.xmlName === 'AliasType')
+        expect(aliasType).toBeDefined()
+      })
+
+      it('Given real SDR registry, When converting, Then EmailTemplate is present and EmailTemplateFolder is absent', () => {
+        // Arrange
+        const adapter = new SDRMetadataAdapter()
+
+        // Act
+        const metadata = adapter.toInternalMetadata()
+
+        // Assert
+        const emailTemplate = metadata.find(m => m.xmlName === 'EmailTemplate')
+        expect(emailTemplate).toBeDefined()
+        expect(emailTemplate?.directoryName).toBe('email')
+        const emailTemplateFolder = metadata.find(
+          m => m.xmlName === 'EmailTemplateFolder'
+        )
+        expect(emailTemplateFolder).toBeUndefined()
+      })
     })
 
     describe('content array for inFolder types', () => {