sv 0.8.3 → 0.8.5

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { AGENT_NAMES, Command, Element, Option, Tag, __commonJS, __export, __require, __toESM as __toESM$1, __toESM$1 as __toESM, addPnpmBuildDependencies, box, cancel, confirm, create, detect, esm_exports, from, getUserAgent, group, installDependencies, installOption, intro, isCancel, log, multiselect, note, outro, packageManagerPrompt, parseCss$1, parseHtml, parseHtml$1, parseJson$1, parseScript$1, parseSvelte, program, require_picocolors, resolveCommand, select, spinner, templates, text, up, walk_exports } from "./package-manager-D3PRQ-L_.js";
-import { addFromString, applyAddons, array_exports, common_exports, createWorkspace, dedent_default, exports_exports, formatFiles, function_exports, getHighlighter, imports_exports, kit_exports, object_exports, require_picocolors$1, setupAddons, variables_exports } from "./install-DP0ugKT8.js";
+import { AGENT_NAMES, Command, Element, Option, Tag, __commonJS, __export, __require, __toESM, __toESM$1, addPnpmBuildDependencies, box, cancel, confirm, create, detect, esm_exports, from, getUserAgent, group, installDependencies, installOption, intro, isCancel, log, multiselect, note, outro, packageManagerPrompt, parseCss$1, parseHtml, parseHtml$1, parseJson$1, parseScript$1, parseSvelte, program, require_picocolors, resolveCommand, select, spinner, templates, text, up, walk_exports } from "./package-manager-D3PRQ-L_.js";
+import { addFromString, applyAddons, array_exports, common_exports, createWorkspace, dedent_default, exports_exports, formatFiles, function_exports, getHighlighter, imports_exports, kit_exports, object_exports, require_picocolors$1, setupAddons, variables_exports } from "./install-BTJ6iCTS.js";
 import fs, { existsSync } from "node:fs";
 import path, { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -12,7 +12,7 @@ import { promisify } from "node:util";
 
 //#region packages/cli/package.json
 var name = "sv";
-var version = "0.8.3";
+var version = "0.8.5";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -138,6 +138,9 @@ function _addIssue(context, label, dataset, config2, other) {
 	if (dataset.issues) dataset.issues.push(issue);
 else dataset.issues = [issue];
 }
+function _isValidObjectKey(object2, key) {
+	return Object.hasOwn(object2, key) && key !== "__proto__" && key !== "prototype" && key !== "constructor";
+}
 function _joinExpects(values, separator) {
 	const list = [...new Set(values)];
 	if (list.length > 1) return `(${list.join(` ${separator} `)})`;
@@ -237,53 +240,6 @@ else _addIssue(this, "type", dataset, config2);
 		}
 	};
 }
-function object(entries, message) {
-	return {
-		kind: "schema",
-		type: "object",
-		reference: object,
-		expects: "Object",
-		async: false,
-		entries,
-		message,
-		_run(dataset, config2) {
-			const input = dataset.value;
-			if (input && typeof input === "object") {
-				dataset.typed = true;
-				dataset.value = {};
-				for (const key in this.entries) {
-					const value2 = input[key];
-					const valueDataset = this.entries[key]._run({
-						typed: false,
-						value: value2
-					}, config2);
-					if (valueDataset.issues) {
-						const pathItem = {
-							type: "object",
-							origin: "value",
-							input,
-							key,
-							value: value2
-						};
-						for (const issue of valueDataset.issues) {
-							if (issue.path) issue.path.unshift(pathItem);
-else issue.path = [pathItem];
-							dataset.issues?.push(issue);
-						}
-						if (!dataset.issues) dataset.issues = valueDataset.issues;
-						if (config2.abortEarly) {
-							dataset.typed = false;
-							break;
-						}
-					}
-					if (!valueDataset.typed) dataset.typed = false;
-					if (valueDataset.value !== void 0 || key in input) dataset.value[key] = valueDataset.value;
-				}
-			} else _addIssue(this, "type", dataset, config2);
-			return dataset;
-		}
-	};
-}
 function optional(wrapped, ...args) {
 	const schema = {
 		kind: "schema",
@@ -322,6 +278,76 @@ else _addIssue(this, "type", dataset, config2);
 		}
 	};
 }
