sv-router 0.15.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv-router",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Modern Svelte Routing",
   "keywords": [
     "svelte",
@@ -46,7 +46,7 @@
     "@vitest/coverage-v8": "^4.1.0",
     "eslint": "^10.0.3",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-simple-import-sort": "^13.0.0",
     "eslint-plugin-svelte": "^3.15.2",
     "eslint-plugin-unicorn": "^64.0.0",
     "globals": "^17.4.0",

package/src/Router.svelte

@@ -12,6 +12,7 @@
 	/** @type {{ base?: string }} */
 	let { base: basename } = $props();
 
+	// svelte-ignore state_referenced_locally
 	init(basename);
 
 	onNavigate();

package/src/attachments.svelte.js

@@ -23,25 +23,3 @@ export function isActiveLink({ className = 'is-active', startsWith = false } = {
 		});
 	};
 }
-
-/** @type {import('./index.d.ts').IsActiveLinkAction} */
-export function isActiveLinkAction(node, { className = 'is-active', startsWith = false } = {}) {
-	if (node.tagName !== 'A') {
-		throw new Error('isActiveLink can only be used on <a> elements');
-	}
-
-	$effect(() => {
-		let pathname;
-		if (base.name === '#') {
-			pathname = new URL(node.href).hash.slice(1);
-		} else {
-			pathname = new URL(node.href).pathname;
-		}
-		const tokens = className.split(' ').filter(Boolean) ?? [];
-		if (startsWith ? location.pathname.startsWith(pathname) : location.pathname === pathname) {
-			node.classList.add(...tokens);
-		} else {
-			node.classList.remove(...tokens);
-		}
-	});
-}

package/src/gen/generate-router-code.js

@@ -165,8 +165,14 @@ function mergeRouteGroup(result, childMap) {
 		} else if (!Array.isArray(val)) {
 			routeWithGroupFiles = { ...val };
 		}
-		if (layout) routeWithGroupFiles.layout = /** @type {string} */ (layout);
-		if (hooks) routeWithGroupFiles.hooks = /** @type {string} */ (hooks);
+		if (layout) {
+			if (routeWithGroupFiles.layout) {
+				routeWithGroupFiles = { '/': routeWithGroupFiles, layout: layout };
+			} else {
+				routeWithGroupFiles.layout = layout;
+			}
+		}
+		if (hooks) routeWithGroupFiles.hooks = hooks;
 		if (mergedMeta) routeWithGroupFiles.meta = /** @type {string | string[]} */ (mergedMeta);
 		if (result[key]) {
 			throw new Error(`Route conflict at \`${key}\``);

package/src/gen/write-router-code.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-console */
 import fs from 'node:fs';
+import { createRequire } from 'node:module';
 import { genConfig } from './config.js';
 import { generateRouterCode } from './generate-router-code.js';
 
@@ -10,14 +11,18 @@ export function writeRouterCode() {
 		}
 
 		// Write `.router/tsconfig.json` file
+		const tsMajor = getTypeScriptMajorVersion();
+		const useBaseUrl = tsMajor === undefined || tsMajor < 6;
+		let alias = genConfig.routerPath;
+		if (!useBaseUrl) {
+			alias = alias.replace(genConfig.genCodeDirPath, '.');
+		}
 		const tsConfig = {
 			compilerOptions: {
 				module: 'preserve',
 				moduleResolution: 'bundler',
-				baseUrl: '..',
-				paths: {
-					[genConfig.genCodeAlias]: [genConfig.routerPath],
-				},
+				...(useBaseUrl ? { baseUrl: '..' } : {}),
+				paths: { [genConfig.genCodeAlias]: [alias] },
 			},
 			include: [
 				'../src/**/*.js',
@@ -62,3 +67,14 @@ function writeFileIfDifferent(filePath, content) {
 		return true;
 	}
 }
+
+function getTypeScriptMajorVersion() {
+	try {
+		const require = createRequire(process.cwd() + '/package.json');
+		const tsPackagePath = require.resolve('typescript/package.json');
+		const tsPackage = JSON.parse(fs.readFileSync(tsPackagePath, 'utf8'));
+		return Number(tsPackage.version.split('.')[0]);
+	} catch {
+		return;
+	}
+}

package/src/index.d.ts

@@ -2,19 +2,6 @@ import type { Component, Snippet } from 'svelte';
 import type { Action } from 'svelte/action';
 import type { Attachment } from 'svelte/attachments';
 
-/**
- * @deprecated Use the `isActiveLink` [attachment](https://svelte.dev/docs/svelte/@attach) instead.
- *
- *   A Svelte action that will add a class to the anchor if its `href` matches the current route. It
- *   can have an optional `className` parameter to specify the class to add, otherwise it will
- *   default to `is-active`, and an optional `startsWith` parameter.
- *
- *   ```svelte
- *   <a href={p('/about')} use:isActiveLink={{ className: 'active-link' }}>
- * ```
- */
-export const isActiveLinkAction: IsActiveLinkAction;
-
 /**
  * A Svelte attachment that will add a class to the anchor if its `href` matches the current route.
  * It can have an optional `className` parameter to specify the class to add, otherwise it will

package/src/index.js

@@ -1,4 +1,4 @@
-export { isActiveLink, isActiveLinkAction } from './attachments.svelte.js';
+export { isActiveLink } from './attachments.svelte.js';
 export { blockNavigation, createRouter } from './create-router.svelte.js';
 export { serializeSearch } from './helpers/utils.js';
 export { Navigation } from './navigation.js';

package/src/search-params.svelte.js

@@ -66,7 +66,8 @@ export function syncSearchParams(search) {
 	for (const [key, value] of newSearch) {
 		searchParams.set(key, value);
 	}
-	for (const key of searchParams.keys()) {
+	// eslint-disable-next-line unicorn/no-useless-spread
+	for (const key of [...searchParams.keys()]) {
 		if (!newSearch.has(key)) {
 			searchParams.delete(key);
 		}