add paths-base support; fix trailing matching

Author: difanta

packages/kit/src/core/sync/write_types/write_api/index.js

@@ -18,7 +18,10 @@ export function write_api(config, manifest_data) {
 		fs.mkdirSync(types_dir, { recursive: true });
 	} catch {}
 
-	const api_imports = ['import type * as Kit from "@sveltejs/kit";'];
+	const api_imports = [
+		'import type * as Kit from "@sveltejs/kit";',
+		'import type { base } from "$app/paths";'
+	];
 
 	/** @type {string[]} */
 	const api_declarations = [];
@@ -35,7 +38,7 @@ export function write_api(config, manifest_data) {
 	api_declarations.push(
 		'type ExpandMethods<T> = { [Method in keyof T]: T[Method] extends (...args: any) => any ? GetEndpointType<T[Method]> : never; };'
 	);
-	api_declarations.push('type optional_trailing = `` | `${string}`;');
+	api_declarations.push('type optional_trailing = `` | `?${string}`;');
 	api_declarations.push('type restricted_characters = ` ` | `/` | `\\\\`;');
 	api_declarations.push('type restricted_characters_rest = ` ` | `\\\\`;');
 	api_declarations.push(
@@ -66,12 +69,23 @@ export function write_api(config, manifest_data) {
 			true
 	  	: false;\n`
 	);
+
+	api_declarations.push(
+		`\n/** Check if is empty or starts with '#' or '?' and does not contain restricted characters */ \ntype ValidateTrailing<S extends string> = FixDynamicTrailing<S> extends '' | \`?\${infer Slug}\` | \`#\${infer Slug}\` ?
+		Slug extends (\`\${string}\${restricted_characters}\${string}\`) ?
+				false
+			: true
+		: false;\n`
+	);
 	api_declarations.push(
 		'type UnionAllTrue<B extends boolean> = [B] extends [true] ? true : false;'
 	);
 	api_declarations.push(
 		'type FixDynamicStr<S> = S extends undefined | null ? "" : Kit.Equals<S, string> extends true ? `/${string}` : S;'
 	);
+	api_declarations.push(
+		'type FixDynamicTrailing<S> = S extends undefined | null ? "" : Kit.Equals<S, string> extends true ? `?${string}` : S;'
+	);
 
 	/** @type {string[]} */
 	const api_endpoints = [
@@ -87,7 +101,7 @@ export function write_api(config, manifest_data) {
 			api_endpoints.push(`\t\t${index}: { `);
 			api_endpoints.push(`\t\t\tid: \`${route.id}\`; `);
 			api_endpoints.push(
-				`\t\t\tdoes_match: RemoveTrailingSlash<ToCheck> extends \`${matcher_str}\${optional_trailing}\` ? ${validator_str} : false; `
+				`\t\t\tdoes_match: RemoveTrailingSlash<ToCheck> extends \`\${typeof base}${matcher_str}\` ? ${validator_str} : false; `
 			);
 			if (route.endpoint) {
 				const route_import_path = posixify(
@@ -222,6 +236,10 @@ function parseSlugs(str) {
 			validators.push(`ValidateRequired<RequiredSlug${index++}>`);
 		}
 	} while (changed);
+	if (!endsWithSlug(str)) {
+		str += '${infer Trailing}';
+		validators.push('ValidateTrailing<Trailing>');
+	}
 	const validator_str =
 		validators.length > 0
 			? `UnionAllTrue<${validators.length > 1 ? validators.join(' | ') : validators.join('')}>`
@@ -232,3 +250,11 @@ function parseSlugs(str) {
 		validator_str
 	};
 }
+
+/**
+ *
+ * @param {string} str
+ */
+function endsWithSlug(str) {
+	return str.endsWith('}');
+}