Fix warnings and missing types on server (#1529)

Author: benmccann

package-lock.json

@@ -32,8 +32,10 @@
     "@rollup/plugin-node-resolve": "^8.0.1",
     "@rollup/plugin-replace": "^2.3.3",
     "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.0.0",
+    "@types/cookie": "^0.4.0",
     "@types/mocha": "^8.0.0",
     "@types/node": "^10.0.0",
+    "@types/node-fetch": "^2.5.7",
     "@types/puppeteer": "^3.0.1",
     "@typescript-eslint/eslint-plugin": "^3.0.2",
     "@typescript-eslint/parser": "^3.0.2",

package.json

@@ -1,11 +1,9 @@
 import {
-  ComponentConstructor,
-  DOMComponentModule,
   Preload
 } from './shared';
 
 export interface DOMComponentModule {
-  default: ComponentConstructor;
+  default: DOMComponentConstructor;
   preload?: Preload;
 }
 

runtime/src/internal/manifest-client.d.ts

@@ -1,8 +1,7 @@
 import { ClientRequest, ServerResponse } from 'http';
 import { TLSSocket } from 'tls';
 import {
-  SSRComponentModule,
-  SSRComponent
+  Preload
 } from './shared';
 
 export const src_dir: string;

runtime/src/internal/manifest-server.d.ts

@@ -2,4 +2,7 @@ export const CONTEXT_KEY: unknown;
 
 export type Params = Record<string, string>;
 export type Query = Record<string, string | string[]>;
-export type Preload = (props: { params: Params, query: Query }) => Promise<any>;
+export type PreloadResult = object | Promise<object>;
+export interface Preload {
+  (this: PreloadContext, page: PreloadPage, session: any): PreloadResult;
+}

runtime/src/internal/shared.d.ts

@@ -1,12 +1,13 @@
 import { writable } from 'svelte/store';
 import fs from 'fs';
 import path from 'path';
-import cookie from 'cookie';
+import { parse } from 'cookie';
 import devalue from 'devalue';
 import fetch from 'node-fetch';
 import URL from 'url';
 import { sourcemap_stacktrace } from './sourcemap_stacktrace';
 import { Manifest, ManifestPage, Req, Res, build_dir, dev, src_dir } from '@sapper/internal/manifest-server';
+import { PreloadResult } from '@sapper/internal/shared';
 import App from '@sapper/internal/App.svelte';
 
 export function get_page_handler(
@@ -128,14 +129,14 @@ export function get_page_handler(
 
 					const cookies = Object.assign(
 						{},
-						cookie.parse(req.headers.cookie || ''),
-						cookie.parse(opts.headers.cookie || '')
+						parse(req.headers.cookie || ''),
+						parse(opts.headers.cookie || '')
 					);
 
 					const set_cookie = res.getHeader('Set-Cookie');
-					(Array.isArray(set_cookie) ? set_cookie : [set_cookie]).forEach(str => {
-						const match = /([^=]+)=([^;]+)/.exec(<string>str);
-						if (match) cookies[match[1]] = match[2];
+					(Array.isArray(set_cookie) ? set_cookie : [set_cookie]).forEach((s: string) => {
+						const m = /([^=]+)=([^;]+)/.exec(s);
+						if (m) cookies[m[1]] = m[2];
 					});
 
 					const str = Object.keys(cookies)
@@ -153,13 +154,13 @@ export function get_page_handler(
 			}
 		};
 
-		let preloaded;
-		let match;
-		let params;
+		let preloaded: object[];
+		let match: RegExpExecArray;
+		let params: Record<string,string>;
 
 		try {
 			const root_preload = manifest.root_comp.preload || (() => {});
-			const root_preloaded = root_preload.call(preload_context, {
+			const root_preloaded: PreloadResult = root_preload.call(preload_context, {
 					host: req.headers.host,
 					path: req.path,
 					query: req.query,
@@ -168,8 +169,7 @@ export function get_page_handler(
 
 			match = error ? null : page.pattern.exec(req.path);
 
-
-			let toPreload = [root_preloaded];
+			let toPreload: PreloadResult[] = [root_preloaded];
 			if (!is_service_worker_index) {
 				toPreload = toPreload.concat(page.parts.map(part => {
 					if (!part) return null;
@@ -258,12 +258,12 @@ export function get_page_handler(
 			};
 
 			if (!is_service_worker_index) {
-				let l = 1;
+				let level_index = 1;
 				for (let i = 0; i < page.parts.length; i += 1) {
 					const part = page.parts[i];
 					if (!part) continue;
 
-					props[`level${l++}`] = {
+					props[`level${level_index++}`] = {
 						component: part.component.default,
 						props: preloaded[i + 1] || {},
 						segment: segments[i]
@@ -295,7 +295,7 @@ export function get_page_handler(
 				script += `if('serviceWorker' in navigator)navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`;
 			}
 
-			const file = [].concat(build_info.assets.main).filter(file => file && /\.js$/.test(file))[0];
+			const file = [].concat(build_info.assets.main).filter(f => f && /\.js$/.test(f))[0];
 			const main = `${req.baseUrl}/client/${file}`;
 
 			// users can set a CSP nonce using res.locals.nonce

runtime/src/server/middleware/get_page_handler.ts

@@ -16,14 +16,14 @@ function get_sourcemap_url(contents: string) {
 
 const file_cache = new Map<string, string>();
 
-function get_file_contents(path: string) {
-	if (file_cache.has(path)) {
-		return file_cache.get(path);
+function get_file_contents(file_path: string) {
+	if (file_cache.has(file_path)) {
+		return file_cache.get(file_path);
 	}
 
 	try {
-		const data = fs.readFileSync(path, 'utf8');
-		file_cache.set(path, data);
+		const data = fs.readFileSync(file_path, 'utf8');
+		file_cache.set(file_path, data);
 		return data;
 	} catch {
 		return undefined;
@@ -34,7 +34,7 @@ export function sourcemap_stacktrace(stack: string) {
 	const replace = (line: string) =>
 		line.replace(
 			/^ {4}at (?:(.+?)\s+\()?(?:(.+?):(\d+)(?::(\d+))?)\)?/,
-			(input, var_name, file_path, line, column) => {
+			(input, var_name, file_path, line_num, column) => {
 				if (!file_path) return input;
 
 				const contents = get_file_contents(file_path);
@@ -72,7 +72,7 @@ export function sourcemap_stacktrace(stack: string) {
 
 				const consumer = new SourceMapConsumer(raw_sourcemap);
 				const pos = consumer.originalPositionFor({
-					line: Number(line),
+					line: Number(line_num),
 					column: Number(column),
 					bias: SourceMapConsumer.LEAST_UPPER_BOUND
 				});