Move the first few functions

Author: benmccann

runtime/src/app/app.ts

@@ -71,16 +71,6 @@ export function set_target(element) {
 	target = element;
 }
 
-export let uid = 1;
-export function set_uid(n) {
-	uid = n;
-}
-
-export let cid: number;
-export function set_cid(n) {
-	cid = n;
-}
-
 const _history = typeof history !== 'undefined' ? history : {
 	pushState: (state: any, title: string, href: string) => {},
 	replaceState: (state: any, title: string, href: string) => {},
@@ -169,22 +159,7 @@ export function scroll_state() {
 	};
 }
 
-export async function navigate(dest: Target, id: number, noscroll?: boolean, hash?: string): Promise<any> {
-	if (id) {
-		// popstate or initial navigation
-		cid = id;
-	} else {
-		const current_scroll = scroll_state();
-
-		// clicked on a link. preserve scroll state
-		scroll_history[cid] = current_scroll;
-
-		id = cid = ++uid;
-		scroll_history[cid] = noscroll ? current_scroll : { x: 0, y: 0 };
-	}
-
-	cid = id;
-
+export async function handle_target(dest: Target) {
 	if (root_component) stores.preloading.set(true);
 
 	const loaded = prefetching && prefetching.href === dest.href ?
@@ -204,26 +179,6 @@ export async function navigate(dest: Target, id: number, noscroll?: boolean, has
 		const { props, branch } = loaded_result;
 		await render(branch, props, dest.page);
 	}
-	if (document.activeElement && (document.activeElement instanceof HTMLElement)) document.activeElement.blur();
-
-	if (!noscroll) {
-		let scroll = scroll_history[id];
-
-		if (hash) {
-			// scroll is an element id (from a hash), we need to compute y.
-			const deep_linked = document.getElementById(hash.slice(1));
-
-			if (deep_linked) {
-				scroll = {
-					x: 0,
-					y: deep_linked.getBoundingClientRect().top + scrollY
-				};
-			}
-		}
-
-		scroll_history[cid] = scroll;
-		if (scroll) scrollTo(scroll.x, scroll.y);
-	}
 }
 
 async function render(branch: any[], props: any, page: Page) {

runtime/src/app/goto/index.ts

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

runtime/src/app/start/index.ts

@@ -1,19 +1,28 @@
 import {
-	cid,
+	handle_target,
 	history,
 	initial_data,
-	navigate,
 	scroll_history,
 	scroll_state,
 	select_target,
 	handle_error,
-	set_target,
-	uid,
-	set_uid,
-	set_cid
+	set_target
 } from '../app';
+import {
+	Target
+} from '../types';
 import prefetch from '../prefetch/index';
 
+export let uid = 1;
+export function set_uid(n: number) {
+	uid = n;
+}
+
+export let cid: number;
+export function set_cid(n: number) {
+	cid = n;
+}
+
 export default function start(opts: {
 	target: Node
 }): Promise<void> {
@@ -145,3 +154,42 @@ function handle_popstate(event: PopStateEvent) {
 		history.replaceState({ id: cid }, '', location.href);
 	}
 }
+
+export async function navigate(dest: Target, id: number, noscroll?: boolean, hash?: string): Promise<any> {
+	if (id) {
+		// popstate or initial navigation
+		cid = id;
+	} else {
+		const current_scroll = scroll_state();
+
+		// clicked on a link. preserve scroll state
+		scroll_history[cid] = current_scroll;
+
+		id = cid = ++uid;
+		scroll_history[cid] = noscroll ? current_scroll : { x: 0, y: 0 };
+	}
+
+	cid = id;
+
+	await handle_target(dest);
+	if (document.activeElement && (document.activeElement instanceof HTMLElement)) document.activeElement.blur();
+
+	if (!noscroll) {
+		let scroll = scroll_history[id];
+
+		if (hash) {
+			// scroll is an element id (from a hash), we need to compute y.
+			const deep_linked = document.getElementById(hash.slice(1));
+
+			if (deep_linked) {
+				scroll = {
+					x: 0,
+					y: deep_linked.getBoundingClientRect().top + scrollY
+				};
+			}
+		}
+
+		scroll_history[cid] = scroll;
+		if (scroll) scrollTo(scroll.x, scroll.y);
+	}
+}