sv 0.13.1 → 0.13.2

package/dist/bin.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { a as detectPackageManager, c as name, h as program, l as version, m as Command, n as add, o as forwardExitCode, p as from, r as create, s as helpConfig } from "./engine-lCnxwqd0.mjs";
-import { color, resolveCommand } from "@sveltejs/sv-utils";
+import { a as detectPackageManager, c as name, h as program, l as version, m as Command, n as add, o as forwardExitCode, p as from, r as create, s as helpConfig } from "./engine-B8V7JiJ3.mjs";
+import { color, resolveCommandArray } from "@sveltejs/sv-utils";
 import process from "node:process";
 import { execSync } from "node:child_process";
 //#region src/cli/check.ts
@@ -12,8 +12,7 @@ const check = new Command("check").description("a CLI for checking your Svelte c
 async function runCheck(cwd, args) {
 	const pm = await detectPackageManager(cwd);
 	if (!from(cwd, "svelte-check", true)) {
-		const cmd = resolveCommand(pm, "add", ["-D", "svelte-check"]);
-		console.error(`'svelte-check' is not installed locally. Install it with: ${color.command(`${cmd.command} ${cmd.args.join(" ")}`)}`);
+		console.error(`'svelte-check' is not installed locally. Install it with: ${color.command(resolveCommandArray(pm, "add", ["-D", "svelte-check"]))}`);
 		process.exit(1);
 	}
 	if (args.includes("--help")) {
@@ -21,8 +20,7 @@ async function runCheck(cwd, args) {
 		console.log("Find here all options for both tools");
 	}
 	try {
-		const cmd = resolveCommand(pm, "execute-local", ["svelte-check", ...args]);
-		execSync(`${cmd.command} ${cmd.args.join(" ")}`, {
+		execSync(resolveCommandArray(pm, "execute-local", ["svelte-check", ...args]).join(" "), {
 			stdio: "inherit",
 			cwd
 		});
@@ -42,8 +40,7 @@ async function runMigrate(cwd, args) {
 	try {
 		const cmdArgs = ["svelte-migrate@latest", ...args];
 		if (pm === "npm") cmdArgs.unshift("--yes");
-		const cmd = resolveCommand(pm, "execute", cmdArgs);
-		execSync(`${cmd.command} ${cmd.args.join(" ")}`, {
+		execSync(resolveCommandArray(pm, "execute", cmdArgs).join(" "), {
 			stdio: "inherit",
 			cwd
 		});

package/dist/{engine-lCnxwqd0.mjs → engine-B8V7JiJ3.mjs}

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { AGENTS, COMMANDS, Walker, color, commonFilePaths, constructCommand, createPrinter, dedent, detect, downloadJson, fileExists, getPackageJson, installPackages, isVersionUnsupportedBelow, js, parse, readFile, resolveCommand, sanitizeName, splitVersion, svelte, text, transforms, writeFile } from "@sveltejs/sv-utils";
+import { AGENTS, COMMANDS, Walker, color, commonFilePaths, constructCommand, createPrinter, dedent, detect, downloadJson, fileExists, getPackageJson, installPackages, isVersionUnsupportedBelow, js, parse, readFile, resolveCommand, resolveCommandArray, sanitizeName, splitVersion, svelte, text, transforms, writeFile } from "@sveltejs/sv-utils";
 import fs, { existsSync } from "node:fs";
 import path, { delimiter, dirname, isAbsolute, join, normalize, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -5882,14 +5882,21 @@ const addEslintConfigPrettier = transforms.script(({ ast, js }) => {
 	});
 	const fallbackConfig = js.common.parseExpression("[]");
 	const eslintConfig = js.exports.createDefault(ast, { fallback: fallbackConfig }).value;
-	if (eslintConfig.type !== "ArrayExpression" && eslintConfig.type !== "CallExpression") return false;
+	let elements = [];
+	if (eslintConfig.type === "ArrayExpression") elements = eslintConfig.elements;
+	else if (eslintConfig.type === "CallExpression") if (eslintConfig.arguments.length === 1 && eslintConfig.arguments[0].type === "ArrayExpression") elements = eslintConfig.arguments[0].elements;
+	else elements = eslintConfig.arguments;
+	else return false;
 	const prettier = js.common.parseExpression("prettier");
 	const sveltePrettierConfig = js.common.parseExpression(`${svelteImportName}.configs.prettier`);
 	const nodesToInsert = [];
 	if (!js.common.contains(eslintConfig, prettier)) nodesToInsert.push(prettier);
 	if (!js.common.contains(eslintConfig, sveltePrettierConfig)) nodesToInsert.push(sveltePrettierConfig);
-	const elements = eslintConfig.type === "ArrayExpression" ? eslintConfig.elements : eslintConfig.arguments;
-	const idx = elements.findIndex((el) => el?.type === "MemberExpression" && el.object.type === "MemberExpression" && el.object.property.type === "Identifier" && el.object.property.name === "configs" && el.object.object.type === "Identifier" && el.object.object.name === svelteImportName);
+	const isSvelteConfig = (maybeSpread) => {
+		const el = maybeSpread?.type === "SpreadElement" ? maybeSpread?.argument : maybeSpread;
+		return el?.type === "MemberExpression" && el.object.type === "MemberExpression" && el.object.object.type === "Identifier" && el.object.object.name === svelteImportName && el.object.property.type === "Identifier" && el.object.property.name === "configs";
+	};
+	const idx = elements.findIndex(isSvelteConfig);
 	if (idx !== -1) elements.splice(idx + 1, 0, ...nodesToInsert);
 	else elements.push(...nodesToInsert);
 });
@@ -6209,7 +6216,7 @@ var better_auth_default = defineAddon({
 					${!d1 ? "import { auth } from '$lib/server/auth';" : ""}
 					${needsAPIError ? "import { APIError } from 'better-auth/api';" : ""}
 
-					export const load${ts(": PageServerLoad")} = async (event) => {
+					export const load${ts(": PageServerLoad")} = (event) => {
 						if (event.locals.user) {
 							return redirect(302, '/demo/better-auth');
 						}
@@ -6277,7 +6284,7 @@ var better_auth_default = defineAddon({
 					${ts("import type { PageServerLoad } from './$types';")}
 					${!d1 ? "import { auth } from '$lib/server/auth';" : ""}
 
-					export const load${ts(": PageServerLoad")} = async (event) => {
+					export const load${ts(": PageServerLoad")} = (event) => {
 						if (!event.locals.user) {
 							return redirect(302, '/demo/better-auth/login');
 						}
@@ -6312,11 +6319,9 @@ var better_auth_default = defineAddon({
 		}
 	},
 	nextSteps: ({ options, packageManager }) => {
-		const { command: authCmd, args: authArgs } = resolveCommand(packageManager, "run", ["auth:schema"]);
-		const { command: dbCmd, args: dbArgs } = resolveCommand(packageManager, "run", ["db:push"]);
 		const steps = [
-			`Run ${color.command(`${authCmd} ${authArgs.join(" ")}`)} to generate the auth schema`,
-			`Run ${color.command(`${dbCmd} ${dbArgs.join(" ")}`)} to update your database`,
+			`Run ${color.command(resolveCommandArray(packageManager, "run", ["auth:schema"]))} to generate the auth schema`,
+			`Run ${color.command(resolveCommandArray(packageManager, "run", ["db:push"]))} to update your database`,
 			`Check ${color.env("ORIGIN")} & ${color.env("BETTER_AUTH_SECRET")} in ${color.path(".env")} and adjust it to your needs`
 		];
 		if (options.demo.includes("github")) steps.push(`Set your ${color.env("GITHUB_CLIENT_ID")} and ${color.env("GITHUB_CLIENT_SECRET")} in ${color.path(".env")}`);
@@ -6650,7 +6655,7 @@ var drizzle_default = defineAddon({
 					from: "drizzle-orm/d1",
 					imports: ["drizzle"]
 				});
-				const getDbFn = js.common.parseStatement(`export const getDb = (d1${ts(": D1Database")} => drizzle(d1, { schema });`);
+				const getDbFn = js.common.parseStatement(`export const getDb = (d1${ts(": D1Database")}) => drizzle(d1, { schema });`);
 				ast.body.push(getDbFn);
 				return;
 			}
@@ -6758,21 +6763,17 @@ var drizzle_default = defineAddon({
 		const steps = [];
 		if (options.database === "d1") {
 			const ext = fileExists(cwd, "wrangler.toml") ? "toml" : "jsonc";
-			const { command, args } = resolveCommand(packageManager, "run", [
+			steps.push(`Add your ${color.env("CLOUDFLARE_ACCOUNT_ID")}, ${color.env("CLOUDFLARE_DATABASE_ID")}, and ${color.env("CLOUDFLARE_D1_TOKEN")} to ${color.path(".env")}`);
+			steps.push(`Run ${color.command(resolveCommandArray(packageManager, "run", [
 				"wrangler",
 				"d1",
 				"create",
-				`<DATABASE_NAME>`
-			]);
-			steps.push(`Add your ${color.env("CLOUDFLARE_ACCOUNT_ID")}, ${color.env("CLOUDFLARE_DATABASE_ID")}, and ${color.env("CLOUDFLARE_D1_TOKEN")} to ${color.path(".env")}`);
-			steps.push(`Run ${color.command(`${command} ${args.join(" ")}`)} to generate a D1 database ID for your ${color.path(`wrangler.${ext}`)}`);
-		}
-		if (options.docker) {
-			const { command, args } = resolveCommand(packageManager, "run", ["db:start"]);
-			steps.push(`Run ${color.command(`${command} ${args.join(" ")}`)} to start the docker container`);
-		} else if (options.database !== "d1") steps.push(`Check ${color.env("DATABASE_URL")} in ${color.path(".env")} and adjust it to your needs`);
-		const { command, args } = resolveCommand(packageManager, "run", ["db:push"]);
-		steps.push(`Run ${color.command(`${command} ${args.join(" ")}`)} to update your database schema`);
+				"<DATABASE_NAME>"
+			]))} to generate a D1 database ID for your ${color.path(`wrangler.${ext}`)}`);
+		}
+		if (options.docker) steps.push(`Run ${color.command(resolveCommandArray(packageManager, "run", ["db:start"]))} to start the docker container`);
+		else if (options.database !== "d1") steps.push(`Check ${color.env("DATABASE_URL")} in ${color.path(".env")} and adjust it to your needs`);
+		steps.push(`Run ${color.command(resolveCommandArray(packageManager, "run", ["db:push"]))} to update your database schema`);
 		return steps;
 	}
 });
@@ -6900,6 +6901,17 @@ var eslint_default = defineAddon({
 				});
 				eslintConfigs.push(svelteTSParserConfig);
 			}
+			const rulesOverride = js.object.create({ rules: {} });
+			eslintConfigs.push(rulesOverride);
+			if (rulesOverride.properties[0].type !== "Property") throw new Error("rulesOverride.properties[0].type !== \"Property\"");
+			comments.add(rulesOverride.properties[0].key, {
+				type: "Line",
+				value: " Override or add rule settings here, such as:"
+			});
+			comments.add(rulesOverride.properties[0].key, {
+				type: "Line",
+				value: " 'svelte/button-has-type': 'error'"
+			});
 			const exportExpression = js.functions.createCall({
 				name: "defineConfig",
 				args: []
@@ -7610,10 +7622,7 @@ var sveltekit_adapter_default = defineAddon({
 	},
 	nextSteps({ options, packageManager }) {
 		const steps = [];
-		if (options.adapter === "cloudflare") {
-			const { command, args } = resolveCommand(packageManager, "run", ["gen"]);
-			steps.push(`Run ${color.command(`${command} ${args.join(" ")}`)} to update ${color.addon("cloudflare")} types`);
-		}
+		if (options.adapter === "cloudflare") steps.push(`Run ${color.command(resolveCommandArray(packageManager, "run", ["gen"]))} to update ${color.addon("cloudflare")} types`);
 		return steps;
 	}
 });
@@ -7899,7 +7908,7 @@ function getAddonDetails(id) {
 //#endregion
 //#region package.json
 var name = "sv";
-var version = "0.13.1";
+var version = "0.13.2";
 //#endregion
 //#region src/core/errors.ts
 var UnsupportedError = class extends Error {
@@ -8046,8 +8055,7 @@ function buildAndLogArgs(agent, command, args, lastArgs = []) {
 	];
 	if (agent === null || agent === void 0) allArgs.push("--no-install");
 	else allArgs.push("--install", agent);
-	const res = resolveCommand(agent ?? "npm", "execute", [...allArgs, ...lastArgs]);
-	const message = [res.command, ...res.args].join(" ");
+	const message = resolveCommandArray(agent ?? "npm", "execute", [...allArgs, ...lastArgs]).join(" ");
 	R$1.message(color.optional(color.dim(`To skip prompts next time, run:`)));
 	R$1.info(color.optional(message), { spacing: -1 });
 	return message;
@@ -11391,15 +11399,10 @@ const create = new Command("create").description("Scaffold a new project (--add
 			const pathHasSpaces = relative.includes(" ");
 			initialSteps.push(`  ${i++}: ${color.command(`cd ${pathHasSpaces ? `"${relative}"` : relative}`)}`);
 		}
-		if (!packageManager) {
-			const { args, command } = resolveCommand(pm, "install", []);
-			initialSteps.push(`  ${i++}: ${color.command(`${command} ${args.join(" ")}`)}`);
-		}
-		const { args, command } = resolveCommand(pm, "run", ["dev", "--open"]);
-		const pmRunCmd = `${command} ${args.join(" ")}`;
+		if (!packageManager) initialSteps.push(`  ${i++}: ${color.command(resolveCommandArray(pm, "install", []))}`);
 		const steps = [
 			...initialSteps,
-			`  ${i++}: ${color.command(pmRunCmd)}`,
+			`  ${i++}: ${color.command(resolveCommandArray(pm, "run", ["dev", "--open"]))}`,
 			"",
 			`To close the dev server, hit ${color.command("Ctrl-C")}`
 		];
@@ -11522,8 +11525,9 @@ async function createProject(cwd, options) {
 	let argsFormattedAddons = [];
 	let addOnFilesToFormat = [];
 	let addOnSuccessfulAddons = [];
+	let addonSetupResults = {};
 	if (template !== "addon" && (options.addOns || options.add.length > 0)) {
-		const { argsFormattedAddons: argsFormatted, filesToFormat, successfulAddons } = await runAddonsApply({
+		const { argsFormattedAddons: argsFormatted, filesToFormat, successfulAddons, setupResults } = await runAddonsApply({
 			answers,
 			options: {
 				cwd: projectPath,
@@ -11540,6 +11544,7 @@ async function createProject(cwd, options) {
 		argsFormattedAddons = argsFormatted;
 		addOnFilesToFormat = filesToFormat;
 		addOnSuccessfulAddons = successfulAddons;
+		addonSetupResults = setupResults;
 	}
 	const packageManager = options.install === false ? null : options.install === true ? await packageManagerPrompt(projectPath) : options.install;
 	const argsFormatted = [];
@@ -11551,7 +11556,7 @@ async function createProject(cwd, options) {
 	updateReadme(directory, buildAndLogArgs(packageManager, "create", argsFormatted, [directory]));
 	updateAgent(directory, language, packageManager ?? "npm", loadedAddons);
 	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) {
 		await installDependencies(packageManager, projectPath);
@@ -11997,7 +12002,8 @@ async function runAddonsApply({ answers, options, loadedAddons, setupResults, wo
 		nextSteps: [],
 		argsFormattedAddons: [],
 		filesToFormat: [],
-		successfulAddons: []
+		successfulAddons: [],
+		setupResults: {}
 	};
 	const { filesToFormat, pnpmBuildDependencies, status } = await applyAddons({
 		loadedAddons,
@@ -12058,15 +12064,16 @@ async function runAddonsApply({ answers, options, loadedAddons, setupResults, wo
 		});
 	}
 	return {
-		nextSteps: getNextSteps(successfulAddons, workspace, answers),
+		nextSteps: getNextSteps(successfulAddons, workspace, answers, setupResults),
 		argsFormattedAddons,
 		filesToFormat,
-		successfulAddons
+		successfulAddons,
+		setupResults
 	};
 }
-function getNextSteps(loadedAddons, workspace, answers) {
-	return loadedAddons.map((loaded) => {
-		const addon = loaded.addon;
+function getNextSteps(loadedAddons, workspace, answers, setupResults) {
+	return orderAddons(loadedAddons.map((l) => l.addon), setupResults).map((loaded) => {
+		const { addon } = loadedAddons.find((l) => l.addon.id === loaded.id);
 		if (!addon.nextSteps) return;
 		const addonOptions = answers[addon.id];
 		const addonNextSteps = addon.nextSteps({
@@ -12337,7 +12344,7 @@ async function runAddon({ addon, loaded, multiple, workspace, workspaceOptions }
 		execute: async (commandArgs, stdio) => {
 			const { command, args } = resolveCommand(workspace.packageManager, "execute", commandArgs);
 			const addonPrefix = multiple ? `${addon.id}: ` : "";
-			const executedCommand = `${command} ${args.join(" ")}`;
+			const executedCommand = [command, ...args].join(" ");
 			if (!TESTING) R$1.step(`${addonPrefix}Running external command ${color.optional(`(${executedCommand})`)}`);
 			if (workspace.packageManager === "npm") args.unshift("--yes");
 			try {

package/dist/{engine-fG9K-byo.d.mts → engine-DmG_8K_H.d.mts}

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

package/dist/src/index.d.mts

@@ -1,4 +1,4 @@
-import { A as BooleanQuestion, C as defineAddon, D as WorkspaceOptions, E as Workspace, F as Question, I as SelectQuestion, L as StringQuestion, M as NumberQuestion, N as OptionDefinition, O as createWorkspace, P as OptionValues, R as officialAddons, S as Verification, T as getErrorHint, _ as Scripts, a as Addon, b as TestDefinition, c as AddonReference, d as ConditionDefinition, f as ConfiguredAddon, g as PreparedAddon, h as PackageDefinition, i as add, j as MultiSelectQuestion, k as BaseQuestion, l as AddonResult, m as OptionBuilder, n as InstallOptions, o as AddonDefinition, p as LoadedAddon, r as OptionMap, s as AddonInput, t as AddonMap, u as AddonSource, v as SetupResult, w as defineAddonOptions, x as Tests, y as SvApi } from "../engine-fG9K-byo.mjs";
+import { A as BooleanQuestion, C as defineAddon, D as WorkspaceOptions, E as Workspace, F as Question, I as SelectQuestion, L as StringQuestion, M as NumberQuestion, N as OptionDefinition, O as createWorkspace, P as OptionValues, R as officialAddons, S as Verification, T as getErrorHint, _ as Scripts, a as Addon, b as TestDefinition, c as AddonReference, d as ConditionDefinition, f as ConfiguredAddon, g as PreparedAddon, h as PackageDefinition, i as add, j as MultiSelectQuestion, k as BaseQuestion, l as AddonResult, m as OptionBuilder, n as InstallOptions, o as AddonDefinition, p as LoadedAddon, r as OptionMap, s as AddonInput, t as AddonMap, u as AddonSource, v as SetupResult, w as defineAddonOptions, x as Tests, y as SvApi } from "../engine-DmG_8K_H.mjs";
 
 //#region src/create/index.d.ts
 type TemplateType = (typeof templateTypes)[number];

package/dist/src/index.mjs

@@ -1,2 +1,2 @@
-import { d as defineAddon, f as defineAddonOptions, t as add, u as officialAddons, v as create } from "../engine-lCnxwqd0.mjs";
+import { d as defineAddon, f as defineAddonOptions, t as add, u as officialAddons, v as create } from "../engine-B8V7JiJ3.mjs";
 export { add, create, defineAddon, defineAddonOptions, officialAddons };

package/dist/src/testing.d.mts

@@ -1,4 +1,4 @@
-import { r as OptionMap, t as AddonMap } from "../engine-fG9K-byo.mjs";
+import { r as OptionMap, t as AddonMap } from "../engine-DmG_8K_H.mjs";
 import { AgentName } from "@sveltejs/sv-utils";
 import { Page } from "@playwright/test";
 import * as vitest from "vitest";

package/dist/src/testing.mjs

@@ -1,4 +1,4 @@
-import { _ as z, b as __require, g as R, i as addPnpmBuildDependencies, t as add, v as create, x as __toESM, y as __commonJSMin } from "../engine-lCnxwqd0.mjs";
+import { _ as z, b as __require, g as R, i as addPnpmBuildDependencies, t as add, v as create, x as __toESM, y as __commonJSMin } from "../engine-B8V7JiJ3.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "type": "module",
   "description": "A command line interface (CLI) for creating and maintaining Svelte applications",
   "license": "MIT",
@@ -25,7 +25,7 @@
     }
   },
   "dependencies": {
-    "@sveltejs/sv-utils": "0.0.4"
+    "@sveltejs/sv-utils": "0.0.5"
   },
   "devDependencies": {
     "@clack/prompts": "1.0.0",