From 735147b3b19de4ac6d2989806d916c56053f7cdb Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Fri, 10 Apr 2020 10:30:22 -0400
Subject: [PATCH 1/5] Remove __domTypes namespace

---
 cli/js/lib.deno.shared_globals.d.ts | 349 +++++++++++++---------------
 cli/js/lib.deno.window.d.ts         |  10 +-
 2 files changed, 170 insertions(+), 189 deletions(-)

diff --git a/cli/js/lib.deno.shared_globals.d.ts b/cli/js/lib.deno.shared_globals.d.ts
index 559fc878faf07c..ca53f09c0de4f5 100644
--- a/cli/js/lib.deno.shared_globals.d.ts
+++ b/cli/js/lib.deno.shared_globals.d.ts
@@ -9,16 +9,8 @@
 /// <reference lib="deno.ns" />
 /// <reference lib="esnext" />
 
-// https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope
-
-declare interface WindowOrWorkerGlobalScope {
-  ReadableStream: __domTypes.ReadableStreamConstructor;
-  location: __domTypes.Location;
-}
-
 // This follows the WebIDL at: https://webassembly.github.io/spec/js-api/
 // and: https://webassembly.github.io/spec/web-api/
-
 declare namespace WebAssembly {
   interface WebAssemblyInstantiatedSource {
     module: Module;
@@ -203,8 +195,7 @@ declare function clearInterval(id?: number): void;
 declare function queueMicrotask(func: Function): void;
 
 declare const console: Console;
-declare const location: __domTypes.Location;
-declare const ReadableStream: __domTypes.ReadableStreamConstructor;
+declare const location: Location;
 
 declare function addEventListener(
   type: string,
@@ -220,188 +211,178 @@ declare function removeEventListener(
   options?: boolean | EventListenerOptions | undefined
 ): void;
 
-declare type ReadableStream<R = any> = __domTypes.ReadableStream<R>;
-
 declare interface ImportMeta {
   url: string;
   main: boolean;
 }
 
-declare namespace __domTypes {
-  export interface DomIterable<K, V> {
-    keys(): IterableIterator<K>;
-    values(): IterableIterator<V>;
-    entries(): IterableIterator<[K, V]>;
-    [Symbol.iterator](): IterableIterator<[K, V]>;
-    forEach(
-      callback: (value: V, key: K, parent: this) => void,
-      thisArg?: any
-    ): void;
-  }
-  export interface ReadableStreamReadDoneResult<T> {
-    done: true;
-    value?: T;
-  }
-  export interface ReadableStreamReadValueResult<T> {
-    done: false;
-    value: T;
-  }
-  export type ReadableStreamReadResult<T> =
-    | ReadableStreamReadValueResult<T>
-    | ReadableStreamReadDoneResult<T>;
-  export interface ReadableStreamDefaultReader<R = any> {
-    readonly closed: Promise<void>;
-    cancel(reason?: any): Promise<void>;
-    read(): Promise<ReadableStreamReadResult<R>>;
-    releaseLock(): void;
-  }
-  export interface UnderlyingSource<R = any> {
-    cancel?: ReadableStreamErrorCallback;
-    pull?: ReadableStreamDefaultControllerCallback<R>;
-    start?: ReadableStreamDefaultControllerCallback<R>;
-    type?: undefined;
-  }
-  export interface ReadableStreamErrorCallback {
-    (reason: any): void | PromiseLike<void>;
-  }
+interface DomIterable<K, V> {
+  keys(): IterableIterator<K>;
+  values(): IterableIterator<V>;
+  entries(): IterableIterator<[K, V]>;
+  [Symbol.iterator](): IterableIterator<[K, V]>;
+  forEach(
+    callback: (value: V, key: K, parent: this) => void,
+    thisArg?: any
+  ): void;
+}
 
-  export interface ReadableStreamDefaultControllerCallback<R> {
-    (controller: ReadableStreamDefaultController<R>): void | PromiseLike<void>;
-  }
+interface ReadableStreamReadDoneResult<T> {
+  done: true;
+  value?: T;
+}
 
-  export interface ReadableStreamDefaultController<R> {
-    readonly desiredSize: number;
-    enqueue(chunk?: R): void;
-    close(): void;
-    error(e?: any): void;
-  }
+interface ReadableStreamReadValueResult<T> {
+  done: false;
+  value: T;
+}
 
-  /** This Streams API interface represents a readable stream of byte data. The
-   * Fetch API offers a concrete instance of a ReadableStream through the body
-   * property of a Response object. */
-  export interface ReadableStream<R = any> {
-    readonly locked: boolean;
-    cancel(reason?: any): Promise<void>;
-    getReader(options: { mode: "byob" }): ReadableStreamBYOBReader;
-    getReader(): ReadableStreamDefaultReader<R>;
-    /* disabled for now
-    pipeThrough<T>(
-      {
-        writable,
-        readable
-      }: {
-        writable: WritableStream<R>;
-        readable: ReadableStream<T>;
-      },
-      options?: PipeOptions
-    ): ReadableStream<T>;
-    pipeTo(dest: WritableStream<R>, options?: PipeOptions): Promise<void>;
-    */
-    tee(): [ReadableStream<R>, ReadableStream<R>];
-  }
+type ReadableStreamReadResult<T> =
+  | ReadableStreamReadValueResult<T>
+  | ReadableStreamReadDoneResult<T>;
 
-  export interface ReadableStreamConstructor<R = any> {
-    new (src?: UnderlyingSource<R>): ReadableStream<R>;
-    prototype: ReadableStream<R>;
-  }
+interface ReadableStreamDefaultReader<R = any> {
+  readonly closed: Promise<void>;
+  cancel(reason?: any): Promise<void>;
+  read(): Promise<ReadableStreamReadResult<R>>;
+  releaseLock(): void;
+}
 
-  export interface ReadableStreamReader<R = any> {
-    cancel(reason: any): Promise<void>;
-    read(): Promise<ReadableStreamReadResult<R>>;
-    releaseLock(): void;
-  }
-  export interface ReadableStreamBYOBReader {
-    readonly closed: Promise<void>;
-    cancel(reason?: any): Promise<void>;
-    read<T extends ArrayBufferView>(
-      view: T
-    ): Promise<ReadableStreamReadResult<T>>;
-    releaseLock(): void;
-  }
-  export interface WritableStream<W = any> {
-    readonly locked: boolean;
-    abort(reason?: any): Promise<void>;
-    getWriter(): WritableStreamDefaultWriter<W>;
-  }
-  export interface WritableStreamDefaultWriter<W = any> {
-    readonly closed: Promise<void>;
-    readonly desiredSize: number | null;
-    readonly ready: Promise<void>;
-    abort(reason?: any): Promise<void>;
-    close(): Promise<void>;
-    releaseLock(): void;
-    write(chunk: W): Promise<void>;
-  }
-  export interface DOMStringList {
-    /** Returns the number of strings in strings. */
-    readonly length: number;
-    /** Returns true if strings contains string, and false otherwise. */
-    contains(string: string): boolean;
-    /** Returns the string with index index from strings. */
-    item(index: number): string | null;
-    [index: number]: string;
-  }
-  /** The location (URL) of the object it is linked to. Changes done on it are
-   * reflected on the object it relates to. Both the Document and Window
-   * interface have such a linked Location, accessible via Document.location and
-   * Window.location respectively. */
-  export interface Location {
-    /** Returns a DOMStringList object listing the origins of the ancestor
-     * browsing contexts, from the parent browsing context to the top-level
-     * browsing context. */
-    readonly ancestorOrigins: DOMStringList;
-    /** Returns the Location object's URL's fragment (includes leading "#" if
-     * non-empty).
-     *
-     * Can be set, to navigate to the same URL with a changed fragment (ignores
-     * leading "#"). */
-    hash: string;
-    /** Returns the Location object's URL's host and port (if different from the
-     * default port for the scheme).
-     *
-     * Can be set, to navigate to the same URL with a changed host and port. */
-    host: string;
-    /** Returns the Location object's URL's host.
-     *
-     * Can be set, to navigate to the same URL with a changed host. */
-    hostname: string;
-    /** Returns the Location object's URL.
-     *
-     * Can be set, to navigate to the given URL. */
-    href: string;
-    toString(): string;
-    /** Returns the Location object's URL's origin. */
-    readonly origin: string;
-    /** Returns the Location object's URL's path.
-     *
-     * Can be set, to navigate to the same URL with a changed path. */
-    pathname: string;
-    /** Returns the Location object's URL's port.
-     *
-     * Can be set, to navigate to the same URL with a changed port. */
-    port: string;
-    /** Returns the Location object's URL's scheme.
-     *
-     * Can be set, to navigate to the same URL with a changed scheme. */
-    protocol: string;
-    /** Returns the Location object's URL's query (includes leading "?" if
-     * non-empty).
-     *
-     * Can be set, to navigate to the same URL with a changed query (ignores
-     * leading "?"). */
-    search: string;
-    /**
-     * Navigates to the given URL.
-     */
-    assign(url: string): void;
-    /**
-     * Reloads the current page.
-     */
-    reload(): void;
-    /** Removes the current page from the session history and navigates to the
-     * given URL. */
-    replace(url: string): void;
-  }
+interface UnderlyingSource<R = any> {
+  cancel?: ReadableStreamErrorCallback;
+  pull?: ReadableStreamDefaultControllerCallback<R>;
+  start?: ReadableStreamDefaultControllerCallback<R>;
+  type?: undefined;
+}
+
+interface ReadableStreamErrorCallback {
+  (reason: any): void | PromiseLike<void>;
+}
+
+interface ReadableStreamDefaultControllerCallback<R> {
+  (controller: ReadableStreamDefaultController<R>): void | PromiseLike<void>;
+}
+
+interface ReadableStreamDefaultController<R> {
+  readonly desiredSize: number;
+  enqueue(chunk?: R): void;
+  close(): void;
+  error(e?: any): void;
+}
+
+/** This Streams API interface represents a readable stream of byte data. The
+ * Fetch API offers a concrete instance of a ReadableStream through the body
+ * property of a Response object. */
+interface ReadableStream<R = any> {
+  readonly locked: boolean;
+  cancel(reason?: any): Promise<void>;
+  // TODO(ry) It doesn't seem like Chrome supports this.
+  // getReader(options: { mode: "byob" }): ReadableStreamBYOBReader;
+  getReader(): ReadableStreamDefaultReader<R>;
+  tee(): [ReadableStream<R>, ReadableStream<R>];
+}
+
+declare const ReadableStream: {
+  prototype: ReadableStream;
+  // TODO(ry) This doesn't match lib.dom.d.ts
+  new (src?: UnderlyingSource<R>): ReadableStream<R>;
+};
+
+/** This Streams API interface provides a standard abstraction for writing streaming data to a destination, known as a sink. This object comes with built-in backpressure and queuing. */
+interface WritableStream<W = any> {
+  readonly locked: boolean;
+  abort(reason?: any): Promise<void>;
+  getWriter(): WritableStreamDefaultWriter<W>;
+}
+
+declare const WritableStream: {
+  prototype: WritableStream;
+  new <W = any>(
+    underlyingSink?: UnderlyingSink<W>,
+    strategy?: QueuingStrategy<W>
+  ): WritableStream<W>;
+};
+
+declare interface WritableStreamDefaultWriter<W = any> {
+  readonly closed: Promise<void>;
+  readonly desiredSize: number | null;
+  readonly ready: Promise<void>;
+  abort(reason?: any): Promise<void>;
+  close(): Promise<void>;
+  releaseLock(): void;
+  write(chunk: W): Promise<void>;
+}
+
+interface DOMStringList {
+  /** Returns the number of strings in strings. */
+  readonly length: number;
+  /** Returns true if strings contains string, and false otherwise. */
+  contains(string: string): boolean;
+  /** Returns the string with index index from strings. */
+  item(index: number): string | null;
+  [index: number]: string;
+}
+
+/** The location (URL) of the object it is linked to. Changes done on it are
+ * reflected on the object it relates to. Both the Document and Window
+ * interface have such a linked Location, accessible via Document.location and
+ * Window.location respectively. */
+declare interface Location {
+  /** Returns a DOMStringList object listing the origins of the ancestor
+   * browsing contexts, from the parent browsing context to the top-level
+   * browsing context. */
+  readonly ancestorOrigins: DOMStringList;
+  /** Returns the Location object's URL's fragment (includes leading "#" if
+   * non-empty).
+   *
+   * Can be set, to navigate to the same URL with a changed fragment (ignores
+   * leading "#"). */
+  hash: string;
+  /** Returns the Location object's URL's host and port (if different from the
+   * default port for the scheme).
+   *
+   * Can be set, to navigate to the same URL with a changed host and port. */
+  host: string;
+  /** Returns the Location object's URL's host.
+   *
+   * Can be set, to navigate to the same URL with a changed host. */
+  hostname: string;
+  /** Returns the Location object's URL.
+   *
+   * Can be set, to navigate to the given URL. */
+  href: string;
+  toString(): string;
+  /** Returns the Location object's URL's origin. */
+  readonly origin: string;
+  /** Returns the Location object's URL's path.
+   *
+   * Can be set, to navigate to the same URL with a changed path. */
+  pathname: string;
+  /** Returns the Location object's URL's port.
+   *
+   * Can be set, to navigate to the same URL with a changed port. */
+  port: string;
+  /** Returns the Location object's URL's scheme.
+   *
+   * Can be set, to navigate to the same URL with a changed scheme. */
+  protocol: string;
+  /** Returns the Location object's URL's query (includes leading "?" if
+   * non-empty).
+   *
+   * Can be set, to navigate to the same URL with a changed query (ignores
+   * leading "?"). */
+  search: string;
+  /**
+   * Navigates to the given URL.
+   */
+  assign(url: string): void;
+  /**
+   * Reloads the current page.
+   */
+  reload(): void;
+  /** Removes the current page from the session history and navigates to the
+   * given URL. */
+  replace(url: string): void;
 }
 
 type BufferSource = ArrayBufferView | ArrayBuffer;
@@ -515,7 +496,7 @@ type FormDataEntryValue = File | string;
  * form fields and their values, which can then be easily sent using the
  * XMLHttpRequest.send() method. It uses the same format a form would use if the
  * encoding type were set to "multipart/form-data". */
-interface FormData extends __domTypes.DomIterable<string, FormDataEntryValue> {
+interface FormData extends DomIterable<string, FormDataEntryValue> {
   append(name: string, value: string | Blob, fileName?: string): void;
   delete(name: string): void;
   get(name: string): FormDataEntryValue | null;
@@ -581,7 +562,7 @@ interface Headers {
   ): void;
 }
 
-interface Headers extends __domTypes.DomIterable<string, string> {
+interface Headers extends DomIterable<string, string> {
   /** Appends a new value onto an existing header inside a `Headers` object, or
    * adds the header if it does not already exist.
    */
diff --git a/cli/js/lib.deno.window.d.ts b/cli/js/lib.deno.window.d.ts
index e4ab6b70dce766..38202be43b7496 100644
--- a/cli/js/lib.deno.window.d.ts
+++ b/cli/js/lib.deno.window.d.ts
@@ -7,9 +7,9 @@
 /// <reference lib="deno.shared_globals" />
 /// <reference lib="esnext" />
 
-declare interface Window extends WindowOrWorkerGlobalScope {
-  window: Window & WindowOrWorkerGlobalScope & typeof globalThis;
-  self: Window & WindowOrWorkerGlobalScope & typeof globalThis;
+declare interface Window {
+  window: Window & typeof globalThis;
+  self: Window & typeof globalThis;
   onload: Function | undefined;
   onunload: Function | undefined;
   crypto: Crypto;
@@ -18,8 +18,8 @@ declare interface Window extends WindowOrWorkerGlobalScope {
   Deno: typeof Deno;
 }
 
-declare const window: Window & WindowOrWorkerGlobalScope & typeof globalThis;
-declare const self: Window & WindowOrWorkerGlobalScope & typeof globalThis;
+declare const window: Window & typeof globalThis;
+declare const self: Window & typeof globalThis;
 declare const onload: Function | undefined;
 declare const onunload: Function | undefined;
 declare const crypto: Crypto;

From b060ad9d8c802950571ea7540e440100212a2a01 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Fri, 10 Apr 2020 11:00:02 -0400
Subject: [PATCH 2/5] x

---
 cli/js/lib.deno.shared_globals.d.ts | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/cli/js/lib.deno.shared_globals.d.ts b/cli/js/lib.deno.shared_globals.d.ts
index ca53f09c0de4f5..2027686a90c9a3 100644
--- a/cli/js/lib.deno.shared_globals.d.ts
+++ b/cli/js/lib.deno.shared_globals.d.ts
@@ -285,7 +285,7 @@ interface ReadableStream<R = any> {
 declare const ReadableStream: {
   prototype: ReadableStream;
   // TODO(ry) This doesn't match lib.dom.d.ts
-  new (src?: UnderlyingSource<R>): ReadableStream<R>;
+  new <R = any>(src?: UnderlyingSource<R>): ReadableStream<R>;
 };
 
 /** This Streams API interface provides a standard abstraction for writing streaming data to a destination, known as a sink. This object comes with built-in backpressure and queuing. */
@@ -295,15 +295,7 @@ interface WritableStream<W = any> {
   getWriter(): WritableStreamDefaultWriter<W>;
 }
 
-declare const WritableStream: {
-  prototype: WritableStream;
-  new <W = any>(
-    underlyingSink?: UnderlyingSink<W>,
-    strategy?: QueuingStrategy<W>
-  ): WritableStream<W>;
-};
-
-declare interface WritableStreamDefaultWriter<W = any> {
+interface WritableStreamDefaultWriter<W = any> {
   readonly closed: Promise<void>;
   readonly desiredSize: number | null;
   readonly ready: Promise<void>;

From 0c6f598aecf2989e7d96c4c956b7f0757dd54729 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Fri, 10 Apr 2020 13:39:29 -0400
Subject: [PATCH 3/5] x

---
 cli/js/lib.deno.window.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cli/js/lib.deno.window.d.ts b/cli/js/lib.deno.window.d.ts
index 38202be43b7496..2b8e6f50fc80c9 100644
--- a/cli/js/lib.deno.window.d.ts
+++ b/cli/js/lib.deno.window.d.ts
@@ -12,6 +12,7 @@ declare interface Window {
   self: Window & typeof globalThis;
   onload: Function | undefined;
   onunload: Function | undefined;
+  location: Location;
   crypto: Crypto;
   close: () => void;
   closed: boolean;

From 3f421e6bde4362fea09c45eea84b244351f4f3a7 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Fri, 10 Apr 2020 13:52:14 -0400
Subject: [PATCH 4/5] fix types test

---
 cli/tests/types.out | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/cli/tests/types.out b/cli/tests/types.out
index a212c01e8ed8d5..85bee7698ef5b8 100644
--- a/cli/tests/types.out
+++ b/cli/tests/types.out
@@ -1,16 +1,4 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 [WILDCARD]
-
-declare namespace Deno {
-[WILDCARD]
-}
-[WILDCARD]
-declare interface WindowOrWorkerGlobalScope {
-[WILDCARD]
-declare interface Window extends WindowOrWorkerGlobalScope {
-[WILDCARD]
-  Deno: typeof Deno;
-}
-
-declare const window: Window & WindowOrWorkerGlobalScope & typeof globalThis;
-[WILDCARD]
+declare namespace Deno [WILDCARD]
+declare const window: Window [WILDCARD]

From 7555a79c68704dbbbf6ce1936ff5d2533c2ecba2 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Fri, 10 Apr 2020 14:02:44 -0400
Subject: [PATCH 5/5] fix worker test

---
 cli/js/lib.deno.worker.d.ts | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/cli/js/lib.deno.worker.d.ts b/cli/js/lib.deno.worker.d.ts
index 95a26924053d9f..ca3670c77457e6 100644
--- a/cli/js/lib.deno.worker.d.ts
+++ b/cli/js/lib.deno.worker.d.ts
@@ -1,15 +1,13 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
-/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-interface, @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any */
 
 /// <reference no-default-lib="true" />
 /// <reference lib="deno.shared_globals" />
 /// <reference lib="esnext" />
 
-declare interface DedicatedWorkerGlobalScope extends WindowOrWorkerGlobalScope {
-  self: DedicatedWorkerGlobalScope &
-    WindowOrWorkerGlobalScope &
-    typeof globalThis;
+declare interface DedicatedWorkerGlobalScope {
+  self: DedicatedWorkerGlobalScope & typeof globalThis;
   onmessage: (e: { data: any }) => void;
   onerror: undefined | typeof onerror;
   name: typeof __workerMain.name;
@@ -17,9 +15,7 @@ declare interface DedicatedWorkerGlobalScope extends WindowOrWorkerGlobalScope {
   postMessage: typeof __workerMain.postMessage;
 }
 
-declare const self: DedicatedWorkerGlobalScope &
-  WindowOrWorkerGlobalScope &
-  typeof globalThis;
+declare const self: DedicatedWorkerGlobalScope & typeof globalThis;
 declare let onmessage: ((e: { data: any }) => Promise<void> | void) | undefined;
 declare let onerror:
   | ((
@@ -41,4 +37,4 @@ declare namespace __workerMain {
   export const name: string;
 }
 
-/* eslint-enable @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-interface, @typescript-eslint/no-explicit-any */
+/* eslint-enable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any */