Merging too

JoshuaKGoldberg · Jan 15, 2025 · fc6de85 · fc6de85
1 parent ef3e5e4
commit fc6de85
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 2 deletions.
diff --git a/packages/create/src/mergers/mergeScripts.test.ts b/packages/create/src/mergers/mergeScripts.test.ts
@@ -22,6 +22,83 @@ describe("mergeScripts", () => {
 		[["a"], [], ["a"]],
 		[["a"], ["a"], ["a"]],
 		[["a"], ["b"], ["a", "b"]],
+		[
+			[
+				{
+					commands: ["pnpm build"],
+				},
+			],
+			[
+				{
+					commands: ["pnpm build"],
+				},
+			],
+			[
+				{
+					commands: ["pnpm build"],
+				},
+			],
+		],
+		[
+			[
+				{
+					commands: ["pnpm build"],
+					silent: true,
+				},
+			],
+			[
+				{
+					commands: ["pnpm build"],
+				},
+			],
+			[
+				{
+					commands: ["pnpm build"],
+				},
+			],
+		],
+		[
+			[
+				{
+					commands: ["pnpm build"],
+					silent: true,
+				},
+			],
+			[
+				{
+					commands: ["pnpm build"],
+					silent: true,
+				},
+			],
+			[
+				{
+					commands: ["pnpm build"],
+					silent: true,
+				},
+			],
+		],
+		[
+			[
+				{
+					commands: ["pnpm build"],
+					phase: 0,
+				},
+			],
+			[
+				{
+					commands: ["pnpm build"],
+				},
+			],
+			[
+				{
+					commands: ["pnpm build"],
+					phase: 0,
+				},
+				{
+					commands: ["pnpm build"],
+				},
+			],
+		],
 		[
 			[
 				{

diff --git a/packages/create/src/mergers/mergeScripts.ts b/packages/create/src/mergers/mergeScripts.ts
@@ -6,15 +6,20 @@ export function mergeScripts(
 	first: CreatedScript[],
 	second: CreatedScript[],
 ): CreatedScript[] {
-	const commandsByPhase = new Map<number, string[][]>();
+	const commandsByPhase = new Map<number | undefined, string[][]>();
 	const commandsWithoutPhase: string[] = [];
+	const nonSilentPhases = new Set<number | undefined>();
 
 	for (const command of [...first, ...second]) {
 		if (typeof command === "string") {
 			commandsWithoutPhase.push(command);
 			continue;
 		}
 
+		if (!command.silent) {
+			nonSilentPhases.add(command.phase);
+		}
+
 		const byPhase = commandsByPhase.get(command.phase);
 		if (!byPhase) {
 			commandsByPhase.set(command.phase, [command.commands.slice()]);
@@ -39,7 +44,11 @@ export function mergeScripts(
 	return [
 		...Array.from(commandsByPhase).flatMap(([phase, phaseCommands]) =>
 			phaseCommands
-				.map((commands) => ({ commands, phase }))
+				.map((commands) => ({
+					commands,
+					phase,
+					...(!nonSilentPhases.has(phase) && { silent: true }),
+				}))
 				.filter((phaseCommand) => {
 					const hash = hashObject(phaseCommand);
 					if (seenPhaseCommands.has(hash)) {