sv 0.9.4 → 0.9.5

package/dist/{addons-DT8tgFSU.js → addons-CkfbAJXX.js}

@@ -1,4 +1,4 @@
-import { Element, T, Tag, __commonJS, __export, __toESM, __toESM$1, be, detect, esm_exports, getUserAgent, parseCss$1, parseHtml, parseHtml$1, parseJson$1, parseScript, parseScript$1, parseSvelte, require_picocolors, require_picocolors$1, resolveCommand, serializeScript, stripAst, up, walk, walk_exports } from "./package-manager-DO5R9a6p.js";
+import { Element, T, Tag, __commonJS, __export, __toESM, __toESM$1, be, detect, esm_exports, getUserAgent, parseCss$1, parseHtml, parseHtml$1, parseJson$1, parseScript, parseScript$1, parseSvelte, require_picocolors as require_picocolors$1, require_picocolors$1 as require_picocolors, resolveCommand, serializeScript, stripAst, up, walk, walk_exports } from "./package-manager-DO5R9a6p.js";
 import fs, { existsSync, lstatSync, readdirSync } from "node:fs";
 import path, { dirname, join } from "node:path";
 import process$1, { stdin, stdout } from "node:process";
@@ -288,25 +288,23 @@ else node.elements.unshift(element);
 }
 var object_exports = {};
 __export(object_exports, {
-	addProperties: () => addProperties,
 	create: () => create,
 	overrideProperties: () => overrideProperties,
-	overrideProperty: () => overrideProperty,
 	property: () => property,
-	removeProperty: () => removeProperty
+	propertyNode: () => propertyNode
 });
 function property(node, options$6) {
+	return propertyNode(node, options$6).value;
+}
+function propertyNode(node, options$6) {
 	const properties = node.properties.filter((x$2) => x$2.type === "Property");
 	let prop = properties.find((x$2) => x$2.key.name === options$6.name);
-	let propertyValue;
-	if (prop) propertyValue = prop.value;
-else {
+	if (!prop) {
 		let isShorthand = false;
 		if (options$6.fallback.type === "Identifier") {
 			const identifier = options$6.fallback;
 			isShorthand = identifier.name === options$6.name;
 		}
-		propertyValue = options$6.fallback;
 		prop = {
 			type: "Property",
 			shorthand: isShorthand,
@@ -314,14 +312,32 @@ else {
 				type: "Identifier",
 				name: options$6.name
 			},
-			value: propertyValue,
+			value: options$6.fallback,
 			kind: "init",
 			computed: false,
 			method: false
 		};
 		node.properties.push(prop);
 	}
-	return propertyValue;
+	return prop;
+}
+function create(properties) {
+	const objectExpression = {
+		type: "ObjectExpression",
+		properties: []
+	};
+	return populateObjectExpression({
+		objectExpression,
+		properties,
+		override: false
+	});
+}
+function overrideProperties(objectExpression, properties) {
+	populateObjectExpression({
+		objectExpression,
+		properties,
+		override: true
+	});
 }
 function overrideProperty(node, options$6) {
 	const properties = node.properties.filter((x$2) => x$2.type === "Property");
@@ -333,51 +349,42 @@ function overrideProperty(node, options$6) {
 	prop.value = options$6.value;
 	return options$6.value;
 }
-function overrideProperties(node, options$6) {
-	for (const [prop, value] of Object.entries(options$6.properties)) {
-		if (value === undefined) continue;
-		overrideProperty(node, {
-			name: prop,
-			value
-		});
-	}
-}
-function addProperties(node, options$6) {
-	for (const [prop, value] of Object.entries(options$6.properties)) {
-		if (value === undefined) continue;
-		property(node, {
-			name: prop,
-			fallback: value
-		});
-	}
-}
-function removeProperty(node, options$6) {
-	const properties = node.properties.filter((x$2) => x$2.type === "Property");
-	const propIdx = properties.findIndex((x$2) => x$2.key.name === options$6.name);
-	if (propIdx !== -1) node.properties.splice(propIdx, 1);
-}
-function create(properties) {
-	const objExpression = {
-		type: "ObjectExpression",
-		properties: []
-	};
-	const getExpression = (value) => {
+function populateObjectExpression(options$6) {
+	const getExpression = (value, existingExpression) => {
 		let expression;
 		if (Array.isArray(value)) {
 			expression = create$1();
 			for (const v$2 of value) append(expression, getExpression(v$2));
-		} else if (typeof value === "object" && value !== null) expression = value.type !== undefined ? value : create(value);
+		} else if (typeof value === "object" && value !== null) if (value.type !== undefined) expression = value;
+else if (options$6.override && existingExpression && existingExpression.type === "ObjectExpression") expression = populateObjectExpression({
+			objectExpression: existingExpression,
+			properties: value,
+			override: options$6.override
+		});
+else expression = populateObjectExpression({
+			objectExpression: create({}),
+			properties: value,
+			override: options$6.override
+		});
 else expression = createLiteral(value);
 		return expression;
 	};
-	for (const [prop, value] of Object.entries(properties)) {
+	for (const [prop, value] of Object.entries(options$6.properties)) {
 		if (value === undefined) continue;
-		property(objExpression, {
+		if (options$6.override) {
+			const existingProperties = options$6.objectExpression.properties.filter((x$2) => x$2.type === "Property");
+			const existingProperty = existingProperties.find((x$2) => x$2.key.name === prop);
+			const existingExpression = existingProperty?.value.type === "ObjectExpression" ? existingProperty.value : undefined;
+			overrideProperty(options$6.objectExpression, {
+				name: prop,
+				value: getExpression(value, existingExpression)
+			});
+		} else property(options$6.objectExpression, {
 			name: prop,
 			fallback: getExpression(value)
 		});
 	}
-	return objExpression;
+	return options$6.objectExpression;
 }
 var function_exports = {};
 __export(function_exports, {
@@ -889,7 +896,7 @@ const addPlugin = (ast, options$6) => {
 
 //#endregion
 //#region packages/cli/commands/add/utils.ts
-var import_picocolors$5 = __toESM$1(require_picocolors$1(), 1);
+var import_picocolors$5 = __toESM$1(require_picocolors(), 1);
 function getPackageJson(cwd) {
 	const packageText = readFile(cwd, commonFilePaths.packageJson);
 	if (!packageText) {
@@ -1063,7 +1070,7 @@ function parseKitOptions(cwd) {
 
 //#endregion
 //#region packages/cli/lib/install.ts
-var import_picocolors$4 = __toESM$1(require_picocolors$1(), 1);
+var import_picocolors$4 = __toESM$1(require_picocolors(), 1);
 async function installAddon({ addons, cwd, options: options$6, packageManager = "npm" }) {
 	const workspace = await createWorkspace({
 		cwd,
@@ -1271,7 +1278,7 @@ else if (y > 0) ret += `${CSI}${y}B`;
 	};
 } });
 var import_src$1 = __toESM(require_src(), 1);
-var import_picocolors$3 = __toESM(require_picocolors(), 1);
+var import_picocolors$3 = __toESM(require_picocolors$1(), 1);
 function hu({ onlyFirst: e$1 = !1 } = {}) {
 	const t = ["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?(?:\\u0007|\\u001B\\u005C|\\u009C))", "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))"].join("|");
 	return new RegExp(t, e$1 ? void 0 : "g");
@@ -2006,8 +2013,8 @@ B$1 = new WeakMap(), k$1 = new WeakMap(), I = new WeakMap(), v$1 = new WeakMap()
 		e$1 ? this.filteredOptions = D$1.filter((t) => x$1(this, I).call(this, e$1, t)) : this.filteredOptions = [...D$1], m(this, B$1, FD(this.focusedValue, this.filteredOptions)), this.focusedValue = this.filteredOptions[x$1(this, B$1)]?.value, this.multiple || (this.focusedValue !== void 0 ? this.toggleSelected(this.focusedValue) : this.deselectAll());
 	}
 };
-var import_picocolors$1 = __toESM(require_picocolors(), 1);
-var import_picocolors$2 = __toESM(require_picocolors(), 1);
+var import_picocolors$1 = __toESM(require_picocolors$1(), 1);
+var import_picocolors$2 = __toESM(require_picocolors$1(), 1);
 var import_src = __toESM(require_src(), 1);
 function Pe() {
 	return process$1.platform !== "win32" ? process$1.env.TERM !== "linux" : !!process$1.env.CI || !!process$1.env.WT_SESSION || !!process$1.env.TERMINUS_SUBLIME || process$1.env.ConEmuTask === "{cmd::Cmder}" || process$1.env.TERM_PROGRAM === "Terminus-Sublime" || process$1.env.TERM_PROGRAM === "vscode" || process$1.env.TERM === "xterm-256color" || process$1.env.TERM === "alacritty" || process$1.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
@@ -2708,7 +2715,7 @@ else return true;
 	if (version.patch === below.patch) return false;
 	return undefined;
 }
-var import_picocolors = __toESM(require_picocolors(), 1);
+var import_picocolors = __toESM(require_picocolors$1(), 1);
 var colors = import_picocolors.default;
 
 //#endregion
@@ -3197,11 +3204,12 @@ var eslint_default = defineAddon({
 	options: {},
 	run: ({ sv, typescript, dependencyVersion }) => {
 		const prettierInstalled = Boolean(dependencyVersion("prettier"));
-		sv.devDependency("eslint", "^9.18.0");
+		sv.devDependency("eslint", "^9.22.0");
 		sv.devDependency("@eslint/compat", "^1.2.5");
 		sv.devDependency("eslint-plugin-svelte", "^3.0.0");
 		sv.devDependency("globals", "^16.0.0");
-		sv.devDependency("@eslint/js", "^9.18.0");
+		sv.devDependency("@eslint/js", "^9.22.0");
+		sv.devDependency("@types/node", getNodeTypesVersion());
 		if (typescript) sv.devDependency("typescript-eslint", "^8.20.0");
 		if (prettierInstalled) sv.devDependency("eslint-config-prettier", "^10.0.1");
 		sv.file("package.json", (content) => {
@@ -3282,7 +3290,7 @@ var eslint_default = defineAddon({
 			let exportExpression;
 			if (typescript) {
 				const tsConfigCall = function_exports.createCall({
-					name: "ts.config",
+					name: "defineConfig",
 					args: []
 				});
 				tsConfigCall.arguments.push(...eslintConfigs);
@@ -3302,14 +3310,14 @@ var eslint_default = defineAddon({
 				from: "typescript-eslint",
 				as: "ts"
 			});
-			imports_exports.addNamed(ast, {
-				from: "node:url",
-				imports: ["fileURLToPath"]
-			});
 			imports_exports.addDefault(ast, {
 				from: "globals",
 				as: "globals"
 			});
+			if (typescript) imports_exports.addNamed(ast, {
+				from: "eslint/config",
+				imports: ["defineConfig"]
+			});
 			imports_exports.addDefault(ast, {
 				from: "eslint-plugin-svelte",
 				as: "svelte"
@@ -3322,6 +3330,10 @@ var eslint_default = defineAddon({
 				from: "@eslint/compat",
 				imports: ["includeIgnoreFile"]
 			});
+			imports_exports.addNamed(ast, {
+				from: "node:url",
+				imports: ["fileURLToPath"]
+			});
 			return generateCode();
 		});
 		if (prettierInstalled) sv.file("eslint.config.js", addEslintConfigPrettier);
@@ -4423,16 +4435,16 @@ var lucia_default = defineAddon({
 						"integer"
 					]
 				});
-				object_exports.overrideProperties(userAttributes, { properties: { id: common_exports.parseExpression("text('id').primaryKey()") } });
-				if (options$6.demo) object_exports.overrideProperties(userAttributes, { properties: {
+				object_exports.overrideProperties(userAttributes, { id: common_exports.parseExpression("text('id').primaryKey()") });
+				if (options$6.demo) object_exports.overrideProperties(userAttributes, {
 					username: common_exports.parseExpression("text('username').notNull().unique()"),
 					passwordHash: common_exports.parseExpression("text('password_hash').notNull()")
-				} });
-				object_exports.overrideProperties(sessionAttributes, { properties: {
+				});
+				object_exports.overrideProperties(sessionAttributes, {
 					id: common_exports.parseExpression("text('id').primaryKey()"),
 					userId: common_exports.parseExpression("text('user_id').notNull().references(() => user.id)"),
 					expiresAt: common_exports.parseExpression("integer('expires_at', { mode: 'timestamp' }).notNull()")
-				} });
+				});
 			}
 			if (drizzleDialect === "mysql") {
 				imports_exports.addNamed(ast, {
@@ -4443,16 +4455,16 @@ var lucia_default = defineAddon({
 						"datetime"
 					]
 				});
-				object_exports.overrideProperties(userAttributes, { properties: { id: common_exports.parseExpression("varchar('id', { length: 255 }).primaryKey()") } });
-				if (options$6.demo) object_exports.overrideProperties(userAttributes, { properties: {
+				object_exports.overrideProperties(userAttributes, { id: common_exports.parseExpression("varchar('id', { length: 255 }).primaryKey()") });
+				if (options$6.demo) object_exports.overrideProperties(userAttributes, {
 					username: common_exports.parseExpression("varchar('username', { length: 32 }).notNull().unique()"),
 					passwordHash: common_exports.parseExpression("varchar('password_hash', { length: 255 }).notNull()")
-				} });
-				object_exports.overrideProperties(sessionAttributes, { properties: {
+				});
+				object_exports.overrideProperties(sessionAttributes, {
 					id: common_exports.parseExpression("varchar('id', { length: 255 }).primaryKey()"),
 					userId: common_exports.parseExpression("varchar('user_id', { length: 255 }).notNull().references(() => user.id)"),
 					expiresAt: common_exports.parseExpression("datetime('expires_at').notNull()")
-				} });
+				});
 			}
 			if (drizzleDialect === "postgresql") {
 				imports_exports.addNamed(ast, {
@@ -4463,16 +4475,16 @@ var lucia_default = defineAddon({
 						"timestamp"
 					]
 				});
-				object_exports.overrideProperties(userAttributes, { properties: { id: common_exports.parseExpression("text('id').primaryKey()") } });
-				if (options$6.demo) object_exports.overrideProperties(userAttributes, { properties: {
+				object_exports.overrideProperties(userAttributes, { id: common_exports.parseExpression("text('id').primaryKey()") });
+				if (options$6.demo) object_exports.overrideProperties(userAttributes, {
 					username: common_exports.parseExpression("text('username').notNull().unique()"),
 					passwordHash: common_exports.parseExpression("text('password_hash').notNull()")
-				} });
-				object_exports.overrideProperties(sessionAttributes, { properties: {
+				});
+				object_exports.overrideProperties(sessionAttributes, {
 					id: common_exports.parseExpression("text('id').primaryKey()"),
 					userId: common_exports.parseExpression("text('user_id').notNull().references(() => user.id)"),
 					expiresAt: common_exports.parseExpression("timestamp('expires_at', { withTimezone: true, mode: 'date' }).notNull()")
-				} });
+				});
 			}
 			let code = generateCode();
 			if (typescript) {
@@ -4971,10 +4983,7 @@ var mdsvex_default = defineAddon({
 				const previousElement = preprocessorArray;
 				preprocessorArray = array_exports.create();
 				array_exports.append(preprocessorArray, previousElement);
-				object_exports.overrideProperty(exportDefault, {
-					name: "preprocess",
-					value: preprocessorArray
-				});
+				object_exports.overrideProperties(exportDefault, { preprocess: preprocessorArray });
 			}
 			const mdsvexCall = function_exports.createCall({
 				name: "mdsvex",
@@ -5243,19 +5252,19 @@ var playwright_default = defineAddon({
 			const defineConfig = common_exports.parseExpression("defineConfig({})");
 			const { value: defaultExport } = exports_exports.createDefault(ast, { fallback: defineConfig });
 			const config = {
-				webServer: object_exports.create({
+				webServer: {
 					command: "npm run build && npm run preview",
 					port: 4173
-				}),
-				testDir: common_exports.createLiteral("e2e")
+				},
+				testDir: "e2e"
 			};
 			if (defaultExport.type === "CallExpression" && defaultExport.arguments[0]?.type === "ObjectExpression") {
 				imports_exports.addNamed(ast, {
-					from: "@playwright/test",
-					imports: ["defineConfig"]
+					imports: ["defineConfig"],
+					from: "@playwright/test"
 				});
-				object_exports.addProperties(defaultExport.arguments[0], { properties: config });
-			} else if (defaultExport.type === "ObjectExpression") object_exports.addProperties(defaultExport, { properties: config });
+				object_exports.overrideProperties(defaultExport.arguments[0], config);
+			} else if (defaultExport.type === "ObjectExpression") object_exports.overrideProperties(defaultExport, config);
 else T$2.warn("Unexpected playwright config for playwright add-on. Could not update.");
 			return generateCode();
 		});
@@ -5437,20 +5446,23 @@ var sveltekit_adapter_default = defineAddon({
 				as: adapterName
 			});
 			const { value: config } = exports_exports.createDefault(ast, { fallback: object_exports.create({}) });
-			const kitConfig = config.properties.find((p$1) => p$1.type === "Property" && p$1.key.type === "Identifier" && p$1.key.name === "kit");
-			if (kitConfig && kitConfig.value.type === "ObjectExpression") {
-				const adapterProp = kitConfig.value.properties.find((p$1) => p$1.type === "Property" && p$1.key.type === "Identifier" && p$1.key.name === "adapter");
-				if (adapterProp) adapterProp.leadingComments = [];
-				object_exports.overrideProperties(kitConfig.value, { properties: { adapter: function_exports.createCall({
-					name: adapterName,
-					args: [],
-					useIdentifiers: true
-				}) } });
-			} else object_exports.addProperties(config, { properties: { kit: object_exports.create({ adapter: function_exports.createCall({
+			object_exports.overrideProperties(config, { kit: { adapter: function_exports.createCall({
 				name: adapterName,
 				args: [],
 				useIdentifiers: true
-			}) }) } });
+			}) } });
+			if (adapter.package !== "@sveltejs/adapter-auto") {
+				const fallback = object_exports.create({});
+				const cfgKitValue = object_exports.property(config, {
+					name: "kit",
+					fallback
+				});
+				const cfgAdapter = object_exports.propertyNode(cfgKitValue, {
+					name: "adapter",
+					fallback
+				});
+				cfgAdapter.leadingComments = [];
+			}
 			return generateCode();
 		});
 	}