sv 1.1.0 → 1.1.1

package/dist/{addons-OcP_HeQ_.mjs → addons-DaktRhvH.mjs}

@@ -1,4 +1,4 @@
-import { D as getSharedFiles, pt as R, v as defineAddon, y as defineAddonOptions } from "./engine-DB9amJxd.mjs";
+import { D as getSharedFiles, pt as R, v as defineAddon, y as defineAddonOptions } from "./engine-CpcTzL2R.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import { KIT3_TSCONFIG, Walker, coerceVersion, color, createPrinter, dedent, defineDemoPage, defineEnv, fileExists, isKit3, loadPackageJson, pnpm, resolveCommandArray, resolveLibPrefix, sanitizeName, svelteConfig, transforms } from "@sveltejs/sv-utils";

package/dist/bin.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { $ as parse$1, A as cliOptions, B as runAndValidateVerifications, C as execSync, D as getSharedFiles, E as dist, F as getPadding, G as UnsupportedError, H as updateAgent, I as helpConfig, J as array, K as name, L as isNodeError, M as filePaths, N as forwardExitCode, O as PackageJSONSchema, P as getHelpSections, Q as optional, R as normalizePosix, S as exec, T as templates, U as updateLibraryBuild, V as runCommand, W as updateReadme, X as literal, Y as boolean, Z as nonEmpty, _ as createLoadedAddon, _t as pe, a as setupAddons, at as string, b as getErrorHint, bt as R$1, c as AGENT_NAMES, ct as program, d as installDependencies, dt as Ce, et as picklist, f as installOption, ft as Ee, g as from, gt as le, h as up$2, ht as ge, i as prepareSvApi, it as strictObject, j as errorAndExit, k as buildAndLogArgs, l as addAllowBuildsIfPnpm, lt as Command, m as up$1, mt as Re, n as applyAddons, nt as record, o as createWorkspace, ot as transform, p as packageManagerPrompt, pt as R, q as version, r as orderAddons, rt as safeParse, s as findWorkspaceRoot, st as union, tt as pipe, u as detectPackageManager, ut as Option, vt, w as create$1, x as NonZeroExitError, yt as we, z as parseAddonOptions } from "./engine-DB9amJxd.mjs";
-import { n as officialAddons$1, t as getAddonDetails } from "./addons-OcP_HeQ_.mjs";
+import { $ as parse$1, A as cliOptions, B as runAndValidateVerifications, C as execSync, D as getSharedFiles, E as dist, F as getPadding, G as UnsupportedError, H as updateAgent, I as helpConfig, J as array, K as name, L as isNodeError, M as filePaths, N as forwardExitCode, O as PackageJSONSchema, P as getHelpSections, Q as optional, R as normalizePosix, S as exec, T as templates, U as updateLibraryBuild, V as runCommand, W as updateReadme, X as literal, Y as boolean, Z as nonEmpty, _ as createLoadedAddon, _t as pe, a as setupAddons, at as string, b as getErrorHint, bt as R$1, c as AGENT_NAMES, ct as program, d as installDependencies, dt as Ce, et as picklist, f as installOption, ft as Ee, g as from, gt as le, h as up$2, ht as ge, i as prepareSvApi, it as strictObject, j as errorAndExit, k as buildAndLogArgs, l as addAllowBuildsIfPnpm, lt as Command, m as up$1, mt as Re, n as applyAddons, nt as record, o as createWorkspace, ot as transform, p as packageManagerPrompt, pt as R, q as version, r as orderAddons, rt as safeParse, s as findWorkspaceRoot, st as union, tt as pipe, u as detectPackageManager, ut as Option, vt, w as create$1, x as NonZeroExitError, yt as we, z as parseAddonOptions } from "./engine-CpcTzL2R.mjs";
+import { n as officialAddons$1, t as getAddonDetails } from "./addons-DaktRhvH.mjs";
 import * as fs$1 from "node:fs";
 import fs from "node:fs";
 import * as path$1 from "node:path";
