Move remaining functions and invert calls

Author: benmccann

runtime/src/app/app.ts

@@ -1,14 +1,17 @@
 import { writable } from 'svelte/store';
 import App from '@sapper/internal/App.svelte';
-import { Query } from '@sapper/internal/shared';
+import {
+	extract_query,
+	init,
+	load_current_page,
+	select_target
+} from './start';
 import {
 	DOMComponentLoader,
 	DOMComponentModule,
 	ErrorComponent,
-	ignore,
 	components,
-	root_comp,
-	routes
+	root_comp
 } from '@sapper/internal/manifest-client';
 import {
 	HydratedTarget,
@@ -70,50 +73,23 @@ export function set_target(element) {
 	target = element;
 }
 
-export function extract_query(search: string) {
-	const query = Object.create(null);
-	if (search.length > 0) {
-		search.slice(1).split('&').forEach(searchParam => {
-			const [, key, value = ''] = /([^=]*)(?:=(.*))?/.exec(decodeURIComponent(searchParam.replace(/\+/g, ' ')));
-			if (typeof query[key] === 'string') query[key] = [<string>query[key]];
-			if (typeof query[key] === 'object') (query[key] as string[]).push(value);
-			else query[key] = value;
-		});
-	}
-	return query;
-}
+export default function start(opts: {
+	target: Node
+}): Promise<void> {
+	set_target(opts.target);
 
-export function select_target(url: URL): Target {
-	if (url.origin !== location.origin) return null;
-	if (!url.pathname.startsWith(initial_data.baseUrl)) return null;
+	init(initial_data.baseUrl, handle_target);
 
-	let path = url.pathname.slice(initial_data.baseUrl.length);
-
-	if (path === '') {
-		path = '/';
+	if (initial_data.error) {
+		return Promise.resolve().then(() => {
+			return handle_error(new URL(location.href));
+		});
 	}
 
-	// avoid accidental clashes between server routes and page routes
-	if (ignore.some(pattern => pattern.test(path))) return;
-
-	for (let i = 0; i < routes.length; i += 1) {
-		const route = routes[i];
-
-		const match = route.pattern.exec(path);
-
-		if (match) {
-			const query: Query = extract_query(url.search);
-			const part = route.parts[route.parts.length - 1];
-			const params = part.params ? part.params(match) : {};
-
-			const page = { host: location.host, path, query, params };
-
-			return { href: url.href, route, match, page };
-		}
-	}
+	return load_current_page();
 }
 
-export function handle_error(url: URL) {
+function handle_error(url: URL) {
 	const { host, pathname, search } = location;
 	const { session, preloaded, status, error } = initial_data;
 
@@ -142,7 +118,7 @@ export function handle_error(url: URL) {
 	render([], props, { host, path: pathname, query, params: {} });
 }
 
-export async function handle_target(dest: Target) {
+async function handle_target(dest: Target): Promise<void> {
 	if (root_component) stores.preloading.set(true);
 
 	const loaded = prefetching && prefetching.href === dest.href ?

runtime/src/app/goto/index.ts

@@ -1,6 +1,4 @@
-import { history } from '../start';
-import { select_target } from '../app';
-import { navigate, cid } from '../start';
+import { cid, history, navigate, select_target } from '../start';
 
 export default function goto(
 		href: string,

runtime/src/app/index.ts

@@ -3,7 +3,7 @@ import { CONTEXT_KEY } from '@sapper/internal/shared';
 
 export const stores = () => getContext(CONTEXT_KEY);
 
-export { default as start } from './start/index';
+export { default as start } from './app';
 export { default as goto } from './goto/index';
 export { default as prefetch } from './prefetch/index';
 export { default as prefetchRoutes } from './prefetchRoutes/index';

runtime/src/app/prefetch/index.ts

@@ -1,4 +1,5 @@
-import { select_target, prefetching, set_prefetching, hydrate_target } from '../app';
+import { prefetching, set_prefetching, hydrate_target } from '../app';
+import { select_target } from '../start';
 
 export default function prefetch(href: string) {
 	const target = select_target(new URL(href, document.baseURI));

runtime/src/app/start/index.ts

@@ -1,15 +1,13 @@
-import {
-	handle_target,
-	initial_data,
-	select_target,
-	handle_error,
-	set_target
-} from '../app';
 import {
 	ScrollPosition,
 	Target
 } from '../types';
 import prefetch from '../prefetch/index';
+import {
+	ignore,
+	routes
+} from '@sapper/internal/manifest-client';
+import { Query } from '@sapper/internal/shared';
 
 export let uid = 1;
 export function set_uid(n: number) {
@@ -30,9 +28,24 @@ export { _history as history };
 
 export const scroll_history: Record<string, ScrollPosition> = {};
 
-export default function start(opts: {
-	target: Node
-}): Promise<void> {
+export function load_current_page(): Promise<void> {
+	return Promise.resolve().then(() => {
+		const { hash, href } = location;
+
+		_history.replaceState({ id: uid }, '', href);
+
+		const target = select_target(new URL(location.href));
+		if (target) return navigate(target, uid, true, hash);
+	});
+}
+
+let base_url: string;
+let handle_target: (dest: Target) => Promise<void>;
+
+export function init(base: string, handler: (dest: Target) => Promise<void>): void {
+	base_url = base;
+	handle_target = handler;
+
 	if ('scrollRestoration' in _history) {
 		_history.scrollRestoration = 'manual';
 	}
@@ -50,27 +63,55 @@ export default function start(opts: {
 		_history.scrollRestoration = 'manual';
 	});
 
-	set_target(opts.target);
-
 	addEventListener('click', handle_click);
 	addEventListener('popstate', handle_popstate);
 
 	// prefetch
 	addEventListener('touchstart', trigger_prefetch);
 	addEventListener('mousemove', handle_mousemove);
+}
 
-	return Promise.resolve().then(() => {
-		const { hash, href } = location;
+export function extract_query(search: string) {
+	const query = Object.create(null);
+	if (search.length > 0) {
+		search.slice(1).split('&').forEach(searchParam => {
+			const [, key, value = ''] = /([^=]*)(?:=(.*))?/.exec(decodeURIComponent(searchParam.replace(/\+/g, ' ')));
+			if (typeof query[key] === 'string') query[key] = [<string>query[key]];
+			if (typeof query[key] === 'object') (query[key] as string[]).push(value);
+			else query[key] = value;
+		});
+	}
+	return query;
+}
 
-		_history.replaceState({ id: uid }, '', href);
+export function select_target(url: URL): Target {
+	if (url.origin !== location.origin) return null;
+	if (!url.pathname.startsWith(base_url)) return null;
 
-		const url = new URL(location.href);
+	let path = url.pathname.slice(base_url.length);
 
-		if (initial_data.error) return handle_error(url);
+	if (path === '') {
+		path = '/';
+	}
 
-		const target = select_target(url);
-		if (target) return navigate(target, uid, true, hash);
-	});
+	// avoid accidental clashes between server routes and page routes
+	if (ignore.some(pattern => pattern.test(path))) return;
+
+	for (let i = 0; i < routes.length; i += 1) {
+		const route = routes[i];
+
+		const match = route.pattern.exec(path);
+
+		if (match) {
+			const query: Query = extract_query(url.search);
+			const part = route.parts[route.parts.length - 1];
+			const params = part.params ? part.params(match) : {};
+
+			const page = { host: location.host, path, query, params };
+
+			return { href: url.href, route, match, page };
+		}
+	}
 }
 
 let mousemove_timeout: NodeJS.Timer;