+function record(key, value2, message) {
+	return {
+		kind: "schema",
+		type: "record",
+		reference: record,
+		expects: "Object",
+		async: false,
+		key,
+		value: value2,
+		message,
+		_run(dataset, config2) {
+			const input = dataset.value;
+			if (input && typeof input === "object") {
+				dataset.typed = true;
+				dataset.value = {};
+				for (const entryKey in input) if (_isValidObjectKey(input, entryKey)) {
+					const entryValue = input[entryKey];
+					const keyDataset = this.key._run({
+						typed: false,
+						value: entryKey
+					}, config2);
+					if (keyDataset.issues) {
+						const pathItem = {
+							type: "object",
+							origin: "key",
+							input,
+							key: entryKey,
+							value: entryValue
+						};
+						for (const issue of keyDataset.issues) {
+							issue.path = [pathItem];
+							dataset.issues?.push(issue);
+						}
+						if (!dataset.issues) dataset.issues = keyDataset.issues;
+						if (config2.abortEarly) {
+							dataset.typed = false;
+							break;
+						}
+					}
+					const valueDataset = this.value._run({
+						typed: false,
+						value: entryValue
+					}, config2);
+					if (valueDataset.issues) {
+						const pathItem = {
+							type: "object",
+							origin: "value",
+							input,
+							key: entryKey,
+							value: entryValue
+						};
+						for (const issue of valueDataset.issues) {
+							if (issue.path) issue.path.unshift(pathItem);
+else issue.path = [pathItem];
+							dataset.issues?.push(issue);
+						}
+						if (!dataset.issues) dataset.issues = valueDataset.issues;
+						if (config2.abortEarly) {
+							dataset.typed = false;
+							break;
+						}
+					}
+					if (!keyDataset.typed || !valueDataset.typed) dataset.typed = false;
+					if (keyDataset.typed) dataset.value[keyDataset.value] = valueDataset.value;
+				}
+			} else _addIssue(this, "type", dataset, config2);
+			return dataset;
+		}
+	};
+}
 function strictObject(entries, message) {
 	return {
 		kind: "schema",
@@ -1073,7 +1099,7 @@ function createPrinter(...conditions) {
 	});
 	return printers;
 }
-var import_picocolors$4 = __toESM$1(require_picocolors(), 1);
+var import_picocolors$4 = __toESM(require_picocolors(), 1);
 var colors = import_picocolors$4.default;
 
 //#endregion
