last part of cleanup

http/cookie.ts

@@ -45,8 +45,8 @@ function toString(cookie: Cookie): string {
  if (cookie.httpOnly) {
  out.push("HttpOnly");
  }
- if (Number.isInteger(cookie.maxAge)) {
- assert(cookie.maxAge > 0, "Max-Age must be an integer superior to 0");
+ if (Number.isInteger(cookie.maxAge!)) {
+ assert(cookie.maxAge! > 0, "Max-Age must be an integer superior to 0");
  out.push(`Max-Age=${cookie.maxAge}`);
  }
  if (cookie.domain) {
@@ -75,10 +75,10 @@ function toString(cookie: Cookie): string {
 export function getCookies(req: ServerRequest): Cookies {
  if (req.headers.has("Cookie")) {
  const out: Cookies = {};
- const c = req.headers.get("Cookie").split(";");
+ const c = req.headers.get("Cookie")!.split(";");
  for (const kv of c) {
  const cookieVal = kv.split("=");
- const key = cookieVal.shift().trim();
+ const key = cookieVal.shift()!.trim();
  out[key] = cookieVal.join("=");
  }
  return out;

http/server.ts

@@ -73,11 +73,10 @@ export async function writeResponse(w: Writer, r: Response): Promise<void> {
  let out = `HTTP/${protoMajor}.${protoMinor} ${statusCode} ${statusText}\r\n`;
 
  setContentLength(r);
+ const headers = r.headers!;
 
- if (r.headers) {
- for (const [key, value] of r.headers) {
- out += `${key}: ${value}\r\n`;
- }
+ for (const [key, value] of headers!) {
+ out += `${key}: ${value}\r\n`;
  }
  out += "\r\n";
 
@@ -88,8 +87,8 @@ export async function writeResponse(w: Writer, r: Response): Promise<void> {
  if (r.body instanceof Uint8Array) {
  const n = await writer.write(r.body);
  assert(n === r.body.byteLength);
- } else if (r.headers.has("content-length")) {
- const bodyLength = parseInt(r.headers.get("content-length"));
+ } else if (headers.has("content-length")) {
+ const bodyLength = parseInt(headers.get("content-length")!);
  const n = await copy(writer, r.body);
  assert(n === bodyLength);
  } else {
@@ -99,17 +98,17 @@ export async function writeResponse(w: Writer, r: Response): Promise<void> {
 }
 
 export class ServerRequest {
- url: string;
- method: string;
- proto: string;
- headers: Headers;
- r: BufReader;
- w: BufWriter;
+ url!: string;
+ method!: string;
+ proto!: string;
+ headers!: Headers;
+ r!: BufReader;
+ w!: BufWriter;
  done: Deferred<void> = deferred();
 
  public async *bodyStream(): AsyncIterableIterator<Uint8Array> {
  if (this.headers.has("content-length")) {
- const len = +this.headers.get("content-length");
+ const len = +this.headers.get("content-length")!;
  if (Number.isNaN(len)) {
  return new Uint8Array(0);
  }
@@ -126,7 +125,7 @@ export class ServerRequest {
  } else {
  if (this.headers.has("transfer-encoding")) {
  const transferEncodings = this.headers
- .get("transfer-encoding")
+ .get("transfer-encoding")!
  .split(",")
  .map((e): string => e.trim().toLowerCase());
  if (transferEncodings.includes("chunked")) {
@@ -226,7 +225,7 @@ export async function readRequest(
  let firstLine: string;
  [firstLine, err] = await tp.readLine();
  if (err) {
- return [null, err];
+ return [req, err];
  }
  [req.method, req.url, req.proto] = firstLine.split(" ", 3);
  [req.headers, err] = await tp.readMIMEHeader();
@@ -254,7 +253,7 @@ export class Server implements AsyncIterable<ServerRequest> {
  ): AsyncIterableIterator<ServerRequest> {
  const bufr = new BufReader(conn);
  const w = new BufWriter(conn);
- let bufStateErr: BufState;
+ let bufStateErr: BufState = null;
  let req: ServerRequest;
 
  while (!this.closing) {
@@ -264,18 +263,18 @@ export class Server implements AsyncIterable<ServerRequest> {
  bufStateErr = err;
  }
  if (bufStateErr) break;
- req.w = w;
- yield req;
+ req!.w = w;
+ yield req!;
  // Wait for the request to be processed before we accept a new request on
  // this connection.
- await req.done;
+ await req!.done;
  }
 
  if (bufStateErr === "EOF") {
  // The connection was gracefully closed.
  } else if (bufStateErr instanceof Error) {
  // An error was thrown while parsing request headers.
- await writeResponse(req.w, {
+ await writeResponse(req!.w, {
  status: 400,
  body: new TextEncoder().encode(`${bufStateErr.message}\r\n\r\n`)
  });

io/writers.ts

@@ -6,6 +6,7 @@ import { decode, encode } from "../strings/strings.ts";
 export class StringWriter implements Writer {
  private chunks: Uint8Array[] = [];
  private byteLength: number = 0;
+ private cache: string | undefined;
 
  constructor(private base: string = "") {
  const c = encode(base);
@@ -16,12 +17,10 @@ export class StringWriter implements Writer {
  async write(p: Uint8Array): Promise<number> {
  this.chunks.push(p);
  this.byteLength += p.byteLength;
- this.cache = null;
+ this.cache = undefined;
  return p.byteLength;
  }
 
- private cache: string;
-
  toString(): string {
  if (this.cache) {
  return this.cache;
@@ -33,6 +32,6 @@ export class StringWriter implements Writer {
  offs += chunk.byteLength;
  }
  this.cache = decode(buf);
- return this.cache;
+ return this.cache!;
  }
 }

log/handlers.ts

@@ -40,14 +40,14 @@ export class BaseHandler {
  return this.formatter.replace(
  /{(\S+)}/g,
  (match, p1): string => {
- const value = logRecord[p1];
+ const value = logRecord[p1 as keyof LogRecord];
 
  // do not interpolate missing values
  if (!value) {
  return match;
  }
 
- return value;
+ return String(value);
  }
  );
  }
@@ -87,7 +87,7 @@ export class ConsoleHandler extends BaseHandler {
 }
 
 export abstract class WriterHandler extends BaseHandler {
- protected _writer: Writer;
+ protected _writer!: Writer;
  private _encoder = new TextEncoder();
 
  log(msg: string): void {
@@ -100,7 +100,7 @@ interface FileHandlerOptions extends HandlerOptions {
 }
 
 export class FileHandler extends WriterHandler {
- private _file: File;
+ private _file!: File;
  private _filename: string;
 
  constructor(levelName: string, options: FileHandlerOptions) {

mime/multipart.ts

@@ -150,20 +150,20 @@ class PartReader implements Reader, Closer {
 
  close(): void {}
 
- private contentDisposition: string;
- private contentDispositionParams: { [key: string]: string };
+ private contentDisposition!: string;
+ private contentDispositionParams!: { [key: string]: string };
 
  private getContentDispositionParams(): { [key: string]: string } {
  if (this.contentDispositionParams) return this.contentDispositionParams;
  const cd = this.headers.get("content-disposition");
- const params = {};
- const comps = cd.split(";");
+ const params: {[key: string]: string} = {};
+ const comps = cd!.split(";");
  this.contentDisposition = comps[0];
  comps
  .slice(1)
- .map((v): string => v.trim())
+ .map((v: string): string => v.trim())
  .map(
- (kv): void => {
+ (kv: string): void => {
  const [k, v] = kv.split("=");
  if (v) {
  const s = v.charAt(0);
@@ -265,7 +265,7 @@ export class MultipartReader {
  file.close();
  formFile = {
  filename: p.fileName,
- type: p.headers.get("content-type"),
+ type: p.headers.get("content-type")!,
  tempfile: filepath,
  size
  };
@@ -275,22 +275,22 @@ export class MultipartReader {
  } else {
  formFile = {
  filename: p.fileName,
- type: p.headers.get("content-type"),
+ type: p.headers.get("content-type")!,
  content: buf.bytes(),
  size: buf.bytes().byteLength
  };
  maxMemory -= n;
  maxValueBytes -= n;
  }
- result[p.formName] = formFile;
+ result[p.formName] = formFile!;
  }
  return result;
  }
 
- private currentPart: PartReader;
- private partsRead: number;
+ private currentPart: PartReader | undefined;
+ private partsRead: number = 0;
 
- private async nextPart(): Promise<PartReader> {
+ private async nextPart(): Promise<PartReader | undefined> {
  if (this.currentPart) {
  this.currentPart.close();
  }
@@ -413,7 +413,7 @@ export class MultipartWriter {
  return this._boundary;
  }
 
- private lastPart: PartWriter;
+ private lastPart: PartWriter | undefined;
  private bufWriter: BufWriter;
  private isClosed: boolean = false;
 

prettier/util.ts

@@ -2,7 +2,7 @@
 const { build, run } = Deno;
 
 // Runs a command in cross-platform way
-export function xrun(opts): Deno.Process {
+export function xrun(opts: Deno.RunOptions): Deno.Process {
  return run({
  ...opts,
  args: build.os === "win" ? ["cmd.exe", "/c", ...opts.args] : opts.args

ws/sha1.ts

@@ -77,11 +77,11 @@ export class Sha1 {
 
  if (notString) {
  for (i = start; index < length && i < 64; ++index) {
- blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
+ blocks[i >> 2] |= message[index] as number << SHIFT[i++ & 3];
  }
  } else {
  for (i = start; index < length && i < 64; ++index) {
- code = message.charCodeAt(index);
+ code = (message as string).charCodeAt(index);
  if (code < 0x80) {
  blocks[i >> 2] |= code << SHIFT[i++ & 3];
  } else if (code < 0x800) {
@@ -94,7 +94,7 @@ export class Sha1 {
  } else {
  code =
  0x10000 +
- (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
+ (((code & 0x3ff) << 10) | ((message as string).charCodeAt(++index) & 0x3ff));
  blocks[i >> 2] |= (0xf0 | (code >> 18)) << SHIFT[i++ & 3];
  blocks[i >> 2] |= (0x80 | ((code >> 12) & 0x3f)) << SHIFT[i++ & 3];
  blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];