@sveltejs/kit 1.0.0-next.299 → 1.0.0-next.300

package/assets/client/start.js

@@ -2,7 +2,7 @@ import { onMount, tick } from 'svelte';
 import { writable } from 'svelte/store';
 import { assets, set_paths } from '../paths.js';
 import Root from '__GENERATED__/root.svelte';
-import { components, dictionary, validators } from '__GENERATED__/client-manifest.js';
+import { components, dictionary, matchers } from '__GENERATED__/client-manifest.js';
 import { init } from './singletons.js';
 
 /**
@@ -292,9 +292,9 @@ function parse_route_id(key) {
  * @param {RegExpMatchArray} match
  * @param {string[]} names
  * @param {string[]} types
- * @param {Record<string, import('types').ParamValidator>} validators
+ * @param {Record<string, import('types').ParamMatcher>} matchers
  */
-function exec(match, names, types, validators) {
+function exec(match, names, types, matchers) {
 	/** @type {Record<string, string>} */
 	const params = {};
 
@@ -304,10 +304,10 @@ function exec(match, names, types, validators) {
 		const value = match[i + 1] || '';
 
 		if (type) {
-			const validator = validators[type];
-			if (!validator) throw new Error(`Missing "${type}" param validator`); // TODO do this ahead of time?
+			const matcher = matchers[type];
+			if (!matcher) throw new Error(`Missing "${type}" param matcher`); // TODO do this ahead of time?
 
-			if (!validator(value)) return;
+			if (!matcher(value)) return;
 		}
 
 		params[name] = value;
@@ -319,10 +319,10 @@ function exec(match, names, types, validators) {
 /**
  * @param {import('types').CSRComponentLoader[]} components
  * @param {Record<string, [number[], number[], 1?]>} dictionary
- * @param {Record<string, (param: string) => boolean>} validators
+ * @param {Record<string, (param: string) => boolean>} matchers
  * @returns {import('types').CSRRoute[]}
  */
-function parse(components, dictionary, validators) {
+function parse(components, dictionary, matchers) {
 	const routes = Object.entries(dictionary).map(([id, [a, b, has_shadow]]) => {
 		const { pattern, names, types } = parse_route_id(id);
 
@@ -331,7 +331,7 @@ function parse(components, dictionary, validators) {
 			/** @param {string} path */
 			exec: (path) => {
 				const match = pattern.exec(path);
-				if (match) return exec(match, names, types, validators);
+				if (match) return exec(match, names, types, matchers);
 			},
 			a: a.map((n) => components[n]),
 			b: b.map((n) => components[n]),
@@ -345,7 +345,7 @@ function parse(components, dictionary, validators) {
 const SCROLL_KEY = 'sveltekit:scroll';
 const INDEX_KEY = 'sveltekit:index';
 
-const routes = parse(components, dictionary, validators);
+const routes = parse(components, dictionary, matchers);
 
 // we import the root layout/error components eagerly, so that
 // connectivity errors after initialisation don't nuke the app
@@ -985,7 +985,7 @@ function create_client({ target, session, base, trailing_slash }) {
 							// @ts-expect-error
 							if (node.loaded.fallthrough) {
 								throw new Error(
-									'fallthrough is no longer supported. Use validators instead: https://kit.svelte.dev/docs/routing#advanced-routing-validation'
+									'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-validation'
 								);
 							}
 

package/assets/server/index.js

@@ -165,7 +165,7 @@ async function render_endpoint(event, mod) {
 	// @ts-expect-error
 	if (response.fallthrough) {
 		throw new Error(
-			'fallthrough is no longer supported. Use validators instead: https://kit.svelte.dev/docs/routing#advanced-routing-validation'
+			'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-matching'
 		);
 	}
 
@@ -1872,7 +1872,7 @@ async function load_node({
 		// @ts-expect-error
 		if (loaded.fallthrough) {
 			throw new Error(
-				'fallthrough is no longer supported. Use validators instead: https://kit.svelte.dev/docs/routing#advanced-routing-validation'
+				'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-matching'
 			);
 		}
 	} else if (shadow.body) {
@@ -1949,7 +1949,7 @@ async function load_shadow_data(route, event, options, prerender) {
 			// @ts-expect-error
 			if (result.fallthrough) {
 				throw new Error(
-					'fallthrough is no longer supported. Use validators instead: https://kit.svelte.dev/docs/routing#advanced-routing-validation'
+					'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-matching'
 				);
 			}
 
@@ -1980,7 +1980,7 @@ async function load_shadow_data(route, event, options, prerender) {
 			// @ts-expect-error
 			if (result.fallthrough) {
 				throw new Error(
-					'fallthrough is no longer supported. Use validators instead: https://kit.svelte.dev/docs/routing#advanced-routing-validation'
+					'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-matching'
 				);
 			}
 
@@ -2504,9 +2504,9 @@ function negotiate(accept, types) {
  * @param {RegExpMatchArray} match
  * @param {string[]} names
  * @param {string[]} types
- * @param {Record<string, import('types').ParamValidator>} validators
+ * @param {Record<string, import('types').ParamMatcher>} matchers
  */
-function exec(match, names, types, validators) {
+function exec(match, names, types, matchers) {
 	/** @type {Record<string, string>} */
 	const params = {};
 
@@ -2516,10 +2516,10 @@ function exec(match, names, types, validators) {
 		const value = match[i + 1] || '';
 
 		if (type) {
-			const validator = validators[type];
-			if (!validator) throw new Error(`Missing "${type}" param validator`); // TODO do this ahead of time?
+			const matcher = matchers[type];
+			if (!matcher) throw new Error(`Missing "${type}" param matcher`); // TODO do this ahead of time?
 
-			if (!validator(value)) return;
+			if (!matcher(value)) return;
 		}
 
 		params[name] = value;
@@ -2581,7 +2581,7 @@ async function respond(request, options, state) {
 	/** @type {Record<string, string>} */
 	let params = {};
 
-	if (options.paths.base) {
+	if (options.paths.base && !state.prerender?.fallback) {
 		if (!decoded.startsWith(options.paths.base)) {
 			return new Response(undefined, { status: 404 });
 		}
@@ -2602,13 +2602,13 @@ async function respond(request, options, state) {
 	}
 
 	if (!state.prerender || !state.prerender.fallback) {
-		const validators = await options.manifest._.validators();
+		const matchers = await options.manifest._.matchers();
 
 		for (const candidate of options.manifest._.routes) {
 			const match = candidate.pattern.exec(decoded);
 			if (!match) continue;
 
-			const matched = exec(match, candidate.names, candidate.types, validators);
+			const matched = exec(match, candidate.names, candidate.types, matchers);
 			if (matched) {
 				route = candidate;
 				params = decode_params(matched);

package/dist/chunks/index.js

@@ -149,23 +149,23 @@ async function create_plugin(config, cwd) {
 								}
 							};
 						}),
-						validators: async () => {
-							/** @type {Record<string, import('types').ParamValidator>} */
-							const validators = {};
+						matchers: async () => {
+							/** @type {Record<string, import('types').ParamMatcher>} */
+							const matchers = {};
 
-							for (const key in manifest_data.validators) {
-								const file = manifest_data.validators[key];
+							for (const key in manifest_data.matchers) {
+								const file = manifest_data.matchers[key];
 								const url = path__default.resolve(cwd, file);
 								const module = await vite.ssrLoadModule(url);
 
-								if (module.validate) {
-									validators[key] = module.validate;
+								if (module.match) {
+									matchers[key] = module.match;
 								} else {
-									throw new Error(`${file} does not export a \`validate\` function`);
+									throw new Error(`${file} does not export a \`match\` function`);
 								}
 							}
 
-							return validators;
+							return matchers;
 						}
 					}
 				};
@@ -209,7 +209,9 @@ async function create_plugin(config, cwd) {
 					try {
 						if (!req.url || !req.method) throw new Error('Incomplete request');
 
-						const base = `${vite.config.server.https ? 'https' : 'http'}://${req.headers.host}`;
+						const base = `${vite.config.server.https ? 'https' : 'http'}://${
+							req.headers[':authority'] || req.headers.host
+						}`;
 
 						const decoded = decodeURI(new URL(base + req.url).pathname);
 

package/dist/chunks/index2.js

@@ -434,9 +434,9 @@ async function build_server(
 		input[name] = resolved;
 	});
 
-	// ...and every validator
-	Object.entries(manifest_data.validators).forEach(([key, file]) => {
-		const name = posixify(path__default.join('entries/validators', key));
+	// ...and every matcher
+	Object.entries(manifest_data.matchers).forEach(([key, file]) => {
+		const name = posixify(path__default.join('entries/matchers', key));
 		input[name] = path__default.resolve(cwd, file);
 	});
 

package/dist/chunks/index3.js

@@ -58,7 +58,7 @@ function generate_manifest({ build_data, relative_path, routes, format = 'esm' }
 	/** @param {string} id */
 	const get_index = (id) => id && /** @type {LookupEntry} */ (bundled_nodes.get(id)).index;
 
-	const validators = new Set();
+	const matchers = new Set();
 
 	// prettier-ignore
 	return `{
@@ -75,7 +75,7 @@ function generate_manifest({ build_data, relative_path, routes, format = 'esm' }
 					const { pattern, names, types } = parse_route_id(route.id);
 
 					types.forEach(type => {
-						if (type) validators.add(type);
+						if (type) matchers.add(type);
 					});
 
 					if (route.type === 'page') {
@@ -108,9 +108,9 @@ function generate_manifest({ build_data, relative_path, routes, format = 'esm' }
 					}
 				}).filter(Boolean).join(',\n\t\t\t\t')}
 			],
-			validators: async () => {
-				${Array.from(validators).map(type => `const { validate: ${type} } = await ${load(`${relative_path}/entries/validators/${type}.js`)}`).join('\n\t\t\t\t')}
-				return { ${Array.from(validators).join(', ')} };
+			matchers: async () => {
+				${Array.from(matchers).map(type => `const { match: ${type} } = await ${load(`${relative_path}/entries/matchers/${type}.js`)}`).join('\n\t\t\t\t')}
+				return { ${Array.from(matchers).join(', ')} };
 			}
 		}
 	}`.replace(/^\t/gm, '');

package/dist/chunks/sync.js

@@ -400,14 +400,14 @@ function create_manifest_data({
 	const params_base = path__default.relative(cwd, config.kit.files.params);
 
 	/** @type {Record<string, string>} */
-	const validators = {};
+	const matchers = {};
 	if (fs__default.existsSync(config.kit.files.params)) {
 		for (const file of fs__default.readdirSync(config.kit.files.params)) {
 			const ext = path__default.extname(file);
 			const type = file.slice(0, -ext.length);
 
 			if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(type)) {
-				validators[type] = path__default.join(params_base, file);
+				matchers[type] = path__default.join(params_base, file);
 			} else {
 				throw new Error(
 					`Validator names must match /^[a-zA-Z_][a-zA-Z0-9_]*$/ — "${file}" is invalid`
@@ -422,7 +422,7 @@ function create_manifest_data({
 		error,
 		components,
 		routes,
-		validators
+		matchers
 	};
 }
 
@@ -695,7 +695,7 @@ function write_manifest(manifest_data, base, output) {
 	write_if_changed(
 		`${output}/client-manifest.js`,
 		trim(`
-			export { validators } from './client-validators.js';
+			export { matchers } from './client-matchers.js';
 
 			export const components = ${components};
 
@@ -941,7 +941,7 @@ function write_types(config, manifest_data) {
 		/** @type {string[]} */
 		const params = [];
 
-		const pattern = /\[([^\]]+)\]/g;
+		const pattern = /\[(?:\.{3})?([^\]]+)\]/g;
 		let match;
 
 		while ((match = pattern.exec(key))) {
@@ -1009,20 +1009,20 @@ function write_types(config, manifest_data) {
  */
 function write_validators(manifest_data, output) {
 	const imports = [];
-	const validators = [];
+	const matchers = [];
 
-	for (const key in manifest_data.validators) {
-		const src = manifest_data.validators[key];
+	for (const key in manifest_data.matchers) {
+		const src = manifest_data.matchers[key];
 
-		imports.push(`import { validate as ${key} } from ${s(path__default.relative(output, src))};`);
-		validators.push(key);
+		imports.push(`import { match as ${key} } from ${s(path__default.relative(output, src))};`);
+		matchers.push(key);
 	}
 
 	const module = imports.length
-		? `${imports.join('\n')}\n\nexport const validators = { ${validators.join(', ')} };`
-		: 'export const validators = {};';
+		? `${imports.join('\n')}\n\nexport const matchers = { ${matchers.join(', ')} };`
+		: 'export const matchers = {};';
 
-	write_if_changed(`${output}/client-validators.js`, module);
+	write_if_changed(`${output}/client-matchers.js`, module);
 }
 
 /** @param {import('types').ValidatedConfig} config */

package/dist/cli.js

@@ -869,7 +869,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.299');
+const prog = sade('svelte-kit').version('1.0.0-next.300');
 
 prog
 	.command('dev')
@@ -1042,7 +1042,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, loose, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.299'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.300'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.299",
+  "version": "1.0.0-next.300",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/index.d.ts

@@ -210,7 +210,7 @@ export interface Page<Params extends Record<string, string> = Record<string, str
 	error: Error | null;
 }
 
-export interface ParamValidator {
+export interface ParamMatcher {
 	(param: string): boolean;
 }
 
@@ -257,6 +257,6 @@ export interface SSRManifest {
 		};
 		nodes: SSRNodeLoader[];
 		routes: SSRRoute[];
-		validators: () => Promise<Record<string, ParamValidator>>;
+		matchers: () => Promise<Record<string, ParamMatcher>>;
 	};
 }

package/types/internal.d.ts

@@ -108,7 +108,7 @@ export interface ManifestData {
 	error: string;
 	components: string[];
 	routes: RouteData[];
-	validators: Record<string, string>;
+	matchers: Record<string, string>;
 }
 
 export interface MethodOverride {