@@ -1212,8 +1238,16 @@ var drizzle_default = defineAddon({
 	shortDescription: "database orm",
 	homepage: "https://orm.drizzle.team",
 	options: options$5,
-	setup: ({ kit, unsupported }) => {
+	setup: ({ kit, unsupported, cwd, typescript }) => {
+		const ext = typescript ? "ts" : "js";
 		if (!kit) unsupported("Requires SvelteKit");
+		const baseDBPath = path.resolve(kit.libDirectory, "server", "db");
+		const paths = {
+			"drizzle config": path.relative(cwd, path.resolve(cwd, `drizzle.config.${ext}`)),
+			"database schema": path.relative(cwd, path.resolve(baseDBPath, `schema.${ext}`)),
+			database: path.relative(cwd, path.resolve(baseDBPath, `index.${ext}`))
+		};
+		for (const [fileType, filePath] of Object.entries(paths)) if (fs.existsSync(filePath)) unsupported(`Preexisting ${fileType} file at '${filePath}'`);
 	},
 	run: ({ sv, typescript, options: options$6, kit }) => {
 		const ext = typescript ? "ts" : "js";
@@ -1286,32 +1320,18 @@ var drizzle_default = defineAddon({
 		sv.file(`drizzle.config.${ext}`, (content) => {
 			const { ast, generateCode } = parseScript$1(content);
 			imports_exports.addNamed(ast, "drizzle-kit", { defineConfig: "defineConfig" });
-			const envCheckStatement = common_exports.statementFromString("if (!process.env.DATABASE_URL) throw new Error('DATABASE_URL is not set');");
-			common_exports.addStatement(ast, envCheckStatement);
-			const fallback = common_exports.expressionFromString("defineConfig({})");
-			const { value: exportDefault } = exports_exports.defaultExport(ast, fallback);
-			if (exportDefault.type !== "CallExpression") return content;
-			const objExpression = exportDefault.arguments?.[0];
-			if (!objExpression || objExpression.type !== "ObjectExpression") return content;
-			const authToken = options$6.sqlite === "turso" ? common_exports.expressionFromString("process.env.DATABASE_AUTH_TOKEN") : undefined;
-			object_exports.properties(objExpression, {
-				schema: common_exports.createLiteral(`./src/lib/server/db/schema.${typescript ? "ts" : "js"}`),
-				dbCredentials: object_exports.create({
-					url: common_exports.expressionFromString("process.env.DATABASE_URL"),
-					authToken
-				}),
-				verbose: {
-					type: "Literal",
-					value: true
-				},
-				strict: {
-					type: "Literal",
-					value: true
-				}
-			});
-			const dialect = options$6.sqlite === "turso" ? "turso" : options$6.database;
-			object_exports.overrideProperties(objExpression, { dialect: common_exports.createLiteral(dialect) });
-			if (options$6.database !== "sqlite") object_exports.removeProperty(objExpression, "driver");
+			common_exports.addStatement(ast, common_exports.statementFromString("if (!process.env.DATABASE_URL) throw new Error('DATABASE_URL is not set');"));
+			exports_exports.defaultExport(ast, common_exports.expressionFromString(`
+					defineConfig({
+						schema: "./src/lib/server/db/schema.${typescript ? "ts" : "js"}",
+						dialect: "${options$6.sqlite === "turso" ? "turso" : options$6.database}",
+						dbCredentials: {
+							${options$6.sqlite === "turso" ? "authToken: process.env.DATABASE_AUTH_TOKEN," : ""}
+							url: process.env.DATABASE_URL
+						},
+						verbose: true,
+						strict: true
+					})`));
 			return generateCode();
 		});
 		sv.file(`${kit?.libDirectory}/server/db/schema.${ext}`, (content) => {
@@ -2685,9 +2705,10 @@ var lucia_default = defineAddon({
 	shortDescription: "auth guide",
 	homepage: "https://lucia-auth.com",
 	options: options$3,
-	setup: ({ kit, dependencyVersion, unsupported, dependsOn }) => {
+	setup: ({ kit, dependencyVersion, unsupported, dependsOn, runsAfter }) => {
 		if (!kit) unsupported("Requires SvelteKit");
 		if (!dependencyVersion("drizzle-orm")) dependsOn("drizzle");
+		runsAfter("tailwindcss");
 	},
 	run: ({ sv, typescript, options: options$6, kit, dependencyVersion }) => {
 		const ext = typescript ? "ts" : "js";
@@ -3045,6 +3066,9 @@ var lucia_default = defineAddon({
 					log$1.warn(`Existing ${colors.yellow(filePath)} file. Could not update.`);
 					return content;
 				}
+				const tailwind = dependencyVersion("@tailwindcss/vite") !== undefined;
+				const twInputClasses = "class=\"mt-1 px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500\"";
+				const twBtnClasses = "class=\"bg-blue-600 text-white px-4 py-2 rounded-md hover:bg-blue-700 transition\"";
 				const svelte5 = !!dependencyVersion("svelte")?.startsWith("5");
 				const [ts, s5] = utils_exports.createPrinter(typescript, svelte5);
 				return dedent_default`
@@ -3055,17 +3079,28 @@ var lucia_default = defineAddon({
 					</script>
 
 					<h1>Login/Register</h1>
-					<form method='post' action='?/login' use:enhance>
+					<form method="post" action="?/login" use:enhance>
 						<label>
 							Username
-							<input name='username' />
+							<input
+								name="username"
+								${tailwind ? twInputClasses : ""}
+							/>
 						</label>
 						<label>
 							Password
-							<input type='password' name='password' />
+							<input
+								type="password"
+								name="password"
+								${tailwind ? twInputClasses : ""}
+							/>
 						</label>
-						<button>Login</button>
-						<button formaction='?/register'>Register</button>
+						<button ${tailwind ? twBtnClasses : ""}
+							>Login</button>
+						<button
+							formaction="?/register"
+							${tailwind ? twBtnClasses : ""}
+							>Register</button>
 					</form>
 					<p style='color: red'>{form?.message ?? ''}</p>
 				`;
@@ -3080,12 +3115,11 @@ var lucia_default = defineAddon({
 				return dedent_default`
 					import * as auth from '$lib/server/auth';
 					import { fail, redirect } from '@sveltejs/kit';
+					import { getRequestEvent } from '$app/server';
 					${ts("import type { Actions, PageServerLoad } from './$types';\n")}
-					export const load${ts(": PageServerLoad")} = async (event) => {
-						if (!event.locals.user) {
-							return redirect(302, '/demo/lucia/login');
-						}
-						return { user: event.locals.user };
+					export const load${ts(": PageServerLoad")} = async () => {
+						const user = requireLogin()
+						return { user };
 					};
 
 					export const actions${ts(": Actions")} = {
@@ -3099,6 +3133,16 @@ var lucia_default = defineAddon({
 							return redirect(302, '/demo/lucia/login');
 						},
 					};
+
+					function requireLogin() {
+					  const { locals } = getRequestEvent();
+
+					  if (!locals.user) {
+					    return redirect(302, "/demo/lucia/login");
+					  }
+
+					  return locals.user;
+					}
 				`;
 			});
 			sv.file(`${kit.routesDirectory}/demo/lucia/+page.svelte`, (content) => {
@@ -3260,7 +3304,7 @@ const DEFAULT_INLANG_PROJECT = {
 	"plugin.inlang.messageFormat": { pathPattern: "./messages/{locale}.json" }
 };
 const options$2 = defineAddonOptions({
-	availableLanguageTags: {
+	languageTags: {
 		question: `Which languages would you like to support? ${colors.gray("(e.g. en,de-ch)")}`,
 		type: "string",
 		default: "en, es",
@@ -3301,7 +3345,7 @@ var paraglide_default = defineAddon({
 			if (content) return content;
 			const { data, generateCode } = parseJson$1(content);
 			for (const key in DEFAULT_INLANG_PROJECT) data[key] = DEFAULT_INLANG_PROJECT[key];
-			const { validLanguageTags: validLanguageTags$1 } = parseLanguageTagInput(options$6.availableLanguageTags);
+			const { validLanguageTags: validLanguageTags$1 } = parseLanguageTagInput(options$6.languageTags);
 			const baseLocale = validLanguageTags$1[0];
 			data.baseLocale = baseLocale;
 			data.locales = validLanguageTags$1;
@@ -3375,7 +3419,7 @@ var paraglide_default = defineAddon({
 				const scriptCode = new MagicString(script.generateCode());
 				const templateCode = new MagicString(template.source);
 				templateCode.append("\n\n<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>\n");
-				const { validLanguageTags: validLanguageTags$1 } = parseLanguageTagInput(options$6.availableLanguageTags);
+				const { validLanguageTags: validLanguageTags$1 } = parseLanguageTagInput(options$6.languageTags);
 				const links = validLanguageTags$1.map((x) => `${templateCode.getIndentString()}<button onclick={() => setLocale('${x}')}>${x}</button>`).join("\n");
 				templateCode.append(`<div>\n${links}\n</div>`);
 				templateCode.append("<p>\nIf you use VSCode, install the <a href=\"https://marketplace.visualstudio.com/items?itemName=inlang.vs-code-extension\" target=\"_blank\">Sherlock i18n extension</a> for a better i18n experience.\n</p>");
@@ -3385,7 +3429,7 @@ var paraglide_default = defineAddon({
 				});
 			});
 		}
-		const { validLanguageTags } = parseLanguageTagInput(options$6.availableLanguageTags);
+		const { validLanguageTags } = parseLanguageTagInput(options$6.languageTags);
 		for (const languageTag of validLanguageTags) sv.file(`messages/${languageTag}.json`, (content) => {
 			const { data, generateCode } = parseJson$1(content);
 			data["$schema"] = "https://inlang.com/schema/inlang-message-format";
@@ -3550,6 +3594,10 @@ var storybook_default = defineAddon({
 	shortDescription: "frontend workshop",
 	homepage: "https://storybook.js.org",
 	options: {},
+	setup: ({ runsAfter }) => {
+		runsAfter("vitest");
+		runsAfter("eslint");
+	},
 	run: async ({ sv }) => {
 		await sv.execute([
 			"storybook@latest",
@@ -3831,7 +3879,7 @@ var UnsupportedError = class extends Error {
 
 //#endregion
 //#region packages/cli/utils/common.ts
-var import_picocolors$3 = __toESM(require_picocolors$1(), 1);
+var import_picocolors$3 = __toESM$1(require_picocolors$1(), 1);
 const NO_PREFIX = "--no-";
 let options = [];
 function getLongFlag(flags) {
@@ -6580,7 +6628,7 @@ else if (err) return cb(err);
 
 //#endregion
 //#region packages/cli/commands/add/fetch-packages.ts
-var import_tar_fs = __toESM(require_tar_fs(), 1);
+var import_tar_fs = __toESM$1(require_tar_fs(), 1);
 const NODE_MODULES = fileURLToPath(new URL("../node_modules", import.meta.url));
 const REGISTRY = "https://registry.npmjs.org";
 const Directive = {
@@ -6702,24 +6750,101 @@ function getGlobalPreconditions(cwd, addons, addonSetupResult) {
 
 //#endregion
 //#region packages/cli/commands/add/index.ts
-var import_picocolors$2 = __toESM(require_picocolors$1(), 1);
+var import_picocolors$2 = __toESM$1(require_picocolors$1(), 1);
 const aliases = officialAddons.map((c) => c.alias).filter((v) => v !== undefined);
-const addonsOptions = getAddonOptionFlags();
+const addonOptions = getAddonOptionFlags();
 const communityDetails = [];
-const OptionFlagSchema = optional(array(string()));
-const addonOptionFlags = addonsOptions.reduce((flags, opt) => Object.assign(flags, { [opt.attributeName()]: OptionFlagSchema }), {});
 const AddonsSchema = array(string());
-const AddonOptionFlagsSchema = object(addonOptionFlags);
 const OptionsSchema$1 = strictObject({
 	cwd: string(),
 	install: union([boolean(), picklist(AGENT_NAMES)]),
 	preconditions: boolean(),
 	community: optional(union([AddonsSchema, boolean()])),
-	...AddonOptionFlagsSchema.entries
+	addons: record(string(), optional(array(string())))
 });
 const defaultPkgPath = up$1();
 const defaultCwd = defaultPkgPath ? path.dirname(defaultPkgPath) : undefined;
-const add = new Command("add").description("applies specified add-ons into a project").argument("[add-on...]", "add-ons to install").option("-C, --cwd <path>", "path to working directory", defaultCwd).option("--no-preconditions", "skip validating preconditions").option("--no-install", "skip installing dependencies").addOption(installOption).configureHelp(helpConfig).action((addonArgs, opts) => {
+const add = new Command("add").description("applies specified add-ons into a project").argument("[add-on...]", `add-ons to install`, (value, prev = []) => {
+	const [addonId, optionFlags] = value.split("=", 2);
+	const repeatedAddons = prev.find(({ id }) => id === addonId);
+	if (repeatedAddons) {
+		console.error(`Malformed arguments: Add-on '${addonId}' is repeated multiple times.`);
+		process$1.exit(1);
+	}
+	if (optionFlags === undefined) {
+		prev.push({
+			id: addonId,
+			options: undefined
+		});
+		return prev;
+	}
+	if (optionFlags.length > 0 && !/.+:.*/.test(optionFlags)) {
+		console.error(`Malformed arguments: An add-on's option in '${value}' is missing it's option name or value (e.g. 'addon=option:value').`);
+		process$1.exit(1);
+	}
+	const options$6 = optionFlags.match(/[^+]*:[^:]*(?=\+|$)/g) ?? [];
+	prev.push({
+		id: addonId,
+		options: options$6
+	});
+	return prev;
+}).option("-C, --cwd <path>", "path to working directory", defaultCwd).option("--no-preconditions", "skip validating preconditions").option("--no-install", "skip installing dependencies").addOption(installOption).configureHelp({
+	...helpConfig,
+	formatHelp(cmd, helper) {
+		const termWidth = helper.padWidth(cmd, helper);
+		const helpWidth = helper.helpWidth ?? 80;
+		function callFormatItem(term, description$1) {
+			return helper.formatItem(term, termWidth, description$1, helper);
+		}
+		let output = [`${helper.styleTitle("Usage:")} ${helper.styleUsage(helper.commandUsage(cmd))}`, ""];
+		const commandDescription = helper.commandDescription(cmd);
+		if (commandDescription.length > 0) output = output.concat([helper.boxWrap(helper.styleCommandDescription(commandDescription), helpWidth), ""]);
+		const argumentList = helper.visibleArguments(cmd).map((argument) => {
+			return callFormatItem(helper.styleArgumentTerm(helper.argumentTerm(argument)), helper.styleArgumentDescription(helper.argumentDescription(argument)));
+		});
+		if (argumentList.length > 0) output = output.concat([
+			helper.styleTitle("Arguments:"),
+			...argumentList,
+			""
+		]);
+		const addonList = addonOptions.map((option) => {
+			const description$1 = option.choices;
+			return callFormatItem(helper.styleArgumentTerm(option.id), helper.styleArgumentDescription(description$1));
+		});
+		if (addonList.length > 0) output = output.concat([
+			helper.styleTitle("Add-On Options:"),
+			...addonList,
+			""
+		]);
+		const optionList = helper.visibleOptions(cmd).map((option) => {
+			return callFormatItem(helper.styleOptionTerm(helper.optionTerm(option)), helper.styleOptionDescription(helper.optionDescription(option)));
+		});
+		if (optionList.length > 0) output = output.concat([
+			helper.styleTitle("Options:"),
+			...optionList,
+			""
+		]);
+		if (helper.showGlobalOptions) {
+			const globalOptionList = helper.visibleGlobalOptions(cmd).map((option) => {
+				return callFormatItem(helper.styleOptionTerm(helper.optionTerm(option)), helper.styleOptionDescription(helper.optionDescription(option)));
+			});
+			if (globalOptionList.length > 0) output = output.concat([
+				helper.styleTitle("Global Options:"),
+				...globalOptionList,
+				""
+			]);
+		}
+		const commandList = helper.visibleCommands(cmd).map((cmd$1) => {
+			return callFormatItem(helper.styleSubcommandTerm(helper.subcommandTerm(cmd$1)), helper.styleSubcommandDescription(helper.subcommandDescription(cmd$1)));
+		});
+		if (commandList.length > 0) output = output.concat([
+			helper.styleTitle("Commands:"),
+			...commandList,
+			""
+		]);
+		return output.join("\n");
+	}
+}).action((addonArgs, opts) => {
 	if (opts.cwd === undefined) {
 		console.error("Invalid workspace: Please verify that you are inside of a Svelte project. You can also specify the working directory with `--cwd <path>`");
 		process$1.exit(1);
@@ -6727,21 +6852,24 @@ const add = new Command("add").description("applies specified add-ons into a pro
 		console.error(`Invalid workspace: Path '${path.resolve(opts.cwd)}' is not a valid workspace.`);
 		process$1.exit(1);
 	}
-	const specifiedAddons = parse(AddonsSchema, addonArgs);
-	const options$6 = parse(OptionsSchema$1, opts);
 	const addonIds = officialAddons.map((addon) => addon.id);
-	const invalidAddons = specifiedAddons.filter((a) => !addonIds.includes(a) && !aliases.includes(a));
+	const invalidAddons = addonArgs.filter(({ id }) => !addonIds.includes(id) && !aliases.includes(id)).map(({ id }) => id);
 	if (invalidAddons.length > 0) {
 		console.error(`Invalid add-ons specified: ${invalidAddons.join(", ")}`);
 		process$1.exit(1);
 	}
-	const selectedAddons = transformAliases(specifiedAddons);
+	const options$6 = parse(OptionsSchema$1, {
+		...opts,
+		addons: {}
+	});
+	const selectedAddons = transformAliases(addonArgs);
+	selectedAddons.forEach((addon) => options$6.addons[addon.id] = addon.options);
 	runCommand(async () => {
-		const { nextSteps } = await runAddCommand(options$6, selectedAddons);
+		const selectedAddonIds = selectedAddons.map(({ id }) => id);
+		const { nextSteps } = await runAddCommand(options$6, selectedAddonIds);
 		if (nextSteps) box(nextSteps, "Next steps");
 	});
 });
-for (const option of addonsOptions) add.addOption(option);
 async function runAddCommand(options$6, selectedAddonIds) {
 	const selectedAddons = selectedAddonIds.map((id) => ({
 		type: "official",
@@ -6749,10 +6877,9 @@ async function runAddCommand(options$6, selectedAddonIds) {
 	}));
 	const official = {};
 	const community = {};
-	for (const addonOption of addonsOptions) {
-		const addonId = addonOption.name();
-		const aliased = addonOption.attributeName();
-		const specifiedOptions = options$6[addonId] || options$6[aliased];
+	for (const addonOption of addonOptions) {
+		const addonId = addonOption.id;
+		const specifiedOptions = options$6.addons[addonId];
 		if (!specifiedOptions) continue;
 		const details$1 = getAddonDetails(addonId);
 		if (!selectedAddons.find((d) => d.addon === details$1)) selectedAddons.push({
@@ -6761,26 +6888,26 @@ async function runAddCommand(options$6, selectedAddonIds) {
 		});
 		official[addonId] ??= {};
 		const optionEntries = Object.entries(details$1.options);
-		for (const specifiedOption of specifiedOptions) {
-			if (!specifiedOption || specifiedOption === "none") continue;
-			const optionEntry = optionEntries.find(([id, question$1]) => {
-				if (question$1.type === "boolean") return id === specifiedOption || `no-${id}` === specifiedOption;
-				if (question$1.type === "select" || question$1.type === "multiselect") return question$1.options.some((o) => o.value === specifiedOption);
-			});
+		for (const option of specifiedOptions) {
+			let [optionId, optionValue] = option.split(":", 2);
+			const optionEntry = optionEntries.find(([id, question$1]) => id === optionId || question$1.group === optionId);
 			if (!optionEntry) {
 				const { choices } = getOptionChoices(details$1);
-				throw new Error(`Invalid '--${addonId}' option: '${specifiedOption}'\nAvailable options: ${choices.join(", ")}`);
+				throw new Error(`Invalid '${addonId}' option: '${option}'\nAvailable options: ${choices.join(", ")}`);
 			}
 			const [questionId, question] = optionEntry;
+			if (question.type === "multiselect" && optionValue === "none") optionValue = "";
 			let existingOption = official[addonId][questionId];
 			if (existingOption !== undefined) {
-				if (typeof existingOption === "boolean") existingOption = existingOption ? questionId : `no-${questionId}`;
-				throw new Error(`Conflicting '--${addonId}' option: '${specifiedOption}' conflicts with '${existingOption}'`);
+				if (typeof existingOption === "boolean") existingOption = existingOption ? "yes" : "no";
+				throw new Error(`Conflicting '${addonId}' option: '${option}' conflicts with '${questionId}:${existingOption}'`);
 			}
-			official[addonId][questionId] = question.type === "boolean" ? !specifiedOption.startsWith("no-") : specifiedOption;
+			if (question.type === "boolean") official[addonId][questionId] = optionValue === "yes";
+else if (question.type === "number") official[addonId][questionId] = Number(optionValue);
+else official[addonId][questionId] = optionValue;
 		}
 		for (const [id, question] of Object.entries(details$1.options)) if (question.condition?.(official[addonId]) !== false) official[addonId][id] ??= question.default;
-else if (official[addonId][id] !== undefined) throw new Error(`Incompatible '--${addonId}' option specified: '${official[addonId][id]}'`);
+else if (official[addonId][id] !== undefined) throw new Error(`Incompatible '${addonId}' option specified: '${official[addonId][id]}'`);
 	}
 	if (options$6.community === true) {
 		const communityAddons = await Promise.all(communityAddonIds.map(async (id) => await getCommunityAddon(id)));
@@ -6856,14 +6983,14 @@ else if (official[addonId][id] !== undefined) throw new Error(`Incompatible '--$
 	let workspace = await createWorkspace({ cwd: options$6.cwd });
 	const addonSetupResults = setupAddons(officialAddons, workspace);
 	if (selectedAddons.length === 0) {
-		const addonOptions = officialAddons.filter(({ id }) => addonSetupResults[id].unsupported.length === 0).map(({ id, homepage: homepage$1, shortDescription }) => ({
+		const addonOptions$1 = officialAddons.filter(({ id }) => addonSetupResults[id].unsupported.length === 0).map(({ id, homepage: homepage$1, shortDescription }) => ({
 			label: id,
 			value: id,
 			hint: `${shortDescription} - ${homepage$1}`
 		}));
 		const selected = await multiselect({
 			message: `What would you like to add to your project? ${import_picocolors$2.default.dim("(use arrow keys / space bar)")}`,
-			options: addonOptions,
+			options: addonOptions$1,
 			required: false
 		});
 		if (isCancel(selected)) {
@@ -7025,13 +7152,16 @@ else if (official[addonId][id] !== undefined) throw new Error(`Incompatible '--$
 /**
 * Dedupes and transforms aliases into their respective addon id
 */
-function transformAliases(ids) {
-	const set = new Set();
-	for (const id of ids) if (aliases.includes(id)) {
-		const addon = officialAddons.find((a) => a.alias === id);
-		set.add(addon.id);
-	} else set.add(id);
-	return Array.from(set);
+function transformAliases(addons) {
+	const set = new Map();
+	for (const addon of addons) if (aliases.includes(addon.id)) {
+		const officialAddon = officialAddons.find((a) => a.alias === addon.id);
+		set.set(officialAddon.id, {
+			id: officialAddon.id,
+			options: addon.options
+		});
+	} else set.set(addon.id, addon);
+	return Array.from(set.values());
 }
 function getAddonOptionFlags() {
 	const options$6 = [];
@@ -7042,12 +7172,11 @@ function getAddonOptionFlags() {
 		const { defaults, groups } = getOptionChoices(details);
 		const choices = Object.entries(groups).map(([group$1, choices$1]) => `${import_picocolors$2.default.dim(`${group$1}:`)} ${choices$1.join(", ")}`).join("\n");
 		const preset = defaults.join(", ") || "none";
-		const option = new Option(`--${id} [options...]`, `${id} add-on options ${import_picocolors$2.default.dim(`(preset: ${preset})`)}\n${choices}`).preset(preset).argParser((value, prev) => {
-			prev ??= [];
-			prev = prev.concat(value.split(/\s|,/));
-			return prev;
+		options$6.push({
+			id,
+			choices,
+			preset
 		});
-		options$6.push(option);
 	}
 	return options$6;
 }
@@ -7060,7 +7189,7 @@ function getOptionChoices(details) {
 		let values = [];
 		const applyDefault = question.condition?.(options$6) !== false;
 		if (question.type === "boolean") {
-			values = [id, `no-${id}`];
+			values = ["yes", `no`];
 			if (applyDefault) {
 				options$6[id] = question.default;
 				defaults.push(question.default ? values[0] : values[1]);
@@ -7080,6 +7209,13 @@ function getOptionChoices(details) {
 				defaults.push(...question.default);
 			}
 		}
+		if (question.type === "string" || question.type === "number") {
+			values = ["<user-input>"];
+			if (applyDefault) {
+				options$6[id] = question.default;
+				defaults.push(question.default.toString());
+			}
+		}
 		choices.push(...values);
 		const groupId = question.group ?? id;
 		groups[groupId] ??= [];
@@ -7094,7 +7230,7 @@ function getOptionChoices(details) {
 
 //#endregion
 //#region packages/cli/commands/create.ts
-var import_picocolors$1 = __toESM(require_picocolors$1(), 1);
+var import_picocolors$1 = __toESM$1(require_picocolors$1(), 1);
 const langs = ["ts", "jsdoc"];
 const langMap = {
 	ts: "typescript",
@@ -7223,7 +7359,8 @@ async function createProject(cwd, options$6) {
 			cwd: projectPath,
 			install: options$6.install,
 			preconditions: false,
-			community: []
+			community: [],
+			addons: {}
 		}, []);
 		packageManager = pm;
 		addOnNextSteps = nextSteps;
@@ -7261,7 +7398,7 @@ function runMigrate(cwd, args) {
 
 //#endregion
 //#region packages/cli/commands/check.ts
-var import_picocolors = __toESM(require_picocolors$1(), 1);
+var import_picocolors = __toESM$1(require_picocolors$1(), 1);
 const check = new Command("check").description("a CLI for checking your Svelte code").allowUnknownOption(true).allowExcessArguments(true).option("-C, --cwd <path>", "path to working directory", process$1.cwd()).configureHelp({ formatHelp() {
 	runCheck(process$1.cwd(), ["--help"]);
 	return "";

package/dist/index.js

@@ -1,4 +1,4 @@
 import { create } from "./package-manager-D3PRQ-L_.js";
-import { installAddon } from "./install-DP0ugKT8.js";
+import { installAddon } from "./install-BTJ6iCTS.js";
 
 export { create, installAddon };

package/dist/{install-DP0ugKT8.js → install-BTJ6iCTS.js}

@@ -159,7 +159,7 @@ else mindent = Math.min(mindent, indent);
 }
 
 //#endregion
-//#region packages/core/dist/common-B-wxp0Ti.js
+//#region packages/core/dist/common-CeY_dUZD.js
 function decircular(object) {
 	const seenObjects = new WeakMap();
 	function internalDecircular(value, path$1 = []) {
@@ -280,6 +280,7 @@ function addFromString(ast, value) {
 }
 function expressionFromString(value) {
 	const program = parseScript(dedent_default(value));
+	stripAst(program, ["raw"]);
 	const statement = program.body[0];
 	if (statement.type !== "ExpressionStatement") throw new Error("value passed was not an expression");
 	return statement.expression;
@@ -1038,12 +1039,17 @@ function setupAddons(addons, workspace) {
 	for (const addon of addons) {
 		const setupResult = {
 			unsupported: [],
-			dependsOn: []
+			dependsOn: [],
+			runsAfter: []
 		};
 		addon.setup?.({
 			...workspace,
-			dependsOn: (name) => setupResult.dependsOn.push(name),
-			unsupported: (reason) => setupResult.unsupported.push(reason)
+			dependsOn: (name) => {
+				setupResult.dependsOn.push(name);
+				setupResult.runsAfter.push(name);
+			},
+			unsupported: (reason) => setupResult.unsupported.push(reason),
+			runsAfter: (name) => setupResult.runsAfter.push(name)
 		});
 		addonSetupResults[addon.id] = setupResult;
 	}
@@ -1118,9 +1124,7 @@ async function runAddon({ addon, multiple, workspace }) {
 }
 function orderAddons(addons, setupResults) {
 	return addons.sort((a, b) => {
-		if (a.id === "storybook") return 1;
-		if (b.id === "storybook") return -1;
-		return setupResults[a.id]?.dependsOn?.length - setupResults[b.id]?.dependsOn?.length;
+		return setupResults[a.id]?.runsAfter?.length - setupResults[b.id]?.runsAfter?.length;
 	});
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "type": "module",
   "description": "A CLI for creating and updating SvelteKit projects",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "tinyexec": "^0.3.2",
     "valibot": "^0.41.0",
     "@sveltejs/cli-core": "0.0.0",
-    "@sveltejs/clack-prompts": "0.9.1",
+    "@sveltejs/addons": "0.0.0",
     "@sveltejs/create": "0.0.0",
-    "@sveltejs/addons": "0.0.0"
+    "@sveltejs/clack-prompts": "0.9.1"
   },
   "keywords": [
     "create",