@@ -3846,7 +3846,7 @@ var lib_alias_default = defineMigrationTask({
 			};
 		}));
 		sv.files({
-			include: `${directory.src}/**/*.{svelte,svelte.ts,svelte.js,ts,js,svx,md}`,
+			include: `**/*.{svelte,svelte.ts,svelte.js,ts,js,svx,md}`,
 			where: (content) => content.includes("$lib")
 		}, (content, file) => {
 			let styleLibPath = path.posix.relative(path.posix.dirname(file.replaceAll("\\", "/")), directory.lib.replaceAll("\\", "/"));
@@ -3859,7 +3859,7 @@ var lib_alias_default = defineMigrationTask({
 						".ts",
 						"/index.js",
 						"/index.ts"
-					]) if (fs.existsSync(`${cwd}/${directory.lib}/${import_path}${ending}`)) return match.slice(0, -1) + ending.replace(".ts", ".js") + match.slice(-1);
+					]) if (fs.existsSync(path.join(cwd, directory.lib, import_path + ending))) return match.slice(0, -1) + ending.replace(".ts", ".js") + match.slice(-1);
 				}
 				return match;
 			});
@@ -3873,7 +3873,7 @@ const KIT3_MIN_VERSIONS = {
 	vite: "^8.0.12",
 	"@sveltejs/vite-plugin-svelte": "^7.0.0",
 	svelte: "^5.57.1",
-	"@sveltejs/package": "^2.5.8",
+	"@sveltejs/package": "^3.0.0",
 	"svelte-check": "^4.7.5",
 	typescript: "^6.0.0"
 };
