Wr/double deb retrieve W-18057369 (#1546)

* test: add test for TDD

* test: undo formatting change

* fix: fix doubly retrieved DEB

* test: undo file snap and remove projects

* fix: restore deleted snapshot files

* chore: realize is path.sep, not os.EOL

Author: WillieRuemmele

src/convert/transformers/defaultMetadataTransformer.ts

@@ -5,6 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { basename, dirname, join } from 'node:path';
+import fs from 'node:fs';
+import { sep } from 'node:path';
 import { Messages } from '@salesforce/core/messages';
 import { Lifecycle } from '@salesforce/core/lifecycle';
 import { SourcePath } from '../../common/types';
@@ -75,7 +77,19 @@ const getContentSourceDestination = (
     if (component.content && component.tree.isDirectory(component.content)) {
       // DEs are always inside a dir.
       if (component.type.strategies?.adapter === 'digitalExperience') {
-        return join(mergeWith.content, basename(source));
+        const parts = source.split(sep);
+        const file = parts.pop() ?? '';
+        const dir = join(mergeWith.content, parts.pop() ?? '');
+        if (
+          source.endsWith('content.json') ||
+          source.endsWith('_meta.json') ||
+          !(fs.existsSync(dir) && fs.statSync(dir).isDirectory())
+        ) {
+          return join(mergeWith.content, basename(source));
+        } else {
+          // if a directory exists with the same name as source, merge into there
+          return join(dir, file);
+        }
       } else {
         const relative = trimUntil(source, basename(component.content));
         return join(dirname(mergeWith.content), relative);

test/snapshot/sampleProjects/digitalExperienceBundle/__snapshots__/verify-md-files.expected/digitalExperiences/site/Capricorn_Coffee_A1/sfdc_cms__view/tooManyRequests/tablet/tablet.json

@@ -0,0 +1,22 @@
+{
+  "type" : "sfdc_cms__view",
+  "title" : "Wishlist",
+  "contentBody" : {
+    "component" : {
+      "children" : [ {
+        "attributes" : {
+          "dxpStyle" : {
+            "padding" : {
+              "bottom" : "0.5rem",
+              "left" : "0.75rem",
+              "right" : "0.75rem",
+              "top" : "0.5rem"
+            }
+          }
+        },
+        "id" : "0d365a1d-3438-4942-a071-8d1e6ad79108"
+      } ]
+    }
+  },
+  "urlName" : "wishlist"
+}

test/snapshot/sampleProjects/digitalExperienceBundle/__snapshots__/verify-source-files.expected/force-app/main/default/digitalExperiences/site/Capricorn_Coffee_A1/sfdc_cms__view/tooManyRequests/tablet/tablet.json

@@ -0,0 +1,22 @@
+{
+  "type" : "sfdc_cms__view",
+  "title" : "Wishlist",
+  "contentBody" : {
+    "component" : {
+      "children" : [ {
+        "attributes" : {
+          "dxpStyle" : {
+            "padding" : {
+              "bottom" : "0.5rem",
+              "left" : "0.75rem",
+              "right" : "0.75rem",
+              "top" : "0.5rem"
+            }
+          }
+        },
+        "id" : "0d365a1d-3438-4942-a071-8d1e6ad79108"
+      } ]
+    }
+  },
+  "urlName" : "wishlist"
+}

test/snapshot/sampleProjects/digitalExperienceBundle/originalMdapi/digitalExperiences/site/Capricorn_Coffee_A1/sfdc_cms__view/tooManyRequests/tablet/tablet.json

@@ -0,0 +1,22 @@
+{
+  "type" : "sfdc_cms__view",
+  "title" : "Wishlist",
+  "contentBody" : {
+    "component" : {
+      "children" : [ {
+        "attributes" : {
+          "dxpStyle" : {
+            "padding" : {
+              "bottom" : "0.5rem",
+              "left" : "0.75rem",
+              "right" : "0.75rem",
+              "top" : "0.5rem"
+            }
+          }
+        },
+        "id" : "0d365a1d-3438-4942-a071-8d1e6ad79108"
+      } ]
+    }
+  },
+  "urlName" : "wishlist"
+}

test/snapshot/sampleProjects/digitalExperienceBundle/snapshots.test.ts

@@ -6,6 +6,7 @@
  */
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import { expect } from 'chai';
 import {
   FORCE_APP,
   MDAPI_OUT,
@@ -14,6 +15,7 @@ import {
   mdapiToSource,
   sourceToMdapi,
 } from '../../helper/conversions';
+import { ComponentSetBuilder, MetadataConverter, RegistryAccess } from '../../../../src';
 
 // we don't want failing tests outputting over each other
 /* eslint-disable no-await-in-loop */
@@ -37,6 +39,67 @@ describe('digitalExperienceBundle', () => {
       path.join(testDir, '__snapshots__', 'verify-source-files.expected', FORCE_APP)
     );
   });
+
+  it('verifies source files after two conversions', async () => {
+    // reads all files in a directory recursively
+    function getAllFiles(dirPath: string, fileList: string[] = []): string[] {
+      const files = fs.readdirSync(dirPath);
+
+      for (const file of files) {
+        const filePath = path.join(dirPath, file);
+        const stat = fs.statSync(filePath);
+
+        if (stat.isDirectory()) {
+          getAllFiles(filePath, fileList); // Recursive call for subdirectories
+        } else {
+          fileList.push(filePath);
+        }
+      }
+
+      return fileList;
+    }
+
+    // should contain correct file path, e.g. DEB/../tablet/tablet.json
+    const fileList = getAllFiles(path.join(testDir, FORCE_APP));
+
+    await dirsAreIdentical(
+      path.join(testDir, FORCE_APP),
+      path.join(testDir, '__snapshots__', 'verify-source-files.expected', FORCE_APP)
+    );
+
+    // build a new CS from the freshly-converted source-format metadata
+    const cs = await ComponentSetBuilder.build({
+      sourcepath: [path.join(testDir, 'originalMdapi')],
+      projectDir: testDir,
+    });
+    const registry = new RegistryAccess(undefined, testDir);
+    const converter = new MetadataConverter(registry);
+
+    // converts metadata format DEB into source-format, with a mergeWith option, merging into force-app
+    await converter.convert(
+      cs,
+      'source', // loads custom registry if there is one
+      {
+        type: 'merge',
+        mergeWith: (
+          await ComponentSetBuilder.build({
+            sourcepath: [path.join(testDir, 'force-app')],
+            projectDir: testDir,
+          })
+        ).getSourceComponents(),
+        defaultDirectory: path.join(testDir, 'force-app'),
+      }
+    );
+
+    // this, currently, will have the incorrect file, DEB/.../tablet.json
+    const fileList2 = getAllFiles(path.join(testDir, FORCE_APP));
+    expect(fileList2).to.deep.equal(fileList);
+
+    await dirsAreIdentical(
+      path.join(testDir, FORCE_APP),
+      path.join(testDir, '__snapshots__', 'verify-source-files.expected', FORCE_APP)
+    );
+  });
   it('verify md files', async () => {
     for (const file of mdFiles) {
       await fileSnap(file, testDir);