sv-router 0.11.1 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv-router",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "description": "Modern Svelte Routing",
   "keywords": [
     "svelte",

package/src/cli/index.js

@@ -1,13 +1,76 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 
+import { existsSync, readFileSync } from 'node:fs';
+import path from 'node:path';
 import { genConfig } from '../gen/config.js';
 import { writeRouterCode } from '../gen/write-router-code.js';
 
 const args = process.argv.slice(2).flatMap((arg) => arg.split('='));
 
+if (args.length > 0) {
+	parseArgs();
+} else {
+	parseViteConfig();
+}
+
+writeRouterCode();
+
+function parseViteConfig() {
+	const viteConfig = readViteConfig('ts') || readViteConfig('js');
+	if (!viteConfig) return;
+	const routerConfig = extractRouterConfig(viteConfig);
+	if (!routerConfig) return;
+	console.log('ℹ️ Using router plugin options from Vite config');
+	if (routerConfig.allLazy) genConfig.allLazy = routerConfig.allLazy;
+	if (routerConfig.js) genConfig.routesInJs = routerConfig.js;
+	if (routerConfig.path) genConfig.routesPath = routerConfig.path;
+	if (routerConfig.ignore) genConfig.ignore = routerConfig.ignore;
+}
+
+/**
+ * @param {'js' | 'ts'} extension
+ * @returns {string | undefined}
+ */
+function readViteConfig(extension) {
+	const vitePath = path.join(process.cwd(), 'vite.config.' + extension);
+	if (existsSync(vitePath)) {
+		return readFileSync(vitePath, 'utf8');
+	}
+}
+
+/**
+ * @param {string} viteConfig
+ * @returns {import('../vite-plugin/index.d.ts').RouterOptions | undefined}
+ */
+function extractRouterConfig(viteConfig) {
+	const regex = /router\(\s*([^)]+)\)/;
+	const match = viteConfig.match(regex);
+	if (!match) return;
+	try {
+		return new Function(`return ${match[1]}`)();
+	} catch (error) {
+		console.error('⚠️ Error parsing router config:', error);
+	}
+}
+
+function parseArgs() {
+	const allLazyArg = arg('allLazy');
+	if (allLazyArg) genConfig.allLazy = true;
+
+	const jsArg = arg('js');
+	if (jsArg) genConfig.routesInJs = true;
+
+	const pathArg = arg('path');
+	if (pathArg) genConfig.routesPath = pathArg;
+
+	const ignoreArg = arg('ignore');
+	if (ignoreArg) genConfig.ignore = ignoreArg.split(',').map((ignore) => new RegExp(ignore, 'gu'));
+}
+
 /**
  * @param {keyof import('../vite-plugin/index.d.ts').RouterOptions} option
- * @returns
+ * @returns {string | undefined}
  */
 function arg(option) {
 	const pathArgIndex = args.indexOf('--' + option);
@@ -17,17 +80,3 @@ function arg(option) {
 	}
 	return args[pathArgIndex];
 }
-
-const allLazyArg = arg('allLazy');
-if (allLazyArg) genConfig.allLazy = true;
-
-const jsArg = arg('js');
-if (jsArg) genConfig.routesInJs = true;
-
-const pathArg = arg('path');
-if (pathArg) genConfig.routesPath = pathArg;
-
-const ignoreArg = arg('ignore');
-if (ignoreArg) genConfig.ignore = ignoreArg.split(',').map((ignore) => new RegExp(ignore, 'gu'));
-
-writeRouterCode();

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

@@ -10,6 +10,7 @@ import path from 'node:path';
  */
 
 const FILENAME_REGEX = /(?<=[/.]|^)\(?([\w-]+)\)?(\.lazy)?\.svelte$/; // any.svelte, any.lazy.svelte, (any).svelte
+const INDEX_FILENAME_REGEX = /(?<=[/.]|^)\(?index\)?(\.lazy)?\.svelte$/; // index.svelte, index.lazy.svelte, (index).svelte
 const PARAM_FILENAME_REGEX = /(?<=[/.]|^)\(?\[([\w-]+)\]\)?(\.lazy)?\.svelte$/; // [any].svelte, [any].lazy.svelte, ([any]).svelte
 const CATCH_ALL_FILENAME_REGEX = /(?<=[/.]|^)\(?\[\.\.\.([\w-]+)\]\)?(\.lazy)?\.svelte$/; // [...any].svelte, [...any].lazy.svelte, ([...any]).svelte
 const OUT_OF_LAYOUT_FILENAME_REGEX = /(?<=[/.]|^)\(\[\.?\.?\.?([\w-]+)\]\)(\.lazy)?\.svelte$/; // ([any]).svelte, ([...any]).lazy.svelte
@@ -81,8 +82,9 @@ export function createRouteMap(fileTree, prefix = '') {
 				continue;
 			}
 
-			if (entry.endsWith('index.svelte') || entry.endsWith('index.lazy.svelte')) {
-				const indexEntry = entry.replace(/\.?index(\.lazy)?\.svelte/, '');
+			if (INDEX_FILENAME_REGEX.test(entry)) {
+				const replacement = /\.?\(index\)(\.lazy)?\.svelte/.test(entry) ? '()' : '';
+				const indexEntry = entry.replace(/\.?\(?index\)?(\.lazy)?\.svelte/, replacement);
 				result['/' + (indexEntry ? filePathToRoute(indexEntry) : '')] = prefix + entry;
 				continue;
 			}

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

@@ -40,13 +40,13 @@ export function writeRouterCode() {
 		const written = writeFileIfDifferent(genConfig.routerPath, routerCode);
 
 		if (written) {
-			console.log('✅️ Routes generated');
+			console.log('❇️ Routes generated');
 		} else {
 			console.log('✅️ Routes already up to date');
 		}
 	} catch (error) {
 		console.error(
-			'Error during routes generation:',
+			'⚠️ Error during routes generation:',
 			error instanceof Error ? error.message : String(error),
 		);
 	}

package/src/helpers/match-route.js

@@ -81,7 +81,7 @@ export function matchRoute(pathname, routes) {
 				);
 				match = /** @type {RouteComponent} */ (routes[resolvedPath]);
 				break outer;
-			} else if (routePart !== pathPart?.toLowerCase()) {
+			} else if (routePart.toLowerCase() !== pathPart?.toLowerCase()) {
 				break;
 			}
 
@@ -93,6 +93,10 @@ export function matchRoute(pathname, routes) {
 				routes[/** @type {keyof Routes} */ ('/' + routeParts.join('/'))]
 			);
 
+			if (typeof routeMatch === 'function' && routeParts.length !== pathParts.length) {
+				continue;
+			}
+
 			if (!breakFromLayouts && 'layout' in routes && routes.layout) {
 				layouts.push(routes.layout);
 			}