@@ -4487,18 +4487,29 @@ function gotoOptions(replace, state) {
 function migrateNavigationHook(call) {
 	const callback = call.arguments[0];
 	if (callback?.type !== "ArrowFunctionExpression" && callback?.type !== "FunctionExpression") return false;
-	const shallow = shallowTest(callback);
-	if (!shallow) return false;
+	const properties = navigationHookProperties(callback);
+	if (!properties) return false;
+	const [shallow, type] = properties;
 	const guard = {
 		type: "IfStatement",
-		test: shallow,
+		test: {
+			type: "LogicalExpression",
+			operator: "&&",
+			left: shallow,
+			right: {
+				type: "BinaryExpression",
+				operator: "===",
+				left: type,
+				right: js.common.createLiteral("goto")
+			}
+		},
 		consequent: {
 			type: "ReturnStatement",
 			argument: null
 		}
 	};
 	if (callback.body.type === "BlockStatement") {
-		if (startsWithShallowGuard(callback.body, shallow)) return false;
+		if (startsWithNavigationGuard(callback.body, shallow, type)) return false;
 		callback.body.body.unshift(guard);
 	} else callback.body = {
 		type: "BlockStatement",
@@ -4509,35 +4520,43 @@ function migrateNavigationHook(call) {
 	};
 	return true;
 }
-function shallowTest(callback) {
+function navigationHookProperties(callback) {
 	const parameter = callback.params[0];
 	if (!parameter) {
 		callback.params.push({
 			type: "ObjectPattern",
-			properties: [patternProperty("shallow")]
+			properties: [patternProperty("shallow"), patternProperty("type")]
 		});
-		return js.variables.createIdentifier("shallow");
+		return [js.variables.createIdentifier("shallow"), js.variables.createIdentifier("type")];
 	}
-	if (parameter.type === "Identifier") return member(parameter.name, "shallow");
-	if (parameter.type === "AssignmentPattern" && parameter.left.type === "Identifier") return member(parameter.left.name, "shallow");
+	if (parameter.type === "Identifier") return [member(parameter.name, "shallow"), member(parameter.name, "type")];
+	if (parameter.type === "AssignmentPattern" && parameter.left.type === "Identifier") return [member(parameter.left.name, "shallow"), member(parameter.left.name, "type")];
 	if (parameter.type !== "ObjectPattern") return void 0;
+	const shallow = patternIdentifier(parameter, "shallow");
+	const type = patternIdentifier(parameter, "type");
+	if (shallow === null || type === null) return void 0;
+	for (const name of [shallow ? void 0 : "shallow", type ? void 0 : "type"]) {
+		if (!name) continue;
+		const restIndex = parameter.properties.findIndex((entry) => entry.type === "RestElement");
+		const property = patternProperty(name);
+		if (restIndex === -1) parameter.properties.push(property);
+		else parameter.properties.splice(restIndex, 0, property);
+	}
+	return [shallow ?? js.variables.createIdentifier("shallow"), type ?? js.variables.createIdentifier("type")];
+}
+function patternIdentifier(parameter, name) {
 	for (const entry of parameter.properties) {
 		if (entry.type !== "Property") continue;
 		const key = entry.key;
-		if ((key.type !== "Identifier" || key.name !== "shallow") && (key.type !== "Literal" || key.value !== "shallow")) continue;
+		if ((key.type !== "Identifier" || key.name !== name) && (key.type !== "Literal" || key.value !== name)) continue;
 		if (entry.value.type === "Identifier") return js.variables.createIdentifier(entry.value.name);
 		if (entry.value.type === "AssignmentPattern" && entry.value.left.type === "Identifier") return js.variables.createIdentifier(entry.value.left.name);
-		return;
+		return null;
 	}
-	const restIndex = parameter.properties.findIndex((entry) => entry.type === "RestElement");
-	const shallowProperty = patternProperty("shallow");
-	if (restIndex === -1) parameter.properties.push(shallowProperty);
-	else parameter.properties.splice(restIndex, 0, shallowProperty);
-	return js.variables.createIdentifier("shallow");
 }
-function startsWithShallowGuard(body, shallow) {
+function startsWithNavigationGuard(body, shallow, type) {
 	const first = body.body[0];
-	return first?.type === "IfStatement" && first.consequent.type === "ReturnStatement" && first.consequent.argument === null && sameExpression(first.test, shallow);
+	return first?.type === "IfStatement" && first.consequent.type === "ReturnStatement" && first.consequent.argument === null && first.test.type === "LogicalExpression" && first.test.operator === "&&" && sameExpression(first.test.left, shallow) && first.test.right.type === "BinaryExpression" && first.test.right.operator === "===" && first.test.right.left.type !== "PrivateIdentifier" && sameExpression(first.test.right.left, type) && first.test.right.right.type === "Literal" && first.test.right.right.value === "goto";
 }
 function sameExpression(left, right) {
 	if (left.type === "Identifier" && right.type === "Identifier") return left.name === right.name;
@@ -4573,7 +4592,15 @@ var svelte_config_default = defineMigrationTask({
 	run: ({ sv, cwd }) => {
 		const configSource = svelteConfig.find(cwd);
 		if (!configSource) return;
-		if (configSource.kind === "vite") return;
+		if (configSource.kind === "vite") {
+			svelteConfig.edit({
+				sv,
+				cwd
+			}, ({ config }) => {
+				if (!removeFilesLib(config)) return false;
+			});
+			return;
+		}
 		const originalConfigObject = svelteConfig.read(cwd);
 		if (!originalConfigObject) return;
 		sv.removeFile(configSource.path);
@@ -4588,6 +4615,16 @@ var svelte_config_default = defineMigrationTask({
 			const originalStatements = [];
 			for (const node of originalConfigObject.ast.body) if (node.type === "ImportDeclaration") originalImports.push(node);
 			else if (node.type !== "ExportDefaultDeclaration" && node !== configDeclaration) originalStatements.push(node);
+			const existingBindings = js.scope.topLevelBindings([ast]);
+			const movedProgram = {
+				...originalConfigObject.ast,
+				body: [...originalImports, ...originalStatements]
+			};
+			const movedBindings = js.scope.topLevelBindings([movedProgram]);
+			const usedBindings = /* @__PURE__ */ new Set([...existingBindings, ...movedBindings]);
+			const renames = /* @__PURE__ */ new Map();
+			for (const name of movedBindings) if (existingBindings.has(name)) renames.set(name, js.identifiers.uniqueName(name, usedBindings));
+			js.identifiers.renameReferences([originalConfigObject.ast], renames);
 			ast.body.unshift(...originalImports);
 			const exportIndex = ast.body.findIndex((node) => node.type === "ExportDefaultDeclaration");
 			ast.body.splice(exportIndex, 0, ...originalStatements);
@@ -4598,24 +4635,24 @@ var svelte_config_default = defineMigrationTask({
 			let trustsAllOrigins = false;
 			for (const prop of newConfigProperties) {
 				if (prop.type !== "Property") continue;
-				if (prop.key.type !== "Identifier") continue;
-				if (prop.key.name === "kit") continue;
+				const key = js.object.propertyName(prop);
+				if (!key || key === "kit") continue;
 				const propAttachment = attachments.get(prop);
-				keyedConfig[prop.key.name] = prop.value;
-				if (propAttachment) propComments.set(prop.key.name, propAttachment);
+				keyedConfig[key] = prop.value;
+				if (propAttachment) propComments.set(key, propAttachment);
 			}
 			for (const [key, value] of Object.entries(keyedConfig)) {
 				if (key === "experimental" && value.type === "ObjectExpression") {
-					removeProperty(value, "handleRenderingErrors");
-					removeProperty(value, "instrumentation");
-					const index = value.properties.findIndex((prop) => prop.type === "Property" && prop.key.type === "Identifier" && prop.key.name === "tracing");
-					if (index !== -1) {
-						keyedConfig.tracing = value.properties[index].value;
-						value.properties.splice(index, 1);
+					js.object.removeProperty(value, { name: "handleRenderingErrors" });
+					js.object.removeProperty(value, { name: "instrumentation" });
+					const tracing = js.object.findProperty(value, { name: "tracing" });
+					if (tracing) {
+						keyedConfig.tracing = tracing.value;
+						js.object.removeProperty(value, { name: "tracing" });
 					}
 				}
 				if (key === "prerender" && value.type === "ObjectExpression") {
-					const originProp = value.properties.find((prop) => prop.type === "Property" && prop.key.type === "Identifier" && prop.key.name === "origin");
+					const originProp = js.object.findProperty(value, { name: "origin" });
 					if (originProp) {
 						keyedConfig.paths ??= {
 							type: "ObjectExpression",
@@ -4633,14 +4670,22 @@ var svelte_config_default = defineMigrationTask({
 							shorthand: false,
 							computed: false
 						});
-						removeProperty(value, "origin");
+						js.object.removeProperty(value, { name: "origin" });
 						if (value.properties.length === 0) delete keyedConfig.prerender;
 					}
 				}
+				if (key === "files" && value.type === "ObjectExpression") {
+					js.object.removeProperty(value, { name: "lib" });
+					if (value.properties.length === 0) delete keyedConfig.files;
+				}
 				if (key === "csrf" && value.type === "ObjectExpression") {
 					const checkOrigin = findDisabledCheckOrigin(value);
 					if (checkOrigin) {
-						checkOrigin.key.name = "trustedOrigins";
+						checkOrigin.key = {
+							type: "Identifier",
+							name: "trustedOrigins"
+						};
+						checkOrigin.computed = false;
 						checkOrigin.value = {
 							type: "ArrayExpression",
 							elements: [{
@@ -4671,7 +4716,10 @@ var svelte_config_default = defineMigrationTask({
 				apply(node, attachments.get(node));
 				if (node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "sveltekit" && node.arguments[0]?.type === "ObjectExpression") rootConfig = node.arguments[0];
 			});
-			for (const prop of rootConfig?.properties ?? []) if (prop.type === "Property" && prop.key.type === "Identifier") apply(prop, propComments.get(prop.key.name));
+			for (const prop of rootConfig?.properties ?? []) if (prop.type === "Property") {
+				const key = js.object.propertyName(prop);
+				if (key) apply(prop, propComments.get(key));
+			}
 		});
 		let addedConfigLoader = false;
 		sv.files({
@@ -4721,10 +4769,19 @@ function forEachNode(root, visit) {
 		forEachNode(node[key], visit);
 	}
 }
-/** Removes a statically named property from an object literal. */
-function removeProperty(value, name) {
-	const index = value.properties.findIndex((prop) => prop.type === "Property" && prop.key.type === "Identifier" && prop.key.name === name);
-	if (index !== -1) value.properties.splice(index, 1);
+/**
+* Drops the `files.lib` option from a kit config object, deleting `files` itself when it only
+* contained `lib`.
+* Returns whether anything was removed.
+*/
+function removeFilesLib(config) {
+	const filesProp = js.object.findProperty(config, { name: "files" });
+	if (!filesProp) return false;
+	const files = filesProp.value;
+	if (files.type !== "ObjectExpression") return false;
+	if (!js.object.removeProperty(files, { name: "lib" })) return false;
+	if (files.properties.length === 0) js.object.removeProperty(config, { name: "files" });
+	return true;
 }
 /**
 * Maps each source comment to the node it documents, returned keyed by node identity. A comment is
@@ -4780,7 +4837,8 @@ function collectComments(ast, source) {
 }
 /** Returns the `checkOrigin: false` property of a `csrf` object, if present. */
 function findDisabledCheckOrigin(value) {
-	return value.properties.find((p) => p.type === "Property" && p.key.type === "Identifier" && p.key.name === "checkOrigin" && p.value.type === "Literal" && p.value.value === false);
+	const property = js.object.findProperty(value, { name: "checkOrigin" });
+	return property?.value.type === "Literal" && property.value.value === false ? property : void 0;
 }
 //#endregion
 //#region src/migrate/migrations/sveltekit-3/tasks/tsconfig.ts

package/dist/{engine-DB9amJxd.mjs → engine-CpcTzL2R.mjs}

@@ -5020,7 +5020,7 @@ function safeParse(schema, input, config$1) {
 //#endregion
 //#region package.json
 var name = "sv";
-var version = "1.1.0";
+var version = "1.1.1";
 //#endregion
 //#region src/core/errors.ts
 var UnsupportedError = class extends Error {

package/dist/src/index.mjs

@@ -1,3 +1,3 @@
-import { t as add, v as defineAddon, w as create, y as defineAddonOptions } from "../engine-DB9amJxd.mjs";
-import { n as officialAddons } from "../addons-OcP_HeQ_.mjs";
+import { t as add, v as defineAddon, w as create, y as defineAddonOptions } from "../engine-CpcTzL2R.mjs";
+import { n as officialAddons } from "../addons-DaktRhvH.mjs";
 export { add, create, defineAddon, defineAddonOptions, officialAddons };

package/dist/src/testing.mjs

@@ -1,4 +1,4 @@
-import { C as execSync, Ct as __toESM, S as exec, St as __require, l as addAllowBuildsIfPnpm, t as add, w as create, xt as __commonJSMin } from "../engine-DB9amJxd.mjs";
+import { C as execSync, Ct as __toESM, S as exec, St as __require, l as addAllowBuildsIfPnpm, t as add, w as create, xt as __commonJSMin } from "../engine-CpcTzL2R.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import V from "node:process";

package/dist/templates/addon/package.json

@@ -22,11 +22,11 @@
 		"access": "public"
 	},
 	"peerDependencies": {
-		"sv": "^1.1.0"
+		"sv": "^1.1.1"
 	},
 	"devDependencies": {
-		"sv": "^1.1.0",
-		"@sveltejs/sv-utils": "^1.0.1",
+		"sv": "^1.1.1",
+		"@sveltejs/sv-utils": "^1.0.2",
 		"@playwright/test": "^1.60.0",
 		"@types/node": "^25.9.1",
 		"tsdown": "^0.22.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A command line interface (CLI) for creating and maintaining Svelte applications",
   "keywords": [
     "create",
@@ -34,7 +34,7 @@
     }
   },
   "dependencies": {
-    "@sveltejs/sv-utils": "1.0.1"
+    "@sveltejs/sv-utils": "1.0.2"
   },
   "devDependencies": {
     "@clack/prompts": "1.5.0",