fix(sv): nextStep will conform to depedencies (#1025)

Author: sacrosanctic

.changeset/blue-sloths-carry.md

@@ -0,0 +1,5 @@
+---
+"sv": patch
+---
+
+fix(sv): `nextStep` will conform to depedencies

packages/sv/src/cli/add.ts

@@ -18,7 +18,7 @@ import {
 	type SetupResult,
 	getErrorHint
 } from '../core/config.ts';
-import { applyAddons, setupAddons } from '../core/engine.ts';
+import { applyAddons, orderAddons, setupAddons } from '../core/engine.ts';
 import { downloadPackage, getPackageJSON } from '../core/fetch-packages.ts';
 import { formatFiles } from '../core/formatFiles.ts';
 import {
@@ -655,6 +655,7 @@ export async function runAddonsApply({
 	argsFormattedAddons: string[];
 	filesToFormat: string[];
 	successfulAddons: LoadedAddon[];
+	setupResults: Record<string, SetupResult>;
 }> {
 	if (!setupResults) {
 		// When no addons are selected, use official addons for setup
@@ -666,7 +667,13 @@ export async function runAddonsApply({
 	// we'll return early when no addons are selected,
 	// indicating that installing deps was skipped and no PM was selected
 	if (loadedAddons.length === 0)
-		return { nextSteps: [], argsFormattedAddons: [], filesToFormat: [], successfulAddons: [] };
+		return {
+			nextSteps: [],
+			argsFormattedAddons: [],
+			filesToFormat: [],
+			successfulAddons: [],
+			setupResults: {}
+		};
 
 	const { filesToFormat, pnpmBuildDependencies, status } = await applyAddons({
 		loadedAddons,
@@ -768,19 +775,22 @@ export async function runAddonsApply({
 		await formatFiles({ packageManager, cwd: options.cwd, filesToFormat });
 	}
 
-	const nextSteps = getNextSteps(successfulAddons, workspace, answers);
+	const nextSteps = getNextSteps(successfulAddons, workspace, answers, setupResults);
 
-	return { nextSteps, argsFormattedAddons, filesToFormat, successfulAddons };
+	return { nextSteps, argsFormattedAddons, filesToFormat, successfulAddons, setupResults };
 }
 
 export function getNextSteps(
 	loadedAddons: LoadedAddon[],
 	workspace: Workspace,
-	answers: Record<string, OptionValues<any>>
+	answers: Record<string, OptionValues<any>>,
+	setupResults: Record<string, SetupResult>
 ): string[] {
-	return loadedAddons
+	const addonDefs = loadedAddons.map((l) => l.addon);
+
+	return orderAddons(addonDefs, setupResults)
 		.map((loaded) => {
-			const addon = loaded.addon;
+			const { addon } = loadedAddons.find((l) => l.addon.id === loaded.id)!;
 			if (!addon.nextSteps) return;
 			const addonOptions = answers[addon.id];
 			const addonNextSteps = addon.nextSteps({ ...workspace, options: addonOptions });

packages/sv/src/cli/create.ts

@@ -6,7 +6,7 @@ import path from 'node:path';
 import process from 'node:process';
 import * as v from 'valibot';
 import * as common from '../core/common.ts';
-import type { LoadedAddon, OptionValues } from '../core/config.ts';
+import type { LoadedAddon, OptionValues, SetupResult } from '../core/config.ts';
 import { formatFiles } from '../core/formatFiles.ts';
 import {
 	AGENT_NAMES,
@@ -331,11 +331,13 @@ async function createProject(cwd: ProjectPath, options: Options) {
 	let argsFormattedAddons: string[] = [];
 	let addOnFilesToFormat: string[] = [];
 	let addOnSuccessfulAddons: LoadedAddon[] = [];
+	let addonSetupResults: Record<string, SetupResult> = {};
 	if (template !== 'addon' && (options.addOns || options.add.length > 0)) {
 		const {
 			argsFormattedAddons: argsFormatted,
 			filesToFormat,
-			successfulAddons
+			successfulAddons,
+			setupResults
 		} = await runAddonsApply({
 			answers,
 			options: {
@@ -354,6 +356,7 @@ async function createProject(cwd: ProjectPath, options: Options) {
 		argsFormattedAddons = argsFormatted;
 		addOnFilesToFormat = filesToFormat;
 		addOnSuccessfulAddons = successfulAddons;
+		addonSetupResults = setupResults;
 	}
 
 	const packageManager =
@@ -382,7 +385,7 @@ async function createProject(cwd: ProjectPath, options: Options) {
 	if (packageManager) {
 		workspace.packageManager = packageManager;
 	}
-	const addOnNextSteps = getNextSteps(addOnSuccessfulAddons, workspace, answers);
+	const addOnNextSteps = getNextSteps(addOnSuccessfulAddons, workspace, answers, addonSetupResults);
 
 	await addPnpmBuildDependencies(projectPath, packageManager, ['esbuild']);
 	if (packageManager) {

packages/sv/src/core/config.ts

@@ -77,7 +77,7 @@ export type Addon<Args extends OptionDefinition, Id extends string = string> = {
 		}
 	) => MaybePromise<void>;
 	/** Next steps to display after the addon is run. */
-	nextSteps?: (data: Workspace & { options: WorkspaceOptions<Args> }) => string[];
+	nextSteps?: (workspace: Workspace & { options: WorkspaceOptions<Args> }) => string[];
 };
 
 /**

packages/sv/src/core/engine.ts

@@ -264,7 +264,10 @@ async function runAddon({ addon, loaded, multiple, workspace, workspaceOptions }
 // orders addons by putting addons that don't require any other addon in the front.
 // This is a drastic simplification, as this could still cause some inconvenient circumstances,
 // but works for now in contrary to the previous implementation
-function orderAddons(addons: Array<Addon<any>>, setupResults: Record<string, SetupResult>) {
+export function orderAddons(
+	addons: Array<Addon<any>>,
+	setupResults: Record<string, SetupResult>
+): Array<Addon<any>> {
 	return addons.sort((a, b) => {
 		return setupResults[a.id]?.runsAfter?.length - setupResults[b.id]?.runsAfter?.length;
 	});