bosia 1.2.2 → 1.2.3

package/src/core/routeTypes.ts

@@ -1,6 +1,7 @@
 import { writeFileSync, readFileSync, existsSync, mkdirSync } from "fs";
 import { join } from "path";
 import type { RouteManifest } from "./types.ts";
+import { segmentName, segmentRank } from "./matcher.ts";
 import { toPosix } from "./paths.ts";
 
 // ─── Route Types Generator ────────────────────────────────
@@ -23,13 +24,7 @@ function paramsForDir(dir: string): string[] {
 		.filter((s) => !/^\(.*\)$/.test(s));
 	const out: string[] = [];
 	for (const seg of segs) {
-		const catchAll = seg.match(/^\[\.\.\.(\w+)\]$/);
-		if (catchAll) {
-			out.push(catchAll[1]!);
-			continue;
-		}
-		const dyn = seg.match(/^\[(\w+)\]$/);
-		if (dyn) out.push(dyn[1]!);
+		if (segmentRank(seg)) out.push(segmentName(seg));
 	}
 	return out;
 }
@@ -76,7 +71,9 @@ export function generateRouteTypes(manifest: RouteManifest): void {
 
 		const params = paramsForDir(dir);
 		const paramsType =
-			params.length === 0 ? `{}` : `{ ${params.map((p) => `${p}: string`).join("; ")} }`;
+			params.length === 0
+				? `{}`
+				: `{ ${params.map((p) => `${/^[A-Za-z_$][\w$]*$/.test(p) ? p : JSON.stringify(p)}: string`).join("; ")} }`;
 
 		const lines: string[] = ["// AUTO-GENERATED by bosia — do not edit\n"];
 		lines.push(`import type { LoadEvent, MetadataEvent, RequestEvent, Metadata } from 'bosia';`);
@@ -101,7 +98,9 @@ export function generateRouteTypes(manifest: RouteManifest): void {
 
 		if (info.pageServer) {
 			lines.push(``);
-			lines.push(`import type { load as _pageLoad } from '${srcBase}+page.server.ts';`);
+			lines.push(
+				`import type { load as _pageLoad } from ${JSON.stringify(srcBase + "+page.server.ts")};`,
+			);
 			lines.push(`export type PageServerLoad = (event: _LoadEvent) => any;`);
 			lines.push(
 				`export type PageMetadataLoad = (event: _MetadataEvent) => Metadata | Promise<Metadata>;`,
@@ -131,7 +130,9 @@ export function generateRouteTypes(manifest: RouteManifest): void {
 		// ActionData — union of all action return types, unwrapping ActionFailure
 		if (info.pageServer) {
 			lines.push(``);
-			lines.push(`import type { actions as _actions } from '${srcBase}+page.server.ts';`);
+			lines.push(
+				`import type { actions as _actions } from ${JSON.stringify(srcBase + "+page.server.ts")};`,
+			);
 			lines.push(
 				`type _ActionReturn<T> = T extends (...args: any[]) => infer R ? Awaited<R> : never;`,
 			);
@@ -144,7 +145,9 @@ export function generateRouteTypes(manifest: RouteManifest): void {
 		}
 
 		if (info.layoutServer) {
-			lines.push(`\nimport type { load as _layoutLoad } from '${srcBase}+layout.server.ts';`);
+			lines.push(
+				`\nimport type { load as _layoutLoad } from ${JSON.stringify(srcBase + "+layout.server.ts")};`,
+			);
 			lines.push(`export type LayoutServerLoad = (event: _LoadEvent) => any;`);
 			lines.push(`export type LayoutData = Awaited<ReturnType<typeof _layoutLoad>>;`);
 			lines.push(`export type LayoutProps = { data: LayoutData; params: Params; children: any };`);

package/src/core/scanner.ts

@@ -1,6 +1,7 @@
 import { readdirSync, existsSync, readFileSync } from "fs";
 import { join } from "path";
 import type { PageRoute, ApiRoute, RouteManifest, TrailingSlash } from "./types.ts";
+import { segmentName, segmentRank } from "./matcher.ts";
 
 // ─── Route Scanner ───────────────────────────────────────
 // Walks src/routes/ and produces a RouteManifest.
@@ -192,19 +193,22 @@ export function scanRoutes(): RouteManifest {
 
 	walk("", [], [], [], [], "never", null);
 
-	// Warn when a catch-all exists but no exact route covers its prefix.
-	// e.g. "/[...slug]" matches everything EXCEPT "/" (which needs its own +page.svelte).
-	const exactPatterns = new Set(
-		pages.filter((p) => !p.pattern.includes("[")).map((p) => p.pattern),
-	);
+	// Invalid segments first, so they get their own message, not a conflict or warning.
+	checkParams(pages, (p) => p.page);
+	checkParams(apis, (a) => a.server);
+
+	// Warn when a trailing catch-all exists but no page covers its prefix.
+	// e.g. "/[...slug]" matches everything EXCEPT "/" (which needs its own +page.svelte),
+	// "/[lang]/[...rest]" needs "/[lang]" for "/en".
+	const pageKeys = new Set(pages.map((p) => routeKey(p.pattern)));
 	for (const p of pages) {
-		const m = p.pattern.match(/^(.*?)\/\[\.\.\.(\w+)\]$/);
-		if (m) {
-			const exactEquivalent = m[1] || "/";
-			if (!exactPatterns.has(exactEquivalent)) {
+		const cut = p.pattern.lastIndexOf("/");
+		if (segmentRank(p.pattern.slice(cut + 1)) === 2) {
+			const exactEquivalent = p.pattern.slice(0, cut) || "/";
+			if (!pageKeys.has(routeKey(exactEquivalent))) {
 				console.warn(
-					`⚠️  No exact route for "${exactEquivalent}" — the catch-all "${p.pattern}" will NOT match it.\n` +
-						`   Add a +page.svelte at the "${exactEquivalent}" level to serve that URL.`,
+					`⚠️  The catch-all "${p.pattern}" doesn't match "${exactEquivalent}" itself.\n` +
+						`   Add a +page.svelte at "${exactEquivalent}" unless another route already serves it.`,
 				);
 			}
 		}
@@ -228,7 +232,7 @@ export function scanRoutes(): RouteManifest {
 function preventConflicts<T extends { pattern: string }>(routes: T[], fileOf: (r: T) => string) {
 	const seen = new Map<string, T>();
 	for (const r of routes) {
-		const key = r.pattern.replace(/\[\.\.\.\w+\]/g, "[...]").replace(/\[\w+\]/g, "[]");
+		const key = routeKey(r.pattern);
 		const first = seen.get(key);
 		if (!first) {
 			seen.set(key, r);
@@ -244,7 +248,66 @@ function preventConflicts<T extends { pattern: string }>(routes: T[], fileOf: (r
 	}
 }
 
-/** Two route files resolve to the same URL. Callers print `message` and exit. */
+const KINDS = ["", "[]", "[...]"];
+
+/** The URL shape of a pattern, param names dropped: `/[lang]/[...rest]` → `/[]/[...]`. */
+function routeKey(pattern: string): string {
+	return pattern.replace(/[^/]+/g, (seg) => {
+		const rank = segmentRank(seg);
+		return rank ? KINDS[rank]! : seg;
+	});
+}
+
+/**
+ * Fail on params the matcher can't serve: brackets that don't wrap a whole
+ * segment, a `[...rest]` that isn't the last segment, `__proto__`, or one name
+ * bound twice. Mid-path catch-alls (`docs/[...path]/edit`) are left out on
+ * purpose: each needs an unanchored `(.+)` (several backtrack for seconds on a
+ * long URL) and span-aware ranking.
+ * Add both together if that route shape is ever needed.
+ */
+function checkParams<T extends { pattern: string }>(routes: T[], fileOf: (r: T) => string) {
+	for (const r of routes) {
+		const segs = r.pattern.split("/").filter(Boolean);
+		const names = new Set<string>();
+		const fail = (problem: string) => {
+			throw new RouteConflictError(
+				`The "${r.pattern}" route is invalid: ${problem}.\n   src/routes/${fileOf(r)}`,
+			);
+		};
+		for (const [i, seg] of segs.entries()) {
+			const rank = segmentRank(seg);
+			if (!rank) {
+				// `[...]`, `[.x]`, `[id].json`, `post-[slug]`, `[[lang]]` would match only their literal text.
+				if (/^\[(\.\.\.)?[^[\]/]*\]$/.test(seg))
+					fail(`${seg} needs a param name that doesn't start with a dot, like [slug] or [...rest]`);
+				if (/[[\]]/.test(seg)) fail(`${seg} must be a whole segment like [slug] or [...rest]`);
+				continue;
+			}
+			const name = segmentName(seg);
+			if (rank === 2 && i !== segs.length - 1) fail(`${seg} must be the last part of the route`);
+			const dots = rank === 2 ? "..." : "";
+			if (name.includes("="))
+				fail(`${seg}: param matchers aren't supported, use [${dots}${name.split("=")[0]}]`);
+			if (name.endsWith("?"))
+				fail(`${seg}: optional params aren't supported, use [${dots}${name.slice(0, -1)}]`);
+			if (/^…|[.…]$/.test(name))
+				fail(`${seg}: did you mean [...${name.replace(/^…|[.…]+$/g, "")}]?`);
+			if (!PARAM_NAME.test(name))
+				fail(`${seg}: a param name uses letters, digits, _, $, - and inner dots only`);
+			// params is a plain object: assigning "__proto__" sets the prototype, not a key.
+			if (name === "__proto__") fail(`"__proto__" can't be a param name`);
+			if (names.has(name)) fail(`the param "${name}" is used twice`);
+			names.add(name);
+		}
+	}
+}
+
+// `[slüg]`, `[$id]`, `[my-path]`, `[file.name]`, `[1st]`; no spaces, quotes, `…` or edge dots.
+const PARAM_NAME = /^[\p{L}\p{N}_$-]+(\.[\p{L}\p{N}_$-]+)*$/u;
+
+/** A route tree the build refuses (two files at one URL, or an invalid param).
+ *  Callers print `message` and exit. */
 export class RouteConflictError extends Error {
 	override name = "RouteConflictError";
 }

package/templates/demo/src/routes/(public)/blog/[slug]/+page.server.ts

@@ -29,7 +29,7 @@ This page lives at routes/(public)/blog/[slug]/+page.svelte but is served at /bl
 
 The matched value is available as params.slug inside +page.server.ts load() and inside the page component via the params prop.
 
-The route matcher uses 3-pass priority: exact matches first, then dynamic segments, then catch-all routes.`,
+The route matcher compares routes part by part: a fixed name beats a param, which beats a catch-all.`,
 	},
 };