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

package/types/internal.d.ts

@@ -11,8 +11,6 @@ import {
 	SSRManifest
 } from './index';
 import {
-	Either,
-	Fallthrough,
 	HttpMethod,
 	JSONObject,
 	MaybePromise,
@@ -69,11 +67,17 @@ export type CSRComponent = any; // TODO
 
 export type CSRComponentLoader = () => Promise<CSRComponent>;
 
-export type CSRRoute = [RegExp, CSRComponentLoader[], CSRComponentLoader[], GetParams?, ShadowKey?];
+export type CSRRoute = {
+	id: string;
+	exec: (path: string) => undefined | Record<string, string>;
+	a: CSRComponentLoader[];
+	b: CSRComponentLoader[];
+	has_shadow: boolean;
+};
 
 export interface EndpointData {
 	type: 'endpoint';
-	key: string;
+	id: string;
 	segments: RouteSegment[];
 	pattern: RegExp;
 	params: string[];
@@ -104,6 +108,7 @@ export interface ManifestData {
 	error: string;
 	components: string[];
 	routes: RouteData[];
+	validators: Record<string, string>;
 }
 
 export interface MethodOverride {
@@ -111,21 +116,18 @@ export interface MethodOverride {
 	allowed: string[];
 }
 
-export type NormalizedLoadOutput = Either<
-	{
-		status: number;
-		error?: Error;
-		redirect?: string;
-		props?: Record<string, any> | Promise<Record<string, any>>;
-		stuff?: Record<string, any>;
-		maxage?: number;
-	},
-	Fallthrough
->;
+export type NormalizedLoadOutput = {
+	status: number;
+	error?: Error;
+	redirect?: string;
+	props?: Record<string, any> | Promise<Record<string, any>>;
+	stuff?: Record<string, any>;
+	maxage?: number;
+};
 
 export interface PageData {
 	type: 'page';
-	key: string;
+	id: string;
 	shadow: string | null;
 	segments: RouteSegment[];
 	pattern: RegExp;
@@ -183,11 +185,10 @@ export interface ShadowEndpointOutput<Output extends JSONObject = JSONObject> {
 type ShadowKey = string;
 
 export interface ShadowRequestHandler<Output extends JSONObject = JSONObject> {
-	(event: RequestEvent): MaybePromise<Either<ShadowEndpointOutput<Output>, Fallthrough>>;
+	(event: RequestEvent): MaybePromise<ShadowEndpointOutput<Output>>;
 }
 
 export interface ShadowData {
-	fallthrough?: boolean;
 	status?: number;
 	error?: Error;
 	redirect?: string;
@@ -216,8 +217,10 @@ export type SSRComponentLoader = () => Promise<SSRComponent>;
 
 export interface SSREndpoint {
 	type: 'endpoint';
+	id: string;
 	pattern: RegExp;
-	params: GetParams;
+	names: string[];
+	types: string[];
 	load(): Promise<{
 		[method: string]: RequestHandler;
 	}>;
@@ -275,9 +278,10 @@ export interface SSROptions {
 
 export interface SSRPage {
 	type: 'page';
-	key: string;
+	id: string;
 	pattern: RegExp;
-	params: GetParams;
+	names: string[];
+	types: string[];
 	shadow:
 		| null
 		| (() => Promise<{
@@ -303,7 +307,6 @@ export type SSRRoute = SSREndpoint | SSRPage;
 
 export interface SSRState {
 	fallback?: string;
-	fetched?: string;
 	getClientAddress: () => string;
 	initiator?: SSRPage | null;
 	platform?: any;

package/types/private.d.ts

@@ -136,18 +136,12 @@ export interface CspDirectives {
 	>;
 }
 
-export type Either<T, U> = Only<T, U> | Only<U, T>;
-
 export interface ErrorLoadInput<Params extends Record<string, string> = Record<string, string>>
 	extends LoadInput<Params> {
 	status?: number;
 	error?: Error;
 }
 
-export interface Fallthrough {
-	fallthrough: true;
-}
-
 export type HttpMethod = 'get' | 'head' | 'post' | 'put' | 'delete' | 'patch';
 
 export interface JSONObject {
@@ -168,12 +162,13 @@ export interface LoadInput<
 	Params extends Record<string, string> = Record<string, string>,
 	Props extends Record<string, any> = Record<string, any>
 > {
-	url: URL;
+	fetch(info: RequestInfo, init?: RequestInit): Promise<Response>;
 	params: Params;
 	props: Props;
-	fetch(info: RequestInfo, init?: RequestInit): Promise<Response>;
+	routeId: string | null;
 	session: App.Session;
 	stuff: Partial<App.Stuff>;
+	url: URL;
 }
 
 export interface LoadOutput<Props extends Record<string, any> = Record<string, any>> {
@@ -241,6 +236,7 @@ export interface RequestEvent<Params extends Record<string, string> = Record<str
 	params: Params;
 	platform: Readonly<App.Platform>;
 	request: Request;
+	routeId: string | null;
 	url: URL;
 }