Fix VS Code warnings (#1424)

Author: benmccann

runtime/src/app/app.ts

@@ -45,16 +45,16 @@ stores.session.subscribe(async value => {
 	if (!ready) return;
 	session_dirty = true;
 
-	const target = select_target(new URL(location.href));
+	const dest = select_target(new URL(location.href));
 
 	const token = current_token = {};
-	const { redirect, props, branch } = await hydrate_target(target);
+	const { redirect, props, branch } = await hydrate_target(dest);
 	if (token !== current_token) return; // a secondary navigation happened while we were loading
 
 	if (redirect) {
 		await goto(redirect.location, { replaceState: true });
 	} else {
-		await render(branch, props, target.page);
+		await render(branch, props, dest.page);
 	}
 });
 
@@ -169,7 +169,7 @@ export function scroll_state() {
 	};
 }
 
-export async function navigate(target: Target, id: number, noscroll?: boolean, hash?: string): Promise<any> {
+export async function navigate(dest: Target, id: number, noscroll?: boolean, hash?: string): Promise<any> {
 	if (id) {
 		// popstate or initial navigation
 		cid = id;
@@ -187,9 +187,9 @@ export async function navigate(target: Target, id: number, noscroll?: boolean, h
 
 	if (root_component) stores.preloading.set(true);
 
-	const loaded = prefetching && prefetching.href === target.href ?
+	const loaded = prefetching && prefetching.href === dest.href ?
 		prefetching.promise :
-		hydrate_target(target);
+		hydrate_target(dest);
 
 	prefetching = null;
 
@@ -202,7 +202,7 @@ export async function navigate(target: Target, id: number, noscroll?: boolean, h
 		await goto(redirect.location, { replaceState: true });
 	} else {
 		const { props, branch } = loaded_result;
-		await render(branch, props, target.page);
+		await render(branch, props, dest.page);
 	}
 	if (document.activeElement && (document.activeElement instanceof HTMLElement)) document.activeElement.blur();
 
@@ -273,8 +273,8 @@ function part_changed(i, segment, match, stringified_query) {
 	}
 }
 
-export async function hydrate_target(target: Target): Promise<HydratedTarget> {
-	const { route, page } = target;
+export async function hydrate_target(dest: Target): Promise<HydratedTarget> {
+	const { route, page } = dest;
 	const segments = page.path.split('/').filter(Boolean);
 
 	let redirect: Redirect = null;
@@ -339,7 +339,7 @@ export async function hydrate_target(target: Target): Promise<HydratedTarget> {
 						host: page.host,
 						path: page.path,
 						query: page.query,
-						params: part.params ? part.params(target.match) : {}
+						params: part.params ? part.params(dest.match) : {}
 					}, $session)
 					: {};
 			} else {

runtime/src/app/start/index.ts

@@ -135,7 +135,8 @@ function handle_popstate(event: PopStateEvent) {
 		if (target) {
 			navigate(target, event.state.id);
 		} else {
-			location.href = location.href; // eslint-disable-line
+			// eslint-disable-next-line
+			location.href = location.href; // nosonar
 		}
 	} else {
 		// hashchange

runtime/src/app/stores/index.ts

@@ -36,9 +36,9 @@ export function page_store<T>(value: T): PageStore<T> {
 
 	function subscribe(run: Subscriber<T>): Unsubscriber {
 		let old_value;
-		return store.subscribe((value) => {
-			if (old_value === undefined || (ready && value !== old_value)) {
-				run(old_value = value);
+		return store.subscribe((new_value) => {
+			if (old_value === undefined || (ready && new_value !== old_value)) {
+				run(old_value = new_value);
 			}
 		});
 	}

src/api/build.ts

@@ -89,17 +89,17 @@ export async function build({
 
 	if (legacy) {
 		process.env.SAPPER_LEGACY_BUILD = 'true';
-		const { client } = await create_compilers(bundler, cwd, src, dest, false);
+		const { client: legacy_client } = await create_compilers(bundler, cwd, src, dest, false);
 
-		const client_result = await client.compile();
+		const legacy_client_result = await legacy_client.compile();
 
 		oncompile({
 			type: 'client (legacy)',
-			result: client_result
+			result: legacy_client_result
 		});
 
-		client_result.to_json(manifest_data, { src, routes, dest });
-		build_info.legacy_assets = client_result.assets;
+		legacy_client_result.to_json(manifest_data, { src, routes, dest });
+		build_info.legacy_assets = legacy_client_result.assets;
 		delete process.env.SAPPER_LEGACY_BUILD;
 	}
 

src/api/export.ts

@@ -1,7 +1,7 @@
 import * as child_process from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as url from 'url';
+import * as urllib from 'url';
 import { promisify } from 'util';
 import fetch from 'node-fetch';
 import * as ports from 'port-authority';
@@ -35,14 +35,14 @@ type Ref = {
 	as: string;
 };
 
-type URL = url.UrlWithStringQuery;
+type URL = urllib.UrlWithStringQuery;
 
 function resolve(from: string, to: string) {
-	return url.parse(url.resolve(from, to));
+	return urllib.parse(urllib.resolve(from, to));
 }
 
-function cleanPath(path: string) {
-	return path.replace(/^\/|\/$|\/*index(.html)*$|.html$/g, '');
+function cleanPath(p: string) {
+	return p.replace(/^\/|\/$|\/*index(.html)*$|.html$/g, '');
 }
 
 function get_href(attrs: string) {
@@ -118,10 +118,10 @@ async function _export({
 	if (!root.href.endsWith('/')) root.href += '/';
 
 	const entryPoints = entry.split(' ').map(entryPoint => {
-		const entry = resolve(origin, `${basepath}/${cleanPath(entryPoint)}`);
-		if (!entry.href.endsWith('/')) entry.href += '/';
+		const resolved = resolve(origin, `${basepath}/${cleanPath(entryPoint)}`);
+		if (!resolved.href.endsWith('/')) resolved.href += '/';
 
-		return entry;
+		return resolved;
 	});
 
 	const proc = child_process.fork(path.resolve(`${build_dir}/server/server.js`), [], {
@@ -184,16 +184,16 @@ async function _export({
 		addCallback(url);
 	}
 
-	async function handleFetch(url: URL, { timeout, host, host_header }: FetchOpts) {
+	async function handleFetch(url: URL, opts: FetchOpts) {
 		const href = url.href;
 		const timeout_deferred = new Deferred();
 		const the_timeout = setTimeout(() => {
 			timeout_deferred.reject(new Error(`Timed out waiting for ${href}`));
-		}, timeout);
+		}, opts.timeout);
 
 		const r = await Promise.race([
 			fetch(href, {
-				headers: { host: host_header || host },
+				headers: { host: opts.host_header || opts.host },
 				redirect: 'manual'
 			}),
 			timeout_deferred.promise
@@ -209,11 +209,10 @@ async function _export({
 
 	async function handleResponse(fetched: Promise<FetchRet>, fetchOpts: FetchOpts) {
 		const { response, url } = await fetched;
-		const { protocol, host, root } = fetchOpts;
 		let pathname = url.pathname;
 
 		if (pathname !== '/service-worker-index.html') {
-			pathname = pathname.replace(root.pathname, '') || '/';
+			pathname = pathname.replace(fetchOpts.root.pathname, '') || '/';
 		}
 
 		let type = response.headers.get('Content-Type');
@@ -261,10 +260,9 @@ async function _export({
 					hrefs = hrefs.filter(Boolean);
 
 					for (const href of hrefs) {
-						const url = resolve(base.href, href);
-
-						if (url.protocol === protocol && url.host === host) {
-							handle(url, fetchOpts, queue.add);
+						const dest = resolve(base.href, href);
+						if (dest.protocol === fetchOpts.protocol && dest.host === fetchOpts.host) {
+							handle(dest, fetchOpts, queue.add);
 						}
 					}
 				}
@@ -277,13 +275,13 @@ async function _export({
 			type = 'text/html';
 			body = `<script>window.location.href = "${location.replace(origin, '')}"</script>`;
 
-			handle(resolve(root.href, location), fetchOpts, queue.add);
+			handle(resolve(fetchOpts.root.href, location), fetchOpts, queue.add);
 		}
 
 		return save(pathname, response.status, type, body);
 	}
 
-	const fetchOpts = {
+	const queueFetchOpts = {
 		timeout: timeout === false ? 0 : timeout,
 		host,
 		host_header,
@@ -295,7 +293,7 @@ async function _export({
 		concurrent,
 		seen,
 		saved,
-		fetchOpts,
+		fetchOpts: queueFetchOpts,
 		handleFetch,
 		handleResponse,
 		callbacks: {
@@ -320,12 +318,12 @@ async function _export({
 					oninfo({
 						message: `Crawling ${entryPoint.href}`
 					});
-					handle(entryPoint, fetchOpts, queue.add);
+					handle(entryPoint, queueFetchOpts, queue.add);
 				}
 
 				if (has_serviceworker) {
 					const workerUrl = resolve(root.href, 'service-worker-index.html');
-					handle(workerUrl, fetchOpts, queue.add);
+					handle(workerUrl, queueFetchOpts, queue.add);
 				}
 			} catch (err) {
 				proc.kill();

src/api/utils/export_queue.ts

@@ -88,8 +88,7 @@ function exportQueue({ concurrent, handleFetch, handleResponse, fetchOpts, callb
 
 		// move urls from urls queue and into fetching queue until fetching queue is full
 		while (fetching.length < concurrent && urls.length) {
-			const url = urls.shift();
-			addToQueue(handleFetch(url, fetchOpts), fetching);
+			addToQueue(handleFetch(urls.shift(), fetchOpts), fetching);
 		}
 
 		if (urls.length === 0 && saving.length === 0 && fetching.length === 0) {
@@ -100,8 +99,8 @@ function exportQueue({ concurrent, handleFetch, handleResponse, fetchOpts, callb
 	}
 
 	return {
-		add: (url: URL) => {
-			urls.push(url);
+		add: (u: URL) => {
+			urls.push(u);
 			return processQueue();
 		},
 		addSave: (p: Promise<any>) => {

src/core/create_compilers/RollupCompiler.ts

@@ -51,8 +51,8 @@ export default class RollupCompiler {
 		});
 
 		mod.onwarn = (warning: any) => {
-			onwarn(warning, (warning: any) => {
-				this.warnings.push(warning);
+			onwarn(warning, (warn: any) => {
+				this.warnings.push(warn);
 			});
 		};
 

src/core/create_compilers/RollupResult.ts

@@ -50,7 +50,7 @@ export default class RollupResult implements CompileResult {
 		} else {
 			for (const name in compiler.input) {
 				const file = compiler.input[name];
-				const chunk = compiler.chunks.find(chunk => file in chunk.modules);
+				const chunk = compiler.chunks.find(chnk => file in chnk.modules);
 				if (chunk) this.assets[name] = chunk.fileName;
 			}
 		}