feat: don't require main/default if dry-run

Author: mshanemc

messages/convert.source-behavior.md

@@ -58,8 +58,8 @@ This command moves metadata into a main/default structure, but your package dire
 
 # error.packageDirectoryNeedsMainDefault.actions
 
-- Update %s to have all its metadata inside a main/default directory structure.
-- Run the command again.
+- Update %s to have all its metadata inside a main/default directory structure, then run the command again.
+- Use the `--dry-run` flag. You can move the files in the output directory to wherever you want them. Please read the dry-run results carefully in case files need to be deleted from your project.
 
 # success.dryRun
 

src/commands/project/convert/source-behavior.ts

@@ -59,7 +59,7 @@ export default class ConvertSourceBehavior extends SfCommand<SourceBehaviorResul
     const projectJson = getValidatedProjectJson(flags.behavior, this.project!);
     const [backupPjsonContents, packageDirsWithDecomposable] = await Promise.all([
       flags['dry-run'] ? readFile(projectJson.getPath()) : '',
-      getPackageDirectoriesForPreset(this.project!, flags.behavior),
+      getPackageDirectoriesForPreset({ project: this.project!, preset: flags.behavior, dryRun: flags['dry-run'] }),
     ]);
     const filesToDelete = await convertToMdapi(packageDirsWithDecomposable);
 

src/utils/convertBehavior.ts

@@ -33,10 +33,15 @@ export const TMP_DIR = process.env.SF_MDAPI_TEMP_DIR ?? 'decompositionConverterT
 export const DRY_RUN_DIR = 'DRY-RUN-RESULTS';
 
 /** returns packageDirectories and ComponentsSets where there is metadata of the type we'll change the behavior for */
-export const getPackageDirectoriesForPreset = async (
-  project: SfProject,
-  preset: string
-): Promise<ComponentSetAndPackageDirPath[]> => {
+export const getPackageDirectoriesForPreset = async ({
+  project,
+  preset,
+  dryRun,
+}: {
+  project: SfProject;
+  preset: string;
+  dryRun: boolean;
+}): Promise<ComponentSetAndPackageDirPath[]> => {
   const projectDir = project.getPath();
   const output = (
     await Promise.all(
@@ -45,14 +50,16 @@ export const getPackageDirectoriesForPreset = async (
         .map((pd) => pd.path)
         .map(componentSetFromPackageDirectory(projectDir)(await getTypesFromPreset(preset)))
     )
-  )
-    .filter(componentSetIsNonEmpty)
-    // we do this after filtering componentSets to reduce false positives (ex: dir does not have main/default but also has nothing to decompose)
-    .map(validateMainDefault(projectDir));
+  ).filter(componentSetIsNonEmpty);
+
   if (output.length === 0) {
     loadMessages().createError('error.noTargetTypes', [preset]);
   }
-  return output;
+
+  return dryRun
+    ? output // dryRun isn't modifying the project, so we don't need to validate the structure
+    : // we do this after filtering componentSets to reduce false positives (ex: dir does not have main/default but also has nothing to decompose)
+      output.map(validateMainDefault(projectDir));
 };
 
 /** converts the composed metadata to mdapi format in a temp dir */