diff --git a/.dprintrc.json b/.dprintrc.json
index dfa68783c24de0..204bbd1f6332f7 100644
--- a/.dprintrc.json
+++ b/.dprintrc.json
@@ -14,6 +14,7 @@
   "excludes": [
     ".cargo_home",
     "cli/dts",
+    "cli/tests/encoding",
     "cli/tsc/*typescript.js",
     "gh-pages",
     "std/**/testdata",
@@ -24,8 +25,8 @@
     "third_party"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.19.9.wasm",
-    "https://plugins.dprint.dev/json-0.4.1.wasm",
-    "https://plugins.dprint.dev/markdown-0.2.4.wasm"
+    "https://plugins.dprint.dev/typescript-0.29.0.wasm",
+    "https://plugins.dprint.dev/json-0.7.0.wasm",
+    "https://plugins.dprint.dev/markdown-0.4.0.wasm"
   ]
 }
diff --git a/.gitattributes b/.gitattributes
index 5abb4177686788..00d74b78499b11 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,7 +2,13 @@
 * text=auto eol=lf
 *.png -text
 
+/cli/tests/encoding/* -text
+
 # Tell git which symlinks point to files, and which ones point to directories.
 # This is relevant for Windows only, and requires git >= 2.19.2 to work.
-/core/libdeno/* symlink=dir
 /cli/tests/symlink_to_subdir symlink=dir
+
+# Tell github these are vendored files.
+# Doesn't include them in the language statistics.
+/cli/tsc/00_typescript.js linguist-vendored
+/cli/dts/* linguist-vendored
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d77954b5f04dc..09a0b443d424e4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         config:
-          - os: macOS-latest
+          - os: macos-10.15
             kind: test_release
           - os: windows-2019
             kind: test_release
@@ -61,12 +61,12 @@ jobs:
           !startsWith(github.ref, 'refs/tags/std/')
         run: |
           mkdir -p target/release
-          tar --exclude=.cargo_home --exclude=".git*" --exclude=target --exclude=deno_typescript/typescript/tests --exclude=third_party/cpplint --exclude=third_party/node_modules --exclude=third_party/python_packages --exclude=third_party/prebuilt -czvf target/release/deno_src.tar.gz -C .. deno
+          tar --exclude=.cargo_home --exclude=".git*" --exclude=target --exclude=third_party/node_modules --exclude=third_party/python_packages --exclude=third_party/prebuilt -czvf target/release/deno_src.tar.gz -C .. deno
 
       - name: Install rust
         uses: hecrj/setup-rust-action@v1
         with:
-          rust-version: 1.45.0
+          rust-version: 1.45.2
 
       - name: Install rust targets
         run: |
@@ -233,9 +233,10 @@ jobs:
         run: |
           cd core
           cargo publish
-          cd ../deno_typescript
           sleep 30
+          cd ../op_crates/web
           cargo publish
-          cd ../cli
+          sleep 30
+          cd ../../cli
           sleep 30
           cargo publish
diff --git a/Cargo.lock b/Cargo.lock
index 31f53cf939c7e8..d4b13b7b230d23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,15 +16,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
 
-[[package]]
-name = "ahash"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
-dependencies = [
- "const-random",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.13"
@@ -70,18 +61,24 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
 
+[[package]]
+name = "arrayvec"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+
 [[package]]
 name = "ast_node"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa87dd2848313961eec40d0625ac425cd9e8bb75988382a247484b7aa3805e5d"
+checksum = "fd6ee2941db3551563d29eaf5214cd3d7b2f322e0c0e3954f5ae020f860bae8c"
 dependencies = [
  "darling",
  "pmutil",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
  "swc_macros_common",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -91,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9021768bcce77296b64648cc7a7460e3df99979b97ed5c925c38d1cc83778d98"
 dependencies = [
  "brotli",
- "bytes 0.5.5",
+ "bytes",
  "flate2",
  "futures-core",
  "memchr",
@@ -121,15 +118,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 
-[[package]]
-name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "base64"
 version = "0.11.0"
@@ -220,22 +208,9 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 
 [[package]]
 name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
-[[package]]
-name = "bytes"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b"
-dependencies = [
- "loom",
-]
+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
 [[package]]
 name = "cargo_gn"
@@ -257,9 +232,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "clap"
-version = "2.33.1"
+version = "2.33.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "10040cdf04294b565d9e0319955430099ec3813a64c952b86a41200ad714ae48"
 dependencies = [
  "ansi_term",
  "atty",
@@ -279,26 +254,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "const-random"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a"
-dependencies = [
- "const-random-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a"
-dependencies = [
- "getrandom",
- "proc-macro-hack",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.2.0"
@@ -347,10 +302,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
  "strsim 0.9.3",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -361,45 +316,37 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
  "darling_core",
  "quote 1.0.7",
- "syn 1.0.33",
-]
-
-[[package]]
-name = "dashmap"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93b8a57df1b6a3f0a96df85297d506a871b31252df23f969b9837ccb5d07455c"
-dependencies = [
- "ahash",
- "cfg-if",
- "num_cpus",
+ "syn 1.0.36",
 ]
 
 [[package]]
 name = "deno"
-version = "1.2.0"
+version = "1.3.1"
 dependencies = [
  "atty",
  "base64 0.12.3",
  "byteorder",
- "bytes 0.5.5",
+ "bytes",
  "clap",
  "deno_core",
+ "deno_doc",
  "deno_lint",
+ "deno_web",
  "dissimilar",
  "dlopen",
- "futures 0.3.5",
+ "dprint-plugin-typescript",
+ "encoding_rs",
+ "futures",
  "fwdansi",
  "http",
  "idna",
  "indexmap",
  "lazy_static",
  "libc",
- "log 0.4.8",
+ "log 0.4.11",
  "nix",
  "notify",
  "os_pipe",
- "pty",
  "rand 0.7.3",
  "regex",
  "reqwest",
@@ -410,12 +357,14 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sourcemap",
+ "swc_common",
+ "swc_ecmascript",
  "sys-info",
  "tempfile",
  "termcolor",
  "test_util",
  "tokio",
- "tokio-rustls 0.13.1",
+ "tokio-rustls 0.14.0",
  "tokio-tungstenite",
  "url",
  "utime",
@@ -430,43 +379,58 @@ dependencies = [
 
 [[package]]
 name = "deno_core"
-version = "0.49.0"
+version = "0.54.0"
 dependencies = [
- "derive_deref",
  "downcast-rs",
- "futures 0.3.5",
+ "futures",
  "lazy_static",
  "libc",
- "log 0.4.8",
+ "log 0.4.11",
  "rusty_v8",
  "serde_json",
- "smallvec 1.4.1",
+ "smallvec",
  "tokio",
  "url",
 ]
 
 [[package]]
-name = "deno_lint"
-version = "0.1.16"
+name = "deno_doc"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9215a4316612e7535f104a7cbc0a3ef535d7eb49c963a3c48433759d7f04bb5"
+checksum = "c3ee3c1b4b40ed04881bf9c005504fc52dbb2bef879922b1c6ed31119449489d"
 dependencies = [
- "dprint-plugin-typescript",
+ "futures",
  "lazy_static",
  "regex",
- "swc_atoms",
- "swc_ecma_visit",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "swc_common",
+ "swc_ecmascript",
+ "termcolor",
 ]
 
 [[package]]
-name = "derive_deref"
-version = "1.1.1"
+name = "deno_lint"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b"
+checksum = "40d72410d84bb82ec20204e4a3ca4de3031edb89090cb6eca84fd1fc798b87d5"
 dependencies = [
- "proc-macro2 1.0.18",
- "quote 1.0.7",
- "syn 1.0.33",
+ "lazy_static",
+ "log 0.4.11",
+ "regex",
+ "serde",
+ "serde_json",
+ "swc_common",
+ "swc_ecmascript",
+]
+
+[[package]]
+name = "deno_web"
+version = "0.4.0"
+dependencies = [
+ "deno_core",
+ "futures",
 ]
 
 [[package]]
@@ -515,25 +479,23 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "dprint-core"
-version = "0.24.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb13f434a98b4fc4f35ae52d5130c9bbe2a514f56c3d6529df11df91080fbd8f"
+checksum = "fab44561ffc8f70d26d6c4cc81a648ecd47dd60836abecf0599253a7b9fdbf5d"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "dprint-plugin-typescript"
-version = "0.19.8"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c227beb41f4c0e3be999c17f9a292765c7d3cfea3186ae55325907e046ad5fc9"
+checksum = "daf2fc659dd444679f15976518fe29866b493ff131f5fd49d1600211559d0201"
 dependencies = [
  "dprint-core",
  "serde",
- "serde_json",
  "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
+ "swc_ecmascript",
 ]
 
 [[package]]
@@ -564,9 +526,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e57153e35187d51f08471d5840459ff29093473e7bedd004a1414985aab92f3"
 dependencies = [
  "pmutil",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "swc_macros_common",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -623,9 +585,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "039885ad6579a86b94ad8df696cce8c530da496bf7b07b12fec8d6c4cd654bb9"
 dependencies = [
  "pmutil",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "swc_macros_common",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -669,12 +631,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
-[[package]]
-name = "futures"
-version = "0.1.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
-
 [[package]]
 name = "futures"
 version = "0.3.5"
@@ -715,7 +671,6 @@ dependencies = [
  "futures-core",
  "futures-task",
  "futures-util",
- "num_cpus",
 ]
 
 [[package]]
@@ -731,9 +686,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -757,7 +712,6 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
 dependencies = [
- "futures 0.1.29",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -770,7 +724,6 @@ dependencies = [
  "proc-macro-hack",
  "proc-macro-nested",
  "slab",
- "tokio-io",
 ]
 
 [[package]]
@@ -792,19 +745,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "generator"
-version = "0.6.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68"
-dependencies = [
- "cc",
- "libc",
- "log 0.4.8",
- "rustc_version",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.12.3"
@@ -831,19 +771,28 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79b7246d7e4b979c03fa093da39cfb3617a96bbeee6310af63991668d7e843ff"
 dependencies = [
- "bytes 0.5.5",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
  "http",
  "indexmap",
- "log 0.4.8",
+ "log 0.4.11",
  "slab",
  "tokio",
  "tokio-util",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
+dependencies = [
+ "autocfg 1.0.0",
+]
+
 [[package]]
 name = "headers"
 version = "0.3.2"
@@ -852,7 +801,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f"
 dependencies = [
  "base64 0.12.3",
  "bitflags",
- "bytes 0.5.5",
+ "bytes",
  "headers-core",
  "http",
  "mime 0.3.16",
@@ -884,7 +833,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
 dependencies = [
- "bytes 0.5.5",
+ "bytes",
  "fnv",
  "itoa",
 ]
@@ -895,7 +844,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
- "bytes 0.5.5",
+ "bytes",
  "http",
 ]
 
@@ -911,7 +860,7 @@ version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6e7655b9594024ad0ee439f3b5a7299369dc2a3f459b47c696f9ff676f9aa1f"
 dependencies = [
- "bytes 0.5.5",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -920,7 +869,7 @@ dependencies = [
  "http-body",
  "httparse",
  "itoa",
- "log 0.4.8",
+ "log 0.4.11",
  "pin-project",
  "socket2",
  "time",
@@ -931,17 +880,17 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
+checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6"
 dependencies = [
- "bytes 0.5.5",
+ "bytes",
  "futures-util",
  "hyper",
- "log 0.4.8",
- "rustls 0.17.0",
+ "log 0.4.11",
+ "rustls 0.18.0",
  "tokio",
- "tokio-rustls 0.13.1",
+ "tokio-rustls 0.14.0",
  "webpki",
 ]
 
@@ -970,11 +919,12 @@ checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d"
 
 [[package]]
 name = "indexmap"
-version = "1.4.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe"
+checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9"
 dependencies = [
  "autocfg 1.0.0",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1003,7 +953,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
 dependencies = [
- "bytes 0.5.5",
+ "bytes",
 ]
 
 [[package]]
@@ -1015,6 +965,25 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ipnet"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
+
+[[package]]
+name = "is-macro"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04807f3dc9e3ea39af3f8469a5297267faf94859637afb836b33f47d9b2650ee"
+dependencies = [
+ "Inflector",
+ "pmutil",
+ "proc-macro2 1.0.19",
+ "quote 1.0.7",
+ "syn 1.0.36",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.6"
@@ -1030,6 +999,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "jsdoc"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4e7d036004e0fd899c705945f16a1ad6c1d45e52fbdeeea054ad60e8db152c4"
+dependencies = [
+ "nom",
+ "serde",
+ "swc_atoms",
+ "swc_common",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1053,20 +1034,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
-name = "libc"
-version = "0.2.72"
+name = "lexical-core"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
+checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
+dependencies = [
+ "arrayvec",
+ "bitflags",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
 
 [[package]]
-name = "lock_api"
-version = "0.1.5"
+name = "libc"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
-dependencies = [
- "owning_ref",
- "scopeguard 0.3.3",
-]
+checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
 
 [[package]]
 name = "log"
@@ -1074,29 +1058,18 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "loom"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls 0.1.2",
-]
-
 [[package]]
 name = "matches"
 version = "0.1.8"
@@ -1173,7 +1146,7 @@ dependencies = [
  "iovec",
  "kernel32-sys",
  "libc",
- "log 0.4.8",
+ "log 0.4.11",
  "miow 0.2.1",
  "net2",
  "slab",
@@ -1187,7 +1160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 dependencies = [
  "lazycell",
- "log 0.4.8",
+ "log 0.4.11",
  "mio",
  "slab",
 ]
@@ -1198,7 +1171,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
  "mio",
  "miow 0.3.5",
  "winapi 0.3.9",
@@ -1245,7 +1218,7 @@ checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01"
 dependencies = [
  "buf_redux",
  "httparse",
- "log 0.4.8",
+ "log 0.4.11",
  "mime 0.2.6",
  "mime_guess 1.8.8",
  "quick-error",
@@ -1285,6 +1258,17 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "nom"
+version = "5.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+dependencies = [
+ "lexical-core",
+ "memchr",
+ "version_check 0.9.2",
+]
+
 [[package]]
 name = "notify"
 version = "5.0.0-pre.3"
@@ -1358,6 +1342,15 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
+[[package]]
+name = "ordered-float"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3741934be594d77de1c8461ebcbbe866f585ea616a9753aa78f2bdc69f0e4579"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "os_pipe"
 version = "0.9.2"
@@ -1377,29 +1370,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-dependencies = [
- "libc",
- "rand 0.6.5",
- "rustc_version",
- "smallvec 0.6.13",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
@@ -1479,9 +1449,9 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -1502,9 +1472,9 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -1521,9 +1491,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.16"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
+checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
 
 [[package]]
 name = "proc-macro-nested"
@@ -1542,9 +1512,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
 dependencies = [
  "unicode-xid 0.2.1",
 ]
@@ -1580,7 +1550,7 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 ]
 
 [[package]]
@@ -1784,13 +1754,13 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b82c9238b305f26f53443e3a4bc8528d64b8d0bee408ec949eb7bf5635ec680"
+checksum = "12427a5577082c24419c9c417db35cfeb65962efc7675bb6b0d5f1f9d315bfe6"
 dependencies = [
  "async-compression",
  "base64 0.12.3",
- "bytes 0.5.5",
+ "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -1798,18 +1768,19 @@ dependencies = [
  "http-body",
  "hyper",
  "hyper-rustls",
+ "ipnet",
  "js-sys",
  "lazy_static",
- "log 0.4.8",
+ "log 0.4.11",
  "mime 0.3.16",
  "mime_guess 2.0.3",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.17.0",
+ "rustls 0.18.0",
  "serde",
  "serde_urlencoded",
  "tokio",
- "tokio-rustls 0.13.1",
+ "tokio-rustls 0.14.0",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1844,12 +1815,12 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
+checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
 dependencies = [
- "base64 0.10.1",
- "log 0.4.8",
+ "base64 0.11.0",
+ "log 0.4.11",
  "ring",
  "sct",
  "webpki",
@@ -1857,12 +1828,12 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
+checksum = "cac94b333ee2aac3284c5b8a1b7fb4dd11cba88c244e3fe33cdbd047af0eb693"
 dependencies = [
- "base64 0.11.0",
- "log 0.4.8",
+ "base64 0.12.3",
+ "log 0.4.11",
  "ring",
  "sct",
  "webpki",
@@ -1870,9 +1841,9 @@ dependencies = [
 
 [[package]]
 name = "rusty_v8"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390f2a21e9855f0cf6113a076cabdfd880b13c055391d61474d5eebf2c1ed491"
+checksum = "30925153e17b35ca37a21f4bbf5f61277348ee3110d65360d89010993ce27079"
 dependencies = [
  "bitflags",
  "cargo_gn",
@@ -1889,10 +1860,10 @@ checksum = "3358c21cbbc1a751892528db4e1de4b7a2b6a73f001e215aaba97d712cfa9777"
 dependencies = [
  "cfg-if",
  "libc",
- "log 0.4.8",
+ "log 0.4.11",
  "memchr",
  "nix",
- "scopeguard 1.1.0",
+ "scopeguard",
  "unicode-segmentation",
  "unicode-width",
  "utf8parse",
@@ -1920,24 +1891,12 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
-
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 
-[[package]]
-name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -1977,29 +1936,29 @@ checksum = "b46e1121e8180c12ff69a742aabc4f310542b6ccb69f1691689ac17fdf8618aa"
 
 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
 dependencies = [
  "indexmap",
  "itoa",
@@ -2061,18 +2020,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
-dependencies = [
- "maybe-uninit",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f"
+checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
 
 [[package]]
 name = "socket2"
@@ -2088,9 +2038,9 @@ dependencies = [
 
 [[package]]
 name = "sourcemap"
-version = "6.0.0"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f42ca034bf301214458cf7f4dcbe7f680fd23d9e4c61193ed139684e2e3adc"
+checksum = "6e031f2463ecbdd5f34c950f89f5c1e1032f22c0f8e3dc4bdb2e8b6658cf61eb"
 dependencies = [
  "base64 0.11.0",
  "if_chain",
@@ -2110,9 +2060,15 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.1.1"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "string_cache"
@@ -2135,7 +2091,7 @@ checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
 dependencies = [
  "phf_generator 0.8.0",
  "phf_shared 0.8.0",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
 ]
 
@@ -2146,10 +2102,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94fdb6536756cfd35ee18b9a9972ab2a699d405cc57e0ad0532022960f30d581"
 dependencies = [
  "pmutil",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
  "swc_macros_common",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -2176,34 +2132,33 @@ dependencies = [
 
 [[package]]
 name = "swc_common"
-version = "0.6.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e97fcbda03677da4d57519548082bd8ed30d6afcef8e18053ad829e290d252"
+checksum = "458740fb57fe3f2b748819c1db0f448d920d4a64b00e802a485bd41290ef6790"
 dependencies = [
  "ast_node",
- "atty",
  "cfg-if",
- "dashmap",
  "either",
  "from_variant",
  "fxhash",
- "log 0.4.8",
- "parking_lot",
- "scoped-tls 1.0.0",
+ "log 0.4.11",
+ "once_cell",
+ "owning_ref",
+ "scoped-tls",
  "serde",
  "sourcemap",
- "string_cache",
- "termcolor",
+ "swc_visit",
  "unicode-width",
 ]
 
 [[package]]
 name = "swc_ecma_ast"
-version = "0.23.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b0fe7f603d4ddef115f7efe72e9c0823f90d9adae5dd4d754fe1a08686b021"
+checksum = "809a1fc3a64d853be83a2b7b389ccacf3c17e221393722550b0af631650e600e"
 dependencies = [
  "enum_kind",
+ "is-macro",
  "num-bigint",
  "serde",
  "string_enum",
@@ -2211,24 +2166,52 @@ dependencies = [
  "swc_common",
 ]
 
+[[package]]
+name = "swc_ecma_codegen"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcee2cebe6f06eaf2ff1819d3c16c31cf5530ef9f6832ee37d2f8d2b5907a38b"
+dependencies = [
+ "bitflags",
+ "num-bigint",
+ "sourcemap",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_codegen_macros",
+]
+
+[[package]]
+name = "swc_ecma_codegen_macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04378143fd1296af71dd3aea2e096bef6fbf8aa3c25352d44d62d7f28aa9851b"
+dependencies = [
+ "pmutil",
+ "proc-macro2 1.0.19",
+ "quote 1.0.7",
+ "swc_macros_common",
+ "syn 1.0.36",
+]
+
 [[package]]
 name = "swc_ecma_parser"
-version = "0.27.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00871b8900ab4c64b66c81787c95e511e46fb25b54db481a98ab1905160e1edd"
+checksum = "504dbc87d7222f01ca57d3572b3b281956b3bda59b80ab3b5125c8f522f6b729"
 dependencies = [
  "either",
  "enum_kind",
- "log 0.4.8",
+ "fxhash",
+ "log 0.4.11",
  "num-bigint",
- "once_cell",
- "regex",
  "serde",
- "smallvec 1.4.1",
+ "smallvec",
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
  "swc_ecma_parser_macros",
+ "swc_ecma_visit",
  "unicode-xid 0.2.1",
 ]
 
@@ -2239,37 +2222,81 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8798810e2c79b884cf238bcb72b4bd12375121ee91724f1ceeb54b6e38a138e7"
 dependencies = [
  "pmutil",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
  "swc_macros_common",
- "syn 1.0.33",
+ "syn 1.0.36",
+]
+
+[[package]]
+name = "swc_ecma_transforms"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ead6107d1d3a8d6c208007cf010c4dbd4fffbd483171b1a64056458647737e"
+dependencies = [
+ "Inflector",
+ "arrayvec",
+ "either",
+ "fxhash",
+ "indexmap",
+ "is-macro",
+ "jsdoc",
+ "log 0.4.11",
+ "once_cell",
+ "ordered-float",
+ "regex",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "unicode-xid 0.2.1",
+]
+
+[[package]]
+name = "swc_ecma_utils"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955c573b290af6880cf465c350a9058f1302640ed67f3230b0affebf1558b7c1"
+dependencies = [
+ "once_cell",
+ "scoped-tls",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_visit",
+ "unicode-xid 0.2.1",
 ]
 
 [[package]]
 name = "swc_ecma_visit"
-version = "0.8.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ce020872b2c0e6b4b65edbb39f523377a67c4532cdde68efbeaa27fade1e44"
+checksum = "6d15e3550f565b81fd414162f49ec9cc708d1e561f8ca2fd29b1828b328aa062"
 dependencies = [
  "num-bigint",
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
- "swc_ecma_visit_macros",
+ "swc_visit",
 ]
 
 [[package]]
-name = "swc_ecma_visit_macros"
-version = "0.4.0"
+name = "swc_ecmascript"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a32877a341800d772d95858c24344ce00f68361763eae5fa97187e6be136c4b"
+checksum = "4c7e45832f8a90fa87a1244cd0d3c9c0fbac0fc55c4e2a0b810e9b7bfc0b5819"
 dependencies = [
- "Inflector",
- "pmutil",
- "proc-macro2 1.0.18",
- "quote 1.0.7",
- "swc_macros_common",
- "syn 1.0.33",
+ "swc_ecma_ast",
+ "swc_ecma_codegen",
+ "swc_ecma_parser",
+ "swc_ecma_transforms",
+ "swc_ecma_visit",
 ]
 
 [[package]]
@@ -2279,9 +2306,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18a9f27d290938370597d363df9a77ba4be8e2bc99f32f69eb5245cdeed3c512"
 dependencies = [
  "pmutil",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
+]
+
+[[package]]
+name = "swc_visit"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6683cd5f6b97498e887e0d4da4c44ddafb755dfb0d950c52af99344fad23fec9"
+dependencies = [
+ "either",
+ "swc_visit_macros",
+]
+
+[[package]]
+name = "swc_visit_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1802720b0826a2ae6fac5be1305b1277cf1e83418549f465edf075d8016a1548"
+dependencies = [
+ "Inflector",
+ "pmutil",
+ "proc-macro2 1.0.19",
+ "quote 1.0.7",
+ "swc_macros_common",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -2297,11 +2348,11 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
+checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
  "unicode-xid 0.2.1",
 ]
@@ -2344,7 +2395,7 @@ name = "test_plugin"
 version = "0.0.1"
 dependencies = [
  "deno_core",
- "futures 0.3.5",
+ "futures",
  "test_util",
 ]
 
@@ -2352,10 +2403,11 @@ dependencies = [
 name = "test_util"
 version = "0.1.0"
 dependencies = [
- "bytes 0.5.5",
- "futures 0.3.5",
+ "bytes",
+ "futures",
  "lazy_static",
  "os_pipe",
+ "pty",
  "regex",
  "tempfile",
  "tokio",
@@ -2386,9 +2438,9 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -2422,7 +2474,7 @@ version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
 dependencies = [
- "bytes 0.5.5",
+ "bytes",
  "fnv",
  "futures-core",
  "iovec",
@@ -2440,48 +2492,37 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "tokio-io"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.29",
- "log 0.4.8",
-]
-
 [[package]]
 name = "tokio-macros"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.12.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3068d891551949b37681724d6b73666787cc63fa8e255c812a41d2513aff9775"
+checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4"
 dependencies = [
  "futures-core",
- "rustls 0.16.0",
+ "rustls 0.17.0",
  "tokio",
  "webpki",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4"
+checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9"
 dependencies = [
  "futures-core",
- "rustls 0.17.0",
+ "rustls 0.18.0",
  "tokio",
  "webpki",
 ]
@@ -2492,8 +2533,8 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8b8fe88007ebc363512449868d7da4389c9400072a3f666f212c7280082882a"
 dependencies = [
- "futures 0.3.5",
- "log 0.4.8",
+ "futures",
+ "log 0.4.11",
  "pin-project",
  "tokio",
  "tungstenite",
@@ -2505,10 +2546,10 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
 dependencies = [
- "bytes 0.5.5",
+ "bytes",
  "futures-core",
  "futures-sink",
- "log 0.4.8",
+ "log 0.4.11",
  "pin-project-lite",
  "tokio",
 ]
@@ -2528,6 +2569,36 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 
+[[package]]
+name = "tracing"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c"
+dependencies = [
+ "cfg-if",
+ "log 0.4.11",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db63662723c316b43ca36d833707cc93dff82a02ba3d7e354f342682cc8b3545"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "tracing-futures"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
+dependencies = [
+ "pin-project",
+ "tracing",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.3"
@@ -2542,11 +2613,11 @@ checksum = "cfea31758bf674f990918962e8e5f07071a3161bd7c4138ed23e416e1ac4264e"
 dependencies = [
  "base64 0.11.0",
  "byteorder",
- "bytes 0.5.5",
+ "bytes",
  "http",
  "httparse",
  "input_buffer",
- "log 0.4.8",
+ "log 0.4.11",
  "rand 0.7.3",
  "sha-1",
  "url",
@@ -2723,34 +2794,36 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
  "try-lock",
 ]
 
 [[package]]
 name = "warp"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e95175b7a927258ecbb816bdada3cc469cb68593e7940b96a60f4af366a9970"
+checksum = "df341dee97c9ae29dfa5e0b0fbbbf620e0d6a36686389bedf83b3daeb8b0d0ac"
 dependencies = [
- "bytes 0.5.5",
- "futures 0.3.5",
+ "bytes",
+ "futures",
  "headers",
  "http",
  "hyper",
- "log 0.4.8",
+ "log 0.4.11",
  "mime 0.3.16",
  "mime_guess 2.0.3",
  "multipart",
  "pin-project",
- "scoped-tls 1.0.0",
+ "scoped-tls",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-rustls 0.12.3",
+ "tokio-rustls 0.13.1",
  "tokio-tungstenite",
  "tower-service",
+ "tracing",
+ "tracing-futures",
  "urlencoding",
 ]
 
@@ -2780,10 +2853,10 @@ checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df"
 dependencies = [
  "bumpalo",
  "lazy_static",
- "log 0.4.8",
- "proc-macro2 1.0.18",
+ "log 0.4.11",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
  "wasm-bindgen-shared",
 ]
 
@@ -2815,9 +2888,9 @@ version = "0.2.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9adff9ee0e94b926ca81b57f57f86d5545cdcb1d259e21ec9bdd95b901754c75"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.33",
+ "syn 1.0.36",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2859,9 +2932,9 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.0.1"
+version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5fe1a9cb33fe7cf77d431070d0223e544b1e4e7f7764bad0a3e691a6678a131"
+checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef"
 dependencies = [
  "libc",
  "thiserror",
diff --git a/Cargo.toml b/Cargo.toml
index ea0e02cf95b00e..80e6ce4e6ab90c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,14 @@ members = [
   "core",
   "test_plugin",
   "test_util",
+  "op_crates/web",
 ]
 exclude = [
   "std/hash/_wasm"
 ]
+
+
+[profile.release]
+codegen-units = 1
+lto = true
+opt-level = 'z' # Optimize for size
diff --git a/Releases.md b/Releases.md
index 2113e100bd4df7..8af49252fedf08 100644
--- a/Releases.md
+++ b/Releases.md
@@ -6,6 +6,129 @@ https://github.com/denoland/deno/releases
 We also have one-line install commands at
 https://github.com/denoland/deno_install
 
+### 1.3.1 / 2020.08.21
+
+- fix: Allow isolated "%"s when parsing file URLs (#7108)
+- fix: Blob.arrayBuffer returns Uint8Array (#7086)
+- fix: CLI argument parsing with dash values (#7039)
+- fix: Create Body stream from any valid bodySource (#7128)
+- fix: Granular permission requests/revokes (#7074)
+- fix: Handling of multiple spaces in URLSearchParams (#7068)
+- core: Enable WebAssembly.instantiateStreaming (#7043)
+- core: Add missing export of HeapLimits (#7047)
+- upgrade: swc_ecmascript, deno_lint, dprint (#7098)
+
+Changes in std version 0.66.0:
+
+- BREAKING(std/datetime): Remove currentDayOfYear (#7059)
+- feat(std/node): Add basic asserts (#7091)
+- feat(std/datetime): Generalise parser, add formatter (#6619)
+- fix(std/node): Misnamed assert exports (#7123)
+- fix(std/encoding/toml): Stop TOML parser from detecting numbers in strings.
+  (#7064)
+- fix(std/encoding/csv): Improve error message on ParseError (#7057)
+
+### 1.3.0 / 2020.08.13
+
+Changes in the CLI:
+
+- feat: Add "--no-check" flag to deno install (#6948)
+- feat: Add "--ignore" flag to deno lint (#6934)
+- feat: Add "--json" flag to deno lint (#6940)
+- feat: Add "--reload" flag to deno bundle (#6996)
+- feat: Add "--reload" flag to deno info (#7009)
+- feat: FileReader API (#6673)
+- feat: Handle imports in deno doc (#6987)
+- feat: Stabilize Deno.mainModule (#6993)
+- feat: Support file URLs in Deno.run for executable (#6994)
+- fix: console.log should see color codes when grouping occurs (#7000)
+- fix: URLSearchParams.toString() behaviour is different from browsers (#7017)
+- fix: Remove @ts-expect-error directives (#7024)
+- fix(unstable): Add missing globals to diagnostics (#6988)
+- refactor(doc): Remove detailed / summary distinction (#6818)
+- core: Memory limits & callbacks (#6914)
+- upgrade: TypeScript to 3.9.7 (#7036)
+- upgrade: Rust crates (#7034, #7040)
+
+Changes in std version 0.65.0:
+
+- feat(std/http): Add TLS serve abilities to file_server (#6962)
+- feat(std/http): Add --no-dir-listing flag to file_server (#6808)
+- feat(std/node): Add util.inspect (#6833)
+- fix: Make std work with isolatedModules (#7016)
+
+### 1.2.3 / 2020.08.08
+
+Changes in the CLI:
+
+- fix: Never type check in deno info (#6978)
+- fix: add missing globals to unstable diagnostics (#6960)
+- fix: add support for non-UTF8 source files (#6789)
+- fix: hash file names in gen cache (#6911)
+- refactor: Encode op errors as strings instead of numbers (#6977)
+- refactor: Op crate for Web APIs (#6906)
+- refactor: remove repeated code in main.rs (#6954)
+- upgrade to rusty_v8 0.8.1 / V8 8.6.334 (#6980)
+- upgrade: deno_lint v0.1.21 (#6985)
+- upgrade: swc_ecmascript (#6943)
+- feat(unstable): custom http client for fetch (#6918)
+
+Changes in std version 0.64.0:
+
+- fix(std/toml): parser error with inline comments (#6942)
+- fix(std/encoding/toml): Add boolean support to stringify (#6941)
+- refactor: Rewrite globToRegExp() (#6963)
+
+### 1.2.2 / 2020.07.31
+
+Changes in the CLI:
+
+- fix: Change release build flags to optimize for size (#6907)
+- fix: Fix file URL to path conversion on Windows (#6920)
+- fix: deno-types, X-TypeScript-Types precedence (#6761)
+- fix: downcast from SwcDiagnosticBuffer to OpError (#6909)
+- perf: Use SWC to strip types for "--no-check" flag (#6895)
+- upgrade: deno_lint, dprint, swc (#6928, #6869)
+- feat(unstable): add "--ignore" flag to deno fmt (#6890)
+
+Changes in std version 0.63.0:
+
+- feat(std/async): add pooledMap utility (#6898)
+- fix(std/json): Add newline at the end of json files (#6885)
+- fix(std/path): Percent-decode in fromFileUrl() (#6913)
+- fix(std/tar): directory type bug (#6905)
+
+### 1.2.1 / 2020.07.23
+
+Changes in the CLI:
+
+- fix: IPv6 hostname should be compressed (#6772)
+- fix: Ignore polling errors caused by return() in watchFs (#6785)
+- fix: Improve URL compatibility (#6807)
+- fix: ModuleSpecifier removes relative path parts (#6762)
+- fix: Share reqwest client between fetch calls (#6792)
+- fix: add icon and metadata to deno.exe on Windows (#6693)
+- fix: panic for runtime error in TS compiler (#6758)
+- fix: providing empty source code for missing compiled files (#6760)
+- refactor: Make OpDispatcher a trait (#6736, #6742)
+- refactor: Remove duplicate code and allow filename overwrite for DomFile
+  (#6817, #6830)
+- upgrade: Rust 1.45.0 (#6791)
+- upgrade: rusty_v8 0.7.0 (#6801)
+- upgrade: tokio 0.2.22 (#6838)
+
+Changes in std version 0.62.0:
+
+- BREAKING(std/fs): remove readFileStr and writeFileStr (#6848, #6847)
+- feat(std/encoding): add ascii85 module (#6711)
+- feat(std/node): add string_decoder (#6638)
+- fix(std/encoding/toml): could not parse strings with apostrophes/semicolons
+  (#6781)
+- fix(std/testing): assertThrows inheritance (#6623)
+- fix(std/wasi): remove number overload from rights in path_open (#6768)
+- refactor(std/datetime): improve weekOfYear (#6741)
+- refactor(std/path): enrich the types in parse_format_test (#6803)
+
 ### 1.2.0 / 2020.07.13
 
 Changes in the CLI:
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 92fddfd9f181a3..bc42f96de87378 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "deno"
-version = "1.2.0"
+version = "1.3.1"
 license = "MIT"
 authors = ["the Deno authors"]
 edition = "2018"
@@ -15,57 +15,62 @@ name = "deno"
 path = "main.rs"
 
 [build-dependencies]
-deno_core = { path = "../core", version = "0.49.0" }
+deno_core = { path = "../core", version = "0.54.0" }
+deno_web = { path = "../op_crates/web", version = "0.4.0" }
 
 [target.'cfg(windows)'.build-dependencies]
-winres = "0.1"
-winapi = "0.3.8"
+winres = "0.1.11"
+winapi = "0.3.9"
 
 [dependencies]
-deno_core = { path = "../core", version = "0.49.0" }
-deno_lint = "0.1.16"
+deno_core = { path = "../core", version = "0.54.0" }
+deno_doc = { version = "0.1.1" }
+deno_lint = { version = "0.1.24", features = ["json"] }
 
 atty = "0.2.14"
-base64 = "0.12.2"
-bytes = "0.5.5"
+base64 = "0.12.3"
+bytes = "0.5.6"
 byteorder = "1.3.4"
-clap = "2.33.1"
+clap = "2.33.2"
 dissimilar = "1.0.2"
 dlopen = "0.1.8"
-futures = { version = "0.3.5", features = ["compat", "io-compat"] }
+encoding_rs = "0.8.23"
+dprint-plugin-typescript = "0.30.0"
+futures = "0.3.5"
 http = "0.2.1"
 idna = "0.2.0"
-indexmap = "1.4.0"
+indexmap = "1.5.1"
 lazy_static = "1.4.0"
-libc = "0.2.71"
-log = "0.4.8"
-notify = "5.0.0-pre.2"
+libc = "0.2.74"
+log = "0.4.11"
+notify = "5.0.0-pre.3"
 rand = "0.7.3"
 regex = "1.3.9"
-reqwest = { version = "0.10.6", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] }
+reqwest = { version = "0.10.7", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] }
 ring = "0.16.15"
-rustyline = { version = "6.2", default-features = false }
-serde = { version = "1.0.112", features = ["derive"] }
-serde_derive = "1.0.112"
-serde_json = { version = "1.0.55", features = [ "preserve_order" ] }
+rustyline = { version = "6.2.0", default-features = false }
+serde = { version = "1.0.115", features = ["derive"] }
+serde_derive = "1.0.115"
+serde_json = { version = "1.0.57", features = [ "preserve_order" ] }
 sys-info = "0.7.0"
-sourcemap = "6.0.0"
+sourcemap = "6.0.1"
+swc_common = { version = "=0.9.1", features = ["sourcemap"] }
+swc_ecmascript = { version = "=0.5.0", features = ["codegen", "parser", "transforms", "visit"] }
 tempfile = "3.1.0"
 termcolor = "1.1.0"
 tokio = { version = "0.2.22", features = ["full"] }
-tokio-rustls = "0.13.1"
 tokio-tungstenite = { version = "0.10.1", features = ["connect"] }
 url = "2.1.1"
-utime = "0.3.0"
+utime = "0.3.1"
 webpki = "0.21.3"
 webpki-roots = "0.19.0"
 walkdir = "2.3.1"
-warp = "0.2.3"
+warp = { version = "0.2.4", features = ["tls"] }
 semver-parser = "0.9.0"
 uuid = { version = "0.8.1", features = ["v4"] }
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.8", features = ["knownfolders", "objbase", "shlobj",
+winapi = { version = "0.3.9", features = ["knownfolders", "objbase", "shlobj",
 "winbase", "winerror", "tlhelp32"] }
 fwdansi = "1.1.0"
 
@@ -78,12 +83,9 @@ os_pipe = "0.9.2"
 tokio-tungstenite = { version = "0.10.1", features = ["connect"] }
 test_util = { path = "../test_util" }
 
-[target.'cfg(unix)'.dev-dependencies]
-pty = "0.2.2"
-
 [package.metadata.winres]
 # This section defines the metadata that appears in the deno.exe PE header.
 OriginalFilename = "deno.exe"
 LegalCopyright = "© Deno contributors & Deno Land Inc. MIT licensed."
 ProductName = "Deno"
-FileDescription = "A secure JavaScript/TypeScript runtime, built on V8 and Rust."
+FileDescription = "A secure runtime for JavaScript and TypeScript."
diff --git a/cli/build.rs b/cli/build.rs
index 983857625ac8ae..df4211d8b8cd8f 100644
--- a/cli/build.rs
+++ b/cli/build.rs
@@ -38,6 +38,11 @@ fn create_compiler_snapshot(
 ) {
   let mut runtime_isolate = CoreIsolate::new(StartupData::None, true);
   let mut custom_libs: HashMap<String, PathBuf> = HashMap::new();
+  let web_scripts = deno_web::get_scripts();
+  custom_libs.insert(
+    "lib.deno.web.d.ts".to_string(),
+    PathBuf::from(web_scripts.declaration),
+  );
   custom_libs.insert(
     "lib.deno.window.d.ts".to_string(),
     cwd.join("dts/lib.deno.window.d.ts"),
@@ -66,8 +71,17 @@ fn create_compiler_snapshot(
 }
 
 fn ts_version() -> String {
-  // TODO(ry) This should be automatically extracted from typescript.js
-  "3.9.2".to_string()
+  std::fs::read_to_string("tsc/00_typescript.js")
+    .unwrap()
+    .lines()
+    .find(|l| l.contains("ts.version = "))
+    .expect(
+      "Failed to find the pattern `ts.version = ` in typescript source code",
+    )
+    .chars()
+    .skip_while(|c| !char::is_numeric(*c))
+    .take_while(|c| *c != '"')
+    .collect::<String>()
 }
 
 fn main() {
@@ -80,6 +94,10 @@ fn main() {
   // op_fetch_asset::trace_serializer();
 
   println!("cargo:rustc-env=TS_VERSION={}", ts_version());
+  println!(
+    "cargo:rustc-env=DENO_WEB_LIB_PATH={}",
+    deno_web::get_scripts().declaration
+  );
 
   println!(
     "cargo:rustc-env=TARGET={}",
@@ -93,7 +111,7 @@ fn main() {
   let runtime_snapshot_path = o.join("CLI_SNAPSHOT.bin");
   let compiler_snapshot_path = o.join("COMPILER_SNAPSHOT.bin");
 
-  let js_files = get_js_files("js2");
+  let js_files = get_js_files_for_rt();
   create_runtime_snapshot(&runtime_snapshot_path, js_files);
 
   let js_files = get_js_files("tsc");
@@ -123,3 +141,68 @@ fn get_js_files(d: &str) -> Vec<String> {
   js_files.sort();
   js_files
 }
+
+fn get_js_files_for_rt() -> Vec<String> {
+  let web_scripts = deno_web::get_scripts();
+
+  let f = vec![
+    "rt/00_bootstrap_namespace.js",
+    &web_scripts.dom_exception,
+    "rt/01_build.js",
+    "rt/01_colors.js",
+    "rt/01_errors.js",
+    &web_scripts.event,
+    "rt/01_internals.js",
+    "rt/01_version.js",
+    "rt/01_web_util.js",
+    &web_scripts.abort_signal,
+    "rt/02_console.js",
+    "rt/03_dom_iterable.js",
+    "rt/06_util.js",
+    &web_scripts.text_encoding,
+    "rt/10_dispatch_json.js",
+    "rt/10_dispatch_minimal.js",
+    "rt/11_crypto.js",
+    "rt/11_resources.js",
+    "rt/11_streams.js",
+    "rt/11_timers.js",
+    "rt/11_url.js",
+    "rt/11_workers.js",
+    "rt/12_io.js",
+    "rt/13_buffer.js",
+    "rt/20_blob.js",
+    "rt/20_headers.js",
+    "rt/20_streams_queuing_strategy.js",
+    "rt/21_dom_file.js",
+    "rt/21_filereader.js",
+    "rt/22_form_data.js",
+    "rt/23_multipart.js",
+    "rt/24_body.js",
+    "rt/25_request.js",
+    "rt/26_fetch.js",
+    "rt/30_files.js",
+    "rt/30_fs.js",
+    "rt/30_metrics.js",
+    "rt/30_net.js",
+    "rt/30_os.js",
+    "rt/40_compiler_api.js",
+    "rt/40_diagnostics.js",
+    "rt/40_error_stack.js",
+    "rt/40_fs_events.js",
+    "rt/40_net_unstable.js",
+    "rt/40_performance.js",
+    "rt/40_permissions.js",
+    "rt/40_plugins.js",
+    "rt/40_process.js",
+    "rt/40_read_file.js",
+    "rt/40_repl.js",
+    "rt/40_signals.js",
+    "rt/40_testing.js",
+    "rt/40_tls.js",
+    "rt/40_tty.js",
+    "rt/40_write_file.js",
+    "rt/90_deno_ns.js",
+    "rt/99_main.js",
+  ];
+  f.iter().map(|p| p.to_string()).collect()
+}
diff --git a/cli/diagnostics.rs b/cli/diagnostics.rs
index 00707c498033ac..41ee5ec22397cc 100644
--- a/cli/diagnostics.rs
+++ b/cli/diagnostics.rs
@@ -2,9 +2,6 @@
 //! This module encodes TypeScript errors (diagnostics) into Rust structs and
 //! contains code for printing them to the console.
 
-// TODO(ry) This module does a lot of JSON parsing manually. It should use
-// serde_json.
-
 use crate::colors;
 use crate::fmt_errors::format_stack;
 use serde::Deserialize;
@@ -152,10 +149,7 @@ fn format_maybe_related_information(
     for rd in related_information {
       s.push_str("\n\n");
       s.push_str(&format_stack(
-        match rd.category {
-          DiagnosticCategory::Error => true,
-          _ => false,
-        },
+        matches!(rd.category, DiagnosticCategory::Error),
         &format_message(&rd.message_chain, &rd.message, 0),
         rd.source_line.as_deref(),
         rd.start_column,
@@ -180,10 +174,7 @@ impl fmt::Display for DiagnosticItem {
       f,
       "{}",
       format_stack(
-        match self.category {
-          DiagnosticCategory::Error => true,
-          _ => false,
-        },
+        matches!(self.category, DiagnosticCategory::Error),
         &format!(
           "{}: {}",
           format_category_and_code(&self.category, self.code),
diff --git a/cli/disk_cache.rs b/cli/disk_cache.rs
index afea71cd22b640..d6fb9866c242f1 100644
--- a/cli/disk_cache.rs
+++ b/cli/disk_cache.rs
@@ -1,4 +1,5 @@
 use crate::fs as deno_fs;
+use crate::http_cache::url_to_filename;
 use std::ffi::OsStr;
 use std::fs;
 use std::io;
@@ -50,7 +51,7 @@ impl DiskCache {
     out.push(scheme);
 
     match scheme {
-      "http" | "https" | "wasm" => {
+      "wasm" => {
         let host = url.host_str().unwrap();
         let host_port = match url.port() {
           // Windows doesn't support ":" in filenames, so we represent port using a
@@ -64,6 +65,7 @@ impl DiskCache {
           out.push(path_seg);
         }
       }
+      "http" | "https" => out = url_to_filename(url),
       "file" => {
         let path = url.to_file_path().unwrap();
         let mut path_components = path.components();
@@ -194,15 +196,15 @@ mod tests {
     let mut test_cases = vec![
       (
         "http://deno.land/std/http/file_server.ts",
-        "http/deno.land/std/http/file_server.ts",
+        "http/deno.land/d8300752800fe3f0beda9505dc1c3b5388beb1ee45afd1f1e2c9fc0866df15cf",
       ),
       (
         "http://localhost:8000/std/http/file_server.ts",
-        "http/localhost_PORT8000/std/http/file_server.ts",
+        "http/localhost_PORT8000/d8300752800fe3f0beda9505dc1c3b5388beb1ee45afd1f1e2c9fc0866df15cf",
       ),
       (
         "https://deno.land/std/http/file_server.ts",
-        "https/deno.land/std/http/file_server.ts",
+        "https/deno.land/d8300752800fe3f0beda9505dc1c3b5388beb1ee45afd1f1e2c9fc0866df15cf",
       ),
       ("wasm://wasm/d1c677ea", "wasm/wasm/d1c677ea"),
     ];
@@ -251,12 +253,12 @@ mod tests {
       (
         "http://deno.land/std/http/file_server.ts",
         "js",
-        "http/deno.land/std/http/file_server.ts.js",
+        "http/deno.land/d8300752800fe3f0beda9505dc1c3b5388beb1ee45afd1f1e2c9fc0866df15cf.js",
       ),
       (
         "http://deno.land/std/http/file_server.ts",
         "js.map",
-        "http/deno.land/std/http/file_server.ts.js.map",
+        "http/deno.land/d8300752800fe3f0beda9505dc1c3b5388beb1ee45afd1f1e2c9fc0866df15cf.js.map",
       ),
     ];
 
diff --git a/cli/doc/class.rs b/cli/doc/class.rs
deleted file mode 100644
index d8fa29ded3ce0b..00000000000000
--- a/cli/doc/class.rs
+++ /dev/null
@@ -1,340 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::colors;
-use crate::doc::display::{
-  display_abstract, display_accessibility, display_async, display_generator,
-  display_method, display_optional, display_readonly, display_static,
-  SliceDisplayer,
-};
-use crate::swc_common::Spanned;
-use crate::swc_ecma_ast;
-use serde::Serialize;
-
-use super::function::function_to_function_def;
-use super::function::FunctionDef;
-use super::interface::expr_to_name;
-use super::params::{
-  assign_pat_to_param_def, ident_to_param_def, pat_to_param_def,
-  prop_name_to_string, ts_fn_param_to_param_def,
-};
-use super::parser::DocParser;
-use super::ts_type::{
-  maybe_type_param_instantiation_to_type_defs, ts_type_ann_to_def, TsTypeDef,
-};
-use super::ts_type_param::maybe_type_param_decl_to_type_param_defs;
-use super::ts_type_param::TsTypeParamDef;
-use super::Location;
-use super::ParamDef;
-
-use std::fmt::{Display, Formatter, Result as FmtResult};
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct ClassConstructorDef {
-  pub js_doc: Option<String>,
-  pub accessibility: Option<swc_ecma_ast::Accessibility>,
-  pub name: String,
-  pub params: Vec<ParamDef>,
-  pub location: Location,
-}
-
-impl Display for ClassConstructorDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}{}({})",
-      display_accessibility(self.accessibility),
-      colors::magenta("constructor"),
-      SliceDisplayer::new(&self.params, ", ", false),
-    )
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct ClassPropertyDef {
-  pub js_doc: Option<String>,
-  pub ts_type: Option<TsTypeDef>,
-  pub readonly: bool,
-  pub accessibility: Option<swc_ecma_ast::Accessibility>,
-  pub optional: bool,
-  pub is_abstract: bool,
-  pub is_static: bool,
-  pub name: String,
-  pub location: Location,
-}
-
-impl Display for ClassPropertyDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}{}{}{}{}{}",
-      display_abstract(self.is_abstract),
-      display_accessibility(self.accessibility),
-      display_static(self.is_static),
-      display_readonly(self.readonly),
-      colors::bold(&self.name),
-      display_optional(self.optional),
-    )?;
-    if let Some(ts_type) = &self.ts_type {
-      write!(f, ": {}", ts_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct ClassIndexSignatureDef {
-  pub readonly: bool,
-  pub params: Vec<ParamDef>,
-  pub ts_type: Option<TsTypeDef>,
-}
-
-impl Display for ClassIndexSignatureDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}[{}]",
-      display_readonly(self.readonly),
-      SliceDisplayer::new(&self.params, ", ", false)
-    )?;
-    if let Some(ts_type) = &self.ts_type {
-      write!(f, ": {}", ts_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct ClassMethodDef {
-  pub js_doc: Option<String>,
-  pub accessibility: Option<swc_ecma_ast::Accessibility>,
-  pub optional: bool,
-  pub is_abstract: bool,
-  pub is_static: bool,
-  pub name: String,
-  pub kind: swc_ecma_ast::MethodKind,
-  pub function_def: FunctionDef,
-  pub location: Location,
-}
-
-impl Display for ClassMethodDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}{}{}{}{}{}{}{}({})",
-      display_abstract(self.is_abstract),
-      display_accessibility(self.accessibility),
-      display_static(self.is_static),
-      display_async(self.function_def.is_async),
-      display_method(self.kind),
-      display_generator(self.function_def.is_generator),
-      colors::bold(&self.name),
-      display_optional(self.optional),
-      SliceDisplayer::new(&self.function_def.params, ", ", false),
-    )?;
-    if let Some(return_type) = &self.function_def.return_type {
-      write!(f, ": {}", return_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct ClassDef {
-  // TODO(bartlomieju): decorators
-  pub is_abstract: bool,
-  pub constructors: Vec<ClassConstructorDef>,
-  pub properties: Vec<ClassPropertyDef>,
-  pub index_signatures: Vec<ClassIndexSignatureDef>,
-  pub methods: Vec<ClassMethodDef>,
-  pub extends: Option<String>,
-  pub implements: Vec<TsTypeDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-  pub super_type_params: Vec<TsTypeDef>,
-}
-
-pub fn class_to_class_def(
-  doc_parser: &DocParser,
-  class: &swc_ecma_ast::Class,
-) -> ClassDef {
-  let mut constructors = vec![];
-  let mut methods = vec![];
-  let mut properties = vec![];
-  let mut index_signatures = vec![];
-
-  let extends: Option<String> = match &class.super_class {
-    Some(boxed) => {
-      use crate::swc_ecma_ast::Expr;
-      let expr: &Expr = &**boxed;
-      match expr {
-        Expr::Ident(ident) => Some(ident.sym.to_string()),
-        _ => None,
-      }
-    }
-    None => None,
-  };
-
-  let implements = class
-    .implements
-    .iter()
-    .map(|expr| expr.into())
-    .collect::<Vec<TsTypeDef>>();
-
-  for member in &class.body {
-    use crate::swc_ecma_ast::ClassMember::*;
-
-    match member {
-      Constructor(ctor) => {
-        let ctor_js_doc = doc_parser.js_doc_for_span(ctor.span());
-        let constructor_name = prop_name_to_string(
-          &ctor.key,
-          Some(&doc_parser.ast_parser.source_map),
-        );
-
-        let mut params = vec![];
-
-        for param in &ctor.params {
-          use crate::swc_ecma_ast::ParamOrTsParamProp::*;
-
-          let param_def = match param {
-            Param(param) => pat_to_param_def(
-              &param.pat,
-              Some(&doc_parser.ast_parser.source_map),
-            ),
-            TsParamProp(ts_param_prop) => {
-              use swc_ecma_ast::TsParamPropParam;
-
-              match &ts_param_prop.param {
-                TsParamPropParam::Ident(ident) => ident_to_param_def(
-                  ident,
-                  Some(&doc_parser.ast_parser.source_map),
-                ),
-                TsParamPropParam::Assign(assign_pat) => {
-                  assign_pat_to_param_def(
-                    assign_pat,
-                    Some(&doc_parser.ast_parser.source_map),
-                  )
-                }
-              }
-            }
-          };
-          params.push(param_def);
-        }
-
-        let constructor_def = ClassConstructorDef {
-          js_doc: ctor_js_doc,
-          accessibility: ctor.accessibility,
-          name: constructor_name,
-          params,
-          location: doc_parser.ast_parser.get_span_location(ctor.span).into(),
-        };
-        constructors.push(constructor_def);
-      }
-      Method(class_method) => {
-        let method_js_doc = doc_parser.js_doc_for_span(class_method.span());
-        let method_name = prop_name_to_string(
-          &class_method.key,
-          Some(&doc_parser.ast_parser.source_map),
-        );
-        let fn_def =
-          function_to_function_def(&doc_parser, &class_method.function);
-        let method_def = ClassMethodDef {
-          js_doc: method_js_doc,
-          accessibility: class_method.accessibility,
-          optional: class_method.is_optional,
-          is_abstract: class_method.is_abstract,
-          is_static: class_method.is_static,
-          name: method_name,
-          kind: class_method.kind,
-          function_def: fn_def,
-          location: doc_parser
-            .ast_parser
-            .get_span_location(class_method.span)
-            .into(),
-        };
-        methods.push(method_def);
-      }
-      ClassProp(class_prop) => {
-        let prop_js_doc = doc_parser.js_doc_for_span(class_prop.span());
-
-        let ts_type = class_prop
-          .type_ann
-          .as_ref()
-          .map(|rt| ts_type_ann_to_def(rt));
-
-        let prop_name = expr_to_name(&*class_prop.key);
-
-        let prop_def = ClassPropertyDef {
-          js_doc: prop_js_doc,
-          ts_type,
-          readonly: class_prop.readonly,
-          optional: class_prop.is_optional,
-          is_abstract: class_prop.is_abstract,
-          is_static: class_prop.is_static,
-          accessibility: class_prop.accessibility,
-          name: prop_name,
-          location: doc_parser
-            .ast_parser
-            .get_span_location(class_prop.span)
-            .into(),
-        };
-        properties.push(prop_def);
-      }
-      TsIndexSignature(ts_index_sig) => {
-        let mut params = vec![];
-        for param in &ts_index_sig.params {
-          let param_def = ts_fn_param_to_param_def(param, None);
-          params.push(param_def);
-        }
-
-        let ts_type = ts_index_sig
-          .type_ann
-          .as_ref()
-          .map(|rt| (&*rt.type_ann).into());
-
-        let index_sig_def = ClassIndexSignatureDef {
-          readonly: ts_index_sig.readonly,
-          params,
-          ts_type,
-        };
-        index_signatures.push(index_sig_def);
-      }
-      // TODO(bartlomieju):
-      PrivateMethod(_) => {}
-      PrivateProp(_) => {}
-      _ => {}
-    }
-  }
-
-  let type_params =
-    maybe_type_param_decl_to_type_param_defs(class.type_params.as_ref());
-
-  let super_type_params = maybe_type_param_instantiation_to_type_defs(
-    class.super_type_params.as_ref(),
-  );
-
-  ClassDef {
-    is_abstract: class.is_abstract,
-    extends,
-    implements,
-    constructors,
-    properties,
-    index_signatures,
-    methods,
-    type_params,
-    super_type_params,
-  }
-}
-
-pub fn get_doc_for_class_decl(
-  doc_parser: &DocParser,
-  class_decl: &swc_ecma_ast::ClassDecl,
-) -> (String, ClassDef) {
-  let class_name = class_decl.ident.sym.to_string();
-  let class_def = class_to_class_def(doc_parser, &class_decl.class);
-
-  (class_name, class_def)
-}
diff --git a/cli/doc/display.rs b/cli/doc/display.rs
deleted file mode 100644
index 9da04363f6f10d..00000000000000
--- a/cli/doc/display.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::colors;
-use crate::swc_ecma_ast;
-use std::fmt::{Display, Formatter, Result};
-
-pub(crate) struct Indent(pub i64);
-
-impl Display for Indent {
-  fn fmt(&self, f: &mut Formatter<'_>) -> Result {
-    for _ in 0..self.0 {
-      write!(f, "  ")?;
-    }
-    Ok(())
-  }
-}
-
-pub(crate) struct SliceDisplayer<'a, T: Display>(&'a [T], &'a str, bool);
-
-impl<'a, T: Display> SliceDisplayer<'a, T> {
-  pub fn new(
-    slice: &'a [T],
-    separator: &'a str,
-    trailing: bool,
-  ) -> SliceDisplayer<'a, T> {
-    SliceDisplayer(slice, separator, trailing)
-  }
-}
-
-impl<T: Display> Display for SliceDisplayer<'_, T> {
-  fn fmt(&self, f: &mut Formatter<'_>) -> Result {
-    if self.0.is_empty() {
-      return Ok(());
-    }
-
-    write!(f, "{}", self.0[0])?;
-    for v in &self.0[1..] {
-      write!(f, "{}{}", self.1, v)?;
-    }
-
-    if self.2 {
-      write!(f, "{}", self.1)?;
-    }
-
-    Ok(())
-  }
-}
-
-pub(crate) fn display_abstract(is_abstract: bool) -> impl Display {
-  colors::magenta(if is_abstract { "abstract " } else { "" })
-}
-
-pub(crate) fn display_accessibility(
-  accessibility: Option<swc_ecma_ast::Accessibility>,
-) -> impl Display {
-  colors::magenta(
-    match accessibility.unwrap_or(swc_ecma_ast::Accessibility::Public) {
-      swc_ecma_ast::Accessibility::Public => "",
-      swc_ecma_ast::Accessibility::Protected => "protected ",
-      swc_ecma_ast::Accessibility::Private => "private ",
-    },
-  )
-}
-
-pub(crate) fn display_async(is_async: bool) -> impl Display {
-  colors::magenta(if is_async { "async " } else { "" })
-}
-
-pub(crate) fn display_generator(is_generator: bool) -> impl Display {
-  colors::magenta(if is_generator { "*" } else { "" })
-}
-
-pub(crate) fn display_method(method: swc_ecma_ast::MethodKind) -> impl Display {
-  colors::magenta(match method {
-    swc_ecma_ast::MethodKind::Getter => "get ",
-    swc_ecma_ast::MethodKind::Setter => "set ",
-    _ => "",
-  })
-}
-
-pub(crate) fn display_optional(is_optional: bool) -> impl Display {
-  colors::magenta(if is_optional { "?" } else { "" })
-}
-
-pub(crate) fn display_readonly(is_readonly: bool) -> impl Display {
-  colors::magenta(if is_readonly { "readonly " } else { "" })
-}
-
-pub(crate) fn display_static(is_static: bool) -> impl Display {
-  colors::magenta(if is_static { "static " } else { "" })
-}
diff --git a/cli/doc/enum.rs b/cli/doc/enum.rs
deleted file mode 100644
index bf561cf942a77a..00000000000000
--- a/cli/doc/enum.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::swc_ecma_ast;
-use serde::Serialize;
-
-use super::parser::DocParser;
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct EnumMemberDef {
-  pub name: String,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct EnumDef {
-  pub members: Vec<EnumMemberDef>,
-}
-
-pub fn get_doc_for_ts_enum_decl(
-  _doc_parser: &DocParser,
-  enum_decl: &swc_ecma_ast::TsEnumDecl,
-) -> (String, EnumDef) {
-  let enum_name = enum_decl.id.sym.to_string();
-  let mut members = vec![];
-
-  for enum_member in &enum_decl.members {
-    use crate::swc_ecma_ast::TsEnumMemberId::*;
-
-    let member_name = match &enum_member.id {
-      Ident(ident) => ident.sym.to_string(),
-      Str(str_) => str_.value.to_string(),
-    };
-
-    let member_def = EnumMemberDef { name: member_name };
-    members.push(member_def);
-  }
-
-  let enum_def = EnumDef { members };
-
-  (enum_name, enum_def)
-}
diff --git a/cli/doc/function.rs b/cli/doc/function.rs
deleted file mode 100644
index ede8bdbbd26a7d..00000000000000
--- a/cli/doc/function.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use super::params::pat_to_param_def;
-use super::parser::DocParser;
-use super::ts_type::ts_type_ann_to_def;
-use super::ts_type::TsTypeDef;
-use super::ts_type_param::maybe_type_param_decl_to_type_param_defs;
-use super::ts_type_param::TsTypeParamDef;
-use super::ParamDef;
-use crate::swc_ecma_ast;
-use serde::Serialize;
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct FunctionDef {
-  pub params: Vec<ParamDef>,
-  pub return_type: Option<TsTypeDef>,
-  pub is_async: bool,
-  pub is_generator: bool,
-  pub type_params: Vec<TsTypeParamDef>,
-  // TODO(bartlomieju): decorators
-}
-
-pub fn function_to_function_def(
-  doc_parser: &DocParser,
-  function: &swc_ecma_ast::Function,
-) -> FunctionDef {
-  let mut params = vec![];
-
-  for param in &function.params {
-    let param_def =
-      pat_to_param_def(&param.pat, Some(&doc_parser.ast_parser.source_map));
-    params.push(param_def);
-  }
-
-  let maybe_return_type = function
-    .return_type
-    .as_ref()
-    .map(|rt| ts_type_ann_to_def(rt));
-
-  let type_params =
-    maybe_type_param_decl_to_type_param_defs(function.type_params.as_ref());
-
-  FunctionDef {
-    params,
-    return_type: maybe_return_type,
-    is_async: function.is_async,
-    is_generator: function.is_generator,
-    type_params,
-  }
-}
-
-pub fn get_doc_for_fn_decl(
-  doc_parser: &DocParser,
-  fn_decl: &swc_ecma_ast::FnDecl,
-) -> (String, FunctionDef) {
-  let name = fn_decl.ident.sym.to_string();
-  let fn_def = function_to_function_def(&doc_parser, &fn_decl.function);
-  (name, fn_def)
-}
diff --git a/cli/doc/interface.rs b/cli/doc/interface.rs
deleted file mode 100644
index d3caa8748492bc..00000000000000
--- a/cli/doc/interface.rs
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::colors;
-use crate::doc::display::{display_optional, display_readonly, SliceDisplayer};
-use crate::swc_ecma_ast;
-use serde::Serialize;
-
-use super::params::ts_fn_param_to_param_def;
-use super::parser::DocParser;
-use super::ts_type::ts_type_ann_to_def;
-use super::ts_type::TsTypeDef;
-use super::ts_type_param::maybe_type_param_decl_to_type_param_defs;
-use super::ts_type_param::TsTypeParamDef;
-use super::Location;
-use super::ParamDef;
-
-use std::fmt::{Display, Formatter, Result as FmtResult};
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct InterfaceMethodDef {
-  pub name: String,
-  pub location: Location,
-  pub js_doc: Option<String>,
-  pub optional: bool,
-  pub params: Vec<ParamDef>,
-  pub return_type: Option<TsTypeDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-impl Display for InterfaceMethodDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}{}({})",
-      colors::bold(&self.name),
-      display_optional(self.optional),
-      SliceDisplayer::new(&self.params, ", ", false),
-    )?;
-    if let Some(return_type) = &self.return_type {
-      write!(f, ": {}", return_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct InterfacePropertyDef {
-  pub name: String,
-  pub location: Location,
-  pub js_doc: Option<String>,
-  pub params: Vec<ParamDef>,
-  pub computed: bool,
-  pub optional: bool,
-  pub ts_type: Option<TsTypeDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-impl Display for InterfacePropertyDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}{}",
-      colors::bold(&self.name),
-      display_optional(self.optional),
-    )?;
-    if let Some(ts_type) = &self.ts_type {
-      write!(f, ": {}", ts_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct InterfaceIndexSignatureDef {
-  pub readonly: bool,
-  pub params: Vec<ParamDef>,
-  pub ts_type: Option<TsTypeDef>,
-}
-
-impl Display for InterfaceIndexSignatureDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}[{}]",
-      display_readonly(self.readonly),
-      SliceDisplayer::new(&self.params, ", ", false)
-    )?;
-    if let Some(ts_type) = &self.ts_type {
-      write!(f, ": {}", ts_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct InterfaceCallSignatureDef {
-  pub location: Location,
-  pub js_doc: Option<String>,
-  pub params: Vec<ParamDef>,
-  pub ts_type: Option<TsTypeDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct InterfaceDef {
-  pub extends: Vec<TsTypeDef>,
-  pub methods: Vec<InterfaceMethodDef>,
-  pub properties: Vec<InterfacePropertyDef>,
-  pub call_signatures: Vec<InterfaceCallSignatureDef>,
-  pub index_signatures: Vec<InterfaceIndexSignatureDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-pub fn expr_to_name(expr: &swc_ecma_ast::Expr) -> String {
-  use crate::swc_ecma_ast::Expr::*;
-  use crate::swc_ecma_ast::ExprOrSuper::*;
-
-  match expr {
-    Ident(ident) => ident.sym.to_string(),
-    Member(member_expr) => {
-      let left = match &member_expr.obj {
-        Super(_) => "super".to_string(),
-        Expr(boxed_expr) => expr_to_name(&*boxed_expr),
-      };
-      let right = expr_to_name(&*member_expr.prop);
-      format!("[{}.{}]", left, right)
-    }
-    _ => "<TODO>".to_string(),
-  }
-}
-
-pub fn get_doc_for_ts_interface_decl(
-  doc_parser: &DocParser,
-  interface_decl: &swc_ecma_ast::TsInterfaceDecl,
-) -> (String, InterfaceDef) {
-  let interface_name = interface_decl.id.sym.to_string();
-
-  let mut methods = vec![];
-  let mut properties = vec![];
-  let mut call_signatures = vec![];
-  let mut index_signatures = vec![];
-
-  for type_element in &interface_decl.body.body {
-    use crate::swc_ecma_ast::TsTypeElement::*;
-
-    match &type_element {
-      TsMethodSignature(ts_method_sig) => {
-        let method_js_doc = doc_parser.js_doc_for_span(ts_method_sig.span);
-
-        let mut params = vec![];
-
-        for param in &ts_method_sig.params {
-          let param_def = ts_fn_param_to_param_def(
-            param,
-            Some(&doc_parser.ast_parser.source_map),
-          );
-          params.push(param_def);
-        }
-
-        let name = expr_to_name(&*ts_method_sig.key);
-
-        let maybe_return_type = ts_method_sig
-          .type_ann
-          .as_ref()
-          .map(|rt| ts_type_ann_to_def(rt));
-
-        let type_params = maybe_type_param_decl_to_type_param_defs(
-          ts_method_sig.type_params.as_ref(),
-        );
-
-        let method_def = InterfaceMethodDef {
-          name,
-          js_doc: method_js_doc,
-          location: doc_parser
-            .ast_parser
-            .get_span_location(ts_method_sig.span)
-            .into(),
-          optional: ts_method_sig.optional,
-          params,
-          return_type: maybe_return_type,
-          type_params,
-        };
-        methods.push(method_def);
-      }
-      TsPropertySignature(ts_prop_sig) => {
-        let prop_js_doc = doc_parser.js_doc_for_span(ts_prop_sig.span);
-        let name = expr_to_name(&*ts_prop_sig.key);
-
-        let mut params = vec![];
-
-        for param in &ts_prop_sig.params {
-          let param_def = ts_fn_param_to_param_def(
-            param,
-            Some(&doc_parser.ast_parser.source_map),
-          );
-          params.push(param_def);
-        }
-
-        let ts_type = ts_prop_sig
-          .type_ann
-          .as_ref()
-          .map(|rt| ts_type_ann_to_def(rt));
-
-        let type_params = maybe_type_param_decl_to_type_param_defs(
-          ts_prop_sig.type_params.as_ref(),
-        );
-
-        let prop_def = InterfacePropertyDef {
-          name,
-          js_doc: prop_js_doc,
-          location: doc_parser
-            .ast_parser
-            .get_span_location(ts_prop_sig.span)
-            .into(),
-          params,
-          ts_type,
-          computed: ts_prop_sig.computed,
-          optional: ts_prop_sig.optional,
-          type_params,
-        };
-        properties.push(prop_def);
-      }
-      TsCallSignatureDecl(ts_call_sig) => {
-        let call_sig_js_doc = doc_parser.js_doc_for_span(ts_call_sig.span);
-
-        let mut params = vec![];
-        for param in &ts_call_sig.params {
-          let param_def = ts_fn_param_to_param_def(
-            param,
-            Some(&doc_parser.ast_parser.source_map),
-          );
-          params.push(param_def);
-        }
-
-        let ts_type = ts_call_sig
-          .type_ann
-          .as_ref()
-          .map(|rt| ts_type_ann_to_def(rt));
-
-        let type_params = maybe_type_param_decl_to_type_param_defs(
-          ts_call_sig.type_params.as_ref(),
-        );
-
-        let call_sig_def = InterfaceCallSignatureDef {
-          js_doc: call_sig_js_doc,
-          location: doc_parser
-            .ast_parser
-            .get_span_location(ts_call_sig.span)
-            .into(),
-          params,
-          ts_type,
-          type_params,
-        };
-        call_signatures.push(call_sig_def);
-      }
-      TsIndexSignature(ts_index_sig) => {
-        let mut params = vec![];
-        for param in &ts_index_sig.params {
-          let param_def = ts_fn_param_to_param_def(param, None);
-          params.push(param_def);
-        }
-
-        let ts_type = ts_index_sig
-          .type_ann
-          .as_ref()
-          .map(|rt| (&*rt.type_ann).into());
-
-        let index_sig_def = InterfaceIndexSignatureDef {
-          readonly: ts_index_sig.readonly,
-          params,
-          ts_type,
-        };
-        index_signatures.push(index_sig_def);
-      }
-      // TODO:
-      TsConstructSignatureDecl(_) => {}
-    }
-  }
-
-  let type_params = maybe_type_param_decl_to_type_param_defs(
-    interface_decl.type_params.as_ref(),
-  );
-
-  let extends = interface_decl
-    .extends
-    .iter()
-    .map(|expr| expr.into())
-    .collect::<Vec<TsTypeDef>>();
-
-  let interface_def = InterfaceDef {
-    extends,
-    methods,
-    properties,
-    call_signatures,
-    index_signatures,
-    type_params,
-  };
-
-  (interface_name, interface_def)
-}
diff --git a/cli/doc/mod.rs b/cli/doc/mod.rs
deleted file mode 100644
index 49f8d7453edb3f..00000000000000
--- a/cli/doc/mod.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-pub mod class;
-mod display;
-pub mod r#enum;
-pub mod function;
-pub mod interface;
-pub mod module;
-pub mod namespace;
-mod node;
-pub mod params;
-pub mod parser;
-pub mod printer;
-pub mod ts_type;
-pub mod ts_type_param;
-pub mod type_alias;
-pub mod variable;
-
-pub use node::DocNode;
-pub use node::DocNodeKind;
-pub use node::Location;
-pub use params::ParamDef;
-pub use parser::DocParser;
-pub use printer::DocPrinter;
-
-#[cfg(test)]
-mod tests;
-
-pub fn find_nodes_by_name_recursively(
-  doc_nodes: Vec<DocNode>,
-  name: String,
-) -> Vec<DocNode> {
-  let mut parts = name.splitn(2, '.');
-  let name = parts.next();
-  let leftover = parts.next();
-  if name.is_none() {
-    return doc_nodes;
-  }
-
-  let name = name.unwrap();
-  let doc_nodes = find_nodes_by_name(doc_nodes, name.to_string());
-
-  let mut found: Vec<DocNode> = vec![];
-  match leftover {
-    Some(leftover) => {
-      for node in doc_nodes {
-        let children = find_children_by_name(node, leftover.to_string());
-        found.extend(children);
-      }
-      found
-    }
-    None => doc_nodes,
-  }
-}
-
-fn find_nodes_by_name(doc_nodes: Vec<DocNode>, name: String) -> Vec<DocNode> {
-  let mut found: Vec<DocNode> = vec![];
-  for node in doc_nodes {
-    if node.name == name {
-      found.push(node);
-    }
-  }
-  found
-}
-
-fn find_children_by_name(node: DocNode, name: String) -> Vec<DocNode> {
-  match node.kind {
-    DocNodeKind::Namespace => {
-      let namespace_def = node.namespace_def.unwrap();
-      find_nodes_by_name_recursively(namespace_def.elements, name)
-    }
-    // TODO(#4516) handle class, interface etc...
-    _ => vec![],
-  }
-}
diff --git a/cli/doc/module.rs b/cli/doc/module.rs
deleted file mode 100644
index 79b1b92bee0e56..00000000000000
--- a/cli/doc/module.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::swc_common::Spanned;
-use crate::swc_ecma_ast;
-
-use super::parser::DocParser;
-use super::DocNode;
-use super::DocNodeKind;
-
-pub fn get_doc_node_for_export_decl(
-  doc_parser: &DocParser,
-  export_decl: &swc_ecma_ast::ExportDecl,
-) -> DocNode {
-  let export_span = export_decl.span();
-  use crate::swc_ecma_ast::Decl;
-
-  let js_doc = doc_parser.js_doc_for_span(export_span);
-  let location = doc_parser.ast_parser.get_span_location(export_span).into();
-
-  match &export_decl.decl {
-    Decl::Class(class_decl) => {
-      let (name, class_def) =
-        super::class::get_doc_for_class_decl(doc_parser, class_decl);
-      DocNode {
-        kind: DocNodeKind::Class,
-        name,
-        location,
-        js_doc,
-        class_def: Some(class_def),
-        function_def: None,
-        variable_def: None,
-        enum_def: None,
-        type_alias_def: None,
-        namespace_def: None,
-        interface_def: None,
-      }
-    }
-    Decl::Fn(fn_decl) => {
-      let (name, function_def) =
-        super::function::get_doc_for_fn_decl(doc_parser, fn_decl);
-      DocNode {
-        kind: DocNodeKind::Function,
-        name,
-        location,
-        js_doc,
-        function_def: Some(function_def),
-        class_def: None,
-        variable_def: None,
-        enum_def: None,
-        type_alias_def: None,
-        namespace_def: None,
-        interface_def: None,
-      }
-    }
-    Decl::Var(var_decl) => {
-      let (name, var_def) = super::variable::get_doc_for_var_decl(var_decl);
-      DocNode {
-        kind: DocNodeKind::Variable,
-        name,
-        location,
-        js_doc,
-        variable_def: Some(var_def),
-        function_def: None,
-        class_def: None,
-        enum_def: None,
-        type_alias_def: None,
-        namespace_def: None,
-        interface_def: None,
-      }
-    }
-    Decl::TsInterface(ts_interface_decl) => {
-      let (name, interface_def) =
-        super::interface::get_doc_for_ts_interface_decl(
-          doc_parser,
-          ts_interface_decl,
-        );
-      DocNode {
-        kind: DocNodeKind::Interface,
-        name,
-        location,
-        js_doc,
-        interface_def: Some(interface_def),
-        variable_def: None,
-        function_def: None,
-        class_def: None,
-        enum_def: None,
-        type_alias_def: None,
-        namespace_def: None,
-      }
-    }
-    Decl::TsTypeAlias(ts_type_alias) => {
-      let (name, type_alias_def) =
-        super::type_alias::get_doc_for_ts_type_alias_decl(
-          doc_parser,
-          ts_type_alias,
-        );
-      DocNode {
-        kind: DocNodeKind::TypeAlias,
-        name,
-        location,
-        js_doc,
-        type_alias_def: Some(type_alias_def),
-        interface_def: None,
-        variable_def: None,
-        function_def: None,
-        class_def: None,
-        enum_def: None,
-        namespace_def: None,
-      }
-    }
-    Decl::TsEnum(ts_enum) => {
-      let (name, enum_def) =
-        super::r#enum::get_doc_for_ts_enum_decl(doc_parser, ts_enum);
-      DocNode {
-        kind: DocNodeKind::Enum,
-        name,
-        location,
-        js_doc,
-        enum_def: Some(enum_def),
-        type_alias_def: None,
-        interface_def: None,
-        variable_def: None,
-        function_def: None,
-        class_def: None,
-        namespace_def: None,
-      }
-    }
-    Decl::TsModule(ts_module) => {
-      let (name, namespace_def) =
-        super::namespace::get_doc_for_ts_module(doc_parser, ts_module);
-      DocNode {
-        kind: DocNodeKind::Namespace,
-        name,
-        location,
-        js_doc,
-        namespace_def: Some(namespace_def),
-        enum_def: None,
-        type_alias_def: None,
-        interface_def: None,
-        variable_def: None,
-        function_def: None,
-        class_def: None,
-      }
-    }
-  }
-}
diff --git a/cli/doc/namespace.rs b/cli/doc/namespace.rs
deleted file mode 100644
index 6cbc619e8e03cd..00000000000000
--- a/cli/doc/namespace.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::swc_ecma_ast;
-use serde::Serialize;
-
-use super::parser::DocParser;
-use super::DocNode;
-use super::DocNodeKind;
-
-#[derive(Debug, Serialize, Clone)]
-pub struct NamespaceDef {
-  pub elements: Vec<DocNode>,
-}
-
-pub fn get_doc_for_ts_namespace_decl(
-  doc_parser: &DocParser,
-  ts_namespace_decl: &swc_ecma_ast::TsNamespaceDecl,
-) -> DocNode {
-  let js_doc = doc_parser.js_doc_for_span(ts_namespace_decl.span);
-  let location = doc_parser
-    .ast_parser
-    .get_span_location(ts_namespace_decl.span)
-    .into();
-  let namespace_name = ts_namespace_decl.id.sym.to_string();
-
-  use crate::swc_ecma_ast::TsNamespaceBody::*;
-
-  let elements = match &*ts_namespace_decl.body {
-    TsModuleBlock(ts_module_block) => {
-      doc_parser.get_doc_nodes_for_module_body(ts_module_block.body.clone())
-    }
-    TsNamespaceDecl(ts_namespace_decl) => {
-      vec![get_doc_for_ts_namespace_decl(doc_parser, ts_namespace_decl)]
-    }
-  };
-
-  let ns_def = NamespaceDef { elements };
-
-  DocNode {
-    kind: DocNodeKind::Namespace,
-    name: namespace_name,
-    location,
-    js_doc,
-    namespace_def: Some(ns_def),
-    function_def: None,
-    variable_def: None,
-    enum_def: None,
-    class_def: None,
-    type_alias_def: None,
-    interface_def: None,
-  }
-}
-
-pub fn get_doc_for_ts_module(
-  doc_parser: &DocParser,
-  ts_module_decl: &swc_ecma_ast::TsModuleDecl,
-) -> (String, NamespaceDef) {
-  use crate::swc_ecma_ast::TsModuleName;
-  let namespace_name = match &ts_module_decl.id {
-    TsModuleName::Ident(ident) => ident.sym.to_string(),
-    TsModuleName::Str(str_) => str_.value.to_string(),
-  };
-
-  let elements = if let Some(body) = &ts_module_decl.body {
-    use crate::swc_ecma_ast::TsNamespaceBody::*;
-
-    match &body {
-      TsModuleBlock(ts_module_block) => {
-        doc_parser.get_doc_nodes_for_module_body(ts_module_block.body.clone())
-      }
-      TsNamespaceDecl(ts_namespace_decl) => {
-        vec![get_doc_for_ts_namespace_decl(doc_parser, ts_namespace_decl)]
-      }
-    }
-  } else {
-    vec![]
-  };
-
-  let ns_def = NamespaceDef { elements };
-
-  (namespace_name, ns_def)
-}
diff --git a/cli/doc/node.rs b/cli/doc/node.rs
deleted file mode 100644
index 690221ed001b63..00000000000000
--- a/cli/doc/node.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::swc_common;
-use serde::Serialize;
-
-#[derive(Debug, PartialEq, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub enum DocNodeKind {
-  Function,
-  Variable,
-  Class,
-  Enum,
-  Interface,
-  TypeAlias,
-  Namespace,
-}
-
-#[derive(Debug, Serialize, Clone, PartialEq)]
-pub struct Location {
-  pub filename: String,
-  pub line: usize,
-  pub col: usize,
-}
-
-impl Into<Location> for swc_common::Loc {
-  fn into(self) -> Location {
-    use crate::swc_common::FileName::*;
-
-    let filename = match &self.file.name {
-      Real(path_buf) => path_buf.to_string_lossy().to_string(),
-      Custom(str_) => str_.to_string(),
-      _ => panic!("invalid filename"),
-    };
-
-    Location {
-      filename,
-      line: self.line,
-      col: self.col_display,
-    }
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub enum ReexportKind {
-  /// export * from "./path/to/module.js";
-  All,
-  /// export * as someNamespace from "./path/to/module.js";
-  Namespace(String),
-  /// export default from "./path/to/module.js";
-  Default,
-  /// (identifier, optional alias)
-  /// export { foo } from "./path/to/module.js";
-  /// export { foo as bar } from "./path/to/module.js";
-  Named(String, Option<String>),
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct Reexport {
-  pub kind: ReexportKind,
-  pub src: String,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct ModuleDoc {
-  pub definitions: Vec<DocNode>,
-  pub reexports: Vec<Reexport>,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct DocNode {
-  pub kind: DocNodeKind,
-  pub name: String,
-  pub location: Location,
-  pub js_doc: Option<String>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub function_def: Option<super::function::FunctionDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub variable_def: Option<super::variable::VariableDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub enum_def: Option<super::r#enum::EnumDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub class_def: Option<super::class::ClassDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub type_alias_def: Option<super::type_alias::TypeAliasDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub namespace_def: Option<super::namespace::NamespaceDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub interface_def: Option<super::interface::InterfaceDef>,
-}
diff --git a/cli/doc/params.rs b/cli/doc/params.rs
deleted file mode 100644
index 3e7967c816e45c..00000000000000
--- a/cli/doc/params.rs
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use super::display::{display_optional, SliceDisplayer};
-use super::ts_type::{ts_type_ann_to_def, TsTypeDef};
-use crate::swc_common::SourceMap;
-use crate::swc_ecma_ast;
-use crate::swc_ecma_ast::{ObjectPatProp, Pat, TsFnParam};
-use serde::Serialize;
-use std::fmt::{Display, Formatter, Result as FmtResult};
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-#[serde(tag = "kind")]
-pub enum ParamDef {
-  #[serde(rename_all = "camelCase")]
-  Array {
-    elements: Vec<Option<ParamDef>>,
-    optional: bool,
-    ts_type: Option<TsTypeDef>,
-  },
-  #[serde(rename_all = "camelCase")]
-  Assign {
-    left: Box<ParamDef>,
-    right: String,
-    ts_type: Option<TsTypeDef>,
-  },
-  #[serde(rename_all = "camelCase")]
-  Identifier {
-    name: String,
-    optional: bool,
-    ts_type: Option<TsTypeDef>,
-  },
-  #[serde(rename_all = "camelCase")]
-  Object {
-    props: Vec<ObjectPatPropDef>,
-    optional: bool,
-    ts_type: Option<TsTypeDef>,
-  },
-  #[serde(rename_all = "camelCase")]
-  Rest {
-    arg: Box<ParamDef>,
-    ts_type: Option<TsTypeDef>,
-  },
-}
-
-impl Display for ParamDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    match self {
-      Self::Array {
-        elements,
-        optional,
-        ts_type,
-      } => {
-        write!(f, "[")?;
-        if !elements.is_empty() {
-          if let Some(v) = &elements[0] {
-            write!(f, "{}", v)?;
-          }
-          for maybe_v in &elements[1..] {
-            write!(f, ", ")?;
-            if let Some(v) = maybe_v {
-              write!(f, "{}", v)?;
-            }
-          }
-        }
-        write!(f, "]")?;
-        write!(f, "{}", display_optional(*optional))?;
-        if let Some(ts_type) = ts_type {
-          write!(f, ": {}", ts_type)?;
-        }
-        Ok(())
-      }
-      Self::Assign { left, ts_type, .. } => {
-        write!(f, "{}", left)?;
-        if let Some(ts_type) = ts_type {
-          write!(f, ": {}", ts_type)?;
-        }
-        // TODO(SyrupThinker) As we cannot display expressions the value is just omitted
-        // write!(f, " = {}", right)?;
-        Ok(())
-      }
-      Self::Identifier {
-        name,
-        optional,
-        ts_type,
-      } => {
-        write!(f, "{}{}", name, display_optional(*optional))?;
-        if let Some(ts_type) = ts_type {
-          write!(f, ": {}", ts_type)?;
-        }
-        Ok(())
-      }
-      Self::Object {
-        props,
-        optional,
-        ts_type,
-      } => {
-        write!(
-          f,
-          "{{{}}}{}",
-          SliceDisplayer::new(&props, ", ", false),
-          display_optional(*optional)
-        )?;
-        if let Some(ts_type) = ts_type {
-          write!(f, ": {}", ts_type)?;
-        }
-        Ok(())
-      }
-      Self::Rest { arg, ts_type } => {
-        write!(f, "...{}", arg)?;
-        if let Some(ts_type) = ts_type {
-          write!(f, ": {}", ts_type)?;
-        }
-        Ok(())
-      }
-    }
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-#[serde(tag = "kind")]
-pub enum ObjectPatPropDef {
-  Assign { key: String, value: Option<String> },
-  KeyValue { key: String, value: Box<ParamDef> },
-  Rest { arg: Box<ParamDef> },
-}
-
-impl Display for ObjectPatPropDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    match self {
-      Self::KeyValue { key, .. } => {
-        // The internal identifier does not need to be exposed
-        write!(f, "{}", key)
-      }
-      Self::Assign { key, value } => {
-        if let Some(_value) = value {
-          // TODO(SyrupThinker) As we cannot display expressions the value is just omitted
-          write!(f, "{}", key)
-        } else {
-          write!(f, "{}", key)
-        }
-      }
-      Self::Rest { arg } => write!(f, "...{}", arg),
-    }
-  }
-}
-
-pub fn ident_to_param_def(
-  ident: &swc_ecma_ast::Ident,
-  _source_map: Option<&SourceMap>,
-) -> ParamDef {
-  let ts_type = ident.type_ann.as_ref().map(|rt| ts_type_ann_to_def(rt));
-
-  ParamDef::Identifier {
-    name: ident.sym.to_string(),
-    optional: ident.optional,
-    ts_type,
-  }
-}
-
-fn rest_pat_to_param_def(
-  rest_pat: &swc_ecma_ast::RestPat,
-  source_map: Option<&SourceMap>,
-) -> ParamDef {
-  let ts_type = rest_pat.type_ann.as_ref().map(|rt| ts_type_ann_to_def(rt));
-
-  ParamDef::Rest {
-    arg: Box::new(pat_to_param_def(&*rest_pat.arg, source_map)),
-    ts_type,
-  }
-}
-
-fn object_pat_prop_to_def(
-  object_pat_prop: &ObjectPatProp,
-  source_map: Option<&SourceMap>,
-) -> ObjectPatPropDef {
-  match object_pat_prop {
-    ObjectPatProp::Assign(assign) => ObjectPatPropDef::Assign {
-      key: assign.key.sym.to_string(),
-      value: assign.value.as_ref().map(|_| "<UNIMPLEMENTED>".to_string()),
-    },
-    ObjectPatProp::KeyValue(keyvalue) => ObjectPatPropDef::KeyValue {
-      key: prop_name_to_string(&keyvalue.key, source_map),
-      value: Box::new(pat_to_param_def(&*keyvalue.value, source_map)),
-    },
-    ObjectPatProp::Rest(rest) => ObjectPatPropDef::Rest {
-      arg: Box::new(pat_to_param_def(&*rest.arg, source_map)),
-    },
-  }
-}
-
-fn object_pat_to_param_def(
-  object_pat: &swc_ecma_ast::ObjectPat,
-  source_map: Option<&SourceMap>,
-) -> ParamDef {
-  let props = object_pat
-    .props
-    .iter()
-    .map(|prop| object_pat_prop_to_def(prop, source_map))
-    .collect::<Vec<_>>();
-  let ts_type = object_pat
-    .type_ann
-    .as_ref()
-    .map(|rt| ts_type_ann_to_def(rt));
-
-  ParamDef::Object {
-    props,
-    optional: object_pat.optional,
-    ts_type,
-  }
-}
-
-fn array_pat_to_param_def(
-  array_pat: &swc_ecma_ast::ArrayPat,
-  source_map: Option<&SourceMap>,
-) -> ParamDef {
-  let elements = array_pat
-    .elems
-    .iter()
-    .map(|elem| elem.as_ref().map(|e| pat_to_param_def(e, source_map)))
-    .collect::<Vec<Option<_>>>();
-  let ts_type = array_pat.type_ann.as_ref().map(|rt| ts_type_ann_to_def(rt));
-
-  ParamDef::Array {
-    elements,
-    optional: array_pat.optional,
-    ts_type,
-  }
-}
-
-pub fn assign_pat_to_param_def(
-  assign_pat: &swc_ecma_ast::AssignPat,
-  source_map: Option<&SourceMap>,
-) -> ParamDef {
-  let ts_type = assign_pat
-    .type_ann
-    .as_ref()
-    .map(|rt| ts_type_ann_to_def(rt));
-
-  ParamDef::Assign {
-    left: Box::new(pat_to_param_def(&*assign_pat.left, source_map)),
-    right: "<UNIMPLEMENTED>".to_string(),
-    ts_type,
-  }
-}
-
-pub fn pat_to_param_def(
-  pat: &swc_ecma_ast::Pat,
-  source_map: Option<&SourceMap>,
-) -> ParamDef {
-  match pat {
-    Pat::Ident(ident) => ident_to_param_def(ident, source_map),
-    Pat::Array(array_pat) => array_pat_to_param_def(array_pat, source_map),
-    Pat::Rest(rest_pat) => rest_pat_to_param_def(rest_pat, source_map),
-    Pat::Object(object_pat) => object_pat_to_param_def(object_pat, source_map),
-    Pat::Assign(assign_pat) => assign_pat_to_param_def(assign_pat, source_map),
-    _ => unreachable!(),
-  }
-}
-
-pub fn ts_fn_param_to_param_def(
-  ts_fn_param: &swc_ecma_ast::TsFnParam,
-  source_map: Option<&SourceMap>,
-) -> ParamDef {
-  match ts_fn_param {
-    TsFnParam::Ident(ident) => ident_to_param_def(ident, source_map),
-    TsFnParam::Array(array_pat) => {
-      array_pat_to_param_def(array_pat, source_map)
-    }
-    TsFnParam::Rest(rest_pat) => rest_pat_to_param_def(rest_pat, source_map),
-    TsFnParam::Object(object_pat) => {
-      object_pat_to_param_def(object_pat, source_map)
-    }
-  }
-}
-
-pub fn prop_name_to_string(
-  prop_name: &swc_ecma_ast::PropName,
-  source_map: Option<&SourceMap>,
-) -> String {
-  use crate::swc_ecma_ast::PropName;
-  match prop_name {
-    PropName::Ident(ident) => ident.sym.to_string(),
-    PropName::Str(str_) => str_.value.to_string(),
-    PropName::Num(num) => num.value.to_string(),
-    PropName::Computed(comp_prop_name) => source_map
-      .map(|sm| sm.span_to_snippet(comp_prop_name.span).unwrap())
-      .unwrap_or_else(|| "<UNAVAILABLE>".to_string()),
-  }
-}
diff --git a/cli/doc/parser.rs b/cli/doc/parser.rs
deleted file mode 100644
index 59fa2b7342a763..00000000000000
--- a/cli/doc/parser.rs
+++ /dev/null
@@ -1,567 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::file_fetcher::map_file_extension;
-use crate::op_error::OpError;
-use crate::swc_common::comments::CommentKind;
-use crate::swc_common::Span;
-use crate::swc_ecma_ast;
-use crate::swc_ecma_ast::Decl;
-use crate::swc_ecma_ast::DefaultDecl;
-use crate::swc_ecma_ast::ModuleDecl;
-use crate::swc_ecma_ast::Stmt;
-use crate::swc_util::AstParser;
-use crate::swc_util::SwcDiagnosticBuffer;
-
-use deno_core::ErrBox;
-use deno_core::ModuleSpecifier;
-use futures::Future;
-use regex::Regex;
-use std::collections::HashMap;
-use std::path::PathBuf;
-use std::pin::Pin;
-
-use super::namespace::NamespaceDef;
-use super::node;
-use super::node::ModuleDoc;
-use super::DocNode;
-use super::DocNodeKind;
-use super::Location;
-
-pub trait DocFileLoader {
-  fn resolve(
-    &self,
-    specifier: &str,
-    referrer: &str,
-  ) -> Result<ModuleSpecifier, OpError> {
-    ModuleSpecifier::resolve_import(specifier, referrer).map_err(OpError::from)
-  }
-
-  fn load_source_code(
-    &self,
-    specifier: &str,
-  ) -> Pin<Box<dyn Future<Output = Result<String, OpError>>>>;
-}
-
-pub struct DocParser {
-  pub ast_parser: AstParser,
-  pub loader: Box<dyn DocFileLoader>,
-  pub private: bool,
-}
-
-impl DocParser {
-  pub fn new(loader: Box<dyn DocFileLoader>, private: bool) -> Self {
-    DocParser {
-      loader,
-      ast_parser: AstParser::new(),
-      private,
-    }
-  }
-
-  fn parse_module(
-    &self,
-    file_name: &str,
-    source_code: &str,
-  ) -> Result<ModuleDoc, SwcDiagnosticBuffer> {
-    let media_type = map_file_extension(&PathBuf::from(file_name));
-    self.ast_parser.parse_module(
-      file_name,
-      media_type,
-      source_code,
-      |parse_result| {
-        let module = parse_result?;
-        let doc_entries =
-          self.get_doc_nodes_for_module_body(module.body.clone());
-        let reexports = self.get_reexports_for_module_body(module.body);
-        let module_doc = ModuleDoc {
-          definitions: doc_entries,
-          reexports,
-        };
-        Ok(module_doc)
-      },
-    )
-  }
-
-  pub async fn parse(&self, file_name: &str) -> Result<Vec<DocNode>, ErrBox> {
-    let source_code = self.loader.load_source_code(file_name).await?;
-
-    self.parse_source(file_name, source_code.as_str())
-  }
-
-  pub fn parse_source(
-    &self,
-    file_name: &str,
-    source_code: &str,
-  ) -> Result<Vec<DocNode>, ErrBox> {
-    let module_doc = self.parse_module(file_name, &source_code)?;
-    Ok(module_doc.definitions)
-  }
-
-  async fn flatten_reexports(
-    &self,
-    reexports: &[node::Reexport],
-    referrer: &str,
-  ) -> Result<Vec<DocNode>, ErrBox> {
-    let mut by_src: HashMap<String, Vec<node::Reexport>> = HashMap::new();
-
-    let mut processed_reexports: Vec<DocNode> = vec![];
-
-    for reexport in reexports {
-      if by_src.get(&reexport.src).is_none() {
-        by_src.insert(reexport.src.to_string(), vec![]);
-      }
-
-      let bucket = by_src.get_mut(&reexport.src).unwrap();
-      bucket.push(reexport.clone());
-    }
-
-    for specifier in by_src.keys() {
-      let resolved_specifier = self.loader.resolve(specifier, referrer)?;
-      let doc_nodes = self.parse(&resolved_specifier.to_string()).await?;
-      let reexports_for_specifier = by_src.get(specifier).unwrap();
-
-      for reexport in reexports_for_specifier {
-        match &reexport.kind {
-          node::ReexportKind::All => {
-            processed_reexports.extend(doc_nodes.clone())
-          }
-          node::ReexportKind::Namespace(ns_name) => {
-            let ns_def = NamespaceDef {
-              elements: doc_nodes.clone(),
-            };
-            let ns_doc_node = DocNode {
-              kind: DocNodeKind::Namespace,
-              name: ns_name.to_string(),
-              location: Location {
-                filename: specifier.to_string(),
-                line: 1,
-                col: 0,
-              },
-              js_doc: None,
-              namespace_def: Some(ns_def),
-              enum_def: None,
-              type_alias_def: None,
-              interface_def: None,
-              variable_def: None,
-              function_def: None,
-              class_def: None,
-            };
-            processed_reexports.push(ns_doc_node);
-          }
-          node::ReexportKind::Named(ident, maybe_alias) => {
-            // Try to find reexport.
-            // NOTE: the reexport might actually be reexport from another
-            // module; for now we're skipping nested reexports.
-            let maybe_doc_node =
-              doc_nodes.iter().find(|node| &node.name == ident);
-
-            if let Some(doc_node) = maybe_doc_node {
-              let doc_node = doc_node.clone();
-              let doc_node = if let Some(alias) = maybe_alias {
-                DocNode {
-                  name: alias.to_string(),
-                  ..doc_node
-                }
-              } else {
-                doc_node
-              };
-
-              processed_reexports.push(doc_node);
-            }
-          }
-          node::ReexportKind::Default => {
-            // TODO: handle default export from child module
-          }
-        }
-      }
-    }
-
-    Ok(processed_reexports)
-  }
-
-  pub async fn parse_with_reexports(
-    &self,
-    file_name: &str,
-  ) -> Result<Vec<DocNode>, ErrBox> {
-    let source_code = self.loader.load_source_code(file_name).await?;
-
-    let module_doc = self.parse_module(file_name, &source_code)?;
-
-    let flattened_docs = if !module_doc.reexports.is_empty() {
-      let mut flattenned_reexports = self
-        .flatten_reexports(&module_doc.reexports, file_name)
-        .await?;
-      flattenned_reexports.extend(module_doc.definitions);
-      flattenned_reexports
-    } else {
-      module_doc.definitions
-    };
-
-    Ok(flattened_docs)
-  }
-
-  pub fn get_doc_nodes_for_module_exports(
-    &self,
-    module_decl: &ModuleDecl,
-  ) -> Vec<DocNode> {
-    match module_decl {
-      ModuleDecl::ExportDecl(export_decl) => {
-        vec![super::module::get_doc_node_for_export_decl(
-          self,
-          export_decl,
-        )]
-      }
-      ModuleDecl::ExportDefaultDecl(export_default_decl) => {
-        let (js_doc, location) =
-          self.details_for_span(export_default_decl.span);
-        let name = "default".to_string();
-
-        let doc_node = match &export_default_decl.decl {
-          DefaultDecl::Class(class_expr) => {
-            let class_def =
-              crate::doc::class::class_to_class_def(self, &class_expr.class);
-            DocNode {
-              kind: DocNodeKind::Class,
-              name,
-              location,
-              js_doc,
-              class_def: Some(class_def),
-              function_def: None,
-              variable_def: None,
-              enum_def: None,
-              type_alias_def: None,
-              namespace_def: None,
-              interface_def: None,
-            }
-          }
-          DefaultDecl::Fn(fn_expr) => {
-            let function_def = crate::doc::function::function_to_function_def(
-              self,
-              &fn_expr.function,
-            );
-            DocNode {
-              kind: DocNodeKind::Function,
-              name,
-              location,
-              js_doc,
-              class_def: None,
-              function_def: Some(function_def),
-              variable_def: None,
-              enum_def: None,
-              type_alias_def: None,
-              namespace_def: None,
-              interface_def: None,
-            }
-          }
-          DefaultDecl::TsInterfaceDecl(interface_decl) => {
-            let (_, interface_def) =
-              crate::doc::interface::get_doc_for_ts_interface_decl(
-                self,
-                interface_decl,
-              );
-            DocNode {
-              kind: DocNodeKind::Interface,
-              name,
-              location,
-              js_doc,
-              class_def: None,
-              function_def: None,
-              variable_def: None,
-              enum_def: None,
-              type_alias_def: None,
-              namespace_def: None,
-              interface_def: Some(interface_def),
-            }
-          }
-        };
-
-        vec![doc_node]
-      }
-      ModuleDecl::ExportDefaultExpr(_export_default_expr) => vec![],
-      _ => vec![],
-    }
-  }
-
-  pub fn get_doc_node_for_stmt(&self, stmt: &Stmt) -> Option<DocNode> {
-    match stmt {
-      Stmt::Decl(decl) => self.get_doc_node_for_decl(decl),
-      _ => None,
-    }
-  }
-
-  fn details_for_span(&self, span: Span) -> (Option<String>, Location) {
-    let js_doc = self.js_doc_for_span(span);
-    let location = self.ast_parser.get_span_location(span).into();
-    (js_doc, location)
-  }
-
-  pub fn get_doc_node_for_decl(&self, decl: &Decl) -> Option<DocNode> {
-    match decl {
-      Decl::Class(class_decl) => {
-        if !self.private && !class_decl.declare {
-          return None;
-        }
-        let (name, class_def) =
-          super::class::get_doc_for_class_decl(self, class_decl);
-        let (js_doc, location) = self.details_for_span(class_decl.class.span);
-        Some(DocNode {
-          kind: DocNodeKind::Class,
-          name,
-          location,
-          js_doc,
-          class_def: Some(class_def),
-          function_def: None,
-          variable_def: None,
-          enum_def: None,
-          type_alias_def: None,
-          namespace_def: None,
-          interface_def: None,
-        })
-      }
-      Decl::Fn(fn_decl) => {
-        if !self.private && !fn_decl.declare {
-          return None;
-        }
-        let (name, function_def) =
-          super::function::get_doc_for_fn_decl(self, fn_decl);
-        let (js_doc, location) = self.details_for_span(fn_decl.function.span);
-        Some(DocNode {
-          kind: DocNodeKind::Function,
-          name,
-          location,
-          js_doc,
-          function_def: Some(function_def),
-          class_def: None,
-          variable_def: None,
-          enum_def: None,
-          type_alias_def: None,
-          namespace_def: None,
-          interface_def: None,
-        })
-      }
-      Decl::Var(var_decl) => {
-        if !self.private && !var_decl.declare {
-          return None;
-        }
-        let (name, var_def) = super::variable::get_doc_for_var_decl(var_decl);
-        let (js_doc, location) = self.details_for_span(var_decl.span);
-        Some(DocNode {
-          kind: DocNodeKind::Variable,
-          name,
-          location,
-          js_doc,
-          variable_def: Some(var_def),
-          function_def: None,
-          class_def: None,
-          enum_def: None,
-          type_alias_def: None,
-          namespace_def: None,
-          interface_def: None,
-        })
-      }
-      Decl::TsInterface(ts_interface_decl) => {
-        if !self.private && !ts_interface_decl.declare {
-          return None;
-        }
-        let (name, interface_def) =
-          super::interface::get_doc_for_ts_interface_decl(
-            self,
-            ts_interface_decl,
-          );
-        let (js_doc, location) = self.details_for_span(ts_interface_decl.span);
-        Some(DocNode {
-          kind: DocNodeKind::Interface,
-          name,
-          location,
-          js_doc,
-          interface_def: Some(interface_def),
-          variable_def: None,
-          function_def: None,
-          class_def: None,
-          enum_def: None,
-          type_alias_def: None,
-          namespace_def: None,
-        })
-      }
-      Decl::TsTypeAlias(ts_type_alias) => {
-        if !self.private && !ts_type_alias.declare {
-          return None;
-        }
-        let (name, type_alias_def) =
-          super::type_alias::get_doc_for_ts_type_alias_decl(
-            self,
-            ts_type_alias,
-          );
-        let (js_doc, location) = self.details_for_span(ts_type_alias.span);
-        Some(DocNode {
-          kind: DocNodeKind::TypeAlias,
-          name,
-          location,
-          js_doc,
-          type_alias_def: Some(type_alias_def),
-          interface_def: None,
-          variable_def: None,
-          function_def: None,
-          class_def: None,
-          enum_def: None,
-          namespace_def: None,
-        })
-      }
-      Decl::TsEnum(ts_enum) => {
-        if !self.private && !ts_enum.declare {
-          return None;
-        }
-        let (name, enum_def) =
-          super::r#enum::get_doc_for_ts_enum_decl(self, ts_enum);
-        let (js_doc, location) = self.details_for_span(ts_enum.span);
-        Some(DocNode {
-          kind: DocNodeKind::Enum,
-          name,
-          location,
-          js_doc,
-          enum_def: Some(enum_def),
-          type_alias_def: None,
-          interface_def: None,
-          variable_def: None,
-          function_def: None,
-          class_def: None,
-          namespace_def: None,
-        })
-      }
-      Decl::TsModule(ts_module) => {
-        if !self.private && !ts_module.declare {
-          return None;
-        }
-        let (name, namespace_def) =
-          super::namespace::get_doc_for_ts_module(self, ts_module);
-        let (js_doc, location) = self.details_for_span(ts_module.span);
-        Some(DocNode {
-          kind: DocNodeKind::Namespace,
-          name,
-          location,
-          js_doc,
-          namespace_def: Some(namespace_def),
-          enum_def: None,
-          type_alias_def: None,
-          interface_def: None,
-          variable_def: None,
-          function_def: None,
-          class_def: None,
-        })
-      }
-    }
-  }
-
-  pub fn get_reexports_for_module_body(
-    &self,
-    module_body: Vec<swc_ecma_ast::ModuleItem>,
-  ) -> Vec<node::Reexport> {
-    use swc_ecma_ast::ExportSpecifier::*;
-
-    let mut reexports: Vec<node::Reexport> = vec![];
-
-    for node in module_body.iter() {
-      if let swc_ecma_ast::ModuleItem::ModuleDecl(module_decl) = node {
-        let r = match module_decl {
-          ModuleDecl::ExportNamed(named_export) => {
-            if let Some(src) = &named_export.src {
-              let src_str = src.value.to_string();
-              named_export
-                .specifiers
-                .iter()
-                .map(|export_specifier| match export_specifier {
-                  Namespace(ns_export) => node::Reexport {
-                    kind: node::ReexportKind::Namespace(
-                      ns_export.name.sym.to_string(),
-                    ),
-                    src: src_str.to_string(),
-                  },
-                  Default(_) => node::Reexport {
-                    kind: node::ReexportKind::Default,
-                    src: src_str.to_string(),
-                  },
-                  Named(named_export) => {
-                    let ident = named_export.orig.sym.to_string();
-                    let maybe_alias =
-                      named_export.exported.as_ref().map(|e| e.sym.to_string());
-                    let kind = node::ReexportKind::Named(ident, maybe_alias);
-                    node::Reexport {
-                      kind,
-                      src: src_str.to_string(),
-                    }
-                  }
-                })
-                .collect::<Vec<node::Reexport>>()
-            } else {
-              vec![]
-            }
-          }
-          ModuleDecl::ExportAll(export_all) => {
-            let reexport = node::Reexport {
-              kind: node::ReexportKind::All,
-              src: export_all.src.value.to_string(),
-            };
-            vec![reexport]
-          }
-          _ => vec![],
-        };
-
-        reexports.extend(r);
-      }
-    }
-
-    reexports
-  }
-
-  pub fn get_doc_nodes_for_module_body(
-    &self,
-    module_body: Vec<swc_ecma_ast::ModuleItem>,
-  ) -> Vec<DocNode> {
-    let mut doc_entries: Vec<DocNode> = vec![];
-    for node in module_body.iter() {
-      match node {
-        swc_ecma_ast::ModuleItem::ModuleDecl(module_decl) => {
-          doc_entries
-            .extend(self.get_doc_nodes_for_module_exports(module_decl));
-        }
-        swc_ecma_ast::ModuleItem::Stmt(stmt) => {
-          if let Some(doc_node) = self.get_doc_node_for_stmt(stmt) {
-            doc_entries.push(doc_node);
-          }
-        }
-      }
-    }
-    doc_entries
-  }
-
-  pub fn js_doc_for_span(&self, span: Span) -> Option<String> {
-    let comments = self.ast_parser.get_span_comments(span);
-    let js_doc_comment = comments.iter().rev().find(|comment| {
-      comment.kind == CommentKind::Block && comment.text.starts_with('*')
-    })?;
-
-    let mut margin_pat = String::from("");
-    if let Some(margin) = self.ast_parser.source_map.span_to_margin(span) {
-      for _ in 0..margin {
-        margin_pat.push(' ');
-      }
-    }
-
-    let js_doc_re = Regex::new(r#" ?\* ?"#).unwrap();
-    let txt = js_doc_comment
-      .text
-      .split('\n')
-      .map(|line| js_doc_re.replace(line, "").to_string())
-      .map(|line| {
-        if line.starts_with(&margin_pat) {
-          line[margin_pat.len()..].to_string()
-        } else {
-          line
-        }
-      })
-      .collect::<Vec<String>>()
-      .join("\n");
-
-    let txt = txt.trim_start().trim_end().to_string();
-
-    Some(txt)
-  }
-}
diff --git a/cli/doc/printer.rs b/cli/doc/printer.rs
deleted file mode 100644
index 2e55c752a6950f..00000000000000
--- a/cli/doc/printer.rs
+++ /dev/null
@@ -1,474 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// TODO(ry) This module builds up output by appending to a string. Instead it
-// should either use a formatting trait
-// https://doc.rust-lang.org/std/fmt/index.html#formatting-traits
-// Or perhaps implement a Serializer for serde
-// https://docs.serde.rs/serde/ser/trait.Serializer.html
-
-// TODO(ry) The methods in this module take ownership of the DocNodes, this is
-// unnecessary and can result in unnecessary copying. Instead they should take
-// references.
-
-use crate::colors;
-use crate::doc;
-use crate::doc::display::{
-  display_abstract, display_async, display_generator, Indent, SliceDisplayer,
-};
-use crate::doc::DocNodeKind;
-use crate::swc_ecma_ast;
-use std::fmt::{Display, Formatter, Result as FmtResult};
-
-pub struct DocPrinter<'a> {
-  doc_nodes: &'a [doc::DocNode],
-  details: bool,
-  private: bool,
-}
-
-impl<'a> DocPrinter<'a> {
-  pub fn new(
-    doc_nodes: &[doc::DocNode],
-    details: bool,
-    private: bool,
-  ) -> DocPrinter {
-    DocPrinter {
-      doc_nodes,
-      details,
-      private,
-    }
-  }
-
-  pub fn format(&self, w: &mut Formatter<'_>) -> FmtResult {
-    if self.details {
-      self.format_details(w, self.doc_nodes, 0)
-    } else {
-      self.format_summary(w, self.doc_nodes, 0)
-    }
-  }
-
-  fn format_summary(
-    &self,
-    w: &mut Formatter<'_>,
-    doc_nodes: &[doc::DocNode],
-    indent: i64,
-  ) -> FmtResult {
-    let mut sorted = Vec::from(doc_nodes);
-    sorted.sort_unstable_by(|a, b| {
-      let kind_cmp = self.kind_order(&a.kind).cmp(&self.kind_order(&b.kind));
-      if kind_cmp == core::cmp::Ordering::Equal {
-        a.name.cmp(&b.name)
-      } else {
-        kind_cmp
-      }
-    });
-
-    for node in sorted {
-      self.format_signature(w, &node, indent)?;
-
-      if let Some(js_doc) = &node.js_doc {
-        self.format_jsdoc(w, js_doc, indent + 1, self.details)?;
-      }
-
-      writeln!(w)?;
-
-      if DocNodeKind::Namespace == node.kind {
-        self.format_summary(
-          w,
-          &node.namespace_def.as_ref().unwrap().elements,
-          indent + 1,
-        )?;
-
-        writeln!(w)?;
-      };
-    }
-
-    Ok(())
-  }
-
-  fn format_details(
-    &self,
-    w: &mut Formatter<'_>,
-    doc_nodes: &[doc::DocNode],
-    indent: i64,
-  ) -> FmtResult {
-    for node in doc_nodes {
-      write!(
-        w,
-        "{}",
-        colors::italic_gray(&format!(
-          "Defined in {}:{}:{} \n\n",
-          node.location.filename, node.location.line, node.location.col
-        ))
-      )?;
-
-      self.format_signature(w, &node, indent)?;
-
-      let js_doc = &node.js_doc;
-      if let Some(js_doc) = js_doc {
-        self.format_jsdoc(w, js_doc, indent + 1, self.details)?;
-      }
-      writeln!(w)?;
-
-      match node.kind {
-        DocNodeKind::Class => self.format_class_details(w, node)?,
-        DocNodeKind::Enum => self.format_enum_details(w, node)?,
-        DocNodeKind::Interface => self.format_interface_details(w, node)?,
-        DocNodeKind::Namespace => self.format_namespace_details(w, node)?,
-        _ => {}
-      }
-    }
-
-    Ok(())
-  }
-
-  fn kind_order(&self, kind: &doc::DocNodeKind) -> i64 {
-    match kind {
-      DocNodeKind::Function => 0,
-      DocNodeKind::Variable => 1,
-      DocNodeKind::Class => 2,
-      DocNodeKind::Enum => 3,
-      DocNodeKind::Interface => 4,
-      DocNodeKind::TypeAlias => 5,
-      DocNodeKind::Namespace => 6,
-    }
-  }
-
-  fn format_signature(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-    indent: i64,
-  ) -> FmtResult {
-    match node.kind {
-      DocNodeKind::Function => self.format_function_signature(w, node, indent),
-      DocNodeKind::Variable => self.format_variable_signature(w, node, indent),
-      DocNodeKind::Class => self.format_class_signature(w, node, indent),
-      DocNodeKind::Enum => self.format_enum_signature(w, node, indent),
-      DocNodeKind::Interface => {
-        self.format_interface_signature(w, node, indent)
-      }
-      DocNodeKind::TypeAlias => {
-        self.format_type_alias_signature(w, node, indent)
-      }
-      DocNodeKind::Namespace => {
-        self.format_namespace_signature(w, node, indent)
-      }
-    }
-  }
-
-  // TODO(SyrupThinker) this should use a JSDoc parser
-  fn format_jsdoc(
-    &self,
-    w: &mut Formatter<'_>,
-    jsdoc: &str,
-    indent: i64,
-    details: bool,
-  ) -> FmtResult {
-    for line in jsdoc.lines() {
-      // Only show the first paragraph when summarising
-      // This should use the @summary JSDoc tag instead
-      if !details && line.is_empty() {
-        break;
-      }
-
-      writeln!(w, "{}{}", Indent(indent), colors::gray(&line))?;
-    }
-
-    Ok(())
-  }
-
-  fn format_class_details(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-  ) -> FmtResult {
-    let class_def = node.class_def.as_ref().unwrap();
-    for node in &class_def.constructors {
-      writeln!(w, "{}{}", Indent(1), node,)?;
-      if let Some(js_doc) = &node.js_doc {
-        self.format_jsdoc(w, &js_doc, 2, self.details)?;
-      }
-    }
-    for node in class_def.properties.iter().filter(|node| {
-      self.private
-        || node
-          .accessibility
-          .unwrap_or(swc_ecma_ast::Accessibility::Public)
-          != swc_ecma_ast::Accessibility::Private
-    }) {
-      writeln!(w, "{}{}", Indent(1), node,)?;
-      if let Some(js_doc) = &node.js_doc {
-        self.format_jsdoc(w, &js_doc, 2, self.details)?;
-      }
-    }
-    for index_sign_def in &class_def.index_signatures {
-      writeln!(w, "{}{}", Indent(1), index_sign_def)?;
-    }
-    for node in class_def.methods.iter().filter(|node| {
-      self.private
-        || node
-          .accessibility
-          .unwrap_or(swc_ecma_ast::Accessibility::Public)
-          != swc_ecma_ast::Accessibility::Private
-    }) {
-      writeln!(w, "{}{}", Indent(1), node,)?;
-      if let Some(js_doc) = &node.js_doc {
-        self.format_jsdoc(w, js_doc, 2, self.details)?;
-      }
-    }
-    writeln!(w)
-  }
-
-  fn format_enum_details(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-  ) -> FmtResult {
-    let enum_def = node.enum_def.as_ref().unwrap();
-    for member in &enum_def.members {
-      writeln!(w, "{}{}", Indent(1), colors::bold(&member.name))?;
-    }
-    writeln!(w)
-  }
-
-  fn format_interface_details(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-  ) -> FmtResult {
-    let interface_def = node.interface_def.as_ref().unwrap();
-
-    for property_def in &interface_def.properties {
-      writeln!(w, "{}{}", Indent(1), property_def)?;
-      if let Some(js_doc) = &property_def.js_doc {
-        self.format_jsdoc(w, js_doc, 2, self.details)?;
-      }
-    }
-    for method_def in &interface_def.methods {
-      writeln!(w, "{}{}", Indent(1), method_def)?;
-      if let Some(js_doc) = &method_def.js_doc {
-        self.format_jsdoc(w, js_doc, 2, self.details)?;
-      }
-    }
-    for index_sign_def in &interface_def.index_signatures {
-      writeln!(w, "{}{}", Indent(1), index_sign_def)?;
-    }
-    writeln!(w)
-  }
-
-  fn format_namespace_details(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-  ) -> FmtResult {
-    let elements = &node.namespace_def.as_ref().unwrap().elements;
-    for node in elements {
-      self.format_signature(w, &node, 1)?;
-      if let Some(js_doc) = &node.js_doc {
-        self.format_jsdoc(w, js_doc, 2, false)?;
-      }
-    }
-    writeln!(w)
-  }
-
-  fn format_class_signature(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-    indent: i64,
-  ) -> FmtResult {
-    let class_def = node.class_def.as_ref().unwrap();
-    write!(
-      w,
-      "{}{}{} {}",
-      Indent(indent),
-      display_abstract(class_def.is_abstract),
-      colors::magenta("class"),
-      colors::bold(&node.name),
-    )?;
-    if !class_def.type_params.is_empty() {
-      write!(
-        w,
-        "<{}>",
-        SliceDisplayer::new(&class_def.type_params, ", ", false)
-      )?;
-    }
-
-    if let Some(extends) = &class_def.extends {
-      write!(w, " {} {}", colors::magenta("extends"), extends)?;
-    }
-    if !class_def.super_type_params.is_empty() {
-      write!(
-        w,
-        "<{}>",
-        SliceDisplayer::new(&class_def.super_type_params, ", ", false)
-      )?;
-    }
-
-    if !class_def.implements.is_empty() {
-      write!(
-        w,
-        " {} {}",
-        colors::magenta("implements"),
-        SliceDisplayer::new(&class_def.implements, ", ", false)
-      )?;
-    }
-
-    writeln!(w)
-  }
-
-  fn format_enum_signature(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-    indent: i64,
-  ) -> FmtResult {
-    writeln!(
-      w,
-      "{}{} {}",
-      Indent(indent),
-      colors::magenta("enum"),
-      colors::bold(&node.name)
-    )
-  }
-
-  fn format_function_signature(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-    indent: i64,
-  ) -> FmtResult {
-    let function_def = node.function_def.as_ref().unwrap();
-    write!(
-      w,
-      "{}{}{}{} {}",
-      Indent(indent),
-      display_async(function_def.is_async),
-      colors::magenta("function"),
-      display_generator(function_def.is_generator),
-      colors::bold(&node.name)
-    )?;
-    if !function_def.type_params.is_empty() {
-      write!(
-        w,
-        "<{}>",
-        SliceDisplayer::new(&function_def.type_params, ", ", false)
-      )?;
-    }
-    write!(
-      w,
-      "({})",
-      SliceDisplayer::new(&function_def.params, ", ", false)
-    )?;
-    if let Some(return_type) = &function_def.return_type {
-      write!(w, ": {}", return_type)?;
-    }
-    writeln!(w)
-  }
-
-  fn format_interface_signature(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-    indent: i64,
-  ) -> FmtResult {
-    let interface_def = node.interface_def.as_ref().unwrap();
-    write!(
-      w,
-      "{}{} {}",
-      Indent(indent),
-      colors::magenta("interface"),
-      colors::bold(&node.name)
-    )?;
-
-    if !interface_def.type_params.is_empty() {
-      write!(
-        w,
-        "<{}>",
-        SliceDisplayer::new(&interface_def.type_params, ", ", false)
-      )?;
-    }
-
-    if !interface_def.extends.is_empty() {
-      write!(
-        w,
-        " {} {}",
-        colors::magenta("extends"),
-        SliceDisplayer::new(&interface_def.extends, ", ", false)
-      )?;
-    }
-
-    writeln!(w)
-  }
-
-  fn format_type_alias_signature(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-    indent: i64,
-  ) -> FmtResult {
-    let type_alias_def = node.type_alias_def.as_ref().unwrap();
-    write!(
-      w,
-      "{}{} {}",
-      Indent(indent),
-      colors::magenta("type"),
-      colors::bold(&node.name),
-    )?;
-
-    if !type_alias_def.type_params.is_empty() {
-      write!(
-        w,
-        "<{}>",
-        SliceDisplayer::new(&type_alias_def.type_params, ", ", false)
-      )?;
-    }
-
-    writeln!(w, " = {}", type_alias_def.ts_type)
-  }
-
-  fn format_namespace_signature(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-    indent: i64,
-  ) -> FmtResult {
-    writeln!(
-      w,
-      "{}{} {}",
-      Indent(indent),
-      colors::magenta("namespace"),
-      colors::bold(&node.name)
-    )
-  }
-
-  fn format_variable_signature(
-    &self,
-    w: &mut Formatter<'_>,
-    node: &doc::DocNode,
-    indent: i64,
-  ) -> FmtResult {
-    let variable_def = node.variable_def.as_ref().unwrap();
-    write!(
-      w,
-      "{}{} {}",
-      Indent(indent),
-      colors::magenta(match variable_def.kind {
-        swc_ecma_ast::VarDeclKind::Const => "const",
-        swc_ecma_ast::VarDeclKind::Let => "let",
-        swc_ecma_ast::VarDeclKind::Var => "var",
-      }),
-      colors::bold(&node.name),
-    )?;
-    if let Some(ts_type) = &variable_def.ts_type {
-      write!(w, ": {}", ts_type)?;
-    }
-    writeln!(w)
-  }
-}
-
-impl<'a> Display for DocPrinter<'a> {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    self.format(f)
-  }
-}
diff --git a/cli/doc/tests.rs b/cli/doc/tests.rs
deleted file mode 100644
index e46fff62105571..00000000000000
--- a/cli/doc/tests.rs
+++ /dev/null
@@ -1,2073 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use super::DocParser;
-use super::DocPrinter;
-use crate::colors;
-use serde_json::json;
-
-use super::parser::DocFileLoader;
-use crate::op_error::OpError;
-use std::collections::HashMap;
-
-use futures::Future;
-use futures::FutureExt;
-use std::pin::Pin;
-
-pub struct TestLoader {
-  files: HashMap<String, String>,
-}
-
-impl TestLoader {
-  pub fn new(files_vec: Vec<(String, String)>) -> Box<Self> {
-    let mut files = HashMap::new();
-
-    for file_tuple in files_vec {
-      files.insert(file_tuple.0, file_tuple.1);
-    }
-
-    Box::new(Self { files })
-  }
-}
-
-impl DocFileLoader for TestLoader {
-  fn load_source_code(
-    &self,
-    specifier: &str,
-  ) -> Pin<Box<dyn Future<Output = Result<String, OpError>>>> {
-    let res = match self.files.get(specifier) {
-      Some(source_code) => Ok(source_code.to_string()),
-      None => Err(OpError::other("not found".to_string())),
-    };
-
-    async move { res }.boxed_local()
-  }
-}
-
-macro_rules! doc_test {
-  ( $name:ident, $source:expr; $block:block ) => {
-    doc_test!($name, $source, false, false; $block);
-  };
-
-  ( $name:ident, $source:expr, details; $block:block ) => {
-    doc_test!($name, $source, true, false; $block);
-  };
-
-  ( $name:ident, $source:expr, private; $block:block ) => {
-    doc_test!($name, $source, false, true; $block);
-  };
-
-  ( $name:ident, $source:expr, details, private; $block:block ) => {
-    doc_test!($name, $source, true, true; $block);
-  };
-
-  ( $name:ident, $source:expr, $details:expr, $private:expr; $block:block ) => {
-    #[tokio::test]
-    async fn $name() {
-      let source_code = $source;
-      let details = $details;
-      let private = $private;
-
-      let loader =
-        TestLoader::new(vec![("test.ts".to_string(), source_code.to_string())]);
-      let entries = DocParser::new(loader, private)
-        .parse("test.ts")
-        .await
-        .unwrap();
-
-      let doc = DocPrinter::new(&entries, details, private).to_string();
-      #[allow(unused_variables)]
-      let doc = colors::strip_ansi_codes(&doc);
-
-      $block
-    }
-  };
-}
-
-macro_rules! contains_test {
-  ( $name:ident, $source:expr;
-    $( $contains:expr ),* $( ; $( $notcontains:expr ),* )? ) => {
-    contains_test!($name, $source, false, false; $($contains),* $(;$($notcontains),*)?);
-  };
-
-  ( $name:ident, $source:expr, details;
-    $( $contains:expr ),* $( ; $( $notcontains:expr ),* )? ) => {
-    contains_test!($name, $source, true, false; $($contains),* $(;$($notcontains),*)?);
-  };
-
-  ( $name:ident, $source:expr, private;
-    $( $contains:expr ),* $( ; $( $notcontains:expr ),* )? ) => {
-    contains_test!($name, $source, false, true; $($contains),* $(;$($notcontains),*)?);
-  };
-
-  ( $name:ident, $source:expr, details, private;
-    $( $contains:expr ),* $( ; $( $notcontains:expr ),* )? ) => {
-    contains_test!($name, $source, true, true; $($contains),* $(;$($notcontains),*)?);
-  };
-
-  ( $name:ident, $source:expr, $details:expr, $private:expr;
-    $( $contains:expr ),* $( ; $( $notcontains:expr ),* )? ) => {
-    doc_test!($name, $source, $details, $private; {
-      $(
-        assert!(doc.contains($contains));
-      )*
-      $(
-        $(
-          assert!(!doc.contains($notcontains));
-        )*
-      )?
-    });
-  };
-}
-
-macro_rules! json_test {
-  ( $name:ident, $source:expr; $json:tt ) => {
-    json_test!($name, $source, false; $json);
-  };
-
-  ( $name:ident, $source:expr, private; $json:tt ) => {
-    json_test!($name, $source, true; $json);
-  };
-
-  ( $name:ident, $source:expr, $private:expr; $json:tt ) => {
-    doc_test!($name, $source, false, $private; {
-      let actual = serde_json::to_value(&entries).unwrap();
-      let expected_json = json!($json);
-      assert_eq!(actual, expected_json);
-    });
-  };
-}
-
-#[tokio::test]
-async fn reexports() {
-  let nested_reexport_source_code = r#"
-/**
-  * JSDoc for bar
-  */
-export const bar = "bar";
-
-export default 42;
-"#;
-  let reexport_source_code = r#"
-import { bar } from "./nested_reexport.ts";
-
-/**
- * JSDoc for const
- */
-export const foo = "foo";
-"#;
-  let test_source_code = r#"
-export { default, foo as fooConst } from "./reexport.ts";
-
-/** JSDoc for function */
-export function fooFn(a: number) {
-  return a;
-}
-"#;
-  let loader = TestLoader::new(vec![
-    ("file:///test.ts".to_string(), test_source_code.to_string()),
-    (
-      "file:///reexport.ts".to_string(),
-      reexport_source_code.to_string(),
-    ),
-    (
-      "file:///nested_reexport.ts".to_string(),
-      nested_reexport_source_code.to_string(),
-    ),
-  ]);
-  let entries = DocParser::new(loader, false)
-    .parse_with_reexports("file:///test.ts")
-    .await
-    .unwrap();
-  assert_eq!(entries.len(), 2);
-
-  let expected_json = json!([
-    {
-      "kind": "variable",
-      "name": "fooConst",
-      "location": {
-        "filename": "file:///reexport.ts",
-        "line": 7,
-        "col": 0
-      },
-      "jsDoc": "JSDoc for const",
-      "variableDef": {
-        "tsType": null,
-        "kind": "const"
-      }
-    },
-    {
-      "kind": "function",
-      "name": "fooFn",
-      "location": {
-        "filename": "file:///test.ts",
-        "line": 5,
-        "col": 0
-      },
-      "jsDoc": "JSDoc for function",
-      "functionDef": {
-        "params": [
-            {
-              "name": "a",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": {
-                "keyword": "number",
-                "kind": "keyword",
-                "repr": "number",
-              },
-            }
-        ],
-        "typeParams": [],
-        "returnType": null,
-        "isAsync": false,
-        "isGenerator": false
-      }
-    }
-  ]);
-  let actual = serde_json::to_value(&entries).unwrap();
-  assert_eq!(actual, expected_json);
-
-  assert!(colors::strip_ansi_codes(
-    DocPrinter::new(&entries, false, false).to_string().as_str()
-  )
-  .contains("function fooFn(a: number)"));
-}
-
-#[tokio::test]
-async fn filter_nodes_by_name() {
-  use super::find_nodes_by_name_recursively;
-  let source_code = r#"
-export namespace Deno {
-  export class Buffer {}
-  export function test(options: object): void;
-  export function test(name: string, fn: Function): void;
-  export function test(name: string | object, fn?: Function): void {}
-}
-
-export namespace Deno {
-  export namespace Inner {
-    export function a(): void {}
-    export const b = 100;
-  }
-}
-"#;
-  let loader =
-    TestLoader::new(vec![("test.ts".to_string(), source_code.to_string())]);
-  let entries = DocParser::new(loader, false)
-    .parse("test.ts")
-    .await
-    .unwrap();
-
-  let found =
-    find_nodes_by_name_recursively(entries.clone(), "Deno".to_string());
-  assert_eq!(found.len(), 2);
-  assert_eq!(found[0].name, "Deno".to_string());
-  assert_eq!(found[1].name, "Deno".to_string());
-
-  let found =
-    find_nodes_by_name_recursively(entries.clone(), "Deno.test".to_string());
-  assert_eq!(found.len(), 3);
-  assert_eq!(found[0].name, "test".to_string());
-  assert_eq!(found[1].name, "test".to_string());
-  assert_eq!(found[2].name, "test".to_string());
-
-  let found =
-    find_nodes_by_name_recursively(entries.clone(), "Deno.Inner.a".to_string());
-  assert_eq!(found.len(), 1);
-  assert_eq!(found[0].name, "a".to_string());
-
-  let found =
-    find_nodes_by_name_recursively(entries.clone(), "Deno.test.a".to_string());
-  assert_eq!(found.len(), 0);
-
-  let found = find_nodes_by_name_recursively(entries, "a.b.c".to_string());
-  assert_eq!(found.len(), 0);
-}
-
-mod serialization {
-  use super::*;
-
-  json_test!(declare_namespace,
-    r#"
-/** Namespace JSdoc */
-declare namespace RootNs {
-    declare const a = "a";
-
-    /** Nested namespace JSDoc */
-    declare namespace NestedNs {
-      declare enum Foo {
-        a = 1,
-        b = 2,
-        c = 3,
-      }
-    }
-}
-    "#;
-    [{
-    "kind": "namespace",
-    "name": "RootNs",
-    "location": {
-      "filename": "test.ts",
-      "line": 3,
-      "col": 0
-    },
-    "jsDoc": "Namespace JSdoc",
-    "namespaceDef": {
-      "elements": [
-        {
-          "kind": "variable",
-          "name": "a",
-          "location": {
-            "filename": "test.ts",
-            "line": 4,
-            "col": 12
-          },
-          "jsDoc": null,
-          "variableDef": {
-            "tsType": null,
-            "kind": "const"
-          }
-        },
-        {
-          "kind": "namespace",
-          "name": "NestedNs",
-          "location": {
-            "filename": "test.ts",
-            "line": 7,
-            "col": 4
-          },
-          "jsDoc": "Nested namespace JSDoc",
-          "namespaceDef": {
-            "elements": [
-              {
-                "kind": "enum",
-                "name": "Foo",
-                "location": {
-                  "filename": "test.ts",
-                  "line": 8,
-                  "col": 6
-                },
-                "jsDoc": null,
-                "enumDef": {
-                  "members": [
-                    {
-                      "name": "a"
-                    },
-                    {
-                      "name": "b"
-                    },
-                    {
-                      "name": "c"
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        }
-      ]
-    }
-  }]);
-
-  json_test!(export_class,
-   r#"
-/** Class doc */
-export class Foobar extends Fizz implements Buzz, Aldrin {
-    private private1?: boolean;
-    protected protected1: number;
-    public public1: boolean;
-    public2: number;
-
-    /** Constructor js doc */
-    constructor(name: string, private private2: number, protected protected2: number) {}
-
-    /** Async foo method */
-    async foo(): Promise<void> {
-        //
-    }
-
-    /** Sync bar method */
-    bar?(): void {
-        //
-    }
-}
-  "#;
-  [{
-    "kind": "class",
-    "name": "Foobar",
-    "location": {
-      "filename": "test.ts",
-      "line": 3,
-      "col": 0
-    },
-    "jsDoc": "Class doc",
-    "classDef": {
-      "isAbstract": false,
-      "extends": "Fizz",
-      "implements": [
-        {
-          "repr": "Buzz",
-          "kind": "typeRef",
-          "typeRef": {
-            "typeParams": null,
-            "typeName": "Buzz"
-          }
-        },
-        {
-          "repr": "Aldrin",
-          "kind": "typeRef",
-          "typeRef": {
-            "typeParams": null,
-            "typeName": "Aldrin"
-          }
-        }
-      ],
-      "typeParams": [],
-      "superTypeParams": [],
-      "constructors": [
-        {
-          "jsDoc": "Constructor js doc",
-          "accessibility": null,
-          "name": "constructor",
-          "params": [
-            {
-              "name": "name",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": {
-                "repr": "string",
-                "kind": "keyword",
-                "keyword": "string"
-              }
-            },
-            {
-              "name": "private2",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": {
-                "repr": "number",
-                "kind": "keyword",
-                "keyword": "number"
-              }
-            },
-            {
-              "name": "protected2",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": {
-                "repr": "number",
-                "kind": "keyword",
-                "keyword": "number"
-              }
-            }
-          ],
-          "location": {
-            "filename": "test.ts",
-            "line": 10,
-            "col": 4
-          }
-        }
-      ],
-      "properties": [
-        {
-          "jsDoc": null,
-          "tsType": {
-              "repr": "boolean",
-              "kind": "keyword",
-              "keyword": "boolean"
-          },
-          "readonly": false,
-          "accessibility": "private",
-          "optional": true,
-          "isAbstract": false,
-          "isStatic": false,
-          "name": "private1",
-          "location": {
-            "filename": "test.ts",
-            "line": 4,
-            "col": 4
-          }
-        },
-        {
-          "jsDoc": null,
-          "tsType": {
-            "repr": "number",
-            "kind": "keyword",
-            "keyword": "number"
-          },
-          "readonly": false,
-          "accessibility": "protected",
-          "optional": false,
-          "isAbstract": false,
-          "isStatic": false,
-          "name": "protected1",
-          "location": {
-            "filename": "test.ts",
-            "line": 5,
-            "col": 4
-          }
-        },
-        {
-          "jsDoc": null,
-          "tsType": {
-            "repr": "boolean",
-            "kind": "keyword",
-            "keyword": "boolean"
-          },
-          "readonly": false,
-          "accessibility": "public",
-          "optional": false,
-          "isAbstract": false,
-          "isStatic": false,
-          "name": "public1",
-          "location": {
-            "filename": "test.ts",
-            "line": 6,
-            "col": 4
-          }
-        },
-        {
-          "jsDoc": null,
-          "tsType": {
-            "repr": "number",
-            "kind": "keyword",
-            "keyword": "number"
-          },
-          "readonly": false,
-          "accessibility": null,
-          "optional": false,
-          "isAbstract": false,
-          "isStatic": false,
-          "name": "public2",
-          "location": {
-            "filename": "test.ts",
-            "line": 7,
-            "col": 4
-          }
-        }
-      ],
-      "indexSignatures": [],
-      "methods": [
-        {
-          "jsDoc": "Async foo method",
-          "accessibility": null,
-          "optional": false,
-          "isAbstract": false,
-          "isStatic": false,
-          "name": "foo",
-          "kind": "method",
-          "functionDef": {
-            "params": [],
-            "returnType": {
-                "repr": "Promise",
-                "kind": "typeRef",
-                "typeRef": {
-                  "typeParams": [
-                    {
-                      "repr": "void",
-                      "kind": "keyword",
-                      "keyword": "void"
-                    }
-                  ],
-                  "typeName": "Promise"
-                }
-            },
-            "typeParams": [],
-            "isAsync": true,
-            "isGenerator": false
-          },
-          "location": {
-            "filename": "test.ts",
-            "line": 13,
-            "col": 4
-          }
-        },
-        {
-          "jsDoc": "Sync bar method",
-          "accessibility": null,
-          "optional": true,
-          "isAbstract": false,
-          "isStatic": false,
-          "name": "bar",
-          "kind": "method",
-          "functionDef": {
-            "params": [],
-            "returnType": {
-              "repr": "void",
-              "kind": "keyword",
-              "keyword": "void"
-            },
-            "isAsync": false,
-            "isGenerator": false,
-            "typeParams": []
-          },
-          "location": {
-            "filename": "test.ts",
-            "line": 18,
-            "col": 4
-          }
-        }
-      ]
-    }
-  }]);
-
-  json_test!(export_const,
-    r#"
-/** Something about fizzBuzz */
-export const fizzBuzz = "fizzBuzz";
-
-export const env: {
-  /** get doc */
-  get(key: string): string | undefined;
-
-  /** set doc */
-  set(key: string, value: string): void;
-}
-    "#;
-  [
-  {
-    "kind":"variable",
-    "name":"fizzBuzz",
-    "location":{
-      "filename":"test.ts",
-      "line":3,
-      "col":0
-    },
-    "jsDoc":"Something about fizzBuzz",
-    "variableDef":{
-      "tsType":null,
-      "kind":"const"
-    }
-  },
-  {
-    "kind":"variable",
-    "name":"env",
-    "location":{
-      "filename":"test.ts",
-      "line":5,
-      "col":0
-    },
-    "jsDoc":null,
-    "variableDef":{
-      "tsType":{
-        "repr":"",
-        "kind":"typeLiteral",
-        "typeLiteral":{
-          "methods":[{
-            "name":"get",
-            "params":[
-              {
-                "name":"key",
-                "kind":"identifier",
-                "optional":false,
-                "tsType":{
-                  "repr":"string",
-                  "kind":"keyword",
-                  "keyword":"string"
-                }
-              }
-            ],
-            "returnType":{
-              "repr":"",
-              "kind":"union",
-              "union":[
-                {
-                  "repr":"string",
-                  "kind":"keyword",
-                  "keyword":"string"
-                },
-                {
-                  "repr":"undefined",
-                  "kind":"keyword",
-                  "keyword":"undefined"
-                }
-              ]
-            },
-            "typeParams":[]
-          }, {
-            "name":"set",
-            "params":[
-              {
-                "name":"key",
-                "kind":"identifier",
-                "optional":false,
-                "tsType":{
-                  "repr":"string",
-                  "kind":"keyword",
-                  "keyword":"string"
-                }
-              },
-              {
-                "name":"value",
-                "kind":"identifier",
-                "optional":false,
-                "tsType":{
-                  "repr":"string",
-                  "kind":"keyword",
-                  "keyword":"string"
-                }
-              }
-              ],
-              "returnType":{
-                "repr":"void",
-                "kind":"keyword",
-                "keyword":"void"
-              },
-              "typeParams":[]
-            }
-            ],
-            "properties":[],
-            "callSignatures":[],
-            "indexSignatures": []
-          }
-        },
-        "kind":"const"
-      }
-    }
-    ]
-  );
-
-  json_test!(export_default_class,
-    r#"
-/** Class doc */
-export default class Foobar {
-    /** Constructor js doc */
-    constructor(name: string, private private2: number, protected protected2: number) {}
-}
-    "#;
-  [{
-      "kind": "class",
-      "name": "default",
-      "location": {
-        "filename": "test.ts",
-        "line": 3,
-        "col": 0
-      },
-      "jsDoc": "Class doc",
-      "classDef": {
-        "isAbstract": false,
-        "extends": null,
-        "implements": [],
-        "typeParams": [],
-        "superTypeParams": [],
-        "constructors": [
-          {
-            "jsDoc": "Constructor js doc",
-            "accessibility": null,
-            "name": "constructor",
-            "params": [
-              {
-                "name": "name",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": {
-                  "repr": "string",
-                  "kind": "keyword",
-                  "keyword": "string"
-                }
-              },
-              {
-                "name": "private2",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": {
-                  "repr": "number",
-                  "kind": "keyword",
-                  "keyword": "number"
-                }
-              },
-              {
-                "name": "protected2",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": {
-                  "repr": "number",
-                  "kind": "keyword",
-                  "keyword": "number"
-                }
-              }
-            ],
-            "location": {
-              "filename": "test.ts",
-              "line": 5,
-              "col": 4
-            }
-          }
-        ],
-        "properties": [],
-        "indexSignatures": [],
-        "methods": []
-      }
-  }]);
-
-  json_test!(export_default_fn,
-    r#"
-export default function foo(a: number) {
-  return a;
-}
-    "#;
-    [{
-    "kind": "function",
-    "name": "default",
-    "location": {
-      "filename": "test.ts",
-      "line": 2,
-      "col": 15
-    },
-    "jsDoc": null,
-    "functionDef": {
-      "params": [
-          {
-            "name": "a",
-            "kind": "identifier",
-            "optional": false,
-            "tsType": {
-              "keyword": "number",
-              "kind": "keyword",
-              "repr": "number",
-            },
-          }
-      ],
-      "typeParams": [],
-      "returnType": null,
-      "isAsync": false,
-      "isGenerator": false
-    }
-  }]);
-
-  json_test!(export_default_interface,
-    r#"
-/**
- * Interface js doc
- */
-export default interface Reader {
-    /** Read n bytes */
-    read?(buf: Uint8Array, something: unknown): Promise<number>
-}
-    "#;
-    [{
-      "kind": "interface",
-      "name": "default",
-      "location": {
-        "filename": "test.ts",
-        "line": 5,
-        "col": 0
-      },
-      "jsDoc": "Interface js doc",
-      "interfaceDef": {
-        "extends": [],
-        "methods": [
-          {
-            "name": "read",
-            "location": {
-              "filename": "test.ts",
-              "line": 7,
-              "col": 4
-            },
-            "optional": true,
-            "jsDoc": "Read n bytes",
-            "params": [
-              {
-                "name": "buf",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": {
-                  "repr": "Uint8Array",
-                  "kind": "typeRef",
-                  "typeRef": {
-                    "typeParams": null,
-                    "typeName": "Uint8Array"
-                  }
-                }
-              },
-              {
-                "name": "something",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": {
-                  "repr": "unknown",
-                  "kind": "keyword",
-                  "keyword": "unknown"
-                }
-              }
-            ],
-            "typeParams": [],
-            "returnType": {
-              "repr": "Promise",
-              "kind": "typeRef",
-              "typeRef": {
-                "typeParams": [
-                  {
-                    "repr": "number",
-                    "kind": "keyword",
-                    "keyword": "number"
-                  }
-                ],
-                "typeName": "Promise"
-              }
-            }
-          }
-        ],
-        "properties": [],
-        "callSignatures": [],
-        "indexSignatures": [],
-        "typeParams": []
-    }
-  }]);
-
-  json_test!(export_enum,
-    r#"
-/**
- * Some enum for good measure
- */
-export enum Hello {
-    World = "world",
-    Fizz = "fizz",
-    Buzz = "buzz",
-}
-    "#;
-    [{
-    "kind": "enum",
-    "name": "Hello",
-    "location": {
-      "filename": "test.ts",
-      "line": 5,
-      "col": 0
-    },
-    "jsDoc": "Some enum for good measure",
-    "enumDef": {
-      "members": [
-        {
-          "name": "World"
-        },
-        {
-          "name": "Fizz"
-        },
-        {
-          "name": "Buzz"
-        }
-      ]
-    }
-  }]);
-
-  json_test!(export_fn,
-    r#"/**
-* @module foo
-*/
-
-/**
-* Hello there, this is a multiline JSdoc.
-*
-* It has many lines
-*
-* Or not that many?
-*/
-export function foo(a: string, b?: number, cb: (...cbArgs: unknown[]) => void, ...args: unknown[]): void {
-    /**
-     * @todo document all the things.
-     */
-    console.log("Hello world");
-}
-    "#;
-  [{
-      "functionDef": {
-        "isAsync": false,
-        "isGenerator": false,
-        "typeParams": [],
-        "params": [
-            {
-              "name": "a",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": {
-                "keyword": "string",
-                "kind": "keyword",
-                "repr": "string",
-              },
-            },
-            {
-              "name": "b",
-              "kind": "identifier",
-              "optional": true,
-              "tsType": {
-                "keyword": "number",
-                "kind": "keyword",
-                "repr": "number",
-              },
-            },
-            {
-              "name": "cb",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": {
-                "repr": "",
-                "kind": "fnOrConstructor",
-                "fnOrConstructor": {
-                  "constructor": false,
-                  "tsType": {
-                    "keyword": "void",
-                    "kind": "keyword",
-                    "repr": "void"
-                  },
-                  "typeParams": [],
-                  "params": [{
-                    "arg": {
-                      "name": "cbArgs",
-                      "kind": "identifier",
-                      "optional": false,
-                      "tsType": null
-                    },
-                    "kind": "rest",
-                    "tsType": {
-                      "repr": "",
-                      "kind": "array",
-                      "array": {
-                          "repr": "unknown",
-                          "kind": "keyword",
-                          "keyword": "unknown"
-                      }
-                    },
-                  }]
-                }
-              },
-            },
-            {
-              "arg": {
-                "name": "args",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": null
-              },
-              "kind": "rest",
-              "tsType": {
-                "array": {
-                  "keyword": "unknown",
-                  "kind": "keyword",
-                  "repr": "unknown"
-                },
-                "kind": "array",
-                "repr": ""
-              }
-            }
-        ],
-        "returnType": {
-          "keyword": "void",
-          "kind": "keyword",
-          "repr": "void",
-        },
-      },
-      "jsDoc": "Hello there, this is a multiline JSdoc.\n\nIt has many lines\n\nOr not that many?",
-      "kind": "function",
-      "location": {
-        "col": 0,
-        "filename": "test.ts",
-        "line": 12,
-      },
-      "name": "foo",
-    }]);
-
-  json_test!(export_fn2,
-    r#"
-interface AssignOpts {
-  a: string;
-  b: number;
-}
-
-export function foo([e,,f, ...g]: number[], { c, d: asdf, i = "asdf", ...rest}, ops: AssignOpts = {}): void {
-    console.log("Hello world");
-}
-    "#;
-  [{
-    "functionDef": {
-      "isAsync": false,
-      "isGenerator": false,
-      "typeParams": [],
-      "params": [
-        {
-          "elements": [
-            {
-              "name": "e",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": null
-            },
-            null,
-            {
-              "name": "f",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": null
-            },
-            {
-              "arg": {
-                "name": "g",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": null
-              },
-              "kind": "rest",
-              "tsType": null
-            }
-          ],
-          "kind": "array",
-          "optional": false,
-          "tsType": {
-            "repr": "",
-            "kind": "array",
-            "array": {
-                "repr": "number",
-                "kind": "keyword",
-                "keyword": "number"
-            }
-          }
-        },
-        {
-          "kind": "object",
-          "optional": false,
-          "props": [
-            {
-              "kind": "assign",
-              "key": "c",
-              "value": null
-            },
-            {
-              "kind": "keyValue",
-              "key": "d",
-              "value": {
-                "name": "asdf",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": null
-              }
-            },
-            {
-              "kind": "assign",
-              "key": "i",
-              "value": "<UNIMPLEMENTED>"
-            },
-            {
-              "arg": {
-                "name": "rest",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": null
-              },
-              "kind": "rest"
-            }
-          ],
-          "tsType": null
-        },
-        {
-          "kind": "assign",
-          "left": {
-            "name": "ops",
-            "kind": "identifier",
-            "optional": false,
-            "tsType": {
-              "repr": "AssignOpts",
-              "kind": "typeRef",
-              "typeRef": {
-                "typeName": "AssignOpts",
-                "typeParams": null,
-              }
-            }
-          },
-          "right": "<UNIMPLEMENTED>",
-          "tsType": null
-        }
-      ],
-      "returnType": {
-        "keyword": "void",
-        "kind": "keyword",
-        "repr": "void",
-      },
-    },
-    "jsDoc": null,
-    "kind": "function",
-    "location": {
-      "col": 0,
-      "filename": "test.ts",
-      "line": 7,
-    },
-    "name": "foo",
-  }]);
-
-  json_test!(export_interface,
-    r#"
-interface Foo {
-  foo(): void;
-}
-interface Bar {
-  bar(): void;
-}
-/**
- * Interface js doc
- */
-export interface Reader extends Foo, Bar {
-    /** Read n bytes */
-    read?(buf: Uint8Array, something: unknown): Promise<number>
-}
-    "#;
-  [{
-      "kind": "interface",
-      "name": "Reader",
-      "location": {
-        "filename": "test.ts",
-        "line": 11,
-        "col": 0
-      },
-      "jsDoc": "Interface js doc",
-      "interfaceDef": {
-        "extends": [
-          {
-            "repr": "Foo",
-            "kind": "typeRef",
-            "typeRef": {
-              "typeParams": null,
-              "typeName": "Foo"
-            }
-          },
-          {
-            "repr": "Bar",
-            "kind": "typeRef",
-            "typeRef": {
-              "typeParams": null,
-              "typeName": "Bar"
-            }
-          }
-        ],
-        "methods": [
-          {
-            "name": "read",
-            "location": {
-              "filename": "test.ts",
-              "line": 13,
-              "col": 4
-            },
-            "optional": true,
-            "jsDoc": "Read n bytes",
-            "params": [
-              {
-                "name": "buf",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": {
-                  "repr": "Uint8Array",
-                  "kind": "typeRef",
-                  "typeRef": {
-                    "typeParams": null,
-                    "typeName": "Uint8Array"
-                  }
-                }
-              },
-              {
-                "name": "something",
-                "kind": "identifier",
-                "optional": false,
-                "tsType": {
-                  "repr": "unknown",
-                  "kind": "keyword",
-                  "keyword": "unknown"
-                }
-              }
-            ],
-            "typeParams": [],
-            "returnType": {
-              "repr": "Promise",
-              "kind": "typeRef",
-              "typeRef": {
-                "typeParams": [
-                  {
-                    "repr": "number",
-                    "kind": "keyword",
-                    "keyword": "number"
-                  }
-                ],
-                "typeName": "Promise"
-              }
-            }
-          }
-        ],
-        "properties": [],
-        "callSignatures": [],
-        "indexSignatures": [],
-        "typeParams": [],
-    }
-  }]);
-
-  json_test!(export_interface2,
-    r#"
-export interface TypedIface<T> {
-    something(): T
-}
-    "#;
-    [{
-      "kind": "interface",
-      "name": "TypedIface",
-      "location": {
-        "filename": "test.ts",
-        "line": 2,
-        "col": 0
-      },
-      "jsDoc": null,
-      "interfaceDef": {
-        "extends": [],
-        "methods": [
-          {
-            "name": "something",
-            "location": {
-              "filename": "test.ts",
-              "line": 3,
-              "col": 4
-            },
-            "jsDoc": null,
-            "optional": false,
-            "params": [],
-            "typeParams": [],
-            "returnType": {
-              "repr": "T",
-              "kind": "typeRef",
-              "typeRef": {
-                "typeParams": null,
-                "typeName": "T"
-              }
-            }
-          }
-        ],
-        "properties": [],
-        "callSignatures": [],
-        "indexSignatures": [],
-        "typeParams": [
-          { "name": "T" }
-        ],
-    }
-  }]);
-
-  json_test!(export_type_alias,
-    r#"
-/** Array holding numbers */
-export type NumberArray = Array<number>;
-    "#;
-    [{
-    "kind": "typeAlias",
-    "name": "NumberArray",
-    "location": {
-        "filename": "test.ts",
-      "line": 3,
-      "col": 0
-    },
-    "jsDoc": "Array holding numbers",
-    "typeAliasDef": {
-      "typeParams": [],
-      "tsType": {
-        "repr": "Array",
-        "kind": "typeRef",
-        "typeRef": {
-          "typeParams": [
-            {
-              "repr": "number",
-              "kind": "keyword",
-              "keyword": "number"
-            }
-          ],
-          "typeName": "Array"
-        }
-      }
-    }
-  }]);
-
-  json_test!(export_namespace,
-    r#"
-/** Namespace JSdoc */
-export namespace RootNs {
-    export const a = "a";
-
-    /** Nested namespace JSDoc */
-    export namespace NestedNs {
-      export enum Foo {
-        a = 1,
-        b = 2,
-        c = 3,
-      }
-    }
-}
-    "#;
-    [{
-    "kind": "namespace",
-    "name": "RootNs",
-    "location": {
-      "filename": "test.ts",
-      "line": 3,
-      "col": 0
-    },
-    "jsDoc": "Namespace JSdoc",
-    "namespaceDef": {
-      "elements": [
-        {
-          "kind": "variable",
-          "name": "a",
-          "location": {
-            "filename": "test.ts",
-            "line": 4,
-            "col": 4
-          },
-          "jsDoc": null,
-          "variableDef": {
-            "tsType": null,
-            "kind": "const"
-          }
-        },
-        {
-          "kind": "namespace",
-          "name": "NestedNs",
-          "location": {
-            "filename": "test.ts",
-            "line": 7,
-            "col": 4
-          },
-          "jsDoc": "Nested namespace JSDoc",
-          "namespaceDef": {
-            "elements": [
-              {
-                "kind": "enum",
-                "name": "Foo",
-                "location": {
-                  "filename": "test.ts",
-                  "line": 8,
-                  "col": 6
-                },
-                "jsDoc": null,
-                "enumDef": {
-                  "members": [
-                    {
-                      "name": "a"
-                    },
-                    {
-                      "name": "b"
-                    },
-                    {
-                      "name": "c"
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        }
-      ]
-    }
-  }]);
-
-  json_test!(optional_return_type,
-    r#"
-  export function foo(a: number) {
-    return a;
-  }
-    "#;
-    [{
-      "kind": "function",
-      "name": "foo",
-      "location": {
-        "filename": "test.ts",
-        "line": 2,
-        "col": 2
-      },
-      "jsDoc": null,
-      "functionDef": {
-        "params": [
-            {
-              "name": "a",
-              "kind": "identifier",
-              "optional": false,
-              "tsType": {
-                "keyword": "number",
-                "kind": "keyword",
-                "repr": "number",
-              },
-            }
-        ],
-        "typeParams": [],
-        "returnType": null,
-        "isAsync": false,
-        "isGenerator": false
-      }
-    }]
-  );
-
-  json_test!(ts_lit_types,
-    r#"
-export type boolLit = false;
-export type strLit = "text";
-export type tplLit = `text`;
-export type numLit = 5;
-    "#;
-  [
-    {
-      "kind": "typeAlias",
-      "name": "boolLit",
-      "location": {
-        "filename": "test.ts",
-        "line": 2,
-        "col": 0
-      },
-      "jsDoc": null,
-      "typeAliasDef": {
-        "tsType": {
-          "repr": "false",
-          "kind": "literal",
-          "literal": {
-            "kind": "boolean",
-            "boolean": false
-          }
-        },
-        "typeParams": []
-      }
-    }, {
-      "kind": "typeAlias",
-      "name": "strLit",
-      "location": {
-        "filename": "test.ts",
-        "line": 3,
-        "col": 0
-      },
-      "jsDoc": null,
-      "typeAliasDef": {
-        "tsType": {
-          "repr": "text",
-          "kind": "literal",
-          "literal": {
-            "kind": "string",
-            "string": "text"
-          }
-        },
-        "typeParams": []
-      }
-    }, {
-      "kind": "typeAlias",
-      "name": "tplLit",
-      "location": {
-        "filename": "test.ts",
-        "line": 4,
-        "col": 0
-      },
-      "jsDoc": null,
-      "typeAliasDef": {
-        "tsType": {
-          "repr": "text",
-          "kind": "literal",
-          "literal": {
-            "kind": "string",
-            "string": "text"
-          }
-        },
-        "typeParams": []
-      }
-    }, {
-      "kind": "typeAlias",
-      "name": "numLit",
-      "location": {
-        "filename": "test.ts",
-        "line": 5,
-        "col": 0
-      },
-      "jsDoc": null,
-      "typeAliasDef": {
-        "tsType": {
-          "repr": "5",
-          "kind": "literal",
-          "literal": {
-            "kind": "number",
-            "number": 5.0
-          }
-        },
-        "typeParams": []
-      }
-    }
-  ]);
-}
-
-mod printer {
-  use super::*;
-
-  contains_test!(abstract_class,
-    "export abstract class Class {}",
-    details;
-    "abstract class Class"
-  );
-
-  contains_test!(abstract_class_abstract_method,
-    r#"
-export abstract class Class {
-  abstract method() {}
-}
-    "#,
-    details;
-    "abstract method()"
-  );
-
-  contains_test!(class_async_method,
-    r#"
-export class Class {
-  async amethod(v) {}
-}
-    "#,
-    details;
-    "async amethod(v)"
-  );
-
-  contains_test!(class_constructor,
-    r#"
-export class Class {
-  constructor(a, b) {}
-}
-    "#,
-    details;
-    "constructor(a, b)"
-  );
-
-  const CLASS_SOURCE: &str = r#"
-export class C {
-  /** a doc */
-  a() {}
-  f: number;
-}
-    "#;
-
-  contains_test!(class_details,
-    CLASS_SOURCE,
-    details;
-    "class C",
-    "a()",
-    "f: number"
-  );
-
-  contains_test!(class_details_all_with_private,
-    r#"
-export class Class {
-  private pri() {}
-  protected pro() {}
-  public pub() {}
-}
-    "#,
-    details,
-    private;
-    "private pri()",
-    "protected pro()",
-    "pub()"
-  );
-
-  contains_test!(class_details_only_non_private_without_private,
-    r#"
-export class Class {
-  private pri() {}
-  protected pro() {}
-  public pub() {}
-}
-    "#,
-    details;
-    "protected pro()",
-    "pub()"
-  );
-
-  contains_test!(class_declaration,
-  "export class Class {}";
-  "class Class"
-  );
-
-  contains_test!(class_extends,
-    "export class Class extends Object {}";
-    "class Class extends Object"
-  );
-
-  contains_test!(class_extends_implements,
-    "export class Class extends Object implements Iterator, Iterable {}";
-    "class Class extends Object implements Iterator, Iterable"
-  );
-
-  contains_test!(class_generic_extends_implements,
-    "export class Class<A, B> extends Map<A, B> implements Iterator<A>, Iterable<B> {}";
-    "class Class<A, B> extends Map<A, B> implements Iterator<A>, Iterable<B>"
-  );
-
-  contains_test!(class_getter_and_setter,
-    r#"
-export class Class {
-  get a(): void {}
-  set b(_v: void) {}
-}
-    "#,
-    details;
-    "get a(): void",
-    "set b(_v: void)"
-  );
-
-  contains_test!(class_index_signature,
-    r#"
-export class C {
-  [key: string]: number;
-}
-    "#,
-    details;
-    "[key: string]: number"
-  );
-
-  contains_test!(class_implements,
-    "export class Class implements Iterator {}";
-    "class Class implements Iterator"
-  );
-
-  contains_test!(class_implements2,
-    "export class Class implements Iterator, Iterable {}";
-    "class Class implements Iterator, Iterable"
-  );
-
-  contains_test!(class_method,
-    r#"
-export class Class {
-  method(v) {}
-}
-    "#,
-    details;
-    "method(v)"
-  );
-
-  contains_test!(class_property,
-    r#"
-export class Class {
-  someproperty: bool;
-  optproperty: bigint;
-}
-    "#,
-    details;
-    "someproperty: bool",
-    "optproperty: bigint"
-  );
-
-  contains_test!(class_readonly_index_signature,
-    r#"
-export class C {
-  readonly [key: string]: number;
-}
-    "#,
-    details;
-    "readonly [key: string]: number"
-  );
-
-  contains_test!(class_static_property,
-    r#"
-export class Class {
-  static property = "";
-}
-    "#,
-    details;
-    "static property"
-  );
-
-  contains_test!(class_summary,
-    CLASS_SOURCE;
-    "class C";
-    "a()",
-    "f: number"
-  );
-
-  contains_test!(class_readonly_property,
-    r#"
-export class Class {
-  readonly property = "";
-}
-    "#,
-    details;
-    "readonly property"
-  );
-
-  contains_test!(class_private_property,
-    r#"
-export class Class {
-  private property = "";
-}
-    "#,
-    details,
-    private;
-    "private property"
-  );
-
-  contains_test!(const_declaration,
-  "export const Const = 0;";
-    "const Const"
-  );
-
-  contains_test!(enum_declaration,
-  "export enum Enum {}";
-    "enum Enum"
-  );
-
-  const EXPORT_SOURCE: &str = r#"
-export function a() {}
-function b() {}
-export class C {}
-class D {}
-export interface E {}
-interface F {}
-export namespace G {}
-namespace H {}
-    "#;
-
-  contains_test!(exports_all_with_private,
-    EXPORT_SOURCE,
-    private;
-    "function a()",
-    "class C",
-    "interface E",
-    "namespace G",
-    "function b()",
-    "class D",
-    "interface F",
-    "namespace H"
-  );
-
-  contains_test!(exports_only_exports_without_private,
-    EXPORT_SOURCE;
-    "function a()",
-    "class C",
-    "interface E",
-    "namespace G";
-    "function b()",
-    "class D",
-    "interface F",
-    "namespace H"
-  );
-
-  contains_test!(function_async,
-    "export async function a() {}";
-    "async function a()"
-  );
-
-  contains_test!(function_array_deconstruction,
-    "export function f([a, b, ...c]) {}";
-    "function f([a, b, ...c])"
-  );
-
-  contains_test!(function_async_generator,
-    "export async function* ag() {}";
-    "async function* ag()"
-  );
-
-  contains_test!(function_declaration,
-  "export function fun() {}";
-    "function fun()"
-  );
-
-  contains_test!(function_generator,
-    "export function* g() {}";
-    "function* g()"
-  );
-
-  contains_test!(function_generic,
-    "export function add<T>(a: T, b: T) { return a + b; }";
-    "function add<T>(a: T, b: T)"
-  );
-
-  contains_test!(function_object_deconstruction,
-    "export function f({ a, b, ...c }) {}";
-    "function f({a, b, ...c})"
-  );
-
-  /* TODO(SyrupThinker) NYI
-  contains_test!(function_type_predicate,
-    r#"
-  export function isFish(pet: Fish | Bird): pet is Fish {
-      return (pet as Fish).swim !== undefined;
-  }
-    "#;
-    "pet is Fish"
-  );
-  */
-
-  contains_test!(generic_instantiated_with_tuple_type,
-    r#"
-interface Generic<T> {}
-export function f(): Generic<[string, number]> { return {}; }
-    "#;
-    "Generic<[string, number]>"
-  );
-
-  contains_test!(type_literal_declaration,
-    "export type T = {}";
-    "{ }"
-  );
-
-  contains_test!(type_literal_index_signature,
-    "export type T = { [key: string]: number; }";
-    "[key: string]: number"
-  );
-
-  contains_test!(type_literal_readonly_index_signature,
-    "export type T = { readonly [key: string]: number; }";
-    "readonly [key: string]: number"
-  );
-
-  contains_test!(interface_declaration,
-  "export interface Interface {}";
-    "interface Interface"
-  );
-
-  contains_test!(interface_extends,
-    "export interface Interface extends Iterator {}";
-    "interface Interface extends Iterator"
-  );
-
-  contains_test!(interface_extends2,
-    "export interface Interface extends Iterator, Iterable {}";
-    "interface Interface extends Iterator, Iterable"
-  );
-
-  contains_test!(interface_generic,
-    "export interface Interface<T> {}";
-    "interface Interface<T>"
-  );
-
-  contains_test!(interface_generic_extends,
-    "export interface Interface<V> extends Iterable<V> {}";
-    "interface Interface<V> extends Iterable<V>"
-  );
-
-  contains_test!(interface_index_signature,
-    r#"
-export interface Interface {
-  [index: number]: Interface;
-}
-    "#,
-    details;
-    "[index: number]: Interface"
-  );
-
-  contains_test!(interface_method,
-    r#"
-export interface I {
-  m(a, b);
-  mo?(c);
-}
-    "#,
-    details;
-    "m(a, b)",
-    "mo?(c)"
-  );
-
-  contains_test!(interface_property,
-    r#"
-export interface I {
-  p: string;
-  po?: number;
-}
-    "#,
-    details;
-    "p: string",
-    "po?: number"
-  );
-
-  contains_test!(interface_readonly_index_signature,
-    r#"
-export interface Interface {
-  readonly [index: number]: Interface;
-}
-    "#,
-    details;
-    "readonly [index: number]: Interface"
-  );
-
-  const JSDOC_SOURCE: &str = r#"
-/**
- * A is a class
- *
- * Nothing more
- */
-export class A {}
-/**
- * B is an interface
- *
- * Should be
- */
-export interface B {}
-/**
- * C is a function
- *
- * Summarised
- */
-export function C() {}
-    "#;
-
-  contains_test!(jsdoc_details,
-    JSDOC_SOURCE,
-    details;
-    "A is a class",
-    "B is an interface",
-    "C is a function",
-    "Nothing more",
-    "Should be",
-    "Summarised"
-  );
-
-  contains_test!(jsdoc_summary,
-    JSDOC_SOURCE;
-    "A is a class",
-    "B is an interface",
-    "C is a function";
-    "Nothing more",
-    "Should be",
-    "Summarised"
-  );
-
-  contains_test!(namespace_declaration,
-  "export namespace Namespace {}";
-    "namespace Namespace"
-  );
-
-  const NAMESPACE_SOURCE: &str = r#"
-export namespace Namespace {
-  /**
-   * Doc comment 1
-   *
-   * Details 1
-   */
-  export function a() {}
-  /**
-   * Doc comment 2
-   *
-   * Details 2
-   */
-  export class B {}
-}
-    "#;
-
-  contains_test!(namespace_details,
-    NAMESPACE_SOURCE,
-    details;
-    "namespace Namespace",
-    "function a()",
-    "class B",
-    "Doc comment 1",
-    "Doc comment 2";
-    "Details 1",
-    "Details 2"
-  );
-
-  contains_test!(namespace_summary,
-    NAMESPACE_SOURCE;
-    "namespace Namespace",
-    "function a()",
-    "class B",
-    "Doc comment 1",
-    "Doc comment 2";
-    "Details 1",
-    "Details 2"
-  );
-
-  contains_test!(type_alias,
-  "export type A = number";
-  "type A = number"
-  );
-
-  contains_test!(type_generic_alias,
-  "export type A<T> = T";
-  "type A<T> = T"
-  );
-}
diff --git a/cli/doc/ts_type.rs b/cli/doc/ts_type.rs
deleted file mode 100644
index 36502ee5e4f556..00000000000000
--- a/cli/doc/ts_type.rs
+++ /dev/null
@@ -1,986 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use super::display::{display_readonly, SliceDisplayer};
-use super::interface::expr_to_name;
-use super::params::ts_fn_param_to_param_def;
-use super::ts_type_param::maybe_type_param_decl_to_type_param_defs;
-use super::ts_type_param::TsTypeParamDef;
-use super::ParamDef;
-use crate::colors;
-use crate::doc;
-use crate::swc_ecma_ast;
-use crate::swc_ecma_ast::{
-  TsArrayType, TsConditionalType, TsExprWithTypeArgs, TsFnOrConstructorType,
-  TsIndexedAccessType, TsKeywordType, TsLit, TsLitType, TsOptionalType,
-  TsParenthesizedType, TsRestType, TsThisType, TsTupleType, TsType, TsTypeAnn,
-  TsTypeLit, TsTypeOperator, TsTypeParamInstantiation, TsTypeQuery, TsTypeRef,
-  TsUnionOrIntersectionType,
-};
-use serde::Serialize;
-use std::fmt::{Display, Formatter, Result as FmtResult};
-
-// pub enum TsType {
-//  *      TsKeywordType(TsKeywordType),
-//  *      TsThisType(TsThisType),
-//  *      TsFnOrConstructorType(TsFnOrConstructorType),
-//  *      TsTypeRef(TsTypeRef),
-//  *      TsTypeQuery(TsTypeQuery),
-//  *      TsTypeLit(TsTypeLit),
-//  *      TsArrayType(TsArrayType),
-//  *      TsTupleType(TsTupleType),
-//  *      TsOptionalType(TsOptionalType),
-//  *      TsRestType(TsRestType),
-//  *      TsUnionOrIntersectionType(TsUnionOrIntersectionType),
-//  *      TsConditionalType(TsConditionalType),
-//  *      TsParenthesizedType(TsParenthesizedType),
-//  *      TsTypeOperator(TsTypeOperator),
-//  *      TsIndexedAccessType(TsIndexedAccessType),
-//  *      TsLitType(TsLitType),
-//     TsInferType(TsInferType),
-//     TsMappedType(TsMappedType),
-//     TsTypePredicate(TsTypePredicate),
-//     TsImportType(TsImportType),
-// }
-
-impl Into<TsTypeDef> for &TsLitType {
-  fn into(self) -> TsTypeDef {
-    let (repr, lit) = match &self.lit {
-      TsLit::Number(num) => (
-        format!("{}", num.value),
-        LiteralDef {
-          kind: LiteralDefKind::Number,
-          number: Some(num.value),
-          string: None,
-          boolean: None,
-        },
-      ),
-      TsLit::Str(str_) => (
-        str_.value.to_string(),
-        LiteralDef {
-          kind: LiteralDefKind::String,
-          number: None,
-          string: Some(str_.value.to_string()),
-          boolean: None,
-        },
-      ),
-      TsLit::Tpl(tpl) => {
-        // A template literal in a type is not allowed to have
-        // expressions, so there will only be one quasi.
-        let quasi = tpl.quasis.get(0).expect("Expected tpl to have a quasi.");
-        let text = quasi.raw.value.to_string();
-        (
-          text.clone(),
-          LiteralDef {
-            kind: LiteralDefKind::String, // semantically the same
-            number: None,
-            string: Some(text),
-            boolean: None,
-          },
-        )
-      }
-      TsLit::Bool(bool_) => (
-        bool_.value.to_string(),
-        LiteralDef {
-          kind: LiteralDefKind::Boolean,
-          number: None,
-          string: None,
-          boolean: Some(bool_.value),
-        },
-      ),
-    };
-
-    TsTypeDef {
-      repr,
-      kind: Some(TsTypeDefKind::Literal),
-      literal: Some(lit),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsArrayType {
-  fn into(self) -> TsTypeDef {
-    let ts_type_def: TsTypeDef = (&*self.elem_type).into();
-
-    TsTypeDef {
-      array: Some(Box::new(ts_type_def)),
-      kind: Some(TsTypeDefKind::Array),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsTupleType {
-  fn into(self) -> TsTypeDef {
-    let mut type_defs = vec![];
-
-    for type_box in &self.elem_types {
-      let ts_type: &TsType = &type_box.ty;
-      let def: TsTypeDef = ts_type.into();
-      type_defs.push(def)
-    }
-
-    TsTypeDef {
-      tuple: Some(type_defs),
-      kind: Some(TsTypeDefKind::Tuple),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsUnionOrIntersectionType {
-  fn into(self) -> TsTypeDef {
-    use crate::swc_ecma_ast::TsUnionOrIntersectionType::*;
-
-    match self {
-      TsUnionType(union_type) => {
-        let mut types_union = vec![];
-
-        for type_box in &union_type.types {
-          let ts_type: &TsType = &(*type_box);
-          let def: TsTypeDef = ts_type.into();
-          types_union.push(def);
-        }
-
-        TsTypeDef {
-          union: Some(types_union),
-          kind: Some(TsTypeDefKind::Union),
-          ..Default::default()
-        }
-      }
-      TsIntersectionType(intersection_type) => {
-        let mut types_intersection = vec![];
-
-        for type_box in &intersection_type.types {
-          let ts_type: &TsType = &(*type_box);
-          let def: TsTypeDef = ts_type.into();
-          types_intersection.push(def);
-        }
-
-        TsTypeDef {
-          intersection: Some(types_intersection),
-          kind: Some(TsTypeDefKind::Intersection),
-          ..Default::default()
-        }
-      }
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsKeywordType {
-  fn into(self) -> TsTypeDef {
-    use crate::swc_ecma_ast::TsKeywordTypeKind::*;
-
-    let keyword_str = match self.kind {
-      TsAnyKeyword => "any",
-      TsUnknownKeyword => "unknown",
-      TsNumberKeyword => "number",
-      TsObjectKeyword => "object",
-      TsBooleanKeyword => "boolean",
-      TsBigIntKeyword => "bigint",
-      TsStringKeyword => "string",
-      TsSymbolKeyword => "symbol",
-      TsVoidKeyword => "void",
-      TsUndefinedKeyword => "undefined",
-      TsNullKeyword => "null",
-      TsNeverKeyword => "never",
-    };
-
-    TsTypeDef {
-      repr: keyword_str.to_string(),
-      kind: Some(TsTypeDefKind::Keyword),
-      keyword: Some(keyword_str.to_string()),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsTypeOperator {
-  fn into(self) -> TsTypeDef {
-    let ts_type = (&*self.type_ann).into();
-    let type_operator_def = TsTypeOperatorDef {
-      operator: self.op.as_str().to_string(),
-      ts_type,
-    };
-
-    TsTypeDef {
-      type_operator: Some(Box::new(type_operator_def)),
-      kind: Some(TsTypeDefKind::TypeOperator),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsParenthesizedType {
-  fn into(self) -> TsTypeDef {
-    let ts_type = (&*self.type_ann).into();
-
-    TsTypeDef {
-      parenthesized: Some(Box::new(ts_type)),
-      kind: Some(TsTypeDefKind::Parenthesized),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsRestType {
-  fn into(self) -> TsTypeDef {
-    let ts_type = (&*self.type_ann).into();
-
-    TsTypeDef {
-      rest: Some(Box::new(ts_type)),
-      kind: Some(TsTypeDefKind::Rest),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsOptionalType {
-  fn into(self) -> TsTypeDef {
-    let ts_type = (&*self.type_ann).into();
-
-    TsTypeDef {
-      optional: Some(Box::new(ts_type)),
-      kind: Some(TsTypeDefKind::Optional),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsThisType {
-  fn into(self) -> TsTypeDef {
-    TsTypeDef {
-      repr: "this".to_string(),
-      this: Some(true),
-      kind: Some(TsTypeDefKind::This),
-      ..Default::default()
-    }
-  }
-}
-
-pub fn ts_entity_name_to_name(
-  entity_name: &swc_ecma_ast::TsEntityName,
-) -> String {
-  use crate::swc_ecma_ast::TsEntityName::*;
-
-  match entity_name {
-    Ident(ident) => ident.sym.to_string(),
-    TsQualifiedName(ts_qualified_name) => {
-      let left = ts_entity_name_to_name(&ts_qualified_name.left);
-      let right = ts_qualified_name.right.sym.to_string();
-      format!("{}.{}", left, right)
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsTypeQuery {
-  fn into(self) -> TsTypeDef {
-    use crate::swc_ecma_ast::TsTypeQueryExpr::*;
-
-    let type_name = match &self.expr_name {
-      TsEntityName(entity_name) => ts_entity_name_to_name(&*entity_name),
-      Import(import_type) => import_type.arg.value.to_string(),
-    };
-
-    TsTypeDef {
-      repr: type_name.to_string(),
-      type_query: Some(type_name),
-      kind: Some(TsTypeDefKind::TypeQuery),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsTypeRef {
-  fn into(self) -> TsTypeDef {
-    let type_name = ts_entity_name_to_name(&self.type_name);
-
-    let type_params = if let Some(type_params_inst) = &self.type_params {
-      let mut ts_type_defs = vec![];
-
-      for type_box in &type_params_inst.params {
-        let ts_type: &TsType = &(*type_box);
-        let def: TsTypeDef = ts_type.into();
-        ts_type_defs.push(def);
-      }
-
-      Some(ts_type_defs)
-    } else {
-      None
-    };
-
-    TsTypeDef {
-      repr: type_name.clone(),
-      type_ref: Some(TsTypeRefDef {
-        type_name,
-        type_params,
-      }),
-      kind: Some(TsTypeDefKind::TypeRef),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsExprWithTypeArgs {
-  fn into(self) -> TsTypeDef {
-    let type_name = ts_entity_name_to_name(&self.expr);
-
-    let type_params = if let Some(type_params_inst) = &self.type_args {
-      let mut ts_type_defs = vec![];
-
-      for type_box in &type_params_inst.params {
-        let ts_type: &TsType = &(*type_box);
-        let def: TsTypeDef = ts_type.into();
-        ts_type_defs.push(def);
-      }
-
-      Some(ts_type_defs)
-    } else {
-      None
-    };
-
-    TsTypeDef {
-      repr: type_name.clone(),
-      type_ref: Some(TsTypeRefDef {
-        type_name,
-        type_params,
-      }),
-      kind: Some(TsTypeDefKind::TypeRef),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsIndexedAccessType {
-  fn into(self) -> TsTypeDef {
-    let indexed_access_def = TsIndexedAccessDef {
-      readonly: self.readonly,
-      obj_type: Box::new((&*self.obj_type).into()),
-      index_type: Box::new((&*self.index_type).into()),
-    };
-
-    TsTypeDef {
-      indexed_access: Some(indexed_access_def),
-      kind: Some(TsTypeDefKind::IndexedAccess),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsTypeLit {
-  fn into(self) -> TsTypeDef {
-    let mut methods = vec![];
-    let mut properties = vec![];
-    let mut call_signatures = vec![];
-    let mut index_signatures = vec![];
-
-    for type_element in &self.members {
-      use crate::swc_ecma_ast::TsTypeElement::*;
-
-      match &type_element {
-        TsMethodSignature(ts_method_sig) => {
-          let mut params = vec![];
-
-          for param in &ts_method_sig.params {
-            let param_def = ts_fn_param_to_param_def(param, None);
-            params.push(param_def);
-          }
-
-          let maybe_return_type = ts_method_sig
-            .type_ann
-            .as_ref()
-            .map(|rt| (&*rt.type_ann).into());
-
-          let type_params = maybe_type_param_decl_to_type_param_defs(
-            ts_method_sig.type_params.as_ref(),
-          );
-          let name = expr_to_name(&*ts_method_sig.key);
-          let method_def = LiteralMethodDef {
-            name,
-            params,
-            return_type: maybe_return_type,
-            type_params,
-          };
-          methods.push(method_def);
-        }
-        TsPropertySignature(ts_prop_sig) => {
-          let name = expr_to_name(&*ts_prop_sig.key);
-
-          let mut params = vec![];
-
-          for param in &ts_prop_sig.params {
-            let param_def = ts_fn_param_to_param_def(param, None);
-            params.push(param_def);
-          }
-
-          let ts_type = ts_prop_sig
-            .type_ann
-            .as_ref()
-            .map(|rt| (&*rt.type_ann).into());
-
-          let type_params = maybe_type_param_decl_to_type_param_defs(
-            ts_prop_sig.type_params.as_ref(),
-          );
-          let prop_def = LiteralPropertyDef {
-            name,
-            params,
-            ts_type,
-            computed: ts_prop_sig.computed,
-            optional: ts_prop_sig.optional,
-            type_params,
-          };
-          properties.push(prop_def);
-        }
-        TsCallSignatureDecl(ts_call_sig) => {
-          let mut params = vec![];
-          for param in &ts_call_sig.params {
-            let param_def = ts_fn_param_to_param_def(param, None);
-            params.push(param_def);
-          }
-
-          let ts_type = ts_call_sig
-            .type_ann
-            .as_ref()
-            .map(|rt| (&*rt.type_ann).into());
-
-          let type_params = maybe_type_param_decl_to_type_param_defs(
-            ts_call_sig.type_params.as_ref(),
-          );
-
-          let call_sig_def = LiteralCallSignatureDef {
-            params,
-            ts_type,
-            type_params,
-          };
-          call_signatures.push(call_sig_def);
-        }
-        TsIndexSignature(ts_index_sig) => {
-          let mut params = vec![];
-          for param in &ts_index_sig.params {
-            let param_def = ts_fn_param_to_param_def(param, None);
-            params.push(param_def);
-          }
-
-          let ts_type = ts_index_sig
-            .type_ann
-            .as_ref()
-            .map(|rt| (&*rt.type_ann).into());
-
-          let index_sig_def = LiteralIndexSignatureDef {
-            readonly: ts_index_sig.readonly,
-            params,
-            ts_type,
-          };
-          index_signatures.push(index_sig_def);
-        }
-        // TODO:
-        TsConstructSignatureDecl(_) => {}
-      }
-    }
-
-    let type_literal = TsTypeLiteralDef {
-      methods,
-      properties,
-      call_signatures,
-      index_signatures,
-    };
-
-    TsTypeDef {
-      kind: Some(TsTypeDefKind::TypeLiteral),
-      type_literal: Some(type_literal),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsConditionalType {
-  fn into(self) -> TsTypeDef {
-    let conditional_type_def = TsConditionalDef {
-      check_type: Box::new((&*self.check_type).into()),
-      extends_type: Box::new((&*self.extends_type).into()),
-      true_type: Box::new((&*self.true_type).into()),
-      false_type: Box::new((&*self.false_type).into()),
-    };
-
-    TsTypeDef {
-      kind: Some(TsTypeDefKind::Conditional),
-      conditional_type: Some(conditional_type_def),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsFnOrConstructorType {
-  fn into(self) -> TsTypeDef {
-    use crate::swc_ecma_ast::TsFnOrConstructorType::*;
-
-    let fn_def = match self {
-      TsFnType(ts_fn_type) => {
-        let mut params = vec![];
-
-        for param in &ts_fn_type.params {
-          let param_def = ts_fn_param_to_param_def(param, None);
-          params.push(param_def);
-        }
-
-        let type_params = maybe_type_param_decl_to_type_param_defs(
-          ts_fn_type.type_params.as_ref(),
-        );
-
-        TsFnOrConstructorDef {
-          constructor: false,
-          ts_type: ts_type_ann_to_def(&ts_fn_type.type_ann),
-          params,
-          type_params,
-        }
-      }
-      TsConstructorType(ctor_type) => {
-        let mut params = vec![];
-
-        for param in &ctor_type.params {
-          let param_def = ts_fn_param_to_param_def(param, None);
-          params.push(param_def);
-        }
-
-        let type_params = maybe_type_param_decl_to_type_param_defs(
-          ctor_type.type_params.as_ref(),
-        );
-        TsFnOrConstructorDef {
-          constructor: true,
-          ts_type: ts_type_ann_to_def(&ctor_type.type_ann),
-          params,
-          type_params,
-        }
-      }
-    };
-
-    TsTypeDef {
-      kind: Some(TsTypeDefKind::FnOrConstructor),
-      fn_or_constructor: Some(Box::new(fn_def)),
-      ..Default::default()
-    }
-  }
-}
-
-impl Into<TsTypeDef> for &TsType {
-  fn into(self) -> TsTypeDef {
-    use crate::swc_ecma_ast::TsType::*;
-
-    match self {
-      TsKeywordType(ref keyword_type) => keyword_type.into(),
-      TsLitType(ref lit_type) => lit_type.into(),
-      TsTypeRef(ref type_ref) => type_ref.into(),
-      TsUnionOrIntersectionType(union_or_inter) => union_or_inter.into(),
-      TsArrayType(array_type) => array_type.into(),
-      TsTupleType(tuple_type) => tuple_type.into(),
-      TsTypeOperator(type_op_type) => type_op_type.into(),
-      TsParenthesizedType(paren_type) => paren_type.into(),
-      TsRestType(rest_type) => rest_type.into(),
-      TsOptionalType(optional_type) => optional_type.into(),
-      TsTypeQuery(type_query) => type_query.into(),
-      TsThisType(this_type) => this_type.into(),
-      TsFnOrConstructorType(fn_or_con_type) => fn_or_con_type.into(),
-      TsConditionalType(conditional_type) => conditional_type.into(),
-      TsIndexedAccessType(indexed_access_type) => indexed_access_type.into(),
-      TsTypeLit(type_literal) => type_literal.into(),
-      _ => TsTypeDef {
-        repr: "<UNIMPLEMENTED>".to_string(),
-        ..Default::default()
-      },
-    }
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TsTypeRefDef {
-  pub type_params: Option<Vec<TsTypeDef>>,
-  pub type_name: String,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub enum LiteralDefKind {
-  Number,
-  String,
-  Boolean,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct LiteralDef {
-  pub kind: LiteralDefKind,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub number: Option<f64>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub string: Option<String>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub boolean: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TsTypeOperatorDef {
-  pub operator: String,
-  pub ts_type: TsTypeDef,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TsFnOrConstructorDef {
-  pub constructor: bool,
-  pub ts_type: TsTypeDef,
-  pub params: Vec<ParamDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TsConditionalDef {
-  pub check_type: Box<TsTypeDef>,
-  pub extends_type: Box<TsTypeDef>,
-  pub true_type: Box<TsTypeDef>,
-  pub false_type: Box<TsTypeDef>,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TsIndexedAccessDef {
-  pub readonly: bool,
-  pub obj_type: Box<TsTypeDef>,
-  pub index_type: Box<TsTypeDef>,
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct LiteralMethodDef {
-  pub name: String,
-  pub params: Vec<ParamDef>,
-  pub return_type: Option<TsTypeDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-impl Display for LiteralMethodDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}({})",
-      self.name,
-      SliceDisplayer::new(&self.params, ", ", false)
-    )?;
-    if let Some(return_type) = &self.return_type {
-      write!(f, ": {}", return_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct LiteralPropertyDef {
-  pub name: String,
-  pub params: Vec<ParamDef>,
-  pub computed: bool,
-  pub optional: bool,
-  pub ts_type: Option<TsTypeDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-impl Display for LiteralPropertyDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(f, "{}", self.name)?;
-    if let Some(ts_type) = &self.ts_type {
-      write!(f, ": {}", ts_type)?;
-    }
-    Ok(())
-  }
-}
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct LiteralCallSignatureDef {
-  pub params: Vec<ParamDef>,
-  pub ts_type: Option<TsTypeDef>,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-impl Display for LiteralCallSignatureDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(f, "({})", SliceDisplayer::new(&self.params, ", ", false))?;
-    if let Some(ts_type) = &self.ts_type {
-      write!(f, ": {}", ts_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct LiteralIndexSignatureDef {
-  pub readonly: bool,
-  pub params: Vec<ParamDef>,
-  pub ts_type: Option<TsTypeDef>,
-}
-
-impl Display for LiteralIndexSignatureDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(
-      f,
-      "{}[{}]",
-      display_readonly(self.readonly),
-      SliceDisplayer::new(&self.params, ", ", false)
-    )?;
-    if let Some(ts_type) = &self.ts_type {
-      write!(f, ": {}", ts_type)?;
-    }
-    Ok(())
-  }
-}
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TsTypeLiteralDef {
-  pub methods: Vec<LiteralMethodDef>,
-  pub properties: Vec<LiteralPropertyDef>,
-  pub call_signatures: Vec<LiteralCallSignatureDef>,
-  pub index_signatures: Vec<LiteralIndexSignatureDef>,
-}
-
-#[derive(Debug, PartialEq, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub enum TsTypeDefKind {
-  Keyword,
-  Literal,
-  TypeRef,
-  Union,
-  Intersection,
-  Array,
-  Tuple,
-  TypeOperator,
-  Parenthesized,
-  Rest,
-  Optional,
-  TypeQuery,
-  This,
-  FnOrConstructor,
-  Conditional,
-  IndexedAccess,
-  TypeLiteral,
-}
-
-#[derive(Debug, Default, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TsTypeDef {
-  pub repr: String,
-
-  pub kind: Option<TsTypeDefKind>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub keyword: Option<String>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub literal: Option<LiteralDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub type_ref: Option<TsTypeRefDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub union: Option<Vec<TsTypeDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub intersection: Option<Vec<TsTypeDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub array: Option<Box<TsTypeDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub tuple: Option<Vec<TsTypeDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub type_operator: Option<Box<TsTypeOperatorDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub parenthesized: Option<Box<TsTypeDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub rest: Option<Box<TsTypeDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub optional: Option<Box<TsTypeDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub type_query: Option<String>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub this: Option<bool>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub fn_or_constructor: Option<Box<TsFnOrConstructorDef>>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub conditional_type: Option<TsConditionalDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub indexed_access: Option<TsIndexedAccessDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub type_literal: Option<TsTypeLiteralDef>,
-}
-
-pub fn ts_type_ann_to_def(type_ann: &TsTypeAnn) -> TsTypeDef {
-  use crate::swc_ecma_ast::TsType::*;
-
-  match &*type_ann.type_ann {
-    TsKeywordType(keyword_type) => keyword_type.into(),
-    TsLitType(lit_type) => lit_type.into(),
-    TsTypeRef(type_ref) => type_ref.into(),
-    TsUnionOrIntersectionType(union_or_inter) => union_or_inter.into(),
-    TsArrayType(array_type) => array_type.into(),
-    TsTupleType(tuple_type) => tuple_type.into(),
-    TsTypeOperator(type_op_type) => type_op_type.into(),
-    TsParenthesizedType(paren_type) => paren_type.into(),
-    TsRestType(rest_type) => rest_type.into(),
-    TsOptionalType(optional_type) => optional_type.into(),
-    TsTypeQuery(type_query) => type_query.into(),
-    TsThisType(this_type) => this_type.into(),
-    TsFnOrConstructorType(fn_or_con_type) => fn_or_con_type.into(),
-    TsConditionalType(conditional_type) => conditional_type.into(),
-    TsIndexedAccessType(indexed_access_type) => indexed_access_type.into(),
-    TsTypeLit(type_literal) => type_literal.into(),
-    _ => TsTypeDef {
-      repr: "<TODO>".to_string(),
-      ..Default::default()
-    },
-  }
-}
-
-impl Display for TsTypeDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    if self.kind.is_none() {
-      return write!(f, "{}", colors::red("<UNIMPLEMENTED>"));
-    }
-
-    let kind = self.kind.as_ref().unwrap();
-    match kind {
-      TsTypeDefKind::Array => write!(f, "{}[]", &*self.array.as_ref().unwrap()),
-      TsTypeDefKind::Conditional => {
-        let conditional = self.conditional_type.as_ref().unwrap();
-        write!(
-          f,
-          "{} {} {} ? {} : {}",
-          &*conditional.check_type,
-          colors::magenta("extends"),
-          &*conditional.extends_type,
-          &*conditional.true_type,
-          &*conditional.false_type
-        )
-      }
-      TsTypeDefKind::FnOrConstructor => {
-        let fn_or_constructor = self.fn_or_constructor.as_ref().unwrap();
-        write!(
-          f,
-          "{}({}) => {}",
-          colors::magenta(if fn_or_constructor.constructor {
-            "new "
-          } else {
-            ""
-          }),
-          SliceDisplayer::new(&fn_or_constructor.params, ", ", false),
-          &fn_or_constructor.ts_type,
-        )
-      }
-      TsTypeDefKind::IndexedAccess => {
-        let indexed_access = self.indexed_access.as_ref().unwrap();
-        write!(
-          f,
-          "{}[{}]",
-          &*indexed_access.obj_type, &*indexed_access.index_type
-        )
-      }
-      TsTypeDefKind::Intersection => {
-        let intersection = self.intersection.as_ref().unwrap();
-        write!(f, "{}", SliceDisplayer::new(&intersection, " & ", false))
-      }
-      TsTypeDefKind::Keyword => {
-        write!(f, "{}", colors::cyan(self.keyword.as_ref().unwrap()))
-      }
-      TsTypeDefKind::Literal => {
-        let literal = self.literal.as_ref().unwrap();
-        match literal.kind {
-          doc::ts_type::LiteralDefKind::Boolean => write!(
-            f,
-            "{}",
-            colors::yellow(&literal.boolean.unwrap().to_string())
-          ),
-          doc::ts_type::LiteralDefKind::String => write!(
-            f,
-            "{}",
-            colors::green(&format!("\"{}\"", literal.string.as_ref().unwrap()))
-          ),
-          doc::ts_type::LiteralDefKind::Number => write!(
-            f,
-            "{}",
-            colors::yellow(&literal.number.unwrap().to_string())
-          ),
-        }
-      }
-      TsTypeDefKind::Optional => {
-        write!(f, "{}?", &*self.optional.as_ref().unwrap())
-      }
-      TsTypeDefKind::Parenthesized => {
-        write!(f, "({})", &*self.parenthesized.as_ref().unwrap())
-      }
-      TsTypeDefKind::Rest => write!(f, "...{}", &*self.rest.as_ref().unwrap()),
-      TsTypeDefKind::This => write!(f, "this"),
-      TsTypeDefKind::Tuple => {
-        let tuple = self.tuple.as_ref().unwrap();
-        write!(f, "[{}]", SliceDisplayer::new(&tuple, ", ", false))
-      }
-      TsTypeDefKind::TypeLiteral => {
-        let type_literal = self.type_literal.as_ref().unwrap();
-        write!(
-          f,
-          "{{ {}{}{}{}}}",
-          SliceDisplayer::new(&type_literal.call_signatures, "; ", true),
-          SliceDisplayer::new(&type_literal.methods, "; ", true),
-          SliceDisplayer::new(&type_literal.properties, "; ", true),
-          SliceDisplayer::new(&type_literal.index_signatures, "; ", true),
-        )
-      }
-      TsTypeDefKind::TypeOperator => {
-        let operator = self.type_operator.as_ref().unwrap();
-        write!(f, "{} {}", operator.operator, &operator.ts_type)
-      }
-      TsTypeDefKind::TypeQuery => {
-        write!(f, "typeof {}", self.type_query.as_ref().unwrap())
-      }
-      TsTypeDefKind::TypeRef => {
-        let type_ref = self.type_ref.as_ref().unwrap();
-        write!(f, "{}", colors::intense_blue(&type_ref.type_name))?;
-        if let Some(type_params) = &type_ref.type_params {
-          write!(f, "<{}>", SliceDisplayer::new(type_params, ", ", false))?;
-        }
-        Ok(())
-      }
-      TsTypeDefKind::Union => {
-        let union = self.union.as_ref().unwrap();
-        write!(f, "{}", SliceDisplayer::new(union, " | ", false))
-      }
-    }
-  }
-}
-
-pub fn maybe_type_param_instantiation_to_type_defs(
-  maybe_type_param_instantiation: Option<&TsTypeParamInstantiation>,
-) -> Vec<TsTypeDef> {
-  if let Some(type_param_instantiation) = maybe_type_param_instantiation {
-    type_param_instantiation
-      .params
-      .iter()
-      .map(|type_param| type_param.as_ref().into())
-      .collect::<Vec<TsTypeDef>>()
-  } else {
-    vec![]
-  }
-}
diff --git a/cli/doc/ts_type_param.rs b/cli/doc/ts_type_param.rs
deleted file mode 100644
index 0483708b6f8bf6..00000000000000
--- a/cli/doc/ts_type_param.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use super::ts_type::TsTypeDef;
-use crate::swc_ecma_ast::TsTypeParam;
-use crate::swc_ecma_ast::TsTypeParamDecl;
-use serde::Serialize;
-use std::fmt::{Display, Formatter, Result as FmtResult};
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TsTypeParamDef {
-  pub name: String,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub constraint: Option<TsTypeDef>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub default: Option<TsTypeDef>,
-}
-
-impl Display for TsTypeParamDef {
-  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-    write!(f, "{}", self.name)?;
-    if let Some(constraint) = &self.constraint {
-      write!(f, " extends {}", constraint)?;
-    }
-    if let Some(default) = &self.default {
-      write!(f, " = {}", default)?;
-    }
-    Ok(())
-  }
-}
-
-impl Into<TsTypeParamDef> for &TsTypeParam {
-  fn into(self) -> TsTypeParamDef {
-    let name = self.name.sym.to_string();
-    let constraint: Option<TsTypeDef> =
-      if let Some(ts_type) = self.constraint.as_ref() {
-        let type_def: TsTypeDef = (&**ts_type).into();
-        Some(type_def)
-      } else {
-        None
-      };
-    let default: Option<TsTypeDef> =
-      if let Some(ts_type) = self.default.as_ref() {
-        let type_def: TsTypeDef = (&**ts_type).into();
-        Some(type_def)
-      } else {
-        None
-      };
-
-    TsTypeParamDef {
-      name,
-      constraint,
-      default,
-    }
-  }
-}
-
-pub fn maybe_type_param_decl_to_type_param_defs(
-  maybe_type_param_decl: Option<&TsTypeParamDecl>,
-) -> Vec<TsTypeParamDef> {
-  if let Some(type_params_decl) = maybe_type_param_decl {
-    type_params_decl
-      .params
-      .iter()
-      .map(|type_param| type_param.into())
-      .collect::<Vec<TsTypeParamDef>>()
-  } else {
-    vec![]
-  }
-}
diff --git a/cli/doc/type_alias.rs b/cli/doc/type_alias.rs
deleted file mode 100644
index b26395c3f1131d..00000000000000
--- a/cli/doc/type_alias.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use super::parser::DocParser;
-use super::ts_type::TsTypeDef;
-use super::ts_type_param::maybe_type_param_decl_to_type_param_defs;
-use super::ts_type_param::TsTypeParamDef;
-use crate::swc_ecma_ast;
-use serde::Serialize;
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct TypeAliasDef {
-  pub ts_type: TsTypeDef,
-  pub type_params: Vec<TsTypeParamDef>,
-}
-
-pub fn get_doc_for_ts_type_alias_decl(
-  _doc_parser: &DocParser,
-  type_alias_decl: &swc_ecma_ast::TsTypeAliasDecl,
-) -> (String, TypeAliasDef) {
-  let alias_name = type_alias_decl.id.sym.to_string();
-  let ts_type = type_alias_decl.type_ann.as_ref().into();
-  let type_params = maybe_type_param_decl_to_type_param_defs(
-    type_alias_decl.type_params.as_ref(),
-  );
-  let type_alias_def = TypeAliasDef {
-    ts_type,
-    type_params,
-  };
-
-  (alias_name, type_alias_def)
-}
diff --git a/cli/doc/variable.rs b/cli/doc/variable.rs
deleted file mode 100644
index 0b9c28a4253251..00000000000000
--- a/cli/doc/variable.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use crate::swc_ecma_ast;
-use serde::Serialize;
-
-use super::ts_type::ts_type_ann_to_def;
-use super::ts_type::TsTypeDef;
-
-#[derive(Debug, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct VariableDef {
-  pub ts_type: Option<TsTypeDef>,
-  pub kind: swc_ecma_ast::VarDeclKind,
-}
-
-// TODO: change this function to return Vec<(String, VariableDef)> as single
-// var declaration can have multiple declarators
-pub fn get_doc_for_var_decl(
-  var_decl: &swc_ecma_ast::VarDecl,
-) -> (String, VariableDef) {
-  assert!(!var_decl.decls.is_empty());
-  let var_declarator = var_decl.decls.get(0).unwrap();
-  let var_name = match &var_declarator.name {
-    swc_ecma_ast::Pat::Ident(ident) => ident.sym.to_string(),
-    _ => "<TODO>".to_string(),
-  };
-
-  let maybe_ts_type = match &var_declarator.name {
-    swc_ecma_ast::Pat::Ident(ident) => {
-      ident.type_ann.as_ref().map(|rt| ts_type_ann_to_def(rt))
-    }
-    _ => None,
-  };
-
-  let variable_def = VariableDef {
-    ts_type: maybe_ts_type,
-    kind: var_decl.kind,
-  };
-
-  (var_name, variable_def)
-}
diff --git a/cli/dts/README.md b/cli/dts/README.md
new file mode 100644
index 00000000000000..bfa022109d4037
--- /dev/null
+++ b/cli/dts/README.md
@@ -0,0 +1,19 @@
+# How to upgrade TypeScript.
+
+The files in this directory are mostly from the TypeScript repository. We
+currently (unfortunately) have a rather manual process for upgrading TypeScript.
+It works like this currently:
+
+1. Checkout typescript repo in a seperate directory.
+2. Copy typescript.js into Deno repo
+3. Copy d.ts files into dts directory
+
+So that might look something like this:
+
+```
+git clone https://github.com/microsoft/TypeScript.git
+cd typescript
+git checkout v3.9.7
+cp lib/typescript.js ~/src/deno/cli/tsc/00_typescript.js
+cp lib/*.d.ts ~/src/deno/cli/dts/
+```
diff --git a/cli/dts/lib.deno.ns.d.ts b/cli/dts/lib.deno.ns.d.ts
index 96217938131e95..829b31a70befa5 100644
--- a/cli/dts/lib.deno.ns.d.ts
+++ b/cli/dts/lib.deno.ns.d.ts
@@ -993,9 +993,9 @@ declare namespace Deno {
   }
 
   /** Synchronously creates a new temporary directory in the default directory
-   * for temporary files (see also `Deno.dir("temp")`), unless `dir` is specified.
-   * Other optional options include prefixing and suffixing the directory name
-   * with `prefix` and `suffix` respectively.
+   * for temporary files, unless `dir` is specified. Other optional options
+   * include prefixing and suffixing the directory name with `prefix` and
+   * `suffix` respectively.
    *
    * The full path to the newly created directory is returned.
    *
@@ -1013,9 +1013,9 @@ declare namespace Deno {
   export function makeTempDirSync(options?: MakeTempOptions): string;
 
   /** Creates a new temporary directory in the default directory for temporary
-   * files (see also `Deno.dir("temp")`), unless `dir` is specified.  Other
-   * optional options include prefixing and suffixing the directory name with
-   * `prefix` and `suffix` respectively.
+   * files, unless `dir` is specified. Other optional options include
+   * prefixing and suffixing the directory name with `prefix` and `suffix`
+   * respectively.
    *
    * This call resolves to the full path to the newly created directory.
    *
@@ -1565,7 +1565,7 @@ declare namespace Deno {
    * else overwriting.
    *
    * ```ts
-   * await Deno.writeTextFileSync("hello1.txt", "Hello world\n");  // overwrite "hello1.txt" or create it
+   * Deno.writeTextFileSync("hello1.txt", "Hello world\n");  // overwrite "hello1.txt" or create it
    * ```
    *
    * Requires `allow-write` permission, and `allow-read` if `options.create` is `false`.
@@ -1896,7 +1896,7 @@ declare namespace Deno {
   export interface RunOptions {
     /** Arguments to pass. Note, the first element needs to be a path to the
      * binary */
-    cmd: string[];
+    cmd: string[] | [URL, ...string[]];
     cwd?: string;
     env?: {
       [key: string]: string;
@@ -2025,4 +2025,7 @@ declare namespace Deno {
    * called when `Deno.inspect()` is called, or when the object is logged to
    * the console. */
   export const customInspect: unique symbol;
+
+  /** The URL of the entrypoint module entered from the command-line. */
+  export const mainModule: string;
 }
diff --git a/cli/dts/lib.deno.shared_globals.d.ts b/cli/dts/lib.deno.shared_globals.d.ts
index c77f1ea0e7eecc..672f8ada41dcf9 100644
--- a/cli/dts/lib.deno.shared_globals.d.ts
+++ b/cli/dts/lib.deno.shared_globals.d.ts
@@ -4,6 +4,7 @@
 
 /// <reference no-default-lib="true" />
 /// <reference lib="esnext" />
+/// <reference lib="deno.web" />
 
 // This follows the WebIDL at: https://webassembly.github.io/spec/js-api/
 // and: https://webassembly.github.io/spec/web-api/
@@ -529,12 +530,6 @@ interface DOMStringList {
   [index: number]: string;
 }
 
-declare class DOMException extends Error {
-  constructor(message?: string, name?: string);
-  readonly name: string;
-  readonly message: string;
-}
-
 type BufferSource = ArrayBufferView | ArrayBuffer;
 type BlobPart = BufferSource | Blob | string;
 
@@ -574,6 +569,48 @@ declare const File: {
   new (fileBits: BlobPart[], fileName: string, options?: FilePropertyBag): File;
 };
 
+interface FileReaderEventMap {
+  "abort": ProgressEvent<FileReader>;
+  "error": ProgressEvent<FileReader>;
+  "load": ProgressEvent<FileReader>;
+  "loadend": ProgressEvent<FileReader>;
+  "loadstart": ProgressEvent<FileReader>;
+  "progress": ProgressEvent<FileReader>;
+}
+
+/** Lets web applications asynchronously read the contents of files (or raw data buffers) stored on the user's computer, using File or Blob objects to specify the file or data to read. */
+interface FileReader extends EventTarget {
+  readonly error: DOMException | null;
+  onabort: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onerror: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onload: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onloadend: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onloadstart: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onprogress: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  readonly readyState: number;
+  readonly result: string | ArrayBuffer | null;
+  abort(): void;
+  readAsArrayBuffer(blob: Blob): void;
+  readAsBinaryString(blob: Blob): void;
+  readAsDataURL(blob: Blob): void;
+  readAsText(blob: Blob, encoding?: string): void;
+  readonly DONE: number;
+  readonly EMPTY: number;
+  readonly LOADING: number;
+  addEventListener<K extends keyof FileReaderEventMap>(type: K, listener: (this: FileReader, ev: FileReaderEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+  addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+  removeEventListener<K extends keyof FileReaderEventMap>(type: K, listener: (this: FileReader, ev: FileReaderEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+  removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var FileReader: {
+  prototype: FileReader;
+  new(): FileReader;
+  readonly DONE: number;
+  readonly EMPTY: number;
+  readonly LOADING: number;
+};
+
 declare const isConsoleInstance: unique symbol;
 
 declare class Console {
@@ -594,8 +631,7 @@ declare class Console {
     }>,
   ) => void;
 
-  /** From MDN:
-   * Displays an interactive tree of the descendant elements of
+  /** Displays an interactive tree of the descendant elements of
    * the specified XML/HTML element. If it is not possible to display
    * as an element the JavaScript Object view is shown instead.
    * The output is presented as a hierarchical listing of expandable
@@ -603,6 +639,9 @@ declare class Console {
    *
    * Since we write to stdout, we can't display anything interactive
    * we just fall back to `console.dir`.
+   * 
+   * > [Console.dirxml](https://developer.mozilla.org/en-US/docs/Web/API/Console/dirxml)
+   * > by Mozilla Contributors is licensed under CC-BY-SA 2.5.
    */
   dirxml: (
     obj: unknown,
@@ -1028,46 +1067,6 @@ declare function fetch(
   init?: RequestInit,
 ): Promise<Response>;
 
-/** Decodes a string of data which has been encoded using base-64 encoding.
- *
- *     console.log(atob("aGVsbG8gd29ybGQ=")); // outputs 'hello world'
- */
-declare function atob(s: string): string;
-
-/** Creates a base-64 ASCII encoded string from the input string.
- *
- *     console.log(btoa("hello world"));  // outputs "aGVsbG8gd29ybGQ="
- */
-declare function btoa(s: string): string;
-
-declare class TextDecoder {
-  /** Returns encoding's name, lowercased. */
-  readonly encoding: string;
-  /** Returns `true` if error mode is "fatal", and `false` otherwise. */
-  readonly fatal: boolean;
-  /** Returns `true` if ignore BOM flag is set, and `false` otherwise. */
-  readonly ignoreBOM = false;
-  constructor(
-    label?: string,
-    options?: { fatal?: boolean; ignoreBOM?: boolean },
-  );
-  /** Returns the result of running encoding's decoder. */
-  decode(input?: BufferSource, options?: { stream?: false }): string;
-  readonly [Symbol.toStringTag]: string;
-}
-
-declare class TextEncoder {
-  /** Returns "utf-8". */
-  readonly encoding = "utf-8";
-  /** Returns the result of running UTF-8's encoder. */
-  encode(input?: string): Uint8Array;
-  encodeInto(
-    input: string,
-    dest: Uint8Array,
-  ): { read: number; written: number };
-  readonly [Symbol.toStringTag]: string;
-}
-
 interface URLSearchParams {
   /** Appends a specified key/value pair as a new search parameter.
    *
@@ -1277,6 +1276,12 @@ interface PostMessageOptions {
   transfer?: any[];
 }
 
+interface ProgressEventInit extends EventInit {
+  lengthComputable?: boolean;
+  loaded?: number;
+  total?: number;
+}
+
 declare class Worker extends EventTarget {
   onerror?: (e: ErrorEvent) => void;
   onmessage?: (e: MessageEvent) => void;
@@ -1442,143 +1447,6 @@ declare class PerformanceMeasure extends PerformanceEntry {
   readonly entryType: "measure";
 }
 
-interface EventInit {
-  bubbles?: boolean;
-  cancelable?: boolean;
-  composed?: boolean;
-}
-
-/** An event which takes place in the DOM. */
-declare class Event {
-  constructor(type: string, eventInitDict?: EventInit);
-  /** Returns true or false depending on how event was initialized. True if
-   * event goes through its target's ancestors in reverse tree order, and
-   * false otherwise. */
-  readonly bubbles: boolean;
-  cancelBubble: boolean;
-  /** Returns true or false depending on how event was initialized. Its return
-   * value does not always carry meaning, but true can indicate that part of the
-   * operation during which event was dispatched, can be canceled by invoking
-   * the preventDefault() method. */
-  readonly cancelable: boolean;
-  /** Returns true or false depending on how event was initialized. True if
-   * event invokes listeners past a ShadowRoot node that is the root of its
-   * target, and false otherwise. */
-  readonly composed: boolean;
-  /** Returns the object whose event listener's callback is currently being
-   * invoked. */
-  readonly currentTarget: EventTarget | null;
-  /** Returns true if preventDefault() was invoked successfully to indicate
-   * cancellation, and false otherwise. */
-  readonly defaultPrevented: boolean;
-  /** Returns the event's phase, which is one of NONE, CAPTURING_PHASE,
-   * AT_TARGET, and BUBBLING_PHASE. */
-  readonly eventPhase: number;
-  /** Returns true if event was dispatched by the user agent, and false
-   * otherwise. */
-  readonly isTrusted: boolean;
-  /** Returns the object to which event is dispatched (its target). */
-  readonly target: EventTarget | null;
-  /** Returns the event's timestamp as the number of milliseconds measured
-   * relative to the time origin. */
-  readonly timeStamp: number;
-  /** Returns the type of event, e.g. "click", "hashchange", or "submit". */
-  readonly type: string;
-  /** Returns the invocation target objects of event's path (objects on which
-   * listeners will be invoked), except for any nodes in shadow trees of which
-   * the shadow root's mode is "closed" that are not reachable from event's
-   * currentTarget. */
-  composedPath(): EventTarget[];
-  /** If invoked when the cancelable attribute value is true, and while
-   * executing a listener for the event with passive set to false, signals to
-   * the operation that caused event to be dispatched that it needs to be
-   * canceled. */
-  preventDefault(): void;
-  /** Invoking this method prevents event from reaching any registered event
-   * listeners after the current one finishes running and, when dispatched in a
-   * tree, also prevents event from reaching any other objects. */
-  stopImmediatePropagation(): void;
-  /** When dispatched in a tree, invoking this method prevents event from
-   * reaching any objects other than the current object. */
-  stopPropagation(): void;
-  readonly AT_TARGET: number;
-  readonly BUBBLING_PHASE: number;
-  readonly CAPTURING_PHASE: number;
-  readonly NONE: number;
-  static readonly AT_TARGET: number;
-  static readonly BUBBLING_PHASE: number;
-  static readonly CAPTURING_PHASE: number;
-  static readonly NONE: number;
-}
-
-/**
- * EventTarget is a DOM interface implemented by objects that can receive events
- * and may have listeners for them.
- */
-declare class EventTarget {
-  /** Appends an event listener for events whose type attribute value is type.
-   * The callback argument sets the callback that will be invoked when the event
-   * is dispatched.
-   *
-   * The options argument sets listener-specific options. For compatibility this
-   * can be a boolean, in which case the method behaves exactly as if the value
-   * was specified as options's capture.
-   *
-   * When set to true, options's capture prevents callback from being invoked
-   * when the event's eventPhase attribute value is BUBBLING_PHASE. When false
-   * (or not present), callback will not be invoked when event's eventPhase
-   * attribute value is CAPTURING_PHASE. Either way, callback will be invoked if
-   * event's eventPhase attribute value is AT_TARGET.
-   *
-   * When set to true, options's passive indicates that the callback will not
-   * cancel the event by invoking preventDefault(). This is used to enable
-   * performance optimizations described in § 2.8 Observing event listeners.
-   *
-   * When set to true, options's once indicates that the callback will only be
-   * invoked once after which the event listener will be removed.
-   *
-   * The event listener is appended to target's event listener list and is not
-   * appended if it has the same type, callback, and capture. */
-  addEventListener(
-    type: string,
-    listener: EventListenerOrEventListenerObject | null,
-    options?: boolean | AddEventListenerOptions,
-  ): void;
-  /** Dispatches a synthetic event event to target and returns true if either
-   * event's cancelable attribute value is false or its preventDefault() method
-   * was not invoked, and false otherwise. */
-  dispatchEvent(event: Event): boolean;
-  /** Removes the event listener in target's event listener list with the same
-   * type, callback, and options. */
-  removeEventListener(
-    type: string,
-    callback: EventListenerOrEventListenerObject | null,
-    options?: EventListenerOptions | boolean,
-  ): void;
-  [Symbol.toStringTag]: string;
-}
-
-interface EventListener {
-  (evt: Event): void | Promise<void>;
-}
-
-interface EventListenerObject {
-  handleEvent(evt: Event): void | Promise<void>;
-}
-
-declare type EventListenerOrEventListenerObject =
-  | EventListener
-  | EventListenerObject;
-
-interface AddEventListenerOptions extends EventListenerOptions {
-  once?: boolean;
-  passive?: boolean;
-}
-
-interface EventListenerOptions {
-  capture?: boolean;
-}
-
 /** Events measuring progress of an underlying process, like an HTTP request
  * (for an XMLHttpRequest, or the loading of the underlying resource of an
  * <img>, <audio>, <video>, <style> or <link>). */
@@ -1589,6 +1457,11 @@ interface ProgressEvent<T extends EventTarget = EventTarget> extends Event {
   readonly total: number;
 }
 
+declare var ProgressEvent: {
+  prototype: ProgressEvent;
+  new(type:string, eventInitDict?: ProgressEventInit): ProgressEvent;
+};
+
 interface CustomEventInit<T = any> extends EventInit {
   detail?: T;
 }
@@ -1600,54 +1473,6 @@ declare class CustomEvent<T = any> extends Event {
   readonly detail: T;
 }
 
-/** A controller object that allows you to abort one or more DOM requests as and
- * when desired. */
-declare class AbortController {
-  /** Returns the AbortSignal object associated with this object. */
-  readonly signal: AbortSignal;
-  /** Invoking this method will set this object's AbortSignal's aborted flag and
-   * signal to any observers that the associated activity is to be aborted. */
-  abort(): void;
-}
-
-interface AbortSignalEventMap {
-  abort: Event;
-}
-
-/** A signal object that allows you to communicate with a DOM request (such as a
- * Fetch) and abort it if required via an AbortController object. */
-interface AbortSignal extends EventTarget {
-  /** Returns true if this AbortSignal's AbortController has signaled to abort,
-   * and false otherwise. */
-  readonly aborted: boolean;
-  onabort: ((this: AbortSignal, ev: Event) => any) | null;
-  addEventListener<K extends keyof AbortSignalEventMap>(
-    type: K,
-    listener: (this: AbortSignal, ev: AbortSignalEventMap[K]) => any,
-    options?: boolean | AddEventListenerOptions,
-  ): void;
-  addEventListener(
-    type: string,
-    listener: EventListenerOrEventListenerObject,
-    options?: boolean | AddEventListenerOptions,
-  ): void;
-  removeEventListener<K extends keyof AbortSignalEventMap>(
-    type: K,
-    listener: (this: AbortSignal, ev: AbortSignalEventMap[K]) => any,
-    options?: boolean | EventListenerOptions,
-  ): void;
-  removeEventListener(
-    type: string,
-    listener: EventListenerOrEventListenerObject,
-    options?: boolean | EventListenerOptions,
-  ): void;
-}
-
-declare const AbortSignal: {
-  prototype: AbortSignal;
-  new (): AbortSignal;
-};
-
 interface ErrorConstructor {
   /** See https://v8.dev/docs/stack-trace-api#stack-trace-collection-for-custom-exceptions. */
   // eslint-disable-next-line @typescript-eslint/ban-types
diff --git a/cli/dts/lib.deno.unstable.d.ts b/cli/dts/lib.deno.unstable.d.ts
index d23536c428d14f..14079f30012888 100644
--- a/cli/dts/lib.deno.unstable.d.ts
+++ b/cli/dts/lib.deno.unstable.d.ts
@@ -48,7 +48,7 @@ declare namespace Deno {
    * Gets the size of the console as columns/rows.
    *
    * ```ts
-   * const { columns, rows } = await Deno.consoleSize(Deno.stdout.rid);
+   * const { columns, rows } = Deno.consoleSize(Deno.stdout.rid);
    * ```
    */
   export function consoleSize(
@@ -283,7 +283,7 @@ declare namespace Deno {
      * symbols). Defaults to `false`. */
     keyofStringsOnly?: string;
     /** Emit class fields with ECMAScript-standard semantics. Defaults to `false`.
-     * Does not apply to `"esnext"` target. */
+     */
     useDefineForClassFields?: boolean;
     /** List of library files to be included in the compilation. If omitted,
      * then the Deno main runtime libs are used. */
@@ -1098,9 +1098,6 @@ declare namespace Deno {
    */
   export function hostname(): string;
 
-  /** **UNSTABLE**: The URL of the file that was originally executed from the command-line. */
-  export const mainModule: string;
-
   /** **UNSTABLE**: new API, yet to be vetted.
    * Synchronously truncates or extends the specified file stream, to reach the
    * specified `len`.  If `len` is not specified then the entire file contents
@@ -1214,4 +1211,45 @@ declare namespace Deno {
    * The pid of the current process's parent.
    */
   export const ppid: number;
+
+  /** **UNSTABLE**: New API, yet to be vetted.
+   * A custom HttpClient for use with `fetch`.
+   *
+   * ```ts
+   * const client = new Deno.createHttpClient({ caFile: "./ca.pem" });
+   * const req = await fetch("https://myserver.com", { client });
+   * ```
+   */
+  export class HttpClient {
+    rid: number;
+    close(): void;
+  }
+
+  /** **UNSTABLE**: New API, yet to be vetted.
+   * The options used when creating a [HttpClient].
+   */
+  interface CreateHttpClientOptions {
+    /** A certificate authority to use when validating TLS certificates.
+     *
+     * Requires `allow-read` permission.
+     */
+    caFile?: string;
+  }
+
+  /** **UNSTABLE**: New API, yet to be vetted.
+   * Create a custom HttpClient for to use with `fetch`.
+   *
+   * ```ts
+   * const client = new Deno.createHttpClient({ caFile: "./ca.pem" });
+   * const req = await fetch("https://myserver.com", { client });
+   * ```
+   */
+  export function createHttpClient(
+    options: CreateHttpClientOptions,
+  ): HttpClient;
 }
+
+declare function fetch(
+  input: Request | URL | string,
+  init?: RequestInit & { client: Deno.HttpClient },
+): Promise<Response>;
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index feb6e29ed11580..c703bfc2723c91 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -7,10 +7,12 @@ use crate::http_util::FetchOnceResult;
 use crate::msg;
 use crate::op_error::OpError;
 use crate::permissions::Permissions;
+use crate::text_encoding;
 use deno_core::ErrBox;
 use deno_core::ModuleSpecifier;
 use futures::future::FutureExt;
 use log::info;
+use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fs;
 use std::future::Future;
@@ -24,6 +26,47 @@ use std::sync::Arc;
 use std::sync::Mutex;
 use url::Url;
 
+/// Structure representing a text document.
+#[derive(Debug, Clone)]
+pub struct TextDocument {
+  bytes: Vec<u8>,
+  charset: Cow<'static, str>,
+}
+
+impl TextDocument {
+  pub fn new(
+    bytes: Vec<u8>,
+    charset: Option<impl Into<Cow<'static, str>>>,
+  ) -> TextDocument {
+    let charset = charset
+      .map(|cs| cs.into())
+      .unwrap_or_else(|| text_encoding::detect_charset(&bytes).into());
+    TextDocument { bytes, charset }
+  }
+
+  pub fn as_bytes(&self) -> &Vec<u8> {
+    &self.bytes
+  }
+
+  pub fn into_bytes(self) -> Vec<u8> {
+    self.bytes
+  }
+
+  pub fn to_str(&self) -> Result<Cow<str>, std::io::Error> {
+    text_encoding::convert_to_utf8(&self.bytes, &self.charset)
+  }
+
+  pub fn to_string(&self) -> Result<String, std::io::Error> {
+    self.to_str().map(String::from)
+  }
+}
+
+impl From<Vec<u8>> for TextDocument {
+  fn from(bytes: Vec<u8>) -> Self {
+    TextDocument::new(bytes, Option::<&str>::None)
+  }
+}
+
 /// Structure representing local or remote file.
 ///
 /// In case of remote file `url` might be different than originally requested URL, if so
@@ -34,7 +77,7 @@ pub struct SourceFile {
   pub filename: PathBuf,
   pub types_header: Option<String>,
   pub media_type: msg::MediaType,
-  pub source_code: Vec<u8>,
+  pub source_code: TextDocument,
 }
 
 /// Simple struct implementing in-process caching to prevent multiple
@@ -78,7 +121,7 @@ impl SourceFileFetcher {
     cache_blocklist: Vec<String>,
     no_remote: bool,
     cached_only: bool,
-    ca_file: Option<String>,
+    ca_file: Option<&str>,
   ) -> Result<Self, ErrBox> {
     let file_fetcher = Self {
       http_cache,
@@ -180,8 +223,9 @@ impl SourceFileFetcher {
     match result {
       Ok(mut file) => {
         // TODO: move somewhere?
-        if file.source_code.starts_with(b"#!") {
-          file.source_code = filter_shebang(file.source_code);
+        if file.source_code.bytes.starts_with(b"#!") {
+          file.source_code =
+            filter_shebang(&file.source_code.to_str().unwrap()[..]).into();
         }
 
         // Cache in-process for subsequent access.
@@ -313,12 +357,12 @@ impl SourceFileFetcher {
       Err(e) => return Err(e.into()),
     };
 
-    let media_type = map_content_type(&filepath, None);
+    let (media_type, charset) = map_content_type(&filepath, None);
     Ok(SourceFile {
       url: module_url.clone(),
       filename: filepath,
       media_type,
-      source_code,
+      source_code: TextDocument::new(source_code, charset),
       types_header: None,
     })
   }
@@ -380,7 +424,7 @@ impl SourceFileFetcher {
 
     let cache_filename = self.http_cache.get_cache_filename(module_url);
     let fake_filepath = PathBuf::from(module_url.path());
-    let media_type = map_content_type(
+    let (media_type, charset) = map_content_type(
       &fake_filepath,
       headers.get("content-type").map(|e| e.as_str()),
     );
@@ -389,7 +433,7 @@ impl SourceFileFetcher {
       url: module_url.clone(),
       filename: cache_filename,
       media_type,
-      source_code,
+      source_code: TextDocument::new(source_code, charset),
       types_header,
     }))
   }
@@ -490,7 +534,7 @@ impl SourceFileFetcher {
           let cache_filepath = dir.http_cache.get_cache_filename(&module_url);
           // Used to sniff out content type from file extension - probably to be removed
           let fake_filepath = PathBuf::from(module_url.path());
-          let media_type = map_content_type(
+          let (media_type, charset) = map_content_type(
             &fake_filepath,
             headers.get("content-type").map(String::as_str),
           );
@@ -502,7 +546,7 @@ impl SourceFileFetcher {
             url: module_url.clone(),
             filename: cache_filepath,
             media_type,
-            source_code: source,
+            source_code: TextDocument::new(source, charset),
             types_header,
           };
 
@@ -532,16 +576,19 @@ pub fn map_file_extension(path: &Path) -> msg::MediaType {
   }
 }
 
-// convert a ContentType string into a enumerated MediaType
-fn map_content_type(path: &Path, content_type: Option<&str>) -> msg::MediaType {
+// convert a ContentType string into a enumerated MediaType + optional charset
+fn map_content_type(
+  path: &Path,
+  content_type: Option<&str>,
+) -> (msg::MediaType, Option<String>) {
   match content_type {
     Some(content_type) => {
-      // sometimes there is additional data after the media type in
+      // Sometimes there is additional data after the media type in
       // Content-Type so we have to do a bit of manipulation so we are only
-      // dealing with the actual media type
-      let ct_vector: Vec<&str> = content_type.split(';').collect();
-      let ct: &str = ct_vector.first().unwrap();
-      match ct.to_lowercase().as_ref() {
+      // dealing with the actual media type.
+      let mut ct_iter = content_type.split(';');
+      let ct = ct_iter.next().unwrap();
+      let media_type = match ct.to_lowercase().as_ref() {
         "application/typescript"
         | "text/typescript"
         | "video/vnd.dlna.mpeg-tts"
@@ -565,9 +612,16 @@ fn map_content_type(path: &Path, content_type: Option<&str>) -> msg::MediaType {
           debug!("unknown content type: {}", content_type);
           msg::MediaType::Unknown
         }
-      }
+      };
+
+      let charset = ct_iter
+        .map(str::trim)
+        .find_map(|s| s.strip_prefix("charset="))
+        .map(String::from);
+
+      (media_type, charset)
     }
-    None => map_file_extension(path),
+    None => (map_file_extension(path), None),
   }
 }
 
@@ -586,8 +640,7 @@ fn map_js_like_extension(
   }
 }
 
-fn filter_shebang(bytes: Vec<u8>) -> Vec<u8> {
-  let string = str::from_utf8(&bytes).unwrap();
+fn filter_shebang(string: &str) -> Vec<u8> {
   if let Some(i) = string.find('\n') {
     let (_, rest) = string.split_at(i);
     rest.as_bytes().to_owned()
@@ -744,7 +797,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_get_source_code_1() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (temp_dir, fetcher) = test_setup();
     let fetcher_1 = fetcher.clone();
     let fetcher_2 = fetcher.clone();
@@ -767,7 +820,7 @@ mod tests {
     assert!(result.is_ok());
     let r = result.unwrap();
     assert_eq!(
-      r.source_code,
+      r.source_code.bytes,
       &b"export { printHello } from \"./print_hello.ts\";\n"[..]
     );
     assert_eq!(&(r.media_type), &msg::MediaType::TypeScript);
@@ -794,7 +847,7 @@ mod tests {
     assert!(result2.is_ok());
     let r2 = result2.unwrap();
     assert_eq!(
-      r2.source_code,
+      r2.source_code.bytes,
       &b"export { printHello } from \"./print_hello.ts\";\n"[..]
     );
     // If get_source_file does not call remote, this should be JavaScript
@@ -823,7 +876,7 @@ mod tests {
     assert!(result3.is_ok());
     let r3 = result3.unwrap();
     assert_eq!(
-      r3.source_code,
+      r3.source_code.bytes,
       &b"export { printHello } from \"./print_hello.ts\";\n"[..]
     );
     // If get_source_file does not call remote, this should be JavaScript
@@ -850,16 +903,14 @@ mod tests {
     assert!(result4.is_ok());
     let r4 = result4.unwrap();
     let expected4 = &b"export { printHello } from \"./print_hello.ts\";\n"[..];
-    assert_eq!(r4.source_code, expected4);
+    assert_eq!(r4.source_code.bytes, expected4);
     // Resolved back to TypeScript
     assert_eq!(&(r4.media_type), &msg::MediaType::TypeScript);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_code_2() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (temp_dir, fetcher) = test_setup();
     let module_url =
       Url::parse("http://localhost:4545/cli/tests/subdir/mismatch_ext.ts")
@@ -880,7 +931,7 @@ mod tests {
     assert!(result.is_ok());
     let r = result.unwrap();
     let expected = b"export const loaded = true;\n";
-    assert_eq!(r.source_code, expected);
+    assert_eq!(r.source_code.bytes, expected);
     assert_eq!(&(r.media_type), &msg::MediaType::JavaScript);
     let (_, headers) = fetcher.http_cache.get(&module_url).unwrap();
     assert_eq!(headers.get("content-type").unwrap(), "text/javascript");
@@ -906,7 +957,7 @@ mod tests {
     assert!(result2.is_ok());
     let r2 = result2.unwrap();
     let expected2 = b"export const loaded = true;\n";
-    assert_eq!(r2.source_code, expected2);
+    assert_eq!(r2.source_code.bytes, expected2);
     // If get_source_file does not call remote, this should be TypeScript
     // as we modified before! (we do not overwrite .headers.json due to no http
     // fetch)
@@ -932,19 +983,17 @@ mod tests {
     assert!(result3.is_ok());
     let r3 = result3.unwrap();
     let expected3 = b"export const loaded = true;\n";
-    assert_eq!(r3.source_code, expected3);
+    assert_eq!(r3.source_code.bytes, expected3);
     // Now the old .headers.json file should be overwritten back to JavaScript!
     // (due to http fetch)
     assert_eq!(&(r3.media_type), &msg::MediaType::JavaScript);
     let (_, headers) = fetcher.http_cache.get(&module_url).unwrap();
     assert_eq!(headers.get("content-type").unwrap(), "text/javascript");
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_code_multiple_downloads_of_same_file() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let specifier = ModuleSpecifier::resolve_url(
       "http://localhost:4545/cli/tests/subdir/mismatch_ext.ts",
@@ -985,12 +1034,11 @@ mod tests {
     let headers_file_modified_2 = headers_file_metadata_2.modified().unwrap();
 
     assert_eq!(headers_file_modified, headers_file_modified_2);
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_code_3() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
 
     let redirect_module_url = Url::parse(
@@ -1038,13 +1086,11 @@ mod tests {
     assert!(headers.get("location").is_none());
     // Examine the meta result.
     assert_eq!(mod_meta.url, target_module_url);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_code_4() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let double_redirect_url = Url::parse(
       "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
@@ -1096,13 +1142,11 @@ mod tests {
 
     // Examine the meta result.
     assert_eq!(mod_meta.url, target_url);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_code_5() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
 
     let double_redirect_url = Url::parse(
@@ -1158,13 +1202,11 @@ mod tests {
     let file_modified_2 = file_metadata_2.modified().unwrap();
 
     assert_eq!(file_modified, file_modified_2);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_code_6() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let double_redirect_url = Url::parse(
       "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
@@ -1200,13 +1242,11 @@ mod tests {
 
     let result = fetcher.fetch_cached_remote_source(&double_redirect_url, 1);
     assert!(result.is_err());
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_code_7() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
 
     // Testing redirect with Location set to absolute url.
@@ -1255,13 +1295,11 @@ mod tests {
     assert!(headers.get("location").is_none());
     // Examine the meta result.
     assert_eq!(mod_meta.url, target_module_url);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_no_remote() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let module_url =
       Url::parse("http://localhost:4545/cli/tests/002_hello.ts").unwrap();
@@ -1279,13 +1317,11 @@ mod tests {
     // FIXME(bartlomieju):
     // let err = result.err().unwrap();
     // assert_eq!(err.kind(), ErrorKind::NotFound);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_get_source_cached_only() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let fetcher_1 = fetcher.clone();
     let fetcher_2 = fetcher.clone();
@@ -1331,12 +1367,11 @@ mod tests {
       )
       .await;
     assert!(result.is_ok());
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_source_0() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let module_url =
       Url::parse("http://127.0.0.1:4545/cli/tests/subdir/mt_video_mp2t.t3.ts")
@@ -1352,7 +1387,7 @@ mod tests {
       .await;
     assert!(result.is_ok());
     let r = result.unwrap();
-    assert_eq!(r.source_code, b"export const loaded = true;\n");
+    assert_eq!(r.source_code.bytes, b"export const loaded = true;\n");
     assert_eq!(&(r.media_type), &msg::MediaType::TypeScript);
 
     // Modify .metadata.json, make sure read from local
@@ -1368,16 +1403,14 @@ mod tests {
     let result2 = fetcher.fetch_cached_remote_source(&module_url, 1);
     assert!(result2.is_ok());
     let r2 = result2.unwrap().unwrap();
-    assert_eq!(r2.source_code, b"export const loaded = true;\n");
+    assert_eq!(r2.source_code.bytes, b"export const loaded = true;\n");
     // Not MediaType::TypeScript due to .headers.json modification
     assert_eq!(&(r2.media_type), &msg::MediaType::JavaScript);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn fetch_remote_source_no_ext() {
-    let g = test_util::http_server();
+    let _g = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let module_url =
       &Url::parse("http://localhost:4545/cli/tests/subdir/no_ext").unwrap();
@@ -1392,16 +1425,15 @@ mod tests {
       .await;
     assert!(result.is_ok());
     let r = result.unwrap();
-    assert_eq!(r.source_code, b"export const loaded = true;\n");
+    assert_eq!(r.source_code.bytes, b"export const loaded = true;\n");
     assert_eq!(&(r.media_type), &msg::MediaType::TypeScript);
     let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
     assert_eq!(headers.get("content-type").unwrap(), "text/typescript");
-    drop(g)
   }
 
   #[tokio::test]
   async fn fetch_remote_source_mismatch_ext() {
-    let g = test_util::http_server();
+    let _g = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let module_url =
       &Url::parse("http://localhost:4545/cli/tests/subdir/mismatch_ext.ts")
@@ -1417,16 +1449,15 @@ mod tests {
       .await;
     assert!(result.is_ok());
     let r2 = result.unwrap();
-    assert_eq!(r2.source_code, b"export const loaded = true;\n");
+    assert_eq!(r2.source_code.bytes, b"export const loaded = true;\n");
     assert_eq!(&(r2.media_type), &msg::MediaType::JavaScript);
     let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
     assert_eq!(headers.get("content-type").unwrap(), "text/javascript");
-    drop(g);
   }
 
   #[tokio::test]
   async fn fetch_remote_source_unknown_ext() {
-    let g = test_util::http_server();
+    let _g = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let module_url =
       &Url::parse("http://localhost:4545/cli/tests/subdir/unknown_ext.deno")
@@ -1442,11 +1473,10 @@ mod tests {
       .await;
     assert!(result.is_ok());
     let r3 = result.unwrap();
-    assert_eq!(r3.source_code, b"export const loaded = true;\n");
+    assert_eq!(r3.source_code.bytes, b"export const loaded = true;\n");
     assert_eq!(&(r3.media_type), &msg::MediaType::TypeScript);
     let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
     assert_eq!(headers.get("content-type").unwrap(), "text/typescript");
-    drop(g);
   }
 
   #[tokio::test]
@@ -1462,7 +1492,7 @@ mod tests {
     assert!(r.is_err());
 
     let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-      .join("js2/99_main.js");
+      .join("rt/99_main.js");
     let specifier =
       ModuleSpecifier::resolve_url_or_path(p.to_str().unwrap()).unwrap();
     let r = fetcher
@@ -1485,7 +1515,7 @@ mod tests {
     assert!(r.is_err());
 
     let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-      .join("js2/99_main.js");
+      .join("rt/99_main.js");
     let specifier =
       ModuleSpecifier::resolve_url_or_path(p.to_str().unwrap()).unwrap();
     let r = fetcher
@@ -1523,6 +1553,63 @@ mod tests {
     }
   }
 
+  async fn test_fetch_source_file_from_disk_nonstandard_encoding(
+    charset: &str,
+    expected_content: String,
+  ) {
+    let (_temp_dir, fetcher) = test_setup();
+
+    let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+      .join(format!("tests/encoding/{}.ts", charset));
+    let specifier =
+      ModuleSpecifier::resolve_url_or_path(p.to_str().unwrap()).unwrap();
+    let r = fetcher
+      .fetch_source_file(&specifier, None, Permissions::allow_all())
+      .await;
+    assert!(r.is_ok());
+    let fetched_file = r.unwrap();
+    let source_code = fetched_file.source_code.to_str();
+    assert!(source_code.is_ok());
+    let actual = source_code.unwrap();
+    assert_eq!(expected_content, actual);
+  }
+
+  #[tokio::test]
+  async fn test_fetch_source_file_from_disk_utf_16_be() {
+    test_fetch_source_file_from_disk_nonstandard_encoding(
+      "utf-16be",
+      String::from_utf8(
+        b"\xEF\xBB\xBFconsole.log(\"Hello World\");\x0A".to_vec(),
+      )
+      .unwrap(),
+    )
+    .await;
+  }
+
+  #[tokio::test]
+  async fn test_fetch_source_file_from_disk_utf_16_le() {
+    test_fetch_source_file_from_disk_nonstandard_encoding(
+      "utf-16le",
+      String::from_utf8(
+        b"\xEF\xBB\xBFconsole.log(\"Hello World\");\x0A".to_vec(),
+      )
+      .unwrap(),
+    )
+    .await;
+  }
+
+  #[tokio::test]
+  async fn test_fetch_source_file_from_disk_utf_8_with_bom() {
+    test_fetch_source_file_from_disk_nonstandard_encoding(
+      "utf-8",
+      String::from_utf8(
+        b"\xEF\xBB\xBFconsole.log(\"Hello World\");\x0A".to_vec(),
+      )
+      .unwrap(),
+    )
+    .await;
+  }
+
   #[test]
   fn test_map_file_extension() {
     assert_eq!(
@@ -1571,43 +1658,43 @@ mod tests {
   fn test_map_content_type_extension_only() {
     // Extension only
     assert_eq!(
-      map_content_type(Path::new("foo/bar.ts"), None),
+      map_content_type(Path::new("foo/bar.ts"), None).0,
       msg::MediaType::TypeScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.tsx"), None),
+      map_content_type(Path::new("foo/bar.tsx"), None).0,
       msg::MediaType::TSX
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.d.ts"), None),
+      map_content_type(Path::new("foo/bar.d.ts"), None).0,
       msg::MediaType::TypeScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.js"), None),
+      map_content_type(Path::new("foo/bar.js"), None).0,
       msg::MediaType::JavaScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.txt"), None),
+      map_content_type(Path::new("foo/bar.txt"), None).0,
       msg::MediaType::Unknown
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.jsx"), None),
+      map_content_type(Path::new("foo/bar.jsx"), None).0,
       msg::MediaType::JSX
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.json"), None),
+      map_content_type(Path::new("foo/bar.json"), None).0,
       msg::MediaType::Json
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.wasm"), None),
+      map_content_type(Path::new("foo/bar.wasm"), None).0,
       msg::MediaType::Wasm
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.cjs"), None),
+      map_content_type(Path::new("foo/bar.cjs"), None).0,
       msg::MediaType::JavaScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), None),
+      map_content_type(Path::new("foo/bar"), None).0,
       msg::MediaType::Unknown
     );
   }
@@ -1616,146 +1703,160 @@ mod tests {
   fn test_map_content_type_media_type_with_no_extension() {
     // Media Type
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("application/typescript")),
+      map_content_type(Path::new("foo/bar"), Some("application/typescript")).0,
       msg::MediaType::TypeScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("text/typescript")),
+      map_content_type(Path::new("foo/bar"), Some("text/typescript")).0,
       msg::MediaType::TypeScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("video/vnd.dlna.mpeg-tts")),
+      map_content_type(Path::new("foo/bar"), Some("video/vnd.dlna.mpeg-tts")).0,
       msg::MediaType::TypeScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("video/mp2t")),
+      map_content_type(Path::new("foo/bar"), Some("video/mp2t")).0,
       msg::MediaType::TypeScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("application/x-typescript")),
+      map_content_type(Path::new("foo/bar"), Some("application/x-typescript"))
+        .0,
       msg::MediaType::TypeScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("application/javascript")),
+      map_content_type(Path::new("foo/bar"), Some("application/javascript")).0,
       msg::MediaType::JavaScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("text/javascript")),
+      map_content_type(Path::new("foo/bar"), Some("text/javascript")).0,
       msg::MediaType::JavaScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("application/ecmascript")),
+      map_content_type(Path::new("foo/bar"), Some("application/ecmascript")).0,
       msg::MediaType::JavaScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("text/ecmascript")),
+      map_content_type(Path::new("foo/bar"), Some("text/ecmascript")).0,
       msg::MediaType::JavaScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("application/x-javascript")),
+      map_content_type(Path::new("foo/bar"), Some("application/x-javascript"))
+        .0,
       msg::MediaType::JavaScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("application/json")),
+      map_content_type(Path::new("foo/bar"), Some("application/json")).0,
       msg::MediaType::Json
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("application/node")),
+      map_content_type(Path::new("foo/bar"), Some("application/node")).0,
       msg::MediaType::JavaScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar"), Some("text/json")),
+      map_content_type(Path::new("foo/bar"), Some("text/json")).0,
       msg::MediaType::Json
     );
+    assert_eq!(
+      map_content_type(Path::new("foo/bar"), Some("text/json; charset=utf-8 ")),
+      (msg::MediaType::Json, Some("utf-8".to_owned()))
+    );
   }
 
   #[test]
   fn test_map_file_extension_media_type_with_extension() {
     assert_eq!(
-      map_content_type(Path::new("foo/bar.ts"), Some("text/plain")),
+      map_content_type(Path::new("foo/bar.ts"), Some("text/plain")).0,
       msg::MediaType::TypeScript
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.ts"), Some("foo/bar")),
+      map_content_type(Path::new("foo/bar.ts"), Some("foo/bar")).0,
       msg::MediaType::Unknown
     );
     assert_eq!(
       map_content_type(
         Path::new("foo/bar.tsx"),
         Some("application/typescript"),
-      ),
+      )
+      .0,
       msg::MediaType::TSX
     );
     assert_eq!(
       map_content_type(
         Path::new("foo/bar.tsx"),
         Some("application/javascript"),
-      ),
+      )
+      .0,
       msg::MediaType::TSX
     );
     assert_eq!(
       map_content_type(
         Path::new("foo/bar.tsx"),
         Some("application/x-typescript"),
-      ),
+      )
+      .0,
       msg::MediaType::TSX
     );
     assert_eq!(
       map_content_type(
         Path::new("foo/bar.tsx"),
         Some("video/vnd.dlna.mpeg-tts"),
-      ),
+      )
+      .0,
       msg::MediaType::TSX
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.tsx"), Some("video/mp2t")),
+      map_content_type(Path::new("foo/bar.tsx"), Some("video/mp2t")).0,
       msg::MediaType::TSX
     );
     assert_eq!(
       map_content_type(
         Path::new("foo/bar.jsx"),
         Some("application/javascript"),
-      ),
+      )
+      .0,
       msg::MediaType::JSX
     );
     assert_eq!(
       map_content_type(
         Path::new("foo/bar.jsx"),
         Some("application/x-typescript"),
-      ),
+      )
+      .0,
       msg::MediaType::JSX
     );
     assert_eq!(
       map_content_type(
         Path::new("foo/bar.jsx"),
         Some("application/ecmascript"),
-      ),
+      )
+      .0,
       msg::MediaType::JSX
     );
     assert_eq!(
-      map_content_type(Path::new("foo/bar.jsx"), Some("text/ecmascript")),
+      map_content_type(Path::new("foo/bar.jsx"), Some("text/ecmascript")).0,
       msg::MediaType::JSX
     );
     assert_eq!(
       map_content_type(
         Path::new("foo/bar.jsx"),
         Some("application/x-javascript"),
-      ),
+      )
+      .0,
       msg::MediaType::JSX
     );
   }
 
   #[test]
   fn test_filter_shebang() {
-    assert_eq!(filter_shebang(b"#!"[..].to_owned()), b"");
-    assert_eq!(filter_shebang(b"#!\n\n"[..].to_owned()), b"\n\n");
-    let code = b"#!/usr/bin/env deno\nconsole.log('hello');\n"[..].to_owned();
+    assert_eq!(filter_shebang("#!"), b"");
+    assert_eq!(filter_shebang("#!\n\n"), b"\n\n");
+    let code = "#!/usr/bin/env deno\nconsole.log('hello');\n";
     assert_eq!(filter_shebang(code), b"\nconsole.log('hello');\n");
   }
 
   #[tokio::test]
   async fn test_fetch_with_etag() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let module_url =
       Url::parse("http://127.0.0.1:4545/etag_script.ts").unwrap();
@@ -1771,7 +1872,7 @@ mod tests {
       .await;
     assert!(source.is_ok());
     let source = source.unwrap();
-    assert_eq!(source.source_code, b"console.log('etag')");
+    assert_eq!(source.source_code.bytes, b"console.log('etag')");
     assert_eq!(&(source.media_type), &msg::MediaType::TypeScript);
 
     let (_, headers) = fetcher.http_cache.get(&module_url).unwrap();
@@ -1798,19 +1899,17 @@ mod tests {
       )
       .await
       .unwrap();
-    assert_eq!(cached_source.source_code, b"changed content");
+    assert_eq!(cached_source.source_code.bytes, b"changed content");
 
     let modified2 = metadata_path.metadata().unwrap().modified().unwrap();
 
     // Assert that the file has not been modified
     assert_eq!(modified1, modified2);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_with_types_header() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let (_temp_dir, fetcher) = test_setup();
     let module_url =
       Url::parse("http://127.0.0.1:4545/xTypeScriptTypes.js").unwrap();
@@ -1825,12 +1924,85 @@ mod tests {
       .await;
     assert!(source.is_ok());
     let source = source.unwrap();
-    assert_eq!(source.source_code, b"export const foo = 'foo';");
+    assert_eq!(source.source_code.bytes, b"export const foo = 'foo';");
     assert_eq!(&(source.media_type), &msg::MediaType::JavaScript);
     assert_eq!(
       source.types_header,
       Some("./xTypeScriptTypes.d.ts".to_string())
     );
-    drop(http_server_guard);
+  }
+
+  #[tokio::test]
+  async fn test_fetch_source_file_from_net_utf16_le() {
+    let content =
+      std::str::from_utf8(b"\xEF\xBB\xBFconsole.log(\"Hello World\");\x0A")
+        .unwrap();
+    test_fetch_non_utf8_source_file_from_net(
+      "utf-16le",
+      "utf-16le.ts",
+      content,
+    )
+    .await;
+  }
+
+  #[tokio::test]
+  async fn test_fetch_source_file_from_net_utf16_be() {
+    let content =
+      std::str::from_utf8(b"\xEF\xBB\xBFconsole.log(\"Hello World\");\x0A")
+        .unwrap();
+    test_fetch_non_utf8_source_file_from_net(
+      "utf-16be",
+      "utf-16be.ts",
+      content,
+    )
+    .await;
+  }
+
+  #[tokio::test]
+  async fn test_fetch_source_file_from_net_windows_1255() {
+    let content = "console.log(\"\u{5E9}\u{5DC}\u{5D5}\u{5DD} \
+                   \u{5E2}\u{5D5}\u{5DC}\u{5DD}\");\u{A}";
+    test_fetch_non_utf8_source_file_from_net(
+      "windows-1255",
+      "windows-1255",
+      content,
+    )
+    .await;
+  }
+
+  async fn test_fetch_non_utf8_source_file_from_net(
+    charset: &str,
+    file_name: &str,
+    expected_content: &str,
+  ) {
+    let _http_server_guard = test_util::http_server();
+    let (_temp_dir, fetcher) = test_setup();
+    let module_url = Url::parse(&format!(
+      "http://127.0.0.1:4545/cli/tests/encoding/{}",
+      file_name
+    ))
+    .unwrap();
+
+    let source = fetcher
+      .fetch_remote_source(
+        &module_url,
+        false,
+        false,
+        1,
+        &Permissions::allow_all(),
+      )
+      .await;
+    assert!(source.is_ok());
+    let source = source.unwrap();
+    assert_eq!(&source.source_code.charset.to_lowercase()[..], charset);
+    let text = &source.source_code.to_str().unwrap();
+    assert_eq!(text, expected_content);
+    assert_eq!(&(source.media_type), &msg::MediaType::TypeScript);
+
+    let (_, headers) = fetcher.http_cache.get(&module_url).unwrap();
+    assert_eq!(
+      headers.get("content-type").unwrap(),
+      &format!("application/typescript;charset={}", charset)
+    );
   }
 }
diff --git a/cli/flags.rs b/cli/flags.rs
index 5ca4824cd2923e..325b291489324b 100644
--- a/cli/flags.rs
+++ b/cli/flags.rs
@@ -3,6 +3,7 @@ use clap::App;
 use clap::AppSettings;
 use clap::Arg;
 use clap::ArgMatches;
+use clap::ArgSettings;
 use clap::SubCommand;
 use log::Level;
 use std::net::SocketAddr;
@@ -39,6 +40,7 @@ pub enum DenoSubcommand {
   Fmt {
     check: bool,
     files: Vec<String>,
+    ignore: Vec<String>,
   },
   Help,
   Info {
@@ -54,7 +56,9 @@ pub enum DenoSubcommand {
   },
   Lint {
     files: Vec<String>,
+    ignore: Vec<String>,
     rules: bool,
+    json: bool,
   },
   Repl,
   Run {
@@ -102,6 +106,7 @@ pub struct Flags {
   pub ca_file: Option<String>,
   pub cached_only: bool,
   pub config_path: Option<String>,
+  pub ignore: Vec<String>,
   pub import_map_path: Option<String>,
   pub inspect: Option<SocketAddr>,
   pub inspect_brk: Option<SocketAddr>,
@@ -192,6 +197,8 @@ static ENV_VARIABLES_HELP: &str = "ENVIRONMENT VARIABLES:
     HTTP_PROXY           Proxy address for HTTP requests
                          (module downloads, fetch)
     HTTPS_PROXY          Proxy address for HTTPS requests
+                         (module downloads, fetch)
+    NO_PROXY             Comma-separated list of hosts which do not use a proxy
                          (module downloads, fetch)";
 
 static DENO_HELP: &str = "A secure JavaScript and TypeScript runtime
@@ -339,13 +346,20 @@ fn types_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
 }
 
 fn fmt_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
+  // TODO(divy-work): remove `--unstable` in 1.3.0
+  unstable_arg_parse(flags, matches);
   let files = match matches.values_of("files") {
     Some(f) => f.map(String::from).collect(),
     None => vec![],
   };
+  let ignore = match matches.values_of("ignore") {
+    Some(f) => f.map(String::from).collect(),
+    None => vec![],
+  };
   flags.subcommand = DenoSubcommand::Fmt {
     check: matches.is_present("check"),
     files,
+    ignore,
   }
 }
 
@@ -353,6 +367,7 @@ fn install_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
   permission_args_parse(flags, matches);
   config_arg_parse(flags, matches);
   ca_file_arg_parse(flags, matches);
+  no_check_arg_parse(flags, matches);
   unstable_arg_parse(flags, matches);
 
   let root = if matches.is_present("root") {
@@ -385,6 +400,7 @@ fn install_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
 fn bundle_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
   ca_file_arg_parse(flags, matches);
   config_arg_parse(flags, matches);
+  reload_arg_parse(flags, matches);
   importmap_arg_parse(flags, matches);
   unstable_arg_parse(flags, matches);
   lock_args_parse(flags, matches);
@@ -457,10 +473,11 @@ fn eval_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
 }
 
 fn info_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
+  reload_arg_parse(flags, matches);
   ca_file_arg_parse(flags, matches);
   unstable_arg_parse(flags, matches);
   let json = matches.is_present("json");
-  no_check_arg_parse(flags, matches);
+  flags.no_check = true;
   flags.subcommand = DenoSubcommand::Info {
     file: matches.value_of("file").map(|f| f.to_string()),
     json,
@@ -621,8 +638,18 @@ fn lint_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
     Some(f) => f.map(String::from).collect(),
     None => vec![],
   };
+  let ignore = match matches.values_of("ignore") {
+    Some(f) => f.map(String::from).collect(),
+    None => vec![],
+  };
   let rules = matches.is_present("rules");
-  flags.subcommand = DenoSubcommand::Lint { files, rules };
+  let json = matches.is_present("json");
+  flags.subcommand = DenoSubcommand::Lint {
+    files,
+    rules,
+    ignore,
+    json,
+  };
 }
 
 fn types_subcommand<'a, 'b>() -> App<'a, 'b> {
@@ -661,6 +688,16 @@ Ignore formatting a file by adding an ignore comment at the top of the file:
         .help("Check if the source files are formatted.")
         .takes_value(false),
     )
+    .arg(
+      Arg::with_name("ignore")
+        .long("ignore")
+        .requires("unstable")
+        .takes_value(true)
+        .use_delimiter(true)
+        .require_equals(true)
+        .help("Ignore formatting particular source files. Use with --unstable"),
+    )
+    .arg(unstable_arg())
     .arg(
       Arg::with_name("files")
         .takes_value(true)
@@ -704,6 +741,7 @@ fn install_subcommand<'a, 'b>() -> App<'a, 'b> {
             .short("f")
             .help("Forcefully overwrite existing installation")
             .takes_value(false))
+        .arg(no_check_arg())
         .arg(ca_file_arg())
         .arg(unstable_arg())
         .arg(config_arg())
@@ -745,6 +783,7 @@ fn bundle_subcommand<'a, 'b>() -> App<'a, 'b> {
     )
     .arg(Arg::with_name("out_file").takes_value(true).required(false))
     .arg(ca_file_arg())
+    .arg(reload_arg())
     .arg(importmap_arg())
     .arg(unstable_arg())
     .arg(config_arg())
@@ -832,8 +871,12 @@ Remote modules cache: Subdirectory containing downloaded remote modules.
 TypeScript compiler cache: Subdirectory containing TS compiler output.",
     )
     .arg(Arg::with_name("file").takes_value(true).required(false))
+    .arg(reload_arg().requires("file"))
     .arg(ca_file_arg())
-    .arg(no_check_arg())
+    // TODO(nayeemrmn): `--no-check` has been removed for `deno info`, but it
+    // shouldn't cause flag parsing to fail for backward-compatibility. Remove
+    // this line for v2.0.0.
+    .arg(no_check_arg().hidden(true))
     .arg(unstable_arg())
     .arg(
       Arg::with_name("json")
@@ -974,6 +1017,9 @@ fn lint_subcommand<'a, 'b>() -> App<'a, 'b> {
   deno lint --unstable
   deno lint --unstable myfile1.ts myfile2.js
 
+Print result as JSON:
+  deno lint --unstable --json
+
 List available rules:
   deno lint --unstable --rules
 
@@ -998,6 +1044,21 @@ Ignore linting a file by adding an ignore comment at the top of the file:
         .long("rules")
         .help("List available rules"),
     )
+    .arg(
+      Arg::with_name("ignore")
+        .long("ignore")
+        .requires("unstable")
+        .takes_value(true)
+        .use_delimiter(true)
+        .require_equals(true)
+        .help("Ignore linting particular source files."),
+    )
+    .arg(
+      Arg::with_name("json")
+        .long("json")
+        .help("Output lint result in JSON format.")
+        .takes_value(false),
+    )
     .arg(
       Arg::with_name("files")
         .takes_value(true)
@@ -1136,6 +1197,7 @@ fn test_subcommand<'a, 'b>() -> App<'a, 'b> {
     )
     .arg(
       Arg::with_name("filter")
+        .set(ArgSettings::AllowLeadingHyphen)
         .long("filter")
         .takes_value(true)
         .help("Run tests with this string or pattern in the test name"),
@@ -1675,6 +1737,7 @@ mod tests {
       r.unwrap(),
       Flags {
         subcommand: DenoSubcommand::Fmt {
+          ignore: vec![],
           check: false,
           files: vec!["script_1.ts".to_string(), "script_2.ts".to_string()]
         },
@@ -1687,6 +1750,7 @@ mod tests {
       r.unwrap(),
       Flags {
         subcommand: DenoSubcommand::Fmt {
+          ignore: vec![],
           check: true,
           files: vec![],
         },
@@ -1699,6 +1763,7 @@ mod tests {
       r.unwrap(),
       Flags {
         subcommand: DenoSubcommand::Fmt {
+          ignore: vec![],
           check: false,
           files: vec![],
         },
@@ -1722,19 +1787,28 @@ mod tests {
         subcommand: DenoSubcommand::Lint {
           files: vec!["script_1.ts".to_string(), "script_2.ts".to_string()],
           rules: false,
+          json: false,
+          ignore: vec![],
         },
         unstable: true,
         ..Flags::default()
       }
     );
 
-    let r = flags_from_vec_safe(svec!["deno", "lint", "--unstable"]);
+    let r = flags_from_vec_safe(svec![
+      "deno",
+      "lint",
+      "--unstable",
+      "--ignore=script_1.ts,script_2.ts"
+    ]);
     assert_eq!(
       r.unwrap(),
       Flags {
         subcommand: DenoSubcommand::Lint {
           files: vec![],
           rules: false,
+          json: false,
+          ignore: svec!["script_1.ts", "script_2.ts"],
         },
         unstable: true,
         ..Flags::default()
@@ -1747,7 +1821,30 @@ mod tests {
       Flags {
         subcommand: DenoSubcommand::Lint {
           files: vec![],
-          rules: true
+          rules: true,
+          json: false,
+          ignore: vec![],
+        },
+        unstable: true,
+        ..Flags::default()
+      }
+    );
+
+    let r = flags_from_vec_safe(svec![
+      "deno",
+      "lint",
+      "--unstable",
+      "--json",
+      "script_1.ts"
+    ]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Lint {
+          files: vec!["script_1.ts".to_string()],
+          rules: false,
+          json: true,
+          ignore: vec![],
         },
         unstable: true,
         ..Flags::default()
@@ -1820,6 +1917,21 @@ mod tests {
           json: false,
           file: Some("script.ts".to_string()),
         },
+        no_check: true,
+        ..Flags::default()
+      }
+    );
+
+    let r = flags_from_vec_safe(svec!["deno", "info", "--reload", "script.ts"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Info {
+          json: false,
+          file: Some("script.ts".to_string()),
+        },
+        reload: true,
+        no_check: true,
         ..Flags::default()
       }
     );
@@ -1832,6 +1944,7 @@ mod tests {
           json: true,
           file: Some("script.ts".to_string()),
         },
+        no_check: true,
         ..Flags::default()
       }
     );
@@ -1844,6 +1957,7 @@ mod tests {
           json: false,
           file: None
         },
+        no_check: true,
         ..Flags::default()
       }
     );
@@ -1856,6 +1970,7 @@ mod tests {
           json: true,
           file: None
         },
+        no_check: true,
         ..Flags::default()
       }
     );
@@ -2215,6 +2330,23 @@ mod tests {
     );
   }
 
+  #[test]
+  fn bundle_with_reload() {
+    let r =
+      flags_from_vec_safe(svec!["deno", "bundle", "--reload", "source.ts"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        reload: true,
+        subcommand: DenoSubcommand::Bundle {
+          source_file: "source.ts".to_string(),
+          out_file: None,
+        },
+        ..Flags::default()
+      }
+    );
+  }
+
   #[test]
   fn run_importmap() {
     let r = flags_from_vec_safe(svec![
@@ -2561,6 +2693,50 @@ mod tests {
         ..Flags::default()
       }
     );
+    let r =
+      flags_from_vec_safe(svec!["deno", "test", "--no-check", "script.ts"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Test {
+          fail_fast: false,
+          filter: None,
+          allow_none: false,
+          quiet: false,
+          include: Some(svec!["script.ts"]),
+        },
+        no_check: true,
+        ..Flags::default()
+      }
+    );
+    let r =
+      flags_from_vec_safe(svec!["deno", "cache", "--no-check", "script.ts"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Cache {
+          files: svec!["script.ts"],
+        },
+        no_check: true,
+        ..Flags::default()
+      }
+    );
+    // TODO(nayeemrmn): `--no-check` has been removed for `deno info`, but it
+    // shouldn't cause flag parsing to fail for backward-compatibility. Remove
+    // this test for v2.0.0.
+    let r =
+      flags_from_vec_safe(svec!["deno", "info", "--no-check", "script.ts"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Info {
+          json: false,
+          file: Some("script.ts".to_string()),
+        },
+        no_check: true,
+        ..Flags::default()
+      }
+    );
   }
 
   #[test]
@@ -2722,6 +2898,25 @@ mod tests {
     );
   }
 
+  #[test]
+  fn test_filter_leading_hyphen() {
+    let r =
+      flags_from_vec_safe(svec!["deno", "test", "--filter", "- foo", "dir1"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Test {
+          fail_fast: false,
+          allow_none: false,
+          quiet: false,
+          filter: Some("- foo".to_string()),
+          include: Some(svec!["dir1"]),
+        },
+        ..Flags::default()
+      }
+    );
+  }
+
   #[test]
   fn run_with_cafile() {
     let r = flags_from_vec_safe(svec![
@@ -2883,6 +3078,7 @@ mod tests {
           file: Some("https://example.com".to_string()),
         },
         ca_file: Some("example.crt".to_owned()),
+        no_check: true,
         ..Flags::default()
       }
     );
diff --git a/cli/fmt.rs b/cli/fmt.rs
index 59239ec17e8468..319f7fece7bbba 100644
--- a/cli/fmt.rs
+++ b/cli/fmt.rs
@@ -9,10 +9,11 @@
 
 use crate::colors;
 use crate::diff::diff;
-use crate::dprint_plugin_typescript as dprint;
 use crate::fs::files_in_subtree;
 use crate::op_error::OpError;
+use crate::text_encoding;
 use deno_core::ErrBox;
+use dprint_plugin_typescript as dprint;
 use std::fs;
 use std::io::stdin;
 use std::io::stdout;
@@ -27,15 +28,24 @@ const BOM_CHAR: char = '\u{FEFF}';
 
 /// Format JavaScript/TypeScript files.
 ///
-/// First argument supports globs, and if it is `None`
+/// First argument and ignore supports globs, and if it is `None`
 /// then the current directory is recursively walked.
-pub async fn format(args: Vec<String>, check: bool) -> Result<(), ErrBox> {
+pub async fn format(
+  args: Vec<String>,
+  check: bool,
+  exclude: Vec<String>,
+) -> Result<(), ErrBox> {
   if args.len() == 1 && args[0] == "-" {
     return format_stdin(check);
   }
-
-  let target_files = collect_files(args)?;
-
+  // collect all files provided.
+  let mut target_files = collect_files(args)?;
+  if !exclude.is_empty() {
+    // collect all files to be ignored
+    // and retain only files that should be formatted.
+    let ignore_files = collect_files(exclude)?;
+    target_files.retain(|f| !ignore_files.contains(&f));
+  }
   let config = get_config();
   if check {
     check_source_files(config, target_files).await
@@ -217,9 +227,9 @@ pub fn collect_files(files: Vec<String>) -> Result<Vec<PathBuf>, ErrBox> {
     for arg in files {
       let p = PathBuf::from(arg);
       if p.is_dir() {
-        target_files.extend(files_in_subtree(p, is_supported));
+        target_files.extend(files_in_subtree(p.canonicalize()?, is_supported));
       } else {
-        target_files.push(p);
+        target_files.push(p.canonicalize()?);
       };
     }
   }
@@ -238,13 +248,15 @@ struct FileContents {
 }
 
 fn read_file_contents(file_path: &PathBuf) -> Result<FileContents, ErrBox> {
-  let file_text = fs::read_to_string(&file_path)?;
+  let file_bytes = fs::read(&file_path)?;
+  let charset = text_encoding::detect_charset(&file_bytes);
+  let file_text = text_encoding::convert_to_utf8(&file_bytes, charset)?;
   let had_bom = file_text.starts_with(BOM_CHAR);
   let text = if had_bom {
     // remove the BOM
     String::from(&file_text[BOM_CHAR.len_utf8()..])
   } else {
-    file_text
+    String::from(file_text)
   };
 
   Ok(FileContents { text, had_bom })
diff --git a/cli/fs.rs b/cli/fs.rs
index 2aedf1e34b536f..f7781741d12f8f 100644
--- a/cli/fs.rs
+++ b/cli/fs.rs
@@ -1,10 +1,10 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+pub use deno_core::normalize_path;
+use deno_core::ErrBox;
 use std::env::current_dir;
 use std::fs::OpenOptions;
 use std::io::Write;
-use std::path::{Component, Path, PathBuf};
-
-use deno_core::ErrBox;
+use std::path::{Path, PathBuf};
 use walkdir::WalkDir;
 
 pub fn write_file<T: AsRef<[u8]>>(
@@ -46,41 +46,6 @@ pub fn write_file_2<T: AsRef<[u8]>>(
   file.write_all(data.as_ref())
 }
 
-/// IMPORTANT: This method is duplicated in core/module_specifier.rs
-///
-/// Normalize all itermediate components of the path (ie. remove "./" and "../" components).
-/// Similar to `fs::canonicalize()` but doesn't resolve symlinks.
-///
-/// Taken from Cargo
-/// https://github.com/rust-lang/cargo/blob/af307a38c20a753ec60f0ad18be5abed3db3c9ac/src/cargo/util/paths.rs#L60-L85
-pub fn normalize_path(path: &Path) -> PathBuf {
-  let mut components = path.components().peekable();
-  let mut ret =
-    if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
-      components.next();
-      PathBuf::from(c.as_os_str())
-    } else {
-      PathBuf::new()
-    };
-
-  for component in components {
-    match component {
-      Component::Prefix(..) => unreachable!(),
-      Component::RootDir => {
-        ret.push(component.as_os_str());
-      }
-      Component::CurDir => {}
-      Component::ParentDir => {
-        ret.pop();
-      }
-      Component::Normal(c) => {
-        ret.push(c);
-      }
-    }
-  }
-  ret
-}
-
 pub fn resolve_from_cwd(path: &Path) -> Result<PathBuf, ErrBox> {
   let resolved_path = if path.is_absolute() {
     path.to_owned()
diff --git a/cli/global_state.rs b/cli/global_state.rs
index 8e5808c903b522..daabcf5198aa49 100644
--- a/cli/global_state.rs
+++ b/cli/global_state.rs
@@ -17,20 +17,15 @@ use crate::tsc::TsCompiler;
 use deno_core::ErrBox;
 use deno_core::ModuleSpecifier;
 use std::env;
-use std::ops::Deref;
 use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 use std::sync::Mutex;
 use tokio::sync::Mutex as AsyncMutex;
 
-/// Holds state of the program and can be accessed by V8 isolate.
-#[derive(Clone)]
-pub struct GlobalState(Arc<GlobalStateInner>);
-
 /// This structure represents state of single "deno" program.
 ///
 /// It is shared by all created workers (thus V8 isolates).
-pub struct GlobalStateInner {
+pub struct GlobalState {
   /// Flags parsed from `argv` contents.
   pub flags: flags::Flags,
   /// Permissions parsed from `flags`.
@@ -44,23 +39,13 @@ pub struct GlobalStateInner {
   compile_lock: AsyncMutex<()>,
 }
 
-impl Deref for GlobalState {
-  type Target = GlobalStateInner;
-  fn deref(&self) -> &Self::Target {
-    &self.0
-  }
-}
-
 impl GlobalState {
-  pub fn new(flags: flags::Flags) -> Result<Self, ErrBox> {
+  pub fn new(flags: flags::Flags) -> Result<Arc<Self>, ErrBox> {
     let custom_root = env::var("DENO_DIR").map(String::into).ok();
     let dir = deno_dir::DenoDir::new(custom_root)?;
     let deps_cache_location = dir.root.join("deps");
     let http_cache = http_cache::HttpCache::new(&deps_cache_location);
-    let ca_file = flags
-      .ca_file
-      .clone()
-      .or_else(|| env::var("DENO_CERT").map(String::into).ok());
+    let ca_file = flags.ca_file.clone().or_else(|| env::var("DENO_CERT").ok());
 
     let file_fetcher = SourceFileFetcher::new(
       http_cache,
@@ -68,7 +53,7 @@ impl GlobalState {
       flags.cache_blocklist.clone(),
       flags.no_remote,
       flags.cached_only,
-      ca_file,
+      ca_file.as_deref(),
     )?;
 
     let ts_compiler = TsCompiler::new(
@@ -95,7 +80,7 @@ impl GlobalState {
         }
       };
 
-    let inner = GlobalStateInner {
+    let global_state = GlobalState {
       dir,
       permissions: Permissions::from_flags(&flags),
       flags,
@@ -106,7 +91,7 @@ impl GlobalState {
       compiler_starts: AtomicUsize::new(0),
       compile_lock: AsyncMutex::new(()),
     };
-    Ok(GlobalState(Arc::new(inner)))
+    Ok(Arc::new(global_state))
   }
 
   /// This function is called when new module load is
@@ -114,7 +99,7 @@ impl GlobalState {
   /// all dependencies and if it is required then also perform TS typecheck
   /// and traspilation.
   pub async fn prepare_module_load(
-    &self,
+    self: &Arc<Self>,
     module_specifier: ModuleSpecifier,
     maybe_referrer: Option<ModuleSpecifier>,
     target_lib: TargetLib,
@@ -174,21 +159,11 @@ impl GlobalState {
 
     if should_compile {
       if self.flags.no_check {
-        self
-          .ts_compiler
-          .transpile(self.clone(), permissions, module_graph)
-          .await?;
+        self.ts_compiler.transpile(module_graph).await?;
       } else {
         self
           .ts_compiler
-          .compile(
-            self.clone(),
-            &out,
-            target_lib,
-            permissions,
-            module_graph,
-            allow_js,
-          )
+          .compile(self, &out, target_lib, permissions, module_graph, allow_js)
           .await?;
       }
     }
@@ -213,7 +188,6 @@ impl GlobalState {
     module_specifier: ModuleSpecifier,
     _maybe_referrer: Option<ModuleSpecifier>,
   ) -> Result<CompiledModule, ErrBox> {
-    let state1 = self.clone();
     let module_specifier = module_specifier.clone();
 
     let out = self
@@ -235,7 +209,7 @@ impl GlobalState {
     };
 
     let compiled_module = if was_compiled {
-      match state1.ts_compiler.get_compiled_module(&out.url) {
+      match self.ts_compiler.get_compiled_module(&out.url) {
         Ok(module) => module,
         Err(e) => {
           let msg = format!(
@@ -253,7 +227,7 @@ impl GlobalState {
       }
     } else {
       CompiledModule {
-        code: String::from_utf8(out.source_code.clone())?,
+        code: out.source_code.to_string()?,
         name: out.url.to_string(),
       }
     };
@@ -267,16 +241,12 @@ impl GlobalState {
   pub fn mock(
     argv: Vec<String>,
     maybe_flags: Option<flags::Flags>,
-  ) -> GlobalState {
-    if let Some(in_flags) = maybe_flags {
-      GlobalState::new(flags::Flags { argv, ..in_flags }).unwrap()
-    } else {
-      GlobalState::new(flags::Flags {
-        argv,
-        ..flags::Flags::default()
-      })
-      .unwrap()
-    }
+  ) -> Arc<GlobalState> {
+    GlobalState::new(flags::Flags {
+      argv,
+      ..maybe_flags.unwrap_or_default()
+    })
+    .unwrap()
   }
 }
 
@@ -343,8 +313,8 @@ fn thread_safe() {
 
 #[test]
 fn test_should_allow_js() {
-  use crate::doc::Location;
   use crate::module_graph::ImportDescriptor;
+  use crate::swc_util::Location;
 
   assert!(should_allow_js(&[
     &ModuleGraphFile {
diff --git a/cli/http_cache.rs b/cli/http_cache.rs
index 8cfcc736adbab3..240d44adb6d69c 100644
--- a/cli/http_cache.rs
+++ b/cli/http_cache.rs
@@ -236,7 +236,6 @@ mod tests {
     );
     assert_eq!(headers.get("etag").unwrap(), "as5625rqdsfb");
     assert_eq!(headers.get("foobar"), None);
-    drop(dir);
   }
 
   #[test]
diff --git a/cli/http_util.rs b/cli/http_util.rs
index f0109ca3612bfb..bf302f7b2293d0 100644
--- a/cli/http_util.rs
+++ b/cli/http_util.rs
@@ -26,7 +26,7 @@ use url::Url;
 
 /// Create new instance of async reqwest::Client. This client supports
 /// proxies and doesn't follow redirects.
-pub fn create_http_client(ca_file: Option<String>) -> Result<Client, ErrBox> {
+pub fn create_http_client(ca_file: Option<&str>) -> Result<Client, ErrBox> {
   let mut headers = HeaderMap::new();
   headers.insert(
     USER_AGENT,
@@ -248,7 +248,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_fetch_string() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
     let url =
       Url::parse("http://127.0.0.1:4545/cli/tests/fixture.json").unwrap();
@@ -262,12 +262,11 @@ mod tests {
     } else {
       panic!();
     }
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_gzip() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
     let url = Url::parse(
       "http://127.0.0.1:4545/cli/tests/053_import_compression/gziped",
@@ -286,12 +285,11 @@ mod tests {
     } else {
       panic!();
     }
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_with_etag() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let url = Url::parse("http://127.0.0.1:4545/etag_script.ts").unwrap();
     let client = create_http_client(None).unwrap();
     let result = fetch_once(client.clone(), &url, None).await;
@@ -310,13 +308,11 @@ mod tests {
     let res =
       fetch_once(client, &url, Some("33a64df551425fcc55e".to_string())).await;
     assert_eq!(res.unwrap(), FetchOnceResult::NotModified);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_brotli() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
     let url = Url::parse(
       "http://127.0.0.1:4545/cli/tests/053_import_compression/brotli",
@@ -336,12 +332,11 @@ mod tests {
     } else {
       panic!();
     }
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_once_with_redirect() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
     let url =
       Url::parse("http://127.0.0.1:4546/cli/tests/fixture.json").unwrap();
@@ -355,7 +350,6 @@ mod tests {
     } else {
       panic!();
     }
-    drop(http_server_guard);
   }
 
   #[test]
@@ -398,17 +392,17 @@ mod tests {
 
   #[tokio::test]
   async fn test_fetch_with_cafile_string() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
     let url =
       Url::parse("https://localhost:5545/cli/tests/fixture.json").unwrap();
 
-    let client = create_http_client(Some(String::from(
+    let client = create_http_client(Some(
       test_util::root_path()
         .join("std/http/testdata/tls/RootCA.pem")
         .to_str()
         .unwrap(),
-    )))
+    ))
     .unwrap();
     let result = fetch_once(client, &url, None).await;
     if let Ok(FetchOnceResult::Code(body, headers)) = result {
@@ -419,23 +413,22 @@ mod tests {
     } else {
       panic!();
     }
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_with_cafile_gzip() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
     let url = Url::parse(
       "https://localhost:5545/cli/tests/053_import_compression/gziped",
     )
     .unwrap();
-    let client = create_http_client(Some(String::from(
+    let client = create_http_client(Some(
       test_util::root_path()
         .join("std/http/testdata/tls/RootCA.pem")
         .to_str()
         .unwrap(),
-    )))
+    ))
     .unwrap();
     let result = fetch_once(client, &url, None).await;
     if let Ok(FetchOnceResult::Code(body, headers)) = result {
@@ -449,19 +442,18 @@ mod tests {
     } else {
       panic!();
     }
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_with_cafile_with_etag() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let url = Url::parse("https://localhost:5545/etag_script.ts").unwrap();
-    let client = create_http_client(Some(String::from(
+    let client = create_http_client(Some(
       test_util::root_path()
         .join("std/http/testdata/tls/RootCA.pem")
         .to_str()
         .unwrap(),
-    )))
+    ))
     .unwrap();
     let result = fetch_once(client.clone(), &url, None).await;
     if let Ok(FetchOnceResult::Code(body, headers)) = result {
@@ -480,24 +472,22 @@ mod tests {
     let res =
       fetch_once(client, &url, Some("33a64df551425fcc55e".to_string())).await;
     assert_eq!(res.unwrap(), FetchOnceResult::NotModified);
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn test_fetch_with_cafile_brotli() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
     let url = Url::parse(
       "https://localhost:5545/cli/tests/053_import_compression/brotli",
     )
     .unwrap();
-    let client = create_http_client(Some(String::from(
+    let client = create_http_client(Some(
       test_util::root_path()
         .join("std/http/testdata/tls/RootCA.pem")
         .to_str()
         .unwrap(),
-    )))
+    ))
     .unwrap();
     let result = fetch_once(client, &url, None).await;
     if let Ok(FetchOnceResult::Code(body, headers)) = result {
@@ -512,6 +502,5 @@ mod tests {
     } else {
       panic!();
     }
-    drop(http_server_guard);
   }
 }
diff --git a/cli/installer.rs b/cli/installer.rs
index f975972a3bfdc4..6d498a16c68905 100644
--- a/cli/installer.rs
+++ b/cli/installer.rs
@@ -218,6 +218,10 @@ pub fn install(
     }
   }
 
+  if flags.no_check {
+    executable_args.push("--no-check".to_string());
+  }
+
   if flags.unstable {
     executable_args.push("--unstable".to_string());
   }
@@ -554,6 +558,7 @@ mod tests {
       Flags {
         allow_net: true,
         allow_read: true,
+        no_check: true,
         log_level: Some(Level::Error),
         ..Flags::default()
       },
@@ -572,7 +577,7 @@ mod tests {
 
     assert!(file_path.exists());
     let content = fs::read_to_string(file_path).unwrap();
-    assert!(content.contains(r#""run" "--allow-read" "--allow-net" "--quiet" "http://localhost:4545/cli/tests/echo_server.ts" "--foobar""#));
+    assert!(content.contains(r#""run" "--allow-read" "--allow-net" "--quiet" "--no-check" "http://localhost:4545/cli/tests/echo_server.ts" "--foobar""#));
   }
 
   #[test]
diff --git a/cli/js.rs b/cli/js.rs
index d63b8131aa8064..763b62aeddf630 100644
--- a/cli/js.rs
+++ b/cli/js.rs
@@ -5,6 +5,7 @@ pub static CLI_SNAPSHOT: &[u8] =
 pub static COMPILER_SNAPSHOT: &[u8] =
   include_bytes!(concat!(env!("OUT_DIR"), "/COMPILER_SNAPSHOT.bin"));
 pub static DENO_NS_LIB: &str = include_str!("dts/lib.deno.ns.d.ts");
+pub static DENO_WEB_LIB: &str = include_str!(env!("DENO_WEB_LIB_PATH"));
 pub static SHARED_GLOBALS_LIB: &str =
   include_str!("dts/lib.deno.shared_globals.d.ts");
 pub static WINDOW_LIB: &str = include_str!("dts/lib.deno.window.d.ts");
@@ -38,7 +39,7 @@ fn compiler_snapshot() {
   deno_core::js_check(isolate.execute(
     "<anon>",
     r#"
-    if (!(bootstrap.tsCompilerRuntime)) {
+    if (!(bootstrapCompilerRuntime)) {
         throw Error("bad");
       }
       console.log(`ts version: ${ts.version}`);
diff --git a/cli/js2/01_event.js b/cli/js2/01_event.js
deleted file mode 100644
index 35967e0a16ae60..00000000000000
--- a/cli/js2/01_event.js
+++ /dev/null
@@ -1,1044 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// This module follows most of the WHATWG Living Standard for the DOM logic.
-// Many parts of the DOM are not implemented in Deno, but the logic for those
-// parts still exists.  This means you will observe a lot of strange structures
-// and impossible logic branches based on what Deno currently supports.
-
-((window) => {
-  const eventData = new WeakMap();
-
-  function requiredArguments(
-    name,
-    length,
-    required,
-  ) {
-    if (length < required) {
-      const errMsg = `${name} requires at least ${required} argument${
-        required === 1 ? "" : "s"
-      }, but only ${length} present`;
-      throw new TypeError(errMsg);
-    }
-  }
-
-  // accessors for non runtime visible data
-
-  function getDispatched(event) {
-    return Boolean(eventData.get(event)?.dispatched);
-  }
-
-  function getPath(event) {
-    return eventData.get(event)?.path ?? [];
-  }
-
-  function getStopImmediatePropagation(event) {
-    return Boolean(eventData.get(event)?.stopImmediatePropagation);
-  }
-
-  function setCurrentTarget(
-    event,
-    value,
-  ) {
-    event.currentTarget = value;
-  }
-
-  function setDispatched(event, value) {
-    const data = eventData.get(event);
-    if (data) {
-      data.dispatched = value;
-    }
-  }
-
-  function setEventPhase(event, value) {
-    event.eventPhase = value;
-  }
-
-  function setInPassiveListener(event, value) {
-    const data = eventData.get(event);
-    if (data) {
-      data.inPassiveListener = value;
-    }
-  }
-
-  function setPath(event, value) {
-    const data = eventData.get(event);
-    if (data) {
-      data.path = value;
-    }
-  }
-
-  function setRelatedTarget(
-    event,
-    value,
-  ) {
-    if ("relatedTarget" in event) {
-      event.relatedTarget = value;
-    }
-  }
-
-  function setTarget(event, value) {
-    event.target = value;
-  }
-
-  function setStopImmediatePropagation(
-    event,
-    value,
-  ) {
-    const data = eventData.get(event);
-    if (data) {
-      data.stopImmediatePropagation = value;
-    }
-  }
-
-  // Type guards that widen the event type
-
-  function hasRelatedTarget(
-    event,
-  ) {
-    return "relatedTarget" in event;
-  }
-
-  function isTrusted() {
-    return eventData.get(this).isTrusted;
-  }
-
-  class Event {
-    #canceledFlag = false;
-    #stopPropagationFlag = false;
-    #attributes = {};
-
-    constructor(type, eventInitDict = {}) {
-      requiredArguments("Event", arguments.length, 1);
-      type = String(type);
-      this.#attributes = {
-        type,
-        bubbles: eventInitDict.bubbles ?? false,
-        cancelable: eventInitDict.cancelable ?? false,
-        composed: eventInitDict.composed ?? false,
-        currentTarget: null,
-        eventPhase: Event.NONE,
-        target: null,
-        timeStamp: Date.now(),
-      };
-      eventData.set(this, {
-        dispatched: false,
-        inPassiveListener: false,
-        isTrusted: false,
-        path: [],
-        stopImmediatePropagation: false,
-      });
-      Reflect.defineProperty(this, "isTrusted", {
-        enumerable: true,
-        get: isTrusted,
-      });
-    }
-
-    get bubbles() {
-      return this.#attributes.bubbles;
-    }
-
-    get cancelBubble() {
-      return this.#stopPropagationFlag;
-    }
-
-    set cancelBubble(value) {
-      this.#stopPropagationFlag = value;
-    }
-
-    get cancelable() {
-      return this.#attributes.cancelable;
-    }
-
-    get composed() {
-      return this.#attributes.composed;
-    }
-
-    get currentTarget() {
-      return this.#attributes.currentTarget;
-    }
-
-    set currentTarget(value) {
-      this.#attributes = {
-        type: this.type,
-        bubbles: this.bubbles,
-        cancelable: this.cancelable,
-        composed: this.composed,
-        currentTarget: value,
-        eventPhase: this.eventPhase,
-        target: this.target,
-        timeStamp: this.timeStamp,
-      };
-    }
-
-    get defaultPrevented() {
-      return this.#canceledFlag;
-    }
-
-    get eventPhase() {
-      return this.#attributes.eventPhase;
-    }
-
-    set eventPhase(value) {
-      this.#attributes = {
-        type: this.type,
-        bubbles: this.bubbles,
-        cancelable: this.cancelable,
-        composed: this.composed,
-        currentTarget: this.currentTarget,
-        eventPhase: value,
-        target: this.target,
-        timeStamp: this.timeStamp,
-      };
-    }
-
-    get initialized() {
-      return true;
-    }
-
-    get target() {
-      return this.#attributes.target;
-    }
-
-    set target(value) {
-      this.#attributes = {
-        type: this.type,
-        bubbles: this.bubbles,
-        cancelable: this.cancelable,
-        composed: this.composed,
-        currentTarget: this.currentTarget,
-        eventPhase: this.eventPhase,
-        target: value,
-        timeStamp: this.timeStamp,
-      };
-    }
-
-    get timeStamp() {
-      return this.#attributes.timeStamp;
-    }
-
-    get type() {
-      return this.#attributes.type;
-    }
-
-    composedPath() {
-      const path = eventData.get(this).path;
-      if (path.length === 0) {
-        return [];
-      }
-
-      if (!this.currentTarget) {
-        throw new Error("assertion error");
-      }
-      const composedPath = [
-        {
-          item: this.currentTarget,
-          itemInShadowTree: false,
-          relatedTarget: null,
-          rootOfClosedTree: false,
-          slotInClosedTree: false,
-          target: null,
-          touchTargetList: [],
-        },
-      ];
-
-      let currentTargetIndex = 0;
-      let currentTargetHiddenSubtreeLevel = 0;
-
-      for (let index = path.length - 1; index >= 0; index--) {
-        const { item, rootOfClosedTree, slotInClosedTree } = path[index];
-
-        if (rootOfClosedTree) {
-          currentTargetHiddenSubtreeLevel++;
-        }
-
-        if (item === this.currentTarget) {
-          currentTargetIndex = index;
-          break;
-        }
-
-        if (slotInClosedTree) {
-          currentTargetHiddenSubtreeLevel--;
-        }
-      }
-
-      let currentHiddenLevel = currentTargetHiddenSubtreeLevel;
-      let maxHiddenLevel = currentTargetHiddenSubtreeLevel;
-
-      for (let i = currentTargetIndex - 1; i >= 0; i--) {
-        const { item, rootOfClosedTree, slotInClosedTree } = path[i];
-
-        if (rootOfClosedTree) {
-          currentHiddenLevel++;
-        }
-
-        if (currentHiddenLevel <= maxHiddenLevel) {
-          composedPath.unshift({
-            item,
-            itemInShadowTree: false,
-            relatedTarget: null,
-            rootOfClosedTree: false,
-            slotInClosedTree: false,
-            target: null,
-            touchTargetList: [],
-          });
-        }
-
-        if (slotInClosedTree) {
-          currentHiddenLevel--;
-
-          if (currentHiddenLevel < maxHiddenLevel) {
-            maxHiddenLevel = currentHiddenLevel;
-          }
-        }
-      }
-
-      currentHiddenLevel = currentTargetHiddenSubtreeLevel;
-      maxHiddenLevel = currentTargetHiddenSubtreeLevel;
-
-      for (let index = currentTargetIndex + 1; index < path.length; index++) {
-        const { item, rootOfClosedTree, slotInClosedTree } = path[index];
-
-        if (slotInClosedTree) {
-          currentHiddenLevel++;
-        }
-
-        if (currentHiddenLevel <= maxHiddenLevel) {
-          composedPath.push({
-            item,
-            itemInShadowTree: false,
-            relatedTarget: null,
-            rootOfClosedTree: false,
-            slotInClosedTree: false,
-            target: null,
-            touchTargetList: [],
-          });
-        }
-
-        if (rootOfClosedTree) {
-          currentHiddenLevel--;
-
-          if (currentHiddenLevel < maxHiddenLevel) {
-            maxHiddenLevel = currentHiddenLevel;
-          }
-        }
-      }
-      return composedPath.map((p) => p.item);
-    }
-
-    preventDefault() {
-      if (this.cancelable && !eventData.get(this).inPassiveListener) {
-        this.#canceledFlag = true;
-      }
-    }
-
-    stopPropagation() {
-      this.#stopPropagationFlag = true;
-    }
-
-    stopImmediatePropagation() {
-      this.#stopPropagationFlag = true;
-      eventData.get(this).stopImmediatePropagation = true;
-    }
-
-    get NONE() {
-      return Event.NONE;
-    }
-
-    get CAPTURING_PHASE() {
-      return Event.CAPTURING_PHASE;
-    }
-
-    get AT_TARGET() {
-      return Event.AT_TARGET;
-    }
-
-    get BUBBLING_PHASE() {
-      return Event.BUBBLING_PHASE;
-    }
-
-    static get NONE() {
-      return 0;
-    }
-
-    static get CAPTURING_PHASE() {
-      return 1;
-    }
-
-    static get AT_TARGET() {
-      return 2;
-    }
-
-    static get BUBBLING_PHASE() {
-      return 3;
-    }
-  }
-
-  function defineEnumerableProps(
-    Ctor,
-    props,
-  ) {
-    for (const prop of props) {
-      Reflect.defineProperty(Ctor.prototype, prop, { enumerable: true });
-    }
-  }
-
-  defineEnumerableProps(Event, [
-    "bubbles",
-    "cancelable",
-    "composed",
-    "currentTarget",
-    "defaultPrevented",
-    "eventPhase",
-    "target",
-    "timeStamp",
-    "type",
-  ]);
-
-  // This is currently the only node type we are using, so instead of implementing
-  // the whole of the Node interface at the moment, this just gives us the one
-  // value to power the standards based logic
-  const DOCUMENT_FRAGMENT_NODE = 11;
-
-  // DOM Logic Helper functions and type guards
-
-  /** Get the parent node, for event targets that have a parent.
-   *
-   * Ref: https://dom.spec.whatwg.org/#get-the-parent */
-  function getParent(eventTarget) {
-    return isNode(eventTarget) ? eventTarget.parentNode : null;
-  }
-
-  function getRoot(eventTarget) {
-    return isNode(eventTarget)
-      ? eventTarget.getRootNode({ composed: true })
-      : null;
-  }
-
-  function isNode(
-    eventTarget,
-  ) {
-    return Boolean(eventTarget && "nodeType" in eventTarget);
-  }
-
-  // https://dom.spec.whatwg.org/#concept-shadow-including-inclusive-ancestor
-  function isShadowInclusiveAncestor(
-    ancestor,
-    node,
-  ) {
-    while (isNode(node)) {
-      if (node === ancestor) {
-        return true;
-      }
-
-      if (isShadowRoot(node)) {
-        node = node && getHost(node);
-      } else {
-        node = getParent(node);
-      }
-    }
-
-    return false;
-  }
-
-  function isShadowRoot(nodeImpl) {
-    return Boolean(
-      nodeImpl &&
-        isNode(nodeImpl) &&
-        nodeImpl.nodeType === DOCUMENT_FRAGMENT_NODE &&
-        getHost(nodeImpl) != null,
-    );
-  }
-
-  function isSlotable(
-    nodeImpl,
-  ) {
-    return Boolean(isNode(nodeImpl) && "assignedSlot" in nodeImpl);
-  }
-
-  // DOM Logic functions
-
-  /** Append a path item to an event's path.
-   *
-   * Ref: https://dom.spec.whatwg.org/#concept-event-path-append
-   */
-  function appendToEventPath(
-    eventImpl,
-    target,
-    targetOverride,
-    relatedTarget,
-    touchTargets,
-    slotInClosedTree,
-  ) {
-    const itemInShadowTree = isNode(target) && isShadowRoot(getRoot(target));
-    const rootOfClosedTree = isShadowRoot(target) &&
-      getMode(target) === "closed";
-
-    getPath(eventImpl).push({
-      item: target,
-      itemInShadowTree,
-      target: targetOverride,
-      relatedTarget,
-      touchTargetList: touchTargets,
-      rootOfClosedTree,
-      slotInClosedTree,
-    });
-  }
-
-  function dispatch(
-    targetImpl,
-    eventImpl,
-    targetOverride,
-  ) {
-    let clearTargets = false;
-    let activationTarget = null;
-
-    setDispatched(eventImpl, true);
-
-    targetOverride = targetOverride ?? targetImpl;
-    const eventRelatedTarget = hasRelatedTarget(eventImpl)
-      ? eventImpl.relatedTarget
-      : null;
-    let relatedTarget = retarget(eventRelatedTarget, targetImpl);
-
-    if (targetImpl !== relatedTarget || targetImpl === eventRelatedTarget) {
-      const touchTargets = [];
-
-      appendToEventPath(
-        eventImpl,
-        targetImpl,
-        targetOverride,
-        relatedTarget,
-        touchTargets,
-        false,
-      );
-
-      const isActivationEvent = eventImpl.type === "click";
-
-      if (isActivationEvent && getHasActivationBehavior(targetImpl)) {
-        activationTarget = targetImpl;
-      }
-
-      let slotInClosedTree = false;
-      let slotable = isSlotable(targetImpl) && getAssignedSlot(targetImpl)
-        ? targetImpl
-        : null;
-      let parent = getParent(targetImpl);
-
-      // Populate event path
-      // https://dom.spec.whatwg.org/#event-path
-      while (parent !== null) {
-        if (slotable !== null) {
-          slotable = null;
-
-          const parentRoot = getRoot(parent);
-          if (
-            isShadowRoot(parentRoot) &&
-            parentRoot &&
-            getMode(parentRoot) === "closed"
-          ) {
-            slotInClosedTree = true;
-          }
-        }
-
-        relatedTarget = retarget(eventRelatedTarget, parent);
-
-        if (
-          isNode(parent) &&
-          isShadowInclusiveAncestor(getRoot(targetImpl), parent)
-        ) {
-          appendToEventPath(
-            eventImpl,
-            parent,
-            null,
-            relatedTarget,
-            touchTargets,
-            slotInClosedTree,
-          );
-        } else if (parent === relatedTarget) {
-          parent = null;
-        } else {
-          targetImpl = parent;
-
-          if (
-            isActivationEvent &&
-            activationTarget === null &&
-            getHasActivationBehavior(targetImpl)
-          ) {
-            activationTarget = targetImpl;
-          }
-
-          appendToEventPath(
-            eventImpl,
-            parent,
-            targetImpl,
-            relatedTarget,
-            touchTargets,
-            slotInClosedTree,
-          );
-        }
-
-        if (parent !== null) {
-          parent = getParent(parent);
-        }
-
-        slotInClosedTree = false;
-      }
-
-      let clearTargetsTupleIndex = -1;
-      const path = getPath(eventImpl);
-      for (
-        let i = path.length - 1;
-        i >= 0 && clearTargetsTupleIndex === -1;
-        i--
-      ) {
-        if (path[i].target !== null) {
-          clearTargetsTupleIndex = i;
-        }
-      }
-      const clearTargetsTuple = path[clearTargetsTupleIndex];
-
-      clearTargets = (isNode(clearTargetsTuple.target) &&
-        isShadowRoot(getRoot(clearTargetsTuple.target))) ||
-        (isNode(clearTargetsTuple.relatedTarget) &&
-          isShadowRoot(getRoot(clearTargetsTuple.relatedTarget)));
-
-      setEventPhase(eventImpl, Event.CAPTURING_PHASE);
-
-      for (let i = path.length - 1; i >= 0; --i) {
-        const tuple = path[i];
-
-        if (tuple.target === null) {
-          invokeEventListeners(tuple, eventImpl);
-        }
-      }
-
-      for (let i = 0; i < path.length; i++) {
-        const tuple = path[i];
-
-        if (tuple.target !== null) {
-          setEventPhase(eventImpl, Event.AT_TARGET);
-        } else {
-          setEventPhase(eventImpl, Event.BUBBLING_PHASE);
-        }
-
-        if (
-          (eventImpl.eventPhase === Event.BUBBLING_PHASE &&
-            eventImpl.bubbles) ||
-          eventImpl.eventPhase === Event.AT_TARGET
-        ) {
-          invokeEventListeners(tuple, eventImpl);
-        }
-      }
-    }
-
-    setEventPhase(eventImpl, Event.NONE);
-    setCurrentTarget(eventImpl, null);
-    setPath(eventImpl, []);
-    setDispatched(eventImpl, false);
-    eventImpl.cancelBubble = false;
-    setStopImmediatePropagation(eventImpl, false);
-
-    if (clearTargets) {
-      setTarget(eventImpl, null);
-      setRelatedTarget(eventImpl, null);
-    }
-
-    // TODO: invoke activation targets if HTML nodes will be implemented
-    // if (activationTarget !== null) {
-    //   if (!eventImpl.defaultPrevented) {
-    //     activationTarget._activationBehavior();
-    //   }
-    // }
-
-    return !eventImpl.defaultPrevented;
-  }
-
-  /** Inner invoking of the event listeners where the resolved listeners are
-   * called.
-   *
-   * Ref: https://dom.spec.whatwg.org/#concept-event-listener-inner-invoke */
-  function innerInvokeEventListeners(
-    eventImpl,
-    targetListeners,
-  ) {
-    let found = false;
-
-    const { type } = eventImpl;
-
-    if (!targetListeners || !targetListeners[type]) {
-      return found;
-    }
-
-    // Copy event listeners before iterating since the list can be modified during the iteration.
-    const handlers = targetListeners[type].slice();
-
-    for (let i = 0; i < handlers.length; i++) {
-      const listener = handlers[i];
-
-      let capture, once, passive;
-      if (typeof listener.options === "boolean") {
-        capture = listener.options;
-        once = false;
-        passive = false;
-      } else {
-        capture = listener.options.capture;
-        once = listener.options.once;
-        passive = listener.options.passive;
-      }
-
-      // Check if the event listener has been removed since the listeners has been cloned.
-      if (!targetListeners[type].includes(listener)) {
-        continue;
-      }
-
-      found = true;
-
-      if (
-        (eventImpl.eventPhase === Event.CAPTURING_PHASE && !capture) ||
-        (eventImpl.eventPhase === Event.BUBBLING_PHASE && capture)
-      ) {
-        continue;
-      }
-
-      if (once) {
-        targetListeners[type].splice(
-          targetListeners[type].indexOf(listener),
-          1,
-        );
-      }
-
-      if (passive) {
-        setInPassiveListener(eventImpl, true);
-      }
-
-      if (typeof listener.callback === "object") {
-        if (typeof listener.callback.handleEvent === "function") {
-          listener.callback.handleEvent(eventImpl);
-        }
-      } else {
-        listener.callback.call(eventImpl.currentTarget, eventImpl);
-      }
-
-      setInPassiveListener(eventImpl, false);
-
-      if (getStopImmediatePropagation(eventImpl)) {
-        return found;
-      }
-    }
-
-    return found;
-  }
-
-  /** Invokes the listeners on a given event path with the supplied event.
-   *
-   * Ref: https://dom.spec.whatwg.org/#concept-event-listener-invoke */
-  function invokeEventListeners(tuple, eventImpl) {
-    const path = getPath(eventImpl);
-    const tupleIndex = path.indexOf(tuple);
-    for (let i = tupleIndex; i >= 0; i--) {
-      const t = path[i];
-      if (t.target) {
-        setTarget(eventImpl, t.target);
-        break;
-      }
-    }
-
-    setRelatedTarget(eventImpl, tuple.relatedTarget);
-
-    if (eventImpl.cancelBubble) {
-      return;
-    }
-
-    setCurrentTarget(eventImpl, tuple.item);
-
-    innerInvokeEventListeners(eventImpl, getListeners(tuple.item));
-  }
-
-  function normalizeAddEventHandlerOptions(
-    options,
-  ) {
-    if (typeof options === "boolean" || typeof options === "undefined") {
-      return {
-        capture: Boolean(options),
-        once: false,
-        passive: false,
-      };
-    } else {
-      return options;
-    }
-  }
-
-  function normalizeEventHandlerOptions(
-    options,
-  ) {
-    if (typeof options === "boolean" || typeof options === "undefined") {
-      return {
-        capture: Boolean(options),
-      };
-    } else {
-      return options;
-    }
-  }
-
-  /** Retarget the target following the spec logic.
-   *
-   * Ref: https://dom.spec.whatwg.org/#retarget */
-  function retarget(a, b) {
-    while (true) {
-      if (!isNode(a)) {
-        return a;
-      }
-
-      const aRoot = a.getRootNode();
-
-      if (aRoot) {
-        if (
-          !isShadowRoot(aRoot) ||
-          (isNode(b) && isShadowInclusiveAncestor(aRoot, b))
-        ) {
-          return a;
-        }
-
-        a = getHost(aRoot);
-      }
-    }
-  }
-
-  // Accessors for non-public data
-
-  const eventTargetData = new WeakMap();
-
-  function setEventTargetData(value) {
-    eventTargetData.set(value, getDefaultTargetData());
-  }
-
-  function getAssignedSlot(target) {
-    return Boolean(eventTargetData.get(target)?.assignedSlot);
-  }
-
-  function getHasActivationBehavior(target) {
-    return Boolean(
-      eventTargetData.get(target)?.hasActivationBehavior,
-    );
-  }
-
-  function getHost(target) {
-    return eventTargetData.get(target)?.host ?? null;
-  }
-
-  function getListeners(target) {
-    return eventTargetData.get(target)?.listeners ?? {};
-  }
-
-  function getMode(target) {
-    return eventTargetData.get(target)?.mode ?? null;
-  }
-
-  function getDefaultTargetData() {
-    return {
-      assignedSlot: false,
-      hasActivationBehavior: false,
-      host: null,
-      listeners: Object.create(null),
-      mode: "",
-    };
-  }
-
-  class EventTarget {
-    constructor() {
-      eventTargetData.set(this, getDefaultTargetData());
-    }
-
-    addEventListener(
-      type,
-      callback,
-      options,
-    ) {
-      requiredArguments("EventTarget.addEventListener", arguments.length, 2);
-      if (callback === null) {
-        return;
-      }
-
-      options = normalizeAddEventHandlerOptions(options);
-      const { listeners } = eventTargetData.get(this ?? globalThis);
-
-      if (!(type in listeners)) {
-        listeners[type] = [];
-      }
-
-      for (const listener of listeners[type]) {
-        if (
-          ((typeof listener.options === "boolean" &&
-            listener.options === options.capture) ||
-            (typeof listener.options === "object" &&
-              listener.options.capture === options.capture)) &&
-          listener.callback === callback
-        ) {
-          return;
-        }
-      }
-
-      listeners[type].push({ callback, options });
-    }
-
-    removeEventListener(
-      type,
-      callback,
-      options,
-    ) {
-      requiredArguments("EventTarget.removeEventListener", arguments.length, 2);
-
-      const listeners = eventTargetData.get(this ?? globalThis).listeners;
-      if (callback !== null && type in listeners) {
-        listeners[type] = listeners[type].filter(
-          (listener) => listener.callback !== callback,
-        );
-      } else if (callback === null || !listeners[type]) {
-        return;
-      }
-
-      options = normalizeEventHandlerOptions(options);
-
-      for (let i = 0; i < listeners[type].length; ++i) {
-        const listener = listeners[type][i];
-        if (
-          ((typeof listener.options === "boolean" &&
-            listener.options === options.capture) ||
-            (typeof listener.options === "object" &&
-              listener.options.capture === options.capture)) &&
-          listener.callback === callback
-        ) {
-          listeners[type].splice(i, 1);
-          break;
-        }
-      }
-    }
-
-    dispatchEvent(event) {
-      requiredArguments("EventTarget.dispatchEvent", arguments.length, 1);
-      const self = this ?? globalThis;
-
-      const listeners = eventTargetData.get(self).listeners;
-      if (!(event.type in listeners)) {
-        return true;
-      }
-
-      if (getDispatched(event)) {
-        throw new DOMException("Invalid event state.", "InvalidStateError");
-      }
-
-      if (event.eventPhase !== Event.NONE) {
-        throw new DOMException("Invalid event state.", "InvalidStateError");
-      }
-
-      return dispatch(self, event);
-    }
-
-    get [Symbol.toStringTag]() {
-      return "EventTarget";
-    }
-
-    getParent(_event) {
-      return null;
-    }
-  }
-
-  defineEnumerableProps(EventTarget, [
-    "addEventListener",
-    "removeEventListener",
-    "dispatchEvent",
-  ]);
-
-  class ErrorEvent extends Event {
-    #message = "";
-    #filename = "";
-    #lineno = "";
-    #colno = "";
-    #error = "";
-
-    get message() {
-      return this.#message;
-    }
-    get filename() {
-      return this.#filename;
-    }
-    get lineno() {
-      return this.#lineno;
-    }
-    get colno() {
-      return this.#colno;
-    }
-    get error() {
-      return this.#error;
-    }
-
-    constructor(
-      type,
-      {
-        bubbles,
-        cancelable,
-        composed,
-        message = "",
-        filename = "",
-        lineno = 0,
-        colno = 0,
-        error = null,
-      } = {},
-    ) {
-      super(type, {
-        bubbles: bubbles,
-        cancelable: cancelable,
-        composed: composed,
-      });
-
-      this.#message = message;
-      this.#filename = filename;
-      this.#lineno = lineno;
-      this.#colno = colno;
-      this.#error = error;
-    }
-
-    get [Symbol.toStringTag]() {
-      return "ErrorEvent";
-    }
-  }
-
-  defineEnumerableProps(ErrorEvent, [
-    "message",
-    "filename",
-    "lineno",
-    "colno",
-    "error",
-  ]);
-
-  class CustomEvent extends Event {
-    #detail = null;
-
-    constructor(type, eventInitDict = {}) {
-      super(type, eventInitDict);
-      requiredArguments("CustomEvent", arguments.length, 1);
-      const { detail } = eventInitDict;
-      this.#detail = detail;
-    }
-
-    get detail() {
-      return this.#detail;
-    }
-
-    get [Symbol.toStringTag]() {
-      return "CustomEvent";
-    }
-  }
-
-  Reflect.defineProperty(CustomEvent.prototype, "detail", {
-    enumerable: true,
-  });
-
-  window.Event = Event;
-  window.EventTarget = EventTarget;
-  window.ErrorEvent = ErrorEvent;
-  window.CustomEvent = CustomEvent;
-  window.__bootstrap.eventTarget = {
-    setEventTargetData,
-  };
-})(this);
diff --git a/cli/js2/02_console.js b/cli/js2/02_console.js
deleted file mode 100644
index 5a9dd4186e20df..00000000000000
--- a/cli/js2/02_console.js
+++ /dev/null
@@ -1,1183 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-((window) => {
-  const exposeForTest = window.__bootstrap.internals.exposeForTest;
-  const {
-    stripColor,
-    yellow,
-    dim,
-    cyan,
-    red,
-    green,
-    magenta,
-    bold,
-  } = window.__bootstrap.colors;
-
-  const {
-    isTypedArray,
-    isInvalidDate,
-    hasOwnProperty,
-  } = window.__bootstrap.webUtil;
-
-  // Copyright Joyent, Inc. and other Node contributors. MIT license.
-  // Forked from Node's lib/internal/cli_table.js
-
-  const tableChars = {
-    middleMiddle: "─",
-    rowMiddle: "┼",
-    topRight: "┐",
-    topLeft: "┌",
-    leftMiddle: "├",
-    topMiddle: "┬",
-    bottomRight: "┘",
-    bottomLeft: "└",
-    bottomMiddle: "┴",
-    rightMiddle: "┤",
-    left: "│ ",
-    right: " │",
-    middle: " │ ",
-  };
-
-  function isFullWidthCodePoint(code) {
-    // Code points are partially derived from:
-    // http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
-    return (
-      code >= 0x1100 &&
-      (code <= 0x115f || // Hangul Jamo
-        code === 0x2329 || // LEFT-POINTING ANGLE BRACKET
-        code === 0x232a || // RIGHT-POINTING ANGLE BRACKET
-        // CJK Radicals Supplement .. Enclosed CJK Letters and Months
-        (code >= 0x2e80 && code <= 0x3247 && code !== 0x303f) ||
-        // Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
-        (code >= 0x3250 && code <= 0x4dbf) ||
-        // CJK Unified Ideographs .. Yi Radicals
-        (code >= 0x4e00 && code <= 0xa4c6) ||
-        // Hangul Jamo Extended-A
-        (code >= 0xa960 && code <= 0xa97c) ||
-        // Hangul Syllables
-        (code >= 0xac00 && code <= 0xd7a3) ||
-        // CJK Compatibility Ideographs
-        (code >= 0xf900 && code <= 0xfaff) ||
-        // Vertical Forms
-        (code >= 0xfe10 && code <= 0xfe19) ||
-        // CJK Compatibility Forms .. Small Form Variants
-        (code >= 0xfe30 && code <= 0xfe6b) ||
-        // Halfwidth and Fullwidth Forms
-        (code >= 0xff01 && code <= 0xff60) ||
-        (code >= 0xffe0 && code <= 0xffe6) ||
-        // Kana Supplement
-        (code >= 0x1b000 && code <= 0x1b001) ||
-        // Enclosed Ideographic Supplement
-        (code >= 0x1f200 && code <= 0x1f251) ||
-        // Miscellaneous Symbols and Pictographs 0x1f300 - 0x1f5ff
-        // Emoticons 0x1f600 - 0x1f64f
-        (code >= 0x1f300 && code <= 0x1f64f) ||
-        // CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
-        (code >= 0x20000 && code <= 0x3fffd))
-    );
-  }
-
-  function getStringWidth(str) {
-    str = stripColor(str).normalize("NFC");
-    let width = 0;
-
-    for (const ch of str) {
-      width += isFullWidthCodePoint(ch.codePointAt(0)) ? 2 : 1;
-    }
-
-    return width;
-  }
-
-  function renderRow(row, columnWidths) {
-    let out = tableChars.left;
-    for (let i = 0; i < row.length; i++) {
-      const cell = row[i];
-      const len = getStringWidth(cell);
-      const needed = (columnWidths[i] - len) / 2;
-      // round(needed) + ceil(needed) will always add up to the amount
-      // of spaces we need while also left justifying the output.
-      out += `${" ".repeat(needed)}${cell}${" ".repeat(Math.ceil(needed))}`;
-      if (i !== row.length - 1) {
-        out += tableChars.middle;
-      }
-    }
-    out += tableChars.right;
-    return out;
-  }
-
-  function cliTable(head, columns) {
-    const rows = [];
-    const columnWidths = head.map((h) => getStringWidth(h));
-    const longestColumn = columns.reduce(
-      (n, a) => Math.max(n, a.length),
-      0,
-    );
-
-    for (let i = 0; i < head.length; i++) {
-      const column = columns[i];
-      for (let j = 0; j < longestColumn; j++) {
-        if (rows[j] === undefined) {
-          rows[j] = [];
-        }
-        const value = (rows[j][i] = hasOwnProperty(column, j) ? column[j] : "");
-        const width = columnWidths[i] || 0;
-        const counted = getStringWidth(value);
-        columnWidths[i] = Math.max(width, counted);
-      }
-    }
-
-    const divider = columnWidths.map((i) =>
-      tableChars.middleMiddle.repeat(i + 2)
-    );
-
-    let result = `${tableChars.topLeft}${divider.join(tableChars.topMiddle)}` +
-      `${tableChars.topRight}\n${renderRow(head, columnWidths)}\n` +
-      `${tableChars.leftMiddle}${divider.join(tableChars.rowMiddle)}` +
-      `${tableChars.rightMiddle}\n`;
-
-    for (const row of rows) {
-      result += `${renderRow(row, columnWidths)}\n`;
-    }
-
-    result +=
-      `${tableChars.bottomLeft}${divider.join(tableChars.bottomMiddle)}` +
-      tableChars.bottomRight;
-
-    return result;
-  }
-  /* End of forked part */
-
-  const DEFAULT_INSPECT_OPTIONS = {
-    depth: 4,
-    indentLevel: 0,
-    sorted: false,
-    trailingComma: false,
-    compact: true,
-    iterableLimit: 100,
-  };
-
-  const DEFAULT_INDENT = "  "; // Default indent string
-
-  const LINE_BREAKING_LENGTH = 80;
-  const MIN_GROUP_LENGTH = 6;
-  const STR_ABBREVIATE_SIZE = 100;
-  // Char codes
-  const CHAR_PERCENT = 37; /* % */
-  const CHAR_LOWERCASE_S = 115; /* s */
-  const CHAR_LOWERCASE_D = 100; /* d */
-  const CHAR_LOWERCASE_I = 105; /* i */
-  const CHAR_LOWERCASE_F = 102; /* f */
-  const CHAR_LOWERCASE_O = 111; /* o */
-  const CHAR_UPPERCASE_O = 79; /* O */
-  const CHAR_LOWERCASE_C = 99; /* c */
-
-  const PROMISE_STRING_BASE_LENGTH = 12;
-
-  class CSI {
-    static kClear = "\x1b[1;1H";
-    static kClearScreenDown = "\x1b[0J";
-  }
-
-  /* eslint-disable @typescript-eslint/no-use-before-define */
-
-  function getClassInstanceName(instance) {
-    if (typeof instance !== "object") {
-      return "";
-    }
-    if (!instance) {
-      return "";
-    }
-
-    const proto = Object.getPrototypeOf(instance);
-    if (proto && proto.constructor) {
-      return proto.constructor.name; // could be "Object" or "Array"
-    }
-
-    return "";
-  }
-
-  function inspectFunction(value, _ctx) {
-    // Might be Function/AsyncFunction/GeneratorFunction
-    const cstrName = Object.getPrototypeOf(value).constructor.name;
-    if (value.name && value.name !== "anonymous") {
-      // from MDN spec
-      return `[${cstrName}: ${value.name}]`;
-    }
-    return `[${cstrName}]`;
-  }
-
-  function inspectIterable(
-    value,
-    ctx,
-    level,
-    options,
-    inspectOptions,
-  ) {
-    if (level >= inspectOptions.depth) {
-      return cyan(`[${options.typeName}]`);
-    }
-    ctx.add(value);
-
-    const entries = [];
-
-    const iter = value.entries();
-    let entriesLength = 0;
-    const next = () => {
-      return iter.next();
-    };
-    for (const el of iter) {
-      if (entriesLength < inspectOptions.iterableLimit) {
-        entries.push(
-          options.entryHandler(
-            el,
-            ctx,
-            level + 1,
-            inspectOptions,
-            next.bind(iter),
-          ),
-        );
-      }
-      entriesLength++;
-    }
-    ctx.delete(value);
-
-    if (options.sort) {
-      entries.sort();
-    }
-
-    if (entriesLength > inspectOptions.iterableLimit) {
-      const nmore = entriesLength - inspectOptions.iterableLimit;
-      entries.push(`... ${nmore} more items`);
-    }
-
-    const iPrefix = `${options.displayName ? options.displayName + " " : ""}`;
-
-    const initIndentation = `\n${DEFAULT_INDENT.repeat(level + 1)}`;
-    const entryIndentation = `,\n${DEFAULT_INDENT.repeat(level + 1)}`;
-    const closingIndentation = `${inspectOptions.trailingComma ? "," : ""}\n${
-      DEFAULT_INDENT.repeat(level)
-    }`;
-
-    let iContent;
-    if (options.group && entries.length > MIN_GROUP_LENGTH) {
-      const groups = groupEntries(entries, level, value);
-      iContent = `${initIndentation}${
-        groups.join(entryIndentation)
-      }${closingIndentation}`;
-    } else {
-      iContent = entries.length === 0 ? "" : ` ${entries.join(", ")} `;
-      if (
-        stripColor(iContent).length > LINE_BREAKING_LENGTH ||
-        !inspectOptions.compact
-      ) {
-        iContent = `${initIndentation}${
-          entries.join(entryIndentation)
-        }${closingIndentation}`;
-      }
-    }
-
-    return `${iPrefix}${options.delims[0]}${iContent}${options.delims[1]}`;
-  }
-
-  // Ported from Node.js
-  // Copyright Node.js contributors. All rights reserved.
-  function groupEntries(
-    entries,
-    level,
-    value,
-    iterableLimit = 100,
-  ) {
-    let totalLength = 0;
-    let maxLength = 0;
-    let entriesLength = entries.length;
-    if (iterableLimit < entriesLength) {
-      // This makes sure the "... n more items" part is not taken into account.
-      entriesLength--;
-    }
-    const separatorSpace = 2; // Add 1 for the space and 1 for the separator.
-    const dataLen = new Array(entriesLength);
-    // Calculate the total length of all output entries and the individual max
-    // entries length of all output entries.
-    // IN PROGRESS: Colors are being taken into account.
-    for (let i = 0; i < entriesLength; i++) {
-      // Taking colors into account: removing the ANSI color
-      // codes from the string before measuring its length
-      const len = stripColor(entries[i]).length;
-      dataLen[i] = len;
-      totalLength += len + separatorSpace;
-      if (maxLength < len) maxLength = len;
-    }
-    // Add two to `maxLength` as we add a single whitespace character plus a comma
-    // in-between two entries.
-    const actualMax = maxLength + separatorSpace;
-    // Check if at least three entries fit next to each other and prevent grouping
-    // of arrays that contains entries of very different length (i.e., if a single
-    // entry is longer than 1/5 of all other entries combined). Otherwise the
-    // space in-between small entries would be enormous.
-    if (
-      actualMax * 3 + (level + 1) < LINE_BREAKING_LENGTH &&
-      (totalLength / actualMax > 5 || maxLength <= 6)
-    ) {
-      const approxCharHeights = 2.5;
-      const averageBias = Math.sqrt(actualMax - totalLength / entries.length);
-      const biasedMax = Math.max(actualMax - 3 - averageBias, 1);
-      // Dynamically check how many columns seem possible.
-      const columns = Math.min(
-        // Ideally a square should be drawn. We expect a character to be about 2.5
-        // times as high as wide. This is the area formula to calculate a square
-        // which contains n rectangles of size `actualMax * approxCharHeights`.
-        // Divide that by `actualMax` to receive the correct number of columns.
-        // The added bias increases the columns for short entries.
-        Math.round(
-          Math.sqrt(approxCharHeights * biasedMax * entriesLength) / biasedMax,
-        ),
-        // Do not exceed the breakLength.
-        Math.floor((LINE_BREAKING_LENGTH - (level + 1)) / actualMax),
-        // Limit the columns to a maximum of fifteen.
-        15,
-      );
-      // Return with the original output if no grouping should happen.
-      if (columns <= 1) {
-        return entries;
-      }
-      const tmp = [];
-      const maxLineLength = [];
-      for (let i = 0; i < columns; i++) {
-        let lineMaxLength = 0;
-        for (let j = i; j < entries.length; j += columns) {
-          if (dataLen[j] > lineMaxLength) lineMaxLength = dataLen[j];
-        }
-        lineMaxLength += separatorSpace;
-        maxLineLength[i] = lineMaxLength;
-      }
-      let order = "padStart";
-      if (value !== undefined) {
-        for (let i = 0; i < entries.length; i++) {
-          /* eslint-disable @typescript-eslint/no-explicit-any */
-          if (
-            typeof value[i] !== "number" &&
-            typeof value[i] !== "bigint"
-          ) {
-            order = "padEnd";
-            break;
-          }
-          /* eslint-enable */
-        }
-      }
-      // Each iteration creates a single line of grouped entries.
-      for (let i = 0; i < entriesLength; i += columns) {
-        // The last lines may contain less entries than columns.
-        const max = Math.min(i + columns, entriesLength);
-        let str = "";
-        let j = i;
-        for (; j < max - 1; j++) {
-          // In future, colors should be taken here into the account
-          const padding = maxLineLength[j - i];
-          str += `${entries[j]}, `[order](padding, " ");
-        }
-        if (order === "padStart") {
-          const padding = maxLineLength[j - i] +
-            entries[j].length -
-            dataLen[j] -
-            separatorSpace;
-          str += entries[j].padStart(padding, " ");
-        } else {
-          str += entries[j];
-        }
-        tmp.push(str);
-      }
-      if (iterableLimit < entries.length) {
-        tmp.push(entries[entriesLength]);
-      }
-      entries = tmp;
-    }
-    return entries;
-  }
-
-  function inspectValue(
-    value,
-    ctx,
-    level,
-    inspectOptions,
-  ) {
-    switch (typeof value) {
-      case "string":
-        return value;
-      case "number": // Numbers are yellow
-        // Special handling of -0
-        return yellow(Object.is(value, -0) ? "-0" : `${value}`);
-      case "boolean": // booleans are yellow
-        return yellow(String(value));
-      case "undefined": // undefined is dim
-        return dim(String(value));
-      case "symbol": // Symbols are green
-        return green(String(value));
-      case "bigint": // Bigints are yellow
-        return yellow(`${value}n`);
-      case "function": // Function string is cyan
-        return cyan(inspectFunction(value, ctx));
-      case "object": // null is bold
-        if (value === null) {
-          return bold("null");
-        }
-
-        if (ctx.has(value)) {
-          // Circular string is cyan
-          return cyan("[Circular]");
-        }
-
-        return inspectObject(value, ctx, level, inspectOptions);
-      default:
-        // Not implemented is red
-        return red("[Not Implemented]");
-    }
-  }
-
-  // We can match Node's quoting behavior exactly by swapping the double quote and
-  // single quote in this array. That would give preference to single quotes.
-  // However, we prefer double quotes as the default.
-  const QUOTES = ['"', "'", "`"];
-
-  /** Surround the string in quotes.
- *
- * The quote symbol is chosen by taking the first of the `QUOTES` array which
- * does not occur in the string. If they all occur, settle with `QUOTES[0]`.
- *
- * Insert a backslash before any occurrence of the chosen quote symbol and
- * before any backslash. */
-  function quoteString(string) {
-    const quote = QUOTES.find((c) => !string.includes(c)) ?? QUOTES[0];
-    const escapePattern = new RegExp(`(?=[${quote}\\\\])`, "g");
-    return `${quote}${string.replace(escapePattern, "\\")}${quote}`;
-  }
-
-  // Print strings when they are inside of arrays or objects with quotes
-  function inspectValueWithQuotes(
-    value,
-    ctx,
-    level,
-    inspectOptions,
-  ) {
-    switch (typeof value) {
-      case "string":
-        const trunc = value.length > STR_ABBREVIATE_SIZE
-          ? value.slice(0, STR_ABBREVIATE_SIZE) + "..."
-          : value;
-        return green(quoteString(trunc)); // Quoted strings are green
-      default:
-        return inspectValue(value, ctx, level, inspectOptions);
-    }
-  }
-
-  function inspectArray(
-    value,
-    ctx,
-    level,
-    inspectOptions,
-  ) {
-    const options = {
-      typeName: "Array",
-      displayName: "",
-      delims: ["[", "]"],
-      entryHandler: (entry, ctx, level, inspectOptions, next) => {
-        const [index, val] = entry;
-        let i = index;
-        if (!value.hasOwnProperty(i)) {
-          i++;
-          while (!value.hasOwnProperty(i) && i < value.length) {
-            next();
-            i++;
-          }
-          const emptyItems = i - index;
-          const ending = emptyItems > 1 ? "s" : "";
-          return dim(`<${emptyItems} empty item${ending}>`);
-        } else {
-          return inspectValueWithQuotes(val, ctx, level, inspectOptions);
-        }
-      },
-      group: inspectOptions.compact,
-      sort: false,
-    };
-    return inspectIterable(value, ctx, level, options, inspectOptions);
-  }
-
-  function inspectTypedArray(
-    typedArrayName,
-    value,
-    ctx,
-    level,
-    inspectOptions,
-  ) {
-    const valueLength = value.length;
-    const options = {
-      typeName: typedArrayName,
-      displayName: `${typedArrayName}(${valueLength})`,
-      delims: ["[", "]"],
-      entryHandler: (entry, ctx, level, inspectOptions) => {
-        const val = entry[1];
-        return inspectValueWithQuotes(val, ctx, level + 1, inspectOptions);
-      },
-      group: inspectOptions.compact,
-      sort: false,
-    };
-    return inspectIterable(value, ctx, level, options, inspectOptions);
-  }
-
-  function inspectSet(
-    value,
-    ctx,
-    level,
-    inspectOptions,
-  ) {
-    const options = {
-      typeName: "Set",
-      displayName: "Set",
-      delims: ["{", "}"],
-      entryHandler: (entry, ctx, level, inspectOptions) => {
-        const val = entry[1];
-        return inspectValueWithQuotes(val, ctx, level + 1, inspectOptions);
-      },
-      group: false,
-      sort: inspectOptions.sorted,
-    };
-    return inspectIterable(value, ctx, level, options, inspectOptions);
-  }
-
-  function inspectMap(
-    value,
-    ctx,
-    level,
-    inspectOptions,
-  ) {
-    const options = {
-      typeName: "Map",
-      displayName: "Map",
-      delims: ["{", "}"],
-      entryHandler: (entry, ctx, level, inspectOptions) => {
-        const [key, val] = entry;
-        return `${
-          inspectValueWithQuotes(
-            key,
-            ctx,
-            level + 1,
-            inspectOptions,
-          )
-        } => ${inspectValueWithQuotes(val, ctx, level + 1, inspectOptions)}`;
-      },
-      group: false,
-      sort: inspectOptions.sorted,
-    };
-    return inspectIterable(
-      value,
-      ctx,
-      level,
-      options,
-      inspectOptions,
-    );
-  }
-
-  function inspectWeakSet() {
-    return `WeakSet { ${cyan("[items unknown]")} }`; // as seen in Node, with cyan color
-  }
-
-  function inspectWeakMap() {
-    return `WeakMap { ${cyan("[items unknown]")} }`; // as seen in Node, with cyan color
-  }
-
-  function inspectDate(value) {
-    // without quotes, ISO format, in magenta like before
-    return magenta(isInvalidDate(value) ? "Invalid Date" : value.toISOString());
-  }
-
-  function inspectRegExp(value) {
-    return red(value.toString()); // RegExps are red
-  }
-
-  function inspectStringObject(value) {
-    return cyan(`[String: "${value.toString()}"]`); // wrappers are in cyan
-  }
-
-  function inspectBooleanObject(value) {
-    return cyan(`[Boolean: ${value.toString()}]`); // wrappers are in cyan
-  }
-
-  function inspectNumberObject(value) {
-    return cyan(`[Number: ${value.toString()}]`); // wrappers are in cyan
-  }
-
-  const PromiseState = {
-    Pending: 0,
-    Fulfilled: 1,
-    Rejected: 2,
-  };
-
-  function inspectPromise(
-    value,
-    ctx,
-    level,
-    inspectOptions,
-  ) {
-    const [state, result] = Deno.core.getPromiseDetails(value);
-
-    if (state === PromiseState.Pending) {
-      return `Promise { ${cyan("<pending>")} }`;
-    }
-
-    const prefix = state === PromiseState.Fulfilled
-      ? ""
-      : `${red("<rejected>")} `;
-
-    const str = `${prefix}${
-      inspectValueWithQuotes(
-        result,
-        ctx,
-        level + 1,
-        inspectOptions,
-      )
-    }`;
-
-    if (str.length + PROMISE_STRING_BASE_LENGTH > LINE_BREAKING_LENGTH) {
-      return `Promise {\n${DEFAULT_INDENT.repeat(level + 1)}${str}\n}`;
-    }
-
-    return `Promise { ${str} }`;
-  }
-
-  // TODO: Proxy
-
-  function inspectRawObject(
-    value,
-    ctx,
-    level,
-    inspectOptions,
-  ) {
-    if (level >= inspectOptions.depth) {
-      return cyan("[Object]"); // wrappers are in cyan
-    }
-    ctx.add(value);
-
-    let baseString;
-
-    let shouldShowDisplayName = false;
-    let displayName = value[
-      Symbol.toStringTag
-    ];
-    if (!displayName) {
-      displayName = getClassInstanceName(value);
-    }
-    if (
-      displayName && displayName !== "Object" && displayName !== "anonymous"
-    ) {
-      shouldShowDisplayName = true;
-    }
-
-    const entries = [];
-    const stringKeys = Object.keys(value);
-    const symbolKeys = Object.getOwnPropertySymbols(value);
-    if (inspectOptions.sorted) {
-      stringKeys.sort();
-      symbolKeys.sort((s1, s2) =>
-        (s1.description ?? "").localeCompare(s2.description ?? "")
-      );
-    }
-
-    for (const key of stringKeys) {
-      entries.push(
-        `${key}: ${
-          inspectValueWithQuotes(
-            value[key],
-            ctx,
-            level + 1,
-            inspectOptions,
-          )
-        }`,
-      );
-    }
-    for (const key of symbolKeys) {
-      entries.push(
-        `${key.toString()}: ${
-          inspectValueWithQuotes(
-            value[key],
-            ctx,
-            level + 1,
-            inspectOptions,
-          )
-        }`,
-      );
-    }
-    // Making sure color codes are ignored when calculating the total length
-    const totalLength = entries.length + level +
-      stripColor(entries.join("")).length;
-
-    ctx.delete(value);
-
-    if (entries.length === 0) {
-      baseString = "{}";
-    } else if (totalLength > LINE_BREAKING_LENGTH || !inspectOptions.compact) {
-      const entryIndent = DEFAULT_INDENT.repeat(level + 1);
-      const closingIndent = DEFAULT_INDENT.repeat(level);
-      baseString = `{\n${entryIndent}${entries.join(`,\n${entryIndent}`)}${
-        inspectOptions.trailingComma ? "," : ""
-      }\n${closingIndent}}`;
-    } else {
-      baseString = `{ ${entries.join(", ")} }`;
-    }
-
-    if (shouldShowDisplayName) {
-      baseString = `${displayName} ${baseString}`;
-    }
-
-    return baseString;
-  }
-
-  function inspectObject(
-    value,
-    consoleContext,
-    level,
-    inspectOptions,
-  ) {
-    if (customInspect in value && typeof value[customInspect] === "function") {
-      try {
-        return String(value[customInspect]());
-      } catch {}
-    }
-    if (value instanceof Error) {
-      return String(value.stack);
-    } else if (Array.isArray(value)) {
-      return inspectArray(value, consoleContext, level, inspectOptions);
-    } else if (value instanceof Number) {
-      return inspectNumberObject(value);
-    } else if (value instanceof Boolean) {
-      return inspectBooleanObject(value);
-    } else if (value instanceof String) {
-      return inspectStringObject(value);
-    } else if (value instanceof Promise) {
-      return inspectPromise(value, consoleContext, level, inspectOptions);
-    } else if (value instanceof RegExp) {
-      return inspectRegExp(value);
-    } else if (value instanceof Date) {
-      return inspectDate(value);
-    } else if (value instanceof Set) {
-      return inspectSet(value, consoleContext, level, inspectOptions);
-    } else if (value instanceof Map) {
-      return inspectMap(value, consoleContext, level, inspectOptions);
-    } else if (value instanceof WeakSet) {
-      return inspectWeakSet();
-    } else if (value instanceof WeakMap) {
-      return inspectWeakMap();
-    } else if (isTypedArray(value)) {
-      return inspectTypedArray(
-        Object.getPrototypeOf(value).constructor.name,
-        value,
-        consoleContext,
-        level,
-        inspectOptions,
-      );
-    } else {
-      // Otherwise, default object formatting
-      return inspectRawObject(value, consoleContext, level, inspectOptions);
-    }
-  }
-
-  function inspectArgs(
-    args,
-    inspectOptions = {},
-  ) {
-    const rInspectOptions = { ...DEFAULT_INSPECT_OPTIONS, ...inspectOptions };
-    const first = args[0];
-    let a = 0;
-    let str = "";
-    let join = "";
-
-    if (typeof first === "string") {
-      let tempStr;
-      let lastPos = 0;
-
-      for (let i = 0; i < first.length - 1; i++) {
-        if (first.charCodeAt(i) === CHAR_PERCENT) {
-          const nextChar = first.charCodeAt(++i);
-          if (a + 1 !== args.length) {
-            switch (nextChar) {
-              case CHAR_LOWERCASE_S:
-                // format as a string
-                tempStr = String(args[++a]);
-                break;
-              case CHAR_LOWERCASE_D:
-              case CHAR_LOWERCASE_I:
-                // format as an integer
-                const tempInteger = args[++a];
-                if (typeof tempInteger === "bigint") {
-                  tempStr = `${tempInteger}n`;
-                } else if (typeof tempInteger === "symbol") {
-                  tempStr = "NaN";
-                } else {
-                  tempStr = `${parseInt(String(tempInteger), 10)}`;
-                }
-                break;
-              case CHAR_LOWERCASE_F:
-                // format as a floating point value
-                const tempFloat = args[++a];
-                if (typeof tempFloat === "symbol") {
-                  tempStr = "NaN";
-                } else {
-                  tempStr = `${parseFloat(String(tempFloat))}`;
-                }
-                break;
-              case CHAR_LOWERCASE_O:
-              case CHAR_UPPERCASE_O:
-                // format as an object
-                tempStr = inspectValue(
-                  args[++a],
-                  new Set(),
-                  0,
-                  rInspectOptions,
-                );
-                break;
-              case CHAR_PERCENT:
-                str += first.slice(lastPos, i);
-                lastPos = i + 1;
-                continue;
-              case CHAR_LOWERCASE_C:
-                // TODO: applies CSS style rules to the output string as specified
-                continue;
-              default:
-                // any other character is not a correct placeholder
-                continue;
-            }
-
-            if (lastPos !== i - 1) {
-              str += first.slice(lastPos, i - 1);
-            }
-
-            str += tempStr;
-            lastPos = i + 1;
-          } else if (nextChar === CHAR_PERCENT) {
-            str += first.slice(lastPos, i);
-            lastPos = i + 1;
-          }
-        }
-      }
-
-      if (lastPos !== 0) {
-        a++;
-        join = " ";
-        if (lastPos < first.length) {
-          str += first.slice(lastPos);
-        }
-      }
-    }
-
-    while (a < args.length) {
-      const value = args[a];
-      str += join;
-      if (typeof value === "string") {
-        str += value;
-      } else {
-        // use default maximum depth for null or undefined argument
-        str += inspectValue(value, new Set(), 0, rInspectOptions);
-      }
-      join = " ";
-      a++;
-    }
-
-    if (rInspectOptions.indentLevel > 0) {
-      const groupIndent = DEFAULT_INDENT.repeat(rInspectOptions.indentLevel);
-      if (str.indexOf("\n") !== -1) {
-        str = str.replace(/\n/g, `\n${groupIndent}`);
-      }
-      str = groupIndent + str;
-    }
-
-    return str;
-  }
-
-  const countMap = new Map();
-  const timerMap = new Map();
-  const isConsoleInstance = Symbol("isConsoleInstance");
-
-  class Console {
-    #printFunc = null;
-    [isConsoleInstance] = false;
-
-    constructor(printFunc) {
-      this.#printFunc = printFunc;
-      this.indentLevel = 0;
-      this[isConsoleInstance] = true;
-
-      // ref https://console.spec.whatwg.org/#console-namespace
-      // For historical web-compatibility reasons, the namespace object for
-      // console must have as its [[Prototype]] an empty object, created as if
-      // by ObjectCreate(%ObjectPrototype%), instead of %ObjectPrototype%.
-      const console = Object.create({});
-      Object.assign(console, this);
-      return console;
-    }
-
-    log = (...args) => {
-      this.#printFunc(
-        inspectArgs(args, {
-          indentLevel: this.indentLevel,
-        }) + "\n",
-        false,
-      );
-    };
-
-    debug = this.log;
-    info = this.log;
-
-    dir = (obj, options = {}) => {
-      this.#printFunc(inspectArgs([obj], options) + "\n", false);
-    };
-
-    dirxml = this.dir;
-
-    warn = (...args) => {
-      this.#printFunc(
-        inspectArgs(args, {
-          indentLevel: this.indentLevel,
-        }) + "\n",
-        true,
-      );
-    };
-
-    error = this.warn;
-
-    assert = (condition = false, ...args) => {
-      if (condition) {
-        return;
-      }
-
-      if (args.length === 0) {
-        this.error("Assertion failed");
-        return;
-      }
-
-      const [first, ...rest] = args;
-
-      if (typeof first === "string") {
-        this.error(`Assertion failed: ${first}`, ...rest);
-        return;
-      }
-
-      this.error(`Assertion failed:`, ...args);
-    };
-
-    count = (label = "default") => {
-      label = String(label);
-
-      if (countMap.has(label)) {
-        const current = countMap.get(label) || 0;
-        countMap.set(label, current + 1);
-      } else {
-        countMap.set(label, 1);
-      }
-
-      this.info(`${label}: ${countMap.get(label)}`);
-    };
-
-    countReset = (label = "default") => {
-      label = String(label);
-
-      if (countMap.has(label)) {
-        countMap.set(label, 0);
-      } else {
-        this.warn(`Count for '${label}' does not exist`);
-      }
-    };
-
-    table = (data, properties) => {
-      if (properties !== undefined && !Array.isArray(properties)) {
-        throw new Error(
-          "The 'properties' argument must be of type Array. " +
-            "Received type string",
-        );
-      }
-
-      if (data === null || typeof data !== "object") {
-        return this.log(data);
-      }
-
-      const objectValues = {};
-      const indexKeys = [];
-      const values = [];
-
-      const stringifyValue = (value) =>
-        inspectValueWithQuotes(value, new Set(), 0, {
-          ...DEFAULT_INSPECT_OPTIONS,
-          depth: 1,
-        });
-      const toTable = (header, body) => this.log(cliTable(header, body));
-      const createColumn = (value, shift) => [
-        ...(shift ? [...new Array(shift)].map(() => "") : []),
-        stringifyValue(value),
-      ];
-
-      let resultData;
-      const isSet = data instanceof Set;
-      const isMap = data instanceof Map;
-      const valuesKey = "Values";
-      const indexKey = isSet || isMap ? "(iter idx)" : "(idx)";
-
-      if (data instanceof Set) {
-        resultData = [...data];
-      } else if (data instanceof Map) {
-        let idx = 0;
-        resultData = {};
-
-        data.forEach((v, k) => {
-          resultData[idx] = { Key: k, Values: v };
-          idx++;
-        });
-      } else {
-        resultData = data;
-      }
-
-      let hasPrimitives = false;
-      Object.keys(resultData).forEach((k, idx) => {
-        const value = resultData[k];
-        const primitive = value === null ||
-          (typeof value !== "function" && typeof value !== "object");
-        if (properties === undefined && primitive) {
-          hasPrimitives = true;
-          values.push(stringifyValue(value));
-        } else {
-          const valueObj = value || {};
-          const keys = properties || Object.keys(valueObj);
-          for (const k of keys) {
-            if (primitive || !valueObj.hasOwnProperty(k)) {
-              if (objectValues[k]) {
-                // fill with blanks for idx to avoid misplacing from later values
-                objectValues[k].push("");
-              }
-            } else {
-              if (objectValues[k]) {
-                objectValues[k].push(stringifyValue(valueObj[k]));
-              } else {
-                objectValues[k] = createColumn(valueObj[k], idx);
-              }
-            }
-          }
-          values.push("");
-        }
-
-        indexKeys.push(k);
-      });
-
-      const headerKeys = Object.keys(objectValues);
-      const bodyValues = Object.values(objectValues);
-      const header = [
-        indexKey,
-        ...(properties ||
-          [...headerKeys, !isMap && hasPrimitives && valuesKey]),
-      ].filter(Boolean);
-      const body = [indexKeys, ...bodyValues, values];
-
-      toTable(header, body);
-    };
-
-    time = (label = "default") => {
-      label = String(label);
-
-      if (timerMap.has(label)) {
-        this.warn(`Timer '${label}' already exists`);
-        return;
-      }
-
-      timerMap.set(label, Date.now());
-    };
-
-    timeLog = (label = "default", ...args) => {
-      label = String(label);
-
-      if (!timerMap.has(label)) {
-        this.warn(`Timer '${label}' does not exists`);
-        return;
-      }
-
-      const startTime = timerMap.get(label);
-      const duration = Date.now() - startTime;
-
-      this.info(`${label}: ${duration}ms`, ...args);
-    };
-
-    timeEnd = (label = "default") => {
-      label = String(label);
-
-      if (!timerMap.has(label)) {
-        this.warn(`Timer '${label}' does not exists`);
-        return;
-      }
-
-      const startTime = timerMap.get(label);
-      timerMap.delete(label);
-      const duration = Date.now() - startTime;
-
-      this.info(`${label}: ${duration}ms`);
-    };
-
-    group = (...label) => {
-      if (label.length > 0) {
-        this.log(...label);
-      }
-      this.indentLevel += 2;
-    };
-
-    groupCollapsed = this.group;
-
-    groupEnd = () => {
-      if (this.indentLevel > 0) {
-        this.indentLevel -= 2;
-      }
-    };
-
-    clear = () => {
-      this.indentLevel = 0;
-      this.#printFunc(CSI.kClear, false);
-      this.#printFunc(CSI.kClearScreenDown, false);
-    };
-
-    trace = (...args) => {
-      const message = inspectArgs(args, { indentLevel: 0 });
-      const err = {
-        name: "Trace",
-        message,
-      };
-      Error.captureStackTrace(err, this.trace);
-      this.error(err.stack);
-    };
-
-    static [Symbol.hasInstance](instance) {
-      return instance[isConsoleInstance];
-    }
-  }
-
-  const customInspect = Symbol("Deno.customInspect");
-
-  function inspect(
-    value,
-    inspectOptions = {},
-  ) {
-    if (typeof value === "string") {
-      return value;
-    } else {
-      return inspectValue(value, new Set(), 0, {
-        ...DEFAULT_INSPECT_OPTIONS,
-        ...inspectOptions,
-        // TODO(nayeemrmn): Indent level is not supported.
-        indentLevel: 0,
-      });
-    }
-  }
-
-  // Expose these fields to internalObject for tests.
-  exposeForTest("Console", Console);
-  exposeForTest("inspectArgs", inspectArgs);
-
-  window.__bootstrap.console = {
-    CSI,
-    inspectArgs,
-    Console,
-    customInspect,
-    inspect,
-  };
-})(this);
diff --git a/cli/js2/07_base64.js b/cli/js2/07_base64.js
deleted file mode 100644
index 7e7f5ca78e31b7..00000000000000
--- a/cli/js2/07_base64.js
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// Forked from https://github.com/beatgammit/base64-js
-// Copyright (c) 2014 Jameson Little. MIT License.
-
-((window) => {
-  const lookup = [];
-  const revLookup = [];
-
-  const code =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  for (let i = 0, len = code.length; i < len; ++i) {
-    lookup[i] = code[i];
-    revLookup[code.charCodeAt(i)] = i;
-  }
-
-  // Support decoding URL-safe base64 strings, as Node.js does.
-  // See: https://en.wikipedia.org/wiki/Base64#URL_applications
-  revLookup["-".charCodeAt(0)] = 62;
-  revLookup["_".charCodeAt(0)] = 63;
-
-  function getLens(b64) {
-    const len = b64.length;
-
-    if (len % 4 > 0) {
-      throw new Error("Invalid string. Length must be a multiple of 4");
-    }
-
-    // Trim off extra bytes after placeholder bytes are found
-    // See: https://github.com/beatgammit/base64-js/issues/42
-    let validLen = b64.indexOf("=");
-    if (validLen === -1) validLen = len;
-
-    const placeHoldersLen = validLen === len ? 0 : 4 - (validLen % 4);
-
-    return [validLen, placeHoldersLen];
-  }
-
-  // base64 is 4/3 + up to two characters of the original data
-  function byteLength(b64) {
-    const lens = getLens(b64);
-    const validLen = lens[0];
-    const placeHoldersLen = lens[1];
-    return ((validLen + placeHoldersLen) * 3) / 4 - placeHoldersLen;
-  }
-
-  function _byteLength(
-    b64,
-    validLen,
-    placeHoldersLen,
-  ) {
-    return ((validLen + placeHoldersLen) * 3) / 4 - placeHoldersLen;
-  }
-
-  function toByteArray(b64) {
-    let tmp;
-    const lens = getLens(b64);
-    const validLen = lens[0];
-    const placeHoldersLen = lens[1];
-
-    const arr = new Uint8Array(_byteLength(b64, validLen, placeHoldersLen));
-
-    let curByte = 0;
-
-    // if there are placeholders, only get up to the last complete 4 chars
-    const len = placeHoldersLen > 0 ? validLen - 4 : validLen;
-
-    let i;
-    for (i = 0; i < len; i += 4) {
-      tmp = (revLookup[b64.charCodeAt(i)] << 18) |
-        (revLookup[b64.charCodeAt(i + 1)] << 12) |
-        (revLookup[b64.charCodeAt(i + 2)] << 6) |
-        revLookup[b64.charCodeAt(i + 3)];
-      arr[curByte++] = (tmp >> 16) & 0xff;
-      arr[curByte++] = (tmp >> 8) & 0xff;
-      arr[curByte++] = tmp & 0xff;
-    }
-
-    if (placeHoldersLen === 2) {
-      tmp = (revLookup[b64.charCodeAt(i)] << 2) |
-        (revLookup[b64.charCodeAt(i + 1)] >> 4);
-      arr[curByte++] = tmp & 0xff;
-    }
-
-    if (placeHoldersLen === 1) {
-      tmp = (revLookup[b64.charCodeAt(i)] << 10) |
-        (revLookup[b64.charCodeAt(i + 1)] << 4) |
-        (revLookup[b64.charCodeAt(i + 2)] >> 2);
-      arr[curByte++] = (tmp >> 8) & 0xff;
-      arr[curByte++] = tmp & 0xff;
-    }
-
-    return arr;
-  }
-
-  function tripletToBase64(num) {
-    return (
-      lookup[(num >> 18) & 0x3f] +
-      lookup[(num >> 12) & 0x3f] +
-      lookup[(num >> 6) & 0x3f] +
-      lookup[num & 0x3f]
-    );
-  }
-
-  function encodeChunk(uint8, start, end) {
-    let tmp;
-    const output = [];
-    for (let i = start; i < end; i += 3) {
-      tmp = ((uint8[i] << 16) & 0xff0000) +
-        ((uint8[i + 1] << 8) & 0xff00) +
-        (uint8[i + 2] & 0xff);
-      output.push(tripletToBase64(tmp));
-    }
-    return output.join("");
-  }
-
-  function fromByteArray(uint8) {
-    let tmp;
-    const len = uint8.length;
-    const extraBytes = len % 3; // if we have 1 byte left, pad 2 bytes
-    const parts = [];
-    const maxChunkLength = 16383; // must be multiple of 3
-
-    // go through the array every three bytes, we'll deal with trailing stuff later
-    for (let i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
-      parts.push(
-        encodeChunk(
-          uint8,
-          i,
-          i + maxChunkLength > len2 ? len2 : i + maxChunkLength,
-        ),
-      );
-    }
-
-    // pad the end with zeros, but make sure to not forget the extra bytes
-    if (extraBytes === 1) {
-      tmp = uint8[len - 1];
-      parts.push(lookup[tmp >> 2] + lookup[(tmp << 4) & 0x3f] + "==");
-    } else if (extraBytes === 2) {
-      tmp = (uint8[len - 2] << 8) + uint8[len - 1];
-      parts.push(
-        lookup[tmp >> 10] +
-          lookup[(tmp >> 4) & 0x3f] +
-          lookup[(tmp << 2) & 0x3f] +
-          "=",
-      );
-    }
-
-    return parts.join("");
-  }
-
-  window.__base64 = {
-    byteLength,
-    toByteArray,
-    fromByteArray,
-  };
-})(this);
diff --git a/cli/js2/90_deno_ns.js b/cli/js2/90_deno_ns.js
deleted file mode 100644
index 714326e93e0251..00000000000000
--- a/cli/js2/90_deno_ns.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// This module exports stable Deno APIs.
-
-((window) => {
-  window.__bootstrap.denoNs = {
-    test: window.__bootstrap.testing.test,
-    metrics: window.__bootstrap.metrics.metrics,
-    Process: window.__bootstrap.process.Process,
-    run: window.__bootstrap.process.run,
-    isatty: window.__bootstrap.tty.isatty,
-    writeFileSync: window.__bootstrap.writeFile.writeFileSync,
-    writeFile: window.__bootstrap.writeFile.writeFile,
-    writeTextFileSync: window.__bootstrap.writeFile.writeTextFileSync,
-    writeTextFile: window.__bootstrap.writeFile.writeTextFile,
-    readTextFile: window.__bootstrap.readFile.readTextFile,
-    readTextFileSync: window.__bootstrap.readFile.readTextFileSync,
-    readFile: window.__bootstrap.readFile.readFile,
-    readFileSync: window.__bootstrap.readFile.readFileSync,
-    watchFs: window.__bootstrap.fsEvents.watchFs,
-    chmodSync: window.__bootstrap.fs.chmodSync,
-    chmod: window.__bootstrap.fs.chmod,
-    chown: window.__bootstrap.fs.chown,
-    chownSync: window.__bootstrap.fs.chownSync,
-    copyFileSync: window.__bootstrap.fs.copyFileSync,
-    cwd: window.__bootstrap.fs.cwd,
-    makeTempDirSync: window.__bootstrap.fs.makeTempDirSync,
-    makeTempDir: window.__bootstrap.fs.makeTempDir,
-    makeTempFileSync: window.__bootstrap.fs.makeTempFileSync,
-    makeTempFile: window.__bootstrap.fs.makeTempFile,
-    mkdirSync: window.__bootstrap.fs.mkdirSync,
-    mkdir: window.__bootstrap.fs.mkdir,
-    chdir: window.__bootstrap.fs.chdir,
-    copyFile: window.__bootstrap.fs.copyFile,
-    readDirSync: window.__bootstrap.fs.readDirSync,
-    readDir: window.__bootstrap.fs.readDir,
-    readLinkSync: window.__bootstrap.fs.readLinkSync,
-    readLink: window.__bootstrap.fs.readLink,
-    realPathSync: window.__bootstrap.fs.realPathSync,
-    realPath: window.__bootstrap.fs.realPath,
-    removeSync: window.__bootstrap.fs.removeSync,
-    remove: window.__bootstrap.fs.remove,
-    renameSync: window.__bootstrap.fs.renameSync,
-    rename: window.__bootstrap.fs.rename,
-    version: window.__bootstrap.version.version,
-    build: window.__bootstrap.build.build,
-    statSync: window.__bootstrap.fs.statSync,
-    lstatSync: window.__bootstrap.fs.lstatSync,
-    stat: window.__bootstrap.fs.stat,
-    lstat: window.__bootstrap.fs.lstat,
-    truncateSync: window.__bootstrap.fs.truncateSync,
-    truncate: window.__bootstrap.fs.truncate,
-    errors: window.__bootstrap.errors.errors,
-    customInspect: window.__bootstrap.console.customInspect,
-    inspect: window.__bootstrap.console.inspect,
-    env: window.__bootstrap.os.env,
-    exit: window.__bootstrap.os.exit,
-    execPath: window.__bootstrap.os.execPath,
-    resources: window.__bootstrap.resources.resources,
-    close: window.__bootstrap.resources.close,
-    Buffer: window.__bootstrap.buffer.Buffer,
-    readAll: window.__bootstrap.buffer.readAll,
-    readAllSync: window.__bootstrap.buffer.readAllSync,
-    writeAll: window.__bootstrap.buffer.writeAll,
-    writeAllSync: window.__bootstrap.buffer.writeAllSync,
-    copy: window.__bootstrap.io.copy,
-    iter: window.__bootstrap.io.iter,
-    iterSync: window.__bootstrap.io.iterSync,
-    SeekMode: window.__bootstrap.io.SeekMode,
-    read: window.__bootstrap.io.read,
-    readSync: window.__bootstrap.io.readSync,
-    write: window.__bootstrap.io.write,
-    writeSync: window.__bootstrap.io.writeSync,
-    File: window.__bootstrap.files.File,
-    open: window.__bootstrap.files.open,
-    openSync: window.__bootstrap.files.openSync,
-    create: window.__bootstrap.files.create,
-    createSync: window.__bootstrap.files.createSync,
-    stdin: window.__bootstrap.files.stdin,
-    stdout: window.__bootstrap.files.stdout,
-    stderr: window.__bootstrap.files.stderr,
-    seek: window.__bootstrap.files.seek,
-    seekSync: window.__bootstrap.files.seekSync,
-    connect: window.__bootstrap.net.connect,
-    listen: window.__bootstrap.net.listen,
-    connectTls: window.__bootstrap.tls.connectTls,
-    listenTls: window.__bootstrap.tls.listenTls,
-  };
-})(this);
diff --git a/cli/js2/90_deno_ns_unstable.js b/cli/js2/90_deno_ns_unstable.js
deleted file mode 100644
index 722effeaff7ed1..00000000000000
--- a/cli/js2/90_deno_ns_unstable.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// This module exports unstable Deno APIs.
-((window) => {
-  window.__bootstrap.denoNsUnstable = {
-    signal: window.__bootstrap.signals.signal,
-    signals: window.__bootstrap.signals.signals,
-    Signal: window.__bootstrap.signals.Signal,
-    SignalStream: window.__bootstrap.signals.SignalStream,
-    transpileOnly: window.__bootstrap.compilerApi.transpileOnly,
-    compile: window.__bootstrap.compilerApi.compile,
-    bundle: window.__bootstrap.compilerApi.bundle,
-    permissions: window.__bootstrap.permissions.permissions,
-    Permissions: window.__bootstrap.permissions.Permissions,
-    PermissionStatus: window.__bootstrap.permissions.PermissionStatus,
-    openPlugin: window.__bootstrap.plugins.openPlugin,
-    kill: window.__bootstrap.process.kill,
-    setRaw: window.__bootstrap.tty.setRaw,
-    consoleSize: window.__bootstrap.tty.consoleSize,
-    DiagnosticCategory: window.__bootstrap.diagnostics.DiagnosticCategory,
-    loadavg: window.__bootstrap.os.loadavg,
-    hostname: window.__bootstrap.os.hostname,
-    osRelease: window.__bootstrap.os.osRelease,
-    applySourceMap: window.__bootstrap.errorStack.opApplySourceMap,
-    formatDiagnostics: window.__bootstrap.errorStack.opFormatDiagnostics,
-    shutdown: window.__bootstrap.net.shutdown,
-    ShutdownMode: window.__bootstrap.net.ShutdownMode,
-    listen: window.__bootstrap.netUnstable.listen,
-    connect: window.__bootstrap.netUnstable.connect,
-    listenDatagram: window.__bootstrap.netUnstable.listenDatagram,
-    startTls: window.__bootstrap.tls.startTls,
-    fstatSync: window.__bootstrap.fs.fstatSync,
-    fstat: window.__bootstrap.fs.fstat,
-    ftruncateSync: window.__bootstrap.fs.ftruncateSync,
-    ftruncate: window.__bootstrap.fs.ftruncate,
-    umask: window.__bootstrap.fs.umask,
-    link: window.__bootstrap.fs.link,
-    linkSync: window.__bootstrap.fs.linkSync,
-    utime: window.__bootstrap.fs.utime,
-    utimeSync: window.__bootstrap.fs.utimeSync,
-    symlink: window.__bootstrap.fs.symlink,
-    symlinkSync: window.__bootstrap.fs.symlinkSync,
-    fdatasyncSync: window.__bootstrap.fs.fdatasyncSync,
-    fdatasync: window.__bootstrap.fs.fdatasync,
-    fsyncSync: window.__bootstrap.fs.fsyncSync,
-    fsync: window.__bootstrap.fs.fsync,
-  };
-})(this);
diff --git a/cli/lint.rs b/cli/lint.rs
index e3e1a81ab5bf05..4e12d582ce8d5e 100644
--- a/cli/lint.rs
+++ b/cli/lint.rs
@@ -6,13 +6,11 @@
 //! At the moment it is only consumed using CLI but in
 //! the future it can be easily extended to provide
 //! the same functions as ops available in JS runtime.
-
 use crate::colors;
 use crate::file_fetcher::map_file_extension;
 use crate::fmt::collect_files;
 use crate::fmt::run_parallelized;
 use crate::fmt_errors;
-use crate::swc_ecma_parser::Syntax;
 use crate::swc_util;
 use deno_core::ErrBox;
 use deno_lint::diagnostic::LintDiagnostic;
@@ -20,37 +18,65 @@ use deno_lint::linter::Linter;
 use deno_lint::linter::LinterBuilder;
 use deno_lint::rules;
 use deno_lint::rules::LintRule;
+use serde::Serialize;
 use std::fs;
 use std::path::PathBuf;
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
+use swc_ecmascript::parser::Syntax;
+
+pub enum LintReporterKind {
+  Pretty,
+  Json,
+}
+
+fn create_reporter(kind: LintReporterKind) -> Box<dyn LintReporter + Send> {
+  match kind {
+    LintReporterKind::Pretty => Box::new(PrettyLintReporter::new()),
+    LintReporterKind::Json => Box::new(JsonLintReporter::new()),
+  }
+}
 
-pub async fn lint_files(args: Vec<String>) -> Result<(), ErrBox> {
-  let target_files = collect_files(args)?;
+pub async fn lint_files(
+  args: Vec<String>,
+  ignore: Vec<String>,
+  json: bool,
+) -> Result<(), ErrBox> {
+  let mut target_files = collect_files(args)?;
+  if !ignore.is_empty() {
+    // collect all files to be ignored
+    // and retain only files that should be linted.
+    let ignore_files = collect_files(ignore)?;
+    target_files.retain(|f| !ignore_files.contains(&f));
+  }
   debug!("Found {} files", target_files.len());
 
-  let error_count = Arc::new(AtomicUsize::new(0));
+  let has_error = Arc::new(AtomicBool::new(false));
 
-  // prevent threads outputting at the same time
-  let output_lock = Arc::new(Mutex::new(0));
+  let reporter_kind = if json {
+    LintReporterKind::Json
+  } else {
+    LintReporterKind::Pretty
+  };
+  let reporter_lock = Arc::new(Mutex::new(create_reporter(reporter_kind)));
 
   run_parallelized(target_files, {
-    let error_count = error_count.clone();
+    let reporter_lock = reporter_lock.clone();
+    let has_error = has_error.clone();
     move |file_path| {
       let r = lint_file(file_path.clone());
+      let mut reporter = reporter_lock.lock().unwrap();
 
       match r {
         Ok(file_diagnostics) => {
-          error_count.fetch_add(file_diagnostics.len(), Ordering::SeqCst);
-          let _g = output_lock.lock().unwrap();
           for d in file_diagnostics.iter() {
-            let fmt_diagnostic = format_diagnostic(d);
-            eprintln!("{}\n", fmt_diagnostic);
+            has_error.store(true, Ordering::Relaxed);
+            reporter.visit(&d);
           }
         }
         Err(err) => {
-          eprintln!("Error linting: {}", file_path.to_string_lossy());
-          eprintln!("   {}", err);
+          has_error.store(true, Ordering::Relaxed);
+          reporter.visit_error(&file_path.to_string_lossy().to_string(), &err);
         }
       }
       Ok(())
@@ -58,9 +84,11 @@ pub async fn lint_files(args: Vec<String>) -> Result<(), ErrBox> {
   })
   .await?;
 
-  let error_count = error_count.load(Ordering::SeqCst);
-  if error_count > 0 {
-    eprintln!("Found {} problems", error_count);
+  let has_error = has_error.load(Ordering::Relaxed);
+
+  reporter_lock.lock().unwrap().close();
+
+  if has_error {
     std::process::exit(1);
   }
 
@@ -161,21 +189,104 @@ fn lint_file(file_path: PathBuf) -> Result<Vec<LintDiagnostic>, ErrBox> {
   Ok(file_diagnostics)
 }
 
-fn format_diagnostic(d: &LintDiagnostic) -> String {
-  let pretty_message =
-    format!("({}) {}", colors::gray(&d.code), d.message.clone());
-
-  fmt_errors::format_stack(
-    true,
-    &pretty_message,
-    Some(&d.line_src),
-    Some(d.location.col as i64),
-    Some((d.location.col + d.snippet_length) as i64),
-    &[fmt_errors::format_location(
-      &d.location.filename,
-      d.location.line as i64,
-      d.location.col as i64,
-    )],
-    0,
-  )
+trait LintReporter {
+  fn visit(&mut self, d: &LintDiagnostic);
+  fn visit_error(&mut self, file_path: &str, err: &ErrBox);
+  fn close(&mut self);
+}
+
+#[derive(Serialize)]
+struct LintError {
+  file_path: String,
+  message: String,
+}
+
+struct PrettyLintReporter {
+  lint_count: u32,
+}
+
+impl PrettyLintReporter {
+  fn new() -> PrettyLintReporter {
+    PrettyLintReporter { lint_count: 0 }
+  }
+}
+
+impl LintReporter for PrettyLintReporter {
+  fn visit(&mut self, d: &LintDiagnostic) {
+    self.lint_count += 1;
+
+    let pretty_message =
+      format!("({}) {}", colors::gray(&d.code), d.message.clone());
+
+    let message = fmt_errors::format_stack(
+      true,
+      &pretty_message,
+      Some(&d.line_src),
+      Some(d.location.col as i64),
+      Some((d.location.col + d.snippet_length) as i64),
+      &[fmt_errors::format_location(
+        &d.location.filename,
+        d.location.line as i64,
+        d.location.col as i64,
+      )],
+      0,
+    );
+
+    eprintln!("{}\n", message);
+  }
+
+  fn visit_error(&mut self, file_path: &str, err: &ErrBox) {
+    eprintln!("Error linting: {}", file_path);
+    eprintln!("   {}", err);
+  }
+
+  fn close(&mut self) {
+    match self.lint_count {
+      1 => eprintln!("Found 1 problem"),
+      n if n > 1 => eprintln!("Found {} problems", self.lint_count),
+      _ => (),
+    }
+  }
+}
+
+#[derive(Serialize)]
+struct JsonLintReporter {
+  diagnostics: Vec<LintDiagnostic>,
+  errors: Vec<LintError>,
+}
+
+impl JsonLintReporter {
+  fn new() -> JsonLintReporter {
+    JsonLintReporter {
+      diagnostics: Vec::new(),
+      errors: Vec::new(),
+    }
+  }
+}
+
+impl LintReporter for JsonLintReporter {
+  fn visit(&mut self, d: &LintDiagnostic) {
+    self.diagnostics.push(d.clone());
+  }
+
+  fn visit_error(&mut self, file_path: &str, err: &ErrBox) {
+    self.errors.push(LintError {
+      file_path: file_path.to_string(),
+      message: err.to_string(),
+    });
+  }
+
+  fn close(&mut self) {
+    // Sort so that we guarantee a deterministic output which is useful for tests
+    self.diagnostics.sort_by_key(|key| get_sort_key(&key));
+
+    let json = serde_json::to_string_pretty(&self);
+    eprintln!("{}", json.unwrap());
+  }
+}
+
+pub fn get_sort_key(a: &LintDiagnostic) -> String {
+  let location = &a.location;
+
+  return format!("{}:{}:{}", location.filename, location.line, location.col);
 }
diff --git a/cli/main.rs b/cli/main.rs
index 7b4ae596ac06d2..f586d88465f0aa 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -11,6 +11,7 @@ extern crate futures;
 extern crate serde_json;
 extern crate clap;
 extern crate deno_core;
+extern crate encoding_rs;
 extern crate indexmap;
 #[cfg(unix)]
 extern crate nix;
@@ -29,7 +30,6 @@ pub mod deno_dir;
 pub mod diagnostics;
 mod diff;
 mod disk_cache;
-mod doc;
 mod file_fetcher;
 pub mod flags;
 mod flags_allow_net;
@@ -61,6 +61,7 @@ mod startup_data;
 pub mod state;
 mod swc_util;
 mod test_runner;
+mod text_encoding;
 mod tokio_util;
 mod tsc;
 mod upgrade;
@@ -68,21 +69,16 @@ pub mod version;
 mod web_worker;
 pub mod worker;
 
-pub use deno_lint::dprint_plugin_typescript;
-pub use deno_lint::swc_common;
-pub use deno_lint::swc_ecma_ast;
-pub use deno_lint::swc_ecma_parser;
-pub use deno_lint::swc_ecma_visit;
-
 use crate::coverage::CoverageCollector;
 use crate::coverage::ScriptCoverage;
 use crate::doc::parser::DocFileLoader;
+use crate::file_fetcher::map_file_extension;
 use crate::file_fetcher::SourceFile;
 use crate::file_fetcher::SourceFileFetcher;
+use crate::file_fetcher::TextDocument;
 use crate::fs as deno_fs;
 use crate::global_state::GlobalState;
 use crate::msg::MediaType;
-use crate::op_error::OpError;
 use crate::permissions::Permissions;
 use crate::tsc::TargetLib;
 use crate::worker::MainWorker;
@@ -91,6 +87,8 @@ use deno_core::Deps;
 use deno_core::ErrBox;
 use deno_core::EsIsolate;
 use deno_core::ModuleSpecifier;
+use deno_doc as doc;
+use deno_doc::parser::DocFileLoader;
 use flags::DenoSubcommand;
 use flags::Flags;
 use futures::future::FutureExt;
@@ -102,8 +100,10 @@ use state::exit_unstable;
 use std::env;
 use std::io::Read;
 use std::io::Write;
+use std::iter::once;
 use std::path::PathBuf;
 use std::pin::Pin;
+use std::sync::Arc;
 use upgrade::upgrade_command;
 use url::Url;
 
@@ -156,7 +156,10 @@ where
   serde_json::to_writer_pretty(writer, value).map_err(ErrBox::from)
 }
 
-fn print_cache_info(state: &GlobalState, json: bool) -> Result<(), ErrBox> {
+fn print_cache_info(
+  state: &Arc<GlobalState>,
+  json: bool,
+) -> Result<(), ErrBox> {
   let deno_dir = &state.dir.root;
   let modules_cache = &state.file_fetcher.http_cache.location;
   let typescript_cache = &state.dir.gen_cache.location;
@@ -198,7 +201,7 @@ async fn print_file_info(
   module_specifier: ModuleSpecifier,
   json: bool,
 ) -> Result<(), ErrBox> {
-  let global_state = worker.state.borrow().global_state.clone();
+  let global_state = worker.state.global_state.clone();
 
   let out = global_state
     .file_fetcher
@@ -292,22 +295,19 @@ async fn print_file_info(
 }
 
 fn get_types(unstable: bool) -> String {
+  let mut types = format!(
+    "{}\n{}\n{}\n{}",
+    crate::js::DENO_NS_LIB,
+    crate::js::DENO_WEB_LIB,
+    crate::js::SHARED_GLOBALS_LIB,
+    crate::js::WINDOW_LIB,
+  );
+
   if unstable {
-    format!(
-      "{}\n{}\n{}\n{}",
-      crate::js::DENO_NS_LIB,
-      crate::js::SHARED_GLOBALS_LIB,
-      crate::js::WINDOW_LIB,
-      crate::js::UNSTABLE_NS_LIB,
-    )
-  } else {
-    format!(
-      "{}\n{}\n{}",
-      crate::js::DENO_NS_LIB,
-      crate::js::SHARED_GLOBALS_LIB,
-      crate::js::WINDOW_LIB,
-    )
+    types.push_str(&format!("\n{}", crate::js::UNSTABLE_NS_LIB,));
   }
+
+  types
 }
 
 async fn info_command(
@@ -324,7 +324,7 @@ async fn info_command(
     print_cache_info(&global_state, json)
   } else {
     let main_module = ModuleSpecifier::resolve_url_or_path(&file.unwrap())?;
-    let mut worker = MainWorker::create(global_state, main_module.clone())?;
+    let mut worker = MainWorker::create(&global_state, main_module.clone())?;
     worker.preload_module(&main_module).await?;
     print_file_info(&worker, main_module.clone(), json).await
   }
@@ -343,7 +343,7 @@ async fn install_command(
   fetch_flags.reload = true;
   let global_state = GlobalState::new(fetch_flags)?;
   let main_module = ModuleSpecifier::resolve_url_or_path(&module_url)?;
-  let mut worker = MainWorker::create(global_state, main_module.clone())?;
+  let mut worker = MainWorker::create(&global_state, main_module.clone())?;
   worker.preload_module(&main_module).await?;
   installer::install(flags, &module_url, args, name, root, force)
     .map_err(ErrBox::from)
@@ -353,36 +353,26 @@ async fn lint_command(
   flags: Flags,
   files: Vec<String>,
   list_rules: bool,
+  ignore: Vec<String>,
+  json: bool,
 ) -> Result<(), ErrBox> {
-  let global_state = GlobalState::new(flags)?;
-
-  // TODO(bartlomieju): refactor, it's non-sense to create
-  // state just to perform unstable check...
-  use crate::state::State;
-  let state = State::new(
-    global_state,
-    None,
-    ModuleSpecifier::resolve_url("file:///dummy.ts").unwrap(),
-    None,
-    true,
-  )?;
-
-  state.check_unstable("lint");
+  if !flags.unstable {
+    exit_unstable("lint");
+  }
 
   if list_rules {
     lint::print_rules_list();
     return Ok(());
   }
 
-  lint::lint_files(files).await
+  lint::lint_files(files, ignore, json).await
 }
 
 async fn cache_command(flags: Flags, files: Vec<String>) -> Result<(), ErrBox> {
   let main_module =
     ModuleSpecifier::resolve_url_or_path("./__$deno$fetch.ts").unwrap();
   let global_state = GlobalState::new(flags)?;
-  let mut worker =
-    MainWorker::create(global_state.clone(), main_module.clone())?;
+  let mut worker = MainWorker::create(&global_state, main_module.clone())?;
 
   for file in files {
     let specifier = ModuleSpecifier::resolve_url_or_path(&file)?;
@@ -402,13 +392,13 @@ async fn eval_command(
   let main_module =
     ModuleSpecifier::resolve_url_or_path("./__$deno$eval.ts").unwrap();
   let global_state = GlobalState::new(flags)?;
-  let mut worker = MainWorker::create(global_state, main_module.clone())?;
+  let mut worker = MainWorker::create(&global_state, main_module.clone())?;
   let main_module_url = main_module.as_url().to_owned();
   // Create a dummy source file.
   let source_code = if print {
-    "console.log(".to_string() + &code + ")"
+    format!("console.log({})", code)
   } else {
-    code.clone()
+    code
   }
   .into_bytes();
 
@@ -421,14 +411,11 @@ async fn eval_command(
     } else {
       MediaType::JavaScript
     },
-    source_code,
+    source_code: TextDocument::new(source_code, Some("utf-8")),
   };
   // Save our fake file into file fetcher cache
-  // to allow module access by TS compiler (e.g. op_fetch_source_files)
-  worker
-    .state
-    .borrow()
-    .global_state
+  // to allow module access by TS compiler.
+  global_state
     .file_fetcher
     .save_source_file_in_cache(&main_module, source_file);
   debug!("main_module {}", &main_module);
@@ -457,7 +444,7 @@ async fn bundle_command(
 
   let output = global_state
     .ts_compiler
-    .bundle(global_state.clone(), module_specifier)
+    .bundle(&global_state, module_specifier)
     .await?;
 
   debug!(">>>>> bundle END");
@@ -522,20 +509,39 @@ async fn doc_command(
   let source_file = source_file.unwrap_or_else(|| "--builtin".to_string());
 
   impl DocFileLoader for SourceFileFetcher {
+    fn resolve(
+      &self,
+      specifier: &str,
+      referrer: &str,
+    ) -> Result<String, doc::DocError> {
+      ModuleSpecifier::resolve_import(specifier, referrer)
+        .map(|specifier| specifier.to_string())
+        .map_err(|e| doc::DocError::Resolve(e.to_string()))
+    }
+
     fn load_source_code(
       &self,
       specifier: &str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, OpError>>>> {
-      let specifier =
-        ModuleSpecifier::resolve_url_or_path(specifier).expect("Bad specifier");
+    ) -> Pin<Box<dyn Future<Output = Result<String, doc::DocError>>>> {
       let fetcher = self.clone();
-
+      let specifier = ModuleSpecifier::resolve_url_or_path(specifier)
+        .expect("Expected valid specifier");
       async move {
         let source_file = fetcher
           .fetch_source_file(&specifier, None, Permissions::allow_all())
-          .await?;
-        String::from_utf8(source_file.source_code)
-          .map_err(|_| OpError::other("failed to parse".to_string()))
+          .await
+          .map_err(|e| {
+            doc::DocError::Io(std::io::Error::new(
+              std::io::ErrorKind::Other,
+              e.to_string(),
+            ))
+          })?;
+        source_file.source_code.to_string().map_err(|e| {
+          doc::DocError::Io(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            e.to_string(),
+          ))
+        })
       }
       .boxed_local()
     }
@@ -545,16 +551,28 @@ async fn doc_command(
   let doc_parser = doc::DocParser::new(loader, private);
 
   let parse_result = if source_file == "--builtin" {
-    doc_parser.parse_source("lib.deno.d.ts", get_types(flags.unstable).as_str())
+    let syntax = swc_util::get_syntax_for_dts();
+    doc_parser.parse_source(
+      "lib.deno.d.ts",
+      syntax,
+      get_types(flags.unstable).as_str(),
+    )
   } else {
+    let path = PathBuf::from(&source_file);
+    let syntax = if path.ends_with("d.ts") {
+      swc_util::get_syntax_for_dts()
+    } else {
+      let media_type = map_file_extension(&path);
+      swc_util::get_syntax_for_media_type(media_type)
+    };
     let module_specifier =
       ModuleSpecifier::resolve_url_or_path(&source_file).unwrap();
     doc_parser
-      .parse_with_reexports(&module_specifier.to_string())
+      .parse_with_reexports(&module_specifier.to_string(), syntax)
       .await
   };
 
-  let doc_nodes = match parse_result {
+  let mut doc_nodes = match parse_result {
     Ok(nodes) => nodes,
     Err(e) => {
       eprintln!("{}", e);
@@ -565,6 +583,7 @@ async fn doc_command(
   if json {
     write_json_to_stdout(&doc_nodes)
   } else {
+    doc_nodes.retain(|doc_node| doc_node.kind != doc::DocNodeKind::Import);
     let details = if let Some(filter) = maybe_filter {
       let nodes =
         doc::find_nodes_by_name_recursively(doc_nodes, filter.clone());
@@ -572,9 +591,15 @@ async fn doc_command(
         eprintln!("Node {} was not found!", filter);
         std::process::exit(1);
       }
-      format!("{}", doc::DocPrinter::new(&nodes, true, private))
+      format!(
+        "{}",
+        doc::DocPrinter::new(&nodes, colors::use_color(), private)
+      )
     } else {
-      format!("{}", doc::DocPrinter::new(&doc_nodes, false, private))
+      format!(
+        "{}",
+        doc::DocPrinter::new(&doc_nodes, colors::use_color(), private)
+      )
     };
 
     write_to_stdout_ignore_sigpipe(details.as_bytes()).map_err(ErrBox::from)
@@ -585,7 +610,7 @@ async fn run_repl(flags: Flags) -> Result<(), ErrBox> {
   let main_module =
     ModuleSpecifier::resolve_url_or_path("./__$deno$repl.ts").unwrap();
   let global_state = GlobalState::new(flags)?;
-  let mut worker = MainWorker::create(global_state, main_module)?;
+  let mut worker = MainWorker::create(&global_state, main_module)?;
   loop {
     (&mut *worker).await?;
   }
@@ -599,7 +624,7 @@ async fn run_command(flags: Flags, script: String) -> Result<(), ErrBox> {
     ModuleSpecifier::resolve_url_or_path("./__$deno$stdin.ts").unwrap()
   };
   let mut worker =
-    MainWorker::create(global_state.clone(), main_module.clone())?;
+    MainWorker::create(&global_state.clone(), main_module.clone())?;
   if script == "-" {
     let mut source = Vec::new();
     std::io::stdin().read_to_end(&mut source)?;
@@ -610,14 +635,11 @@ async fn run_command(flags: Flags, script: String) -> Result<(), ErrBox> {
       url: main_module_url,
       types_header: None,
       media_type: MediaType::TypeScript,
-      source_code: source,
+      source_code: source.into(),
     };
     // Save our fake file into file fetcher cache
-    // to allow module access by TS compiler (e.g. op_fetch_source_files)
-    worker
-      .state
-      .borrow()
-      .global_state
+    // to allow module access by TS compiler
+    global_state
       .file_fetcher
       .save_source_file_in_cache(&main_module, source_file);
   };
@@ -663,22 +685,21 @@ async fn test_command(
   );
   let main_module =
     ModuleSpecifier::resolve_url(&test_file_url.to_string()).unwrap();
-  let mut worker =
-    MainWorker::create(global_state.clone(), main_module.clone())?;
+  let mut worker = MainWorker::create(&global_state, main_module.clone())?;
   // Create a dummy source file.
   let source_file = SourceFile {
     filename: test_file_url.to_file_path().unwrap(),
     url: test_file_url,
     types_header: None,
     media_type: MediaType::TypeScript,
-    source_code: test_file.clone().into_bytes(),
+    source_code: TextDocument::new(
+      test_file.clone().into_bytes(),
+      Some("utf-8"),
+    ),
   };
   // Save our fake file into file fetcher cache
-  // to allow module access by TS compiler (e.g. op_fetch_source_files)
-  worker
-    .state
-    .borrow()
-    .global_state
+  // to allow module access by TS compiler
+  global_state
     .file_fetcher
     .save_source_file_in_cache(&main_module, source_file);
 
@@ -794,9 +815,27 @@ pub fn main() {
   let flags = flags::flags_from_vec(args);
 
   if let Some(ref v8_flags) = flags.v8_flags {
-    let mut v8_flags_ = v8_flags.clone();
-    v8_flags_.insert(0, "UNUSED_BUT_NECESSARY_ARG0".to_string());
-    v8_set_flags(v8_flags_);
+    let v8_flags_includes_help = v8_flags
+      .iter()
+      .any(|flag| flag == "-help" || flag == "--help");
+    let v8_flags = once("UNUSED_BUT_NECESSARY_ARG0".to_owned())
+      .chain(v8_flags.iter().cloned())
+      .collect::<Vec<_>>();
+    let unrecognized_v8_flags = v8_set_flags(v8_flags)
+      .into_iter()
+      .skip(1)
+      .collect::<Vec<_>>();
+    if !unrecognized_v8_flags.is_empty() {
+      for f in unrecognized_v8_flags {
+        eprintln!("error: V8 did not recognize flag '{}'", f);
+      }
+      eprintln!();
+      eprintln!("For a list of V8 flags, use '--v8-flags=--help'");
+      std::process::exit(1);
+    }
+    if v8_flags_includes_help {
+      std::process::exit(0);
+    }
   }
 
   let log_level = match flags.log_level {
@@ -824,9 +863,11 @@ pub fn main() {
     DenoSubcommand::Cache { files } => {
       cache_command(flags, files).boxed_local()
     }
-    DenoSubcommand::Fmt { check, files } => {
-      fmt::format(files, check).boxed_local()
-    }
+    DenoSubcommand::Fmt {
+      check,
+      files,
+      ignore,
+    } => fmt::format(files, check, ignore).boxed_local(),
     DenoSubcommand::Info { file, json } => {
       info_command(flags, file, json).boxed_local()
     }
@@ -839,9 +880,12 @@ pub fn main() {
     } => {
       install_command(flags, module_url, args, name, root, force).boxed_local()
     }
-    DenoSubcommand::Lint { files, rules } => {
-      lint_command(flags, files, rules).boxed_local()
-    }
+    DenoSubcommand::Lint {
+      files,
+      rules,
+      ignore,
+      json,
+    } => lint_command(flags, files, rules, ignore, json).boxed_local(),
     DenoSubcommand::Repl => run_repl(flags).boxed_local(),
     DenoSubcommand::Run { script } => run_command(flags, script).boxed_local(),
     DenoSubcommand::Test {
diff --git a/cli/module_graph.rs b/cli/module_graph.rs
index 3fb1379f306200..5b15c0cd472fe5 100644
--- a/cli/module_graph.rs
+++ b/cli/module_graph.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 use crate::checksum;
-use crate::doc::Location;
 use crate::file_fetcher::map_file_extension;
 use crate::file_fetcher::SourceFile;
 use crate::file_fetcher::SourceFileFetcher;
@@ -8,6 +7,7 @@ use crate::import_map::ImportMap;
 use crate::msg::MediaType;
 use crate::op_error::OpError;
 use crate::permissions::Permissions;
+use crate::swc_util::Location;
 use crate::tsc::pre_process_file;
 use crate::tsc::ImportDesc;
 use crate::tsc::TsReferenceDesc;
@@ -458,7 +458,7 @@ impl ModuleGraphLoader {
           redirect: Some(source_file.url.to_string()),
           filename: source_file.filename.to_str().unwrap().to_string(),
           version_hash: checksum::gen(&[
-            &source_file.source_code,
+            &source_file.source_code.as_bytes(),
             version::DENO.as_bytes(),
           ]),
           media_type: source_file.media_type,
@@ -473,9 +473,11 @@ impl ModuleGraphLoader {
     }
 
     let module_specifier = ModuleSpecifier::from(source_file.url.clone());
-    let version_hash =
-      checksum::gen(&[&source_file.source_code, version::DENO.as_bytes()]);
-    let source_code = String::from_utf8(source_file.source_code)?;
+    let version_hash = checksum::gen(&[
+      &source_file.source_code.as_bytes(),
+      version::DENO.as_bytes(),
+    ]);
+    let source_code = source_file.source_code.to_string()?;
 
     if SUPPORTED_MEDIA_TYPES.contains(&source_file.media_type) {
       if let Some(types_specifier) = source_file.types_header {
@@ -580,7 +582,7 @@ impl ModuleGraphLoader {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use crate::GlobalState;
+  use crate::global_state::GlobalState;
 
   async fn build_graph(
     module_specifier: &ModuleSpecifier,
@@ -602,7 +604,7 @@ mod tests {
   #[ignore]
   #[tokio::test]
   async fn source_graph_fetch() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
 
     let module_specifier = ModuleSpecifier::resolve_url_or_path(
       "http://localhost:4545/cli/tests/019_media_types.ts",
@@ -690,12 +692,11 @@ mod tests {
         },
       ])
     );
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn source_graph_type_references() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
 
     let module_specifier = ModuleSpecifier::resolve_url_or_path(
       "http://localhost:4545/cli/tests/type_definitions.ts",
@@ -747,13 +748,11 @@ mod tests {
     ));
     assert!(graph
       .contains_key("http://localhost:4545/cli/tests/type_definitions/qat.ts"));
-
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn source_graph_type_references2() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
 
     let module_specifier = ModuleSpecifier::resolve_url_or_path(
       "http://localhost:4545/cli/tests/type_directives_02.ts",
@@ -797,12 +796,11 @@ mod tests {
         }
       ])
     );
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn source_graph_type_references3() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
 
     let module_specifier = ModuleSpecifier::resolve_url_or_path(
       "http://localhost:4545/cli/tests/type_directives_01.ts",
@@ -840,12 +838,11 @@ mod tests {
         }
       ])
     );
-    drop(http_server_guard);
   }
 
   #[tokio::test]
   async fn source_graph_different_langs() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
 
     // ModuleGraphLoader was mistakenly parsing this file as TSX
     // https://github.com/denoland/deno/issues/5867
@@ -858,8 +855,6 @@ mod tests {
     build_graph(&module_specifier)
       .await
       .expect("Failed to build graph");
-
-    drop(http_server_guard);
   }
 }
 
diff --git a/cli/op_error.rs b/cli/op_error.rs
index 73f7640a8e301e..32ad9c0f726464 100644
--- a/cli/op_error.rs
+++ b/cli/op_error.rs
@@ -15,6 +15,7 @@
 //!   exceptions.
 
 use crate::import_map::ImportMapError;
+use crate::swc_util::SwcDiagnosticBuffer;
 use deno_core::ErrBox;
 use deno_core::ModuleResolutionError;
 use rustyline::error::ReadlineError;
@@ -53,15 +54,75 @@ pub enum ErrorKind {
   Busy = 23,
 }
 
+impl From<ErrorKind> for String {
+  fn from(kind: ErrorKind) -> Self {
+    let s = match kind {
+      ErrorKind::NotFound => "NotFound",
+      ErrorKind::PermissionDenied => "PermissionDenied",
+      ErrorKind::ConnectionRefused => "ConnectionRefused",
+      ErrorKind::ConnectionReset => "ConnectionReset",
+      ErrorKind::ConnectionAborted => "ConnectionAborted",
+      ErrorKind::NotConnected => "NotConnected",
+      ErrorKind::AddrInUse => "AddrInUse",
+      ErrorKind::AddrNotAvailable => "AddrNotAvailable",
+      ErrorKind::BrokenPipe => "BrokenPipe",
+      ErrorKind::AlreadyExists => "AlreadyExists",
+      ErrorKind::InvalidData => "InvalidData",
+      ErrorKind::TimedOut => "TimedOut",
+      ErrorKind::Interrupted => "Interrupted",
+      ErrorKind::WriteZero => "WriteZero",
+      ErrorKind::UnexpectedEof => "UnexpectedEof",
+      ErrorKind::BadResource => "BadResource",
+      ErrorKind::Http => "Http",
+      ErrorKind::URIError => "URIError",
+      ErrorKind::TypeError => "TypeError",
+      ErrorKind::Other => "Other",
+      ErrorKind::Busy => "Busy",
+    };
+
+    s.to_string()
+  }
+}
+
+fn error_str_to_kind(kind_str: &str) -> ErrorKind {
+  match kind_str {
+    "NotFound" => ErrorKind::NotFound,
+    "PermissionDenied" => ErrorKind::PermissionDenied,
+    "ConnectionRefused" => ErrorKind::ConnectionRefused,
+    "ConnectionReset" => ErrorKind::ConnectionReset,
+    "ConnectionAborted" => ErrorKind::ConnectionAborted,
+    "NotConnected" => ErrorKind::NotConnected,
+    "AddrInUse" => ErrorKind::AddrInUse,
+    "AddrNotAvailable" => ErrorKind::AddrNotAvailable,
+    "BrokenPipe" => ErrorKind::BrokenPipe,
+    "AlreadyExists" => ErrorKind::AlreadyExists,
+    "InvalidData" => ErrorKind::InvalidData,
+    "TimedOut" => ErrorKind::TimedOut,
+    "Interrupted" => ErrorKind::Interrupted,
+    "WriteZero" => ErrorKind::WriteZero,
+    "UnexpectedEof" => ErrorKind::UnexpectedEof,
+    "BadResource" => ErrorKind::BadResource,
+    "Http" => ErrorKind::Http,
+    "URIError" => ErrorKind::URIError,
+    "TypeError" => ErrorKind::TypeError,
+    "Other" => ErrorKind::Other,
+    "Busy" => ErrorKind::Busy,
+    _ => panic!("unknown error kind"),
+  }
+}
+
 #[derive(Debug)]
 pub struct OpError {
-  pub kind: ErrorKind,
+  pub kind_str: String,
   pub msg: String,
 }
 
 impl OpError {
   fn new(kind: ErrorKind, msg: String) -> Self {
-    Self { kind, msg }
+    Self {
+      kind_str: kind.into(),
+      msg,
+    }
   }
 
   pub fn not_found(msg: String) -> Self {
@@ -111,6 +172,16 @@ impl OpError {
       "resource is unavailable because it is in use by a promise".to_string(),
     )
   }
+
+  pub fn invalid_domain_error() -> OpError {
+    OpError::type_error("Invalid domain.".to_string())
+  }
+
+  pub fn permission_escalation_error() -> OpError {
+    OpError::permission_denied(
+      "Arguments escalate parent permissions.".to_string(),
+    )
+  }
 }
 
 impl Error for OpError {}
@@ -129,10 +200,7 @@ impl From<ImportMapError> for OpError {
 
 impl From<&ImportMapError> for OpError {
   fn from(error: &ImportMapError) -> Self {
-    Self {
-      kind: ErrorKind::Other,
-      msg: error.to_string(),
-    }
+    Self::new(ErrorKind::Other, error.to_string())
   }
 }
 
@@ -144,10 +212,7 @@ impl From<ModuleResolutionError> for OpError {
 
 impl From<&ModuleResolutionError> for OpError {
   fn from(error: &ModuleResolutionError) -> Self {
-    Self {
-      kind: ErrorKind::URIError,
-      msg: error.to_string(),
-    }
+    Self::new(ErrorKind::URIError, error.to_string())
   }
 }
 
@@ -165,10 +230,7 @@ impl From<&VarError> for OpError {
       NotUnicode(..) => ErrorKind::InvalidData,
     };
 
-    Self {
-      kind,
-      msg: error.to_string(),
-    }
+    Self::new(kind, error.to_string())
   }
 }
 
@@ -205,10 +267,7 @@ impl From<&io::Error> for OpError {
       _ => unreachable!(),
     };
 
-    Self {
-      kind,
-      msg: error.to_string(),
-    }
+    Self::new(kind, error.to_string())
   }
 }
 
@@ -220,10 +279,7 @@ impl From<url::ParseError> for OpError {
 
 impl From<&url::ParseError> for OpError {
   fn from(error: &url::ParseError) -> Self {
-    Self {
-      kind: ErrorKind::URIError,
-      msg: error.to_string(),
-    }
+    Self::new(ErrorKind::URIError, error.to_string())
   }
 }
 impl From<reqwest::Error> for OpError {
@@ -251,14 +307,8 @@ impl From<&reqwest::Error> for OpError {
             .downcast_ref::<serde_json::error::Error>()
             .map(|e| e.into())
         })
-        .unwrap_or_else(|| Self {
-          kind: ErrorKind::Http,
-          msg: error.to_string(),
-        }),
-      None => Self {
-        kind: ErrorKind::Http,
-        msg: error.to_string(),
-      },
+        .unwrap_or_else(|| Self::new(ErrorKind::Http, error.to_string())),
+      None => Self::new(ErrorKind::Http, error.to_string()),
     }
   }
 }
@@ -281,10 +331,7 @@ impl From<&ReadlineError> for OpError {
       _ => unimplemented!(),
     };
 
-    Self {
-      kind,
-      msg: error.to_string(),
-    }
+    Self::new(kind, error.to_string())
   }
 }
 
@@ -304,10 +351,7 @@ impl From<&serde_json::error::Error> for OpError {
       Category::Eof => ErrorKind::UnexpectedEof,
     };
 
-    Self {
-      kind,
-      msg: error.to_string(),
-    }
+    Self::new(kind, error.to_string())
   }
 }
 
@@ -327,10 +371,7 @@ impl From<nix::Error> for OpError {
       nix::Error::UnsupportedOperation => unreachable!(),
     };
 
-    Self {
-      kind,
-      msg: error.to_string(),
-    }
+    Self::new(kind, error.to_string())
   }
 }
 
@@ -351,10 +392,7 @@ impl From<&dlopen::Error> for OpError {
       NullSymbol => ErrorKind::Other,
     };
 
-    Self {
-      kind,
-      msg: error.to_string(),
-    }
+    Self::new(kind, error.to_string())
   }
 }
 
@@ -375,10 +413,19 @@ impl From<&notify::Error> for OpError {
       InvalidConfig(_) => ErrorKind::InvalidData,
     };
 
-    Self {
-      kind,
-      msg: error.to_string(),
-    }
+    Self::new(kind, error.to_string())
+  }
+}
+
+impl From<SwcDiagnosticBuffer> for OpError {
+  fn from(error: SwcDiagnosticBuffer) -> Self {
+    OpError::from(&error)
+  }
+}
+
+impl From<&SwcDiagnosticBuffer> for OpError {
+  fn from(error: &SwcDiagnosticBuffer) -> Self {
+    Self::new(ErrorKind::Other, error.diagnostics.join(", "))
   }
 }
 
@@ -396,9 +443,9 @@ impl From<ErrBox> for OpError {
 
     None
       .or_else(|| {
-        error
-          .downcast_ref::<OpError>()
-          .map(|e| OpError::new(e.kind, e.msg.to_string()))
+        error.downcast_ref::<OpError>().map(|e| {
+          OpError::new(error_str_to_kind(&e.kind_str), e.msg.to_string())
+        })
       })
       .or_else(|| error.downcast_ref::<reqwest::Error>().map(|e| e.into()))
       .or_else(|| error.downcast_ref::<ImportMapError>().map(|e| e.into()))
@@ -418,6 +465,11 @@ impl From<ErrBox> for OpError {
       })
       .or_else(|| error.downcast_ref::<dlopen::Error>().map(|e| e.into()))
       .or_else(|| error.downcast_ref::<notify::Error>().map(|e| e.into()))
+      .or_else(|| {
+        error
+          .downcast_ref::<SwcDiagnosticBuffer>()
+          .map(|e| e.into())
+      })
       .or_else(|| unix_error_kind(&error))
       .unwrap_or_else(|| {
         panic!("Can't downcast {:?} to OpError", error);
@@ -446,21 +498,21 @@ mod tests {
   #[test]
   fn test_simple_error() {
     let err = OpError::not_found("foo".to_string());
-    assert_eq!(err.kind, ErrorKind::NotFound);
+    assert_eq!(err.kind_str, "NotFound");
     assert_eq!(err.to_string(), "foo");
   }
 
   #[test]
   fn test_io_error() {
     let err = OpError::from(io_error());
-    assert_eq!(err.kind, ErrorKind::NotFound);
+    assert_eq!(err.kind_str, "NotFound");
     assert_eq!(err.to_string(), "entity not found");
   }
 
   #[test]
   fn test_url_error() {
     let err = OpError::from(url_error());
-    assert_eq!(err.kind, ErrorKind::URIError);
+    assert_eq!(err.kind_str, "URIError");
     assert_eq!(err.to_string(), "empty host");
   }
 
@@ -469,21 +521,21 @@ mod tests {
   #[test]
   fn test_import_map_error() {
     let err = OpError::from(import_map_error());
-    assert_eq!(err.kind, ErrorKind::Other);
+    assert_eq!(err.kind_str, "Other");
     assert_eq!(err.to_string(), "an import map error");
   }
 
   #[test]
   fn test_bad_resource() {
     let err = OpError::bad_resource("Resource has been closed".to_string());
-    assert_eq!(err.kind, ErrorKind::BadResource);
+    assert_eq!(err.kind_str, "BadResource");
     assert_eq!(err.to_string(), "Resource has been closed");
   }
 
   #[test]
   fn test_bad_resource_id() {
     let err = OpError::bad_resource_id();
-    assert_eq!(err.kind, ErrorKind::BadResource);
+    assert_eq!(err.kind_str, "BadResource");
     assert_eq!(err.to_string(), "Bad resource ID");
   }
 
@@ -492,7 +544,7 @@ mod tests {
     let err = OpError::permission_denied(
       "run again with the --allow-net flag".to_string(),
     );
-    assert_eq!(err.kind, ErrorKind::PermissionDenied);
+    assert_eq!(err.kind_str, "PermissionDenied");
     assert_eq!(err.to_string(), "run again with the --allow-net flag");
   }
 }
diff --git a/cli/op_fetch_asset.rs b/cli/op_fetch_asset.rs
index d89ae20b39c777..0ebd84c4308a27 100644
--- a/cli/op_fetch_asset.rs
+++ b/cli/op_fetch_asset.rs
@@ -4,7 +4,6 @@
 pub use deno_core::v8_set_flags;
 use deno_core::CoreIsolateState;
 use deno_core::Op;
-use deno_core::OpDispatcher;
 use deno_core::ZeroCopyBuf;
 use std::collections::HashMap;
 use std::path::PathBuf;
@@ -88,7 +87,7 @@ fn get_asset(name: &str) -> Option<&'static str> {
 /// CoreIsolate.
 pub fn op_fetch_asset<S: ::std::hash::BuildHasher>(
   custom_assets: HashMap<String, PathBuf, S>,
-) -> impl OpDispatcher {
+) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op {
   for (_, path) in custom_assets.iter() {
     println!("cargo:rerun-if-changed={}", path.display());
   }
diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs
index 9e56ef4362170a..7ad4aece3cfd17 100644
--- a/cli/ops/compiler.rs
+++ b/cli/ops/compiler.rs
@@ -1,8 +1,20 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+use super::dispatch_json::{JsonOp, Value};
+use crate::op_error::OpError;
+use crate::ops::json_op;
 use crate::state::State;
 use deno_core::CoreIsolate;
+use deno_core::CoreIsolateState;
+use deno_core::ZeroCopyBuf;
+use std::rc::Rc;
+use std::sync::Arc;
+use std::sync::Mutex;
 
-pub fn init(i: &mut CoreIsolate, _s: &State) {
+pub fn init(
+  i: &mut CoreIsolate,
+  _s: &Rc<State>,
+  response: Arc<Mutex<Option<String>>>,
+) {
   let custom_assets = std::collections::HashMap::new();
   // TODO(ry) use None.
   // TODO(bartlomieju): is this op even required?
@@ -10,4 +22,46 @@ pub fn init(i: &mut CoreIsolate, _s: &State) {
     "op_fetch_asset",
     crate::op_fetch_asset::op_fetch_asset(custom_assets),
   );
+
+  i.register_op(
+    "op_compiler_respond",
+    json_op(compiler_op(response, op_compiler_respond)),
+  );
+}
+
+pub fn compiler_op<D>(
+  response: Arc<Mutex<Option<String>>>,
+  dispatcher: D,
+) -> impl Fn(
+  &mut deno_core::CoreIsolateState,
+  Value,
+  &mut [ZeroCopyBuf],
+) -> Result<JsonOp, OpError>
+where
+  D: Fn(
+    Arc<Mutex<Option<String>>>,
+    Value,
+    &mut [ZeroCopyBuf],
+  ) -> Result<JsonOp, OpError>,
+{
+  move |_isolate_state: &mut CoreIsolateState,
+        args: Value,
+        zero_copy: &mut [ZeroCopyBuf]|
+        -> Result<JsonOp, OpError> {
+    dispatcher(response.clone(), args, zero_copy)
+  }
+}
+
+fn op_compiler_respond(
+  response: Arc<Mutex<Option<String>>>,
+  args: Value,
+  _zero_copy: &mut [ZeroCopyBuf],
+) -> Result<JsonOp, OpError> {
+  let mut r = response.lock().unwrap();
+  assert!(
+    r.is_none(),
+    "op_compiler_respond found unexpected existing compiler output"
+  );
+  *r = Some(args.to_string());
+  Ok(JsonOp::Sync(json!({})))
 }
diff --git a/cli/ops/dispatch_json.rs b/cli/ops/dispatch_json.rs
index c3a1c3b3fdb843..5ed7e6c6d8d560 100644
--- a/cli/ops/dispatch_json.rs
+++ b/cli/ops/dispatch_json.rs
@@ -3,7 +3,6 @@ use crate::op_error::OpError;
 use deno_core::Buf;
 use deno_core::CoreIsolateState;
 use deno_core::Op;
-use deno_core::OpDispatcher;
 use deno_core::ZeroCopyBuf;
 use futures::future::FutureExt;
 pub use serde_derive::Deserialize;
@@ -27,11 +26,11 @@ pub enum JsonOp {
 fn json_err(err: OpError) -> Value {
   json!({
     "message": err.msg,
-    "kind": err.kind as u32,
+    "kind": err.kind_str,
   })
 }
 
-fn serialize_result(promise_id: Option<u64>, result: JsonResult) -> Buf {
+pub fn serialize_result(promise_id: Option<u64>, result: JsonResult) -> Buf {
   let value = match result {
     Ok(v) => json!({ "ok": v, "promiseId": promise_id }),
     Err(err) => json!({ "err": json_err(err), "promiseId": promise_id }),
@@ -45,36 +44,16 @@ struct AsyncArgs {
   promise_id: Option<u64>,
 }
 
-/// Like OpDispatcher but with additional json `Value` parameter
-/// and return a result of `JsonOp` instead of `Op`.
-pub trait JsonOpDispatcher {
-  fn dispatch(
-    &self,
-    isolate_state: &mut CoreIsolateState,
-    json: Value,
-    zero_copy: &mut [ZeroCopyBuf],
-  ) -> Result<JsonOp, OpError>;
-}
-
-impl<F> JsonOpDispatcher for F
+pub fn json_op<D>(
+  d: D,
+) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
 where
-  F: Fn(
+  D: Fn(
     &mut CoreIsolateState,
     Value,
     &mut [ZeroCopyBuf],
   ) -> Result<JsonOp, OpError>,
 {
-  fn dispatch(
-    &self,
-    isolate_state: &mut CoreIsolateState,
-    json: Value,
-    zero_copy: &mut [ZeroCopyBuf],
-  ) -> Result<JsonOp, OpError> {
-    self(isolate_state, json, zero_copy)
-  }
-}
-
-pub fn json_op(d: impl JsonOpDispatcher) -> impl OpDispatcher {
   move |isolate_state: &mut CoreIsolateState, zero_copy: &mut [ZeroCopyBuf]| {
     assert!(!zero_copy.is_empty(), "Expected JSON string at position 0");
     let async_args: AsyncArgs = match serde_json::from_slice(&zero_copy[0]) {
@@ -89,7 +68,7 @@ pub fn json_op(d: impl JsonOpDispatcher) -> impl OpDispatcher {
 
     let result = serde_json::from_slice(&zero_copy[0])
       .map_err(OpError::from)
-      .and_then(|args| d.dispatch(isolate_state, args, &mut zero_copy[1..]));
+      .and_then(|args| d(isolate_state, args, &mut zero_copy[1..]));
 
     // Convert to Op
     match result {
diff --git a/cli/ops/dispatch_minimal.rs b/cli/ops/dispatch_minimal.rs
index c37e57e45f90b2..df7d48b4e4efd8 100644
--- a/cli/ops/dispatch_minimal.rs
+++ b/cli/ops/dispatch_minimal.rs
@@ -9,7 +9,6 @@ use byteorder::{LittleEndian, WriteBytesExt};
 use deno_core::Buf;
 use deno_core::CoreIsolateState;
 use deno_core::Op;
-use deno_core::OpDispatcher;
 use deno_core::ZeroCopyBuf;
 use futures::future::FutureExt;
 use std::future::Future;
@@ -40,21 +39,24 @@ impl Into<Buf> for Record {
 pub struct ErrorRecord {
   pub promise_id: i32,
   pub arg: i32,
-  pub error_code: i32,
+  pub error_len: i32,
+  pub error_code: Vec<u8>,
   pub error_message: Vec<u8>,
 }
 
 impl Into<Buf> for ErrorRecord {
   fn into(self) -> Buf {
-    let v32: Vec<i32> = vec![self.promise_id, self.arg, self.error_code];
+    let v32: Vec<i32> = vec![self.promise_id, self.arg, self.error_len];
     let mut v8: Vec<u8> = Vec::new();
     for n in v32 {
       v8.write_i32::<LittleEndian>(n).unwrap();
     }
+    let mut code = self.error_code;
     let mut message = self.error_message;
-    // Align to 32bit word, padding with the space character.
-    message.resize((message.len() + 3usize) & !3usize, b' ');
+    v8.append(&mut code);
     v8.append(&mut message);
+    // Align to 32bit word, padding with the space character.
+    v8.resize((v8.len() + 3usize) & !3usize, b' ');
     v8.into_boxed_slice()
   }
 }
@@ -62,13 +64,14 @@ impl Into<Buf> for ErrorRecord {
 #[test]
 fn test_error_record() {
   let expected = vec![
-    1, 0, 0, 0, 255, 255, 255, 255, 10, 0, 0, 0, 69, 114, 114, 111, 114, 32,
-    32, 32,
+    1, 0, 0, 0, 255, 255, 255, 255, 11, 0, 0, 0, 66, 97, 100, 82, 101, 115,
+    111, 117, 114, 99, 101, 69, 114, 114, 111, 114,
   ];
   let err_record = ErrorRecord {
     promise_id: 1,
     arg: -1,
-    error_code: 10,
+    error_len: 11,
+    error_code: "BadResource".to_string().as_bytes().to_owned(),
     error_message: "Error".to_string().as_bytes().to_owned(),
   };
   let buf: Buf = err_record.into();
@@ -115,7 +118,9 @@ fn test_parse_min_record() {
   assert_eq!(parse_min_record(&buf), None);
 }
 
-pub fn minimal_op<D>(d: D) -> impl OpDispatcher
+pub fn minimal_op<D>(
+  d: D,
+) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
 where
   D: Fn(&mut CoreIsolateState, bool, i32, &mut [ZeroCopyBuf]) -> MinimalOp,
 {
@@ -128,7 +133,8 @@ where
         let error_record = ErrorRecord {
           promise_id: 0,
           arg: -1,
-          error_code: e.kind as i32,
+          error_len: e.kind_str.len() as i32,
+          error_code: e.kind_str.as_bytes().to_owned(),
           error_message: e.msg.as_bytes().to_owned(),
         };
         return Op::Sync(error_record.into());
@@ -148,7 +154,8 @@ where
           let error_record = ErrorRecord {
             promise_id: record.promise_id,
             arg: -1,
-            error_code: err.kind as i32,
+            error_len: err.kind_str.len() as i32,
+            error_code: err.kind_str.as_bytes().to_owned(),
             error_message: err.msg.as_bytes().to_owned(),
           };
           error_record.into()
@@ -165,7 +172,8 @@ where
               let error_record = ErrorRecord {
                 promise_id: record.promise_id,
                 arg: -1,
-                error_code: err.kind as i32,
+                error_len: err.kind_str.len() as i32,
+                error_code: err.kind_str.as_bytes().to_owned(),
                 error_message: err.msg.as_bytes().to_owned(),
               };
               error_record.into()
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs
index ade125b1a1552d..02295d7f81ba4e 100644
--- a/cli/ops/errors.rs
+++ b/cli/ops/errors.rs
@@ -8,8 +8,9 @@ use crate::state::State;
 use deno_core::CoreIsolate;
 use deno_core::ZeroCopyBuf;
 use std::collections::HashMap;
+use std::rc::Rc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op(
     "op_apply_source_map",
     s.stateful_json_op(op_apply_source_map),
@@ -29,7 +30,7 @@ struct ApplySourceMap {
 }
 
 fn op_apply_source_map(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -42,7 +43,7 @@ fn op_apply_source_map(
       args.line_number.into(),
       args.column_number.into(),
       &mut mappings_map,
-      &state.borrow().global_state.ts_compiler,
+      &state.global_state.ts_compiler,
     );
 
   Ok(JsonOp::Sync(json!({
@@ -53,7 +54,7 @@ fn op_apply_source_map(
 }
 
 fn op_format_diagnostic(
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/fetch.rs b/cli/ops/fetch.rs
index 869c7c5b886d87..b320222edc5d59 100644
--- a/cli/ops/fetch.rs
+++ b/cli/ops/fetch.rs
@@ -1,7 +1,7 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 use super::dispatch_json::{Deserialize, JsonOp, Value};
 use super::io::{StreamResource, StreamResourceHolder};
-use crate::http_util::HttpBody;
+use crate::http_util::{create_http_client, HttpBody};
 use crate::op_error::OpError;
 use crate::state::State;
 use deno_core::CoreIsolate;
@@ -11,29 +11,48 @@ use futures::future::FutureExt;
 use http::header::HeaderName;
 use http::header::HeaderValue;
 use http::Method;
+use reqwest::Client;
 use std::convert::From;
+use std::path::PathBuf;
+use std::rc::Rc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_fetch", s.stateful_json_op2(op_fetch));
+  i.register_op(
+    "op_create_http_client",
+    s.stateful_json_op2(op_create_http_client),
+  );
 }
 
 #[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
 struct FetchArgs {
   method: Option<String>,
   url: String,
   headers: Vec<(String, String)>,
+  client_rid: Option<u32>,
 }
 
 pub fn op_fetch(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   data: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: FetchArgs = serde_json::from_value(args)?;
   let url = args.url;
-
-  let client = &state.borrow().http_client;
+  let resource_table_ = isolate_state.resource_table.borrow();
+
+  let mut client_ref_mut;
+  let client = if let Some(rid) = args.client_rid {
+    let r = resource_table_
+      .get::<HttpClientResource>(rid)
+      .ok_or_else(OpError::bad_resource_id)?;
+    &r.client
+  } else {
+    client_ref_mut = state.http_client.borrow_mut();
+    &mut *client_ref_mut
+  };
 
   let method = match args.method {
     Some(method_str) => Method::from_bytes(method_str.as_bytes())
@@ -100,3 +119,40 @@ pub fn op_fetch(
 
   Ok(JsonOp::Async(future.boxed_local()))
 }
+
+struct HttpClientResource {
+  client: Client,
+}
+
+impl HttpClientResource {
+  fn new(client: Client) -> Self {
+    Self { client }
+  }
+}
+
+#[derive(Deserialize, Default, Debug)]
+#[serde(rename_all = "camelCase")]
+#[serde(default)]
+struct CreateHttpClientOptions {
+  ca_file: Option<String>,
+}
+
+fn op_create_http_client(
+  isolate_state: &mut CoreIsolateState,
+  state: &Rc<State>,
+  args: Value,
+  _zero_copy: &mut [ZeroCopyBuf],
+) -> Result<JsonOp, OpError> {
+  let args: CreateHttpClientOptions = serde_json::from_value(args)?;
+  let mut resource_table = isolate_state.resource_table.borrow_mut();
+
+  if let Some(ca_file) = args.ca_file.clone() {
+    state.check_read(&PathBuf::from(ca_file))?;
+  }
+
+  let client = create_http_client(args.ca_file.as_deref()).unwrap();
+
+  let rid =
+    resource_table.add("httpClient", Box::new(HttpClientResource::new(client)));
+  Ok(JsonOp::Sync(json!(rid)))
+}
diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs
index 66487c41bdd3d9..0fd6ad5efd90e1 100644
--- a/cli/ops/fs.rs
+++ b/cli/ops/fs.rs
@@ -6,21 +6,29 @@ use super::io::{FileMetadata, StreamResource, StreamResourceHolder};
 use crate::op_error::OpError;
 use crate::ops::dispatch_json::JsonResult;
 use crate::state::State;
+use deno_core::BufVec;
 use deno_core::CoreIsolate;
 use deno_core::CoreIsolateState;
+use deno_core::ResourceTable;
 use deno_core::ZeroCopyBuf;
 use futures::future::FutureExt;
+use std::cell::RefCell;
 use std::convert::From;
 use std::env::{current_dir, set_current_dir, temp_dir};
 use std::io;
 use std::path::{Path, PathBuf};
+use std::rc::Rc;
 use std::time::SystemTime;
 use std::time::UNIX_EPOCH;
 
 use rand::{thread_rng, Rng};
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
-  i.register_op("op_open", s.stateful_json_op2(op_open));
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
+  let t = &CoreIsolate::state(i).borrow().resource_table.clone();
+
+  i.register_op("op_open_sync", s.stateful_json_op_sync(t, op_open_sync));
+  i.register_op("op_open_async", s.stateful_json_op_async(t, op_open_async));
+
   i.register_op("op_seek", s.stateful_json_op2(op_seek));
   i.register_op("op_fdatasync", s.stateful_json_op2(op_fdatasync));
   i.register_op("op_fsync", s.stateful_json_op2(op_fsync));
@@ -54,10 +62,9 @@ fn into_string(s: std::ffi::OsString) -> Result<String, OpError> {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct OpenArgs {
-  promise_id: Option<u64>,
   path: String,
-  options: OpenOptions,
   mode: Option<u32>,
+  options: OpenOptions,
 }
 
 #[derive(Deserialize, Default, Debug)]
@@ -72,15 +79,12 @@ struct OpenOptions {
   create_new: bool,
 }
 
-fn op_open(
-  isolate_state: &mut CoreIsolateState,
+fn open_helper(
   state: &State,
   args: Value,
-  _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<JsonOp, OpError> {
+) -> Result<(PathBuf, std::fs::OpenOptions), OpError> {
   let args: OpenArgs = serde_json::from_value(args)?;
   let path = Path::new(&args.path).to_path_buf();
-  let resource_table = isolate_state.resource_table.clone();
 
   let mut open_options = std::fs::OpenOptions::new();
 
@@ -113,37 +117,46 @@ fn op_open(
     .append(options.append)
     .create_new(options.create_new);
 
-  let is_sync = args.promise_id.is_none();
+  Ok((path, open_options))
+}
 
-  if is_sync {
-    let std_file = open_options.open(path)?;
-    let tokio_file = tokio::fs::File::from_std(std_file);
-    let mut resource_table = resource_table.borrow_mut();
-    let rid = resource_table.add(
-      "fsFile",
-      Box::new(StreamResourceHolder::new(StreamResource::FsFile(Some((
-        tokio_file,
-        FileMetadata::default(),
-      ))))),
-    );
-    Ok(JsonOp::Sync(json!(rid)))
-  } else {
-    let fut = async move {
-      let tokio_file = tokio::fs::OpenOptions::from(open_options)
-        .open(path)
-        .await?;
-      let mut resource_table = resource_table.borrow_mut();
-      let rid = resource_table.add(
-        "fsFile",
-        Box::new(StreamResourceHolder::new(StreamResource::FsFile(Some((
-          tokio_file,
-          FileMetadata::default(),
-        ))))),
-      );
-      Ok(json!(rid))
-    };
-    Ok(JsonOp::Async(fut.boxed_local()))
-  }
+fn op_open_sync(
+  state: &State,
+  resource_table: &mut ResourceTable,
+  args: Value,
+  _zero_copy: &mut [ZeroCopyBuf],
+) -> Result<Value, OpError> {
+  let (path, open_options) = open_helper(state, args)?;
+  let std_file = open_options.open(path)?;
+  let tokio_file = tokio::fs::File::from_std(std_file);
+  let rid = resource_table.add(
+    "fsFile",
+    Box::new(StreamResourceHolder::new(StreamResource::FsFile(Some((
+      tokio_file,
+      FileMetadata::default(),
+    ))))),
+  );
+  Ok(json!(rid))
+}
+
+async fn op_open_async(
+  state: Rc<State>,
+  resource_table: Rc<RefCell<ResourceTable>>,
+  args: Value,
+  _zero_copy: BufVec,
+) -> Result<Value, OpError> {
+  let (path, open_options) = open_helper(&state, args)?;
+  let tokio_file = tokio::fs::OpenOptions::from(open_options)
+    .open(path)
+    .await?;
+  let rid = resource_table.borrow_mut().add(
+    "fsFile",
+    Box::new(StreamResourceHolder::new(StreamResource::FsFile(Some((
+      tokio_file,
+      FileMetadata::default(),
+    ))))),
+  );
+  Ok(json!(rid))
 }
 
 #[derive(Deserialize)]
@@ -157,7 +170,7 @@ struct SeekArgs {
 
 fn op_seek(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -217,7 +230,7 @@ struct FdatasyncArgs {
 
 fn op_fdatasync(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -261,7 +274,7 @@ struct FsyncArgs {
 
 fn op_fsync(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -305,7 +318,7 @@ struct FstatArgs {
 
 fn op_fstat(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -347,7 +360,7 @@ struct UmaskArgs {
 }
 
 fn op_umask(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -385,7 +398,7 @@ struct ChdirArgs {
 }
 
 fn op_chdir(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -406,7 +419,7 @@ struct MkdirArgs {
 }
 
 fn op_mkdir(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -440,7 +453,7 @@ struct ChmodArgs {
 }
 
 fn op_chmod(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -480,7 +493,7 @@ struct ChownArgs {
 }
 
 fn op_chown(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -517,7 +530,7 @@ struct RemoveArgs {
 }
 
 fn op_remove(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -571,7 +584,7 @@ struct CopyFileArgs {
 }
 
 fn op_copy_file(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -665,7 +678,7 @@ struct StatArgs {
 }
 
 fn op_stat(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -695,7 +708,7 @@ struct RealpathArgs {
 }
 
 fn op_realpath(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -730,7 +743,7 @@ struct ReadDirArgs {
 }
 
 fn op_read_dir(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -773,7 +786,7 @@ struct RenameArgs {
 }
 
 fn op_rename(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -802,7 +815,7 @@ struct LinkArgs {
 }
 
 fn op_link(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -840,7 +853,7 @@ struct SymlinkOptions {
 }
 
 fn op_symlink(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -900,7 +913,7 @@ struct ReadLinkArgs {
 }
 
 fn op_read_link(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -928,7 +941,7 @@ struct FtruncateArgs {
 
 fn op_ftruncate(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -973,7 +986,7 @@ struct TruncateArgs {
 }
 
 fn op_truncate(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -1047,7 +1060,7 @@ struct MakeTempArgs {
 }
 
 fn op_make_temp_dir(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -1078,7 +1091,7 @@ fn op_make_temp_dir(
 }
 
 fn op_make_temp_file(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -1118,7 +1131,7 @@ struct UtimeArgs {
 }
 
 fn op_utime(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -1138,7 +1151,7 @@ fn op_utime(
 }
 
 fn op_cwd(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/fs_events.rs b/cli/ops/fs_events.rs
index b9d54fc3e5bd6e..fcaf138f8241b0 100644
--- a/cli/ops/fs_events.rs
+++ b/cli/ops/fs_events.rs
@@ -17,9 +17,10 @@ use notify::Watcher;
 use serde::Serialize;
 use std::convert::From;
 use std::path::PathBuf;
+use std::rc::Rc;
 use tokio::sync::mpsc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_fs_events_open", s.stateful_json_op2(op_fs_events_open));
   i.register_op("op_fs_events_poll", s.stateful_json_op2(op_fs_events_poll));
 }
@@ -64,7 +65,7 @@ impl From<NotifyEvent> for FsEvent {
 
 pub fn op_fs_events_open(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -102,7 +103,7 @@ pub fn op_fs_events_open(
 
 pub fn op_fs_events_poll(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/idna.rs b/cli/ops/idna.rs
index 8ecef4862058df..c76ceba89bbfae 100644
--- a/cli/ops/idna.rs
+++ b/cli/ops/idna.rs
@@ -3,23 +3,17 @@
 //! https://url.spec.whatwg.org/#idna
 
 use super::dispatch_json::{Deserialize, JsonOp, Value};
-use crate::op_error::{ErrorKind, OpError};
+use crate::op_error::OpError;
 use crate::state::State;
 use deno_core::CoreIsolate;
 use deno_core::ZeroCopyBuf;
 use idna::{domain_to_ascii, domain_to_ascii_strict};
+use std::rc::Rc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_domain_to_ascii", s.stateful_json_op(op_domain_to_ascii));
 }
 
-fn invalid_domain_error() -> OpError {
-  OpError {
-    kind: ErrorKind::TypeError,
-    msg: "Invalid domain.".to_string(),
-  }
-}
-
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct DomainToAscii {
@@ -28,16 +22,17 @@ struct DomainToAscii {
 }
 
 fn op_domain_to_ascii(
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: DomainToAscii = serde_json::from_value(args)?;
   let domain = if args.be_strict {
     domain_to_ascii_strict(args.domain.as_str())
-      .map_err(|_| invalid_domain_error())?
+      .map_err(|_| OpError::invalid_domain_error())?
   } else {
-    domain_to_ascii(args.domain.as_str()).map_err(|_| invalid_domain_error())?
+    domain_to_ascii(args.domain.as_str())
+      .map_err(|_| OpError::invalid_domain_error())?
   };
   Ok(JsonOp::Sync(json!(domain)))
 }
diff --git a/cli/ops/io.rs b/cli/ops/io.rs
index c35e0d4b67b831..4d03e0ef71008b 100644
--- a/cli/ops/io.rs
+++ b/cli/ops/io.rs
@@ -11,6 +11,7 @@ use futures::future::FutureExt;
 use futures::ready;
 use std::collections::HashMap;
 use std::pin::Pin;
+use std::rc::Rc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::task::Context;
 use std::task::Poll;
@@ -84,7 +85,7 @@ lazy_static! {
   };
 }
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_read", s.stateful_minimal_op2(op_read));
   i.register_op("op_write", s.stateful_minimal_op2(op_write));
 }
@@ -236,7 +237,7 @@ impl DenoAsyncRead for StreamResource {
 
 pub fn op_read(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   is_sync: bool,
   rid: i32,
   zero_copy: &mut [ZeroCopyBuf],
@@ -361,7 +362,7 @@ impl DenoAsyncWrite for StreamResource {
 
 pub fn op_write(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   is_sync: bool,
   rid: i32,
   zero_copy: &mut [ZeroCopyBuf],
diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs
index 331ed4aa1969f9..f8fcea1b54b861 100644
--- a/cli/ops/mod.rs
+++ b/cli/ops/mod.rs
@@ -3,8 +3,8 @@ mod dispatch_json;
 mod dispatch_minimal;
 
 pub use dispatch_json::json_op;
+pub use dispatch_json::serialize_result;
 pub use dispatch_json::JsonOp;
-pub use dispatch_json::JsonOpDispatcher;
 pub use dispatch_json::JsonResult;
 pub use dispatch_minimal::minimal_op;
 pub use dispatch_minimal::MinimalOp;
diff --git a/cli/ops/net.rs b/cli/ops/net.rs
index 76abcb6c30a552..445c69106353f0 100644
--- a/cli/ops/net.rs
+++ b/cli/ops/net.rs
@@ -13,6 +13,7 @@ use futures::future::FutureExt;
 use std::convert::From;
 use std::net::Shutdown;
 use std::net::SocketAddr;
+use std::rc::Rc;
 use std::task::Context;
 use std::task::Poll;
 use tokio::net::TcpListener;
@@ -22,7 +23,7 @@ use tokio::net::UdpSocket;
 #[cfg(unix)]
 use super::net_unix;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_accept", s.stateful_json_op2(op_accept));
   i.register_op("op_connect", s.stateful_json_op2(op_connect));
   i.register_op("op_shutdown", s.stateful_json_op2(op_shutdown));
@@ -102,7 +103,7 @@ fn accept_tcp(
 
 fn op_accept(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -126,7 +127,7 @@ struct ReceiveArgs {
 
 fn receive_udp(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   args: ReceiveArgs,
   zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -166,7 +167,7 @@ fn receive_udp(
 
 fn op_datagram_receive(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -196,7 +197,7 @@ struct SendArgs {
 
 fn op_datagram_send(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -266,7 +267,7 @@ struct ConnectArgs {
 
 fn op_connect(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -352,7 +353,7 @@ struct ShutdownArgs {
 
 fn op_shutdown(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -494,7 +495,7 @@ fn listen_udp(
 
 fn op_listen(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/os.rs b/cli/ops/os.rs
index f084f213bf7ccd..e46aff3e61de95 100644
--- a/cli/ops/os.rs
+++ b/cli/ops/os.rs
@@ -6,9 +6,10 @@ use deno_core::CoreIsolate;
 use deno_core::ZeroCopyBuf;
 use std::collections::HashMap;
 use std::env;
+use std::rc::Rc;
 use url::Url;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_exit", s.stateful_json_op(op_exit));
   i.register_op("op_env", s.stateful_json_op(op_env));
   i.register_op("op_exec_path", s.stateful_json_op(op_exec_path));
@@ -21,7 +22,7 @@ pub fn init(i: &mut CoreIsolate, s: &State) {
 }
 
 fn op_exec_path(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -41,7 +42,7 @@ struct SetEnv {
 }
 
 fn op_set_env(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -52,7 +53,7 @@ fn op_set_env(
 }
 
 fn op_env(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -67,7 +68,7 @@ struct GetEnv {
 }
 
 fn op_get_env(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -86,7 +87,7 @@ struct DeleteEnv {
 }
 
 fn op_delete_env(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -102,7 +103,7 @@ struct Exit {
 }
 
 fn op_exit(
-  _s: &State,
+  _s: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -111,7 +112,7 @@ fn op_exit(
 }
 
 fn op_loadavg(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -128,7 +129,7 @@ fn op_loadavg(
 }
 
 fn op_hostname(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -139,7 +140,7 @@ fn op_hostname(
 }
 
 fn op_os_release(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs
index a4ee4120e7c056..4cb9985367c6c1 100644
--- a/cli/ops/permissions.rs
+++ b/cli/ops/permissions.rs
@@ -5,8 +5,9 @@ use crate::state::State;
 use deno_core::CoreIsolate;
 use deno_core::ZeroCopyBuf;
 use std::path::Path;
+use std::rc::Rc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op(
     "op_query_permission",
     s.stateful_json_op(op_query_permission),
@@ -29,66 +30,64 @@ struct PermissionArgs {
 }
 
 pub fn op_query_permission(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: PermissionArgs = serde_json::from_value(args)?;
-  let state = state.borrow();
+  let permissions = state.permissions.borrow();
   let path = args.path.as_deref();
-  let perm = state.permissions.get_permission_state(
-    &args.name,
-    &args.url.as_deref(),
-    &path.as_deref().map(Path::new),
-  )?;
+  let perm = match args.name.as_ref() {
+    "read" => permissions.query_read(&path.as_deref().map(Path::new)),
+    "write" => permissions.query_write(&path.as_deref().map(Path::new)),
+    "net" => permissions.query_net_url(&args.url.as_deref())?,
+    "env" => permissions.query_env(),
+    "run" => permissions.query_run(),
+    "plugin" => permissions.query_plugin(),
+    "hrtime" => permissions.query_hrtime(),
+    n => return Err(OpError::other(format!("No such permission name: {}", n))),
+  };
   Ok(JsonOp::Sync(json!({ "state": perm.to_string() })))
 }
 
 pub fn op_revoke_permission(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: PermissionArgs = serde_json::from_value(args)?;
-  let mut state = state.borrow_mut();
-  let permissions = &mut state.permissions;
-  match args.name.as_ref() {
-    "run" => permissions.allow_run.revoke(),
-    "read" => permissions.allow_read.revoke(),
-    "write" => permissions.allow_write.revoke(),
-    "net" => permissions.allow_net.revoke(),
-    "env" => permissions.allow_env.revoke(),
-    "plugin" => permissions.allow_plugin.revoke(),
-    "hrtime" => permissions.allow_hrtime.revoke(),
-    _ => {}
-  };
+  let mut permissions = state.permissions.borrow_mut();
   let path = args.path.as_deref();
-  let perm = permissions.get_permission_state(
-    &args.name,
-    &args.url.as_deref(),
-    &path.as_deref().map(Path::new),
-  )?;
+  let perm = match args.name.as_ref() {
+    "read" => permissions.revoke_read(&path.as_deref().map(Path::new)),
+    "write" => permissions.revoke_write(&path.as_deref().map(Path::new)),
+    "net" => permissions.revoke_net(&args.url.as_deref())?,
+    "env" => permissions.revoke_env(),
+    "run" => permissions.revoke_run(),
+    "plugin" => permissions.revoke_plugin(),
+    "hrtime" => permissions.revoke_hrtime(),
+    n => return Err(OpError::other(format!("No such permission name: {}", n))),
+  };
   Ok(JsonOp::Sync(json!({ "state": perm.to_string() })))
 }
 
 pub fn op_request_permission(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: PermissionArgs = serde_json::from_value(args)?;
-  let mut state = state.borrow_mut();
-  let permissions = &mut state.permissions;
+  let permissions = &mut state.permissions.borrow_mut();
   let path = args.path.as_deref();
   let perm = match args.name.as_ref() {
-    "run" => Ok(permissions.request_run()),
-    "read" => Ok(permissions.request_read(&path.as_deref().map(Path::new))),
-    "write" => Ok(permissions.request_write(&path.as_deref().map(Path::new))),
-    "net" => permissions.request_net(&args.url.as_deref()),
-    "env" => Ok(permissions.request_env()),
-    "plugin" => Ok(permissions.request_plugin()),
-    "hrtime" => Ok(permissions.request_hrtime()),
-    n => Err(OpError::other(format!("No such permission name: {}", n))),
-  }?;
+    "read" => permissions.request_read(&path.as_deref().map(Path::new)),
+    "write" => permissions.request_write(&path.as_deref().map(Path::new)),
+    "net" => permissions.request_net(&args.url.as_deref())?,
+    "env" => permissions.request_env(),
+    "run" => permissions.request_run(),
+    "plugin" => permissions.request_plugin(),
+    "hrtime" => permissions.request_hrtime(),
+    n => return Err(OpError::other(format!("No such permission name: {}", n))),
+  };
   Ok(JsonOp::Sync(json!({ "state": perm.to_string() })))
 }
diff --git a/cli/ops/plugin.rs b/cli/ops/plugin.rs
index 3edcaa962f5612..3fb1494043ebb6 100644
--- a/cli/ops/plugin.rs
+++ b/cli/ops/plugin.rs
@@ -3,6 +3,7 @@ use crate::op_error::OpError;
 use crate::ops::dispatch_json::Deserialize;
 use crate::ops::dispatch_json::JsonOp;
 use crate::ops::dispatch_json::Value;
+use crate::ops::json_op;
 use crate::state::State;
 use deno_core::plugin_api;
 use deno_core::CoreIsolate;
@@ -19,8 +20,11 @@ use std::rc::Rc;
 use std::task::Context;
 use std::task::Poll;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
-  i.register_op("op_open_plugin", s.stateful_json_op2(op_open_plugin));
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
+  i.register_op(
+    "op_open_plugin",
+    s.core_op(json_op(s.stateful_op2(op_open_plugin))),
+  );
 }
 
 #[derive(Deserialize)]
@@ -31,7 +35,7 @@ struct OpenPluginArgs {
 
 pub fn op_open_plugin(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -106,8 +110,7 @@ impl<'a> plugin_api::Interface for PluginInterface<'a> {
     let plugin_lib = self.plugin_lib.clone();
     self.isolate_state.op_registry.register(
       name,
-      move |isolate_state: &mut CoreIsolateState,
-            zero_copy: &mut [ZeroCopyBuf]| {
+      move |isolate_state, zero_copy| {
         let mut interface = PluginInterface::new(isolate_state, &plugin_lib);
         let op = dispatch_op_fn(&mut interface, zero_copy);
         match op {
diff --git a/cli/ops/process.rs b/cli/ops/process.rs
index 384068e6afd584..bf733a78e97162 100644
--- a/cli/ops/process.rs
+++ b/cli/ops/process.rs
@@ -12,12 +12,13 @@ use futures::future::poll_fn;
 use futures::future::FutureExt;
 use futures::TryFutureExt;
 use std::convert::From;
+use std::rc::Rc;
 use tokio::process::Command;
 
 #[cfg(unix)]
 use std::os::unix::process::ExitStatusExt;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_run", s.stateful_json_op2(op_run));
   i.register_op("op_run_status", s.stateful_json_op2(op_run_status));
   i.register_op("op_kill", s.stateful_json_op(op_kill));
@@ -62,7 +63,7 @@ struct ChildResource {
 
 fn op_run(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -173,7 +174,7 @@ struct RunStatusArgs {
 
 fn op_run_status(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -223,7 +224,7 @@ struct KillArgs {
 }
 
 fn op_kill(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/random.rs b/cli/ops/random.rs
index b29c761b860562..275f264f9f4712 100644
--- a/cli/ops/random.rs
+++ b/cli/ops/random.rs
@@ -6,8 +6,9 @@ use deno_core::CoreIsolate;
 use deno_core::ZeroCopyBuf;
 use rand::thread_rng;
 use rand::Rng;
+use std::rc::Rc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op(
     "op_get_random_values",
     s.stateful_json_op(op_get_random_values),
@@ -15,14 +16,14 @@ pub fn init(i: &mut CoreIsolate, s: &State) {
 }
 
 fn op_get_random_values(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   assert_eq!(zero_copy.len(), 1);
 
-  if let Some(ref mut seeded_rng) = state.borrow_mut().seeded_rng {
-    seeded_rng.fill(&mut *zero_copy[0]);
+  if let Some(seeded_rng) = &state.seeded_rng {
+    seeded_rng.borrow_mut().fill(&mut *zero_copy[0]);
   } else {
     let mut rng = thread_rng();
     rng.fill(&mut *zero_copy[0]);
diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs
index b8fd7ab8b3c91a..88b7de88195179 100644
--- a/cli/ops/repl.rs
+++ b/cli/ops/repl.rs
@@ -7,10 +7,11 @@ use crate::state::State;
 use deno_core::CoreIsolate;
 use deno_core::CoreIsolateState;
 use deno_core::ZeroCopyBuf;
+use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::Mutex;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_repl_start", s.stateful_json_op2(op_repl_start));
   i.register_op("op_repl_readline", s.stateful_json_op2(op_repl_readline));
 }
@@ -25,14 +26,14 @@ struct ReplStartArgs {
 
 fn op_repl_start(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: ReplStartArgs = serde_json::from_value(args)?;
   debug!("op_repl_start {}", args.history_file);
   let history_path =
-    repl::history_path(&state.borrow().global_state.dir, &args.history_file);
+    repl::history_path(&state.global_state.dir, &args.history_file);
   let repl = repl::Repl::new(history_path);
   let resource = ReplResource(Arc::new(Mutex::new(repl)));
   let mut resource_table = isolate_state.resource_table.borrow_mut();
@@ -48,7 +49,7 @@ struct ReplReadlineArgs {
 
 fn op_repl_readline(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/resources.rs b/cli/ops/resources.rs
index a66a661700ee90..a24b3b3823abdf 100644
--- a/cli/ops/resources.rs
+++ b/cli/ops/resources.rs
@@ -5,15 +5,16 @@ use crate::state::State;
 use deno_core::CoreIsolate;
 use deno_core::CoreIsolateState;
 use deno_core::ZeroCopyBuf;
+use std::rc::Rc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_resources", s.stateful_json_op2(op_resources));
   i.register_op("op_close", s.stateful_json_op2(op_close));
 }
 
 fn op_resources(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -24,7 +25,7 @@ fn op_resources(
 /// op_close removes a resource from the resource table.
 fn op_close(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/runtime.rs b/cli/ops/runtime.rs
index 1e426ad8ae3e5c..b4fb3c496d5e94 100644
--- a/cli/ops/runtime.rs
+++ b/cli/ops/runtime.rs
@@ -9,19 +9,19 @@ use deno_core::CoreIsolate;
 use deno_core::ModuleSpecifier;
 use deno_core::ZeroCopyBuf;
 use std::env;
+use std::rc::Rc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_start", s.stateful_json_op(op_start));
   i.register_op("op_main_module", s.stateful_json_op(op_main_module));
   i.register_op("op_metrics", s.stateful_json_op(op_metrics));
 }
 
 fn op_start(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
-  let state = state.borrow();
   let gs = &state.global_state;
 
   Ok(JsonOp::Sync(json!({
@@ -43,27 +43,25 @@ fn op_start(
 }
 
 fn op_main_module(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
-  let main = &state.borrow().main_module.to_string();
+  let main = &state.main_module.to_string();
   let main_url = ModuleSpecifier::resolve_url_or_path(&main)?;
   if main_url.as_url().scheme() == "file" {
     let main_path = std::env::current_dir().unwrap().join(main_url.to_string());
     state.check_read_blind(&main_path, "main_module")?;
   }
-  state.check_unstable("Deno.mainModule");
   Ok(JsonOp::Sync(json!(&main)))
 }
 
 fn op_metrics(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
-  let state = state.borrow();
-  let m = &state.metrics;
+  let m = &state.metrics.borrow();
 
   Ok(JsonOp::Sync(json!({
     "opsDispatched": m.ops_dispatched,
diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs
index e70b69de73a70e..d77ab8f08e9f25 100644
--- a/cli/ops/runtime_compiler.rs
+++ b/cli/ops/runtime_compiler.rs
@@ -9,8 +9,9 @@ use crate::tsc::runtime_transpile;
 use deno_core::CoreIsolate;
 use deno_core::ZeroCopyBuf;
 use std::collections::HashMap;
+use std::rc::Rc;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_compile", s.stateful_json_op(op_compile));
   i.register_op("op_transpile", s.stateful_json_op(op_transpile));
 }
@@ -25,19 +26,18 @@ struct CompileArgs {
 }
 
 fn op_compile(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   state.check_unstable("Deno.compile");
   let args: CompileArgs = serde_json::from_value(args)?;
-  let s = state.borrow();
-  let global_state = s.global_state.clone();
-  let permissions = s.permissions.clone();
+  let global_state = state.global_state.clone();
+  let permissions = state.permissions.borrow().clone();
   let fut = async move {
     let fut = if args.bundle {
       runtime_bundle(
-        global_state,
+        &global_state,
         permissions,
         &args.root_name,
         &args.sources,
@@ -46,7 +46,7 @@ fn op_compile(
       .boxed_local()
     } else {
       runtime_compile(
-        global_state,
+        &global_state,
         permissions,
         &args.root_name,
         &args.sources,
@@ -68,17 +68,16 @@ struct TranspileArgs {
 }
 
 fn op_transpile(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   state.check_unstable("Deno.transpile");
   let args: TranspileArgs = serde_json::from_value(args)?;
-  let s = state.borrow();
-  let global_state = s.global_state.clone();
-  let permissions = s.permissions.clone();
+  let global_state = state.global_state.clone();
+  let permissions = state.permissions.borrow().clone();
   let fut = async move {
-    runtime_transpile(global_state, permissions, &args.sources, &args.options)
+    runtime_transpile(&global_state, permissions, &args.sources, &args.options)
       .await
   }
   .boxed_local();
diff --git a/cli/ops/signal.rs b/cli/ops/signal.rs
index 6457ac42e484e7..cb83427c8949ee 100644
--- a/cli/ops/signal.rs
+++ b/cli/ops/signal.rs
@@ -5,6 +5,7 @@ use crate::state::State;
 use deno_core::CoreIsolate;
 use deno_core::CoreIsolateState;
 use deno_core::ZeroCopyBuf;
+use std::rc::Rc;
 
 #[cfg(unix)]
 use super::dispatch_json::Deserialize;
@@ -15,7 +16,7 @@ use std::task::Waker;
 #[cfg(unix)]
 use tokio::signal::unix::{signal, Signal, SignalKind};
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_signal_bind", s.stateful_json_op2(op_signal_bind));
   i.register_op("op_signal_unbind", s.stateful_json_op2(op_signal_unbind));
   i.register_op("op_signal_poll", s.stateful_json_op2(op_signal_poll));
@@ -41,7 +42,7 @@ struct SignalArgs {
 #[cfg(unix)]
 fn op_signal_bind(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -63,7 +64,7 @@ fn op_signal_bind(
 #[cfg(unix)]
 fn op_signal_poll(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -90,7 +91,7 @@ fn op_signal_poll(
 #[cfg(unix)]
 pub fn op_signal_unbind(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -115,7 +116,7 @@ pub fn op_signal_unbind(
 #[cfg(not(unix))]
 pub fn op_signal_bind(
   _isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -125,7 +126,7 @@ pub fn op_signal_bind(
 #[cfg(not(unix))]
 fn op_signal_unbind(
   _isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -135,7 +136,7 @@ fn op_signal_unbind(
 #[cfg(not(unix))]
 fn op_signal_poll(
   _isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/timers.rs b/cli/ops/timers.rs
index 044c5ea4afa841..e3fe14c2c783bc 100644
--- a/cli/ops/timers.rs
+++ b/cli/ops/timers.rs
@@ -5,10 +5,11 @@ use crate::state::State;
 use deno_core::CoreIsolate;
 use deno_core::ZeroCopyBuf;
 use futures::future::FutureExt;
+use std::rc::Rc;
 use std::time::Duration;
 use std::time::Instant;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op(
     "op_global_timer_stop",
     s.stateful_json_op(op_global_timer_stop),
@@ -18,12 +19,11 @@ pub fn init(i: &mut CoreIsolate, s: &State) {
 }
 
 fn op_global_timer_stop(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
-  let mut state = state.borrow_mut();
-  state.global_timer.cancel();
+  state.global_timer.borrow_mut().cancel();
   Ok(JsonOp::Sync(json!({})))
 }
 
@@ -33,17 +33,17 @@ struct GlobalTimerArgs {
 }
 
 fn op_global_timer(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: GlobalTimerArgs = serde_json::from_value(args)?;
   let val = args.timeout;
 
-  let mut state = state.borrow_mut();
   let deadline = Instant::now() + Duration::from_millis(val);
   let f = state
     .global_timer
+    .borrow_mut()
     .new_timeout(deadline)
     .then(move |_| futures::future::ok(json!({})));
 
@@ -55,11 +55,10 @@ fn op_global_timer(
 // If the High precision flag is not set, the
 // nanoseconds are rounded on 2ms.
 fn op_now(
-  state: &State,
+  state: &Rc<State>,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
-  let state = state.borrow();
   let seconds = state.start_time.elapsed().as_secs();
   let mut subsec_nanos = state.start_time.elapsed().subsec_nanos();
   let reduced_time_precision = 2_000_000; // 2ms in nanoseconds
@@ -67,8 +66,12 @@ fn op_now(
   // If the permission is not enabled
   // Round the nano result on 2 milliseconds
   // see: https://developer.mozilla.org/en-US/docs/Web/API/DOMHighResTimeStamp#Reduced_time_precision
-  if !state.permissions.allow_hrtime.is_allow() {
-    subsec_nanos -= subsec_nanos % reduced_time_precision
+  if let Err(op_error) = state.check_hrtime() {
+    if op_error.kind_str == "PermissionDenied" {
+      subsec_nanos -= subsec_nanos % reduced_time_precision;
+    } else {
+      return Err(op_error);
+    }
   }
 
   Ok(JsonOp::Sync(json!({
diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs
index 3e22c71ea67253..76962f5c8f2e4c 100644
--- a/cli/ops/tls.rs
+++ b/cli/ops/tls.rs
@@ -14,6 +14,7 @@ use std::fs::File;
 use std::io::BufReader;
 use std::net::SocketAddr;
 use std::path::Path;
+use std::rc::Rc;
 use std::sync::Arc;
 use std::task::Context;
 use std::task::Poll;
@@ -29,7 +30,7 @@ use tokio_rustls::{
 };
 use webpki::DNSNameRef;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_start_tls", s.stateful_json_op2(op_start_tls));
   i.register_op("op_connect_tls", s.stateful_json_op2(op_connect_tls));
   i.register_op("op_listen_tls", s.stateful_json_op2(op_listen_tls));
@@ -55,7 +56,7 @@ struct StartTLSArgs {
 
 pub fn op_start_tls(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -134,7 +135,7 @@ pub fn op_start_tls(
 
 pub fn op_connect_tls(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -308,7 +309,7 @@ struct ListenTlsArgs {
 
 fn op_listen_tls(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -358,7 +359,7 @@ struct AcceptTlsArgs {
 
 fn op_accept_tls(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/tty.rs b/cli/ops/tty.rs
index d86100232fd4cb..d6aaeb78548606 100644
--- a/cli/ops/tty.rs
+++ b/cli/ops/tty.rs
@@ -10,6 +10,7 @@ use deno_core::ZeroCopyBuf;
 use nix::sys::termios;
 use serde_derive::{Deserialize, Serialize};
 use serde_json::Value;
+use std::rc::Rc;
 
 #[cfg(windows)]
 use winapi::shared::minwindef::DWORD;
@@ -35,7 +36,7 @@ fn get_windows_handle(
   Ok(handle)
 }
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_set_raw", s.stateful_json_op2(op_set_raw));
   i.register_op("op_isatty", s.stateful_json_op2(op_isatty));
   i.register_op("op_console_size", s.stateful_json_op2(op_console_size));
@@ -49,7 +50,7 @@ struct SetRawArgs {
 
 pub fn op_set_raw(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -218,7 +219,7 @@ struct IsattyArgs {
 
 pub fn op_isatty(
   isolate_state: &mut CoreIsolateState,
-  _state: &State,
+  _state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -265,7 +266,7 @@ struct ConsoleSize {
 
 pub fn op_console_size(
   isolate_state: &mut CoreIsolateState,
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
diff --git a/cli/ops/web_worker.rs b/cli/ops/web_worker.rs
index 4a661d2bedaf9e..8ad497d5cd32a6 100644
--- a/cli/ops/web_worker.rs
+++ b/cli/ops/web_worker.rs
@@ -2,7 +2,6 @@
 use super::dispatch_json::{JsonOp, Value};
 use crate::op_error::OpError;
 use crate::ops::json_op;
-use crate::ops::JsonOpDispatcher;
 use crate::state::State;
 use crate::web_worker::WebWorkerHandle;
 use crate::worker::WorkerEvent;
@@ -11,11 +10,16 @@ use deno_core::CoreIsolateState;
 use deno_core::ZeroCopyBuf;
 use futures::channel::mpsc;
 use std::convert::From;
+use std::rc::Rc;
 
 pub fn web_worker_op<D>(
   sender: mpsc::Sender<WorkerEvent>,
   dispatcher: D,
-) -> impl JsonOpDispatcher
+) -> impl Fn(
+  &mut CoreIsolateState,
+  Value,
+  &mut [ZeroCopyBuf],
+) -> Result<JsonOp, OpError>
 where
   D: Fn(
     &mpsc::Sender<WorkerEvent>,
@@ -33,7 +37,11 @@ pub fn web_worker_op2<D>(
   handle: WebWorkerHandle,
   sender: mpsc::Sender<WorkerEvent>,
   dispatcher: D,
-) -> impl JsonOpDispatcher
+) -> impl Fn(
+  &mut CoreIsolateState,
+  Value,
+  &mut [ZeroCopyBuf],
+) -> Result<JsonOp, OpError>
 where
   D: Fn(
     WebWorkerHandle,
@@ -52,7 +60,7 @@ where
 
 pub fn init(
   i: &mut CoreIsolate,
-  s: &State,
+  s: &Rc<State>,
   sender: &mpsc::Sender<WorkerEvent>,
   handle: WebWorkerHandle,
 ) {
diff --git a/cli/ops/worker_host.rs b/cli/ops/worker_host.rs
index e3571f71332e8e..47ebd9c7f730dc 100644
--- a/cli/ops/worker_host.rs
+++ b/cli/ops/worker_host.rs
@@ -17,9 +17,11 @@ use deno_core::ModuleSpecifier;
 use deno_core::ZeroCopyBuf;
 use futures::future::FutureExt;
 use std::convert::From;
+use std::rc::Rc;
+use std::sync::Arc;
 use std::thread::JoinHandle;
 
-pub fn init(i: &mut CoreIsolate, s: &State) {
+pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
   i.register_op("op_create_worker", s.stateful_json_op(op_create_worker));
   i.register_op(
     "op_host_terminate_worker",
@@ -38,7 +40,7 @@ pub fn init(i: &mut CoreIsolate, s: &State) {
 fn create_web_worker(
   worker_id: u32,
   name: String,
-  global_state: GlobalState,
+  global_state: &Arc<GlobalState>,
   permissions: Permissions,
   specifier: ModuleSpecifier,
   has_deno_namespace: bool,
@@ -49,7 +51,7 @@ fn create_web_worker(
   let mut worker = WebWorker::new(
     name.clone(),
     startup_data::deno_isolate_init(),
-    state,
+    &state,
     has_deno_namespace,
   );
 
@@ -84,12 +86,13 @@ fn create_web_worker(
 fn run_worker_thread(
   worker_id: u32,
   name: String,
-  global_state: GlobalState,
+  global_state: &Arc<GlobalState>,
   permissions: Permissions,
   specifier: ModuleSpecifier,
   has_deno_namespace: bool,
   maybe_source_code: Option<String>,
 ) -> Result<(JoinHandle<()>, WebWorkerHandle), ErrBox> {
+  let global_state = global_state.clone();
   let (handle_sender, handle_receiver) =
     std::sync::mpsc::sync_channel::<Result<WebWorkerHandle, ErrBox>>(1);
 
@@ -103,7 +106,7 @@ fn run_worker_thread(
     let result = create_web_worker(
       worker_id,
       name,
-      global_state,
+      &global_state,
       permissions,
       specifier.clone(),
       has_deno_namespace,
@@ -178,7 +181,7 @@ struct CreateWorkerArgs {
 
 /// Create worker as the host
 fn op_create_worker(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _data: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -196,12 +199,10 @@ fn op_create_worker(
     state.check_unstable("Worker.deno");
   }
   let parent_state = state.clone();
-  let mut state = state.borrow_mut();
   let global_state = state.global_state.clone();
-  let permissions = state.permissions.clone();
-  let worker_id = state.next_worker_id;
-  state.next_worker_id += 1;
-  drop(state);
+  let permissions = state.permissions.borrow().clone();
+  let worker_id = state.next_worker_id.get();
+  state.next_worker_id.set(worker_id + 1);
 
   let module_specifier = ModuleSpecifier::resolve_url(&specifier)?;
   let worker_name = args_name.unwrap_or_else(|| "".to_string());
@@ -209,7 +210,7 @@ fn op_create_worker(
   let (join_handle, worker_handle) = run_worker_thread(
     worker_id,
     worker_name,
-    global_state,
+    &global_state,
     permissions,
     module_specifier,
     use_deno_namespace,
@@ -218,9 +219,9 @@ fn op_create_worker(
   .map_err(|e| OpError::other(e.to_string()))?;
   // At this point all interactions with worker happen using thread
   // safe handler returned from previous function call
-  let mut parent_state = parent_state.borrow_mut();
   parent_state
     .workers
+    .borrow_mut()
     .insert(worker_id, (join_handle, worker_handle));
 
   Ok(JsonOp::Sync(json!({ "id": worker_id })))
@@ -232,15 +233,17 @@ struct WorkerArgs {
 }
 
 fn op_host_terminate_worker(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _data: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: WorkerArgs = serde_json::from_value(args)?;
   let id = args.id as u32;
-  let mut state = state.borrow_mut();
-  let (join_handle, worker_handle) =
-    state.workers.remove(&id).expect("No worker handle found");
+  let (join_handle, worker_handle) = state
+    .workers
+    .borrow_mut()
+    .remove(&id)
+    .expect("No worker handle found");
   worker_handle.terminate();
   join_handle.join().expect("Panic in worker thread");
   Ok(JsonOp::Sync(json!({})))
@@ -298,27 +301,21 @@ fn serialize_worker_event(event: WorkerEvent) -> Value {
 
 /// Get message from guest worker as host
 fn op_host_get_message(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   _data: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
   let args: WorkerArgs = serde_json::from_value(args)?;
   let id = args.id as u32;
-  let worker_handle = {
-    let state_ = state.borrow();
-    let (_join_handle, worker_handle) =
-      state_.workers.get(&id).expect("No worker handle found");
-    worker_handle.clone()
-  };
-  let state_ = state.clone();
+  let state = state.clone();
+  let worker_handle = state.workers.borrow()[&id].1.clone();
   let op = async move {
     let response = match worker_handle.get_event().await? {
       Some(event) => {
         // Terminal error means that worker should be removed from worker table.
         if let WorkerEvent::TerminalError(_) = &event {
-          let mut state_ = state_.borrow_mut();
           if let Some((join_handle, mut worker_handle)) =
-            state_.workers.remove(&id)
+            state.workers.borrow_mut().remove(&id)
           {
             worker_handle.sender.close_channel();
             join_handle.join().expect("Worker thread panicked");
@@ -328,12 +325,10 @@ fn op_host_get_message(
       }
       None => {
         // Worker shuts down
-        let mut state_ = state_.borrow_mut();
+        let mut workers = state.workers.borrow_mut();
         // Try to remove worker from workers table - NOTE: `Worker.terminate()` might have been called
         // already meaning that we won't find worker in table - in that case ignore.
-        if let Some((join_handle, mut worker_handle)) =
-          state_.workers.remove(&id)
-        {
+        if let Some((join_handle, mut worker_handle)) = workers.remove(&id) {
           worker_handle.sender.close_channel();
           join_handle.join().expect("Worker thread panicked");
         }
@@ -347,7 +342,7 @@ fn op_host_get_message(
 
 /// Post message to guest worker as host
 fn op_host_post_message(
-  state: &State,
+  state: &Rc<State>,
   args: Value,
   data: &mut [ZeroCopyBuf],
 ) -> Result<JsonOp, OpError> {
@@ -357,9 +352,8 @@ fn op_host_post_message(
   let msg = Vec::from(&*data[0]).into_boxed_slice();
 
   debug!("post message to worker {}", id);
-  let state = state.borrow();
-  let (_, worker_handle) =
-    state.workers.get(&id).expect("No worker handle found");
+  let workers = state.workers.borrow();
+  let worker_handle = workers[&id].1.clone();
   worker_handle
     .post_message(msg)
     .map_err(|e| OpError::other(e.to_string()))?;
diff --git a/cli/permissions.rs b/cli/permissions.rs
index 2e378b49748ca2..7d9fa1d45b7506 100644
--- a/cli/permissions.rs
+++ b/cli/permissions.rs
@@ -3,11 +3,11 @@ use crate::colors;
 use crate::flags::Flags;
 use crate::fs::resolve_from_cwd;
 use crate::op_error::OpError;
-use serde::de;
 use serde::Deserialize;
 use std::collections::HashSet;
 use std::env::current_dir;
 use std::fmt;
+use std::hash::Hash;
 #[cfg(not(test))]
 use std::io;
 use std::path::{Path, PathBuf};
@@ -22,65 +22,41 @@ use url::Url;
 const PERMISSION_EMOJI: &str = "⚠️";
 
 /// Tri-state value for storing permission state
-#[derive(PartialEq, Debug, Clone, Copy)]
+#[derive(PartialEq, Debug, Clone, Copy, Deserialize)]
 pub enum PermissionState {
-  Allow = 0,
-  Ask = 1,
-  Deny = 2,
+  Granted = 0,
+  Prompt = 1,
+  Denied = 2,
 }
 
 impl PermissionState {
-  /// Checks the permission state and returns the result.
-  pub fn check(self, msg: &str, flag_name: &str) -> Result<(), OpError> {
-    if self == PermissionState::Allow {
+  /// Check the permission state.
+  fn check(self, msg: &str, flag_name: &str) -> Result<(), OpError> {
+    if self == PermissionState::Granted {
       log_perm_access(msg);
       return Ok(());
     }
     let m = format!("{}, run again with the {} flag", msg, flag_name);
     Err(OpError::permission_denied(m))
   }
-  pub fn is_allow(self) -> bool {
-    self == PermissionState::Allow
-  }
-  /// If the state is "Allow" walk it back to the default "Ask"
-  /// Don't do anything if state is "Deny"
-  pub fn revoke(&mut self) {
-    if *self == PermissionState::Allow {
-      *self = PermissionState::Ask;
-    }
-  }
-  /// Requests the permission.
-  pub fn request(&mut self, msg: &str) -> PermissionState {
-    if *self != PermissionState::Ask {
-      return *self;
-    }
-    if permission_prompt(msg) {
-      *self = PermissionState::Allow;
-    } else {
-      *self = PermissionState::Deny;
-    }
-    *self
-  }
 
-  pub fn fork(self, value: bool) -> Result<PermissionState, OpError> {
-    if value && self == PermissionState::Deny {
-      Err(OpError::permission_denied(
-        "Arguments escalate parent permissions.".to_string(),
-      ))
-    } else if value {
-      Ok(PermissionState::Allow)
-    } else {
-      Ok(PermissionState::Deny)
+  /// Check that the permissions represented by `other` don't escalate ours.
+  fn check_fork(self, other: &Self) -> Result<(), OpError> {
+    if self == PermissionState::Denied && other != &PermissionState::Denied
+      || self == PermissionState::Prompt && other == &PermissionState::Granted
+    {
+      return Err(OpError::permission_escalation_error());
     }
+    Ok(())
   }
 }
 
 impl From<usize> for PermissionState {
   fn from(val: usize) -> Self {
     match val {
-      0 => PermissionState::Allow,
-      1 => PermissionState::Ask,
-      2 => PermissionState::Deny,
+      0 => PermissionState::Granted,
+      1 => PermissionState::Prompt,
+      2 => PermissionState::Denied,
       _ => unreachable!(),
     }
   }
@@ -89,9 +65,9 @@ impl From<usize> for PermissionState {
 impl From<bool> for PermissionState {
   fn from(val: bool) -> Self {
     if val {
-      PermissionState::Allow
+      PermissionState::Granted
     } else {
-      PermissionState::Ask
+      PermissionState::Prompt
     }
   }
 }
@@ -99,68 +75,49 @@ impl From<bool> for PermissionState {
 impl fmt::Display for PermissionState {
   fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     match self {
-      PermissionState::Allow => f.pad("granted"),
-      PermissionState::Ask => f.pad("prompt"),
-      PermissionState::Deny => f.pad("denied"),
+      PermissionState::Granted => f.pad("granted"),
+      PermissionState::Prompt => f.pad("prompt"),
+      PermissionState::Denied => f.pad("denied"),
     }
   }
 }
 
 impl Default for PermissionState {
   fn default() -> Self {
-    PermissionState::Ask
+    PermissionState::Prompt
   }
 }
 
-struct BoolPermVisitor;
-
-fn deserialize_permission_state<'de, D>(
-  d: D,
-) -> Result<PermissionState, D::Error>
-where
-  D: de::Deserializer<'de>,
-{
-  impl<'de> de::Visitor<'de> for BoolPermVisitor {
-    type Value = PermissionState;
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct UnaryPermission<T: Eq + Hash> {
+  pub global_state: PermissionState,
+  pub granted_list: HashSet<T>,
+  pub denied_list: HashSet<T>,
+}
 
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-      formatter.write_str("a boolean value")
+impl<T: Eq + Hash> UnaryPermission<T> {
+  /// Check that the permissions represented by `other` don't escalate ours.
+  fn check_fork(&self, other: &Self) -> Result<(), OpError> {
+    self.global_state.check_fork(&other.global_state)?;
+    if !self.granted_list.is_superset(&other.granted_list) {
+      return Err(OpError::permission_escalation_error());
     }
-
-    fn visit_bool<E>(self, value: bool) -> Result<Self::Value, E>
-    where
-      E: de::Error,
-    {
-      if value {
-        Ok(PermissionState::Allow)
-      } else {
-        Ok(PermissionState::Deny)
-      }
+    if !self.denied_list.is_subset(&other.denied_list) {
+      return Err(OpError::permission_escalation_error());
     }
+    Ok(())
   }
-  d.deserialize_bool(BoolPermVisitor)
 }
 
 #[derive(Clone, Debug, Default, Deserialize, PartialEq)]
 pub struct Permissions {
-  // Keep in sync with cli/js/permissions.ts
-  #[serde(deserialize_with = "deserialize_permission_state")]
-  pub allow_read: PermissionState,
-  pub read_allowlist: HashSet<PathBuf>,
-  #[serde(deserialize_with = "deserialize_permission_state")]
-  pub allow_write: PermissionState,
-  pub write_allowlist: HashSet<PathBuf>,
-  #[serde(deserialize_with = "deserialize_permission_state")]
-  pub allow_net: PermissionState,
-  pub net_allowlist: HashSet<String>,
-  #[serde(deserialize_with = "deserialize_permission_state")]
-  pub allow_env: PermissionState,
-  #[serde(deserialize_with = "deserialize_permission_state")]
-  pub allow_run: PermissionState,
-  #[serde(deserialize_with = "deserialize_permission_state")]
-  pub allow_plugin: PermissionState,
-  #[serde(deserialize_with = "deserialize_permission_state")]
-  pub allow_hrtime: PermissionState,
+  pub read: UnaryPermission<PathBuf>,
+  pub write: UnaryPermission<PathBuf>,
+  pub net: UnaryPermission<String>,
+  pub env: PermissionState,
+  pub run: PermissionState,
+  pub plugin: PermissionState,
+  pub hrtime: PermissionState,
 }
 
 fn resolve_fs_allowlist(allowlist: &[PathBuf]) -> HashSet<PathBuf> {
@@ -173,16 +130,25 @@ fn resolve_fs_allowlist(allowlist: &[PathBuf]) -> HashSet<PathBuf> {
 impl Permissions {
   pub fn from_flags(flags: &Flags) -> Self {
     Self {
-      allow_read: PermissionState::from(flags.allow_read),
-      read_allowlist: resolve_fs_allowlist(&flags.read_allowlist),
-      allow_write: PermissionState::from(flags.allow_write),
-      write_allowlist: resolve_fs_allowlist(&flags.write_allowlist),
-      allow_net: PermissionState::from(flags.allow_net),
-      net_allowlist: flags.net_allowlist.iter().cloned().collect(),
-      allow_env: PermissionState::from(flags.allow_env),
-      allow_run: PermissionState::from(flags.allow_run),
-      allow_plugin: PermissionState::from(flags.allow_plugin),
-      allow_hrtime: PermissionState::from(flags.allow_hrtime),
+      read: UnaryPermission::<PathBuf> {
+        global_state: PermissionState::from(flags.allow_read),
+        granted_list: resolve_fs_allowlist(&flags.read_allowlist),
+        ..Default::default()
+      },
+      write: UnaryPermission::<PathBuf> {
+        global_state: PermissionState::from(flags.allow_write),
+        granted_list: resolve_fs_allowlist(&flags.write_allowlist),
+        ..Default::default()
+      },
+      net: UnaryPermission::<String> {
+        global_state: PermissionState::from(flags.allow_net),
+        granted_list: flags.net_allowlist.iter().cloned().collect(),
+        ..Default::default()
+      },
+      env: PermissionState::from(flags.allow_env),
+      run: PermissionState::from(flags.allow_run),
+      plugin: PermissionState::from(flags.allow_plugin),
+      hrtime: PermissionState::from(flags.allow_hrtime),
     }
   }
 
@@ -194,7 +160,7 @@ impl Permissions {
       path.to_path_buf()
     } else {
       match self
-        .get_state_read(&Some(&current_dir().unwrap()))
+        .query_read(&Some(&current_dir().unwrap()))
         .check("", "")
       {
         Ok(_) => resolved_path.clone(),
@@ -206,79 +172,87 @@ impl Permissions {
 
   pub fn allow_all() -> Self {
     Self {
-      allow_read: PermissionState::from(true),
-      allow_write: PermissionState::from(true),
-      allow_net: PermissionState::from(true),
-      allow_env: PermissionState::from(true),
-      allow_run: PermissionState::from(true),
-      allow_plugin: PermissionState::from(true),
-      allow_hrtime: PermissionState::from(true),
-      ..Default::default()
+      read: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      write: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      net: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      env: PermissionState::Granted,
+      run: PermissionState::Granted,
+      plugin: PermissionState::Granted,
+      hrtime: PermissionState::Granted,
     }
   }
 
-  pub fn check_run(&self) -> Result<(), OpError> {
-    self
-      .allow_run
-      .check("access to run a subprocess", "--allow-run")
-  }
-
-  fn get_state_read(&self, path: &Option<&Path>) -> PermissionState {
-    if path.map_or(false, |f| check_path_white_list(f, &self.read_allowlist)) {
-      return PermissionState::Allow;
+  pub fn query_read(&self, path: &Option<&Path>) -> PermissionState {
+    let path = path.map(|p| resolve_from_cwd(p).unwrap());
+    if self.read.global_state == PermissionState::Denied
+      && match path.as_ref() {
+        None => true,
+        Some(path) => check_path_blocklist(path, &self.read.denied_list),
+      }
+    {
+      return PermissionState::Denied;
     }
-    self.allow_read
-  }
-
-  pub fn check_read(&self, path: &Path) -> Result<(), OpError> {
-    let (resolved_path, display_path) = self.resolved_and_display_path(path);
-    self.get_state_read(&Some(&resolved_path)).check(
-      &format!("read access to \"{}\"", display_path.display()),
-      "--allow-read",
-    )
-  }
-
-  /// As `check_read()`, but permission error messages will anonymize the path
-  /// by replacing it with the given `display`.
-  pub fn check_read_blind(
-    &self,
-    path: &Path,
-    display: &str,
-  ) -> Result<(), OpError> {
-    let resolved_path = resolve_from_cwd(path).unwrap();
-    self
-      .get_state_read(&Some(&resolved_path))
-      .check(&format!("read access to <{}>", display), "--allow-read")
-  }
-
-  fn get_state_write(&self, path: &Option<&Path>) -> PermissionState {
-    if path.map_or(false, |f| check_path_white_list(f, &self.write_allowlist)) {
-      return PermissionState::Allow;
+    if self.read.global_state == PermissionState::Granted
+      || match path.as_ref() {
+        None => false,
+        Some(path) => check_path_allowlist(path, &self.read.granted_list),
+      }
+    {
+      return PermissionState::Granted;
     }
-    self.allow_write
+    PermissionState::Prompt
   }
 
-  pub fn check_write(&self, path: &Path) -> Result<(), OpError> {
-    let (resolved_path, display_path) = self.resolved_and_display_path(path);
-    self.get_state_write(&Some(&resolved_path)).check(
-      &format!("write access to \"{}\"", display_path.display()),
-      "--allow-write",
-    )
+  pub fn query_write(&self, path: &Option<&Path>) -> PermissionState {
+    let path = path.map(|p| resolve_from_cwd(p).unwrap());
+    if self.write.global_state == PermissionState::Denied
+      && match path.as_ref() {
+        None => true,
+        Some(path) => check_path_blocklist(path, &self.write.denied_list),
+      }
+    {
+      return PermissionState::Denied;
+    }
+    if self.write.global_state == PermissionState::Granted
+      || match path.as_ref() {
+        None => false,
+        Some(path) => check_path_allowlist(path, &self.write.granted_list),
+      }
+    {
+      return PermissionState::Granted;
+    }
+    PermissionState::Prompt
   }
 
-  fn get_state_net(&self, host: &str, port: Option<u16>) -> PermissionState {
-    if check_host_and_port_allowlist(host, port, &self.net_allowlist) {
-      return PermissionState::Allow;
+  pub fn query_net(&self, host: &str, port: Option<u16>) -> PermissionState {
+    if self.net.global_state == PermissionState::Denied
+      || check_host_and_port_list(host, port, &self.net.denied_list)
+    {
+      return PermissionState::Denied;
     }
-    self.allow_net
+    if self.net.global_state == PermissionState::Granted
+      || check_host_and_port_list(host, port, &self.net.granted_list)
+    {
+      return PermissionState::Granted;
+    }
+    PermissionState::Prompt
   }
 
-  fn get_state_net_url(
+  pub fn query_net_url(
     &self,
     url: &Option<&str>,
   ) -> Result<PermissionState, OpError> {
     if url.is_none() {
-      return Ok(self.allow_net);
+      return Ok(self.net.global_state);
     }
     let url: &str = url.unwrap();
     // If url is invalid, then throw a TypeError.
@@ -291,179 +265,363 @@ impl Permissions {
           .to_owned(),
       ));
     }
-    Ok(self.get_state_net(
+    Ok(self.query_net(
       &format!("{}", parsed.host().unwrap()),
       parsed.port_or_known_default(),
     ))
   }
 
-  pub fn check_net(&self, hostname: &str, port: u16) -> Result<(), OpError> {
-    self.get_state_net(hostname, Some(port)).check(
-      &format!("network access to \"{}:{}\"", hostname, port),
-      "--allow-net",
-    )
+  pub fn query_env(&self) -> PermissionState {
+    self.env
   }
 
-  pub fn check_net_url(&self, url: &url::Url) -> Result<(), OpError> {
-    let host = url
-      .host_str()
-      .ok_or_else(|| OpError::uri_error("missing host".to_owned()))?;
-    self
-      .get_state_net(host, url.port_or_known_default())
-      .check(&format!("network access to \"{}\"", url), "--allow-net")
-  }
-
-  pub fn check_env(&self) -> Result<(), OpError> {
-    self
-      .allow_env
-      .check("access to environment variables", "--allow-env")
+  pub fn query_run(&self) -> PermissionState {
+    self.run
   }
 
-  pub fn check_plugin(&self, path: &Path) -> Result<(), OpError> {
-    let (_, display_path) = self.resolved_and_display_path(path);
-    self.allow_plugin.check(
-      &format!("access to open a plugin: {}", display_path.display()),
-      "--allow-plugin",
-    )
+  pub fn query_plugin(&self) -> PermissionState {
+    self.plugin
   }
 
-  pub fn request_run(&mut self) -> PermissionState {
-    self
-      .allow_run
-      .request("Deno requests to access to run a subprocess")
+  pub fn query_hrtime(&self) -> PermissionState {
+    self.hrtime
   }
 
   pub fn request_read(&mut self, path: &Option<&Path>) -> PermissionState {
-    let paths = path.map(|p| self.resolved_and_display_path(p));
-    if let Some((p, _)) = paths.as_ref() {
-      if check_path_white_list(&p, &self.read_allowlist) {
-        return PermissionState::Allow;
+    if let Some(path) = path {
+      let (resolved_path, display_path) = self.resolved_and_display_path(path);
+      let state = self.query_read(&Some(&resolved_path));
+      if state == PermissionState::Prompt {
+        if permission_prompt(&format!(
+          "Deno requests read access to \"{}\"",
+          display_path.display()
+        )) {
+          self
+            .read
+            .granted_list
+            .retain(|path| !path.starts_with(&resolved_path));
+          self.read.granted_list.insert(resolved_path);
+          return PermissionState::Granted;
+        } else {
+          self
+            .read
+            .denied_list
+            .retain(|path| !resolved_path.starts_with(path));
+          self.read.denied_list.insert(resolved_path);
+          self.read.global_state = PermissionState::Denied;
+          return PermissionState::Denied;
+        }
       }
-    };
-    self.allow_read.request(&match paths {
-      None => "Deno requests read access".to_string(),
-      Some((_, display_path)) => format!(
-        "Deno requests read access to \"{}\"",
-        display_path.display()
-      ),
-    })
+      state
+    } else {
+      let state = self.query_read(&None);
+      if state == PermissionState::Prompt {
+        if permission_prompt("Deno requests read access") {
+          self.read.granted_list.clear();
+          self.read.global_state = PermissionState::Granted;
+          return PermissionState::Granted;
+        } else {
+          self.read.global_state = PermissionState::Denied;
+          return PermissionState::Denied;
+        }
+      }
+      state
+    }
   }
 
   pub fn request_write(&mut self, path: &Option<&Path>) -> PermissionState {
-    let paths = path.map(|p| self.resolved_and_display_path(p));
-    if let Some((p, _)) = paths.as_ref() {
-      if check_path_white_list(&p, &self.write_allowlist) {
-        return PermissionState::Allow;
+    if let Some(path) = path {
+      let (resolved_path, display_path) = self.resolved_and_display_path(path);
+      let state = self.query_write(&Some(&resolved_path));
+      if state == PermissionState::Prompt {
+        if permission_prompt(&format!(
+          "Deno requests write access to \"{}\"",
+          display_path.display()
+        )) {
+          self
+            .write
+            .granted_list
+            .retain(|path| !path.starts_with(&resolved_path));
+          self.write.granted_list.insert(resolved_path);
+          return PermissionState::Granted;
+        } else {
+          self
+            .write
+            .denied_list
+            .retain(|path| !resolved_path.starts_with(path));
+          self.write.denied_list.insert(resolved_path);
+          self.write.global_state = PermissionState::Denied;
+          return PermissionState::Denied;
+        }
       }
-    };
-    self.allow_write.request(&match paths {
-      None => "Deno requests write access".to_string(),
-      Some((_, display_path)) => format!(
-        "Deno requests write access to \"{}\"",
-        display_path.display()
-      ),
-    })
+      state
+    } else {
+      let state = self.query_write(&None);
+      if state == PermissionState::Prompt {
+        if permission_prompt("Deno requests write access") {
+          self.write.granted_list.clear();
+          self.write.global_state = PermissionState::Granted;
+          return PermissionState::Granted;
+        } else {
+          self.write.global_state = PermissionState::Denied;
+          return PermissionState::Denied;
+        }
+      }
+      state
+    }
   }
 
   pub fn request_net(
     &mut self,
     url: &Option<&str>,
   ) -> Result<PermissionState, OpError> {
-    if self.get_state_net_url(url)? == PermissionState::Ask {
-      return Ok(self.allow_net.request(&match url {
-        None => "Deno requests network access".to_string(),
-        Some(url) => format!("Deno requests network access to \"{}\"", url),
-      }));
-    };
-    self.get_state_net_url(url)
+    if let Some(url) = url {
+      let state = self.query_net_url(&Some(url))?;
+      if state == PermissionState::Prompt {
+        if permission_prompt(&format!(
+          "Deno requests network access to \"{}\"",
+          url
+        )) {
+          self.net.granted_list.insert(url.to_string());
+          return Ok(PermissionState::Granted);
+        } else {
+          self.net.denied_list.insert(url.to_string());
+          self.net.global_state = PermissionState::Denied;
+          return Ok(PermissionState::Denied);
+        }
+      }
+      Ok(state)
+    } else {
+      let state = self.query_net_url(&None)?;
+      if state == PermissionState::Prompt {
+        if permission_prompt("Deno requests network access") {
+          self.net.granted_list.clear();
+          self.net.global_state = PermissionState::Granted;
+          return Ok(PermissionState::Granted);
+        } else {
+          self.net.global_state = PermissionState::Denied;
+          return Ok(PermissionState::Denied);
+        }
+      }
+      Ok(state)
+    }
   }
 
   pub fn request_env(&mut self) -> PermissionState {
-    self
-      .allow_env
-      .request("Deno requests to access to environment variables")
+    if self.env == PermissionState::Prompt {
+      if permission_prompt("Deno requests access to environment variables") {
+        self.env = PermissionState::Granted;
+      } else {
+        self.env = PermissionState::Denied;
+      }
+    }
+    self.env
   }
 
-  pub fn request_hrtime(&mut self) -> PermissionState {
-    self
-      .allow_hrtime
-      .request("Deno requests to access to high precision time")
+  pub fn request_run(&mut self) -> PermissionState {
+    if self.run == PermissionState::Prompt {
+      if permission_prompt("Deno requests to access to run a subprocess") {
+        self.run = PermissionState::Granted;
+      } else {
+        self.run = PermissionState::Denied;
+      }
+    }
+    self.run
   }
 
   pub fn request_plugin(&mut self) -> PermissionState {
-    self.allow_plugin.request("Deno requests to open plugins")
+    if self.plugin == PermissionState::Prompt {
+      if permission_prompt("Deno requests to open plugins") {
+        self.plugin = PermissionState::Granted;
+      } else {
+        self.plugin = PermissionState::Denied;
+      }
+    }
+    self.plugin
   }
 
-  pub fn get_permission_state(
-    &self,
-    name: &str,
+  pub fn request_hrtime(&mut self) -> PermissionState {
+    if self.hrtime == PermissionState::Prompt {
+      if permission_prompt("Deno requests access to high precision time") {
+        self.hrtime = PermissionState::Granted;
+      } else {
+        self.hrtime = PermissionState::Denied;
+      }
+    }
+    self.hrtime
+  }
+
+  pub fn revoke_read(&mut self, path: &Option<&Path>) -> PermissionState {
+    if let Some(path) = path {
+      let path = resolve_from_cwd(path).unwrap();
+      self
+        .read
+        .granted_list
+        .retain(|path_| !path_.starts_with(&path));
+    } else {
+      self.read.granted_list.clear();
+      if self.read.global_state == PermissionState::Granted {
+        self.read.global_state = PermissionState::Prompt;
+      }
+    }
+    self.query_read(path)
+  }
+
+  pub fn revoke_write(&mut self, path: &Option<&Path>) -> PermissionState {
+    if let Some(path) = path {
+      let path = resolve_from_cwd(path).unwrap();
+      self
+        .write
+        .granted_list
+        .retain(|path_| !path_.starts_with(&path));
+    } else {
+      self.write.granted_list.clear();
+      if self.write.global_state == PermissionState::Granted {
+        self.write.global_state = PermissionState::Prompt;
+      }
+    }
+    self.query_write(path)
+  }
+
+  pub fn revoke_net(
+    &mut self,
     url: &Option<&str>,
-    path: &Option<&Path>,
   ) -> Result<PermissionState, OpError> {
-    let path = path.map(|p| resolve_from_cwd(p).unwrap());
-    let path = path.as_deref();
-    match name {
-      "run" => Ok(self.allow_run),
-      "read" => Ok(self.get_state_read(&path)),
-      "write" => Ok(self.get_state_write(&path)),
-      "net" => self.get_state_net_url(url),
-      "env" => Ok(self.allow_env),
-      "plugin" => Ok(self.allow_plugin),
-      "hrtime" => Ok(self.allow_hrtime),
-      n => Err(OpError::other(format!("No such permission name: {}", n))),
+    if let Some(url) = url {
+      self.net.granted_list.remove(*url);
+    } else {
+      self.net.granted_list.clear();
+      if self.net.global_state == PermissionState::Granted {
+        self.net.global_state = PermissionState::Prompt;
+      }
+    }
+    self.query_net_url(url)
+  }
+
+  pub fn revoke_env(&mut self) -> PermissionState {
+    if self.env == PermissionState::Granted {
+      self.env = PermissionState::Prompt;
+    }
+    self.env
+  }
+
+  pub fn revoke_run(&mut self) -> PermissionState {
+    if self.run == PermissionState::Granted {
+      self.run = PermissionState::Prompt;
+    }
+    self.run
+  }
+
+  pub fn revoke_plugin(&mut self) -> PermissionState {
+    if self.plugin == PermissionState::Granted {
+      self.plugin = PermissionState::Prompt;
+    }
+    self.plugin
+  }
+
+  pub fn revoke_hrtime(&mut self) -> PermissionState {
+    if self.hrtime == PermissionState::Granted {
+      self.hrtime = PermissionState::Prompt;
     }
+    self.hrtime
+  }
+
+  pub fn check_read(&self, path: &Path) -> Result<(), OpError> {
+    let (resolved_path, display_path) = self.resolved_and_display_path(path);
+    self.query_read(&Some(&resolved_path)).check(
+      &format!("read access to \"{}\"", display_path.display()),
+      "--allow-read",
+    )
+  }
+
+  /// As `check_read()`, but permission error messages will anonymize the path
+  /// by replacing it with the given `display`.
+  pub fn check_read_blind(
+    &self,
+    path: &Path,
+    display: &str,
+  ) -> Result<(), OpError> {
+    let resolved_path = resolve_from_cwd(path).unwrap();
+    self
+      .query_read(&Some(&resolved_path))
+      .check(&format!("read access to <{}>", display), "--allow-read")
+  }
+
+  pub fn check_write(&self, path: &Path) -> Result<(), OpError> {
+    let (resolved_path, display_path) = self.resolved_and_display_path(path);
+    self.query_write(&Some(&resolved_path)).check(
+      &format!("write access to \"{}\"", display_path.display()),
+      "--allow-write",
+    )
+  }
+
+  pub fn check_net(&self, hostname: &str, port: u16) -> Result<(), OpError> {
+    self.query_net(hostname, Some(port)).check(
+      &format!("network access to \"{}:{}\"", hostname, port),
+      "--allow-net",
+    )
+  }
+
+  pub fn check_net_url(&self, url: &url::Url) -> Result<(), OpError> {
+    let host = url
+      .host_str()
+      .ok_or_else(|| OpError::uri_error("missing host".to_owned()))?;
+    self
+      .query_net(host, url.port_or_known_default())
+      .check(&format!("network access to \"{}\"", url), "--allow-net")
+  }
+
+  pub fn check_env(&self) -> Result<(), OpError> {
+    self
+      .env
+      .check("access to environment variables", "--allow-env")
+  }
+
+  pub fn check_run(&self) -> Result<(), OpError> {
+    self.run.check("access to run a subprocess", "--allow-run")
+  }
+
+  pub fn check_plugin(&self, path: &Path) -> Result<(), OpError> {
+    let (_, display_path) = self.resolved_and_display_path(path);
+    self.plugin.check(
+      &format!("access to open a plugin: {}", display_path.display()),
+      "--allow-plugin",
+    )
+  }
+
+  pub fn check_hrtime(&self) -> Result<(), OpError> {
+    self
+      .hrtime
+      .check("access to high precision time", "--allow-run")
   }
 
   #[allow(clippy::too_many_arguments)]
   pub fn fork(
     &self,
-    allow_read: bool,
-    read_allowlist: HashSet<PathBuf>,
-    allow_write: bool,
-    write_allowlist: HashSet<PathBuf>,
-    allow_net: bool,
-    net_allowlist: HashSet<String>,
-    allow_env: bool,
-    allow_run: bool,
-    allow_plugin: bool,
-    allow_hrtime: bool,
+    read: UnaryPermission<PathBuf>,
+    write: UnaryPermission<PathBuf>,
+    net: UnaryPermission<String>,
+    env: PermissionState,
+    run: PermissionState,
+    plugin: PermissionState,
+    hrtime: PermissionState,
   ) -> Result<Permissions, OpError> {
-    let allow_read = self.allow_read.fork(allow_read)?;
-    let allow_write = self.allow_write.fork(allow_write)?;
-    let allow_net = self.allow_net.fork(allow_net)?;
-    let allow_env = self.allow_env.fork(allow_env)?;
-    let allow_run = self.allow_run.fork(allow_run)?;
-    let allow_plugin = self.allow_plugin.fork(allow_plugin)?;
-    let allow_hrtime = self.allow_hrtime.fork(allow_hrtime)?;
-    if !(read_allowlist.is_subset(&self.read_allowlist)) {
-      Err(OpError::permission_denied(format!(
-        "Arguments escalate parent permissions. Parent Permissions have only {:?} in `read_allowlist`",
-        self.read_allowlist
-      )))
-    } else if !(write_allowlist.is_subset(&self.write_allowlist)) {
-      Err(OpError::permission_denied(format!(
-        "Arguments escalate parent permissions. Parent Permissions have only {:?} in `write_allowlist`",
-        self.write_allowlist
-      )))
-    } else if !(net_allowlist.is_subset(&self.net_allowlist)) {
-      Err(OpError::permission_denied(format!(
-        "Arguments escalate parent permissions. Parent Permissions have only {:?} in `net_allowlist`",
-        self.net_allowlist
-      )))
-    } else {
-      Ok(Permissions {
-        allow_read,
-        read_allowlist,
-        allow_write,
-        write_allowlist,
-        allow_net,
-        net_allowlist,
-        allow_env,
-        allow_run,
-        allow_plugin,
-        allow_hrtime,
-      })
-    }
+    self.read.check_fork(&read)?;
+    self.write.check_fork(&write)?;
+    self.net.check_fork(&net)?;
+    self.env.check_fork(&env)?;
+    self.run.check_fork(&run)?;
+    self.plugin.check_fork(&plugin)?;
+    self.hrtime.check_fork(&hrtime)?;
+    Ok(Permissions {
+      read,
+      write,
+      net,
+      env,
+      run,
+      plugin,
+      hrtime,
+    })
   }
 }
 
@@ -529,20 +687,25 @@ fn log_perm_access(message: &str) {
   );
 }
 
-fn check_path_white_list(path: &Path, white_list: &HashSet<PathBuf>) -> bool {
-  let mut path_buf = PathBuf::from(path);
-  loop {
-    if white_list.contains(&path_buf) {
+fn check_path_allowlist(path: &Path, allowlist: &HashSet<PathBuf>) -> bool {
+  for path_ in allowlist {
+    if path.starts_with(path_) {
       return true;
     }
-    if !path_buf.pop() {
-      break;
+  }
+  false
+}
+
+fn check_path_blocklist(path: &Path, blocklist: &HashSet<PathBuf>) -> bool {
+  for path_ in blocklist {
+    if path_.starts_with(path) {
+      return true;
     }
   }
   false
 }
 
-fn check_host_and_port_allowlist(
+fn check_host_and_port_list(
   host: &str,
   port: Option<u16>,
   allowlist: &HashSet<String>,
@@ -708,253 +871,48 @@ mod tests {
     }
   }
 
-  #[test]
-  fn test_permissions_request_run() {
-    let guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
-    let mut perms0 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert_eq!(perms0.request_run(), PermissionState::Allow);
-
-    let mut perms1 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(perms1.request_run(), PermissionState::Deny);
-    drop(guard);
-  }
-
-  #[test]
-  fn test_permissions_request_read() {
-    let guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
-    let allowlist = vec![PathBuf::from("/foo/bar")];
-    let mut perms0 = Permissions::from_flags(&Flags {
-      read_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    // If the allowlist contains the path, then the result is `allow`
-    // regardless of prompt result
-    assert_eq!(
-      perms0.request_read(&Some(Path::new("/foo/bar"))),
-      PermissionState::Allow
-    );
-
-    let mut perms1 = Permissions::from_flags(&Flags {
-      read_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert_eq!(
-      perms1.request_read(&Some(Path::new("/foo/baz"))),
-      PermissionState::Allow
-    );
-
-    let mut perms2 = Permissions::from_flags(&Flags {
-      read_allowlist: allowlist,
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(
-      perms2.request_read(&Some(Path::new("/foo/baz"))),
-      PermissionState::Deny
-    );
-    drop(guard);
-  }
-
-  #[test]
-  fn test_permissions_request_write() {
-    let guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
-    let allowlist = vec![PathBuf::from("/foo/bar")];
-    let mut perms0 = Permissions::from_flags(&Flags {
-      write_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    // If the allowlist contains the path, then the result is `allow`
-    // regardless of prompt result
-    assert_eq!(
-      perms0.request_write(&Some(Path::new("/foo/bar"))),
-      PermissionState::Allow
-    );
-
-    let mut perms1 = Permissions::from_flags(&Flags {
-      write_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert_eq!(
-      perms1.request_write(&Some(Path::new("/foo/baz"))),
-      PermissionState::Allow
-    );
-
-    let mut perms2 = Permissions::from_flags(&Flags {
-      write_allowlist: allowlist,
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(
-      perms2.request_write(&Some(Path::new("/foo/baz"))),
-      PermissionState::Deny
-    );
-    drop(guard);
-  }
-
-  #[test]
-  fn test_permission_request_net() {
-    let guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
-    let allowlist = svec!["localhost:8080"];
-
-    let mut perms0 = Permissions::from_flags(&Flags {
-      net_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    // If the url matches the allowlist item, then the result is `allow`
-    // regardless of prompt result
-    assert_eq!(
-      perms0
-        .request_net(&Some("http://localhost:8080/"))
-        .expect("Testing expect"),
-      PermissionState::Allow
-    );
-
-    let mut perms1 = Permissions::from_flags(&Flags {
-      net_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert_eq!(
-      perms1
-        .request_net(&Some("http://deno.land/"))
-        .expect("Testing expect"),
-      PermissionState::Allow
-    );
-
-    let mut perms2 = Permissions::from_flags(&Flags {
-      net_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(
-      perms2
-        .request_net(&Some("http://deno.land/"))
-        .expect("Testing expect"),
-      PermissionState::Deny
-    );
-
-    let mut perms3 = Permissions::from_flags(&Flags {
-      net_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert!(perms3.request_net(&Some(":")).is_err());
-
-    let mut perms4 = Permissions::from_flags(&Flags {
-      net_allowlist: allowlist.clone(),
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(
-      perms4
-        .request_net(&Some("localhost:8080"))
-        .unwrap_err()
-        .kind,
-      crate::op_error::ErrorKind::URIError
-    );
-
-    let mut perms5 = Permissions::from_flags(&Flags {
-      net_allowlist: allowlist,
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(
-      perms5.request_net(&Some("file:/1.txt")).unwrap_err().kind,
-      crate::op_error::ErrorKind::URIError
-    );
-
-    drop(guard);
-  }
-
-  #[test]
-  fn test_permissions_request_env() {
-    let guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
-    let mut perms0 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert_eq!(perms0.request_env(), PermissionState::Allow);
-
-    let mut perms1 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(perms1.request_env(), PermissionState::Deny);
-    drop(guard);
-  }
-
-  #[test]
-  fn test_permissions_request_plugin() {
-    let guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
-    let mut perms0 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert_eq!(perms0.request_plugin(), PermissionState::Allow);
-
-    let mut perms1 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(perms1.request_plugin(), PermissionState::Deny);
-    drop(guard);
-  }
-
-  #[test]
-  fn test_permissions_request_hrtime() {
-    let guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
-    let mut perms0 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert_eq!(perms0.request_hrtime(), PermissionState::Allow);
-
-    let mut perms1 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(false);
-    assert_eq!(perms1.request_hrtime(), PermissionState::Deny);
-    drop(guard);
-  }
-
   #[test]
   fn test_deserialize_perms() {
     let json_perms = r#"
     {
-      "allow_read": true,
-      "read_allowlist": [],
-      "allow_write": true,
-      "write_allowlist": [],
-      "allow_net": true,
-      "net_allowlist": [],
-      "allow_env": true,
-      "allow_run": true,
-      "allow_plugin": true,
-      "allow_hrtime": true
+      "read": {
+        "global_state": "Granted",
+        "granted_list": [],
+        "denied_list": []
+      },
+      "write": {
+        "global_state": "Granted",
+        "granted_list": [],
+        "denied_list": []
+      },
+      "net": {
+        "global_state": "Granted",
+        "granted_list": [],
+        "denied_list": []
+      },
+      "env": "Granted",
+      "run": "Granted",
+      "plugin": "Granted",
+      "hrtime": "Granted"
     }
     "#;
     let perms0 = Permissions {
-      allow_read: PermissionState::Allow,
-      allow_write: PermissionState::Allow,
-      allow_net: PermissionState::Allow,
-      allow_hrtime: PermissionState::Allow,
-      allow_env: PermissionState::Allow,
-      allow_plugin: PermissionState::Allow,
-      allow_run: PermissionState::Allow,
-      read_allowlist: HashSet::new(),
-      write_allowlist: HashSet::new(),
-      net_allowlist: HashSet::new(),
+      read: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      write: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      net: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      env: PermissionState::Granted,
+      run: PermissionState::Granted,
+      hrtime: PermissionState::Granted,
+      plugin: PermissionState::Granted,
     };
     let deserialized_perms: Permissions =
       serde_json::from_str(json_perms).unwrap();
@@ -963,68 +921,208 @@ mod tests {
 
   #[test]
   fn test_fork() {
-    let guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
-    let perms0 = Permissions::from_flags(&Flags {
-      ..Default::default()
-    });
-    set_prompt_result(true);
-    assert_eq!(
-      perms0
-        .fork(
-          true,
-          HashSet::new(),
-          true,
-          HashSet::new(),
-          true,
-          HashSet::new(),
-          true,
-          true,
-          false,
-          false,
-        )
-        .expect("Testing expect"),
-      Permissions {
-        allow_read: PermissionState::Allow,
-        read_allowlist: HashSet::new(),
-        allow_write: PermissionState::Allow,
-        write_allowlist: HashSet::new(),
-        allow_net: PermissionState::Allow,
-        net_allowlist: HashSet::new(),
-        allow_env: PermissionState::Allow,
-        allow_run: PermissionState::Allow,
-        allow_plugin: PermissionState::Deny,
-        allow_hrtime: PermissionState::Deny,
-      }
-    );
-    set_prompt_result(false);
-    assert_eq!(
-      perms0
-        .fork(
-          true,
-          HashSet::new(),
-          true,
-          HashSet::new(),
-          true,
-          HashSet::new(),
-          true,
-          true,
-          false,
-          false,
-        )
-        .expect("Testing expect"),
-      Permissions {
-        allow_read: PermissionState::Allow,
-        read_allowlist: HashSet::new(),
-        allow_write: PermissionState::Allow,
-        write_allowlist: HashSet::new(),
-        allow_net: PermissionState::Allow,
-        net_allowlist: HashSet::new(),
-        allow_env: PermissionState::Allow,
-        allow_run: PermissionState::Allow,
-        allow_plugin: PermissionState::Deny,
-        allow_hrtime: PermissionState::Deny,
-      }
-    );
-    drop(guard);
+    let perms0 = Permissions::from_flags(&Flags::default());
+    perms0
+      .fork(
+        UnaryPermission {
+          global_state: PermissionState::Prompt,
+          ..Default::default()
+        },
+        UnaryPermission {
+          global_state: PermissionState::Prompt,
+          ..Default::default()
+        },
+        UnaryPermission {
+          global_state: PermissionState::Prompt,
+          ..Default::default()
+        },
+        PermissionState::Prompt,
+        PermissionState::Prompt,
+        PermissionState::Denied,
+        PermissionState::Denied,
+      )
+      .expect("Fork should succeed.");
+    perms0
+      .fork(
+        UnaryPermission {
+          global_state: PermissionState::Granted,
+          ..Default::default()
+        },
+        UnaryPermission {
+          global_state: PermissionState::Granted,
+          ..Default::default()
+        },
+        UnaryPermission {
+          global_state: PermissionState::Granted,
+          ..Default::default()
+        },
+        PermissionState::Granted,
+        PermissionState::Granted,
+        PermissionState::Denied,
+        PermissionState::Denied,
+      )
+      .expect_err("Fork should fail.");
+  }
+
+  #[test]
+  fn test_query() {
+    let perms1 = Permissions {
+      read: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      write: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      net: UnaryPermission {
+        global_state: PermissionState::Granted,
+        ..Default::default()
+      },
+      env: PermissionState::Granted,
+      run: PermissionState::Granted,
+      plugin: PermissionState::Granted,
+      hrtime: PermissionState::Granted,
+    };
+    let perms2 = Permissions {
+      read: UnaryPermission {
+        global_state: PermissionState::Prompt,
+        granted_list: resolve_fs_allowlist(&[PathBuf::from("/foo")]),
+        ..Default::default()
+      },
+      write: UnaryPermission {
+        global_state: PermissionState::Prompt,
+        granted_list: resolve_fs_allowlist(&[PathBuf::from("/foo")]),
+        ..Default::default()
+      },
+      net: UnaryPermission {
+        global_state: PermissionState::Prompt,
+        granted_list: ["127.0.0.1:8000".to_string()].iter().cloned().collect(),
+        ..Default::default()
+      },
+      env: PermissionState::Prompt,
+      run: PermissionState::Prompt,
+      plugin: PermissionState::Prompt,
+      hrtime: PermissionState::Prompt,
+    };
+    #[rustfmt::skip]
+    {
+      assert_eq!(perms1.query_read(&None), PermissionState::Granted);
+      assert_eq!(perms1.query_read(&Some(&Path::new("/foo"))), PermissionState::Granted);
+      assert_eq!(perms2.query_read(&None), PermissionState::Prompt);
+      assert_eq!(perms2.query_read(&Some(&Path::new("/foo"))), PermissionState::Granted);
+      assert_eq!(perms2.query_read(&Some(&Path::new("/foo/bar"))), PermissionState::Granted);
+      assert_eq!(perms1.query_write(&None), PermissionState::Granted);
+      assert_eq!(perms1.query_write(&Some(&Path::new("/foo"))), PermissionState::Granted);
+      assert_eq!(perms2.query_write(&None), PermissionState::Prompt);
+      assert_eq!(perms2.query_write(&Some(&Path::new("/foo"))), PermissionState::Granted);
+      assert_eq!(perms2.query_write(&Some(&Path::new("/foo/bar"))), PermissionState::Granted);
+      assert_eq!(perms1.query_net_url(&None).unwrap(), PermissionState::Granted);
+      assert_eq!(perms1.query_net_url(&Some("http://127.0.0.1:8000")).unwrap(), PermissionState::Granted);
+      assert_eq!(perms2.query_net_url(&None).unwrap(), PermissionState::Prompt);
+      assert_eq!(perms2.query_net_url(&Some("http://127.0.0.1:8000")).unwrap(), PermissionState::Granted);
+      assert_eq!(perms1.query_env(), PermissionState::Granted);
+      assert_eq!(perms2.query_env(), PermissionState::Prompt);
+      assert_eq!(perms1.query_run(), PermissionState::Granted);
+      assert_eq!(perms2.query_run(), PermissionState::Prompt);
+      assert_eq!(perms1.query_plugin(), PermissionState::Granted);
+      assert_eq!(perms2.query_plugin(), PermissionState::Prompt);
+      assert_eq!(perms1.query_hrtime(), PermissionState::Granted);
+      assert_eq!(perms2.query_hrtime(), PermissionState::Prompt);
+    };
+  }
+
+  #[test]
+  fn test_request() {
+    let mut perms = Permissions {
+      read: UnaryPermission {
+        global_state: PermissionState::Prompt,
+        ..Default::default()
+      },
+      write: UnaryPermission {
+        global_state: PermissionState::Prompt,
+        ..Default::default()
+      },
+      net: UnaryPermission {
+        global_state: PermissionState::Prompt,
+        ..Default::default()
+      },
+      env: PermissionState::Prompt,
+      run: PermissionState::Prompt,
+      plugin: PermissionState::Prompt,
+      hrtime: PermissionState::Prompt,
+    };
+    #[rustfmt::skip]
+    {
+      let _guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
+      set_prompt_result(true);
+      assert_eq!(perms.request_read(&Some(&Path::new("/foo"))), PermissionState::Granted);
+      assert_eq!(perms.query_read(&None), PermissionState::Prompt);
+      set_prompt_result(false);
+      assert_eq!(perms.request_read(&Some(&Path::new("/foo/bar"))), PermissionState::Granted);
+      set_prompt_result(false);
+      assert_eq!(perms.request_write(&Some(&Path::new("/foo"))), PermissionState::Denied);
+      assert_eq!(perms.query_write(&Some(&Path::new("/foo/bar"))), PermissionState::Prompt);
+      set_prompt_result(true);
+      assert_eq!(perms.request_write(&None), PermissionState::Denied);
+      set_prompt_result(true);
+      assert_eq!(perms.request_net(&None).unwrap(), PermissionState::Granted);
+      set_prompt_result(false);
+      assert_eq!(perms.request_net(&Some("http://127.0.0.1:8000")).unwrap(), PermissionState::Granted);
+      set_prompt_result(true);
+      assert_eq!(perms.request_env(), PermissionState::Granted);
+      set_prompt_result(false);
+      assert_eq!(perms.request_env(), PermissionState::Granted);
+      set_prompt_result(false);
+      assert_eq!(perms.request_run(), PermissionState::Denied);
+      set_prompt_result(true);
+      assert_eq!(perms.request_run(), PermissionState::Denied);
+      set_prompt_result(true);
+      assert_eq!(perms.request_plugin(), PermissionState::Granted);
+      set_prompt_result(false);
+      assert_eq!(perms.request_plugin(), PermissionState::Granted);
+      set_prompt_result(false);
+      assert_eq!(perms.request_hrtime(), PermissionState::Denied);
+      set_prompt_result(true);
+      assert_eq!(perms.request_hrtime(), PermissionState::Denied);
+    };
+  }
+
+  #[test]
+  fn test_revoke() {
+    let mut perms = Permissions {
+      read: UnaryPermission {
+        global_state: PermissionState::Prompt,
+        granted_list: resolve_fs_allowlist(&[PathBuf::from("/foo")]),
+        ..Default::default()
+      },
+      write: UnaryPermission {
+        global_state: PermissionState::Prompt,
+        granted_list: resolve_fs_allowlist(&[PathBuf::from("/foo")]),
+        ..Default::default()
+      },
+      net: UnaryPermission {
+        global_state: PermissionState::Denied,
+        ..Default::default()
+      },
+      env: PermissionState::Granted,
+      run: PermissionState::Granted,
+      plugin: PermissionState::Prompt,
+      hrtime: PermissionState::Denied,
+    };
+    #[rustfmt::skip]
+    {
+      assert_eq!(perms.revoke_read(&Some(&Path::new("/foo/bar"))), PermissionState::Granted);
+      assert_eq!(perms.revoke_read(&Some(&Path::new("/foo"))), PermissionState::Prompt);
+      assert_eq!(perms.query_read(&Some(&Path::new("/foo/bar"))), PermissionState::Prompt);
+      assert_eq!(perms.revoke_write(&Some(&Path::new("/foo/bar"))), PermissionState::Granted);
+      assert_eq!(perms.revoke_write(&None), PermissionState::Prompt);
+      assert_eq!(perms.query_write(&Some(&Path::new("/foo/bar"))), PermissionState::Prompt);
+      assert_eq!(perms.revoke_net(&None).unwrap(), PermissionState::Denied);
+      assert_eq!(perms.revoke_env(), PermissionState::Prompt);
+      assert_eq!(perms.revoke_run(), PermissionState::Prompt);
+      assert_eq!(perms.revoke_plugin(), PermissionState::Prompt);
+      assert_eq!(perms.revoke_hrtime(), PermissionState::Denied);
+    };
   }
 }
diff --git a/cli/js2/00_bootstrap_namespace.js b/cli/rt/00_bootstrap_namespace.js
similarity index 100%
rename from cli/js2/00_bootstrap_namespace.js
rename to cli/rt/00_bootstrap_namespace.js
diff --git a/cli/js2/01_build.js b/cli/rt/01_build.js
similarity index 100%
rename from cli/js2/01_build.js
rename to cli/rt/01_build.js
diff --git a/cli/js2/01_colors.js b/cli/rt/01_colors.js
similarity index 100%
rename from cli/js2/01_colors.js
rename to cli/rt/01_colors.js
diff --git a/cli/js2/01_errors.js b/cli/rt/01_errors.js
similarity index 52%
rename from cli/js2/01_errors.js
rename to cli/rt/01_errors.js
index 8390dd803f6a36..fb2bb78c27ce70 100644
--- a/cli/js2/01_errors.js
+++ b/cli/rt/01_errors.js
@@ -1,101 +1,6 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 ((window) => {
-  // Warning! The values in this enum are duplicated in cli/op_error.rs
-  // Update carefully!
-  const ErrorKind = {
-    1: "NotFound",
-    2: "PermissionDenied",
-    3: "ConnectionRefused",
-    4: "ConnectionReset",
-    5: "ConnectionAborted",
-    6: "NotConnected",
-    7: "AddrInUse",
-    8: "AddrNotAvailable",
-    9: "BrokenPipe",
-    10: "AlreadyExists",
-    13: "InvalidData",
-    14: "TimedOut",
-    15: "Interrupted",
-    16: "WriteZero",
-    17: "UnexpectedEof",
-    18: "BadResource",
-    19: "Http",
-    20: "URIError",
-    21: "TypeError",
-    22: "Other",
-    23: "Busy",
-
-    NotFound: 1,
-    PermissionDenied: 2,
-    ConnectionRefused: 3,
-    ConnectionReset: 4,
-    ConnectionAborted: 5,
-    NotConnected: 6,
-    AddrInUse: 7,
-    AddrNotAvailable: 8,
-    BrokenPipe: 9,
-    AlreadyExists: 10,
-    InvalidData: 13,
-    TimedOut: 14,
-    Interrupted: 15,
-    WriteZero: 16,
-    UnexpectedEof: 17,
-    BadResource: 18,
-    Http: 19,
-    URIError: 20,
-    TypeError: 21,
-    Other: 22,
-    Busy: 23,
-  };
-
-  function getErrorClass(kind) {
-    switch (kind) {
-      case ErrorKind.TypeError:
-        return TypeError;
-      case ErrorKind.Other:
-        return Error;
-      case ErrorKind.URIError:
-        return URIError;
-      case ErrorKind.NotFound:
-        return NotFound;
-      case ErrorKind.PermissionDenied:
-        return PermissionDenied;
-      case ErrorKind.ConnectionRefused:
-        return ConnectionRefused;
-      case ErrorKind.ConnectionReset:
-        return ConnectionReset;
-      case ErrorKind.ConnectionAborted:
-        return ConnectionAborted;
-      case ErrorKind.NotConnected:
-        return NotConnected;
-      case ErrorKind.AddrInUse:
-        return AddrInUse;
-      case ErrorKind.AddrNotAvailable:
-        return AddrNotAvailable;
-      case ErrorKind.BrokenPipe:
-        return BrokenPipe;
-      case ErrorKind.AlreadyExists:
-        return AlreadyExists;
-      case ErrorKind.InvalidData:
-        return InvalidData;
-      case ErrorKind.TimedOut:
-        return TimedOut;
-      case ErrorKind.Interrupted:
-        return Interrupted;
-      case ErrorKind.WriteZero:
-        return WriteZero;
-      case ErrorKind.UnexpectedEof:
-        return UnexpectedEof;
-      case ErrorKind.BadResource:
-        return BadResource;
-      case ErrorKind.Http:
-        return Http;
-      case ErrorKind.Busy:
-        return Busy;
-    }
-  }
-
   class NotFound extends Error {
     constructor(msg) {
       super(msg);
@@ -245,6 +150,5 @@
 
   window.__bootstrap.errors = {
     errors,
-    getErrorClass,
   };
 })(this);
diff --git a/cli/js2/01_internals.js b/cli/rt/01_internals.js
similarity index 100%
rename from cli/js2/01_internals.js
rename to cli/rt/01_internals.js
diff --git a/cli/js2/01_version.js b/cli/rt/01_version.js
similarity index 100%
rename from cli/js2/01_version.js
rename to cli/rt/01_version.js
diff --git a/cli/js2/01_web_util.js b/cli/rt/01_web_util.js
similarity index 100%
rename from cli/js2/01_web_util.js
rename to cli/rt/01_web_util.js
diff --git a/cli/tsc/02_console.js b/cli/rt/02_console.js
similarity index 96%
rename from cli/tsc/02_console.js
rename to cli/rt/02_console.js
index 5a9dd4186e20df..e3492772d50c12 100644
--- a/cli/tsc/02_console.js
+++ b/cli/rt/02_console.js
@@ -371,14 +371,14 @@
         let str = "";
         let j = i;
         for (; j < max - 1; j++) {
-          // In future, colors should be taken here into the account
-          const padding = maxLineLength[j - i];
+          const lengthOfColorCodes = entries[j].length - dataLen[j];
+          const padding = maxLineLength[j - i] + lengthOfColorCodes;
           str += `${entries[j]}, `[order](padding, " ");
         }
         if (order === "padStart") {
+          const lengthOfColorCodes = entries[j].length - dataLen[j];
           const padding = maxLineLength[j - i] +
-            entries[j].length -
-            dataLen[j] -
+            lengthOfColorCodes -
             separatorSpace;
           str += entries[j].padStart(padding, " ");
         } else {
@@ -439,16 +439,30 @@
   const QUOTES = ['"', "'", "`"];
 
   /** Surround the string in quotes.
- *
- * The quote symbol is chosen by taking the first of the `QUOTES` array which
- * does not occur in the string. If they all occur, settle with `QUOTES[0]`.
- *
- * Insert a backslash before any occurrence of the chosen quote symbol and
- * before any backslash. */
+   *
+   * The quote symbol is chosen by taking the first of the `QUOTES` array which
+   * does not occur in the string. If they all occur, settle with `QUOTES[0]`.
+   *
+   * Insert a backslash before any occurrence of the chosen quote symbol and
+   * before any backslash.
+   */
   function quoteString(string) {
     const quote = QUOTES.find((c) => !string.includes(c)) ?? QUOTES[0];
     const escapePattern = new RegExp(`(?=[${quote}\\\\])`, "g");
-    return `${quote}${string.replace(escapePattern, "\\")}${quote}`;
+    string = string.replace(escapePattern, "\\");
+    string = replaceEscapeSequences(string);
+    return `${quote}${string}${quote}`;
+  }
+
+  // Replace escape sequences that can modify output.
+  function replaceEscapeSequences(string) {
+    return string
+      .replace(/[\b]/g, "\\b")
+      .replace(/\f/g, "\\f")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/\t/g, "\\t")
+      .replace(/\v/g, "\\v");
   }
 
   // Print strings when they are inside of arrays or objects with quotes
@@ -683,7 +697,7 @@
 
     for (const key of stringKeys) {
       entries.push(
-        `${key}: ${
+        `${replaceEscapeSequences(key)}: ${
           inspectValueWithQuotes(
             value[key],
             ctx,
@@ -695,7 +709,7 @@
     }
     for (const key of symbolKeys) {
       entries.push(
-        `${key.toString()}: ${
+        `${replaceEscapeSequences(key.toString())}: ${
           inspectValueWithQuotes(
             value[key],
             ctx,
diff --git a/cli/js2/03_dom_iterable.js b/cli/rt/03_dom_iterable.js
similarity index 100%
rename from cli/js2/03_dom_iterable.js
rename to cli/rt/03_dom_iterable.js
diff --git a/cli/js2/06_util.js b/cli/rt/06_util.js
similarity index 78%
rename from cli/js2/06_util.js
rename to cli/rt/06_util.js
index 086275bd879b1a..b0ed5696fac5c7 100644
--- a/cli/js2/06_util.js
+++ b/cli/rt/06_util.js
@@ -63,32 +63,32 @@
     });
   }
 
+  // Keep in sync with `fromFileUrl()` in `std/path/win32.ts`.
   function pathFromURLWin32(url) {
-    const hostname = url.hostname;
-    const pathname = decodeURIComponent(url.pathname.replace(/\//g, "\\"));
-
-    if (hostname !== "") {
-      //TODO(actual-size) Node adds a punycode decoding step, we should consider adding this
-      return `\\\\${hostname}${pathname}`;
+    let path = decodeURIComponent(
+      url.pathname
+        .replace(/^\/*([A-Za-z]:)(\/|$)/, "$1/")
+        .replace(/\//g, "\\")
+        .replace(/%(?![0-9A-Fa-f]{2})/g, "%25"),
+    );
+    if (url.hostname != "") {
+      // Note: The `URL` implementation guarantees that the drive letter and
+      // hostname are mutually exclusive. Otherwise it would not have been valid
+      // to append the hostname and path like this.
+      path = `\\\\${url.hostname}${path}`;
     }
-
-    const validPath = /^\\(?<driveLetter>[A-Za-z]):\\/;
-    const matches = validPath.exec(pathname);
-
-    if (!matches?.groups?.driveLetter) {
-      throw new TypeError("A URL with the file schema must be absolute.");
-    }
-
-    // we don't want a leading slash on an absolute path in Windows
-    return pathname.slice(1);
+    return path;
   }
 
+  // Keep in sync with `fromFileUrl()` in `std/path/posix.ts`.
   function pathFromURLPosix(url) {
     if (url.hostname !== "") {
       throw new TypeError(`Host must be empty.`);
     }
 
-    return decodeURIComponent(url.pathname);
+    return decodeURIComponent(
+      url.pathname.replace(/%(?![0-9A-Fa-f]{2})/g, "%25"),
+    );
   }
 
   function pathFromURL(pathOrUrl) {
diff --git a/cli/js2/10_dispatch_json.js b/cli/rt/10_dispatch_json.js
similarity index 93%
rename from cli/js2/10_dispatch_json.js
rename to cli/rt/10_dispatch_json.js
index 3d19ea62aeb76e..05b4d46ed74b58 100644
--- a/cli/js2/10_dispatch_json.js
+++ b/cli/rt/10_dispatch_json.js
@@ -3,7 +3,6 @@
 ((window) => {
   const core = window.Deno.core;
   const util = window.__bootstrap.util;
-  const getErrorClass = window.__bootstrap.errors.getErrorClass;
   // Using an object without a prototype because `Map` was causing GC problems.
   const promiseTable = Object.create(null);
   let _nextPromiseId = 1;
@@ -22,7 +21,7 @@
 
   function unwrapResponse(res) {
     if (res.err != null) {
-      throw new (getErrorClass(res.err.kind))(res.err.message);
+      throw new (core.getErrorClass(res.err.kind))(res.err.message);
     }
     util.assert(res.ok != null);
     return res.ok;
diff --git a/cli/js2/10_dispatch_minimal.js b/cli/rt/10_dispatch_minimal.js
similarity index 87%
rename from cli/js2/10_dispatch_minimal.js
rename to cli/rt/10_dispatch_minimal.js
index 6137449f418bb2..0a0a4f99f2a40e 100644
--- a/cli/js2/10_dispatch_minimal.js
+++ b/cli/rt/10_dispatch_minimal.js
@@ -3,7 +3,6 @@
 ((window) => {
   const core = window.Deno.core;
   const util = window.__bootstrap.util;
-  const errorNs = window.__bootstrap.errors;
 
   // Using an object without a prototype because `Map` was causing GC problems.
   const promiseTableMin = Object.create(null);
@@ -32,11 +31,13 @@
     let err;
 
     if (arg < 0) {
-      const kind = result;
-      const message = decoder.decode(ui8.subarray(12));
-      err = { kind, message };
+      const codeLen = result;
+      const codeAndMessage = decoder.decode(ui8.subarray(12));
+      const errorCode = codeAndMessage.slice(0, codeLen);
+      const message = codeAndMessage.slice(codeLen);
+      err = { kind: errorCode, message };
     } else if (ui8.length != 12) {
-      throw new errorNs.errors.InvalidData("BadMessage");
+      throw new TypeError("Malformed response message");
     }
 
     return {
@@ -49,7 +50,7 @@
 
   function unwrapResponse(res) {
     if (res.err != null) {
-      throw new (errorNs.getErrorClass(res.err.kind))(res.err.message);
+      throw new (core.getErrorClass(res.err.kind))(res.err.message);
     }
     return res.result;
   }
diff --git a/cli/js2/11_crypto.js b/cli/rt/11_crypto.js
similarity index 100%
rename from cli/js2/11_crypto.js
rename to cli/rt/11_crypto.js
diff --git a/cli/js2/11_resources.js b/cli/rt/11_resources.js
similarity index 100%
rename from cli/js2/11_resources.js
rename to cli/rt/11_resources.js
diff --git a/cli/js2/11_streams.js b/cli/rt/11_streams.js
similarity index 99%
rename from cli/js2/11_streams.js
rename to cli/rt/11_streams.js
index 4bdbfbc5cc1f59..e5a5732e5e5957 100644
--- a/cli/js2/11_streams.js
+++ b/cli/rt/11_streams.js
@@ -9,7 +9,6 @@
 ((window) => {
   /* eslint-disable @typescript-eslint/no-explicit-any,require-await */
 
-  const { AbortSignal } = window.__bootstrap.abortSignal;
   const { cloneValue, setFunctionName } = window.__bootstrap.webUtil;
   const { assert, AssertionError } = window.__bootstrap.util;
   const { customInspect, inspect } = window.__bootstrap.console;
diff --git a/cli/js2/11_timers.js b/cli/rt/11_timers.js
similarity index 100%
rename from cli/js2/11_timers.js
rename to cli/rt/11_timers.js
diff --git a/cli/js2/11_url.js b/cli/rt/11_url.js
similarity index 74%
rename from cli/js2/11_url.js
rename to cli/rt/11_url.js
index 435d3454e7207a..7e01f4d887f5ba 100644
--- a/cli/js2/11_url.js
+++ b/cli/rt/11_url.js
@@ -1,7 +1,6 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 ((window) => {
-  const { build } = window.__bootstrap.build;
   const { getRandomValues } = window.__bootstrap.crypto;
   const { customInspect } = window.__bootstrap.console;
   const { sendSync } = window.__bootstrap.dispatchJson;
@@ -223,7 +222,7 @@
       return this.#params
         .map(
           (tuple) =>
-            `${encodeURIComponent(tuple[0])}=${encodeURIComponent(tuple[1])}`,
+            `${encodeSearchParam(tuple[0])}=${encodeSearchParam(tuple[1])}`,
         )
         .join("&");
     }
@@ -264,74 +263,118 @@
     return [capture, rest];
   }
 
-  function parse(url, isBase = true) {
+  function parse(url, baseParts = null) {
     const parts = {};
     let restUrl;
-    [parts.protocol, restUrl] = takePattern(url.trim(), /^([a-z]+):/);
-    if (isBase && parts.protocol == "") {
-      return undefined;
+    let usedNonBase = false;
+    [parts.protocol, restUrl] = takePattern(
+      url.trim(),
+      /^([A-Za-z][+-.0-9A-Za-z]*):/,
+    );
+    parts.protocol = parts.protocol.toLowerCase();
+    if (parts.protocol == "") {
+      if (baseParts == null) {
+        return null;
+      }
+      parts.protocol = baseParts.protocol;
+    } else if (
+      parts.protocol != baseParts?.protocol ||
+      !specialSchemes.includes(parts.protocol)
+    ) {
+      usedNonBase = true;
     }
     const isSpecial = specialSchemes.includes(parts.protocol);
     if (parts.protocol == "file") {
       parts.slashes = "//";
       parts.username = "";
       parts.password = "";
-      [parts.hostname, restUrl] = takePattern(restUrl, /^[/\\]{2}([^/\\?#]*)/);
-      parts.port = "";
-      if (build.os == "windows" && parts.hostname == "") {
-        // UNC paths. e.g. "\\\\localhost\\foo\\bar" on Windows should be
-        // representable as `new URL("file:////localhost/foo/bar")` which is
-        // equivalent to: `new URL("file://localhost/foo/bar")`.
+      if (usedNonBase || restUrl.match(/^[/\\]{2}/)) {
         [parts.hostname, restUrl] = takePattern(
           restUrl,
-          /^[/\\]{2,}([^/\\?#]*)/,
+          /^[/\\]{2}([^/\\?#]*)/,
         );
+        usedNonBase = true;
+      } else {
+        parts.hostname = baseParts.hostname;
       }
+      parts.port = "";
     } else {
-      let restAuthority;
-      if (isSpecial) {
-        parts.slashes = "//";
-        [restAuthority, restUrl] = takePattern(
-          restUrl,
-          /^[/\\]{2,}([^/\\?#]*)/,
+      if (usedNonBase || restUrl.match(/^[/\\]{2}/)) {
+        let restAuthority;
+        if (isSpecial) {
+          parts.slashes = "//";
+          [restAuthority, restUrl] = takePattern(
+            restUrl,
+            /^[/\\]*([^/\\?#]*)/,
+          );
+        } else {
+          parts.slashes = restUrl.match(/^[/\\]{2}/) ? "//" : "";
+          [restAuthority, restUrl] = takePattern(
+            restUrl,
+            /^[/\\]{2}([^/\\?#]*)/,
+          );
+        }
+        let restAuthentication;
+        [restAuthentication, restAuthority] = takePattern(
+          restAuthority,
+          /^(.*)@/,
+        );
+        [parts.username, restAuthentication] = takePattern(
+          restAuthentication,
+          /^([^:]*)/,
         );
+        parts.username = encodeUserinfo(parts.username);
+        [parts.password] = takePattern(restAuthentication, /^:(.*)/);
+        parts.password = encodeUserinfo(parts.password);
+        [parts.hostname, restAuthority] = takePattern(
+          restAuthority,
+          /^(\[[0-9a-fA-F.:]{2,}\]|[^:]+)/,
+        );
+        [parts.port] = takePattern(restAuthority, /^:(.*)/);
+        if (!isValidPort(parts.port)) {
+          return null;
+        }
+        if (parts.hostname == "" && isSpecial) {
+          return null;
+        }
+        usedNonBase = true;
       } else {
-        parts.slashes = restUrl.match(/^[/\\]{2}/) ? "//" : "";
-        [restAuthority, restUrl] = takePattern(restUrl, /^[/\\]{2}([^/\\?#]*)/);
-      }
-      let restAuthentication;
-      [restAuthentication, restAuthority] = takePattern(
-        restAuthority,
-        /^(.*)@/,
-      );
-      [parts.username, restAuthentication] = takePattern(
-        restAuthentication,
-        /^([^:]*)/,
-      );
-      parts.username = encodeUserinfo(parts.username);
-      [parts.password] = takePattern(restAuthentication, /^:(.*)/);
-      parts.password = encodeUserinfo(parts.password);
-      [parts.hostname, restAuthority] = takePattern(
-        restAuthority,
-        /^(\[[0-9a-fA-F.:]{2,}\]|[^:]+)/,
-      );
-      [parts.port] = takePattern(restAuthority, /^:(.*)/);
-      if (!isValidPort(parts.port)) {
-        return undefined;
-      }
-      if (parts.hostname == "" && isSpecial && isBase) {
-        return undefined;
+        parts.username = baseParts.username;
+        parts.password = baseParts.password;
+        parts.hostname = baseParts.hostname;
+        parts.port = baseParts.port;
       }
     }
     try {
       parts.hostname = encodeHostname(parts.hostname, isSpecial);
     } catch {
-      return undefined;
+      return null;
     }
     [parts.path, restUrl] = takePattern(restUrl, /^([^?#]*)/);
     parts.path = encodePathname(parts.path.replace(/\\/g, "/"));
-    [parts.query, restUrl] = takePattern(restUrl, /^(\?[^#]*)/);
-    parts.query = encodeSearch(parts.query);
+    if (usedNonBase) {
+      parts.path = normalizePath(parts.path, parts.protocol == "file");
+    } else {
+      if (parts.path != "") {
+        usedNonBase = true;
+      }
+      parts.path = resolvePathFromBase(
+        parts.path,
+        baseParts.path || "/",
+        baseParts.protocol == "file",
+      );
+    }
+    // Drop the hostname if a drive letter is parsed.
+    if (parts.protocol == "file" && parts.path.match(/^\/+[A-Za-z]:(\/|$)/)) {
+      parts.hostname = "";
+    }
+    if (usedNonBase || restUrl.startsWith("?")) {
+      [parts.query, restUrl] = takePattern(restUrl, /^(\?[^#]*)/);
+      parts.query = encodeSearch(parts.query, isSpecial);
+      usedNonBase = true;
+    } else {
+      parts.query = baseParts.query;
+    }
     [parts.hash] = takePattern(restUrl, /^(#.*)/);
     parts.hash = encodeHash(parts.hash);
     return parts;
@@ -348,22 +391,26 @@
   // Keep it outside of URL to avoid any attempts of access.
   const blobURLMap = new Map();
 
-  function isAbsolutePath(path) {
-    return path.startsWith("/");
-  }
-
   // Resolves `.`s and `..`s where possible.
   // Preserves repeating and trailing `/`s by design.
-  // On Windows, drive letter paths will be given a leading slash, and also a
-  // trailing slash if there are no other components e.g. "C:" -> "/C:/".
-  function normalizePath(path, isFilePath = false) {
-    if (build.os == "windows" && isFilePath) {
-      path = path.replace(/^\/*([A-Za-z]:)(\/|$)/, "/$1/");
-    }
-    const isAbsolute = isAbsolutePath(path);
+  // Assumes drive letter file paths will have a leading slash.
+  function normalizePath(path, isFilePath) {
+    const isAbsolute = path.startsWith("/");
     path = path.replace(/^\//, "");
     const pathSegments = path.split("/");
 
+    let driveLetter = null;
+    if (isFilePath && pathSegments[0].match(/^[A-Za-z]:$/)) {
+      driveLetter = pathSegments.shift();
+    }
+
+    if (isFilePath && isAbsolute) {
+      while (pathSegments.length > 1 && pathSegments[0] == "") {
+        pathSegments.shift();
+      }
+    }
+
+    let ensureTrailingSlash = false;
     const newPathSegments = [];
     for (let i = 0; i < pathSegments.length; i++) {
       const previous = newPathSegments[newPathSegments.length - 1];
@@ -373,64 +420,67 @@
         (previous != undefined || isAbsolute)
       ) {
         newPathSegments.pop();
-      } else if (pathSegments[i] != ".") {
+        ensureTrailingSlash = true;
+      } else if (pathSegments[i] == ".") {
+        ensureTrailingSlash = true;
+      } else {
         newPathSegments.push(pathSegments[i]);
+        ensureTrailingSlash = false;
       }
     }
+    if (driveLetter != null) {
+      newPathSegments.unshift(driveLetter);
+    }
+    if (newPathSegments.length == 0 && !isAbsolute) {
+      newPathSegments.push(".");
+      ensureTrailingSlash = false;
+    }
 
     let newPath = newPathSegments.join("/");
-    if (!isAbsolute) {
-      if (newPathSegments.length == 0) {
-        newPath = ".";
-      }
-    } else {
+    if (isAbsolute) {
       newPath = `/${newPath}`;
     }
+    if (ensureTrailingSlash) {
+      newPath = newPath.replace(/\/*$/, "/");
+    }
     return newPath;
   }
 
   // Standard URL basing logic, applied to paths.
-  function resolvePathFromBase(
-    path,
-    basePath,
-    isFilePath = false,
-  ) {
-    let normalizedPath = normalizePath(path, isFilePath);
-    let normalizedBasePath = normalizePath(basePath, isFilePath);
-
-    let driveLetterPrefix = "";
-    if (build.os == "windows" && isFilePath) {
-      let driveLetter;
-      let baseDriveLetter;
-      [driveLetter, normalizedPath] = takePattern(
-        normalizedPath,
-        /^(\/[A-Za-z]:)(?=\/)/,
-      );
-      [baseDriveLetter, normalizedBasePath] = takePattern(
-        normalizedBasePath,
-        /^(\/[A-Za-z]:)(?=\/)/,
-      );
-      driveLetterPrefix = driveLetter || baseDriveLetter;
-    }
-
-    if (isAbsolutePath(normalizedPath)) {
-      return `${driveLetterPrefix}${normalizedPath}`;
-    }
-    if (!isAbsolutePath(normalizedBasePath)) {
-      throw new TypeError("Base path must be absolute.");
-    }
-
-    // Special case.
-    if (path == "") {
-      return `${driveLetterPrefix}${normalizedBasePath}`;
+  function resolvePathFromBase(path, basePath, isFilePath) {
+    let basePrefix;
+    let suffix;
+    const baseDriveLetter = basePath.match(/^\/+[A-Za-z]:(?=\/|$)/)?.[0];
+    if (isFilePath && path.match(/^\/+[A-Za-z]:(\/|$)/)) {
+      basePrefix = "";
+      suffix = path;
+    } else if (path.startsWith("/")) {
+      if (isFilePath && baseDriveLetter) {
+        basePrefix = baseDriveLetter;
+        suffix = path;
+      } else {
+        basePrefix = "";
+        suffix = path;
+      }
+    } else if (path != "") {
+      basePath = normalizePath(basePath, isFilePath);
+      path = normalizePath(path, isFilePath);
+      // Remove everything after the last `/` in `basePath`.
+      if (baseDriveLetter && isFilePath) {
+        basePrefix = `${baseDriveLetter}${
+          basePath.slice(baseDriveLetter.length).replace(/[^\/]*$/, "")
+        }`;
+      } else {
+        basePrefix = basePath.replace(/[^\/]*$/, "");
+      }
+      basePrefix = basePrefix.replace(/\/*$/, "/");
+      // If `normalizedPath` ends with `.` or `..`, add a trailing slash.
+      suffix = path.replace(/(?<=(^|\/)(\.|\.\.))$/, "/");
+    } else {
+      basePrefix = basePath;
+      suffix = "";
     }
-
-    // Remove everything after the last `/` in `normalizedBasePath`.
-    const prefix = normalizedBasePath.replace(/[^\/]*$/, "");
-    // If `normalizedPath` ends with `.` or `..`, add a trailing slash.
-    const suffix = normalizedPath.replace(/(?<=(^|\/)(\.|\.\.))$/, "/");
-
-    return `${driveLetterPrefix}${normalizePath(prefix + suffix)}`;
+    return normalizePath(basePrefix + suffix, isFilePath);
   }
 
   function isValidPort(value) {
@@ -610,7 +660,8 @@
     set search(value) {
       value = String(value);
       const query = value == "" || value.charAt(0) == "?" ? value : `?${value}`;
-      parts.get(this).query = encodeSearch(query);
+      const isSpecial = specialSchemes.includes(parts.get(this).protocol);
+      parts.get(this).query = encodeSearch(query, isSpecial);
       this.#updateSearchParams();
     }
 
@@ -628,46 +679,22 @@
     }
 
     constructor(url, base) {
-      let baseParts;
+      let baseParts = null;
+      new.target;
       if (base) {
-        baseParts = typeof base === "string" ? parse(base) : parts.get(base);
-        if (baseParts === undefined) {
+        baseParts = base instanceof URL ? parts.get(base) : parse(base);
+        if (baseParts == null) {
           throw new TypeError("Invalid base URL.");
         }
       }
 
-      const urlParts = typeof url === "string"
-        ? parse(url, !baseParts)
-        : parts.get(url);
-      if (urlParts == undefined) {
-        throw new TypeError("Invalid URL.");
-      }
-
-      if (urlParts.protocol) {
-        urlParts.path = normalizePath(
-          urlParts.path,
-          urlParts.protocol == "file",
-        );
-        parts.set(this, urlParts);
-      } else if (baseParts) {
-        parts.set(this, {
-          protocol: baseParts.protocol,
-          slashes: baseParts.slashes,
-          username: baseParts.username,
-          password: baseParts.password,
-          hostname: baseParts.hostname,
-          port: baseParts.port,
-          path: resolvePathFromBase(
-            urlParts.path,
-            baseParts.path || "/",
-            baseParts.protocol == "file",
-          ),
-          query: urlParts.query,
-          hash: urlParts.hash,
-        });
-      } else {
+      const urlParts = url instanceof URL
+        ? parts.get(url)
+        : parse(url, baseParts);
+      if (urlParts == null) {
         throw new TypeError("Invalid URL.");
       }
+      parts.set(this, urlParts);
 
       this.#updateSearchParams();
     }
@@ -740,9 +767,9 @@
     return (c >= "\u0000" && c <= "\u001F") || c > "\u007E";
   }
 
-  function charInSearchSet(c) {
+  function charInSearchSet(c, isSpecial) {
     // deno-fmt-ignore
-    return charInC0ControlSet(c) || ["\u0020", "\u0022", "\u0023", "\u0027", "\u003C", "\u003E"].includes(c) || c > "\u007E";
+    return charInC0ControlSet(c) || ["\u0020", "\u0022", "\u0023", "\u003C", "\u003E"].includes(c) || isSpecial && c == "\u0027" || c > "\u007E";
   }
 
   function charInFragmentSet(c) {
@@ -766,6 +793,11 @@
     return ["\u0000", "\u0009", "\u000A", "\u000D", "\u0020", "\u0023", "\u0025", "\u002F", "\u003A", "\u003C", "\u003E", "\u003F", "\u0040", "\u005B", "\u005C", "\u005D", "\u005E"].includes(c);
   }
 
+  function charInFormUrlencodedSet(c) {
+    // deno-fmt-ignore
+    return charInUserinfoSet(c) || ["\u0021", "\u0024", "\u0025", "\u0026", "\u0027", "\u0028", "\u0029", "\u002B", "\u002C", "\u007E"].includes(c);
+  }
+
   const encoder = new TextEncoder();
 
   function encodeChar(c) {
@@ -840,8 +872,10 @@
     return [...s].map((c) => (charInPathSet(c) ? encodeChar(c) : c)).join("");
   }
 
-  function encodeSearch(s) {
-    return [...s].map((c) => (charInSearchSet(c) ? encodeChar(c) : c)).join("");
+  function encodeSearch(s, isSpecial) {
+    return [...s].map((
+      c,
+    ) => (charInSearchSet(c, isSpecial) ? encodeChar(c) : c)).join("");
   }
 
   function encodeHash(s) {
@@ -850,6 +884,11 @@
     );
   }
 
+  function encodeSearchParam(s) {
+    return [...s].map((c) => (charInFormUrlencodedSet(c) ? encodeChar(c) : c))
+      .join("").replace(/%20/g, "+");
+  }
+
   window.__bootstrap.url = {
     URL,
     URLSearchParams,
diff --git a/cli/js2/11_workers.js b/cli/rt/11_workers.js
similarity index 100%
rename from cli/js2/11_workers.js
rename to cli/rt/11_workers.js
diff --git a/cli/js2/12_io.js b/cli/rt/12_io.js
similarity index 100%
rename from cli/js2/12_io.js
rename to cli/rt/12_io.js
diff --git a/cli/js2/13_buffer.js b/cli/rt/13_buffer.js
similarity index 100%
rename from cli/js2/13_buffer.js
rename to cli/rt/13_buffer.js
diff --git a/cli/js2/20_blob.js b/cli/rt/20_blob.js
similarity index 99%
rename from cli/js2/20_blob.js
rename to cli/rt/20_blob.js
index 5b0ef349e82854..f7309dafbc93bc 100644
--- a/cli/js2/20_blob.js
+++ b/cli/rt/20_blob.js
@@ -151,7 +151,7 @@
           bytes.set(chunk, offs);
           offs += chunk.byteLength;
         }
-        return bytes;
+        return bytes.buffer;
       } else {
         throw new TypeError("Invalid reader result.");
       }
diff --git a/cli/js2/20_headers.js b/cli/rt/20_headers.js
similarity index 100%
rename from cli/js2/20_headers.js
rename to cli/rt/20_headers.js
diff --git a/cli/js2/20_streams_queuing_strategy.js b/cli/rt/20_streams_queuing_strategy.js
similarity index 100%
rename from cli/js2/20_streams_queuing_strategy.js
rename to cli/rt/20_streams_queuing_strategy.js
diff --git a/cli/js2/21_dom_file.js b/cli/rt/21_dom_file.js
similarity index 100%
rename from cli/js2/21_dom_file.js
rename to cli/rt/21_dom_file.js
diff --git a/cli/rt/21_filereader.js b/cli/rt/21_filereader.js
new file mode 100644
index 00000000000000..ea1ca3e5f541b9
--- /dev/null
+++ b/cli/rt/21_filereader.js
@@ -0,0 +1,264 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+
+((window) => {
+  const base64 = window.__bootstrap.base64;
+  const setTimeout = window.__bootstrap.timers.setTimeout;
+
+  // ProgressEvent could also be used in other DOM progress event emits.
+  // Current use is for FileReader.
+  class ProgressEvent extends Event {
+    constructor(type, eventInitDict = {}) {
+      super(type, eventInitDict);
+
+      this.lengthComputable = eventInitDict?.lengthComputable ?? false;
+      this.loaded = eventInitDict?.loaded ?? 0;
+      this.total = eventInitDict?.total ?? 0;
+    }
+  }
+  window.__bootstrap.progressEvent = {
+    ProgressEvent,
+  };
+
+  async function readOperation(fr, blob, readtype) {
+    // Implementation from https://w3c.github.io/FileAPI/ notes
+    // And body of deno blob.ts readBytes
+
+    fr.aborting = false;
+
+    // 1. If fr’s state is "loading", throw an InvalidStateError DOMException.
+    if (fr.readyState === FileReader.LOADING) {
+      throw new DOMException(
+        "Invalid FileReader state.",
+        "InvalidStateError",
+      );
+    }
+    // 2. Set fr’s state to "loading".
+    fr.readyState = FileReader.LOADING;
+    // 3. Set fr’s result to null.
+    fr.result = null;
+    // 4. Set fr’s error to null.
+    fr.error = null;
+
+    // 5. Let stream be the result of calling get stream on blob.
+    const stream /*: ReadableStream<ArrayBufferView>*/ = blob.stream();
+
+    // 6. Let reader be the result of getting a reader from stream.
+    const reader = stream.getReader();
+
+    // 7. Let bytes be an empty byte sequence.
+    //let bytes = new Uint8Array();
+    const chunks /*: Uint8Array[]*/ = [];
+
+    // 8. Let chunkPromise be the result of reading a chunk from stream with reader.
+    let chunkPromise = reader.read();
+
+    // 9. Let isFirstChunk be true.
+    let isFirstChunk = true;
+
+    // 10 in parallel while true
+    while (!fr.aborting) {
+      // 1. Wait for chunkPromise to be fulfilled or rejected.
+      try {
+        const chunk = await chunkPromise;
+
+        // 2. If chunkPromise is fulfilled, and isFirstChunk is true, queue a task to fire a progress event called loadstart at fr.
+        if (isFirstChunk) {
+          setTimeout(() => {
+            // fire a progress event for loadstart
+            const ev = new ProgressEvent("loadstart", {});
+            fr.dispatchEvent(ev);
+            if (fr.onloadstart !== null) {
+              fr.onloadstart(ev);
+            }
+          }, 0);
+        }
+        // 3. Set isFirstChunk to false.
+        isFirstChunk = false;
+
+        // 4. If chunkPromise is fulfilled with an object whose done property is false
+        // and whose value property is a Uint8Array object, run these steps:
+        if (!chunk.done && chunk.value instanceof Uint8Array) {
+          chunks.push(chunk.value);
+
+          // TODO: (only) If roughly 50ms have passed since last progress
+          {
+            const size = chunks.reduce((p, i) => p + i.byteLength, 0);
+            const ev = new ProgressEvent("progress", {
+              loaded: size,
+            });
+            fr.dispatchEvent(ev);
+            if (fr.onprogress !== null) {
+              fr.onprogress(ev);
+            }
+          }
+
+          chunkPromise = reader.read();
+        } // 5 Otherwise, if chunkPromise is fulfilled with an object whose done property is true, queue a task to run the following steps and abort this algorithm:
+        else if (chunk.done === true) {
+          setTimeout(() => {
+            if (fr.aborting) {
+              return;
+            }
+
+            // 1. Set fr’s state to "done".
+            fr.readyState = FileReader.DONE;
+            // 2. Let result be the result of package data given bytes, type, blob’s type, and encodingName.
+            const size = chunks.reduce((p, i) => p + i.byteLength, 0);
+            const bytes = new Uint8Array(size);
+            let offs = 0;
+            for (const chunk of chunks) {
+              bytes.set(chunk, offs);
+              offs += chunk.byteLength;
+            }
+            switch (readtype.kind) {
+              case "ArrayBuffer": {
+                fr.result = bytes.buffer;
+                break;
+              }
+              case "Text": {
+                const decoder = new TextDecoder(readtype.encoding);
+                fr.result = decoder.decode(bytes.buffer);
+                break;
+              }
+              case "DataUrl": {
+                fr.result = "data:application/octet-stream;base64," +
+                  base64.fromByteArray(bytes);
+                break;
+              }
+            }
+            // 4.2 Fire a progress event called load at the fr.
+            {
+              const ev = new ProgressEvent("load", {
+                lengthComputable: true,
+                loaded: size,
+                total: size,
+              });
+              fr.dispatchEvent(ev);
+              if (fr.onload !== null) {
+                fr.onload(ev);
+              }
+            }
+
+            // 5. If fr’s state is not "loading", fire a progress event called loadend at the fr.
+            //Note: Event handler for the load or error events could have started another load, if that happens the loadend event for this load is not fired.
+            if (fr.readyState !== FileReader.LOADING) {
+              const ev = new ProgressEvent("loadend", {
+                lengthComputable: true,
+                loaded: size,
+                total: size,
+              });
+              fr.dispatchEvent(ev);
+              if (fr.onloadend !== null) {
+                fr.onloadend(ev);
+              }
+            }
+          }, 0);
+
+          break;
+        }
+      } catch (err) {
+        if (fr.aborting) {
+          break;
+        }
+
+        // chunkPromise rejected
+        fr.readyState = FileReader.DONE;
+        fr.error = err;
+
+        {
+          const ev = new ProgressEvent("error", {});
+          fr.dispatchEvent(ev);
+          if (fr.onerror !== null) {
+            fr.onerror(ev);
+          }
+        }
+
+        //If fr’s state is not "loading", fire a progress event called loadend at fr.
+        //Note: Event handler for the error event could have started another load, if that happens the loadend event for this load is not fired.
+        if (fr.readyState !== FileReader.LOADING) {
+          const ev = new ProgressEvent("loadend", {});
+          fr.dispatchEvent(ev);
+          if (fr.onloadend !== null) {
+            fr.onloadend(ev);
+          }
+        }
+
+        break;
+      }
+    }
+  }
+
+  class FileReader extends EventTarget {
+    error = null;
+    onabort = null;
+    onerror = null;
+    onload = null;
+    onloadend = null;
+    onloadstart = null;
+    onprogress = null;
+
+    readyState = FileReader.EMPTY;
+    result = null;
+    aborting = false;
+
+    constructor() {
+      super();
+    }
+
+    abort() {
+      // If context object's state is "empty" or if context object's state is "done" set context object's result to null and terminate this algorithm.
+      if (
+        this.readyState === FileReader.EMPTY ||
+        this.readyState === FileReader.DONE
+      ) {
+        this.result = null;
+        return;
+      }
+      // If context object's state is "loading" set context object's state to "done" and set context object's result to null.
+      if (this.readyState === FileReader.LOADING) {
+        this.readyState = FileReader.DONE;
+        this.result = null;
+      }
+      // If there are any tasks from the context object on the file reading task source in an affiliated task queue, then remove those tasks from that task queue.
+      // Terminate the algorithm for the read method being processed.
+      this.aborting = true;
+
+      // Fire a progress event called abort at the context object.
+      const ev = new ProgressEvent("abort", {});
+      this.dispatchEvent(ev);
+      if (this.onabort !== null) {
+        this.onabort(ev);
+      }
+
+      // If context object's state is not "loading", fire a progress event called loadend at the context object.
+      if (this.readyState !== FileReader.LOADING) {
+        const ev = new ProgressEvent("loadend", {});
+        this.dispatchEvent(ev);
+        if (this.onloadend !== null) {
+          this.onloadend(ev);
+        }
+      }
+    }
+    readAsArrayBuffer(blob) {
+      readOperation(this, blob, { kind: "ArrayBuffer" });
+    }
+    readAsBinaryString(blob) {
+      // alias for readAsArrayBuffer
+      readOperation(this, blob, { kind: "ArrayBuffer" });
+    }
+    readAsDataURL(blob) {
+      readOperation(this, blob, { kind: "DataUrl" });
+    }
+    readAsText(blob, encoding) {
+      readOperation(this, blob, { kind: "Text", encoding });
+    }
+  }
+
+  FileReader.EMPTY = 0;
+  FileReader.LOADING = 1;
+  FileReader.DONE = 2;
+
+  window.__bootstrap.fileReader = {
+    FileReader,
+  };
+})(this);
diff --git a/cli/js2/22_form_data.js b/cli/rt/22_form_data.js
similarity index 100%
rename from cli/js2/22_form_data.js
rename to cli/rt/22_form_data.js
diff --git a/cli/js2/23_multipart.js b/cli/rt/23_multipart.js
similarity index 100%
rename from cli/js2/23_multipart.js
rename to cli/rt/23_multipart.js
diff --git a/cli/js2/24_body.js b/cli/rt/24_body.js
similarity index 81%
rename from cli/js2/24_body.js
rename to cli/rt/24_body.js
index ebd0ddc6df54a2..a3348907b9a935 100644
--- a/cli/js2/24_body.js
+++ b/cli/rt/24_body.js
@@ -66,6 +66,32 @@
     return buffer.bytes().buffer;
   }
 
+  function bodyToArrayBuffer(bodySource) {
+    if (isTypedArray(bodySource)) {
+      return bodySource.buffer;
+    } else if (bodySource instanceof ArrayBuffer) {
+      return bodySource;
+    } else if (typeof bodySource === "string") {
+      const enc = new TextEncoder();
+      return enc.encode(bodySource).buffer;
+    } else if (bodySource instanceof ReadableStream) {
+      throw new Error(
+        `Can't convert stream to ArrayBuffer (try bufferFromStream)`,
+      );
+    } else if (
+      bodySource instanceof FormData ||
+      bodySource instanceof URLSearchParams
+    ) {
+      const enc = new TextEncoder();
+      return enc.encode(bodySource.toString()).buffer;
+    } else if (!bodySource) {
+      return null;
+    }
+    throw new Error(
+      `Body type not implemented: ${bodySource.constructor.name}`,
+    );
+  }
+
   const BodyUsedError =
     "Failed to execute 'clone' on 'Body': body is already used";
 
@@ -86,18 +112,26 @@
         return this._stream;
       }
 
-      if (this._bodySource instanceof ReadableStream) {
+      if (!this._bodySource) {
+        return null;
+      } else if (this._bodySource instanceof ReadableStream) {
         this._stream = this._bodySource;
-      }
-      if (typeof this._bodySource === "string") {
-        const bodySource = this._bodySource;
+      } else {
+        const buf = bodyToArrayBuffer(this._bodySource);
+        if (!(buf instanceof ArrayBuffer)) {
+          throw new Error(
+            `Expected ArrayBuffer from body`,
+          );
+        }
+
         this._stream = new ReadableStream({
           start(controller) {
-            controller.enqueue(bodySource);
+            controller.enqueue(buf);
             controller.close();
           },
         });
       }
+
       return this._stream;
     }
 
@@ -172,31 +206,10 @@
     }
 
     arrayBuffer() {
-      if (isTypedArray(this._bodySource)) {
-        return Promise.resolve(this._bodySource.buffer);
-      } else if (this._bodySource instanceof ArrayBuffer) {
-        return Promise.resolve(this._bodySource);
-      } else if (typeof this._bodySource === "string") {
-        const enc = new TextEncoder();
-        return Promise.resolve(
-          enc.encode(this._bodySource).buffer,
-        );
-      } else if (this._bodySource instanceof ReadableStream) {
+      if (this._bodySource instanceof ReadableStream) {
         return bufferFromStream(this._bodySource.getReader(), this.#size);
-      } else if (
-        this._bodySource instanceof FormData ||
-        this._bodySource instanceof URLSearchParams
-      ) {
-        const enc = new TextEncoder();
-        return Promise.resolve(
-          enc.encode(this._bodySource.toString()).buffer,
-        );
-      } else if (!this._bodySource) {
-        return Promise.resolve(new ArrayBuffer(0));
       }
-      throw new Error(
-        `Body type not yet implemented: ${this._bodySource.constructor.name}`,
-      );
+      return bodyToArrayBuffer(this._bodySource);
     }
   }
 
diff --git a/cli/js2/25_request.js b/cli/rt/25_request.js
similarity index 100%
rename from cli/js2/25_request.js
rename to cli/rt/25_request.js
diff --git a/cli/js2/26_fetch.js b/cli/rt/26_fetch.js
similarity index 93%
rename from cli/js2/26_fetch.js
rename to cli/rt/26_fetch.js
index 2aee7c457f27f0..9e34aa8d8f73e1 100644
--- a/cli/js2/26_fetch.js
+++ b/cli/rt/26_fetch.js
@@ -6,16 +6,30 @@
   const { Blob, bytesSymbol: blobBytesSymbol } = window.__bootstrap.blob;
   const { read } = window.__bootstrap.io;
   const { close } = window.__bootstrap.resources;
-  const { sendAsync } = window.__bootstrap.dispatchJson;
+  const { sendSync, sendAsync } = window.__bootstrap.dispatchJson;
   const Body = window.__bootstrap.body;
   const { ReadableStream } = window.__bootstrap.streams;
   const { MultipartBuilder } = window.__bootstrap.multipart;
   const { Headers } = window.__bootstrap.headers;
 
-  function opFetch(
-    args,
-    body,
-  ) {
+  function createHttpClient(options) {
+    return new HttpClient(opCreateHttpClient(options));
+  }
+
+  function opCreateHttpClient(args) {
+    return sendSync("op_create_http_client", args);
+  }
+
+  class HttpClient {
+    constructor(rid) {
+      this.rid = rid;
+    }
+    close() {
+      close(this.rid);
+    }
+  }
+
+  function opFetch(args, body) {
     let zeroCopy;
     if (body != null) {
       zeroCopy = new Uint8Array(body.buffer, body.byteOffset, body.byteLength);
@@ -169,12 +183,7 @@
     }
   }
 
-  function sendFetchReq(
-    url,
-    method,
-    headers,
-    body,
-  ) {
+  function sendFetchReq(url, method, headers, body, clientRid) {
     let headerArray = [];
     if (headers) {
       headerArray = Array.from(headers.entries());
@@ -184,19 +193,18 @@
       method,
       url,
       headers: headerArray,
+      clientRid,
     };
 
     return opFetch(args, body);
   }
 
-  async function fetch(
-    input,
-    init,
-  ) {
+  async function fetch(input, init) {
     let url;
     let method = null;
     let headers = null;
     let body;
+    let clientRid = null;
     let redirected = false;
     let remRedirectCount = 20; // TODO: use a better way to handle
 
@@ -250,6 +258,10 @@
             headers.set("content-type", contentType);
           }
         }
+
+        if (init.client instanceof HttpClient) {
+          clientRid = init.client.rid;
+        }
       }
     } else {
       url = input.url;
@@ -264,7 +276,13 @@
     let responseBody;
     let responseInit = {};
     while (remRedirectCount) {
-      const fetchResponse = await sendFetchReq(url, method, headers, body);
+      const fetchResponse = await sendFetchReq(
+        url,
+        method,
+        headers,
+        body,
+        clientRid,
+      );
 
       if (
         NULL_BODY_STATUS.includes(fetchResponse.status) ||
@@ -366,5 +384,7 @@
   window.__bootstrap.fetch = {
     fetch,
     Response,
+    HttpClient,
+    createHttpClient,
   };
 })(this);
diff --git a/cli/js2/30_files.js b/cli/rt/30_files.js
similarity index 90%
rename from cli/js2/30_files.js
rename to cli/rt/30_files.js
index 0b6d9c67f5aae6..fe44727c28b931 100644
--- a/cli/js2/30_files.js
+++ b/cli/rt/30_files.js
@@ -22,25 +22,17 @@
     return sendAsync("op_seek", { rid, offset, whence });
   }
 
-  function opOpenSync(path, options) {
-    const mode = options?.mode;
-    return sendSync("op_open", { path: pathFromURL(path), options, mode });
-  }
-
-  function opOpen(
-    path,
-    options,
-  ) {
-    const mode = options?.mode;
-    return sendAsync("op_open", { path: pathFromURL(path), options, mode });
-  }
-
   function openSync(
     path,
     options = { read: true },
   ) {
     checkOpenOptions(options);
-    const rid = opOpenSync(path, options);
+    const mode = options?.mode;
+    const rid = sendSync(
+      "op_open_sync",
+      { path: pathFromURL(path), options, mode },
+    );
+
     return new File(rid);
   }
 
@@ -49,7 +41,12 @@
     options = { read: true },
   ) {
     checkOpenOptions(options);
-    const rid = await opOpen(path, options);
+    const mode = options?.mode;
+    const rid = await sendAsync(
+      "op_open_async",
+      { path: pathFromURL(path), options, mode },
+    );
+
     return new File(rid);
   }
 
diff --git a/cli/js2/30_fs.js b/cli/rt/30_fs.js
similarity index 100%
rename from cli/js2/30_fs.js
rename to cli/rt/30_fs.js
diff --git a/cli/js2/30_metrics.js b/cli/rt/30_metrics.js
similarity index 100%
rename from cli/js2/30_metrics.js
rename to cli/rt/30_metrics.js
diff --git a/cli/js2/30_net.js b/cli/rt/30_net.js
similarity index 100%
rename from cli/js2/30_net.js
rename to cli/rt/30_net.js
diff --git a/cli/js2/30_os.js b/cli/rt/30_os.js
similarity index 100%
rename from cli/js2/30_os.js
rename to cli/rt/30_os.js
diff --git a/cli/js2/40_compiler_api.js b/cli/rt/40_compiler_api.js
similarity index 100%
rename from cli/js2/40_compiler_api.js
rename to cli/rt/40_compiler_api.js
diff --git a/cli/js2/40_diagnostics.js b/cli/rt/40_diagnostics.js
similarity index 100%
rename from cli/js2/40_diagnostics.js
rename to cli/rt/40_diagnostics.js
diff --git a/cli/js2/40_error_stack.js b/cli/rt/40_error_stack.js
similarity index 100%
rename from cli/js2/40_error_stack.js
rename to cli/rt/40_error_stack.js
diff --git a/cli/js2/40_fs_events.js b/cli/rt/40_fs_events.js
similarity index 71%
rename from cli/js2/40_fs_events.js
rename to cli/rt/40_fs_events.js
index ad1fd678fb4171..b9121c15570005 100644
--- a/cli/js2/40_fs_events.js
+++ b/cli/rt/40_fs_events.js
@@ -2,6 +2,7 @@
 
 ((window) => {
   const { sendSync, sendAsync } = window.__bootstrap.dispatchJson;
+  const { errors } = window.__bootstrap.errors;
   const { close } = window.__bootstrap.resources;
 
   class FsWatcher {
@@ -16,10 +17,17 @@
       return this.#rid;
     }
 
-    next() {
-      return sendAsync("op_fs_events_poll", {
-        rid: this.rid,
-      });
+    async next() {
+      try {
+        return await sendAsync("op_fs_events_poll", {
+          rid: this.rid,
+        });
+      } catch (error) {
+        if (error instanceof errors.BadResource) {
+          return { value: undefined, done: true };
+        }
+        throw error;
+      }
     }
 
     return(value) {
diff --git a/cli/js2/40_net_unstable.js b/cli/rt/40_net_unstable.js
similarity index 100%
rename from cli/js2/40_net_unstable.js
rename to cli/rt/40_net_unstable.js
diff --git a/cli/js2/40_performance.js b/cli/rt/40_performance.js
similarity index 100%
rename from cli/js2/40_performance.js
rename to cli/rt/40_performance.js
diff --git a/cli/js2/40_permissions.js b/cli/rt/40_permissions.js
similarity index 100%
rename from cli/js2/40_permissions.js
rename to cli/rt/40_permissions.js
diff --git a/cli/js2/40_plugins.js b/cli/rt/40_plugins.js
similarity index 100%
rename from cli/js2/40_plugins.js
rename to cli/rt/40_plugins.js
diff --git a/cli/js2/40_process.js b/cli/rt/40_process.js
similarity index 95%
rename from cli/js2/40_process.js
rename to cli/rt/40_process.js
index 97744a600a4202..0e81b8b0f1e388 100644
--- a/cli/js2/40_process.js
+++ b/cli/rt/40_process.js
@@ -5,7 +5,7 @@
   const { close } = window.__bootstrap.resources;
   const { readAll } = window.__bootstrap.buffer;
   const { sendSync, sendAsync } = window.__bootstrap.dispatchJson;
-  const { assert } = window.__bootstrap.util;
+  const { assert, pathFromURL } = window.__bootstrap.util;
 
   function opKill(pid, signo) {
     sendSync("op_kill", { pid, signo });
@@ -98,6 +98,9 @@
     stderr = "inherit",
     stdin = "inherit",
   }) {
+    if (cmd[0] != null) {
+      cmd[0] = pathFromURL(cmd[0]);
+    }
     const res = opRun({
       cmd: cmd.map(String),
       cwd,
diff --git a/cli/js2/40_read_file.js b/cli/rt/40_read_file.js
similarity index 100%
rename from cli/js2/40_read_file.js
rename to cli/rt/40_read_file.js
diff --git a/cli/js2/40_repl.js b/cli/rt/40_repl.js
similarity index 100%
rename from cli/js2/40_repl.js
rename to cli/rt/40_repl.js
diff --git a/cli/js2/40_signals.js b/cli/rt/40_signals.js
similarity index 100%
rename from cli/js2/40_signals.js
rename to cli/rt/40_signals.js
diff --git a/cli/js2/40_testing.js b/cli/rt/40_testing.js
similarity index 100%
rename from cli/js2/40_testing.js
rename to cli/rt/40_testing.js
diff --git a/cli/js2/40_tls.js b/cli/rt/40_tls.js
similarity index 100%
rename from cli/js2/40_tls.js
rename to cli/rt/40_tls.js
diff --git a/cli/js2/40_tty.js b/cli/rt/40_tty.js
similarity index 100%
rename from cli/js2/40_tty.js
rename to cli/rt/40_tty.js
diff --git a/cli/js2/40_write_file.js b/cli/rt/40_write_file.js
similarity index 100%
rename from cli/js2/40_write_file.js
rename to cli/rt/40_write_file.js
diff --git a/cli/rt/90_deno_ns.js b/cli/rt/90_deno_ns.js
new file mode 100644
index 00000000000000..ac22410f62a09c
--- /dev/null
+++ b/cli/rt/90_deno_ns.js
@@ -0,0 +1,131 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+
+__bootstrap.denoNs = {
+  test: __bootstrap.testing.test,
+  metrics: __bootstrap.metrics.metrics,
+  Process: __bootstrap.process.Process,
+  run: __bootstrap.process.run,
+  isatty: __bootstrap.tty.isatty,
+  writeFileSync: __bootstrap.writeFile.writeFileSync,
+  writeFile: __bootstrap.writeFile.writeFile,
+  writeTextFileSync: __bootstrap.writeFile.writeTextFileSync,
+  writeTextFile: __bootstrap.writeFile.writeTextFile,
+  readTextFile: __bootstrap.readFile.readTextFile,
+  readTextFileSync: __bootstrap.readFile.readTextFileSync,
+  readFile: __bootstrap.readFile.readFile,
+  readFileSync: __bootstrap.readFile.readFileSync,
+  watchFs: __bootstrap.fsEvents.watchFs,
+  chmodSync: __bootstrap.fs.chmodSync,
+  chmod: __bootstrap.fs.chmod,
+  chown: __bootstrap.fs.chown,
+  chownSync: __bootstrap.fs.chownSync,
+  copyFileSync: __bootstrap.fs.copyFileSync,
+  cwd: __bootstrap.fs.cwd,
+  makeTempDirSync: __bootstrap.fs.makeTempDirSync,
+  makeTempDir: __bootstrap.fs.makeTempDir,
+  makeTempFileSync: __bootstrap.fs.makeTempFileSync,
+  makeTempFile: __bootstrap.fs.makeTempFile,
+  mkdirSync: __bootstrap.fs.mkdirSync,
+  mkdir: __bootstrap.fs.mkdir,
+  chdir: __bootstrap.fs.chdir,
+  copyFile: __bootstrap.fs.copyFile,
+  readDirSync: __bootstrap.fs.readDirSync,
+  readDir: __bootstrap.fs.readDir,
+  readLinkSync: __bootstrap.fs.readLinkSync,
+  readLink: __bootstrap.fs.readLink,
+  realPathSync: __bootstrap.fs.realPathSync,
+  realPath: __bootstrap.fs.realPath,
+  removeSync: __bootstrap.fs.removeSync,
+  remove: __bootstrap.fs.remove,
+  renameSync: __bootstrap.fs.renameSync,
+  rename: __bootstrap.fs.rename,
+  version: __bootstrap.version.version,
+  build: __bootstrap.build.build,
+  statSync: __bootstrap.fs.statSync,
+  lstatSync: __bootstrap.fs.lstatSync,
+  stat: __bootstrap.fs.stat,
+  lstat: __bootstrap.fs.lstat,
+  truncateSync: __bootstrap.fs.truncateSync,
+  truncate: __bootstrap.fs.truncate,
+  errors: __bootstrap.errors.errors,
+  customInspect: __bootstrap.console.customInspect,
+  inspect: __bootstrap.console.inspect,
+  env: __bootstrap.os.env,
+  exit: __bootstrap.os.exit,
+  execPath: __bootstrap.os.execPath,
+  resources: __bootstrap.resources.resources,
+  close: __bootstrap.resources.close,
+  Buffer: __bootstrap.buffer.Buffer,
+  readAll: __bootstrap.buffer.readAll,
+  readAllSync: __bootstrap.buffer.readAllSync,
+  writeAll: __bootstrap.buffer.writeAll,
+  writeAllSync: __bootstrap.buffer.writeAllSync,
+  copy: __bootstrap.io.copy,
+  iter: __bootstrap.io.iter,
+  iterSync: __bootstrap.io.iterSync,
+  SeekMode: __bootstrap.io.SeekMode,
+  read: __bootstrap.io.read,
+  readSync: __bootstrap.io.readSync,
+  write: __bootstrap.io.write,
+  writeSync: __bootstrap.io.writeSync,
+  File: __bootstrap.files.File,
+  open: __bootstrap.files.open,
+  openSync: __bootstrap.files.openSync,
+  create: __bootstrap.files.create,
+  createSync: __bootstrap.files.createSync,
+  stdin: __bootstrap.files.stdin,
+  stdout: __bootstrap.files.stdout,
+  stderr: __bootstrap.files.stderr,
+  seek: __bootstrap.files.seek,
+  seekSync: __bootstrap.files.seekSync,
+  connect: __bootstrap.net.connect,
+  listen: __bootstrap.net.listen,
+  connectTls: __bootstrap.tls.connectTls,
+  listenTls: __bootstrap.tls.listenTls,
+};
+
+__bootstrap.denoNsUnstable = {
+  signal: __bootstrap.signals.signal,
+  signals: __bootstrap.signals.signals,
+  Signal: __bootstrap.signals.Signal,
+  SignalStream: __bootstrap.signals.SignalStream,
+  transpileOnly: __bootstrap.compilerApi.transpileOnly,
+  compile: __bootstrap.compilerApi.compile,
+  bundle: __bootstrap.compilerApi.bundle,
+  permissions: __bootstrap.permissions.permissions,
+  Permissions: __bootstrap.permissions.Permissions,
+  PermissionStatus: __bootstrap.permissions.PermissionStatus,
+  openPlugin: __bootstrap.plugins.openPlugin,
+  kill: __bootstrap.process.kill,
+  setRaw: __bootstrap.tty.setRaw,
+  consoleSize: __bootstrap.tty.consoleSize,
+  DiagnosticCategory: __bootstrap.diagnostics.DiagnosticCategory,
+  loadavg: __bootstrap.os.loadavg,
+  hostname: __bootstrap.os.hostname,
+  osRelease: __bootstrap.os.osRelease,
+  applySourceMap: __bootstrap.errorStack.opApplySourceMap,
+  formatDiagnostics: __bootstrap.errorStack.opFormatDiagnostics,
+  shutdown: __bootstrap.net.shutdown,
+  ShutdownMode: __bootstrap.net.ShutdownMode,
+  listen: __bootstrap.netUnstable.listen,
+  connect: __bootstrap.netUnstable.connect,
+  listenDatagram: __bootstrap.netUnstable.listenDatagram,
+  startTls: __bootstrap.tls.startTls,
+  fstatSync: __bootstrap.fs.fstatSync,
+  fstat: __bootstrap.fs.fstat,
+  ftruncateSync: __bootstrap.fs.ftruncateSync,
+  ftruncate: __bootstrap.fs.ftruncate,
+  umask: __bootstrap.fs.umask,
+  link: __bootstrap.fs.link,
+  linkSync: __bootstrap.fs.linkSync,
+  utime: __bootstrap.fs.utime,
+  utimeSync: __bootstrap.fs.utimeSync,
+  symlink: __bootstrap.fs.symlink,
+  symlinkSync: __bootstrap.fs.symlinkSync,
+  fdatasyncSync: __bootstrap.fs.fdatasyncSync,
+  fdatasync: __bootstrap.fs.fdatasync,
+  fsyncSync: __bootstrap.fs.fsyncSync,
+  fsync: __bootstrap.fs.fsync,
+  HttpClient: __bootstrap.fetch.HttpClient,
+  createHttpClient: __bootstrap.fetch.createHttpClient,
+};
diff --git a/cli/js2/99_main.js b/cli/rt/99_main.js
similarity index 88%
rename from cli/js2/99_main.js
rename to cli/rt/99_main.js
index 325881b5ad205d..18cc1d2513ece5 100644
--- a/cli/js2/99_main.js
+++ b/cli/rt/99_main.js
@@ -20,7 +20,6 @@ delete Object.prototype.__proto__;
   const worker = window.__bootstrap.worker;
   const signals = window.__bootstrap.signals;
   const { internalSymbol, internalObject } = window.__bootstrap.internals;
-  const abortSignal = window.__bootstrap.abortSignal;
   const performance = window.__bootstrap.performance;
   const crypto = window.__bootstrap.crypto;
   const url = window.__bootstrap.url;
@@ -29,11 +28,14 @@ delete Object.prototype.__proto__;
   const streams = window.__bootstrap.streams;
   const blob = window.__bootstrap.blob;
   const domFile = window.__bootstrap.domFile;
+  const progressEvent = window.__bootstrap.progressEvent;
+  const fileReader = window.__bootstrap.fileReader;
   const formData = window.__bootstrap.formData;
   const request = window.__bootstrap.request;
   const fetch = window.__bootstrap.fetch;
   const denoNs = window.__bootstrap.denoNs;
   const denoNsUnstable = window.__bootstrap.denoNsUnstable;
+  const errors = window.__bootstrap.errors.errors;
 
   let windowIsClosing = false;
 
@@ -175,6 +177,30 @@ delete Object.prototype.__proto__;
     return s;
   }
 
+  function registerErrors() {
+    core.registerErrorClass("NotFound", errors.NotFound);
+    core.registerErrorClass("PermissionDenied", errors.PermissionDenied);
+    core.registerErrorClass("ConnectionRefused", errors.ConnectionRefused);
+    core.registerErrorClass("ConnectionReset", errors.ConnectionReset);
+    core.registerErrorClass("ConnectionAborted", errors.ConnectionAborted);
+    core.registerErrorClass("NotConnected", errors.NotConnected);
+    core.registerErrorClass("AddrInUse", errors.AddrInUse);
+    core.registerErrorClass("AddrNotAvailable", errors.AddrNotAvailable);
+    core.registerErrorClass("BrokenPipe", errors.BrokenPipe);
+    core.registerErrorClass("AlreadyExists", errors.AlreadyExists);
+    core.registerErrorClass("InvalidData", errors.InvalidData);
+    core.registerErrorClass("TimedOut", errors.TimedOut);
+    core.registerErrorClass("Interrupted", errors.Interrupted);
+    core.registerErrorClass("WriteZero", errors.WriteZero);
+    core.registerErrorClass("UnexpectedEof", errors.UnexpectedEof);
+    core.registerErrorClass("BadResource", errors.BadResource);
+    core.registerErrorClass("Http", errors.Http);
+    core.registerErrorClass("URIError", URIError);
+    core.registerErrorClass("TypeError", TypeError);
+    core.registerErrorClass("Other", Error);
+    core.registerErrorClass("Busy", errors.Busy);
+  }
+
   // https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope
   const windowOrWorkerGlobalScopeMethods = {
     atob: util.writable(atob),
@@ -190,8 +216,6 @@ delete Object.prototype.__proto__;
   // Other properties shared between WindowScope and WorkerGlobalScope
   const windowOrWorkerGlobalScopeProperties = {
     console: util.writable(new Console(core.print)),
-    AbortController: util.nonEnumerable(abortSignal.AbortController),
-    AbortSignal: util.nonEnumerable(abortSignal.AbortSignal),
     Blob: util.nonEnumerable(blob.Blob),
     ByteLengthQueuingStrategy: util.nonEnumerable(
       queuingStrategy.ByteLengthQueuingStrategy,
@@ -201,6 +225,7 @@ delete Object.prototype.__proto__;
     ),
     crypto: util.readOnly(crypto),
     File: util.nonEnumerable(domFile.DomFile),
+    FileReader: util.nonEnumerable(fileReader.FileReader),
     CustomEvent: util.nonEnumerable(CustomEvent),
     DOMException: util.nonEnumerable(DOMException),
     ErrorEvent: util.nonEnumerable(ErrorEvent),
@@ -216,6 +241,7 @@ delete Object.prototype.__proto__;
     PerformanceEntry: util.nonEnumerable(performance.PerformanceEntry),
     PerformanceMark: util.nonEnumerable(performance.PerformanceMark),
     PerformanceMeasure: util.nonEnumerable(performance.PerformanceMeasure),
+    ProgressEvent: util.nonEnumerable(progressEvent.ProgressEvent),
     TextDecoder: util.nonEnumerable(TextDecoder),
     TextEncoder: util.nonEnumerable(TextEncoder),
     TransformStream: util.nonEnumerable(streams.TransformStream),
@@ -290,6 +316,8 @@ delete Object.prototype.__proto__;
     const { args, cwd, noColor, pid, ppid, repl, unstableFlag } =
       runtimeStart();
 
+    registerErrors();
+
     const finalDenoNs = {
       core,
       internal: internalSymbol,
@@ -301,14 +329,10 @@ delete Object.prototype.__proto__;
       ppid: util.readOnly(ppid),
       noColor: util.readOnly(noColor),
       args: util.readOnly(Object.freeze(args)),
+      mainModule: util.getterOnly(opMainModule),
     });
 
     if (unstableFlag) {
-      Object.defineProperty(
-        finalDenoNs,
-        "mainModule",
-        util.getterOnly(opMainModule),
-      );
       Object.assign(finalDenoNs, denoNsUnstable);
     }
 
@@ -347,6 +371,8 @@ delete Object.prototype.__proto__;
       internalName ?? name,
     );
 
+    registerErrors();
+
     const finalDenoNs = {
       core,
       internal: internalSymbol,
diff --git a/cli/js2/README.md b/cli/rt/README.md
similarity index 99%
rename from cli/js2/README.md
rename to cli/rt/README.md
index 24f86249de1c6e..f73163df21e395 100644
--- a/cli/js2/README.md
+++ b/cli/rt/README.md
@@ -1,4 +1,4 @@
-# js2
+# Runtime JavaScript Code
 
 This directory contains Deno runtime code written in plain JavaScript.
 
diff --git a/cli/state.rs b/cli/state.rs
index f04b577b42d8b8..055c09916e080c 100644
--- a/cli/state.rs
+++ b/cli/state.rs
@@ -6,79 +6,166 @@ use crate::http_util::create_http_client;
 use crate::import_map::ImportMap;
 use crate::metrics::Metrics;
 use crate::op_error::OpError;
+use crate::ops::serialize_result;
 use crate::ops::JsonOp;
-use crate::ops::JsonOpDispatcher;
 use crate::ops::MinimalOp;
 use crate::permissions::Permissions;
 use crate::tsc::TargetLib;
 use crate::web_worker::WebWorkerHandle;
 use deno_core::Buf;
+use deno_core::BufVec;
+use deno_core::CoreIsolateState;
 use deno_core::ErrBox;
 use deno_core::ModuleLoadId;
 use deno_core::ModuleLoader;
 use deno_core::ModuleSpecifier;
 use deno_core::Op;
-use deno_core::OpDispatcher;
+use deno_core::ResourceTable;
 use deno_core::ZeroCopyBuf;
 use futures::future::FutureExt;
 use futures::Future;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 use serde_json::Value;
+use std::cell::Cell;
 use std::cell::RefCell;
 use std::collections::HashMap;
-use std::ops::Deref;
 use std::path::Path;
 use std::pin::Pin;
 use std::rc::Rc;
 use std::str;
+use std::sync::Arc;
 use std::thread::JoinHandle;
 use std::time::Instant;
 
-#[derive(Clone)]
-pub struct State(Rc<RefCell<StateInner>>);
-
-impl Deref for State {
-  type Target = Rc<RefCell<StateInner>>;
-  fn deref(&self) -> &Self::Target {
-    &self.0
-  }
-}
-
 #[cfg_attr(feature = "cargo-clippy", allow(stutter))]
-pub struct StateInner {
-  pub global_state: GlobalState,
-  pub permissions: Permissions,
+pub struct State {
+  pub global_state: Arc<GlobalState>,
+  pub permissions: RefCell<Permissions>,
   pub main_module: ModuleSpecifier,
   /// When flags contains a `.import_map_path` option, the content of the
   /// import map file will be resolved and set.
   pub import_map: Option<ImportMap>,
-  pub metrics: Metrics,
-  pub global_timer: GlobalTimer,
-  pub workers: HashMap<u32, (JoinHandle<()>, WebWorkerHandle)>,
-  pub next_worker_id: u32,
+  pub metrics: RefCell<Metrics>,
+  pub global_timer: RefCell<GlobalTimer>,
+  pub workers: RefCell<HashMap<u32, (JoinHandle<()>, WebWorkerHandle)>>,
+  pub next_worker_id: Cell<u32>,
   pub start_time: Instant,
-  pub seeded_rng: Option<StdRng>,
+  pub seeded_rng: Option<RefCell<StdRng>>,
   pub target_lib: TargetLib,
   pub is_main: bool,
   pub is_internal: bool,
-  pub http_client: reqwest::Client,
+  pub http_client: RefCell<reqwest::Client>,
 }
 
 impl State {
-  pub fn stateful_json_op<D>(&self, dispatcher: D) -> impl OpDispatcher
+  pub fn stateful_json_op<D>(
+    self: &Rc<Self>,
+    dispatcher: D,
+  ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
   where
-    D: Fn(&State, Value, &mut [ZeroCopyBuf]) -> Result<JsonOp, OpError>,
+    D: Fn(&Rc<State>, Value, &mut [ZeroCopyBuf]) -> Result<JsonOp, OpError>,
   {
     use crate::ops::json_op;
     self.core_op(json_op(self.stateful_op(dispatcher)))
   }
 
-  pub fn stateful_json_op2<D>(&self, dispatcher: D) -> impl OpDispatcher
+  pub fn stateful_json_op_sync<D>(
+    self: &Rc<Self>,
+    resource_table: &Rc<RefCell<ResourceTable>>,
+    dispatcher: D,
+  ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
   where
     D: Fn(
-      &mut deno_core::CoreIsolateState,
       &State,
+      &mut ResourceTable,
+      Value,
+      &mut [ZeroCopyBuf],
+    ) -> Result<Value, OpError>,
+  {
+    let state = self.clone();
+    let resource_table = resource_table.clone();
+
+    move |_: &mut CoreIsolateState, bufs: &mut [ZeroCopyBuf]| {
+      // The first buffer should contain JSON encoded op arguments; parse them.
+      let args: Value = match serde_json::from_slice(&bufs[0]) {
+        Ok(v) => v,
+        Err(e) => {
+          let e = OpError::from(e);
+          return Op::Sync(serialize_result(None, Err(e)));
+        }
+      };
+
+      // Make a slice containing all buffers except for the first one.
+      let zero_copy = &mut bufs[1..];
+
+      let result =
+        dispatcher(&state, &mut *resource_table.borrow_mut(), args, zero_copy);
+
+      // Convert to Op.
+      Op::Sync(serialize_result(None, result))
+    }
+  }
+
+  pub fn stateful_json_op_async<D, F>(
+    self: &Rc<Self>,
+    resource_table: &Rc<RefCell<ResourceTable>>,
+    dispatcher: D,
+  ) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
+  where
+    D:
+      FnOnce(Rc<State>, Rc<RefCell<ResourceTable>>, Value, BufVec) -> F + Clone,
+    F: Future<Output = Result<Value, OpError>> + 'static,
+  {
+    let state = self.clone();
+    let resource_table = resource_table.clone();
+
+    move |_: &mut CoreIsolateState, bufs: &mut [ZeroCopyBuf]| {
+      // The first buffer should contain JSON encoded op arguments; parse them.
+      let args: Value = match serde_json::from_slice(&bufs[0]) {
+        Ok(v) => v,
+        Err(e) => {
+          let e = OpError::from(e);
+          return Op::Sync(serialize_result(None, Err(e)));
+        }
+      };
+
+      // `args` should have a `promiseId` property with positive integer value.
+      let promise_id = match args.get("promiseId").and_then(|v| v.as_u64()) {
+        Some(i) => i,
+        None => {
+          let e = OpError::type_error("`promiseId` invalid/missing".to_owned());
+          return Op::Sync(serialize_result(None, Err(e)));
+        }
+      };
+
+      // Take ownership of all buffers after the first one.
+      let zero_copy: BufVec = bufs[1..].into();
+
+      // Call dispatcher to obtain op future.
+      let fut = (dispatcher.clone())(
+        state.clone(),
+        resource_table.clone(),
+        args,
+        zero_copy,
+      );
+
+      // Convert to Op.
+      Op::Async(
+        async move { serialize_result(Some(promise_id), fut.await) }
+          .boxed_local(),
+      )
+    }
+  }
+
+  pub fn stateful_json_op2<D>(
+    self: &Rc<Self>,
+    dispatcher: D,
+  ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
+  where
+    D: Fn(
+      &mut deno_core::CoreIsolateState,
+      &Rc<State>,
       Value,
       &mut [ZeroCopyBuf],
     ) -> Result<JsonOp, OpError>,
@@ -90,7 +177,13 @@ impl State {
   /// Wrap core `OpDispatcher` to collect metrics.
   // TODO(ry) this should be private. Is called by stateful_json_op or
   // stateful_minimal_op
-  pub fn core_op(&self, dispatcher: impl OpDispatcher) -> impl OpDispatcher {
+  pub fn core_op<D>(
+    self: &Rc<Self>,
+    dispatcher: D,
+  ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
+  where
+    D: Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op,
+  {
     let state = self.clone();
 
     move |isolate_state: &mut deno_core::CoreIsolateState,
@@ -101,12 +194,11 @@ impl State {
       let bytes_sent_zero_copy =
         zero_copy[1..].iter().map(|b| b.len()).sum::<usize>() as u64;
 
-      let op = dispatcher.dispatch(isolate_state, zero_copy);
+      let op = dispatcher(isolate_state, zero_copy);
 
       match op {
         Op::Sync(buf) => {
-          let mut state_ = state.borrow_mut();
-          state_.metrics.op_sync(
+          state.metrics.borrow_mut().op_sync(
             bytes_sent_control,
             bytes_sent_zero_copy,
             buf.len() as u64,
@@ -114,28 +206,31 @@ impl State {
           Op::Sync(buf)
         }
         Op::Async(fut) => {
-          let mut state_ = state.borrow_mut();
-          state_
+          state
             .metrics
+            .borrow_mut()
             .op_dispatched_async(bytes_sent_control, bytes_sent_zero_copy);
           let state = state.clone();
           let result_fut = fut.map(move |buf: Buf| {
-            let mut state_ = state.borrow_mut();
-            state_.metrics.op_completed_async(buf.len() as u64);
+            state
+              .metrics
+              .borrow_mut()
+              .op_completed_async(buf.len() as u64);
             buf
           });
           Op::Async(result_fut.boxed_local())
         }
         Op::AsyncUnref(fut) => {
-          let mut state_ = state.borrow_mut();
-          state_.metrics.op_dispatched_async_unref(
+          state.metrics.borrow_mut().op_dispatched_async_unref(
             bytes_sent_control,
             bytes_sent_zero_copy,
           );
           let state = state.clone();
           let result_fut = fut.map(move |buf: Buf| {
-            let mut state_ = state.borrow_mut();
-            state_.metrics.op_completed_async_unref(buf.len() as u64);
+            state
+              .metrics
+              .borrow_mut()
+              .op_completed_async_unref(buf.len() as u64);
             buf
           });
           Op::AsyncUnref(result_fut.boxed_local())
@@ -144,11 +239,14 @@ impl State {
     }
   }
 
-  pub fn stateful_minimal_op2<D>(&self, dispatcher: D) -> impl OpDispatcher
+  pub fn stateful_minimal_op2<D>(
+    self: &Rc<Self>,
+    dispatcher: D,
+  ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
   where
     D: Fn(
       &mut deno_core::CoreIsolateState,
-      &State,
+      &Rc<State>,
       bool,
       i32,
       &mut [ZeroCopyBuf],
@@ -171,9 +269,16 @@ impl State {
   /// NOTE: This only works with JSON dispatcher.
   /// This is a band-aid for transition to `CoreIsolate.register_op` API as most of our
   /// ops require `state` argument.
-  pub fn stateful_op<D>(&self, dispatcher: D) -> impl JsonOpDispatcher
+  pub fn stateful_op<D>(
+    self: &Rc<Self>,
+    dispatcher: D,
+  ) -> impl Fn(
+    &mut deno_core::CoreIsolateState,
+    Value,
+    &mut [ZeroCopyBuf],
+  ) -> Result<JsonOp, OpError>
   where
-    D: Fn(&State, Value, &mut [ZeroCopyBuf]) -> Result<JsonOp, OpError>,
+    D: Fn(&Rc<State>, Value, &mut [ZeroCopyBuf]) -> Result<JsonOp, OpError>,
   {
     let state = self.clone();
     move |_isolate_state: &mut deno_core::CoreIsolateState,
@@ -182,11 +287,18 @@ impl State {
           -> Result<JsonOp, OpError> { dispatcher(&state, args, zero_copy) }
   }
 
-  pub fn stateful_op2<D>(&self, dispatcher: D) -> impl JsonOpDispatcher
+  pub fn stateful_op2<D>(
+    self: &Rc<Self>,
+    dispatcher: D,
+  ) -> impl Fn(
+    &mut deno_core::CoreIsolateState,
+    Value,
+    &mut [ZeroCopyBuf],
+  ) -> Result<JsonOp, OpError>
   where
     D: Fn(
       &mut deno_core::CoreIsolateState,
-      &State,
+      &Rc<State>,
       Value,
       &mut [ZeroCopyBuf],
     ) -> Result<JsonOp, OpError>,
@@ -204,11 +316,10 @@ impl State {
   ///
   /// This is intentionally a non-recoverable check so that people cannot probe
   /// for unstable APIs from stable programs.
-  pub fn check_unstable(&self, api_name: &str) {
+  pub fn check_unstable(self: &Rc<Self>, api_name: &str) {
     // TODO(ry) Maybe use IsolateHandle::terminate_execution here to provide a
     // stack trace in JS.
-    let s = self.0.borrow();
-    if !s.global_state.flags.unstable {
+    if !self.global_state.flags.unstable {
       exit_unstable(api_name);
     }
   }
@@ -230,7 +341,7 @@ impl ModuleLoader for State {
     is_main: bool,
   ) -> Result<ModuleSpecifier, ErrBox> {
     if !is_main {
-      if let Some(import_map) = &self.borrow().import_map {
+      if let Some(import_map) = &self.import_map {
         let result = import_map.resolve(specifier, referrer)?;
         if let Some(r) = result {
           return Ok(r);
@@ -250,11 +361,10 @@ impl ModuleLoader for State {
     _is_dyn_import: bool,
   ) -> Pin<Box<deno_core::ModuleSourceFuture>> {
     let module_specifier = module_specifier.to_owned();
-    let mut state = self.borrow_mut();
     // TODO(bartlomieju): incrementing resolve_count here has no sense...
-    state.metrics.resolve_count += 1;
+    self.metrics.borrow_mut().resolve_count += 1;
     let module_url_specified = module_specifier.to_string();
-    let global_state = state.global_state.clone();
+    let global_state = self.global_state.clone();
 
     // TODO(bartlomieju): `fetch_compiled_module` should take `load_id` param
     let fut = async move {
@@ -281,18 +391,17 @@ impl ModuleLoader for State {
     is_dyn_import: bool,
   ) -> Pin<Box<dyn Future<Output = Result<(), ErrBox>>>> {
     let module_specifier = module_specifier.clone();
-    let state = self.borrow();
-    let target_lib = state.target_lib.clone();
-    let maybe_import_map = state.import_map.clone();
+    let target_lib = self.target_lib.clone();
+    let maybe_import_map = self.import_map.clone();
     // Only "main" module is loaded without permission check,
     // ie. module that is associated with "is_main" state
     // and is not a dynamic import.
-    let permissions = if state.is_main && !is_dyn_import {
+    let permissions = if self.is_main && !is_dyn_import {
       Permissions::allow_all()
     } else {
-      state.permissions.clone()
+      self.permissions.borrow().clone()
     };
-    let global_state = state.global_state.clone();
+    let global_state = self.global_state.clone();
     // TODO(bartlomieju): I'm not sure if it's correct to ignore
     // bad referrer - this is the case for `Deno.core.evalContext()` where
     // `ref_str` is `<unknown>`.
@@ -301,7 +410,6 @@ impl ModuleLoader for State {
     } else {
       None
     };
-    drop(state);
 
     // TODO(bartlomieju): `prepare_module_load` should take `load_id` param
     async move {
@@ -323,87 +431,65 @@ impl ModuleLoader for State {
 impl State {
   /// If `shared_permission` is None then permissions from globa state are used.
   pub fn new(
-    global_state: GlobalState,
+    global_state: &Arc<GlobalState>,
     shared_permissions: Option<Permissions>,
     main_module: ModuleSpecifier,
     maybe_import_map: Option<ImportMap>,
     is_internal: bool,
-  ) -> Result<Self, ErrBox> {
-    let seeded_rng = match global_state.flags.seed {
-      Some(seed) => Some(StdRng::seed_from_u64(seed)),
-      None => None,
-    };
-
-    let permissions = if let Some(perm) = shared_permissions {
-      perm
-    } else {
-      global_state.permissions.clone()
-    };
-
-    let http_client = create_http_client(global_state.flags.ca_file.clone())?;
-
-    let state = Rc::new(RefCell::new(StateInner {
-      global_state,
+  ) -> Result<Rc<Self>, ErrBox> {
+    let fl = &global_state.flags;
+    let state = State {
+      global_state: global_state.clone(),
       main_module,
-      permissions,
+      permissions: shared_permissions
+        .unwrap_or_else(|| global_state.permissions.clone())
+        .into(),
       import_map: maybe_import_map,
-      metrics: Metrics::default(),
-      global_timer: GlobalTimer::new(),
-      workers: HashMap::new(),
-      next_worker_id: 0,
+      metrics: Default::default(),
+      global_timer: Default::default(),
+      workers: Default::default(),
+      next_worker_id: Default::default(),
       start_time: Instant::now(),
-      seeded_rng,
+      seeded_rng: fl.seed.map(|v| StdRng::seed_from_u64(v).into()),
       target_lib: TargetLib::Main,
       is_main: true,
       is_internal,
-      http_client,
-    }));
-
-    Ok(Self(state))
+      http_client: create_http_client(fl.ca_file.as_deref())?.into(),
+    };
+    Ok(Rc::new(state))
   }
 
   /// If `shared_permission` is None then permissions from globa state are used.
   pub fn new_for_worker(
-    global_state: GlobalState,
+    global_state: &Arc<GlobalState>,
     shared_permissions: Option<Permissions>,
     main_module: ModuleSpecifier,
-  ) -> Result<Self, ErrBox> {
-    let seeded_rng = match global_state.flags.seed {
-      Some(seed) => Some(StdRng::seed_from_u64(seed)),
-      None => None,
-    };
-
-    let permissions = if let Some(perm) = shared_permissions {
-      perm
-    } else {
-      global_state.permissions.clone()
-    };
-
-    let http_client = create_http_client(global_state.flags.ca_file.clone())?;
-
-    let state = Rc::new(RefCell::new(StateInner {
-      global_state,
+  ) -> Result<Rc<Self>, ErrBox> {
+    let fl = &global_state.flags;
+    let state = State {
+      global_state: global_state.clone(),
       main_module,
-      permissions,
+      permissions: shared_permissions
+        .unwrap_or_else(|| global_state.permissions.clone())
+        .into(),
       import_map: None,
-      metrics: Metrics::default(),
-      global_timer: GlobalTimer::new(),
-      workers: HashMap::new(),
-      next_worker_id: 0,
+      metrics: Default::default(),
+      global_timer: Default::default(),
+      workers: Default::default(),
+      next_worker_id: Default::default(),
       start_time: Instant::now(),
-      seeded_rng,
+      seeded_rng: fl.seed.map(|v| StdRng::seed_from_u64(v).into()),
       target_lib: TargetLib::Worker,
       is_main: false,
       is_internal: false,
-      http_client,
-    }));
-
-    Ok(Self(state))
+      http_client: create_http_client(fl.ca_file.as_deref())?.into(),
+    };
+    Ok(Rc::new(state))
   }
 
   #[inline]
   pub fn check_read(&self, path: &Path) -> Result<(), OpError> {
-    self.borrow().permissions.check_read(path)
+    self.permissions.borrow().check_read(path)
   }
 
   /// As `check_read()`, but permission error messages will anonymize the path
@@ -414,37 +500,42 @@ impl State {
     path: &Path,
     display: &str,
   ) -> Result<(), OpError> {
-    self.borrow().permissions.check_read_blind(path, display)
+    self.permissions.borrow().check_read_blind(path, display)
   }
 
   #[inline]
   pub fn check_write(&self, path: &Path) -> Result<(), OpError> {
-    self.borrow().permissions.check_write(path)
+    self.permissions.borrow().check_write(path)
   }
 
   #[inline]
   pub fn check_env(&self) -> Result<(), OpError> {
-    self.borrow().permissions.check_env()
+    self.permissions.borrow().check_env()
   }
 
   #[inline]
   pub fn check_net(&self, hostname: &str, port: u16) -> Result<(), OpError> {
-    self.borrow().permissions.check_net(hostname, port)
+    self.permissions.borrow().check_net(hostname, port)
   }
 
   #[inline]
   pub fn check_net_url(&self, url: &url::Url) -> Result<(), OpError> {
-    self.borrow().permissions.check_net_url(url)
+    self.permissions.borrow().check_net_url(url)
   }
 
   #[inline]
   pub fn check_run(&self) -> Result<(), OpError> {
-    self.borrow().permissions.check_run()
+    self.permissions.borrow().check_run()
+  }
+
+  #[inline]
+  pub fn check_hrtime(&self) -> Result<(), OpError> {
+    self.permissions.borrow().check_hrtime()
   }
 
   #[inline]
   pub fn check_plugin(&self, filename: &Path) -> Result<(), OpError> {
-    self.borrow().permissions.check_plugin(filename)
+    self.permissions.borrow().check_plugin(filename)
   }
 
   pub fn check_dyn_import(
@@ -476,11 +567,11 @@ impl State {
   }
 
   #[cfg(test)]
-  pub fn mock(main_module: &str) -> State {
+  pub fn mock(main_module: &str) -> Rc<State> {
     let module_specifier = ModuleSpecifier::resolve_url_or_path(main_module)
       .expect("Invalid entry module");
     State::new(
-      GlobalState::mock(vec!["deno".to_string()], None),
+      &GlobalState::mock(vec!["deno".to_string()], None),
       None,
       module_specifier,
       None,
diff --git a/cli/swc_util.rs b/cli/swc_util.rs
index 906d9f9bddab71..934bed01a73dce 100644
--- a/cli/swc_util.rs
+++ b/cli/swc_util.rs
@@ -1,29 +1,61 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 use crate::msg::MediaType;
-use crate::swc_common;
-use crate::swc_common::comments::Comments;
-use crate::swc_common::errors::Diagnostic;
-use crate::swc_common::errors::DiagnosticBuilder;
-use crate::swc_common::errors::Emitter;
-use crate::swc_common::errors::Handler;
-use crate::swc_common::errors::HandlerFlags;
-use crate::swc_common::FileName;
-use crate::swc_common::Globals;
-use crate::swc_common::SourceMap;
-use crate::swc_common::Span;
-use crate::swc_ecma_ast;
-use crate::swc_ecma_parser::lexer::Lexer;
-use crate::swc_ecma_parser::EsConfig;
-use crate::swc_ecma_parser::JscTarget;
-use crate::swc_ecma_parser::Parser;
-use crate::swc_ecma_parser::Session;
-use crate::swc_ecma_parser::SourceFileInput;
-use crate::swc_ecma_parser::Syntax;
-use crate::swc_ecma_parser::TsConfig;
+use deno_core::ErrBox;
+use serde::Serialize;
 use std::error::Error;
 use std::fmt;
+use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::RwLock;
+use swc_common::chain;
+use swc_common::comments::SingleThreadedComments;
+use swc_common::errors::Diagnostic;
+use swc_common::errors::DiagnosticBuilder;
+use swc_common::errors::Emitter;
+use swc_common::errors::Handler;
+use swc_common::errors::HandlerFlags;
+use swc_common::FileName;
+use swc_common::Globals;
+use swc_common::SourceMap;
+use swc_common::Span;
+use swc_ecmascript::ast::Program;
+use swc_ecmascript::codegen::text_writer::JsWriter;
+use swc_ecmascript::codegen::Node;
+use swc_ecmascript::parser::lexer::Lexer;
+use swc_ecmascript::parser::EsConfig;
+use swc_ecmascript::parser::JscTarget;
+use swc_ecmascript::parser::Parser;
+use swc_ecmascript::parser::StringInput;
+use swc_ecmascript::parser::Syntax;
+use swc_ecmascript::parser::TsConfig;
+use swc_ecmascript::transforms::fixer;
+use swc_ecmascript::transforms::typescript;
+use swc_ecmascript::visit::FoldWith;
+
+#[derive(Debug, Serialize, Clone, PartialEq)]
+pub struct Location {
+  pub filename: String,
+  pub line: usize,
+  pub col: usize,
+}
+
+impl Into<Location> for swc_common::Loc {
+  fn into(self) -> Location {
+    use swc_common::FileName::*;
+
+    let filename = match &self.file.name {
+      Real(path_buf) => path_buf.to_string_lossy().to_string(),
+      Custom(str_) => str_.to_string(),
+      _ => panic!("invalid filename"),
+    };
+
+    Location {
+      filename,
+      line: self.line,
+      col: self.col_display,
+    }
+  }
+}
 
 fn get_default_es_config() -> EsConfig {
   let mut config = EsConfig::default();
@@ -48,6 +80,12 @@ fn get_default_ts_config() -> TsConfig {
   ts_config
 }
 
+pub fn get_syntax_for_dts() -> Syntax {
+  let mut ts_config = TsConfig::default();
+  ts_config.dts = true;
+  Syntax::Typescript(ts_config)
+}
+
 pub fn get_syntax_for_media_type(media_type: MediaType) -> Syntax {
   match media_type {
     MediaType::JavaScript => Syntax::Es(get_default_es_config()),
@@ -134,14 +172,14 @@ impl Emitter for SwcErrorBuffer {
 /// to `parse_module`.
 pub struct AstParser {
   pub buffered_error: SwcErrorBuffer,
-  pub source_map: Arc<SourceMap>,
+  pub source_map: Rc<SourceMap>,
   pub handler: Handler,
-  pub comments: Comments,
+  pub comments: SingleThreadedComments,
   pub globals: Globals,
 }
 
 impl AstParser {
-  pub fn new() -> Self {
+  pub fn default() -> Self {
     let buffered_error = SwcErrorBuffer::default();
 
     let handler = Handler::with_emitter_and_flags(
@@ -155,58 +193,90 @@ impl AstParser {
 
     AstParser {
       buffered_error,
-      source_map: Arc::new(SourceMap::default()),
+      source_map: Rc::new(SourceMap::default()),
       handler,
-      comments: Comments::default(),
+      comments: SingleThreadedComments::default(),
       globals: Globals::new(),
     }
   }
 
-  pub fn parse_module<F, R>(
+  pub fn parse_module(
     &self,
     file_name: &str,
     media_type: MediaType,
     source_code: &str,
-    callback: F,
-  ) -> R
-  where
-    F: FnOnce(Result<swc_ecma_ast::Module, SwcDiagnosticBuffer>) -> R,
-  {
-    swc_common::GLOBALS.set(&self.globals, || {
-      let swc_source_file = self.source_map.new_source_file(
-        FileName::Custom(file_name.to_string()),
-        source_code.to_string(),
-      );
-
-      let buffered_err = self.buffered_error.clone();
-      let session = Session {
-        handler: &self.handler,
-      };
-
-      let syntax = get_syntax_for_media_type(media_type);
+  ) -> Result<swc_ecmascript::ast::Module, SwcDiagnosticBuffer> {
+    let swc_source_file = self.source_map.new_source_file(
+      FileName::Custom(file_name.to_string()),
+      source_code.to_string(),
+    );
 
-      let lexer = Lexer::new(
-        session,
-        syntax,
-        JscTarget::Es2019,
-        SourceFileInput::from(&*swc_source_file),
-        Some(&self.comments),
-      );
+    let buffered_err = self.buffered_error.clone();
+    let syntax = get_syntax_for_media_type(media_type);
 
-      let mut parser = Parser::new_from(session, lexer);
+    let lexer = Lexer::new(
+      syntax,
+      JscTarget::Es2019,
+      StringInput::from(&*swc_source_file),
+      Some(&self.comments),
+    );
 
-      let parse_result =
-        parser
-          .parse_module()
-          .map_err(move |mut err: DiagnosticBuilder| {
-            err.emit();
-            SwcDiagnosticBuffer::from_swc_error(buffered_err, self)
-          });
+    let mut parser = Parser::new_from(lexer);
 
-      callback(parse_result)
+    parser.parse_module().map_err(move |err| {
+      let mut diagnostic = err.into_diagnostic(&self.handler);
+      diagnostic.emit();
+      SwcDiagnosticBuffer::from_swc_error(buffered_err, self)
     })
   }
 
+  pub fn strip_types(
+    &self,
+    file_name: &str,
+    media_type: MediaType,
+    source_code: &str,
+  ) -> Result<String, ErrBox> {
+    let parse_result = self.parse_module(file_name, media_type, source_code);
+    let module = parse_result?;
+    let program = Program::Module(module);
+    let mut compiler_pass =
+      chain!(typescript::strip(), fixer(Some(&self.comments)));
+    let program = program.fold_with(&mut compiler_pass);
+
+    let mut src_map_buf = vec![];
+    let mut buf = vec![];
+    {
+      let writer = Box::new(JsWriter::new(
+        self.source_map.clone(),
+        "\n",
+        &mut buf,
+        Some(&mut src_map_buf),
+      ));
+      let config = swc_ecmascript::codegen::Config { minify: false };
+      let mut emitter = swc_ecmascript::codegen::Emitter {
+        cfg: config,
+        comments: Some(&self.comments),
+        cm: self.source_map.clone(),
+        wr: writer,
+      };
+      program.emit_with(&mut emitter)?;
+    }
+    let mut src = String::from_utf8(buf).map_err(ErrBox::from)?;
+    {
+      let mut buf = vec![];
+      self
+        .source_map
+        .build_source_map_from(&mut src_map_buf, None)
+        .to_writer(&mut buf)?;
+      let map = String::from_utf8(buf)?;
+
+      src.push_str("//# sourceMappingURL=data:application/json;base64,");
+      let encoded_map = base64::encode(map.as_bytes());
+      src.push_str(&encoded_map);
+    }
+    Ok(src)
+  }
+
   pub fn get_span_location(&self, span: Span) -> swc_common::Loc {
     self.source_map.lookup_char_pos(span.lo())
   }
@@ -215,15 +285,19 @@ impl AstParser {
     &self,
     span: Span,
   ) -> Vec<swc_common::comments::Comment> {
-    let maybe_comments = self.comments.take_leading_comments(span.lo());
-
-    if let Some(comments) = maybe_comments {
-      // clone the comments and put them back in map
-      let to_return = comments.clone();
-      self.comments.add_leading(span.lo(), comments);
-      to_return
-    } else {
-      vec![]
-    }
+    self
+      .comments
+      .with_leading(span.lo(), |comments| comments.to_vec())
   }
 }
+
+#[test]
+fn test_strip_types() {
+  let ast_parser = AstParser::default();
+  let result = ast_parser
+    .strip_types("test.ts", MediaType::TypeScript, "const a: number = 10;")
+    .unwrap();
+  assert!(result.starts_with(
+    "const a = 10;\n//# sourceMappingURL=data:application/json;base64,"
+  ));
+}
diff --git a/cli/tests/031_info_no_check.out b/cli/tests/031_info_no_check.out
new file mode 100644
index 00000000000000..5b67e3f2f08c1f
--- /dev/null
+++ b/cli/tests/031_info_no_check.out
@@ -0,0 +1,6 @@
+[WILDCARD]
+local: [WILDCARD]031_info_no_check.ts
+type: TypeScript
+compiled: [WILDCARD].js
+deps:
+[WILDCARD]031_info_no_check.ts
diff --git a/cli/tests/031_info_no_check.ts b/cli/tests/031_info_no_check.ts
new file mode 100644
index 00000000000000..9b7492dbe0c839
--- /dev/null
+++ b/cli/tests/031_info_no_check.ts
@@ -0,0 +1 @@
+const _foo: string = 1;
diff --git a/cli/tests/045_proxy_test.ts b/cli/tests/045_proxy_test.ts
index c8df8ceb2ec651..873d3a0c171ae4 100644
--- a/cli/tests/045_proxy_test.ts
+++ b/cli/tests/045_proxy_test.ts
@@ -67,7 +67,52 @@ async function testModuleDownload(): Promise<void> {
   http.close();
 }
 
+async function testFetchNoProxy(): Promise<void> {
+  const c = Deno.run({
+    cmd: [
+      Deno.execPath(),
+      "run",
+      "--quiet",
+      "--reload",
+      "--allow-net",
+      "045_proxy_client.ts",
+    ],
+    stdout: "piped",
+    env: {
+      HTTP_PROXY: "http://not.exising.proxy.server",
+      NO_PROXY: "localhost",
+    },
+  });
+
+  const status = await c.status();
+  assertEquals(status.code, 0);
+  c.close();
+}
+
+async function testModuleDownloadNoProxy(): Promise<void> {
+  const http = Deno.run({
+    cmd: [
+      Deno.execPath(),
+      "cache",
+      "--reload",
+      "--quiet",
+      "http://localhost:4545/std/examples/colors.ts",
+    ],
+    stdout: "piped",
+    env: {
+      HTTP_PROXY: "http://not.exising.proxy.server",
+      NO_PROXY: "localhost",
+    },
+  });
+
+  const httpStatus = await http.status();
+  assertEquals(httpStatus.code, 0);
+  http.close();
+}
+
 proxyServer();
 await testFetch();
 await testModuleDownload();
+await testFetchNoProxy();
+await testModuleDownloadNoProxy();
 Deno.exit(0);
diff --git a/cli/tests/049_info_flag_script_jsx.out b/cli/tests/049_info_flag_script_jsx.out
index ff4f04f3a62ca8..fd5b511dc90e4d 100644
--- a/cli/tests/049_info_flag_script_jsx.out
+++ b/cli/tests/049_info_flag_script_jsx.out
@@ -1,7 +1,7 @@
 [WILDCARD]
 local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD]
 type: TypeScript
-compiled: [WILDCARD]048_media_types_jsx.ts.js
+compiled: [WILDCARD].js
 deps:
 http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts
   ├── http://localhost:4545/cli/tests/subdir/mt_text_typescript_tsx.t1.tsx
diff --git a/cli/tests/054_info_local_imports.out b/cli/tests/054_info_local_imports.out
index 32cfd852534742..fdf2f44a637796 100644
--- a/cli/tests/054_info_local_imports.out
+++ b/cli/tests/054_info_local_imports.out
@@ -1,6 +1,6 @@
 local: [WILDCARD]005_more_imports.ts
 type: TypeScript
-compiled: [WILDCARD]005_more_imports.ts.js
+compiled: [WILDCARD].js
 deps:
 file://[WILDCARD]/005_more_imports.ts
   └─┬ file://[WILDCARD]/subdir/mod1.ts
diff --git a/cli/tests/055_info_file_json.out b/cli/tests/055_info_file_json.out
index 20bf94f3f5ae1a..08dc737909a7f4 100644
--- a/cli/tests/055_info_file_json.out
+++ b/cli/tests/055_info_file_json.out
@@ -1,7 +1,7 @@
 {
   "local": "[WILDCARD]005_more_imports.ts",
   "fileType": "TypeScript",
-  "compiled": "[WILDCARD]005_more_imports.ts.js",
+  "compiled": "[WILDCARD].js",
   "map": null,
   "deps": [
     "file://[WILDCARD]/005_more_imports.ts",
diff --git a/cli/tests/057_revoke_permissions.out b/cli/tests/057_revoke_permissions.out
deleted file mode 100644
index 8ea5692363f802..00000000000000
--- a/cli/tests/057_revoke_permissions.out
+++ /dev/null
@@ -1,11 +0,0 @@
-[WILDCARD]
-running 7 tests
-test runGranted ... ok [WILDCARD]
-test readGranted ... ok [WILDCARD]
-test writeGranted ... ok [WILDCARD]
-test netGranted ... ok [WILDCARD]
-test envGranted ... ok [WILDCARD]
-test pluginGranted ... ok [WILDCARD]
-test hrtimeGranted ... ok [WILDCARD]
-
-test result: ok. 7 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]
diff --git a/cli/tests/057_revoke_permissions.ts b/cli/tests/057_revoke_permissions.ts
deleted file mode 100644
index de8deecb4c24b7..00000000000000
--- a/cli/tests/057_revoke_permissions.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-const knownPermissions: Deno.PermissionName[] = [
-  "run",
-  "read",
-  "write",
-  "net",
-  "env",
-  "plugin",
-  "hrtime",
-];
-
-export function assert(cond: unknown): asserts cond {
-  if (!cond) {
-    throw Error("Assertion failed");
-  }
-}
-
-function genFunc(grant: Deno.PermissionName): [string, () => Promise<void>] {
-  const gen: () => Promise<void> = async function Granted(): Promise<void> {
-    const status0 = await Deno.permissions.query({ name: grant });
-    assert(status0 != null);
-    assert(status0.state === "granted");
-
-    const status1 = await Deno.permissions.revoke({ name: grant });
-    assert(status1 != null);
-    assert(status1.state === "prompt");
-  };
-  const name = grant + "Granted";
-  return [name, gen];
-}
-
-for (const grant of knownPermissions) {
-  const [name, fn] = genFunc(grant);
-  Deno.test(name, fn);
-}
diff --git a/cli/tests/061_permissions_request.ts b/cli/tests/061_permissions_request.ts
new file mode 100644
index 00000000000000..8fdc2c5904f609
--- /dev/null
+++ b/cli/tests/061_permissions_request.ts
@@ -0,0 +1,6 @@
+const status1 = await Deno.permissions.request({ name: "read", path: "foo" });
+const status2 = await Deno.permissions.query({ name: "read", path: "bar" });
+const status3 = await Deno.permissions.request({ name: "read", path: "bar" });
+console.log(status1);
+console.log(status2);
+console.log(status3);
diff --git a/cli/tests/061_permissions_request.ts.out b/cli/tests/061_permissions_request.ts.out
new file mode 100644
index 00000000000000..de058a9a36d18b
--- /dev/null
+++ b/cli/tests/061_permissions_request.ts.out
@@ -0,0 +1,3 @@
+[WILDCARD]PermissionStatus { state: "granted" }
+PermissionStatus { state: "prompt" }
+PermissionStatus { state: "denied" }
diff --git a/cli/tests/062_permissions_request_global.ts b/cli/tests/062_permissions_request_global.ts
new file mode 100644
index 00000000000000..4ed98ff641eae3
--- /dev/null
+++ b/cli/tests/062_permissions_request_global.ts
@@ -0,0 +1,6 @@
+const status1 = await Deno.permissions.request({ name: "read" });
+const status2 = await Deno.permissions.query({ name: "read", path: "foo" });
+const status3 = await Deno.permissions.query({ name: "read", path: "bar" });
+console.log(status1);
+console.log(status2);
+console.log(status3);
diff --git a/cli/tests/062_permissions_request_global.ts.out b/cli/tests/062_permissions_request_global.ts.out
new file mode 100644
index 00000000000000..69b5ee50d330ff
--- /dev/null
+++ b/cli/tests/062_permissions_request_global.ts.out
@@ -0,0 +1,3 @@
+[WILDCARD]PermissionStatus { state: "granted" }
+PermissionStatus { state: "granted" }
+PermissionStatus { state: "granted" }
diff --git a/cli/tests/063_permissions_revoke.ts b/cli/tests/063_permissions_revoke.ts
new file mode 100644
index 00000000000000..e618836934dc98
--- /dev/null
+++ b/cli/tests/063_permissions_revoke.ts
@@ -0,0 +1,6 @@
+const status1 = await Deno.permissions.revoke({ name: "read", path: "foo" });
+const status2 = await Deno.permissions.query({ name: "read", path: "bar" });
+const status3 = await Deno.permissions.revoke({ name: "read", path: "bar" });
+console.log(status1);
+console.log(status2);
+console.log(status3);
diff --git a/cli/tests/063_permissions_revoke.ts.out b/cli/tests/063_permissions_revoke.ts.out
new file mode 100644
index 00000000000000..803893e9c06aed
--- /dev/null
+++ b/cli/tests/063_permissions_revoke.ts.out
@@ -0,0 +1,3 @@
+[WILDCARD]PermissionStatus { state: "prompt" }
+PermissionStatus { state: "granted" }
+PermissionStatus { state: "prompt" }
diff --git a/cli/tests/064_permissions_revoke_global.ts b/cli/tests/064_permissions_revoke_global.ts
new file mode 100644
index 00000000000000..efe74b82806730
--- /dev/null
+++ b/cli/tests/064_permissions_revoke_global.ts
@@ -0,0 +1,6 @@
+const status1 = await Deno.permissions.revoke({ name: "read" });
+const status2 = await Deno.permissions.query({ name: "read", path: "foo" });
+const status3 = await Deno.permissions.query({ name: "read", path: "bar" });
+console.log(status1);
+console.log(status2);
+console.log(status3);
diff --git a/cli/tests/064_permissions_revoke_global.ts.out b/cli/tests/064_permissions_revoke_global.ts.out
new file mode 100644
index 00000000000000..a2ea05cb7f6f22
--- /dev/null
+++ b/cli/tests/064_permissions_revoke_global.ts.out
@@ -0,0 +1,3 @@
+[WILDCARD]PermissionStatus { state: "prompt" }
+PermissionStatus { state: "prompt" }
+PermissionStatus { state: "prompt" }
diff --git a/cli/tests/compiler_api_test.ts b/cli/tests/compiler_api_test.ts
index 7ff9ebc2bac94a..311dae8fdc8506 100644
--- a/cli/tests/compiler_api_test.ts
+++ b/cli/tests/compiler_api_test.ts
@@ -1,5 +1,9 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { assert, assertEquals } from "../../std/testing/asserts.ts";
+import {
+  assert,
+  assertEquals,
+  assertThrowsAsync,
+} from "../../std/testing/asserts.ts";
 
 Deno.test({
   name: "Deno.compile() - sources provided",
@@ -33,7 +37,7 @@ Deno.test({
 });
 
 Deno.test({
-  name: "Deno.compile() - compiler options effects imit",
+  name: "Deno.compile() - compiler options effects emit",
   async fn() {
     const [diagnostics, actual] = await Deno.compile(
       "/foo.ts",
@@ -199,3 +203,23 @@ Deno.test({
     assert(diagnostics.length === 1);
   },
 });
+
+// See https://github.com/denoland/deno/issues/6908
+Deno.test({
+  name: "Deno.compile() - SWC diagnostics",
+  async fn() {
+    await assertThrowsAsync(async () => {
+      await Deno.compile("main.js", {
+        "main.js": `
+      export class Foo {
+        constructor() {
+          console.log("foo");
+        }
+        export get() {
+          console.log("bar");
+        }
+      }`,
+      });
+    });
+  },
+});
diff --git a/cli/tests/deno_doc.out b/cli/tests/deno_doc.out
new file mode 100644
index 00000000000000..86a77a9cc19f24
--- /dev/null
+++ b/cli/tests/deno_doc.out
@@ -0,0 +1,2 @@
+[WILDCARD]
+function foo[WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/deno_doc.ts b/cli/tests/deno_doc.ts
new file mode 100644
index 00000000000000..92ba2f174de281
--- /dev/null
+++ b/cli/tests/deno_doc.ts
@@ -0,0 +1,4 @@
+/** Some JSDoc */
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+export function foo() {
+}
diff --git a/cli/tests/deno_doc_builtin.out b/cli/tests/deno_doc_builtin.out
new file mode 100644
index 00000000000000..b4a90d6bc6bda3
--- /dev/null
+++ b/cli/tests/deno_doc_builtin.out
@@ -0,0 +1,3 @@
+[WILDCARD]
+namespace Deno
+[WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/encoding/utf-16be.ts b/cli/tests/encoding/utf-16be.ts
new file mode 100644
index 00000000000000..3d0144d7c0d381
Binary files /dev/null and b/cli/tests/encoding/utf-16be.ts differ
diff --git a/cli/tests/encoding/utf-16le.ts b/cli/tests/encoding/utf-16le.ts
new file mode 100644
index 00000000000000..6f0e415f2cb933
Binary files /dev/null and b/cli/tests/encoding/utf-16le.ts differ
diff --git a/cli/tests/encoding/utf-8.ts b/cli/tests/encoding/utf-8.ts
new file mode 100644
index 00000000000000..bf889aeb7d38c2
--- /dev/null
+++ b/cli/tests/encoding/utf-8.ts
@@ -0,0 +1 @@
+console.log("Hello World");
diff --git a/cli/tests/encoding/windows-1255 b/cli/tests/encoding/windows-1255
new file mode 100644
index 00000000000000..ec5cad7fd44d08
--- /dev/null
+++ b/cli/tests/encoding/windows-1255
@@ -0,0 +1 @@
+console.log("���� ����");
diff --git a/cli/tests/error_syntax.js.out b/cli/tests/error_syntax.js.out
index 107bc1df0ddd1a..d458bae498562c 100644
--- a/cli/tests/error_syntax.js.out
+++ b/cli/tests/error_syntax.js.out
@@ -1 +1 @@
-error: Expected Comma, got Some(Word(following)) at [WILDCARD]tests/error_syntax.js:3:5
+error: Expected ,, got following at [WILDCARD]tests/error_syntax.js:3:5
diff --git a/cli/tests/fmt_check_tests_dir.out b/cli/tests/fmt_check_tests_dir.out
index 9ae4117f0e40c1..060f2f17a4b885 100644
--- a/cli/tests/fmt_check_tests_dir.out
+++ b/cli/tests/fmt_check_tests_dir.out
@@ -1,2 +1,2 @@
 [WILDCARD]
-error: Found [WILDCARD] not formatted files
+error: Found 1 not formatted file
diff --git a/cli/tests/import_file_with_colon.ts b/cli/tests/import_file_with_colon.ts
new file mode 100644
index 00000000000000..5a2bbceb6097b6
--- /dev/null
+++ b/cli/tests/import_file_with_colon.ts
@@ -0,0 +1 @@
+import "http://localhost:4545/cli/tests/subdir/file_with_:_in_name.ts";
diff --git a/cli/tests/import_file_with_colon.ts.out b/cli/tests/import_file_with_colon.ts.out
new file mode 100644
index 00000000000000..f60bbf4b1be132
--- /dev/null
+++ b/cli/tests/import_file_with_colon.ts.out
@@ -0,0 +1 @@
+Hello from file_with_:_in_name.ts
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index c4332804adcf17..2b7ffa26bc2c6f 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -1,8 +1,6 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 #[cfg(unix)]
 extern crate nix;
-#[cfg(unix)]
-extern crate pty;
 extern crate tempfile;
 
 use test_util as util;
@@ -50,7 +48,7 @@ fn std_lint() {
 
 #[test]
 fn x_deno_warning() {
-  let g = util::http_server();
+  let _g = util::http_server();
   let output = util::deno_cmd()
     .current_dir(util::root_path())
     .arg("run")
@@ -67,7 +65,6 @@ fn x_deno_warning() {
   let stderr_str = std::str::from_utf8(&output.stderr).unwrap().trim();
   assert_eq!("testing x-deno-warning header", stdout_str);
   assert!(util::strip_ansi_codes(stderr_str).contains("Warning foobar"));
-  drop(g);
 }
 
 #[test]
@@ -167,8 +164,8 @@ fn no_color() {
 #[test]
 #[ignore]
 pub fn test_raw_tty() {
-  use pty::fork::*;
   use std::io::{Read, Write};
+  use util::pty::fork::*;
 
   let fork = Fork::from_ptmx().unwrap();
 
@@ -283,7 +280,7 @@ fn benchmark_test() {
 #[test]
 fn deno_dir_test() {
   use std::fs::remove_dir_all;
-  let g = util::http_server();
+  let _g = util::http_server();
   let deno_dir = TempDir::new().expect("tempdir fail");
   remove_dir_all(deno_dir.path()).unwrap();
 
@@ -316,13 +313,11 @@ fn deno_dir_test() {
   assert!(deno_dir.path().join("gen").is_dir());
 
   remove_dir_all(deno_dir.path()).unwrap();
-  drop(deno_dir);
-  drop(g);
 }
 
 #[test]
 fn cache_test() {
-  let g = util::http_server();
+  let _g = util::http_server();
   let deno_dir = TempDir::new().expect("tempdir fail");
   let module_url =
     url::Url::parse("http://localhost:4545/cli/tests/006_url_imports.ts")
@@ -339,7 +334,6 @@ fn cache_test() {
   assert_eq!(out, "");
   // TODO(ry) Is there some way to check that the file was actually cached in
   // DENO_DIR?
-  drop(g);
 }
 
 #[test]
@@ -352,6 +346,20 @@ fn fmt_test() {
   let badly_formatted_str = badly_formatted.to_str().unwrap();
   std::fs::copy(&badly_formatted_original, &badly_formatted)
     .expect("Failed to copy file");
+  // First, check formatting by ignoring the badly formatted file.
+  let status = util::deno_cmd()
+    .current_dir(util::root_path())
+    .arg("fmt")
+    .arg(format!("--ignore={}", badly_formatted_str))
+    .arg("--unstable")
+    .arg("--check")
+    .arg(badly_formatted_str)
+    .spawn()
+    .expect("Failed to spawn script")
+    .wait()
+    .expect("Failed to wait for child process");
+  assert!(status.success());
+  // Check without ignore.
   let status = util::deno_cmd()
     .current_dir(util::root_path())
     .arg("fmt")
@@ -362,6 +370,7 @@ fn fmt_test() {
     .wait()
     .expect("Failed to wait for child process");
   assert!(!status.success());
+  // Format the source file.
   let status = util::deno_cmd()
     .current_dir(util::root_path())
     .arg("fmt")
@@ -539,7 +548,7 @@ fn installer_test_local_module_run() {
 
 #[test]
 fn installer_test_remote_module_run() {
-  let g = util::http_server();
+  let _g = util::http_server();
   let temp_dir = TempDir::new().expect("tempdir fail");
   let bin_dir = temp_dir.path().join("bin");
   std::fs::create_dir(&bin_dir).unwrap();
@@ -572,12 +581,11 @@ fn installer_test_remote_module_run() {
     .unwrap()
     .trim()
     .ends_with("hello, foo"));
-  drop(g)
 }
 
 #[test]
 fn js_unit_tests() {
-  let g = util::http_server();
+  let _g = util::http_server();
   let mut deno = util::deno_cmd()
     .current_dir(util::root_path())
     .arg("run")
@@ -591,7 +599,6 @@ fn js_unit_tests() {
     .spawn()
     .expect("failed to spawn script");
   let status = deno.wait().expect("failed to wait for the child process");
-  drop(g);
   assert_eq!(Some(0), status.code());
   assert!(status.success());
 }
@@ -689,7 +696,7 @@ fn ts_reload() {
   assert!(std::str::from_utf8(&output.stdout)
     .unwrap()
     .trim()
-    .contains("compiler::host.writeFile deno://002_hello.js"));
+    .contains("\"compiler::host.writeFile\" \"deno://002_hello.js\""));
 }
 
 #[test]
@@ -1384,7 +1391,7 @@ itest!(deno_test_only {
 
 #[test]
 fn workers() {
-  let g = util::http_server();
+  let _g = util::http_server();
   let status = util::deno_cmd()
     .current_dir(util::tests_path())
     .arg("test")
@@ -1398,7 +1405,6 @@ fn workers() {
     .wait()
     .unwrap();
   assert!(status.success());
-  drop(g);
 }
 
 #[test]
@@ -1439,6 +1445,12 @@ itest!(_030_eval_ts {
   output: "030_eval_ts.out",
 });
 
+itest!(_031_info_no_check {
+  args: "info 031_info_no_check.ts",
+  output: "031_info_no_check.out",
+  http_server: true,
+});
+
 itest!(_033_import_map {
   args:
     "run --quiet --reload --importmap=importmaps/import_map.json --unstable importmaps/test.ts",
@@ -1532,7 +1544,10 @@ itest!(_048_media_types_jsx {
   http_server: true,
 });
 
-itest!(_049_info_flag_script_jsx {
+// TODO(nayeemrmn): This hits an SWC type-stripping bug:
+// `error: Unterminated regexp literal at http://localhost:4545/cli/tests/subdir/mt_video_vdn_tsx.t2.tsx:4:19`
+// Re-enable once fixed.
+itest_ignore!(_049_info_flag_script_jsx {
   args: "info http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts",
   output: "049_info_flag_script_jsx.out",
   http_server: true,
@@ -1564,12 +1579,6 @@ itest!(_056_make_temp_file_write_perm {
   output: "056_make_temp_file_write_perm.out",
 });
 
-// TODO(lucacasonato): remove --unstable when permissions goes stable
-itest!(_057_revoke_permissions {
-  args: "test -A --unstable 057_revoke_permissions.ts",
-  output: "057_revoke_permissions.out",
-});
-
 itest!(_058_tasks_microtasks_close {
   args: "run --quiet 058_tasks_microtasks_close.ts",
   output: "058_tasks_microtasks_close.ts.out",
@@ -1586,6 +1595,36 @@ itest!(_060_deno_doc_displays_all_overloads_in_details_view {
   output: "060_deno_doc_displays_all_overloads_in_details_view.ts.out",
 });
 
+#[cfg(unix)]
+#[test]
+fn _061_permissions_request() {
+  let args = "run --unstable 061_permissions_request.ts";
+  let output = "061_permissions_request.ts.out";
+  let input = b"g\nd\n";
+
+  util::test_pty(args, output, input);
+}
+
+#[cfg(unix)]
+#[test]
+fn _062_permissions_request_global() {
+  let args = "run --unstable 062_permissions_request_global.ts";
+  let output = "062_permissions_request_global.ts.out";
+  let input = b"g\n";
+
+  util::test_pty(args, output, input);
+}
+
+itest!(_063_permissions_revoke {
+  args: "run --unstable --allow-read=foo,bar 063_permissions_revoke.ts",
+  output: "063_permissions_revoke.ts.out",
+});
+
+itest!(_064_permissions_revoke_global {
+  args: "run --unstable --allow-read=foo,bar 064_permissions_revoke_global.ts",
+  output: "064_permissions_revoke_global.ts.out",
+});
+
 itest!(js_import_detect {
   args: "run --quiet --reload js_import_detect.ts",
   output: "js_import_detect.ts.out",
@@ -1901,7 +1940,7 @@ itest!(import_meta {
 });
 
 itest!(main_module {
-  args: "run --quiet --unstable --allow-read --reload main_module.ts",
+  args: "run --quiet --allow-read --reload main_module.ts",
   output: "main_module.ts.out",
 });
 
@@ -1961,6 +2000,12 @@ itest!(type_directives_redirect {
   http_server: true,
 });
 
+itest!(type_headers_deno_types {
+  args: "run --reload type_headers_deno_types.ts",
+  output: "type_headers_deno_types.ts.out",
+  http_server: true,
+});
+
 itest!(ts_type_imports {
   args: "run --reload ts_type_imports.ts",
   output: "ts_type_imports.ts.out",
@@ -2000,17 +2045,23 @@ itest!(unbuffered_stdout {
 
 // Cannot write the expression to evaluate as "console.log(typeof gc)"
 // because itest! splits args on whitespace.
-itest!(eval_v8_flags {
+itest!(v8_flags_eval {
   args: "eval --v8-flags=--expose-gc console.log(typeof(gc))",
   output: "v8_flags.js.out",
 });
 
-itest!(run_v8_flags {
+itest!(v8_flags_run {
   args: "run --v8-flags=--expose-gc v8_flags.js",
   output: "v8_flags.js.out",
 });
 
-itest!(run_v8_help {
+itest!(v8_flags_unrecognized {
+  args: "repl --v8-flags=--foo,bar,--trace-gc,-baz",
+  output: "v8_flags_unrecognized.out",
+  exit_code: 1,
+});
+
+itest!(v8_help {
   args: "repl --v8-flags=--help",
   output: "v8_help.out",
 });
@@ -2031,6 +2082,11 @@ itest!(wasm_async {
   output: "wasm_async.out",
 });
 
+itest!(wasm_streaming {
+  args: "run wasm_streaming.js",
+  output: "wasm_streaming.out",
+});
+
 itest!(wasm_unreachable {
   args: "run wasm_unreachable.js",
   output: "wasm_unreachable.out",
@@ -2187,22 +2243,51 @@ itest!(deno_lint {
   exit_code: 1,
 });
 
+itest!(deno_lint_json {
+  args:
+    "lint --unstable --json lint/file1.js lint/file2.ts lint/ignored_file.ts lint/malformed.js",
+  output: "lint/expected_json.out",
+  exit_code: 1,
+});
+
+itest!(deno_lint_ignore {
+  args: "lint --unstable --ignore=lint/file1.js,lint/malformed.js lint/",
+  output: "lint/expected_ignore.out",
+  exit_code: 1,
+});
+
 itest!(deno_lint_glob {
-  args: "lint --unstable lint/",
+  args: "lint --unstable --ignore=lint/malformed.js lint/",
   output: "lint/expected_glob.out",
   exit_code: 1,
 });
 
+itest!(deno_doc_builtin {
+  args: "doc",
+  output: "deno_doc_builtin.out",
+});
+
+itest!(deno_doc {
+  args: "doc deno_doc.ts",
+  output: "deno_doc.out",
+});
+
 itest!(compiler_js_error {
   args: "run --unstable compiler_js_error.ts",
   output: "compiler_js_error.ts.out",
   exit_code: 1,
 });
 
+itest!(import_file_with_colon {
+  args: "run --quiet --reload import_file_with_colon.ts",
+  output: "import_file_with_colon.ts.out",
+  http_server: true,
+});
+
 #[test]
 fn cafile_env_fetch() {
   use url::Url;
-  let g = util::http_server();
+  let _g = util::http_server();
   let deno_dir = TempDir::new().expect("tempdir fail");
   let module_url =
     Url::parse("https://localhost:5545/cli/tests/cafile_url_imports.ts")
@@ -2217,13 +2302,12 @@ fn cafile_env_fetch() {
     .output()
     .expect("Failed to spawn script");
   assert!(output.status.success());
-  drop(g);
 }
 
 #[test]
 fn cafile_fetch() {
   use url::Url;
-  let g = util::http_server();
+  let _g = util::http_server();
   let deno_dir = TempDir::new().expect("tempdir fail");
   let module_url =
     Url::parse("http://localhost:4545/cli/tests/cafile_url_imports.ts")
@@ -2241,12 +2325,11 @@ fn cafile_fetch() {
   assert!(output.status.success());
   let out = std::str::from_utf8(&output.stdout).unwrap();
   assert_eq!(out, "");
-  drop(g);
 }
 
 #[test]
 fn cafile_install_remote_module() {
-  let g = util::http_server();
+  let _g = util::http_server();
   let temp_dir = TempDir::new().expect("tempdir fail");
   let bin_dir = temp_dir.path().join("bin");
   std::fs::create_dir(&bin_dir).unwrap();
@@ -2282,15 +2365,11 @@ fn cafile_install_remote_module() {
     .expect("failed to spawn script");
   let stdout = std::str::from_utf8(&output.stdout).unwrap().trim();
   assert!(stdout.ends_with("foo"));
-
-  drop(deno_dir);
-  drop(temp_dir);
-  drop(g)
 }
 
 #[test]
 fn cafile_bundle_remote_exports() {
-  let g = util::http_server();
+  let _g = util::http_server();
 
   // First we have to generate a bundle of some remote module that has exports.
   let mod1 = "https://localhost:5545/cli/tests/subdir/mod1.ts";
@@ -2332,8 +2411,6 @@ fn cafile_bundle_remote_exports() {
     .trim()
     .ends_with("Hello"));
   assert_eq!(output.stderr, b"");
-
-  drop(g)
 }
 
 #[test]
@@ -2880,6 +2957,13 @@ async fn inspector_pause() {
 
 #[tokio::test]
 async fn inspector_port_collision() {
+  // Skip this test on WSL, which allows multiple processes to listen on the
+  // same port, rather than making `bind()` fail with `EADDRINUSE`.
+  if cfg!(target_os = "linux") && std::env::var_os("WSL_DISTRO_NAME").is_some()
+  {
+    return;
+  }
+
   let script = util::tests_path().join("inspector1.js");
   let inspect_flag = inspect_flag_with_unique_port("--inspect");
 
@@ -2892,10 +2976,10 @@ async fn inspector_port_collision() {
     .unwrap();
 
   let stderr_1 = child1.stderr.as_mut().unwrap();
-  let mut stderr_lines_1 = std::io::BufReader::new(stderr_1)
+  let mut stderr_1_lines = std::io::BufReader::new(stderr_1)
     .lines()
     .map(|r| r.unwrap());
-  let _ = extract_ws_url_from_stderr(&mut stderr_lines_1);
+  let _ = extract_ws_url_from_stderr(&mut stderr_1_lines);
 
   let mut child2 = util::deno_cmd()
     .arg("run")
@@ -2905,15 +2989,13 @@ async fn inspector_port_collision() {
     .spawn()
     .unwrap();
 
-  use std::io::Read;
-  let mut stderr_str_2 = String::new();
-  child2
-    .stderr
-    .as_mut()
-    .unwrap()
-    .read_to_string(&mut stderr_str_2)
-    .unwrap();
-  assert!(stderr_str_2.contains("Cannot start inspector server"));
+  let stderr_2 = child2.stderr.as_mut().unwrap();
+  let stderr_2_error_message = std::io::BufReader::new(stderr_2)
+    .lines()
+    .map(|r| r.unwrap())
+    .inspect(|line| assert!(!line.contains("Debugger listening")))
+    .find(|line| line.contains("Cannot start inspector server"));
+  assert!(stderr_2_error_message.is_some());
 
   child1.kill().unwrap();
   child1.wait().unwrap();
@@ -3108,7 +3190,7 @@ async fn inspector_runtime_evaluate_does_not_crash() {
     }
   }
 
-  std::mem::drop(stdin);
+  drop(stdin);
   child.wait().unwrap();
 }
 
@@ -3153,6 +3235,8 @@ fn set_raw_should_not_panic_on_no_tty() {
 }
 
 #[cfg(windows)]
+// Clippy suggests to remove the `NoStd` prefix from all variants. I disagree.
+#[allow(clippy::enum_variant_names)]
 enum WinProcConstraints {
   NoStdIn,
   NoStdOut,
diff --git a/cli/tests/lint/expected_ignore.out b/cli/tests/lint/expected_ignore.out
new file mode 100644
index 00000000000000..02b9d917c17e13
--- /dev/null
+++ b/cli/tests/lint/expected_ignore.out
@@ -0,0 +1,2 @@
+[WILDCARD]
+Found 1 problem
diff --git a/cli/tests/lint/expected_json.out b/cli/tests/lint/expected_json.out
new file mode 100644
index 00000000000000..8d2e83bb71031a
--- /dev/null
+++ b/cli/tests/lint/expected_json.out
@@ -0,0 +1,43 @@
+{
+  "diagnostics": [
+    {
+      "location": {
+        "filename": "[WILDCARD]",
+        "line": 1,
+        "col": 0
+      },
+      "message": "Ignore directive requires lint rule code",
+      "code": "ban-untagged-ignore",
+      "line_src": "// deno-lint-ignore",
+      "snippet_length": 19
+    },
+    {
+      "location": {
+        "filename": "[WILDCARD]",
+        "line": 2,
+        "col": 14
+      },
+      "message": "Empty block statement",
+      "code": "no-empty",
+      "line_src": "while (false) {}",
+      "snippet_length": 2
+    },
+    {
+      "location": {
+        "filename": "[WILDCARD]",
+        "line": 3,
+        "col": 12
+      },
+      "message": "Empty block statement",
+      "code": "no-empty",
+      "line_src": "} catch (e) {}",
+      "snippet_length": 2
+    }
+  ],
+  "errors": [
+    {
+      "file_path": "[WILDCARD]malformed.js",
+      "message": "Expected }, got <eof> at [WILDCARD]malformed.js:4:15"
+    }
+  ]
+}
diff --git a/cli/tests/lint/malformed.js b/cli/tests/lint/malformed.js
new file mode 100644
index 00000000000000..5ad4650d6b6d74
--- /dev/null
+++ b/cli/tests/lint/malformed.js
@@ -0,0 +1,4 @@
+// deno-fmt-ignore-file
+
+// intentionally malformed file
+export class A {
\ No newline at end of file
diff --git a/cli/tests/performance_stats.out b/cli/tests/performance_stats.out
index 9fea7715ad351d..c623d81da0df14 100644
--- a/cli/tests/performance_stats.out
+++ b/cli/tests/performance_stats.out
@@ -1,5 +1,5 @@
 [WILDCARD]
-Files: 43
+Files: 44
 Nodes: [WILDCARD]
 Identifiers: [WILDCARD]
 Symbols: [WILDCARD]
diff --git a/cli/tests/seed_random.js.out b/cli/tests/seed_random.js.out
index f51b858ff93b6b..2b5551c83f55a1 100644
--- a/cli/tests/seed_random.js.out
+++ b/cli/tests/seed_random.js.out
@@ -9,15 +9,15 @@
 0.5950178237266042
 0.22440633214343908
 Uint8Array(32) [
-  116, 125, 169, 69, 106, 231,  99,
-  39, 148, 188, 211, 41, 46, 211,
-  236, 141, 55, 10, 214, 63, 118,
+  116, 125, 169,  69, 106, 231,  99,
+   39, 148, 188, 211,  41,  46, 211,
+  236, 141,  55,  10, 214,  63, 118,
   230, 218, 249, 125, 161, 137, 110,
-  214, 36, 159, 154
+  214,  36, 159, 154
 ]
 Uint8Array(32) [
-  248, 21, 21, 9, 41, 0, 71, 124,
-  244, 209, 252, 151, 7, 10, 168, 250,
-  84, 170, 243, 140, 53, 47, 99, 212,
-  18, 146, 68, 48, 66, 222, 67, 112
+  248,  21,  21,   9, 41,   0,  71, 124,
+  244, 209, 252, 151,  7,  10, 168, 250,
+   84, 170, 243, 140, 53,  47,  99, 212,
+   18, 146,  68,  48, 66, 222,  67, 112
 ]
diff --git a/cli/tests/swc_syntax_error.ts.out b/cli/tests/swc_syntax_error.ts.out
index 0cc365e2007df8..53ed29cb679787 100644
--- a/cli/tests/swc_syntax_error.ts.out
+++ b/cli/tests/swc_syntax_error.ts.out
@@ -1 +1 @@
-error: Unexpected token Some(RBrace) at [WILDCARD]syntax_error.ts:4:0
+error: Unexpected token `}`. Expected an identifier, void, yield, null, await, break, a string literal, a numeric literal, true, false, `, -, import, this, typeof, {, [, ( at [WILDCARD]syntax_error.ts:4:0
diff --git a/cli/tests/type_directives_01.ts.out b/cli/tests/type_directives_01.ts.out
index f2fbdb15addf71..8bd20087bac498 100644
--- a/cli/tests/type_directives_01.ts.out
+++ b/cli/tests/type_directives_01.ts.out
@@ -1,3 +1,3 @@
 [WILDCARD]
-DEBUG TS - compiler::host.getSourceFile http://127.0.0.1:4545/xTypeScriptTypes.d.ts
+DEBUG TS - "compiler::host.getSourceFile" "http://127.0.0.1:4545/xTypeScriptTypes.d.ts"
 [WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/type_directives_02.ts.out b/cli/tests/type_directives_02.ts.out
index 1e630ca32d2c00..5cfdeefc28be6c 100644
--- a/cli/tests/type_directives_02.ts.out
+++ b/cli/tests/type_directives_02.ts.out
@@ -1,3 +1,3 @@
 [WILDCARD]
-DEBUG TS - compiler::host.getSourceFile file:[WILDCARD]cli/tests/subdir/type_reference.d.ts
+DEBUG TS - "compiler::host.getSourceFile" "file:[WILDCARD]cli/tests/subdir/type_reference.d.ts"
 [WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/type_headers_deno_types.ts b/cli/tests/type_headers_deno_types.ts
new file mode 100644
index 00000000000000..7e5438cdbf7015
--- /dev/null
+++ b/cli/tests/type_headers_deno_types.ts
@@ -0,0 +1,18 @@
+/**
+ * Following import uses two distinct ways to provide types:
+ * - X-TypeScript-Types headers
+ * - @deno-types directive
+ * 
+ * Because "@deno-types" directive must be placed by user explicitly it
+ * should have higher precedence than type header.
+ * 
+ * This is verified by providing conflicting type declaration
+ * depending on a way. There should be no TS error, otherwise
+ * it means that wrong type declarations are used (from X-TypeScript-Types)
+ * header.
+ */
+
+// @deno-types="http://127.0.0.1:4545/type_headers_deno_types.foo.d.ts"
+import { foo } from "http://127.0.0.1:4545/type_headers_deno_types.foo.js";
+
+foo("hello");
diff --git a/cli/tests/type_headers_deno_types.ts.out b/cli/tests/type_headers_deno_types.ts.out
new file mode 100644
index 00000000000000..f1e4ca1f87b862
--- /dev/null
+++ b/cli/tests/type_headers_deno_types.ts.out
@@ -0,0 +1,5 @@
+Download http://[WILDCARD]:4545/type_headers_deno_types.foo.js
+Download http://[WILDCARD]:4545/type_headers_deno_types.foo.d.ts
+Download http://[WILDCARD]:4545/type_headers_deno_types.d.ts
+Check [WILDCARD]/type_headers_deno_types.ts
+hello
diff --git a/cli/tests/unit/blob_test.ts b/cli/tests/unit/blob_test.ts
index 79e6f1f8f00ccd..494c2ac756ab0c 100644
--- a/cli/tests/unit/blob_test.ts
+++ b/cli/tests/unit/blob_test.ts
@@ -91,6 +91,12 @@ unitTest(async function blobStream(): Promise<void> {
   assertEquals(decode(bytes), "Hello World");
 });
 
+unitTest(async function blobArrayBuffer(): Promise<void> {
+  const uint = new Uint8Array([102, 111, 111]);
+  const blob = new Blob([uint]);
+  assertEquals(await blob.arrayBuffer(), uint.buffer);
+});
+
 unitTest(function blobConstructorNameIsBlob(): void {
   const blob = new Blob();
   assertEquals(blob.constructor.name, "Blob");
diff --git a/cli/tests/unit/body_test.ts b/cli/tests/unit/body_test.ts
index b7393ad0d23865..d9979e7035a5d6 100644
--- a/cli/tests/unit/body_test.ts
+++ b/cli/tests/unit/body_test.ts
@@ -1,5 +1,9 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { unitTest, assertEquals, assert } from "./test_util.ts";
+import {
+  unitTest,
+  assertEquals,
+  assert,
+} from "./test_util.ts";
 
 // just a hack to get a body object
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -39,6 +43,8 @@ unitTest(
     const response = await fetch(
       "http://localhost:4545/multipart_form_data.txt",
     );
+    assert(response.body instanceof ReadableStream);
+
     const text = await response.text();
 
     const body = buildBody(text, response.headers);
@@ -56,6 +62,8 @@ unitTest(
     const response = await fetch(
       "http://localhost:4545/cli/tests/subdir/form_urlencoded.txt",
     );
+    assert(response.body instanceof ReadableStream);
+
     const text = await response.text();
 
     const body = buildBody(text, response.headers);
diff --git a/cli/tests/unit/chown_test.ts b/cli/tests/unit/chown_test.ts
index 739e355de36632..93a3feec9093bc 100644
--- a/cli/tests/unit/chown_test.ts
+++ b/cli/tests/unit/chown_test.ts
@@ -1,5 +1,10 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { unitTest, assertEquals, assert } from "./test_util.ts";
+import {
+  unitTest,
+  assertEquals,
+  assertThrows,
+  assertThrowsAsync,
+} from "./test_util.ts";
 
 // chown on Windows is noop for now, so ignore its testing on Windows
 
@@ -28,11 +33,9 @@ unitTest(
   { ignore: Deno.build.os == "windows" },
   async function chownNoWritePermission(): Promise<void> {
     const filePath = "chown_test_file.txt";
-    try {
+    await assertThrowsAsync(async () => {
       await Deno.chown(filePath, 1000, 1000);
-    } catch (e) {
-      assert(e instanceof Deno.errors.PermissionDenied);
-    }
+    }, Deno.errors.PermissionDenied);
   },
 );
 
@@ -42,11 +45,9 @@ unitTest(
     const { uid, gid } = await getUidAndGid();
     const filePath = Deno.makeTempDirSync() + "/chown_test_file.txt";
 
-    try {
+    assertThrows(() => {
       Deno.chownSync(filePath, uid, gid);
-    } catch (e) {
-      assert(e instanceof Deno.errors.NotFound);
-    }
+    }, Deno.errors.NotFound);
   },
 );
 
@@ -56,11 +57,9 @@ unitTest(
     const { uid, gid } = await getUidAndGid();
     const filePath = (await Deno.makeTempDir()) + "/chown_test_file.txt";
 
-    try {
+    await assertThrowsAsync(async () => {
       await Deno.chown(filePath, uid, gid);
-    } catch (e) {
-      assert(e instanceof Deno.errors.NotFound);
-    }
+    }, Deno.errors.NotFound);
   },
 );
 
@@ -71,12 +70,10 @@ unitTest(
     const filePath = dirPath + "/chown_test_file.txt";
     Deno.writeTextFileSync(filePath, "Hello");
 
-    try {
+    assertThrows(() => {
       // try changing the file's owner to root
       Deno.chownSync(filePath, 0, 0);
-    } catch (e) {
-      assert(e instanceof Deno.errors.PermissionDenied);
-    }
+    }, Deno.errors.PermissionDenied);
     Deno.removeSync(dirPath, { recursive: true });
   },
 );
@@ -88,12 +85,10 @@ unitTest(
     const filePath = dirPath + "/chown_test_file.txt";
     await Deno.writeTextFile(filePath, "Hello");
 
-    try {
+    await assertThrowsAsync(async () => {
       // try changing the file's owner to root
       await Deno.chown(filePath, 0, 0);
-    } catch (e) {
-      assert(e instanceof Deno.errors.PermissionDenied);
-    }
+    }, Deno.errors.PermissionDenied);
     await Deno.remove(dirPath, { recursive: true });
   },
 );
diff --git a/cli/tests/unit/console_test.ts b/cli/tests/unit/console_test.ts
index e20a915555145e..60d2143c05822c 100644
--- a/cli/tests/unit/console_test.ts
+++ b/cli/tests/unit/console_test.ts
@@ -57,6 +57,23 @@ unitTest(function consoleTestStringifyComplexObjects(): void {
   assertEquals(stringify({ foo: "bar" }), `{ foo: "bar" }`);
 });
 
+unitTest(
+  function consoleTestStringifyComplexObjectsWithEscapedSequences(): void {
+    assertEquals(
+      stringify(["foo\b", "foo\f", "foo\n", "foo\r", "foo\t", "foo\v"]),
+      `[ "foo\\b", "foo\\f", "foo\\n", "foo\\r", "foo\\t", "foo\\v" ]`,
+    );
+    assertEquals(
+      stringify({ "foo\b": "bar\n", "bar\r": "baz\t" }),
+      `{ foo\\b: "bar\\n", bar\\r: "baz\\t" }`,
+    );
+    assertEquals(
+      stringify(new Set(["foo\n", "foo\r"])),
+      `Set { "foo\\n", "foo\\r" }`,
+    );
+  },
+);
+
 unitTest(function consoleTestStringifyQuotes(): void {
   assertEquals(stringify(["\\"]), `[ "\\\\" ]`);
   assertEquals(stringify(['\\,"']), `[ '\\\\,"' ]`);
@@ -590,6 +607,84 @@ unitTest(function consoleTestStringifyIterable() {
   */
 });
 
+unitTest(function consoleTestStringifyIterableWhenGrouped(): void {
+  const withOddNumberOfEls = new Float64Array(
+    [
+      2.1,
+      2.01,
+      2.001,
+      2.0001,
+      2.00001,
+      2.000001,
+      2.0000001,
+      2.00000001,
+      2.000000001,
+      2.0000000001,
+      2,
+    ],
+  );
+  assertEquals(
+    stringify(withOddNumberOfEls),
+    `Float64Array(11) [
+          2.1,         2.01,
+        2.001,       2.0001,
+      2.00001,     2.000001,
+    2.0000001,   2.00000001,
+  2.000000001, 2.0000000001,
+            2
+]`,
+  );
+  const withEvenNumberOfEls = new Float64Array(
+    [
+      2.1,
+      2.01,
+      2.001,
+      2.0001,
+      2.00001,
+      2.000001,
+      2.0000001,
+      2.00000001,
+      2.000000001,
+      2.0000000001,
+      2,
+      2,
+    ],
+  );
+  assertEquals(
+    stringify(withEvenNumberOfEls),
+    `Float64Array(12) [
+          2.1,         2.01,
+        2.001,       2.0001,
+      2.00001,     2.000001,
+    2.0000001,   2.00000001,
+  2.000000001, 2.0000000001,
+            2,            2
+]`,
+  );
+  const withThreeColumns = [
+    2,
+    2.1,
+    2.11,
+    2,
+    2.111,
+    2.1111,
+    2,
+    2.1,
+    2.11,
+    2,
+    2.1,
+  ];
+  assertEquals(
+    stringify(withThreeColumns),
+    `[
+  2,   2.1,   2.11,
+  2, 2.111, 2.1111,
+  2,   2.1,   2.11,
+  2,   2.1
+]`,
+  );
+});
+
 unitTest(async function consoleTestStringifyPromises(): Promise<void> {
   const pendingPromise = new Promise((_res, _rej) => {});
   assertEquals(stringify(pendingPromise), "Promise { <pending> }");
diff --git a/cli/tests/unit/dispatch_json_test.ts b/cli/tests/unit/dispatch_json_test.ts
index e10a503610846c..e5200aa5b9ac6b 100644
--- a/cli/tests/unit/dispatch_json_test.ts
+++ b/cli/tests/unit/dispatch_json_test.ts
@@ -1,4 +1,9 @@
-import { assert, unitTest, assertMatch, unreachable } from "./test_util.ts";
+import {
+  assertStrictEquals,
+  unitTest,
+  assertMatch,
+  unreachable,
+} from "./test_util.ts";
 
 const openErrorStackPattern = new RegExp(
   `^.*
@@ -28,10 +33,38 @@ declare global {
 }
 
 unitTest(function malformedJsonControlBuffer(): void {
-  const opId = Deno.core.ops()["op_open"];
-  const res = Deno.core.send(opId, new Uint8Array([1, 2, 3, 4, 5]));
-  const resText = new TextDecoder().decode(res);
-  const resJson = JSON.parse(resText);
-  assert(!resJson.ok);
-  assert(resJson.err);
+  const opId = Deno.core.ops()["op_open_sync"];
+  const argsBuf = new Uint8Array([1, 2, 3, 4, 5]);
+  const resBuf = Deno.core.send(opId, argsBuf);
+  const resText = new TextDecoder().decode(resBuf);
+  const resObj = JSON.parse(resText);
+  assertStrictEquals(resObj.ok, undefined);
+  assertStrictEquals(resObj.err.kind, "TypeError");
+  assertMatch(resObj.err.message, /\bexpected value\b/);
+});
+
+unitTest(function invalidPromiseId(): void {
+  const opId = Deno.core.ops()["op_open_async"];
+  const argsObj = {
+    promiseId: "1. NEIN!",
+    path: "/tmp/P.I.S.C.I.X/yeah",
+    mode: 0o666,
+    options: {
+      read: true,
+      write: true,
+      create: true,
+      truncate: false,
+      append: false,
+      createNew: false,
+    },
+  };
+  const argsText = JSON.stringify(argsObj);
+  const argsBuf = new TextEncoder().encode(argsText);
+  const resBuf = Deno.core.send(opId, argsBuf);
+  const resText = new TextDecoder().decode(resBuf);
+  const resObj = JSON.parse(resText);
+  console.error(resText);
+  assertStrictEquals(resObj.ok, undefined);
+  assertStrictEquals(resObj.err.kind, "TypeError");
+  assertMatch(resObj.err.message, /\bpromiseId\b/);
 });
diff --git a/cli/tests/unit/dispatch_minimal_test.ts b/cli/tests/unit/dispatch_minimal_test.ts
index 26296b469daa57..e10acfc54e449b 100644
--- a/cli/tests/unit/dispatch_minimal_test.ts
+++ b/cli/tests/unit/dispatch_minimal_test.ts
@@ -43,7 +43,7 @@ unitTest(function malformedMinimalControlBuffer(): void {
     header.byteLength / 4,
   );
   const arg = buf32[1];
-  const message = new TextDecoder().decode(res.slice(12)).trim();
+  const codeAndMessage = new TextDecoder().decode(res.slice(12)).trim();
   assert(arg < 0);
-  assertEquals(message, "Unparsable control buffer");
+  assertEquals(codeAndMessage, "TypeErrorUnparsable control buffer");
 });
diff --git a/cli/tests/unit/fetch_test.ts b/cli/tests/unit/fetch_test.ts
index 9562c48c7567e8..012ce7b3457524 100644
--- a/cli/tests/unit/fetch_test.ts
+++ b/cli/tests/unit/fetch_test.ts
@@ -938,3 +938,21 @@ unitTest(function fetchResponseEmptyConstructor(): void {
   assertEquals(response.bodyUsed, false);
   assertEquals([...response.headers], []);
 });
+
+unitTest(
+  { perms: { net: true, read: true } },
+  async function fetchCustomHttpClientSuccess(): Promise<
+    void
+  > {
+    const client = Deno.createHttpClient(
+      { caFile: "./cli/tests/tls/RootCA.crt" },
+    );
+    const response = await fetch(
+      "https://localhost:5545/cli/tests/fixture.json",
+      { client },
+    );
+    const json = await response.json();
+    assertEquals(json.name, "deno");
+    client.close();
+  },
+);
diff --git a/cli/tests/unit/filereader_test.ts b/cli/tests/unit/filereader_test.ts
new file mode 100644
index 00000000000000..9b2cf1d129d009
--- /dev/null
+++ b/cli/tests/unit/filereader_test.ts
@@ -0,0 +1,220 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+import { unitTest, assertEquals } from "./test_util.ts";
+
+unitTest(function fileReaderConstruct(): void {
+  const fr = new FileReader();
+  assertEquals(fr.readyState, FileReader.EMPTY);
+
+  assertEquals(FileReader.EMPTY, 0);
+  assertEquals(FileReader.LOADING, 1);
+  assertEquals(FileReader.DONE, 2);
+});
+
+unitTest(async function fileReaderLoadBlob(): Promise<void> {
+  await new Promise<void>((resolve) => {
+    const fr = new FileReader();
+    const b1 = new Blob(["Hello World"]);
+
+    assertEquals(fr.readyState, FileReader.EMPTY);
+
+    const hasOnEvents = {
+      load: false,
+      loadend: false,
+      loadstart: false,
+      progress: 0,
+    };
+    const hasDispatchedEvents = {
+      load: false,
+      loadend: false,
+      loadstart: false,
+      progress: 0,
+    };
+    let result: string | null = null;
+
+    fr.addEventListener("load", () => {
+      hasDispatchedEvents.load = true;
+    });
+    fr.addEventListener("loadend", () => {
+      hasDispatchedEvents.loadend = true;
+    });
+    fr.addEventListener("loadstart", () => {
+      hasDispatchedEvents.loadstart = true;
+    });
+    fr.addEventListener("progress", () => {
+      hasDispatchedEvents.progress += 1;
+    });
+
+    fr.onloadstart = (): void => {
+      hasOnEvents.loadstart = true;
+    };
+    fr.onprogress = (): void => {
+      assertEquals(fr.readyState, FileReader.LOADING);
+
+      hasOnEvents.progress += 1;
+    };
+    fr.onload = (): void => {
+      hasOnEvents.load = true;
+    };
+    fr.onloadend = (ev): void => {
+      hasOnEvents.loadend = true;
+      result = fr.result as string;
+
+      assertEquals(hasOnEvents.loadstart, true);
+      assertEquals(hasDispatchedEvents.loadstart, true);
+      assertEquals(hasOnEvents.load, true);
+      assertEquals(hasDispatchedEvents.load, true);
+      assertEquals(hasOnEvents.loadend, true);
+      assertEquals(hasDispatchedEvents.loadend, true);
+
+      assertEquals(fr.readyState, FileReader.DONE);
+
+      assertEquals(result, "Hello World");
+      assertEquals(ev.lengthComputable, true);
+      resolve();
+    };
+
+    fr.readAsText(b1);
+  });
+});
+
+unitTest(async function fileReaderLoadBlobDouble(): Promise<void> {
+  // impl note from https://w3c.github.io/FileAPI/
+  // Event handler for the load or error events could have started another load,
+  // if that happens the loadend event for the first load is not fired
+
+  const fr = new FileReader();
+  const b1 = new Blob(["First load"]);
+  const b2 = new Blob(["Second load"]);
+
+  await new Promise<void>((resolve) => {
+    let result: string | null = null;
+
+    fr.onload = (): void => {
+      result = fr.result as string;
+      assertEquals(result === "First load" || result === "Second load", true);
+
+      if (result === "First load") {
+        fr.readAsText(b2);
+      }
+    };
+    fr.onloadend = (): void => {
+      assertEquals(result, "Second load");
+
+      resolve();
+    };
+
+    fr.readAsText(b1);
+  });
+});
+
+unitTest(async function fileReaderLoadBlobArrayBuffer(): Promise<void> {
+  await new Promise<void>((resolve) => {
+    const fr = new FileReader();
+    const b1 = new Blob(["Hello World"]);
+    let result: ArrayBuffer | null = null;
+
+    fr.onloadend = (ev): void => {
+      assertEquals(fr.result instanceof ArrayBuffer, true);
+      result = fr.result as ArrayBuffer;
+
+      const decoder = new TextDecoder();
+      const text = decoder.decode(result);
+
+      assertEquals(text, "Hello World");
+      assertEquals(ev.lengthComputable, true);
+      resolve();
+    };
+
+    fr.readAsArrayBuffer(b1);
+  });
+});
+
+unitTest(async function fileReaderLoadBlobDataUrl(): Promise<void> {
+  await new Promise<void>((resolve) => {
+    const fr = new FileReader();
+    const b1 = new Blob(["Hello World"]);
+    let result: string | null = null;
+
+    fr.onloadend = (ev): void => {
+      result = fr.result as string;
+      assertEquals(
+        result,
+        "data:application/octet-stream;base64,SGVsbG8gV29ybGQ=",
+      );
+      assertEquals(ev.lengthComputable, true);
+      resolve();
+    };
+
+    fr.readAsDataURL(b1);
+  });
+});
+
+unitTest(async function fileReaderLoadBlobAbort(): Promise<void> {
+  await new Promise<void>((resolve) => {
+    const fr = new FileReader();
+    const b1 = new Blob(["Hello World"]);
+
+    const hasOnEvents = {
+      load: false,
+      loadend: false,
+      abort: false,
+    };
+
+    fr.onload = (): void => {
+      hasOnEvents.load = true;
+    };
+    fr.onloadend = (ev): void => {
+      hasOnEvents.loadend = true;
+
+      assertEquals(hasOnEvents.load, false);
+      assertEquals(hasOnEvents.loadend, true);
+      assertEquals(hasOnEvents.abort, true);
+
+      assertEquals(fr.readyState, FileReader.DONE);
+      assertEquals(fr.result, null);
+      assertEquals(ev.lengthComputable, false);
+      resolve();
+    };
+    fr.onabort = (): void => {
+      hasOnEvents.abort = true;
+    };
+
+    fr.readAsDataURL(b1);
+    fr.abort();
+  });
+});
+
+unitTest(async function fileReaderLoadBlobAbort(): Promise<void> {
+  await new Promise<void>((resolve) => {
+    const fr = new FileReader();
+    const b1 = new Blob(["Hello World"]);
+
+    const hasOnEvents = {
+      load: false,
+      loadend: false,
+      abort: false,
+    };
+
+    fr.onload = (): void => {
+      hasOnEvents.load = true;
+    };
+    fr.onloadend = (ev): void => {
+      hasOnEvents.loadend = true;
+
+      assertEquals(hasOnEvents.load, false);
+      assertEquals(hasOnEvents.loadend, true);
+      assertEquals(hasOnEvents.abort, true);
+
+      assertEquals(fr.readyState, FileReader.DONE);
+      assertEquals(fr.result, null);
+      assertEquals(ev.lengthComputable, false);
+      resolve();
+    };
+    fr.onabort = (): void => {
+      hasOnEvents.abort = true;
+    };
+
+    fr.readAsDataURL(b1);
+    fr.abort();
+  });
+});
diff --git a/cli/tests/unit/fs_events_test.ts b/cli/tests/unit/fs_events_test.ts
index f2dd59d796f002..d730011872c615 100644
--- a/cli/tests/unit/fs_events_test.ts
+++ b/cli/tests/unit/fs_events_test.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { unitTest, assert, assertThrows } from "./test_util.ts";
+import { unitTest, assert, assertEquals, assertThrows } from "./test_util.ts";
 
 // TODO(ry) Add more tests to specify format.
 
@@ -60,3 +60,21 @@ unitTest(
     assert(events[1].paths[0].includes(testDir));
   },
 );
+
+unitTest(
+  { perms: { read: true, write: true } },
+  async function watchFsReturn(): Promise<void> {
+    const testDir = await Deno.makeTempDir();
+    const iter = Deno.watchFs(testDir);
+
+    // Asynchronously loop events.
+    const eventsPromise = getTwoEvents(iter);
+
+    // Close the watcher.
+    await iter.return!();
+
+    // Expect zero events.
+    const events = await eventsPromise;
+    assertEquals(events, []);
+  },
+);
diff --git a/cli/tests/unit/permissions_test.ts b/cli/tests/unit/permissions_test.ts
index 7528768a13cd85..00572772123b78 100644
--- a/cli/tests/unit/permissions_test.ts
+++ b/cli/tests/unit/permissions_test.ts
@@ -1,27 +1,15 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { unitTest, assert } from "./test_util.ts";
+import { unitTest, assertThrowsAsync } from "./test_util.ts";
 
 unitTest(async function permissionInvalidName(): Promise<void> {
-  let thrown = false;
-  try {
+  await assertThrowsAsync(async () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     await Deno.permissions.query({ name: "foo" as any });
-  } catch (e) {
-    thrown = true;
-    assert(e instanceof Error);
-  } finally {
-    assert(thrown);
-  }
+  }, Error);
 });
 
 unitTest(async function permissionNetInvalidUrl(): Promise<void> {
-  let thrown = false;
-  try {
+  await assertThrowsAsync(async () => {
     await Deno.permissions.query({ name: "net", url: ":" });
-  } catch (e) {
-    thrown = true;
-    assert(e instanceof URIError);
-  } finally {
-    assert(thrown);
-  }
+  }, URIError);
 });
diff --git a/cli/tests/unit/process_test.ts b/cli/tests/unit/process_test.ts
index 966a9425bbe898..5b784497073be9 100644
--- a/cli/tests/unit/process_test.ts
+++ b/cli/tests/unit/process_test.ts
@@ -26,6 +26,29 @@ unitTest({ perms: { run: true } }, async function runSuccess(): Promise<void> {
   p.stdout.close();
   p.close();
 });
+
+unitTest({ perms: { run: true } }, async function runUrl(): Promise<void> {
+  const q = Deno.run({
+    cmd: ["python", "-c", "import sys; print sys.executable"],
+    stdout: "piped",
+  });
+  await q.status();
+  const pythonPath = new TextDecoder().decode(await q.output()).trim();
+  q.close();
+
+  const p = Deno.run({
+    cmd: [new URL(`file:///${pythonPath}`), "-c", "print('hello world')"],
+    stdout: "piped",
+    stderr: "null",
+  });
+  const status = await p.status();
+  assertEquals(status.success, true);
+  assertEquals(status.code, 0);
+  assertEquals(status.signal, undefined);
+  p.stdout.close();
+  p.close();
+});
+
 unitTest({ perms: { run: true } }, async function runStdinRid0(): Promise<
   void
 > {
diff --git a/cli/tests/unit/progressevent_test.ts b/cli/tests/unit/progressevent_test.ts
new file mode 100644
index 00000000000000..4f852e4585d954
--- /dev/null
+++ b/cli/tests/unit/progressevent_test.ts
@@ -0,0 +1,18 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+import { unitTest, assertEquals } from "./test_util.ts";
+
+unitTest(function progressEventConstruct(): void {
+  const progressEventDefs = new ProgressEvent("progressEventType", {});
+  assertEquals(progressEventDefs.lengthComputable, false);
+  assertEquals(progressEventDefs.loaded, 0);
+  assertEquals(progressEventDefs.total, 0);
+
+  const progressEvent = new ProgressEvent("progressEventType", {
+    lengthComputable: true,
+    loaded: 123,
+    total: 456,
+  });
+  assertEquals(progressEvent.lengthComputable, true);
+  assertEquals(progressEvent.loaded, 123);
+  assertEquals(progressEvent.total, 456);
+});
diff --git a/cli/tests/unit/stat_test.ts b/cli/tests/unit/stat_test.ts
index 092724395e7d9b..a7911b9c915ca3 100644
--- a/cli/tests/unit/stat_test.ts
+++ b/cli/tests/unit/stat_test.ts
@@ -17,7 +17,8 @@ unitTest({ perms: { read: true } }, function fstatSyncSuccess(): void {
   assert(fileInfo.size);
   assert(fileInfo.atime);
   assert(fileInfo.mtime);
-  assert(fileInfo.birthtime);
+  // The `birthtime` field is not available on Linux before kernel version 4.11.
+  assert(fileInfo.birthtime || Deno.build.os === "linux");
 
   Deno.close(file.rid);
 });
@@ -33,7 +34,8 @@ unitTest({ perms: { read: true } }, async function fstatSuccess(): Promise<
   assert(fileInfo.size);
   assert(fileInfo.atime);
   assert(fileInfo.mtime);
-  assert(fileInfo.birthtime);
+  // The `birthtime` field is not available on Linux before kernel version 4.11.
+  assert(fileInfo.birthtime || Deno.build.os === "linux");
 
   Deno.close(file.rid);
 });
diff --git a/cli/tests/unit/unit_tests.ts b/cli/tests/unit/unit_tests.ts
index ad820a55caca2a..03f0c6f1c566bb 100644
--- a/cli/tests/unit/unit_tests.ts
+++ b/cli/tests/unit/unit_tests.ts
@@ -23,6 +23,7 @@ import "./event_test.ts";
 import "./event_target_test.ts";
 import "./fetch_test.ts";
 import "./file_test.ts";
+import "./filereader_test.ts";
 import "./files_test.ts";
 import "./filter_function_test.ts";
 import "./form_data_test.ts";
@@ -43,6 +44,7 @@ import "./os_test.ts";
 import "./permissions_test.ts";
 import "./path_from_url_test.ts";
 import "./process_test.ts";
+import "./progressevent_test.ts";
 import "./real_path_test.ts";
 import "./read_dir_test.ts";
 import "./read_text_file_test.ts";
diff --git a/cli/tests/unit/url_search_params_test.ts b/cli/tests/unit/url_search_params_test.ts
index 6965fe1288fe08..c20db56dd2b36c 100644
--- a/cli/tests/unit/url_search_params_test.ts
+++ b/cli/tests/unit/url_search_params_test.ts
@@ -1,6 +1,44 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 import { unitTest, assert, assertEquals } from "./test_util.ts";
 
+unitTest(function urlSearchParamsWithMultipleSpaces(): void {
+  const init = { str: "this string has spaces in it" };
+  const searchParams = new URLSearchParams(init).toString();
+  assertEquals(searchParams, "str=this+string+has+spaces+in+it");
+});
+
+unitTest(function urlSearchParamsWithExclamation(): void {
+  const init = [
+    ["str", "hello, world!"],
+  ];
+  const searchParams = new URLSearchParams(init).toString();
+  assertEquals(searchParams, "str=hello%2C+world%21");
+});
+
+unitTest(function urlSearchParamsWithQuotes(): void {
+  const init = [
+    ["str", "'hello world'"],
+  ];
+  const searchParams = new URLSearchParams(init).toString();
+  assertEquals(searchParams, "str=%27hello+world%27");
+});
+
+unitTest(function urlSearchParamsWithBraket(): void {
+  const init = [
+    ["str", "(hello world)"],
+  ];
+  const searchParams = new URLSearchParams(init).toString();
+  assertEquals(searchParams, "str=%28hello+world%29");
+});
+
+unitTest(function urlSearchParamsWithTilde(): void {
+  const init = [
+    ["str", "hello~world"],
+  ];
+  const searchParams = new URLSearchParams(init).toString();
+  assertEquals(searchParams, "str=hello%7Eworld");
+});
+
 unitTest(function urlSearchParamsInitString(): void {
   const init = "c=4&a=2&b=3&%C3%A1=1";
   const searchParams = new URLSearchParams(init);
diff --git a/cli/tests/unit/url_test.ts b/cli/tests/unit/url_test.ts
index b50f6a25bd39c5..438e80892d8a05 100644
--- a/cli/tests/unit/url_test.ts
+++ b/cli/tests/unit/url_test.ts
@@ -27,6 +27,23 @@ unitTest(function urlParsing(): void {
   );
 });
 
+unitTest(function urlProtocolParsing(): void {
+  assertEquals(new URL("Aa+-.1://foo").protocol, "aa+-.1:");
+  assertEquals(new URL("aA+-.1://foo").protocol, "aa+-.1:");
+  assertThrows(() => new URL("1://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("+://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("-://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL(".://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("_://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("=://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("!://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL(`"://foo`), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("$://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("%://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("^://foo"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("*://foo"), TypeError, "Invalid URL.");
+});
+
 unitTest(function urlAuthenticationParsing(): void {
   const specialUrl = new URL("http://foo:bar@baz");
   assertEquals(specialUrl.username, "foo");
@@ -201,46 +218,35 @@ unitTest(function urlBackSlashes(): void {
   );
 });
 
+unitTest(function urlProtocolSlashes(): void {
+  assertEquals(new URL("http:foo").href, "http://foo/");
+  assertEquals(new URL("http://foo").href, "http://foo/");
+  assertEquals(new URL("file:foo").href, "file:///foo");
+  assertEquals(new URL("file://foo").href, "file://foo/");
+  assertEquals(new URL("abcd:foo").href, "abcd:foo");
+  assertEquals(new URL("abcd://foo").href, "abcd://foo");
+});
+
 unitTest(function urlRequireHost(): void {
   assertEquals(new URL("file:///").href, "file:///");
-  assertThrows(() => {
-    new URL("ftp:///");
-  });
-  assertThrows(() => {
-    new URL("http:///");
-  });
-  assertThrows(() => {
-    new URL("https:///");
-  });
-  assertThrows(() => {
-    new URL("ws:///");
-  });
-  assertThrows(() => {
-    new URL("wss:///");
-  });
+  assertThrows(() => new URL("ftp:///"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("http:///"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("https:///"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("ws:///"), TypeError, "Invalid URL.");
+  assertThrows(() => new URL("wss:///"), TypeError, "Invalid URL.");
 });
 
 unitTest(function urlDriveLetter() {
-  assertEquals(
-    new URL("file:///C:").href,
-    Deno.build.os == "windows" ? "file:///C:/" : "file:///C:",
-  );
-  assertEquals(new URL("http://example.com/C:").href, "http://example.com/C:");
-});
-
-unitTest(function urlUncHostname() {
-  assertEquals(
-    new URL("file:////").href,
-    Deno.build.os == "windows" ? "file:///" : "file:////",
-  );
-  assertEquals(
-    new URL("file:////server").href,
-    Deno.build.os == "windows" ? "file://server/" : "file:////server",
-  );
-  assertEquals(
-    new URL("file:////server/file").href,
-    Deno.build.os == "windows" ? "file://server/file" : "file:////server/file",
-  );
+  assertEquals(new URL("file:///C:").href, "file:///C:");
+  assertEquals(new URL("file:///C:/").href, "file:///C:/");
+  assertEquals(new URL("file:///C:/..").href, "file:///C:/");
+  // Don't recognise drive letters with extra leading slashes.
+  assertEquals(new URL("file:////C:/..").href, "file:///");
+  // Drop the hostname if a drive letter is parsed.
+  assertEquals(new URL("file://foo/C:").href, "file:///C:");
+  // Don't recognise drive letters in non-file protocols.
+  assertEquals(new URL("http://foo/C:/..").href, "http://foo/");
+  assertEquals(new URL("abcd://foo/C:/..").href, "abcd://foo/");
 });
 
 unitTest(function urlHostnameUpperCase() {
@@ -254,96 +260,99 @@ unitTest(function urlEmptyPath() {
   assertEquals(new URL("abcd://foo").pathname, "");
 });
 
+unitTest(function urlPathRepeatedSlashes() {
+  assertEquals(new URL("http://foo//bar//").pathname, "//bar//");
+  assertEquals(new URL("file://foo///bar//").pathname, "/bar//");
+  assertEquals(new URL("abcd://foo//bar//").pathname, "//bar//");
+});
+
 unitTest(function urlTrim() {
   assertEquals(new URL(" http://example.com  ").href, "http://example.com/");
 });
 
 unitTest(function urlEncoding() {
   assertEquals(
-    new URL("https://a !$&*()=,;+'\"@example.com").username,
+    new URL("http://a !$&*()=,;+'\"@example.com").username,
     "a%20!$&*()%3D,%3B+%27%22",
   );
   assertEquals(
-    new URL("https://:a !$&*()=,;+'\"@example.com").password,
+    new URL("http://:a !$&*()=,;+'\"@example.com").password,
     "a%20!$&*()%3D,%3B+%27%22",
   );
-  assertEquals(new URL("abcde://mañana/c?d#e").hostname, "ma%C3%B1ana");
   // https://url.spec.whatwg.org/#idna
-  assertEquals(new URL("https://mañana/c?d#e").hostname, "xn--maana-pta");
+  assertEquals(new URL("http://mañana/c?d#e").hostname, "xn--maana-pta");
+  assertEquals(new URL("abcd://mañana/c?d#e").hostname, "ma%C3%B1ana");
   assertEquals(
-    new URL("https://example.com/a ~!@$&*()=:/,;+'\"\\").pathname,
+    new URL("http://example.com/a ~!@$&*()=:/,;+'\"\\").pathname,
     "/a%20~!@$&*()=:/,;+'%22/",
   );
   assertEquals(
-    new URL("https://example.com?a ~!@$&*()=:/,;?+'\"\\").search,
+    new URL("http://example.com?a ~!@$&*()=:/,;?+'\"\\").search,
     "?a%20~!@$&*()=:/,;?+%27%22\\",
   );
   assertEquals(
-    new URL("https://example.com#a ~!@#$&*()=:/,;?+'\"\\").hash,
+    new URL("abcd://example.com?a ~!@$&*()=:/,;?+'\"\\").search,
+    "?a%20~!@$&*()=:/,;?+'%22\\",
+  );
+  assertEquals(
+    new URL("http://example.com#a ~!@#$&*()=:/,;?+'\"\\").hash,
     "#a%20~!@#$&*()=:/,;?+'%22\\",
   );
 });
 
-unitTest(function urlBaseURL(): void {
-  const base = new URL(
-    "https://foo:bar@baz.qat:8000/qux/quux?foo=bar&baz=12#qat",
-  );
-  const url = new URL("/foo/bar?baz=foo#qux", base);
-  assertEquals(url.href, "https://foo:bar@baz.qat:8000/foo/bar?baz=foo#qux");
+unitTest(function urlBase(): void {
+  assertEquals(new URL("d", new URL("http://foo/a?b#c")).href, "http://foo/d");
 
-  assertEquals(
-    new URL("D", "https://foo.bar/path/a/b/c/d").href,
-    "https://foo.bar/path/a/b/c/D",
-  );
+  assertEquals(new URL("", "http://foo/a/b?c#d").href, "http://foo/a/b?c");
+  assertEquals(new URL("", "file://foo/a/b?c#d").href, "file://foo/a/b?c");
+  assertEquals(new URL("", "abcd://foo/a/b?c#d").href, "abcd://foo/a/b?c");
 
-  assertEquals(new URL("D", "https://foo.bar").href, "https://foo.bar/D");
-  assertEquals(new URL("D", "https://foo.bar/").href, "https://foo.bar/D");
+  assertEquals(new URL("#e", "http://foo/a/b?c#d").href, "http://foo/a/b?c#e");
+  assertEquals(new URL("#e", "file://foo/a/b?c#d").href, "file://foo/a/b?c#e");
+  assertEquals(new URL("#e", "abcd://foo/a/b?c#d").href, "abcd://foo/a/b?c#e");
 
-  assertEquals(
-    new URL("/d", "https://foo.bar/path/a/b/c/d").href,
-    "https://foo.bar/d",
-  );
-});
+  assertEquals(new URL("?e", "http://foo/a/b?c#d").href, "http://foo/a/b?e");
+  assertEquals(new URL("?e", "file://foo/a/b?c#d").href, "file://foo/a/b?e");
+  assertEquals(new URL("?e", "abcd://foo/a/b?c#d").href, "abcd://foo/a/b?e");
 
-unitTest(function urlBaseString(): void {
-  const url = new URL(
-    "/foo/bar?baz=foo#qux",
-    "https://foo:bar@baz.qat:8000/qux/quux?foo=bar&baz=12#qat",
-  );
-  assertEquals(url.href, "https://foo:bar@baz.qat:8000/foo/bar?baz=foo#qux");
-});
+  assertEquals(new URL("e", "http://foo/a/b?c#d").href, "http://foo/a/e");
+  assertEquals(new URL("e", "file://foo/a/b?c#d").href, "file://foo/a/e");
+  assertEquals(new URL("e", "abcd://foo/a/b?c#d").href, "abcd://foo/a/e");
+
+  assertEquals(new URL(".", "http://foo/a/b?c#d").href, "http://foo/a/");
+  assertEquals(new URL(".", "file://foo/a/b?c#d").href, "file://foo/a/");
+  assertEquals(new URL(".", "abcd://foo/a/b?c#d").href, "abcd://foo/a/");
 
-unitTest(function urlRelativeWithBase(): void {
-  assertEquals(new URL("", "file:///a/a/a").href, "file:///a/a/a");
-  assertEquals(new URL(".", "file:///a/a/a").href, "file:///a/a/");
-  assertEquals(new URL("..", "file:///a/a/a").href, "file:///a/");
-  assertEquals(new URL("b", "file:///a/a/a").href, "file:///a/a/b");
-  assertEquals(new URL("b", "file:///a/a/a/").href, "file:///a/a/a/b");
-  assertEquals(new URL("b/", "file:///a/a/a").href, "file:///a/a/b/");
-  assertEquals(new URL("../b", "file:///a/a/a").href, "file:///a/b");
+  assertEquals(new URL("..", "http://foo/a/b?c#d").href, "http://foo/");
+  assertEquals(new URL("..", "file://foo/a/b?c#d").href, "file://foo/");
+  assertEquals(new URL("..", "abcd://foo/a/b?c#d").href, "abcd://foo/");
+
+  assertEquals(new URL("/e", "http://foo/a/b?c#d").href, "http://foo/e");
+  assertEquals(new URL("/e", "file://foo/a/b?c#d").href, "file://foo/e");
+  assertEquals(new URL("/e", "abcd://foo/a/b?c#d").href, "abcd://foo/e");
+
+  assertEquals(new URL("//bar", "http://foo/a/b?c#d").href, "http://bar/");
+  assertEquals(new URL("//bar", "file://foo/a/b?c#d").href, "file://bar/");
+  assertEquals(new URL("//bar", "abcd://foo/a/b?c#d").href, "abcd://bar");
+
+  assertEquals(new URL("efgh:", "http://foo/a/b?c#d").href, "efgh:");
+  assertEquals(new URL("efgh:", "file://foo/a/b?c#d").href, "efgh:");
+  assertEquals(new URL("efgh:", "abcd://foo/a/b?c#d").href, "efgh:");
 });
 
 unitTest(function urlDriveLetterBase() {
-  assertEquals(
-    new URL("/b", "file:///C:/a/b").href,
-    Deno.build.os == "windows" ? "file:///C:/b" : "file:///b",
-  );
-  assertEquals(
-    new URL("D:", "file:///C:/a/b").href,
-    Deno.build.os == "windows" ? "file:///D:/" : "file:///C:/a/D:",
-  );
-  assertEquals(
-    new URL("/D:", "file:///C:/a/b").href,
-    Deno.build.os == "windows" ? "file:///D:/" : "file:///D:",
-  );
-  assertEquals(
-    new URL("D:/b", "file:///C:/a/b").href,
-    Deno.build.os == "windows" ? "file:///D:/b" : "file:///C:/a/D:/b",
-  );
+  assertEquals(new URL("/b", "file:///C:/a/b").href, "file:///C:/b");
+  assertEquals(new URL("/D:", "file:///C:/a/b").href, "file:///D:");
 });
 
-unitTest(function emptyBasePath(): void {
-  assertEquals(new URL("", "http://example.com").href, "http://example.com/");
+unitTest(function urlSameProtocolBase() {
+  assertEquals(new URL("http:", "http://foo/a").href, "http://foo/a");
+  assertEquals(new URL("file:", "file://foo/a").href, "file://foo/a");
+  assertEquals(new URL("abcd:", "abcd://foo/a").href, "abcd:");
+
+  assertEquals(new URL("http:b", "http://foo/a").href, "http://foo/b");
+  assertEquals(new URL("file:b", "file://foo/a").href, "file://foo/b");
+  assertEquals(new URL("abcd:b", "abcd://foo/a").href, "abcd:b");
 });
 
 unitTest(function deletingAllParamsRemovesQuestionMarkFromURL(): void {
@@ -391,12 +400,6 @@ unitTest(function protocolNotHttpOrFile() {
   assertEquals(url.origin, "null");
 });
 
-unitTest(function createBadUrl(): void {
-  assertThrows(() => {
-    new URL("0.0.0.0:8080");
-  });
-});
-
 unitTest(function throwForInvalidPortConstructor(): void {
   const urls = [
     // If port is greater than 2^16 − 1, validation error, return failure.
@@ -416,14 +419,6 @@ unitTest(function throwForInvalidPortConstructor(): void {
   new URL("https://baz.qat:0");
 });
 
-unitTest(function throwForInvalidSchemeConstructor(): void {
-  assertThrows(
-    () => new URL("invalid_scheme://baz.qat"),
-    TypeError,
-    "Invalid URL.",
-  );
-});
-
 unitTest(function doNotOverridePortIfInvalid(): void {
   const initialPort = "3000";
   const ports = [
diff --git a/cli/tests/v8_flags_unrecognized.out b/cli/tests/v8_flags_unrecognized.out
new file mode 100644
index 00000000000000..56e70f830920cf
--- /dev/null
+++ b/cli/tests/v8_flags_unrecognized.out
@@ -0,0 +1,5 @@
+error: V8 did not recognize flag '--foo'
+error: V8 did not recognize flag 'bar'
+error: V8 did not recognize flag '-baz'
+
+For a list of V8 flags, use '--v8-flags=--help'
diff --git a/cli/tests/v8_help.out b/cli/tests/v8_help.out
index 3d7aac28dba580..006d7355792562 100644
--- a/cli/tests/v8_help.out
+++ b/cli/tests/v8_help.out
@@ -1,3 +1,4 @@
 [WILDCARD]
-Synopsis:
-[WILDCARD]d8[WILDCARD]
\ No newline at end of file
+Options:
+[WILDCARD]
+  --trace-gc [WILDCARD]
diff --git a/cli/tests/wasm_streaming.js b/cli/tests/wasm_streaming.js
new file mode 100644
index 00000000000000..6c94573251ebb5
--- /dev/null
+++ b/cli/tests/wasm_streaming.js
@@ -0,0 +1,29 @@
+// The following blob can be created by taking the following s-expr and pass
+// it through wat2wasm.
+//    (module
+//      (func $add (param $a i32) (param $b i32) (result i32)
+//        local.get $a
+//        local.get $b
+//        i32.add)
+//      (export "add" (func $add))
+//    )
+// deno-fmt-ignore
+const bytes = new Uint8Array([
+  0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,
+  0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x07, 0x01,
+  0x03, 0x61, 0x64, 0x64, 0x00, 0x00, 0x0a, 0x09, 0x01, 0x07, 0x00, 0x20,
+  0x00, 0x20, 0x01, 0x6a, 0x0b
+]);
+
+async function main() {
+  const wasm = await WebAssembly.instantiateStreaming(bytes, {
+  });
+
+  const result = wasm.instance.exports.add(1, 3);
+  console.log("1 + 3 =", result);
+  if (result != 4) {
+    throw Error("bad");
+  }
+}
+
+main();
diff --git a/cli/tests/wasm_streaming.out b/cli/tests/wasm_streaming.out
new file mode 100644
index 00000000000000..5cdf17de738b6c
--- /dev/null
+++ b/cli/tests/wasm_streaming.out
@@ -0,0 +1 @@
+1 + 3 = 4
diff --git a/cli/tests/wasm_unreachable.out b/cli/tests/wasm_unreachable.out
index 64978bbb886a65..67437c01ea0916 100644
--- a/cli/tests/wasm_unreachable.out
+++ b/cli/tests/wasm_unreachable.out
@@ -1,3 +1,3 @@
 error: Uncaught RuntimeError: unreachable
     at unreachable (<anonymous>:0:40)
-    at [WILDCARD]/deno/cli/tests/wasm_unreachable.js:[WILDCARD]:18
+    at [WILDCARD]/cli/tests/wasm_unreachable.js:[WILDCARD]:18
diff --git a/cli/text_encoding.rs b/cli/text_encoding.rs
new file mode 100644
index 00000000000000..9d8e5bcc9cfb2d
--- /dev/null
+++ b/cli/text_encoding.rs
@@ -0,0 +1,94 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+use encoding_rs::*;
+use std::{
+  borrow::Cow,
+  io::{Error, ErrorKind},
+};
+
+/// Attempts to detect the character encoding of the provided bytes.
+///
+/// Supports UTF-8, UTF-16 Little Endian and UTF-16 Big Endian.
+pub fn detect_charset(bytes: &'_ [u8]) -> &'static str {
+  const UTF16_LE_BOM: &[u8] = b"\xFF\xFE";
+  const UTF16_BE_BOM: &[u8] = b"\xFE\xFF";
+
+  if bytes.starts_with(UTF16_LE_BOM) {
+    "utf-16le"
+  } else if bytes.starts_with(UTF16_BE_BOM) {
+    "utf-16be"
+  } else {
+    // Assume everything else is utf-8
+    "utf-8"
+  }
+}
+
+/// Attempts to convert the provided bytes to a UTF-8 string.
+///
+/// Supports all encodings supported by the encoding_rs crate, which includes
+/// all encodings specified in the WHATWG Encoding Standard, and only those
+/// encodings (see: https://encoding.spec.whatwg.org/).
+pub fn convert_to_utf8<'a>(
+  bytes: &'a [u8],
+  charset: &'_ str,
+) -> Result<Cow<'a, str>, Error> {
+  match Encoding::for_label(charset.as_bytes()) {
+    Some(encoding) => encoding
+      .decode_without_bom_handling_and_without_replacement(bytes)
+      .ok_or_else(|| ErrorKind::InvalidData.into()),
+    None => Err(Error::new(
+      ErrorKind::InvalidInput,
+      format!("Unsupported charset: {}", charset),
+    )),
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  fn test_detection(test_data: &[u8], expected_charset: &str) {
+    let detected_charset = detect_charset(test_data);
+    assert_eq!(
+      expected_charset.to_lowercase(),
+      detected_charset.to_lowercase()
+    );
+  }
+
+  #[test]
+  fn test_detection_utf8_no_bom() {
+    let test_data = "Hello UTF-8 it is \u{23F0} for Deno!"
+      .to_owned()
+      .into_bytes();
+    test_detection(&test_data, "utf-8");
+  }
+
+  #[test]
+  fn test_detection_utf16_little_endian() {
+    let test_data = b"\xFF\xFEHello UTF-16LE".to_owned().to_vec();
+    test_detection(&test_data, "utf-16le");
+  }
+
+  #[test]
+  fn test_detection_utf16_big_endian() {
+    let test_data = b"\xFE\xFFHello UTF-16BE".to_owned().to_vec();
+    test_detection(&test_data, "utf-16be");
+  }
+
+  #[test]
+  fn test_decoding_unsupported_charset() {
+    let test_data = Vec::new();
+    let result = convert_to_utf8(&test_data, "utf-32le");
+    assert!(result.is_err());
+    let err = result.expect_err("Err expected");
+    assert!(err.kind() == ErrorKind::InvalidInput);
+  }
+
+  #[test]
+  fn test_decoding_invalid_utf8() {
+    let test_data = b"\xFE\xFE\xFF\xFF".to_vec();
+    let result = convert_to_utf8(&test_data, "utf-8");
+    assert!(result.is_err());
+    let err = result.expect_err("Err expected");
+    assert!(err.kind() == ErrorKind::InvalidData);
+  }
+}
diff --git a/cli/tokio_util.rs b/cli/tokio_util.rs
index 0e1257da7bce1c..e477cd5eee010a 100644
--- a/cli/tokio_util.rs
+++ b/cli/tokio_util.rs
@@ -12,7 +12,7 @@ pub fn create_basic_runtime() -> tokio::runtime::Runtime {
 // TODO(ry) rename to run_local ?
 pub fn run_basic<F, R>(future: F) -> R
 where
-  F: std::future::Future<Output = R> + 'static,
+  F: std::future::Future<Output = R>,
 {
   let mut rt = create_basic_runtime();
   rt.block_on(future)
diff --git a/cli/tsc.rs b/cli/tsc.rs
index dafee0259d6500..5fa8b67a35bc67 100644
--- a/cli/tsc.rs
+++ b/cli/tsc.rs
@@ -3,7 +3,6 @@ use crate::colors;
 use crate::diagnostics::Diagnostic;
 use crate::diagnostics::DiagnosticItem;
 use crate::disk_cache::DiskCache;
-use crate::doc::Location;
 use crate::file_fetcher::SourceFile;
 use crate::file_fetcher::SourceFileFetcher;
 use crate::flags::Flags;
@@ -19,23 +18,15 @@ use crate::permissions::Permissions;
 use crate::source_maps::SourceMapGetter;
 use crate::startup_data;
 use crate::state::State;
-use crate::swc_common::comments::CommentKind;
-use crate::swc_common::Span;
-use crate::swc_ecma_ast;
-use crate::swc_ecma_visit;
-use crate::swc_ecma_visit::Node;
-use crate::swc_ecma_visit::Visit;
 use crate::swc_util::AstParser;
+use crate::swc_util::Location;
 use crate::swc_util::SwcDiagnosticBuffer;
 use crate::version;
-use crate::web_worker::WebWorker;
-use crate::worker::WorkerEvent;
+use crate::worker::Worker;
 use core::task::Context;
-use deno_core::Buf;
 use deno_core::ErrBox;
 use deno_core::ModuleSpecifier;
 use deno_core::StartupData;
-use futures::future::Either;
 use futures::future::Future;
 use futures::future::FutureExt;
 use log::debug;
@@ -55,11 +46,16 @@ use std::ops::Deref;
 use std::ops::DerefMut;
 use std::path::PathBuf;
 use std::pin::Pin;
+use std::rc::Rc;
 use std::str;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::Mutex;
 use std::task::Poll;
+use swc_common::comments::CommentKind;
+use swc_common::Span;
+use swc_ecmascript::visit::Node;
+use swc_ecmascript::visit::Visit;
 use url::Url;
 
 pub const AVAILABLE_LIBS: &[&str] = &[
@@ -130,30 +126,50 @@ pub struct CompiledModule {
   pub name: String,
 }
 
-pub struct CompilerWorker(WebWorker);
+pub struct CompilerWorker {
+  worker: Worker,
+  response: Arc<Mutex<Option<String>>>,
+}
 
 impl CompilerWorker {
-  pub fn new(name: String, startup_data: StartupData, state: State) -> Self {
-    let state_ = state.clone();
-    let mut worker = WebWorker::new(name, startup_data, state_, false);
+  pub fn new(
+    name: String,
+    startup_data: StartupData,
+    state: &Rc<State>,
+  ) -> Self {
+    let mut worker = Worker::new(name, startup_data, state);
+    let response = Arc::new(Mutex::new(None));
     {
       let isolate = &mut worker.isolate;
-      ops::compiler::init(isolate, &state);
+      ops::runtime::init(isolate, &state);
+      ops::errors::init(isolate, &state);
+      ops::timers::init(isolate, &state);
+      ops::compiler::init(isolate, &state, response.clone());
     }
-    Self(worker)
+
+    Self { worker, response }
+  }
+
+  pub fn get_response(&mut self) -> String {
+    let mut maybe_response = self.response.lock().unwrap();
+    assert!(
+      maybe_response.is_some(),
+      "Unexpected missing response from TS compiler"
+    );
+    maybe_response.take().unwrap()
   }
 }
 
 impl Deref for CompilerWorker {
-  type Target = WebWorker;
+  type Target = Worker;
   fn deref(&self) -> &Self::Target {
-    &self.0
+    &self.worker
   }
 }
 
 impl DerefMut for CompilerWorker {
   fn deref_mut(&mut self) -> &mut Self::Target {
-    &mut self.0
+    &mut self.worker
   }
 }
 
@@ -162,7 +178,7 @@ impl Future for CompilerWorker {
 
   fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
     let inner = self.get_mut();
-    inner.0.poll_unpin(cx)
+    inner.worker.poll_unpin(cx)
   }
 }
 
@@ -187,21 +203,16 @@ lazy_static! {
 /// Create a new worker with snapshot of TS compiler and setup compiler's
 /// runtime.
 fn create_compiler_worker(
-  global_state: GlobalState,
+  global_state: &Arc<GlobalState>,
   permissions: Permissions,
 ) -> CompilerWorker {
   // TODO(bartlomieju): these $deno$ specifiers should be unified for all subcommands
   // like 'eval', 'repl'
   let entry_point =
     ModuleSpecifier::resolve_url_or_path("./__$deno$ts_compiler.ts").unwrap();
-  let worker_state = State::new(
-    global_state.clone(),
-    Some(permissions),
-    entry_point,
-    None,
-    true,
-  )
-  .expect("Unable to create worker state");
+  let worker_state =
+    State::new(&global_state, Some(permissions), entry_point, None, true)
+      .expect("Unable to create worker state");
 
   // TODO(bartlomieju): this metric is never used anywhere
   // Count how many times we start the compiler worker.
@@ -210,9 +221,11 @@ fn create_compiler_worker(
   let mut worker = CompilerWorker::new(
     "TS".to_string(),
     startup_data::compiler_isolate_init(),
-    worker_state,
+    &worker_state,
   );
-  worker.execute("bootstrap.tsCompilerRuntime()").unwrap();
+  worker
+    .execute("globalThis.bootstrapCompilerRuntime()")
+    .unwrap();
   worker
 }
 
@@ -397,13 +410,6 @@ struct CompileResponse {
   build_info: Option<String>,
   stats: Option<Vec<Stat>>,
 }
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct TranspileResponse {
-  diagnostics: Diagnostic,
-  emit_map: HashMap<String, EmittedSource>,
-  stats: Option<Vec<Stat>>,
-}
 
 // TODO(bartlomieju): possible deduplicate once TS refactor is stabilized
 #[derive(Deserialize)]
@@ -464,7 +470,7 @@ impl TsCompiler {
       if let Some(metadata) = self.get_metadata(&url) {
         // Compare version hashes
         let version_hash_to_validate = source_code_version_hash(
-          &source_file.source_code,
+          &source_file.source_code.as_bytes(),
           version::DENO,
           &self.config.hash,
         );
@@ -505,7 +511,7 @@ impl TsCompiler {
           .fetch_cached_source_file(&specifier, Permissions::allow_all())
         {
           let existing_hash = crate::checksum::gen(&[
-            &source_file.source_code,
+            &source_file.source_code.as_bytes(),
             version::DENO.as_bytes(),
           ]);
           let expected_hash =
@@ -538,7 +544,7 @@ impl TsCompiler {
   /// compiler.
   pub async fn compile(
     &self,
-    global_state: GlobalState,
+    global_state: &Arc<GlobalState>,
     source_file: &SourceFile,
     target: TargetLib,
     permissions: Permissions,
@@ -570,10 +576,7 @@ impl TsCompiler {
     };
     let root_names = vec![module_url.to_string()];
     let unstable = self.flags.unstable;
-    let performance = match self.flags.log_level {
-      Some(Level::Debug) => true,
-      _ => false,
-    };
+    let performance = matches!(self.flags.log_level, Some(Level::Debug));
     let compiler_config = self.config.clone();
     let cwd = std::env::current_dir().unwrap();
 
@@ -604,17 +607,15 @@ impl TsCompiler {
       }),
     };
 
-    let req_msg = j.to_string().into_boxed_str().into_boxed_bytes();
+    let req_msg = j.to_string();
 
     // TODO(bartlomieju): lift this call up - TSC shouldn't print anything
     info!("{} {}", colors::green("Check"), module_url.to_string());
 
-    let msg =
+    let json_str =
       execute_in_same_thread(global_state, permissions, req_msg).await?;
 
-    let json_str = std::str::from_utf8(&msg).unwrap();
-
-    let compile_response: CompileResponse = serde_json::from_str(json_str)?;
+    let compile_response: CompileResponse = serde_json::from_str(&json_str)?;
 
     if !compile_response.diagnostics.items.is_empty() {
       return Err(ErrBox::from(compile_response.diagnostics));
@@ -633,7 +634,7 @@ impl TsCompiler {
   /// all the dependencies for that module.
   pub async fn bundle(
     &self,
-    global_state: GlobalState,
+    global_state: &Arc<GlobalState>,
     module_specifier: ModuleSpecifier,
   ) -> Result<String, ErrBox> {
     debug!(
@@ -681,10 +682,8 @@ impl TsCompiler {
     let root_names = vec![module_specifier.to_string()];
     let target = "main";
     let cwd = std::env::current_dir().unwrap();
-    let performance = match global_state.flags.log_level {
-      Some(Level::Debug) => true,
-      _ => false,
-    };
+    let performance =
+      matches!(global_state.flags.log_level, Some(Level::Debug));
 
     let compiler_config = self.config.clone();
 
@@ -713,13 +712,12 @@ impl TsCompiler {
       }),
     };
 
-    let req_msg = j.to_string().into_boxed_str().into_boxed_bytes();
+    let req_msg = j.to_string();
 
-    let msg =
+    let json_str =
       execute_in_same_thread(global_state, permissions, req_msg).await?;
-    let json_str = std::str::from_utf8(&msg).unwrap();
 
-    let bundle_response: BundleResponse = serde_json::from_str(json_str)?;
+    let bundle_response: BundleResponse = serde_json::from_str(&json_str)?;
 
     maybe_log_stats(bundle_response.stats);
 
@@ -734,8 +732,6 @@ impl TsCompiler {
 
   pub async fn transpile(
     &self,
-    global_state: GlobalState,
-    permissions: Permissions,
     module_graph: ModuleGraph,
   ) -> Result<(), ErrBox> {
     let mut source_files: Vec<TranspileSourceFile> = Vec::new();
@@ -754,47 +750,30 @@ impl TsCompiler {
       return Ok(());
     }
 
-    let source_files_json =
-      serde_json::to_value(source_files).expect("Filed to serialize data");
-    let compiler_config = self.config.clone();
-    let cwd = std::env::current_dir().unwrap();
-    let performance = match global_state.flags.log_level {
-      Some(Level::Debug) => true,
-      _ => false,
-    };
-    let j = match (compiler_config.path, compiler_config.content) {
-      (Some(config_path), Some(config_data)) => json!({
-        "config": str::from_utf8(&config_data).unwrap(),
-        "configPath": config_path,
-        "cwd": cwd,
-        "performance": performance,
-        "sourceFiles": source_files_json,
-        "type": msg::CompilerRequestType::Transpile,
-      }),
-      _ => json!({
-        "performance": performance,
-        "sourceFiles": source_files_json,
-        "type": msg::CompilerRequestType::Transpile,
-      }),
-    };
-
-    let req_msg = j.to_string().into_boxed_str().into_boxed_bytes();
+    let mut emit_map = HashMap::new();
 
-    let msg =
-      execute_in_same_thread(global_state.clone(), permissions, req_msg)
-        .await?;
+    for source_file in source_files {
+      let parser = AstParser::default();
+      let stripped_source = parser.strip_types(
+        &source_file.file_name,
+        MediaType::TypeScript,
+        &source_file.source_code,
+      )?;
 
-    let json_str = std::str::from_utf8(&msg).unwrap();
-
-    let transpile_response: TranspileResponse = serde_json::from_str(json_str)?;
+      // TODO(bartlomieju): this is superfluous, just to make caching function happy
+      let emitted_filename = PathBuf::from(&source_file.file_name)
+        .with_extension("js")
+        .to_string_lossy()
+        .to_string();
+      let emitted_source = EmittedSource {
+        filename: source_file.file_name.to_string(),
+        contents: stripped_source,
+      };
 
-    if !transpile_response.diagnostics.items.is_empty() {
-      return Err(ErrBox::from(transpile_response.diagnostics));
+      emit_map.insert(emitted_filename, emitted_source);
     }
 
-    maybe_log_stats(transpile_response.stats);
-
-    self.cache_emitted_files(transpile_response.emit_map)?;
+    self.cache_emitted_files(emit_map)?;
     Ok(())
   }
 
@@ -871,9 +850,7 @@ impl TsCompiler {
     let compiled_source_file = self.get_compiled_source_file(module_url)?;
 
     let compiled_module = CompiledModule {
-      code: str::from_utf8(&compiled_source_file.source_code)
-        .unwrap()
-        .to_string(),
+      code: compiled_source_file.source_code.to_string()?,
       name: module_url.to_string(),
     };
 
@@ -881,8 +858,8 @@ impl TsCompiler {
   }
 
   /// Return compiled JS file for given TS module.
-  // TODO: ideally we shouldn't construct SourceFile by hand, but it should be delegated to
-  // SourceFileFetcher
+  // TODO: ideally we shouldn't construct SourceFile by hand, but it should be
+  // delegated to SourceFileFetcher.
   pub fn get_compiled_source_file(
     &self,
     module_url: &Url,
@@ -898,7 +875,7 @@ impl TsCompiler {
       url: module_url.clone(),
       filename: compiled_code_filename,
       media_type: msg::MediaType::JavaScript,
-      source_code: compiled_code,
+      source_code: compiled_code.into(),
       types_header: None,
     };
 
@@ -922,7 +899,7 @@ impl TsCompiler {
     self.mark_compiled(module_specifier.as_url());
 
     let version_hash = source_code_version_hash(
-      &source_file.source_code,
+      &source_file.source_code.as_bytes(),
       version::DENO,
       &self.config.hash,
     );
@@ -955,7 +932,7 @@ impl TsCompiler {
       url: module_specifier.as_url().to_owned(),
       filename: source_map_filename,
       media_type: msg::MediaType::JavaScript,
-      source_code,
+      source_code: source_code.into(),
       types_header: None,
     };
 
@@ -1001,7 +978,7 @@ impl SourceMapGetter for TsCompiler {
     self
       .try_resolve_and_get_source_file(script_name)
       .and_then(|out| {
-        str::from_utf8(&out.source_code).ok().map(|v| {
+        out.source_code.to_str().ok().map(|v| {
           // Do NOT use .lines(): it skips the terminating empty line.
           // (due to internally using .split_terminator() instead of .split())
           let lines: Vec<&str> = v.split('\n').collect();
@@ -1040,7 +1017,7 @@ impl TsCompiler {
   ) -> Option<Vec<u8>> {
     if let Some(module_specifier) = self.try_to_resolve(script_name) {
       return match self.get_source_map_file(&module_specifier) {
-        Ok(out) => Some(out.source_code),
+        Ok(out) => Some(out.source_code.into_bytes()),
         Err(_) => {
           // Check if map is inlined
           if let Ok(compiled_source) =
@@ -1077,41 +1054,19 @@ impl TsCompiler {
 }
 
 async fn execute_in_same_thread(
-  global_state: GlobalState,
+  global_state: &Arc<GlobalState>,
   permissions: Permissions,
-  req: Buf,
-) -> Result<Buf, ErrBox> {
-  let mut worker = create_compiler_worker(global_state.clone(), permissions);
-  let handle = worker.thread_safe_handle();
-  handle.post_message(req)?;
-
-  let mut event_fut = handle.get_event().boxed_local();
-
-  loop {
-    let select_result = futures::future::select(event_fut, &mut worker).await;
-    match select_result {
-      Either::Left((event_result, _worker)) => {
-        let event = event_result
-          .expect("Compiler didn't respond")
-          .expect("Empty message");
-
-        let buf = match event {
-          WorkerEvent::Message(buf) => Ok(buf),
-          WorkerEvent::Error(error) => Err(error),
-          WorkerEvent::TerminalError(error) => Err(error),
-        }?;
-        return Ok(buf);
-      }
-      Either::Right((worker_result, event_fut_)) => {
-        event_fut = event_fut_;
-        worker_result?;
-      }
-    }
-  }
+  req: String,
+) -> Result<String, ErrBox> {
+  let mut worker = create_compiler_worker(&global_state, permissions);
+  let script = format!("globalThis.tsCompilerOnMessage({{ data: {} }});", req);
+  worker.execute2("<compiler>", &script)?;
+  (&mut *worker).await?;
+  Ok(worker.get_response())
 }
 
 async fn create_runtime_module_graph(
-  global_state: GlobalState,
+  global_state: &Arc<GlobalState>,
   permissions: Permissions,
   root_name: &str,
   sources: &Option<HashMap<String, String>>,
@@ -1175,14 +1130,14 @@ fn js_error_to_op_error(error: ErrBox) -> OpError {
 
 /// This function is used by `Deno.compile()` API.
 pub async fn runtime_compile(
-  global_state: GlobalState,
+  global_state: &Arc<GlobalState>,
   permissions: Permissions,
   root_name: &str,
   sources: &Option<HashMap<String, String>>,
   maybe_options: &Option<String>,
 ) -> Result<Value, OpError> {
   let (root_names, module_graph) = create_runtime_module_graph(
-    global_state.clone(),
+    &global_state,
     permissions.clone(),
     root_name,
     sources,
@@ -1200,18 +1155,15 @@ pub async fn runtime_compile(
     "options": maybe_options,
     "unstable": global_state.flags.unstable,
   })
-  .to_string()
-  .into_boxed_str()
-  .into_boxed_bytes();
+  .to_string();
 
   let compiler = global_state.ts_compiler.clone();
 
-  let msg = execute_in_same_thread(global_state, permissions, req_msg)
+  let json_str = execute_in_same_thread(global_state, permissions, req_msg)
     .await
     .map_err(js_error_to_op_error)?;
-  let json_str = std::str::from_utf8(&msg).unwrap();
 
-  let response: RuntimeCompileResponse = serde_json::from_str(json_str)?;
+  let response: RuntimeCompileResponse = serde_json::from_str(&json_str)?;
 
   if response.diagnostics.is_empty() && sources.is_none() {
     compiler.cache_emitted_files(response.emit_map)?;
@@ -1220,19 +1172,19 @@ pub async fn runtime_compile(
   // We're returning `Ok()` instead of `Err()` because it's not runtime
   // error if there were diagnostics produced; we want to let user handle
   // diagnostics in the runtime.
-  Ok(serde_json::from_str::<Value>(json_str).unwrap())
+  Ok(serde_json::from_str::<Value>(&json_str).unwrap())
 }
 
 /// This function is used by `Deno.bundle()` API.
 pub async fn runtime_bundle(
-  global_state: GlobalState,
+  global_state: &Arc<GlobalState>,
   permissions: Permissions,
   root_name: &str,
   sources: &Option<HashMap<String, String>>,
   maybe_options: &Option<String>,
 ) -> Result<Value, OpError> {
   let (root_names, module_graph) = create_runtime_module_graph(
-    global_state.clone(),
+    &global_state,
     permissions.clone(),
     root_name,
     sources,
@@ -1250,24 +1202,21 @@ pub async fn runtime_bundle(
     "options": maybe_options,
     "unstable": global_state.flags.unstable,
   })
-  .to_string()
-  .into_boxed_str()
-  .into_boxed_bytes();
+  .to_string();
 
-  let msg = execute_in_same_thread(global_state, permissions, req_msg)
+  let json_str = execute_in_same_thread(global_state, permissions, req_msg)
     .await
     .map_err(js_error_to_op_error)?;
-  let json_str = std::str::from_utf8(&msg).unwrap();
-  let _response: RuntimeBundleResponse = serde_json::from_str(json_str)?;
+  let _response: RuntimeBundleResponse = serde_json::from_str(&json_str)?;
   // We're returning `Ok()` instead of `Err()` because it's not runtime
   // error if there were diagnostics produced; we want to let user handle
   // diagnostics in the runtime.
-  Ok(serde_json::from_str::<Value>(json_str).unwrap())
+  Ok(serde_json::from_str::<Value>(&json_str).unwrap())
 }
 
 /// This function is used by `Deno.transpileOnly()` API.
 pub async fn runtime_transpile(
-  global_state: GlobalState,
+  global_state: &Arc<GlobalState>,
   permissions: Permissions,
   sources: &HashMap<String, String>,
   options: &Option<String>,
@@ -1277,15 +1226,12 @@ pub async fn runtime_transpile(
     "sources": sources,
     "options": options,
   })
-  .to_string()
-  .into_boxed_str()
-  .into_boxed_bytes();
+  .to_string();
 
-  let msg = execute_in_same_thread(global_state, permissions, req_msg)
+  let json_str = execute_in_same_thread(global_state, permissions, req_msg)
     .await
     .map_err(js_error_to_op_error)?;
-  let json_str = std::str::from_utf8(&msg).unwrap();
-  let v = serde_json::from_str::<serde_json::Value>(json_str)
+  let v = serde_json::from_str::<serde_json::Value>(&json_str)
     .expect("Error decoding JSON string.");
   Ok(v)
 }
@@ -1311,7 +1257,7 @@ struct DependencyVisitor {
 impl Visit for DependencyVisitor {
   fn visit_import_decl(
     &mut self,
-    import_decl: &swc_ecma_ast::ImportDecl,
+    import_decl: &swc_ecmascript::ast::ImportDecl,
     _parent: &dyn Node,
   ) {
     let src_str = import_decl.src.value.to_string();
@@ -1324,7 +1270,7 @@ impl Visit for DependencyVisitor {
 
   fn visit_named_export(
     &mut self,
-    named_export: &swc_ecma_ast::NamedExport,
+    named_export: &swc_ecmascript::ast::NamedExport,
     _parent: &dyn Node,
   ) {
     if let Some(src) = &named_export.src {
@@ -1339,7 +1285,7 @@ impl Visit for DependencyVisitor {
 
   fn visit_export_all(
     &mut self,
-    export_all: &swc_ecma_ast::ExportAll,
+    export_all: &swc_ecmascript::ast::ExportAll,
     _parent: &dyn Node,
   ) {
     let src_str = export_all.src.value.to_string();
@@ -1352,7 +1298,7 @@ impl Visit for DependencyVisitor {
 
   fn visit_ts_import_type(
     &mut self,
-    ts_import_type: &swc_ecma_ast::TsImportType,
+    ts_import_type: &swc_ecmascript::ast::TsImportType,
     _parent: &dyn Node,
   ) {
     // TODO(bartlomieju): possibly add separate DependencyKind
@@ -1366,13 +1312,13 @@ impl Visit for DependencyVisitor {
 
   fn visit_call_expr(
     &mut self,
-    call_expr: &swc_ecma_ast::CallExpr,
+    call_expr: &swc_ecmascript::ast::CallExpr,
     parent: &dyn Node,
   ) {
-    use swc_ecma_ast::Expr::*;
-    use swc_ecma_ast::ExprOrSuper::*;
+    use swc_ecmascript::ast::Expr::*;
+    use swc_ecmascript::ast::ExprOrSuper::*;
 
-    swc_ecma_visit::visit_call_expr(self, call_expr, parent);
+    swc_ecmascript::visit::visit_call_expr(self, call_expr, parent);
     let boxed_expr = match call_expr.callee.clone() {
       Super(_) => return,
       Expr(boxed) => boxed,
@@ -1390,7 +1336,7 @@ impl Visit for DependencyVisitor {
     if let Some(arg) = call_expr.args.get(0) {
       match &*arg.expr {
         Lit(lit) => {
-          if let swc_ecma_ast::Lit::Str(str_) = lit {
+          if let swc_ecmascript::ast::Lit::Str(str_) = lit {
             let src_str = str_.value.to_string();
             self.dependencies.push(DependencyDescriptor {
               specifier: src_str,
@@ -1437,62 +1383,60 @@ pub fn pre_process_file(
   source_code: &str,
   analyze_dynamic_imports: bool,
 ) -> Result<(Vec<ImportDesc>, Vec<TsReferenceDesc>), SwcDiagnosticBuffer> {
-  let parser = AstParser::new();
-  parser.parse_module(file_name, media_type, source_code, |parse_result| {
-    let module = parse_result?;
-    let mut collector = DependencyVisitor {
-      dependencies: vec![],
-    };
-    let module_span = module.span;
-    collector.visit_module(&module, &module);
-
-    let dependency_descriptors = collector.dependencies;
-
-    // for each import check if there's relevant @deno-types directive
-    let imports = dependency_descriptors
-      .iter()
-      .filter(|desc| {
-        if analyze_dynamic_imports {
-          return true;
-        }
-
-        desc.kind != DependencyKind::DynamicImport
-      })
-      .map(|desc| {
-        let location = parser.get_span_location(desc.span);
-        let deno_types = get_deno_types(&parser, desc.span);
-        ImportDesc {
-          specifier: desc.specifier.to_string(),
-          deno_types,
-          location: location.into(),
-        }
-      })
-      .collect();
-
-    // analyze comment from beginning of the file and find TS directives
-    let comments = parser
-      .comments
-      .take_leading_comments(module_span.lo())
-      .unwrap_or_else(Vec::new);
-
-    let mut references = vec![];
-    for comment in comments {
-      if comment.kind != CommentKind::Line {
-        continue;
+  let parser = AstParser::default();
+  let parse_result = parser.parse_module(file_name, media_type, source_code);
+  let module = parse_result?;
+  let mut collector = DependencyVisitor {
+    dependencies: vec![],
+  };
+  let module_span = module.span;
+  collector.visit_module(&module, &module);
+
+  let dependency_descriptors = collector.dependencies;
+
+  // for each import check if there's relevant @deno-types directive
+  let imports = dependency_descriptors
+    .iter()
+    .filter(|desc| {
+      if analyze_dynamic_imports {
+        return true;
       }
 
-      let text = comment.text.to_string();
-      if let Some((kind, specifier)) = parse_ts_reference(text.trim()) {
-        let location = parser.get_span_location(comment.span);
-        references.push(TsReferenceDesc {
-          kind,
-          specifier,
-          location: location.into(),
-        });
+      desc.kind != DependencyKind::DynamicImport
+    })
+    .map(|desc| {
+      let location = parser.get_span_location(desc.span);
+      let deno_types = get_deno_types(&parser, desc.span);
+      ImportDesc {
+        specifier: desc.specifier.to_string(),
+        deno_types,
+        location: location.into(),
       }
+    })
+    .collect();
+
+  // analyze comment from beginning of the file and find TS directives
+  let comments = parser
+    .comments
+    .with_leading(module_span.lo(), |cmts| cmts.to_vec());
+
+  let mut references = vec![];
+  for comment in comments {
+    if comment.kind != CommentKind::Line {
+      continue;
     }
-    Ok((imports, references))
-  })
+
+    let text = comment.text.to_string();
+    if let Some((kind, specifier)) = parse_ts_reference(text.trim()) {
+      let location = parser.get_span_location(comment.span);
+      references.push(TsReferenceDesc {
+        kind,
+        specifier,
+        location: location.into(),
+      });
+    }
+  }
+  Ok((imports, references))
 }
 
 fn get_deno_types(parser: &AstParser, span: Span) -> Option<String> {
@@ -1550,6 +1494,7 @@ mod tests {
   use super::*;
   use crate::deno_dir;
   use crate::fs as deno_fs;
+  use crate::global_state::GlobalState;
   use crate::http_cache;
   use deno_core::ModuleSpecifier;
   use std::path::PathBuf;
@@ -1619,7 +1564,7 @@ mod tests {
       url: specifier.as_url().clone(),
       filename: PathBuf::from(p.to_str().unwrap().to_string()),
       media_type: msg::MediaType::TypeScript,
-      source_code: include_bytes!("./tests/002_hello.ts").to_vec(),
+      source_code: include_bytes!("./tests/002_hello.ts").to_vec().into(),
       types_header: None,
     };
     let dir =
@@ -1662,7 +1607,7 @@ mod tests {
 
     let result = ts_compiler
       .compile(
-        mock_state.clone(),
+        &mock_state,
         &out,
         TargetLib::Main,
         Permissions::allow_all(),
@@ -1695,7 +1640,7 @@ mod tests {
       url: specifier.as_url().clone(),
       filename: PathBuf::from(p.to_str().unwrap().to_string()),
       media_type: msg::MediaType::TypeScript,
-      source_code: include_bytes!("./tests/002_hello.ts").to_vec(),
+      source_code: include_bytes!("./tests/002_hello.ts").to_vec().into(),
       types_header: None,
     };
     let dir =
@@ -1736,9 +1681,7 @@ mod tests {
     )
     .unwrap();
 
-    let result = ts_compiler
-      .transpile(mock_state.clone(), Permissions::allow_all(), module_graph)
-      .await;
+    let result = ts_compiler.transpile(module_graph).await;
     assert!(result.is_ok());
     let compiled_file = ts_compiler.get_compiled_module(&out.url).unwrap();
     let source_code = compiled_file.code;
@@ -1773,8 +1716,9 @@ mod tests {
 
     let result = mock_state
       .ts_compiler
-      .bundle(mock_state.clone(), module_name)
+      .bundle(&mock_state, module_name)
       .await;
+
     assert!(result.is_ok());
   }
 
diff --git a/cli/tsc/00_typescript.js b/cli/tsc/00_typescript.js
index 90202c1c5b1e7f..cb5199f3bce2c9 100644
--- a/cli/tsc/00_typescript.js
+++ b/cli/tsc/00_typescript.js
@@ -244,7 +244,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = "3.9.2";
+    ts.version = "3.9.7";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -2677,6 +2677,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
+    var _a;
     var nullLogger = {
         logEvent: ts.noop,
         logErrEvent: ts.noop,
@@ -2703,9 +2704,10 @@ var ts;
     // See https://github.com/microsoft/typescript-etw for more information
     var etwModule;
     try {
-        // require() will throw an exception if the module is not installed
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        // require() will throw an exception if the module is not found
         // It may also return undefined if not installed properly
-        etwModule = require("@microsoft/typescript-etw");
+        etwModule = require(etwModulePath);
     }
     catch (e) {
         etwModule = undefined;
@@ -7682,6 +7684,7 @@ var ts;
         Cannot_find_a_tsconfig_json_file_at_the_current_directory_Colon_0: diag(5081, ts.DiagnosticCategory.Error, "Cannot_find_a_tsconfig_json_file_at_the_current_directory_Colon_0_5081", "Cannot find a tsconfig.json file at the current directory: {0}."),
         _0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1: diag(5082, ts.DiagnosticCategory.Error, "_0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1_5082", "'{0}' could be instantiated with an arbitrary type which could be unrelated to '{1}'."),
         Cannot_read_file_0: diag(5083, ts.DiagnosticCategory.Error, "Cannot_read_file_0_5083", "Cannot read file '{0}'."),
+        The_inferred_type_of_0_references_a_type_with_a_cyclic_structure_which_cannot_be_trivially_serialized_A_type_annotation_is_necessary: diag(5088, ts.DiagnosticCategory.Error, "The_inferred_type_of_0_references_a_type_with_a_cyclic_structure_which_cannot_be_trivially_serialize_5088", "The inferred type of '{0}' references a type with a cyclic structure which cannot be trivially serialized. A type annotation is necessary."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -15828,7 +15831,7 @@ var ts;
         if (!(name.kind === 154 /* ComputedPropertyName */ || name.kind === 195 /* ElementAccessExpression */)) {
             return false;
         }
-        var expr = ts.isElementAccessExpression(name) ? name.argumentExpression : name.expression;
+        var expr = ts.isElementAccessExpression(name) ? skipParentheses(name.argumentExpression) : name.expression;
         return !isStringOrNumericLiteralLike(expr) &&
             !isSignedNumericLiteral(expr) &&
             !isWellKnownSymbolSyntactically(expr);
@@ -38822,8 +38825,8 @@ var ts;
                     context.inferTypeParameters = type.root.inferTypeParameters;
                     var extendsTypeNode = typeToTypeNodeHelper(type.extendsType, context);
                     context.inferTypeParameters = saveInferTypeParameters;
-                    var trueTypeNode = typeToTypeNodeHelper(getTrueTypeFromConditionalType(type), context);
-                    var falseTypeNode = typeToTypeNodeHelper(getFalseTypeFromConditionalType(type), context);
+                    var trueTypeNode = typeToTypeNodeOrCircularityElision(getTrueTypeFromConditionalType(type));
+                    var falseTypeNode = typeToTypeNodeOrCircularityElision(getFalseTypeFromConditionalType(type));
                     context.approximateLength += 15;
                     return ts.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode);
                 }
@@ -38831,6 +38834,20 @@ var ts;
                     return typeToTypeNodeHelper(type.baseType, context);
                 }
                 return ts.Debug.fail("Should be unreachable.");
+                function typeToTypeNodeOrCircularityElision(type) {
+                    var _a, _b;
+                    if (type.flags & 1048576 /* Union */) {
+                        if (context.visitedTypes && context.visitedTypes.has("" + getTypeId(type))) {
+                            if (!(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
+                                context.encounteredError = true;
+                                (_b = (_a = context.tracker) === null || _a === void 0 ? void 0 : _a.reportCyclicStructureError) === null || _b === void 0 ? void 0 : _b.call(_a);
+                            }
+                            return createElidedInformationPlaceholder(context);
+                        }
+                        return visitAndTransformType(type, function (type) { return typeToTypeNodeHelper(type, context); });
+                    }
+                    return typeToTypeNodeHelper(type, context);
+                }
                 function createMappedTypeNodeFromType(type) {
                     ts.Debug.assert(!!(type.flags & 524288 /* Object */));
                     var readonlyToken = type.declaration.readonlyToken ? ts.createToken(type.declaration.readonlyToken.kind) : undefined;
@@ -44040,7 +44057,7 @@ var ts;
             return type.resolvedProperties;
         }
         function getPropertiesOfType(type) {
-            type = getApparentType(getReducedType(type));
+            type = getReducedApparentType(type);
             return type.flags & 3145728 /* UnionOrIntersection */ ?
                 getPropertiesOfUnionOrIntersectionType(type) :
                 getPropertiesOfObjectType(type);
@@ -44373,6 +44390,13 @@ var ts;
                                                 t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType :
                                                     t;
         }
+        function getReducedApparentType(type) {
+            // Since getApparentType may return a non-reduced union or intersection type, we need to perform
+            // type reduction both before and after obtaining the apparent type. For example, given a type parameter
+            // 'T extends A | B', the type 'T & X' becomes 'A & X | B & X' after obtaining the apparent type, and
+            // that type may need futher reduction to remove empty intersections.
+            return getReducedType(getApparentType(getReducedType(type)));
+        }
         function createUnionOrIntersectionProperty(containingType, name) {
             var singleProp;
             var propSet;
@@ -44583,7 +44607,7 @@ var ts;
          * @param name a name of property to look up in a given type
          */
         function getPropertyOfType(type, name) {
-            type = getApparentType(getReducedType(type));
+            type = getReducedApparentType(type);
             if (type.flags & 524288 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members.get(name);
@@ -44619,7 +44643,7 @@ var ts;
          * maps primitive types and type parameters are to their apparent types.
          */
         function getSignaturesOfType(type, kind) {
-            return getSignaturesOfStructuredType(getApparentType(getReducedType(type)), kind);
+            return getSignaturesOfStructuredType(getReducedApparentType(type), kind);
         }
         function getIndexInfoOfStructuredType(type, kind) {
             if (type.flags & 3670016 /* StructuredType */) {
@@ -44634,12 +44658,12 @@ var ts;
         // Return the indexing info of the given kind in the given type. Creates synthetic union index types when necessary and
         // maps primitive types and type parameters are to their apparent types.
         function getIndexInfoOfType(type, kind) {
-            return getIndexInfoOfStructuredType(getApparentType(getReducedType(type)), kind);
+            return getIndexInfoOfStructuredType(getReducedApparentType(type), kind);
         }
         // Return the index type of the given kind in the given type. Creates synthetic union index types when necessary and
         // maps primitive types and type parameters are to their apparent types.
         function getIndexTypeOfType(type, kind) {
-            return getIndexTypeOfStructuredType(getApparentType(getReducedType(type)), kind);
+            return getIndexTypeOfStructuredType(getReducedApparentType(type), kind);
         }
         function getImplicitIndexTypeOfType(type, kind) {
             if (isObjectTypeWithInferableIndex(type)) {
@@ -46465,10 +46489,12 @@ var ts;
             }
             return links.resolvedType;
         }
-        function createIndexedAccessType(objectType, indexType) {
+        function createIndexedAccessType(objectType, indexType, aliasSymbol, aliasTypeArguments) {
             var type = createType(8388608 /* IndexedAccess */);
             type.objectType = objectType;
             type.indexType = indexType;
+            type.aliasSymbol = aliasSymbol;
+            type.aliasTypeArguments = aliasTypeArguments;
             return type;
         }
         /**
@@ -46777,10 +46803,10 @@ var ts;
             var templateMapper = combineTypeMappers(objectType.mapper, mapper);
             return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
         }
-        function getIndexedAccessType(objectType, indexType, accessNode) {
-            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */) || (accessNode ? errorType : unknownType);
+        function getIndexedAccessType(objectType, indexType, accessNode, aliasSymbol, aliasTypeArguments) {
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */, aliasSymbol, aliasTypeArguments) || (accessNode ? errorType : unknownType);
         }
-        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags) {
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags, aliasSymbol, aliasTypeArguments) {
             if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
@@ -46803,14 +46829,14 @@ var ts;
                 var id = objectType.id + "," + indexType.id;
                 var type = indexedAccessTypes.get(id);
                 if (!type) {
-                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType));
+                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType, aliasSymbol, aliasTypeArguments));
                 }
                 return type;
             }
             // In the following we resolve T[K] to the type of the property in T selected by K.
             // We treat boolean as different from other unions to improve errors;
             // skipping straight to getPropertyTypeForIndexType gives errors with 'boolean' instead of 'true'.
-            var apparentObjectType = getApparentType(getReducedType(objectType));
+            var apparentObjectType = getReducedApparentType(objectType);
             if (indexType.flags & 1048576 /* Union */ && !(indexType.flags & 16 /* Boolean */)) {
                 var propTypes = [];
                 var wasMissingProp = false;
@@ -46832,7 +46858,7 @@ var ts;
                 if (wasMissingProp) {
                     return undefined;
                 }
-                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes) : getUnionType(propTypes);
+                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments) : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments);
             }
             return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */);
         }
@@ -46841,7 +46867,8 @@ var ts;
             if (!links.resolvedType) {
                 var objectType = getTypeFromTypeNode(node.objectType);
                 var indexType = getTypeFromTypeNode(node.indexType);
-                var resolved = getIndexedAccessType(objectType, indexType, node);
+                var potentialAlias = getAliasSymbolForTypeNode(node);
+                var resolved = getIndexedAccessType(objectType, indexType, node, potentialAlias, getTypeArgumentsForAliasSymbol(potentialAlias));
                 links.resolvedType = resolved.flags & 8388608 /* IndexedAccess */ &&
                     resolved.objectType === objectType &&
                     resolved.indexType === indexType ?
@@ -47897,7 +47924,7 @@ var ts;
                 return getIndexType(instantiateType(type.type, mapper));
             }
             if (flags & 8388608 /* IndexedAccess */) {
-                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper));
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper), /*accessNode*/ undefined, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
             }
             if (flags & 16777216 /* Conditional */) {
                 return getConditionalTypeInstantiation(type, combineTypeMappers(type.mapper, mapper));
@@ -55442,6 +55469,9 @@ var ts;
                     return ts.Debug.assertNever(kind);
             }
         }
+        function isCircularMappedProperty(symbol) {
+            return !!(ts.getCheckFlags(symbol) & 262144 /* Mapped */ && !symbol.type && findResolutionCycleStartIndex(symbol, 0 /* Type */) >= 0);
+        }
         function getTypeOfPropertyOfContextualType(type, name) {
             return mapType(type, function (t) {
                 if (isGenericMappedType(t)) {
@@ -55455,7 +55485,7 @@ var ts;
                 else if (t.flags & 3670016 /* StructuredType */) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
-                        return getTypeOfSymbol(prop);
+                        return isCircularMappedProperty(prop) ? undefined : getTypeOfSymbol(prop);
                     }
                     if (isTupleType(t)) {
                         var restType = getRestTypeOfTupleType(t);
@@ -56499,7 +56529,7 @@ var ts;
                 var right = _a[_i];
                 var left = props.get(right.escapedName);
                 var rightType = getTypeOfSymbol(right);
-                if (left && !maybeTypeOfKind(rightType, 98304 /* Nullable */) && !(maybeTypeOfKind(rightType, 1 /* Any */) && right.flags & 16777216 /* Optional */)) {
+                if (left && !maybeTypeOfKind(rightType, 98304 /* Nullable */) && !(maybeTypeOfKind(rightType, 3 /* AnyOrUnknown */) && right.flags & 16777216 /* Optional */)) {
                     var diagnostic = error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
                     ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(spread, ts.Diagnostics.This_spread_always_overwrites_this_property));
                 }
@@ -77354,13 +77384,16 @@ var ts;
         // Find original source text, since we need to emit the raw strings of the tagged template.
         // The raw strings contain the (escaped) strings of what the user wrote.
         // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
-        var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
-        // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
-        // thus we need to remove those characters.
-        // First template piece starts with "`", others with "}"
-        // Last template piece ends with "`", others with "${"
-        var isLast = node.kind === 14 /* NoSubstitutionTemplateLiteral */ || node.kind === 17 /* TemplateTail */;
-        text = text.substring(1, text.length - (isLast ? 1 : 2));
+        var text = node.rawText;
+        if (text === undefined) {
+            text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+            // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
+            // thus we need to remove those characters.
+            // First template piece starts with "`", others with "}"
+            // Last template piece ends with "`", others with "${"
+            var isLast = node.kind === 14 /* NoSubstitutionTemplateLiteral */ || node.kind === 17 /* TemplateTail */;
+            text = text.substring(1, text.length - (isLast ? 1 : 2));
+        }
         // Newline normalization:
         // ES6 Spec 11.8.6.1 - Static Semantics of TV's and TRV's
         // <CR><LF> and <CR> LineTerminatorSequences are normalized to <LF> for both TV and TRV.
@@ -77409,9 +77442,10 @@ var ts;
         ClassFacts[ClassFacts["IsNamedExternalExport"] = 16] = "IsNamedExternalExport";
         ClassFacts[ClassFacts["IsDefaultExternalExport"] = 32] = "IsDefaultExternalExport";
         ClassFacts[ClassFacts["IsDerivedClass"] = 64] = "IsDerivedClass";
+        ClassFacts[ClassFacts["UseImmediatelyInvokedFunctionExpression"] = 128] = "UseImmediatelyInvokedFunctionExpression";
         ClassFacts[ClassFacts["HasAnyDecorators"] = 6] = "HasAnyDecorators";
         ClassFacts[ClassFacts["NeedsName"] = 5] = "NeedsName";
-        ClassFacts[ClassFacts["UseImmediatelyInvokedFunctionExpression"] = 7] = "UseImmediatelyInvokedFunctionExpression";
+        ClassFacts[ClassFacts["MayNeedImmediatelyInvokedFunctionExpression"] = 7] = "MayNeedImmediatelyInvokedFunctionExpression";
         ClassFacts[ClassFacts["IsExported"] = 56] = "IsExported";
     })(ClassFacts || (ClassFacts = {}));
     function transformTypeScript(context) {
@@ -77898,6 +77932,8 @@ var ts;
                 facts |= 32 /* IsDefaultExternalExport */;
             else if (isNamedExternalModuleExport(node))
                 facts |= 16 /* IsNamedExternalExport */;
+            if (languageVersion <= 1 /* ES5 */ && (facts & 7 /* MayNeedImmediatelyInvokedFunctionExpression */))
+                facts |= 128 /* UseImmediatelyInvokedFunctionExpression */;
             return facts;
         }
         function hasTypeScriptClassSyntax(node) {
@@ -77915,7 +77951,7 @@ var ts;
             }
             var staticProperties = ts.getProperties(node, /*requireInitializer*/ true, /*isStatic*/ true);
             var facts = getClassFacts(node, staticProperties);
-            if (facts & 7 /* UseImmediatelyInvokedFunctionExpression */) {
+            if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
                 context.startLexicalEnvironment();
             }
             var name = node.name || (facts & 5 /* NeedsName */ ? ts.getGeneratedNameForNode(node) : undefined);
@@ -77927,7 +77963,7 @@ var ts;
             addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
             addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
             addConstructorDecorationStatement(statements, node);
-            if (facts & 7 /* UseImmediatelyInvokedFunctionExpression */) {
+            if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
                 // When we emit a TypeScript class down to ES5, we must wrap it in an IIFE so that the
                 // 'es2015' transformer can properly nest static initializers and decorators. The result
                 // looks something like:
@@ -77953,16 +77989,11 @@ var ts;
                 ts.insertStatementsAfterStandardPrologue(statements, context.endLexicalEnvironment());
                 var iife = ts.createImmediatelyInvokedArrowFunction(statements);
                 ts.setEmitFlags(iife, 33554432 /* TypeScriptClassWrapper */);
-                // Class comment is already added by the ES2015 transform when targeting ES5 or below.
-                // Only add if targetting ES2015+ to prevent duplicates
-                if (languageVersion > 1 /* ES5 */) {
-                    ts.addSyntheticLeadingComment(iife, 3 /* MultiLineCommentTrivia */, "* @class ");
-                }
                 var varStatement = ts.createVariableStatement(
                 /*modifiers*/ undefined, ts.createVariableDeclarationList([
                     ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ false), 
                     /*type*/ undefined, iife)
-                ], languageVersion > 1 /* ES5 */ ? 1 /* Let */ : undefined));
+                ]));
                 ts.setOriginalNode(varStatement, node);
                 ts.setCommentRange(varStatement, node);
                 ts.setSourceMapRange(varStatement, ts.moveRangePastDecorators(node));
@@ -77975,7 +78006,7 @@ var ts;
             if (facts & 8 /* IsExportOfNamespace */) {
                 addExportMemberAssignment(statements, node);
             }
-            else if (facts & 7 /* UseImmediatelyInvokedFunctionExpression */ || facts & 2 /* HasConstructorDecorators */) {
+            else if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */ || facts & 2 /* HasConstructorDecorators */) {
                 if (facts & 32 /* IsDefaultExternalExport */) {
                     statements.push(ts.createExportDefault(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)));
                 }
@@ -78002,7 +78033,7 @@ var ts;
             //      ${members}
             //  }
             // we do not emit modifiers on the declaration if we are emitting an IIFE
-            var modifiers = !(facts & 7 /* UseImmediatelyInvokedFunctionExpression */)
+            var modifiers = !(facts & 128 /* UseImmediatelyInvokedFunctionExpression */)
                 ? ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier)
                 : undefined;
             var classDeclaration = ts.createClassDeclaration(
@@ -90503,7 +90534,7 @@ var ts;
         scoped: false,
         dependencies: [ts.createBindingHelper],
         priority: 2,
-        text: "\n            var __exportStar = (this && this.__exportStar) || function(m, exports) {\n                for (var p in m) if (p !== \"default\" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);\n            }"
+        text: "\n            var __exportStar = (this && this.__exportStar) || function(m, exports) {\n                for (var p in m) if (p !== \"default\" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);\n            };"
     };
     function createExportStarHelper(context, module) {
         context.requestEmitHelper(exportStarHelper);
@@ -90522,7 +90553,7 @@ var ts;
         scoped: false,
         dependencies: [ts.createBindingHelper, ts.setModuleDefaultHelper],
         priority: 2,
-        text: "\nvar __importStar = (this && this.__importStar) || function (mod) {\n    if (mod && mod.__esModule) return mod;\n    var result = {};\n    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\n    __setModuleDefault(result, mod);\n    return result;\n};"
+        text: "\nvar __importStar = (this && this.__importStar) || function (mod) {\n    if (mod && mod.__esModule) return mod;\n    var result = {};\n    if (mod != null) for (var k in mod) if (k !== \"default\" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\n    __setModuleDefault(result, mod);\n    return result;\n};"
     };
     // emit helper for `import Name from "foo"`
     ts.importDefaultHelper = {
@@ -92623,6 +92654,7 @@ var ts;
             trackSymbol: trackSymbol,
             reportInaccessibleThisError: reportInaccessibleThisError,
             reportInaccessibleUniqueSymbolError: reportInaccessibleUniqueSymbolError,
+            reportCyclicStructureError: reportCyclicStructureError,
             reportPrivateInBaseOfClassExpression: reportPrivateInBaseOfClassExpression,
             reportLikelyUnsafeImportRequiredError: reportLikelyUnsafeImportRequiredError,
             moduleResolverHost: host,
@@ -92709,6 +92741,11 @@ var ts;
                 context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), "unique symbol"));
             }
         }
+        function reportCyclicStructureError() {
+            if (errorNameNode) {
+                context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_references_a_type_with_a_cyclic_structure_which_cannot_be_trivially_serialized_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode)));
+            }
+        }
         function reportInaccessibleThisError() {
             if (errorNameNode) {
                 context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), "this"));
@@ -110195,8 +110232,8 @@ var ts;
      * The default is CRLF.
      */
     function getNewLineOrDefaultFromHost(host, formatSettings) {
-        return (formatSettings && formatSettings.newLineCharacter) ||
-            (host.getNewLine && host.getNewLine()) ||
+        var _a;
+        return (formatSettings === null || formatSettings === void 0 ? void 0 : formatSettings.newLineCharacter) || ((_a = host.getNewLine) === null || _a === void 0 ? void 0 : _a.call(host)) ||
             carriageReturnLineFeed;
     }
     ts.getNewLineOrDefaultFromHost = getNewLineOrDefaultFromHost;
@@ -120290,7 +120327,7 @@ var ts;
                 }
                 // Delete any subsequent imports.
                 for (var i = 1; i < oldImportDecls.length; i++) {
-                    changeTracker.delete(sourceFile, oldImportDecls[i]);
+                    changeTracker.deleteNode(sourceFile, oldImportDecls[i]);
                 }
             }
         }
@@ -124760,8 +124797,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        function getFormatContext(options) {
-            return { options: options, getRules: getRulesMap() };
+        function getFormatContext(options, host) {
+            return { options: options, getRules: getRulesMap(), host: host };
         }
         formatting.getFormatContext = getFormatContext;
         var rulesMapCache;
@@ -125174,7 +125211,7 @@ var ts;
             return formatting.getFormattingScanner(sourceFile.text, sourceFile.languageVariant, getScanStartPosition(enclosingNode, originalRange, sourceFile), originalRange.end, function (scanner) { return formatSpanWorker(originalRange, enclosingNode, formatting.SmartIndenter.getIndentationForNode(enclosingNode, originalRange, sourceFile, formatContext.options), getOwnOrInheritedDelta(enclosingNode, formatContext.options, sourceFile), scanner, formatContext, requestKind, prepareRangeContainsErrorFunction(sourceFile.parseDiagnostics, originalRange), sourceFile); });
         }
         function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) {
-            var options = _a.options, getRules = _a.getRules;
+            var options = _a.options, getRules = _a.getRules, host = _a.host;
             // formatting context is used by rules provider
             var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options);
             var previousRange;
@@ -125844,7 +125881,7 @@ var ts;
                         // edit should not be applied if we have one line feed between elements
                         var lineDelta = currentStartLine - previousStartLine;
                         if (lineDelta !== 1) {
-                            recordReplace(previousRange.end, currentRange.pos - previousRange.end, options.newLineCharacter);
+                            recordReplace(previousRange.end, currentRange.pos - previousRange.end, ts.getNewLineOrDefaultFromHost(host, options));
                             return onLaterLine ? 0 /* None */ : 1 /* LineAdded */;
                         }
                         break;
@@ -126727,6 +126764,10 @@ var ts;
             ChangeTracker.prototype.delete = function (sourceFile, node) {
                 this.deletedNodes.push({ sourceFile: sourceFile, node: node });
             };
+            ChangeTracker.prototype.deleteNode = function (sourceFile, node, options) {
+                if (options === void 0) { options = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }; }
+                this.deleteRange(sourceFile, getAdjustedRange(sourceFile, node, node, options));
+            };
             ChangeTracker.prototype.deleteModifier = function (sourceFile, modifier) {
                 this.deleteRange(sourceFile, { pos: modifier.getStart(sourceFile), end: ts.skipTrivia(sourceFile.text, modifier.end, /*stopAfterLineBreak*/ true) });
             };
@@ -139383,7 +139424,7 @@ var ts;
         function getCompletionEntryDetails(fileName, position, name, formattingOptions, source, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
             synchronizeHostData();
-            return ts.Completions.getCompletionEntryDetails(program, log, getValidSourceFile(fileName), position, { name: name, source: source }, host, (formattingOptions && ts.formatting.getFormatContext(formattingOptions)), // TODO: GH#18217
+            return ts.Completions.getCompletionEntryDetails(program, log, getValidSourceFile(fileName), position, { name: name, source: source }, host, (formattingOptions && ts.formatting.getFormatContext(formattingOptions, host)), // TODO: GH#18217
             preferences, cancellationToken);
         }
         function getCompletionEntrySymbol(fileName, position, name, source, preferences) {
@@ -139655,14 +139696,14 @@ var ts;
         }
         function getFormattingEditsForRange(fileName, start, end, options) {
             var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            return ts.formatting.formatSelection(start, end, sourceFile, ts.formatting.getFormatContext(toEditorSettings(options)));
+            return ts.formatting.formatSelection(start, end, sourceFile, ts.formatting.getFormatContext(toEditorSettings(options), host));
         }
         function getFormattingEditsForDocument(fileName, options) {
-            return ts.formatting.formatDocument(syntaxTreeCache.getCurrentSourceFile(fileName), ts.formatting.getFormatContext(toEditorSettings(options)));
+            return ts.formatting.formatDocument(syntaxTreeCache.getCurrentSourceFile(fileName), ts.formatting.getFormatContext(toEditorSettings(options), host));
         }
         function getFormattingEditsAfterKeystroke(fileName, position, key, options) {
             var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            var formatContext = ts.formatting.getFormatContext(toEditorSettings(options));
+            var formatContext = ts.formatting.getFormatContext(toEditorSettings(options), host);
             if (!ts.isInComment(sourceFile, position)) {
                 switch (key) {
                     case "{":
@@ -139682,7 +139723,7 @@ var ts;
             synchronizeHostData();
             var sourceFile = getValidSourceFile(fileName);
             var span = ts.createTextSpanFromBounds(start, end);
-            var formatContext = ts.formatting.getFormatContext(formatOptions);
+            var formatContext = ts.formatting.getFormatContext(formatOptions, host);
             return ts.flatMap(ts.deduplicate(errorCodes, ts.equateValues, ts.compareValues), function (errorCode) {
                 cancellationToken.throwIfCancellationRequested();
                 return ts.codefix.getFixes({ errorCode: errorCode, sourceFile: sourceFile, span: span, program: program, host: host, cancellationToken: cancellationToken, formatContext: formatContext, preferences: preferences });
@@ -139693,7 +139734,7 @@ var ts;
             synchronizeHostData();
             ts.Debug.assert(scope.type === "file");
             var sourceFile = getValidSourceFile(scope.fileName);
-            var formatContext = ts.formatting.getFormatContext(formatOptions);
+            var formatContext = ts.formatting.getFormatContext(formatOptions, host);
             return ts.codefix.getAllFixes({ fixId: fixId, sourceFile: sourceFile, program: program, host: host, cancellationToken: cancellationToken, formatContext: formatContext, preferences: preferences });
         }
         function organizeImports(scope, formatOptions, preferences) {
@@ -139701,12 +139742,12 @@ var ts;
             synchronizeHostData();
             ts.Debug.assert(scope.type === "file");
             var sourceFile = getValidSourceFile(scope.fileName);
-            var formatContext = ts.formatting.getFormatContext(formatOptions);
+            var formatContext = ts.formatting.getFormatContext(formatOptions, host);
             return ts.OrganizeImports.organizeImports(sourceFile, formatContext, host, program, preferences);
         }
         function getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
-            return ts.getEditsForFileRename(getProgram(), oldFilePath, newFilePath, host, ts.formatting.getFormatContext(formatOptions), preferences, sourceMapper);
+            return ts.getEditsForFileRename(getProgram(), oldFilePath, newFilePath, host, ts.formatting.getFormatContext(formatOptions, host), preferences, sourceMapper);
         }
         function applyCodeActionCommand(fileName, actionOrFormatSettingsOrUndefined) {
             var action = typeof fileName === "string" ? actionOrFormatSettingsOrUndefined : fileName;
@@ -139908,7 +139949,7 @@ var ts;
                 endPosition: endPosition,
                 program: getProgram(),
                 host: host,
-                formatContext: ts.formatting.getFormatContext(formatOptions),
+                formatContext: ts.formatting.getFormatContext(formatOptions, host),
                 cancellationToken: cancellationToken,
                 preferences: preferences,
             };
diff --git a/cli/tsc/01_build.js b/cli/tsc/01_build.js
deleted file mode 100644
index 7c1dc817eae9be..00000000000000
--- a/cli/tsc/01_build.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-((window) => {
-  const build = {
-    target: "unknown",
-    arch: "unknown",
-    os: "unknown",
-    vendor: "unknown",
-    env: undefined,
-  };
-
-  function setBuildInfo(target) {
-    const [arch, vendor, os, env] = target.split("-", 4);
-    build.target = target;
-    build.arch = arch;
-    build.vendor = vendor;
-    build.os = os;
-    build.env = env;
-    Object.freeze(build);
-  }
-
-  window.__bootstrap.build = {
-    build,
-    setBuildInfo,
-  };
-})(this);
diff --git a/cli/tsc/01_colors.js b/cli/tsc/01_colors.js
deleted file mode 100644
index 2dc55918695069..00000000000000
--- a/cli/tsc/01_colors.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-((window) => {
-  function code(open, close) {
-    return {
-      open: `\x1b[${open}m`,
-      close: `\x1b[${close}m`,
-      regexp: new RegExp(`\\x1b\\[${close}m`, "g"),
-    };
-  }
-
-  function run(str, code) {
-    return !globalThis || !globalThis.Deno || globalThis.Deno.noColor
-      ? str
-      : `${code.open}${str.replace(code.regexp, code.open)}${code.close}`;
-  }
-
-  function bold(str) {
-    return run(str, code(1, 22));
-  }
-
-  function italic(str) {
-    return run(str, code(3, 23));
-  }
-
-  function yellow(str) {
-    return run(str, code(33, 39));
-  }
-
-  function cyan(str) {
-    return run(str, code(36, 39));
-  }
-
-  function red(str) {
-    return run(str, code(31, 39));
-  }
-
-  function green(str) {
-    return run(str, code(32, 39));
-  }
-
-  function bgRed(str) {
-    return run(str, code(41, 49));
-  }
-
-  function white(str) {
-    return run(str, code(37, 39));
-  }
-
-  function gray(str) {
-    return run(str, code(90, 39));
-  }
-
-  function magenta(str) {
-    return run(str, code(35, 39));
-  }
-
-  function dim(str) {
-    return run(str, code(2, 22));
-  }
-
-  // https://github.com/chalk/ansi-regex/blob/2b56fb0c7a07108e5b54241e8faec160d393aedb/index.js
-  const ANSI_PATTERN = new RegExp(
-    [
-      "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
-      "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))",
-    ].join("|"),
-    "g",
-  );
-
-  function stripColor(string) {
-    return string.replace(ANSI_PATTERN, "");
-  }
-
-  window.__bootstrap.colors = {
-    bold,
-    italic,
-    yellow,
-    cyan,
-    red,
-    green,
-    bgRed,
-    white,
-    gray,
-    magenta,
-    dim,
-    stripColor,
-  };
-})(this);
diff --git a/cli/tsc/01_errors.js b/cli/tsc/01_errors.js
index 8390dd803f6a36..fb2bb78c27ce70 100644
--- a/cli/tsc/01_errors.js
+++ b/cli/tsc/01_errors.js
@@ -1,101 +1,6 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 ((window) => {
-  // Warning! The values in this enum are duplicated in cli/op_error.rs
-  // Update carefully!
-  const ErrorKind = {
-    1: "NotFound",
-    2: "PermissionDenied",
-    3: "ConnectionRefused",
-    4: "ConnectionReset",
-    5: "ConnectionAborted",
-    6: "NotConnected",
-    7: "AddrInUse",
-    8: "AddrNotAvailable",
-    9: "BrokenPipe",
-    10: "AlreadyExists",
-    13: "InvalidData",
-    14: "TimedOut",
-    15: "Interrupted",
-    16: "WriteZero",
-    17: "UnexpectedEof",
-    18: "BadResource",
-    19: "Http",
-    20: "URIError",
-    21: "TypeError",
-    22: "Other",
-    23: "Busy",
-
-    NotFound: 1,
-    PermissionDenied: 2,
-    ConnectionRefused: 3,
-    ConnectionReset: 4,
-    ConnectionAborted: 5,
-    NotConnected: 6,
-    AddrInUse: 7,
-    AddrNotAvailable: 8,
-    BrokenPipe: 9,
-    AlreadyExists: 10,
-    InvalidData: 13,
-    TimedOut: 14,
-    Interrupted: 15,
-    WriteZero: 16,
-    UnexpectedEof: 17,
-    BadResource: 18,
-    Http: 19,
-    URIError: 20,
-    TypeError: 21,
-    Other: 22,
-    Busy: 23,
-  };
-
-  function getErrorClass(kind) {
-    switch (kind) {
-      case ErrorKind.TypeError:
-        return TypeError;
-      case ErrorKind.Other:
-        return Error;
-      case ErrorKind.URIError:
-        return URIError;
-      case ErrorKind.NotFound:
-        return NotFound;
-      case ErrorKind.PermissionDenied:
-        return PermissionDenied;
-      case ErrorKind.ConnectionRefused:
-        return ConnectionRefused;
-      case ErrorKind.ConnectionReset:
-        return ConnectionReset;
-      case ErrorKind.ConnectionAborted:
-        return ConnectionAborted;
-      case ErrorKind.NotConnected:
-        return NotConnected;
-      case ErrorKind.AddrInUse:
-        return AddrInUse;
-      case ErrorKind.AddrNotAvailable:
-        return AddrNotAvailable;
-      case ErrorKind.BrokenPipe:
-        return BrokenPipe;
-      case ErrorKind.AlreadyExists:
-        return AlreadyExists;
-      case ErrorKind.InvalidData:
-        return InvalidData;
-      case ErrorKind.TimedOut:
-        return TimedOut;
-      case ErrorKind.Interrupted:
-        return Interrupted;
-      case ErrorKind.WriteZero:
-        return WriteZero;
-      case ErrorKind.UnexpectedEof:
-        return UnexpectedEof;
-      case ErrorKind.BadResource:
-        return BadResource;
-      case ErrorKind.Http:
-        return Http;
-      case ErrorKind.Busy:
-        return Busy;
-    }
-  }
-
   class NotFound extends Error {
     constructor(msg) {
       super(msg);
@@ -245,6 +150,5 @@
 
   window.__bootstrap.errors = {
     errors,
-    getErrorClass,
   };
 })(this);
diff --git a/cli/tsc/01_internals.js b/cli/tsc/01_internals.js
deleted file mode 100644
index eee9eeaf769f93..00000000000000
--- a/cli/tsc/01_internals.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-((window) => {
-  const internalSymbol = Symbol("Deno.internal");
-
-  // The object where all the internal fields for testing will be living.
-  const internalObject = {};
-
-  // Register a field to internalObject for test access,
-  // through Deno[Deno.internal][name].
-  function exposeForTest(name, value) {
-    Object.defineProperty(internalObject, name, {
-      value,
-      enumerable: false,
-    });
-  }
-
-  window.__bootstrap.internals = {
-    internalSymbol,
-    internalObject,
-    exposeForTest,
-  };
-})(this);
diff --git a/cli/tsc/01_version.js b/cli/tsc/01_version.js
deleted file mode 100644
index 325e1156f873e3..00000000000000
--- a/cli/tsc/01_version.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-((window) => {
-  const version = {
-    deno: "",
-    v8: "",
-    typescript: "",
-  };
-
-  function setVersions(
-    denoVersion,
-    v8Version,
-    tsVersion,
-  ) {
-    version.deno = denoVersion;
-    version.v8 = v8Version;
-    version.typescript = tsVersion;
-
-    Object.freeze(version);
-  }
-
-  window.__bootstrap.version = {
-    version,
-    setVersions,
-  };
-})(this);
diff --git a/cli/tsc/01_web_util.js b/cli/tsc/01_web_util.js
deleted file mode 100644
index 596dcbfcd04ed6..00000000000000
--- a/cli/tsc/01_web_util.js
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-((window) => {
-  function isTypedArray(x) {
-    return ArrayBuffer.isView(x) && !(x instanceof DataView);
-  }
-
-  function isInvalidDate(x) {
-    return isNaN(x.getTime());
-  }
-
-  function requiredArguments(
-    name,
-    length,
-    required,
-  ) {
-    if (length < required) {
-      const errMsg = `${name} requires at least ${required} argument${
-        required === 1 ? "" : "s"
-      }, but only ${length} present`;
-      throw new TypeError(errMsg);
-    }
-  }
-
-  function immutableDefine(
-    o,
-    p,
-    value,
-  ) {
-    Object.defineProperty(o, p, {
-      value,
-      configurable: false,
-      writable: false,
-    });
-  }
-
-  function hasOwnProperty(obj, v) {
-    if (obj == null) {
-      return false;
-    }
-    return Object.prototype.hasOwnProperty.call(obj, v);
-  }
-
-  /** Returns whether o is iterable. */
-  function isIterable(
-    o,
-  ) {
-    // checks for null and undefined
-    if (o == null) {
-      return false;
-    }
-    return (
-      typeof (o)[Symbol.iterator] === "function"
-    );
-  }
-
-  const objectCloneMemo = new WeakMap();
-
-  function cloneArrayBuffer(
-    srcBuffer,
-    srcByteOffset,
-    srcLength,
-    _cloneConstructor,
-  ) {
-    // this function fudges the return type but SharedArrayBuffer is disabled for a while anyway
-    return srcBuffer.slice(
-      srcByteOffset,
-      srcByteOffset + srcLength,
-    );
-  }
-
-  /** Clone a value in a similar way to structured cloning.  It is similar to a
- * StructureDeserialize(StructuredSerialize(...)). */
-  function cloneValue(value) {
-    switch (typeof value) {
-      case "number":
-      case "string":
-      case "boolean":
-      case "undefined":
-      case "bigint":
-        return value;
-      case "object": {
-        if (objectCloneMemo.has(value)) {
-          return objectCloneMemo.get(value);
-        }
-        if (value === null) {
-          return value;
-        }
-        if (value instanceof Date) {
-          return new Date(value.valueOf());
-        }
-        if (value instanceof RegExp) {
-          return new RegExp(value);
-        }
-        if (value instanceof SharedArrayBuffer) {
-          return value;
-        }
-        if (value instanceof ArrayBuffer) {
-          const cloned = cloneArrayBuffer(
-            value,
-            0,
-            value.byteLength,
-            ArrayBuffer,
-          );
-          objectCloneMemo.set(value, cloned);
-          return cloned;
-        }
-        if (ArrayBuffer.isView(value)) {
-          const clonedBuffer = cloneValue(value.buffer);
-          // Use DataViewConstructor type purely for type-checking, can be a
-          // DataView or TypedArray.  They use the same constructor signature,
-          // only DataView has a length in bytes and TypedArrays use a length in
-          // terms of elements, so we adjust for that.
-          let length;
-          if (value instanceof DataView) {
-            length = value.byteLength;
-          } else {
-            length = value.length;
-          }
-          return new (value.constructor)(
-            clonedBuffer,
-            value.byteOffset,
-            length,
-          );
-        }
-        if (value instanceof Map) {
-          const clonedMap = new Map();
-          objectCloneMemo.set(value, clonedMap);
-          value.forEach((v, k) => clonedMap.set(k, cloneValue(v)));
-          return clonedMap;
-        }
-        if (value instanceof Set) {
-          const clonedSet = new Map();
-          objectCloneMemo.set(value, clonedSet);
-          value.forEach((v, k) => clonedSet.set(k, cloneValue(v)));
-          return clonedSet;
-        }
-
-        const clonedObj = {};
-        objectCloneMemo.set(value, clonedObj);
-        const sourceKeys = Object.getOwnPropertyNames(value);
-        for (const key of sourceKeys) {
-          clonedObj[key] = cloneValue(value[key]);
-        }
-        return clonedObj;
-      }
-      case "symbol":
-      case "function":
-      default:
-        throw new DOMException("Uncloneable value in stream", "DataCloneError");
-    }
-  }
-
-  /** A helper function which ensures accessors are enumerable, as they normally
- * are not. */
-  function defineEnumerableProps(
-    Ctor,
-    props,
-  ) {
-    for (const prop of props) {
-      Reflect.defineProperty(Ctor.prototype, prop, { enumerable: true });
-    }
-  }
-
-  function getHeaderValueParams(value) {
-    const params = new Map();
-    // Forced to do so for some Map constructor param mismatch
-    value
-      .split(";")
-      .slice(1)
-      .map((s) => s.trim().split("="))
-      .filter((arr) => arr.length > 1)
-      .map(([k, v]) => [k, v.replace(/^"([^"]*)"$/, "$1")])
-      .forEach(([k, v]) => params.set(k, v));
-    return params;
-  }
-
-  function hasHeaderValueOf(s, value) {
-    return new RegExp(`^${value}[\t\s]*;?`).test(s);
-  }
-
-  /** An internal function which provides a function name for some generated
- * functions, so stack traces are a bit more readable.
- */
-  function setFunctionName(fn, value) {
-    Object.defineProperty(fn, "name", { value, configurable: true });
-  }
-
-  window.__bootstrap.webUtil = {
-    isTypedArray,
-    isInvalidDate,
-    requiredArguments,
-    immutableDefine,
-    hasOwnProperty,
-    isIterable,
-    cloneValue,
-    defineEnumerableProps,
-    getHeaderValueParams,
-    hasHeaderValueOf,
-    setFunctionName,
-  };
-})(this);
diff --git a/cli/tsc/06_util.js b/cli/tsc/06_util.js
index 086275bd879b1a..b6a582f9e45caa 100644
--- a/cli/tsc/06_util.js
+++ b/cli/tsc/06_util.js
@@ -1,8 +1,7 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 ((window) => {
-  const { build } = window.__bootstrap.build;
-  const internals = window.__bootstrap.internals;
+  const core = Deno.core;
   let logDebug = false;
   let logSource = "JS";
 
@@ -15,9 +14,8 @@
 
   function log(...args) {
     if (logDebug) {
-      // if we destructure `console` off `globalThis` too early, we don't bind to
-      // the right console, therefore we don't log anything out.
-      globalThis.console.log(`DEBUG ${logSource} -`, ...args);
+      const stringifiedArgs = args.map(JSON.stringify).join(" ");
+      core.print(`DEBUG ${logSource} - ${stringifiedArgs}\n`);
     }
   }
 
@@ -50,93 +48,6 @@
     throw new Error("not implemented");
   }
 
-  function immutableDefine(
-    o,
-    p,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    value,
-  ) {
-    Object.defineProperty(o, p, {
-      value,
-      configurable: false,
-      writable: false,
-    });
-  }
-
-  function pathFromURLWin32(url) {
-    const hostname = url.hostname;
-    const pathname = decodeURIComponent(url.pathname.replace(/\//g, "\\"));
-
-    if (hostname !== "") {
-      //TODO(actual-size) Node adds a punycode decoding step, we should consider adding this
-      return `\\\\${hostname}${pathname}`;
-    }
-
-    const validPath = /^\\(?<driveLetter>[A-Za-z]):\\/;
-    const matches = validPath.exec(pathname);
-
-    if (!matches?.groups?.driveLetter) {
-      throw new TypeError("A URL with the file schema must be absolute.");
-    }
-
-    // we don't want a leading slash on an absolute path in Windows
-    return pathname.slice(1);
-  }
-
-  function pathFromURLPosix(url) {
-    if (url.hostname !== "") {
-      throw new TypeError(`Host must be empty.`);
-    }
-
-    return decodeURIComponent(url.pathname);
-  }
-
-  function pathFromURL(pathOrUrl) {
-    if (pathOrUrl instanceof URL) {
-      if (pathOrUrl.protocol != "file:") {
-        throw new TypeError("Must be a file URL.");
-      }
-
-      return build.os == "windows"
-        ? pathFromURLWin32(pathOrUrl)
-        : pathFromURLPosix(pathOrUrl);
-    }
-    return pathOrUrl;
-  }
-
-  internals.exposeForTest("pathFromURL", pathFromURL);
-
-  function writable(value) {
-    return {
-      value,
-      writable: true,
-      enumerable: true,
-      configurable: true,
-    };
-  }
-
-  function nonEnumerable(value) {
-    return {
-      value,
-      writable: true,
-      configurable: true,
-    };
-  }
-
-  function readOnly(value) {
-    return {
-      value,
-      enumerable: true,
-    };
-  }
-
-  function getterOnly(getter) {
-    return {
-      get: getter,
-      enumerable: true,
-    };
-  }
-
   window.__bootstrap.util = {
     log,
     setLogDebug,
@@ -144,11 +55,5 @@
     createResolvable,
     assert,
     AssertionError,
-    immutableDefine,
-    pathFromURL,
-    writable,
-    nonEnumerable,
-    readOnly,
-    getterOnly,
   };
 })(this);
diff --git a/cli/tsc/08_text_encoding.js b/cli/tsc/08_text_encoding.js
deleted file mode 100644
index 1aa5d43c0ac4cc..00000000000000
--- a/cli/tsc/08_text_encoding.js
+++ /dev/null
@@ -1,638 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// The following code is based off of text-encoding at:
-// https://github.com/inexorabletash/text-encoding
-//
-// Anyone is free to copy, modify, publish, use, compile, sell, or
-// distribute this software, either in source code form or as a compiled
-// binary, for any purpose, commercial or non-commercial, and by any
-// means.
-//
-// In jurisdictions that recognize copyright laws, the author or authors
-// of this software dedicate any and all copyright interest in the
-// software to the public domain. We make this dedication for the benefit
-// of the public at large and to the detriment of our heirs and
-// successors. We intend this dedication to be an overt act of
-// relinquishment in perpetuity of all present and future rights to this
-// software under copyright law.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-((window) => {
-  const core = Deno.core;
-
-  const CONTINUE = null;
-  const END_OF_STREAM = -1;
-  const FINISHED = -1;
-
-  function decoderError(fatal) {
-    if (fatal) {
-      throw new TypeError("Decoder error.");
-    }
-    return 0xfffd; // default code point
-  }
-
-  function inRange(a, min, max) {
-    return min <= a && a <= max;
-  }
-
-  function isASCIIByte(a) {
-    return inRange(a, 0x00, 0x7f);
-  }
-
-  function stringToCodePoints(input) {
-    const u = [];
-    for (const c of input) {
-      u.push(c.codePointAt(0));
-    }
-    return u;
-  }
-
-  class UTF8Encoder {
-    handler(codePoint) {
-      if (codePoint === END_OF_STREAM) {
-        return "finished";
-      }
-
-      if (inRange(codePoint, 0x00, 0x7f)) {
-        return [codePoint];
-      }
-
-      let count;
-      let offset;
-      if (inRange(codePoint, 0x0080, 0x07ff)) {
-        count = 1;
-        offset = 0xc0;
-      } else if (inRange(codePoint, 0x0800, 0xffff)) {
-        count = 2;
-        offset = 0xe0;
-      } else if (inRange(codePoint, 0x10000, 0x10ffff)) {
-        count = 3;
-        offset = 0xf0;
-      } else {
-        throw TypeError(
-          `Code point out of range: \\x${codePoint.toString(16)}`,
-        );
-      }
-
-      const bytes = [(codePoint >> (6 * count)) + offset];
-
-      while (count > 0) {
-        const temp = codePoint >> (6 * (count - 1));
-        bytes.push(0x80 | (temp & 0x3f));
-        count--;
-      }
-
-      return bytes;
-    }
-  }
-
-  class SingleByteDecoder {
-    #index = [];
-    #fatal = false;
-
-    constructor(
-      index,
-      { ignoreBOM = false, fatal = false } = {},
-    ) {
-      if (ignoreBOM) {
-        throw new TypeError("Ignoring the BOM is available only with utf-8.");
-      }
-      this.#fatal = fatal;
-      this.#index = index;
-    }
-    handler(_stream, byte) {
-      if (byte === END_OF_STREAM) {
-        return FINISHED;
-      }
-      if (isASCIIByte(byte)) {
-        return byte;
-      }
-      const codePoint = this.#index[byte - 0x80];
-
-      if (codePoint == null) {
-        return decoderError(this.#fatal);
-      }
-
-      return codePoint;
-    }
-  }
-
-  // The encodingMap is a hash of labels that are indexed by the conical
-  // encoding.
-  const encodingMap = {
-    "windows-1252": [
-      "ansi_x3.4-1968",
-      "ascii",
-      "cp1252",
-      "cp819",
-      "csisolatin1",
-      "ibm819",
-      "iso-8859-1",
-      "iso-ir-100",
-      "iso8859-1",
-      "iso88591",
-      "iso_8859-1",
-      "iso_8859-1:1987",
-      "l1",
-      "latin1",
-      "us-ascii",
-      "windows-1252",
-      "x-cp1252",
-    ],
-    "utf-8": ["unicode-1-1-utf-8", "utf-8", "utf8"],
-  };
-  // We convert these into a Map where every label resolves to its canonical
-  // encoding type.
-  const encodings = new Map();
-  for (const key of Object.keys(encodingMap)) {
-    const labels = encodingMap[key];
-    for (const label of labels) {
-      encodings.set(label, key);
-    }
-  }
-
-  // A map of functions that return new instances of a decoder indexed by the
-  // encoding type.
-  const decoders = new Map();
-
-  // Single byte decoders are an array of code point lookups
-  const encodingIndexes = new Map();
-  // deno-fmt-ignore
-  encodingIndexes.set("windows-1252", [
-    8364,
-    129,
-    8218,
-    402,
-    8222,
-    8230,
-    8224,
-    8225,
-    710,
-    8240,
-    352,
-    8249,
-    338,
-    141,
-    381,
-    143,
-    144,
-    8216,
-    8217,
-    8220,
-    8221,
-    8226,
-    8211,
-    8212,
-    732,
-    8482,
-    353,
-    8250,
-    339,
-    157,
-    382,
-    376,
-    160,
-    161,
-    162,
-    163,
-    164,
-    165,
-    166,
-    167,
-    168,
-    169,
-    170,
-    171,
-    172,
-    173,
-    174,
-    175,
-    176,
-    177,
-    178,
-    179,
-    180,
-    181,
-    182,
-    183,
-    184,
-    185,
-    186,
-    187,
-    188,
-    189,
-    190,
-    191,
-    192,
-    193,
-    194,
-    195,
-    196,
-    197,
-    198,
-    199,
-    200,
-    201,
-    202,
-    203,
-    204,
-    205,
-    206,
-    207,
-    208,
-    209,
-    210,
-    211,
-    212,
-    213,
-    214,
-    215,
-    216,
-    217,
-    218,
-    219,
-    220,
-    221,
-    222,
-    223,
-    224,
-    225,
-    226,
-    227,
-    228,
-    229,
-    230,
-    231,
-    232,
-    233,
-    234,
-    235,
-    236,
-    237,
-    238,
-    239,
-    240,
-    241,
-    242,
-    243,
-    244,
-    245,
-    246,
-    247,
-    248,
-    249,
-    250,
-    251,
-    252,
-    253,
-    254,
-    255,
-  ]);
-  for (const [key, index] of encodingIndexes) {
-    decoders.set(
-      key,
-      (options) => {
-        return new SingleByteDecoder(index, options);
-      },
-    );
-  }
-
-  function codePointsToString(codePoints) {
-    let s = "";
-    for (const cp of codePoints) {
-      s += String.fromCodePoint(cp);
-    }
-    return s;
-  }
-
-  class Stream {
-    #tokens = [];
-    constructor(tokens) {
-      this.#tokens = [...tokens];
-      this.#tokens.reverse();
-    }
-
-    endOfStream() {
-      return !this.#tokens.length;
-    }
-
-    read() {
-      return !this.#tokens.length ? END_OF_STREAM : this.#tokens.pop();
-    }
-
-    prepend(token) {
-      if (Array.isArray(token)) {
-        while (token.length) {
-          this.#tokens.push(token.pop());
-        }
-      } else {
-        this.#tokens.push(token);
-      }
-    }
-
-    push(token) {
-      if (Array.isArray(token)) {
-        while (token.length) {
-          this.#tokens.unshift(token.shift());
-        }
-      } else {
-        this.#tokens.unshift(token);
-      }
-    }
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  function isEitherArrayBuffer(x) {
-    return x instanceof SharedArrayBuffer || x instanceof ArrayBuffer;
-  }
-
-  class TextDecoder {
-    #encoding = "";
-
-    get encoding() {
-      return this.#encoding;
-    }
-    fatal = false;
-    ignoreBOM = false;
-
-    constructor(label = "utf-8", options = { fatal: false }) {
-      if (options.ignoreBOM) {
-        this.ignoreBOM = true;
-      }
-      if (options.fatal) {
-        this.fatal = true;
-      }
-      label = String(label).trim().toLowerCase();
-      const encoding = encodings.get(label);
-      if (!encoding) {
-        throw new RangeError(
-          `The encoding label provided ('${label}') is invalid.`,
-        );
-      }
-      if (!decoders.has(encoding) && encoding !== "utf-8") {
-        throw new TypeError(`Internal decoder ('${encoding}') not found.`);
-      }
-      this.#encoding = encoding;
-    }
-
-    decode(
-      input,
-      options = { stream: false },
-    ) {
-      if (options.stream) {
-        throw new TypeError("Stream not supported.");
-      }
-
-      let bytes;
-      if (input instanceof Uint8Array) {
-        bytes = input;
-      } else if (isEitherArrayBuffer(input)) {
-        bytes = new Uint8Array(input);
-      } else if (
-        typeof input === "object" &&
-        "buffer" in input &&
-        isEitherArrayBuffer(input.buffer)
-      ) {
-        bytes = new Uint8Array(
-          input.buffer,
-          input.byteOffset,
-          input.byteLength,
-        );
-      } else {
-        bytes = new Uint8Array(0);
-      }
-
-      // For simple utf-8 decoding "Deno.core.decode" can be used for performance
-      if (
-        this.#encoding === "utf-8" &&
-        this.fatal === false &&
-        this.ignoreBOM === false
-      ) {
-        return core.decode(bytes);
-      }
-
-      // For performance reasons we utilise a highly optimised decoder instead of
-      // the general decoder.
-      if (this.#encoding === "utf-8") {
-        return decodeUtf8(bytes, this.fatal, this.ignoreBOM);
-      }
-
-      const decoder = decoders.get(this.#encoding)({
-        fatal: this.fatal,
-        ignoreBOM: this.ignoreBOM,
-      });
-      const inputStream = new Stream(bytes);
-      const output = [];
-
-      while (true) {
-        const result = decoder.handler(inputStream, inputStream.read());
-        if (result === FINISHED) {
-          break;
-        }
-
-        if (result !== CONTINUE) {
-          output.push(result);
-        }
-      }
-
-      if (output.length > 0 && output[0] === 0xfeff) {
-        output.shift();
-      }
-
-      return codePointsToString(output);
-    }
-
-    get [Symbol.toStringTag]() {
-      return "TextDecoder";
-    }
-  }
-
-  class TextEncoder {
-    encoding = "utf-8";
-    encode(input = "") {
-      // Deno.core.encode() provides very efficient utf-8 encoding
-      if (this.encoding === "utf-8") {
-        return core.encode(input);
-      }
-
-      const encoder = new UTF8Encoder();
-      const inputStream = new Stream(stringToCodePoints(input));
-      const output = [];
-
-      while (true) {
-        const result = encoder.handler(inputStream.read());
-        if (result === "finished") {
-          break;
-        }
-        output.push(...result);
-      }
-
-      return new Uint8Array(output);
-    }
-    encodeInto(input, dest) {
-      const encoder = new UTF8Encoder();
-      const inputStream = new Stream(stringToCodePoints(input));
-
-      let written = 0;
-      let read = 0;
-      while (true) {
-        const result = encoder.handler(inputStream.read());
-        if (result === "finished") {
-          break;
-        }
-        if (dest.length - written >= result.length) {
-          read++;
-          dest.set(result, written);
-          written += result.length;
-          if (result.length > 3) {
-            // increment read a second time if greater than U+FFFF
-            read++;
-          }
-        } else {
-          break;
-        }
-      }
-
-      return {
-        read,
-        written,
-      };
-    }
-    get [Symbol.toStringTag]() {
-      return "TextEncoder";
-    }
-  }
-
-  // This function is based on Bjoern Hoehrmann's DFA UTF-8 decoder.
-  // See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
-  //
-  // Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-  //
-  // Permission is hereby granted, free of charge, to any person obtaining a copy
-  // of this software and associated documentation files (the "Software"), to deal
-  // in the Software without restriction, including without limitation the rights
-  // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  // copies of the Software, and to permit persons to whom the Software is
-  // furnished to do so, subject to the following conditions:
-  //
-  // The above copyright notice and this permission notice shall be included in
-  // all copies or substantial portions of the Software.
-  //
-  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  // SOFTWARE.
-  function decodeUtf8(
-    input,
-    fatal,
-    ignoreBOM,
-  ) {
-    let outString = "";
-
-    // Prepare a buffer so that we don't have to do a lot of string concats, which
-    // are very slow.
-    const outBufferLength = Math.min(1024, input.length);
-    const outBuffer = new Uint16Array(outBufferLength);
-    let outIndex = 0;
-
-    let state = 0;
-    let codepoint = 0;
-    let type;
-
-    let i =
-      ignoreBOM && input[0] === 0xef && input[1] === 0xbb && input[2] === 0xbf
-        ? 3
-        : 0;
-
-    for (; i < input.length; ++i) {
-      // Encoding error handling
-      if (state === 12 || (state !== 0 && (input[i] & 0xc0) !== 0x80)) {
-        if (fatal) {
-          throw new TypeError(
-            `Decoder error. Invalid byte in sequence at position ${i} in data.`,
-          );
-        }
-        outBuffer[outIndex++] = 0xfffd; // Replacement character
-        if (outIndex === outBufferLength) {
-          outString += String.fromCharCode.apply(null, outBuffer);
-          outIndex = 0;
-        }
-        state = 0;
-      }
-
-      // deno-fmt-ignore
-      type = [
-         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-         1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,  9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-         7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-         8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-        10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8
-      ][input[i]];
-      codepoint = state !== 0
-        ? (input[i] & 0x3f) | (codepoint << 6)
-        : (0xff >> type) & input[i];
-      // deno-fmt-ignore
-      state = [
-         0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
-        12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,
-        12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,
-        12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12,
-        12,36,12,12,12,12,12,12,12,12,12,12
-      ][state + type];
-
-      if (state !== 0) continue;
-
-      // Add codepoint to buffer (as charcodes for utf-16), and flush buffer to
-      // string if needed.
-      if (codepoint > 0xffff) {
-        outBuffer[outIndex++] = 0xd7c0 + (codepoint >> 10);
-        if (outIndex === outBufferLength) {
-          outString += String.fromCharCode.apply(null, outBuffer);
-          outIndex = 0;
-        }
-        outBuffer[outIndex++] = 0xdc00 | (codepoint & 0x3ff);
-        if (outIndex === outBufferLength) {
-          outString += String.fromCharCode.apply(null, outBuffer);
-          outIndex = 0;
-        }
-      } else {
-        outBuffer[outIndex++] = codepoint;
-        if (outIndex === outBufferLength) {
-          outString += String.fromCharCode.apply(null, outBuffer);
-          outIndex = 0;
-        }
-      }
-    }
-
-    // Add a replacement character if we ended in the middle of a sequence or
-    // encountered an invalid code at the end.
-    if (state !== 0) {
-      if (fatal) throw new TypeError(`Decoder error. Unexpected end of data.`);
-      outBuffer[outIndex++] = 0xfffd; // Replacement character
-    }
-
-    // Final flush of buffer
-    outString += String.fromCharCode.apply(
-      null,
-      outBuffer.subarray(0, outIndex),
-    );
-
-    return outString;
-  }
-
-  window.TextEncoder = TextEncoder;
-  window.TextDecoder = TextDecoder;
-})(this);
diff --git a/cli/tsc/10_dispatch_json.js b/cli/tsc/10_dispatch_json.js
index 3d19ea62aeb76e..a25014789a6dcf 100644
--- a/cli/tsc/10_dispatch_json.js
+++ b/cli/tsc/10_dispatch_json.js
@@ -3,7 +3,7 @@
 ((window) => {
   const core = window.Deno.core;
   const util = window.__bootstrap.util;
-  const getErrorClass = window.__bootstrap.errors.getErrorClass;
+
   // Using an object without a prototype because `Map` was causing GC problems.
   const promiseTable = Object.create(null);
   let _nextPromiseId = 1;
@@ -22,7 +22,7 @@
 
   function unwrapResponse(res) {
     if (res.err != null) {
-      throw new (getErrorClass(res.err.kind))(res.err.message);
+      throw new (core.getErrorClass(res.err.kind))(res.err.message);
     }
     util.assert(res.ok != null);
     return res.ok;
diff --git a/cli/tsc/11_timers.js b/cli/tsc/11_timers.js
deleted file mode 100644
index 59fc0dc76c060d..00000000000000
--- a/cli/tsc/11_timers.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-((window) => {
-  const dispatchJson = window.__bootstrap.dispatchJson;
-
-  function opNow() {
-    return dispatchJson.sendSync("op_now");
-  }
-
-  window.__bootstrap.timers = { opNow };
-})(this);
diff --git a/cli/tsc/11_workers.js b/cli/tsc/11_workers.js
deleted file mode 100644
index 8ae0d5ad556bcf..00000000000000
--- a/cli/tsc/11_workers.js
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-((window) => {
-  const { log } = window.__bootstrap.util;
-  const { sendSync, sendAsync } = window.__bootstrap.dispatchJson;
-  /*
-  import { blobURLMap } from "./web/url.ts";
-  */
-
-  function createWorker(
-    specifier,
-    hasSourceCode,
-    sourceCode,
-    useDenoNamespace,
-    name,
-  ) {
-    return sendSync("op_create_worker", {
-      specifier,
-      hasSourceCode,
-      sourceCode,
-      name,
-      useDenoNamespace,
-    });
-  }
-
-  function hostTerminateWorker(id) {
-    sendSync("op_host_terminate_worker", { id });
-  }
-
-  function hostPostMessage(id, data) {
-    sendSync("op_host_post_message", { id }, data);
-  }
-
-  function hostGetMessage(id) {
-    return sendAsync("op_host_get_message", { id });
-  }
-
-  const encoder = new TextEncoder();
-  const decoder = new TextDecoder();
-
-  class MessageEvent extends Event {
-    constructor(type, eventInitDict) {
-      super(type, {
-        bubbles: eventInitDict?.bubbles ?? false,
-        cancelable: eventInitDict?.cancelable ?? false,
-        composed: eventInitDict?.composed ?? false,
-      });
-
-      this.data = eventInitDict?.data ?? null;
-      this.origin = eventInitDict?.origin ?? "";
-      this.lastEventId = eventInitDict?.lastEventId ?? "";
-    }
-  }
-
-  function encodeMessage(data) {
-    const dataJson = JSON.stringify(data);
-    return encoder.encode(dataJson);
-  }
-
-  function decodeMessage(dataIntArray) {
-    const dataJson = decoder.decode(dataIntArray);
-    return JSON.parse(dataJson);
-  }
-
-  class Worker extends EventTarget {
-    #id = 0;
-    #name = "";
-    #terminated = false;
-
-    constructor(specifier, options) {
-      super();
-      const { type = "classic", name = "unknown" } = options ?? {};
-
-      if (type !== "module") {
-        throw new Error(
-          'Not yet implemented: only "module" type workers are supported',
-        );
-      }
-
-      this.#name = name;
-      const hasSourceCode = false;
-      const sourceCode = decoder.decode(new Uint8Array());
-
-      /* TODO(bartlomieju):
-      // Handle blob URL.
-      if (specifier.startsWith("blob:")) {
-        hasSourceCode = true;
-        const b = blobURLMap.get(specifier);
-        if (!b) {
-          throw new Error("No Blob associated with the given URL is found");
-        }
-        const blobBytes = blobBytesWeakMap.get(b!);
-        if (!blobBytes) {
-          throw new Error("Invalid Blob");
-        }
-        sourceCode = blobBytes!;
-      }
-      */
-
-      const useDenoNamespace = options ? !!options.deno : false;
-
-      const { id } = createWorker(
-        specifier,
-        hasSourceCode,
-        sourceCode,
-        useDenoNamespace,
-        options?.name,
-      );
-      this.#id = id;
-      this.#poll();
-    }
-
-    #handleMessage = (msgData) => {
-      let data;
-      try {
-        data = decodeMessage(new Uint8Array(msgData));
-      } catch (e) {
-        const msgErrorEvent = new MessageEvent("messageerror", {
-          cancelable: false,
-          data,
-        });
-        if (this.onmessageerror) {
-          this.onmessageerror(msgErrorEvent);
-        }
-        return;
-      }
-
-      const msgEvent = new MessageEvent("message", {
-        cancelable: false,
-        data,
-      });
-
-      if (this.onmessage) {
-        this.onmessage(msgEvent);
-      }
-
-      this.dispatchEvent(msgEvent);
-    };
-
-    #handleError = (e) => {
-      const event = new ErrorEvent("error", {
-        cancelable: true,
-        message: e.message,
-        lineno: e.lineNumber ? e.lineNumber + 1 : undefined,
-        colno: e.columnNumber ? e.columnNumber + 1 : undefined,
-        filename: e.fileName,
-        error: null,
-      });
-
-      let handled = false;
-      if (this.onerror) {
-        this.onerror(event);
-      }
-
-      this.dispatchEvent(event);
-      if (event.defaultPrevented) {
-        handled = true;
-      }
-
-      return handled;
-    };
-
-    #poll = async () => {
-      while (!this.#terminated) {
-        const event = await hostGetMessage(this.#id);
-
-        // If terminate was called then we ignore all messages
-        if (this.#terminated) {
-          return;
-        }
-
-        const type = event.type;
-
-        if (type === "terminalError") {
-          this.#terminated = true;
-          if (!this.#handleError(event.error)) {
-            throw Error(event.error.message);
-          }
-          continue;
-        }
-
-        if (type === "msg") {
-          this.#handleMessage(event.data);
-          continue;
-        }
-
-        if (type === "error") {
-          if (!this.#handleError(event.error)) {
-            throw Error(event.error.message);
-          }
-          continue;
-        }
-
-        if (type === "close") {
-          log(`Host got "close" message from worker: ${this.#name}`);
-          this.#terminated = true;
-          return;
-        }
-
-        throw new Error(`Unknown worker event: "${type}"`);
-      }
-    };
-
-    postMessage(message, transferOrOptions) {
-      if (transferOrOptions) {
-        throw new Error(
-          "Not yet implemented: `transfer` and `options` are not supported.",
-        );
-      }
-
-      if (this.#terminated) {
-        return;
-      }
-
-      hostPostMessage(this.#id, encodeMessage(message));
-    }
-
-    terminate() {
-      if (!this.#terminated) {
-        this.#terminated = true;
-        hostTerminateWorker(this.#id);
-      }
-    }
-  }
-
-  window.__bootstrap.worker = {
-    Worker,
-    MessageEvent,
-  };
-})(this);
diff --git a/cli/tsc/40_diagnostics.js b/cli/tsc/40_diagnostics.js
deleted file mode 100644
index 110d3d7670719e..00000000000000
--- a/cli/tsc/40_diagnostics.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// Diagnostic provides an abstraction for advice/errors received from a
-// compiler, which is strongly influenced by the format of TypeScript
-// diagnostics.
-
-((window) => {
-  const DiagnosticCategory = {
-    0: "Log",
-    1: "Debug",
-    2: "Info",
-    3: "Error",
-    4: "Warning",
-    5: "Suggestion",
-
-    Log: 0,
-    Debug: 1,
-    Info: 2,
-    Error: 3,
-    Warning: 4,
-    Suggestion: 5,
-  };
-
-  window.__bootstrap.diagnostics = {
-    DiagnosticCategory,
-  };
-})(this);
diff --git a/cli/tsc/40_error_stack.js b/cli/tsc/40_error_stack.js
index 80f4fc5edce35b..77321eb126103e 100644
--- a/cli/tsc/40_error_stack.js
+++ b/cli/tsc/40_error_stack.js
@@ -3,22 +3,19 @@
 ((window) => {
   // Some of the code here is adapted directly from V8 and licensed under a BSD
   // style license available here: https://github.com/v8/v8/blob/24886f2d1c565287d33d71e4109a53bf0b54b75c/LICENSE.v8
-  const colors = window.__bootstrap.colors;
   const assert = window.__bootstrap.util.assert;
-  const internals = window.__bootstrap.internals;
-  const dispatchJson = window.__bootstrap.dispatchJson;
 
-  function opFormatDiagnostics(items) {
-    return dispatchJson.sendSync("op_format_diagnostic", { items });
-  }
-
-  function opApplySourceMap(location) {
-    const res = dispatchJson.sendSync("op_apply_source_map", location);
-    return {
-      fileName: res.fileName,
-      lineNumber: res.lineNumber,
-      columnNumber: res.columnNumber,
-    };
+  // https://github.com/chalk/ansi-regex/blob/2b56fb0c7a07108e5b54241e8faec160d393aedb/index.js
+  const ANSI_PATTERN = new RegExp(
+    [
+      "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
+      "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))",
+    ].join("|"),
+    "g",
+  );
+
+  function stripColor(string) {
+    return string.replace(ANSI_PATTERN, "");
   }
 
   function patchCallSite(callSite, location) {
@@ -109,12 +106,9 @@
     return result;
   }
 
-  function getFileLocation(callSite, internal = false) {
-    const cyan = internal ? colors.gray : colors.cyan;
-    const yellow = internal ? colors.gray : colors.yellow;
-    const black = internal ? colors.gray : (s) => s;
+  function getFileLocation(callSite) {
     if (callSite.isNative()) {
-      return cyan("native");
+      return "native";
     }
 
     let result = "";
@@ -123,32 +117,29 @@
     if (!fileName && callSite.isEval()) {
       const evalOrigin = callSite.getEvalOrigin();
       assert(evalOrigin != null);
-      result += cyan(`${evalOrigin}, `);
+      result += `${evalOrigin}, `;
     }
 
     if (fileName) {
-      result += cyan(fileName);
+      result += fileName;
     } else {
-      result += cyan("<anonymous>");
+      result += "<anonymous>";
     }
 
     const lineNumber = callSite.getLineNumber();
     if (lineNumber != null) {
-      result += `${black(":")}${yellow(lineNumber.toString())}`;
+      result += `:${lineNumber.toString()}`;
 
       const columnNumber = callSite.getColumnNumber();
       if (columnNumber != null) {
-        result += `${black(":")}${yellow(columnNumber.toString())}`;
+        result += `:${columnNumber.toString()}`;
       }
     }
 
     return result;
   }
 
-  function callSiteToString(callSite, internal = false) {
-    const cyan = internal ? colors.gray : colors.cyan;
-    const black = internal ? colors.gray : (s) => s;
-
+  function callSiteToString(callSite) {
     let result = "";
     const functionName = callSite.getFunctionName();
 
@@ -159,35 +150,29 @@
     const isMethodCall = !(isTopLevel || isConstructor);
 
     if (isAsync) {
-      result += colors.gray("async ");
+      result += "async ";
     }
     if (isPromiseAll) {
-      result += colors.bold(
-        colors.italic(
-          black(`Promise.all (index ${callSite.getPromiseIndex()})`),
-        ),
-      );
+      result += `Promise.all (index ${callSite.getPromiseIndex()})`;
       return result;
     }
     if (isMethodCall) {
-      result += colors.bold(colors.italic(black(getMethodCall(callSite))));
+      result += getMethodCall(callSite);
     } else if (isConstructor) {
-      result += colors.gray("new ");
+      result += "new ";
       if (functionName) {
-        result += colors.bold(colors.italic(black(functionName)));
+        result += functionName;
       } else {
-        result += cyan("<anonymous>");
+        result += "<anonymous>";
       }
     } else if (functionName) {
-      result += colors.bold(colors.italic(black(functionName)));
+      result += functionName;
     } else {
-      result += getFileLocation(callSite, internal);
+      result += getFileLocation(callSite);
       return result;
     }
 
-    result += ` ${black("(")}${getFileLocation(callSite, internal)}${
-      black(")")
-    }`;
+    result += ` (${getFileLocation(callSite)})`;
     return result;
   }
 
@@ -224,11 +209,11 @@
         if (fileName && lineNumber != null && columnNumber != null) {
           return patchCallSite(
             callSite,
-            opApplySourceMap({
+            {
               fileName,
               lineNumber,
               columnNumber,
-            }),
+            },
           );
         }
         return callSite;
@@ -240,15 +225,14 @@
     });
     for (const callSite of mappedCallSites) {
       error.__callSiteEvals.push(Object.freeze(evaluateCallSite(callSite)));
-      const isInternal = callSite.getFileName()?.startsWith("$deno$") ?? false;
-      error.__formattedFrames.push(callSiteToString(callSite, isInternal));
+      error.__formattedFrames.push(callSiteToString(callSite));
     }
     Object.freeze(error.__callSiteEvals);
     Object.freeze(error.__formattedFrames);
     return (
       `${error.name}: ${error.message}\n` +
       error.__formattedFrames
-        .map((s) => `    at ${colors.stripColor(s)}`)
+        .map((s) => `    at ${stripColor(s)}`)
         .join("\n")
     );
   }
@@ -257,11 +241,7 @@
     ErrorConstructor.prepareStackTrace = prepareStackTrace;
   }
 
-  internals.exposeForTest("setPrepareStackTrace", setPrepareStackTrace);
-
   window.__bootstrap.errorStack = {
     setPrepareStackTrace,
-    opApplySourceMap,
-    opFormatDiagnostics,
   };
 })(this);
diff --git a/cli/tsc/40_performance.js b/cli/tsc/40_performance.js
deleted file mode 100644
index 768c43a6af87ba..00000000000000
--- a/cli/tsc/40_performance.js
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-((window) => {
-  const { opNow } = window.__bootstrap.timers;
-  const { customInspect, inspect } = window.__bootstrap.console;
-  const { cloneValue } = window.__bootstrap.webUtil;
-
-  let performanceEntries = [];
-
-  function findMostRecent(
-    name,
-    type,
-  ) {
-    return performanceEntries
-      .slice()
-      .reverse()
-      .find((entry) => entry.name === name && entry.entryType === type);
-  }
-
-  function convertMarkToTimestamp(mark) {
-    if (typeof mark === "string") {
-      const entry = findMostRecent(mark, "mark");
-      if (!entry) {
-        throw new SyntaxError(`Cannot find mark: "${mark}".`);
-      }
-      return entry.startTime;
-    }
-    if (mark < 0) {
-      throw new TypeError("Mark cannot be negative.");
-    }
-    return mark;
-  }
-
-  function filterByNameType(
-    name,
-    type,
-  ) {
-    return performanceEntries.filter(
-      (entry) =>
-        (name ? entry.name === name : true) &&
-        (type ? entry.entryType === type : true),
-    );
-  }
-
-  function now() {
-    const res = opNow();
-    return res.seconds * 1e3 + res.subsecNanos / 1e6;
-  }
-
-  class PerformanceEntry {
-    #name = "";
-    #entryType = "";
-    #startTime = 0;
-    #duration = 0;
-
-    get name() {
-      return this.#name;
-    }
-
-    get entryType() {
-      return this.#entryType;
-    }
-
-    get startTime() {
-      return this.#startTime;
-    }
-
-    get duration() {
-      return this.#duration;
-    }
-
-    constructor(
-      name,
-      entryType,
-      startTime,
-      duration,
-    ) {
-      this.#name = name;
-      this.#entryType = entryType;
-      this.#startTime = startTime;
-      this.#duration = duration;
-    }
-
-    toJSON() {
-      return {
-        name: this.#name,
-        entryType: this.#entryType,
-        startTime: this.#startTime,
-        duration: this.#duration,
-      };
-    }
-
-    [customInspect]() {
-      return `${this.constructor.name} { name: "${this.name}", entryType: "${this.entryType}", startTime: ${this.startTime}, duration: ${this.duration} }`;
-    }
-  }
-
-  class PerformanceMark extends PerformanceEntry {
-    #detail = null;
-
-    get detail() {
-      return this.#detail;
-    }
-
-    get entryType() {
-      return "mark";
-    }
-
-    constructor(
-      name,
-      { detail = null, startTime = now() } = {},
-    ) {
-      super(name, "mark", startTime, 0);
-      if (startTime < 0) {
-        throw new TypeError("startTime cannot be negative");
-      }
-      this.#detail = cloneValue(detail);
-    }
-
-    toJSON() {
-      return {
-        name: this.name,
-        entryType: this.entryType,
-        startTime: this.startTime,
-        duration: this.duration,
-        detail: this.detail,
-      };
-    }
-
-    [customInspect]() {
-      return this.detail
-        ? `${this.constructor.name} {\n  detail: ${
-          inspect(this.detail, { depth: 3 })
-        },\n  name: "${this.name}",\n  entryType: "${this.entryType}",\n  startTime: ${this.startTime},\n  duration: ${this.duration}\n}`
-        : `${this.constructor.name} { detail: ${this.detail}, name: "${this.name}", entryType: "${this.entryType}", startTime: ${this.startTime}, duration: ${this.duration} }`;
-    }
-  }
-
-  class PerformanceMeasure extends PerformanceEntry {
-    #detail = null;
-
-    get detail() {
-      return this.#detail;
-    }
-
-    get entryType() {
-      return "measure";
-    }
-
-    constructor(
-      name,
-      startTime,
-      duration,
-      detail = null,
-    ) {
-      super(name, "measure", startTime, duration);
-      this.#detail = cloneValue(detail);
-    }
-
-    toJSON() {
-      return {
-        name: this.name,
-        entryType: this.entryType,
-        startTime: this.startTime,
-        duration: this.duration,
-        detail: this.detail,
-      };
-    }
-
-    [customInspect]() {
-      return this.detail
-        ? `${this.constructor.name} {\n  detail: ${
-          inspect(this.detail, { depth: 3 })
-        },\n  name: "${this.name}",\n  entryType: "${this.entryType}",\n  startTime: ${this.startTime},\n  duration: ${this.duration}\n}`
-        : `${this.constructor.name} { detail: ${this.detail}, name: "${this.name}", entryType: "${this.entryType}", startTime: ${this.startTime}, duration: ${this.duration} }`;
-    }
-  }
-
-  class Performance {
-    clearMarks(markName) {
-      if (markName == null) {
-        performanceEntries = performanceEntries.filter(
-          (entry) => entry.entryType !== "mark",
-        );
-      } else {
-        performanceEntries = performanceEntries.filter(
-          (entry) => !(entry.name === markName && entry.entryType === "mark"),
-        );
-      }
-    }
-
-    clearMeasures(measureName) {
-      if (measureName == null) {
-        performanceEntries = performanceEntries.filter(
-          (entry) => entry.entryType !== "measure",
-        );
-      } else {
-        performanceEntries = performanceEntries.filter(
-          (entry) =>
-            !(entry.name === measureName && entry.entryType === "measure"),
-        );
-      }
-    }
-
-    getEntries() {
-      return filterByNameType();
-    }
-
-    getEntriesByName(
-      name,
-      type,
-    ) {
-      return filterByNameType(name, type);
-    }
-
-    getEntriesByType(type) {
-      return filterByNameType(undefined, type);
-    }
-
-    mark(
-      markName,
-      options = {},
-    ) {
-      // 3.1.1.1 If the global object is a Window object and markName uses the
-      // same name as a read only attribute in the PerformanceTiming interface,
-      // throw a SyntaxError. - not implemented
-      const entry = new PerformanceMark(markName, options);
-      // 3.1.1.7 Queue entry - not implemented
-      performanceEntries.push(entry);
-      return entry;
-    }
-
-    measure(
-      measureName,
-      startOrMeasureOptions = {},
-      endMark,
-    ) {
-      if (startOrMeasureOptions && typeof startOrMeasureOptions === "object") {
-        if (endMark) {
-          throw new TypeError("Options cannot be passed with endMark.");
-        }
-        if (
-          !("start" in startOrMeasureOptions) &&
-          !("end" in startOrMeasureOptions)
-        ) {
-          throw new TypeError(
-            "A start or end mark must be supplied in options.",
-          );
-        }
-        if (
-          "start" in startOrMeasureOptions &&
-          "duration" in startOrMeasureOptions &&
-          "end" in startOrMeasureOptions
-        ) {
-          throw new TypeError(
-            "Cannot specify start, end, and duration together in options.",
-          );
-        }
-      }
-      let endTime;
-      if (endMark) {
-        endTime = convertMarkToTimestamp(endMark);
-      } else if (
-        typeof startOrMeasureOptions === "object" &&
-        "end" in startOrMeasureOptions
-      ) {
-        endTime = convertMarkToTimestamp(startOrMeasureOptions.end);
-      } else if (
-        typeof startOrMeasureOptions === "object" &&
-        "start" in startOrMeasureOptions &&
-        "duration" in startOrMeasureOptions
-      ) {
-        const start = convertMarkToTimestamp(startOrMeasureOptions.start);
-        const duration = convertMarkToTimestamp(startOrMeasureOptions.duration);
-        endTime = start + duration;
-      } else {
-        endTime = now();
-      }
-      let startTime;
-      if (
-        typeof startOrMeasureOptions === "object" &&
-        "start" in startOrMeasureOptions
-      ) {
-        startTime = convertMarkToTimestamp(startOrMeasureOptions.start);
-      } else if (
-        typeof startOrMeasureOptions === "object" &&
-        "end" in startOrMeasureOptions &&
-        "duration" in startOrMeasureOptions
-      ) {
-        const end = convertMarkToTimestamp(startOrMeasureOptions.end);
-        const duration = convertMarkToTimestamp(startOrMeasureOptions.duration);
-        startTime = end - duration;
-      } else if (typeof startOrMeasureOptions === "string") {
-        startTime = convertMarkToTimestamp(startOrMeasureOptions);
-      } else {
-        startTime = 0;
-      }
-      const entry = new PerformanceMeasure(
-        measureName,
-        startTime,
-        endTime - startTime,
-        typeof startOrMeasureOptions === "object"
-          ? startOrMeasureOptions.detail ?? null
-          : null,
-      );
-      performanceEntries.push(entry);
-      return entry;
-    }
-
-    now() {
-      return now();
-    }
-  }
-
-  window.__bootstrap.performance = {
-    PerformanceEntry,
-    PerformanceMark,
-    PerformanceMeasure,
-    Performance,
-  };
-})(this);
diff --git a/cli/tsc/90_deno_ns.js b/cli/tsc/90_deno_ns.js
deleted file mode 100644
index 0c2d4e39b09b3d..00000000000000
--- a/cli/tsc/90_deno_ns.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// This module exports stable Deno APIs.
-
-((window) => {
-  window.__bootstrap.denoNs = {
-    version: window.__bootstrap.version.version,
-    build: window.__bootstrap.build.build,
-    errors: window.__bootstrap.errors.errors,
-    customInspect: window.__bootstrap.console.customInspect,
-    inspect: window.__bootstrap.console.inspect,
-  };
-})(this);
diff --git a/cli/tsc/99_main.js b/cli/tsc/99_main.js
deleted file mode 100644
index 9b85e2f607bfff..00000000000000
--- a/cli/tsc/99_main.js
+++ /dev/null
@@ -1,217 +0,0 @@
-// Removes the `__proto__` for security reasons.  This intentionally makes
-// Deno non compliant with ECMA-262 Annex B.2.2.1
-//
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-delete Object.prototype.__proto__;
-
-((window) => {
-  const core = Deno.core;
-  const util = window.__bootstrap.util;
-  const eventTarget = window.__bootstrap.eventTarget;
-  const dispatchJson = window.__bootstrap.dispatchJson;
-  const build = window.__bootstrap.build;
-  const version = window.__bootstrap.version;
-  const errorStack = window.__bootstrap.errorStack;
-  const Console = window.__bootstrap.console.Console;
-  const worker = window.__bootstrap.worker;
-  const { internalSymbol, internalObject } = window.__bootstrap.internals;
-  const performance = window.__bootstrap.performance;
-  const crypto = window.__bootstrap.crypto;
-  const denoNs = window.__bootstrap.denoNs;
-
-  const encoder = new TextEncoder();
-
-  function workerClose() {
-    if (isClosing) {
-      return;
-    }
-
-    isClosing = true;
-    opCloseWorker();
-  }
-
-  // TODO(bartlomieju): remove these funtions
-  // Stuff for workers
-  const onmessage = () => {};
-  const onerror = () => {};
-
-  function postMessage(data) {
-    const dataJson = JSON.stringify(data);
-    const dataIntArray = encoder.encode(dataJson);
-    opPostMessage(dataIntArray);
-  }
-
-  let isClosing = false;
-  async function workerMessageRecvCallback(data) {
-    const msgEvent = new worker.MessageEvent("message", {
-      cancelable: false,
-      data,
-    });
-
-    try {
-      if (globalThis["onmessage"]) {
-        const result = globalThis.onmessage(msgEvent);
-        if (result && "then" in result) {
-          await result;
-        }
-      }
-      globalThis.dispatchEvent(msgEvent);
-    } catch (e) {
-      let handled = false;
-
-      const errorEvent = new ErrorEvent("error", {
-        cancelable: true,
-        message: e.message,
-        lineno: e.lineNumber ? e.lineNumber + 1 : undefined,
-        colno: e.columnNumber ? e.columnNumber + 1 : undefined,
-        filename: e.fileName,
-        error: null,
-      });
-
-      if (globalThis["onerror"]) {
-        const ret = globalThis.onerror(
-          e.message,
-          e.fileName,
-          e.lineNumber,
-          e.columnNumber,
-          e,
-        );
-        handled = ret === true;
-      }
-
-      globalThis.dispatchEvent(errorEvent);
-      if (errorEvent.defaultPrevented) {
-        handled = true;
-      }
-
-      if (!handled) {
-        throw e;
-      }
-    }
-  }
-
-  function opPostMessage(data) {
-    dispatchJson.sendSync("op_worker_post_message", {}, data);
-  }
-
-  function opCloseWorker() {
-    dispatchJson.sendSync("op_worker_close");
-  }
-
-  function opStart() {
-    return dispatchJson.sendSync("op_start");
-  }
-
-  // TODO(bartlomieju): temporary solution, must be fixed when moving
-  // dispatches to separate crates
-  function initOps() {
-    const opsMap = core.ops();
-    for (const [_name, opId] of Object.entries(opsMap)) {
-      core.setAsyncHandler(opId, dispatchJson.asyncMsgFromRust);
-    }
-  }
-
-  function runtimeStart(source) {
-    initOps();
-    // First we send an empty `Start` message to let the privileged side know we
-    // are ready. The response should be a `StartRes` message containing the CLI
-    // args and other info.
-    const s = opStart();
-    version.setVersions(s.denoVersion, s.v8Version, s.tsVersion);
-    build.setBuildInfo(s.target);
-    util.setLogDebug(s.debugFlag, source);
-    errorStack.setPrepareStackTrace(Error);
-    return s;
-  }
-
-  // Other properties shared between WindowScope and WorkerGlobalScope
-  const windowOrWorkerGlobalScopeProperties = {
-    console: util.writable(new Console(core.print)),
-    crypto: util.readOnly(crypto),
-    CustomEvent: util.nonEnumerable(CustomEvent),
-    ErrorEvent: util.nonEnumerable(ErrorEvent),
-    Event: util.nonEnumerable(Event),
-    EventTarget: util.nonEnumerable(EventTarget),
-    performance: util.writable(new performance.Performance()),
-    Performance: util.nonEnumerable(performance.Performance),
-    PerformanceEntry: util.nonEnumerable(performance.PerformanceEntry),
-    PerformanceMark: util.nonEnumerable(performance.PerformanceMark),
-    PerformanceMeasure: util.nonEnumerable(performance.PerformanceMeasure),
-    TextDecoder: util.nonEnumerable(TextDecoder),
-    TextEncoder: util.nonEnumerable(TextEncoder),
-    Worker: util.nonEnumerable(worker.Worker),
-  };
-
-  const eventTargetProperties = {
-    addEventListener: util.readOnly(
-      EventTarget.prototype.addEventListener,
-    ),
-    dispatchEvent: util.readOnly(EventTarget.prototype.dispatchEvent),
-    removeEventListener: util.readOnly(
-      EventTarget.prototype.removeEventListener,
-    ),
-  };
-
-  const workerRuntimeGlobalProperties = {
-    self: util.readOnly(globalThis),
-    onmessage: util.writable(onmessage),
-    onerror: util.writable(onerror),
-    // TODO: should be readonly?
-    close: util.nonEnumerable(workerClose),
-    postMessage: util.writable(postMessage),
-    workerMessageRecvCallback: util.nonEnumerable(workerMessageRecvCallback),
-  };
-
-  let hasBootstrapped = false;
-
-  function bootstrapWorkerRuntime(name, useDenoNamespace, internalName) {
-    if (hasBootstrapped) {
-      throw new Error("Worker runtime already bootstrapped");
-    }
-    // Remove bootstrapping methods from global scope
-    globalThis.__bootstrap = undefined;
-    globalThis.bootstrap = undefined;
-    util.log("bootstrapWorkerRuntime");
-    hasBootstrapped = true;
-    Object.defineProperties(globalThis, windowOrWorkerGlobalScopeProperties);
-    Object.defineProperties(globalThis, workerRuntimeGlobalProperties);
-    Object.defineProperties(globalThis, eventTargetProperties);
-    Object.defineProperties(globalThis, { name: util.readOnly(name) });
-    eventTarget.setEventTargetData(globalThis);
-    const { noColor, args } = runtimeStart(
-      internalName ?? name,
-    );
-
-    const finalDenoNs = {
-      core,
-      internal: internalSymbol,
-      [internalSymbol]: internalObject,
-      ...denoNs,
-    };
-    if (useDenoNamespace) {
-      Object.defineProperties(finalDenoNs, {
-        noColor: util.readOnly(noColor),
-        args: util.readOnly(Object.freeze(args)),
-      });
-      // Setup `Deno` global - we're actually overriding already
-      // existing global `Deno` with `Deno` namespace from "./deno.ts".
-      util.immutableDefine(globalThis, "Deno", finalDenoNs);
-      Object.freeze(globalThis.Deno);
-      Object.freeze(globalThis.Deno.core);
-      Object.freeze(globalThis.Deno.core.sharedQueue);
-    } else {
-      delete globalThis.Deno;
-      util.assert(globalThis.Deno === undefined);
-    }
-  }
-
-  Object.defineProperties(globalThis, {
-    bootstrap: {
-      value: {
-        workerRuntime: bootstrapWorkerRuntime,
-      },
-      configurable: true,
-      writable: true,
-    },
-  });
-})(this);
diff --git a/cli/tsc/99_main_compiler.js b/cli/tsc/99_main_compiler.js
index d64896862d7486..4d44375c6dccd6 100644
--- a/cli/tsc/99_main_compiler.js
+++ b/cli/tsc/99_main_compiler.js
@@ -3,10 +3,13 @@
 // This module is the entry point for "compiler" isolate, ie. the one
 // that is created when Deno needs to compile TS/WASM to JS.
 //
-// It provides a single functions that should be called by Rust:
-//  - `bootstrapTsCompilerRuntime`
+// It provides two functions that should be called by Rust:
+//  - `bootstrapCompilerRuntime`
 // This functions must be called when creating isolate
 // to properly setup runtime.
+//  - `tsCompilerOnMessage`
+// This function must be called when sending a request
+// to the compiler.
 
 // Removes the `__proto__` for security reasons.  This intentionally makes
 // Deno non compliant with ECMA-262 Annex B.2.2.1
@@ -16,65 +19,102 @@ delete Object.prototype.__proto__;
 
 ((window) => {
   const core = Deno.core;
-  const { bold, cyan, yellow } = window.__bootstrap.colors;
   const { assert, log, notImplemented } = window.__bootstrap.util;
-  const { DiagnosticCategory } = window.__bootstrap.diagnostics;
+  const dispatchJson = window.__bootstrap.dispatchJson;
+  const util = window.__bootstrap.util;
+  const errorStack = window.__bootstrap.errorStack;
+  const errors = window.__bootstrap.errors.errors;
+
+  function opNow() {
+    const res = dispatchJson.sendSync("op_now");
+    return res.seconds * 1e3 + res.subsecNanos / 1e6;
+  }
+
+  const DiagnosticCategory = {
+    0: "Log",
+    1: "Debug",
+    2: "Info",
+    3: "Error",
+    4: "Warning",
+    5: "Suggestion",
+
+    Log: 0,
+    Debug: 1,
+    Info: 2,
+    Error: 3,
+    Warning: 4,
+    Suggestion: 5,
+  };
 
   const unstableDenoGlobalProperties = [
-    "umask",
-    "linkSync",
-    "link",
-    "symlinkSync",
-    "symlink",
-    "loadavg",
-    "osRelease",
-    "openPlugin",
+    "CompilerOptions",
+    "DatagramConn",
+    "Diagnostic",
     "DiagnosticCategory",
-    "DiagnosticMessageChain",
     "DiagnosticItem",
-    "Diagnostic",
-    "formatDiagnostics",
-    "CompilerOptions",
-    "TranspileOnlyResult",
-    "transpileOnly",
-    "compile",
-    "bundle",
-    "Location",
-    "applySourceMap",
+    "DiagnosticMessageChain",
+    "EnvPermissionDescriptor",
+    "HrtimePermissionDescriptor",
+    "HttpClient",
     "LinuxSignal",
+    "Location",
     "MacOSSignal",
-    "Signal",
-    "SignalStream",
-    "signal",
-    "signals",
-    "setRaw",
-    "utimeSync",
-    "utime",
-    "ShutdownMode",
-    "shutdown",
-    "DatagramConn",
-    "UnixListenOptions",
-    "listen",
-    "listenDatagram",
-    "UnixConnectOptions",
-    "connect",
-    "StartTlsOptions",
-    "startTls",
-    "kill",
+    "NetPermissionDescriptor",
+    "PermissionDescriptor",
     "PermissionName",
     "PermissionState",
-    "RunPermissionDescriptor",
+    "PermissionStatus",
+    "Permissions",
+    "PluginPermissionDescriptor",
     "ReadPermissionDescriptor",
+    "RunPermissionDescriptor",
+    "ShutdownMode",
+    "Signal",
+    "SignalStream",
+    "StartTlsOptions",
+    "SymlinkOptions",
+    "TranspileOnlyResult",
+    "UnixConnectOptions",
+    "UnixListenOptions",
     "WritePermissionDescriptor",
-    "NetPermissionDescriptor",
-    "EnvPermissionDescriptor",
-    "PluginPermissionDescriptor",
-    "HrtimePermissionDescriptor",
-    "PermissionDescriptor",
-    "Permissions",
-    "PermissionStatus",
+    "applySourceMap",
+    "bundle",
+    "compile",
+    "connect",
+    "consoleSize",
+    "createHttpClient",
+    "fdatasync",
+    "fdatasyncSync",
+    "formatDiagnostics",
+    "fstat",
+    "fstatSync",
+    "fsync",
+    "fsyncSync",
+    "ftruncate",
+    "ftruncateSync",
     "hostname",
+    "kill",
+    "link",
+    "linkSync",
+    "listen",
+    "listenDatagram",
+    "loadavg",
+    "mainModule",
+    "openPlugin",
+    "osRelease",
+    "permissions",
     "ppid",
+    "setRaw",
+    "shutdown",
+    "signal",
+    "signals",
+    "startTls",
+    "symlink",
+    "symlinkSync",
+    "transpileOnly",
+    "umask",
+    "utime",
+    "utimeSync",
   ];
 
   function transformMessageText(messageText, code) {
@@ -114,9 +154,7 @@ delete Object.prototype.__proto__;
     return messageText;
   }
 
-  function fromDiagnosticCategory(
-    category,
-  ) {
+  function fromDiagnosticCategory(category) {
     switch (category) {
       case ts.DiagnosticCategory.Error:
         return DiagnosticCategory.Error;
@@ -135,11 +173,7 @@ delete Object.prototype.__proto__;
     }
   }
 
-  function getSourceInformation(
-    sourceFile,
-    start,
-    length,
-  ) {
+  function getSourceInformation(sourceFile, start, length) {
     const scriptResourceName = sourceFile.fileName;
     const {
       line: lineNumber,
@@ -171,9 +205,7 @@ delete Object.prototype.__proto__;
     };
   }
 
-  function fromDiagnosticMessageChain(
-    messageChain,
-  ) {
+  function fromDiagnosticMessageChain(messageChain) {
     if (!messageChain) {
       return undefined;
     }
@@ -189,9 +221,7 @@ delete Object.prototype.__proto__;
     });
   }
 
-  function parseDiagnostic(
-    item,
-  ) {
+  function parseDiagnostic(item) {
     const {
       messageText,
       category: sourceCategory,
@@ -229,9 +259,7 @@ delete Object.prototype.__proto__;
     return sourceInfo ? { ...base, ...sourceInfo } : base;
   }
 
-  function parseRelatedInformation(
-    relatedInformation,
-  ) {
+  function parseRelatedInformation(relatedInformation) {
     const result = [];
     for (const item of relatedInformation) {
       result.push(parseDiagnostic(item));
@@ -239,9 +267,7 @@ delete Object.prototype.__proto__;
     return result;
   }
 
-  function fromTypeScriptDiagnostic(
-    diagnostics,
-  ) {
+  function fromTypeScriptDiagnostic(diagnostics) {
     const items = [];
     for (const sourceDiagnostic of diagnostics) {
       const item = parseDiagnostic(sourceDiagnostic);
@@ -464,12 +490,7 @@ delete Object.prototype.__proto__;
    */
   const RESOLVED_SPECIFIER_CACHE = new Map();
 
-  function configure(
-    defaultOptions,
-    source,
-    path,
-    cwd,
-  ) {
+  function configure(defaultOptions, source, path, cwd) {
     const { config, error } = ts.parseConfigFileTextToJson(path, source);
     if (error) {
       return { diagnostics: [error], options: defaultOptions };
@@ -515,11 +536,7 @@ delete Object.prototype.__proto__;
       return SOURCE_FILE_CACHE.get(url);
     }
 
-    static cacheResolvedUrl(
-      resolvedUrl,
-      rawModuleSpecifier,
-      containingFile,
-    ) {
+    static cacheResolvedUrl(resolvedUrl, rawModuleSpecifier, containingFile) {
       containingFile = containingFile || "";
       let innerCache = RESOLVED_SPECIFIER_CACHE.get(containingFile);
       if (!innerCache) {
@@ -529,10 +546,7 @@ delete Object.prototype.__proto__;
       innerCache.set(rawModuleSpecifier, resolvedUrl);
     }
 
-    static getResolvedUrl(
-      moduleSpecifier,
-      containingFile,
-    ) {
+    static getResolvedUrl(moduleSpecifier, containingFile) {
       const containingCache = RESOLVED_SPECIFIER_CACHE.get(containingFile);
       if (containingCache) {
         return containingCache.get(moduleSpecifier);
@@ -596,11 +610,7 @@ delete Object.prototype.__proto__;
       return this.#options;
     }
 
-    configure(
-      cwd,
-      path,
-      configurationText,
-    ) {
+    configure(cwd, path, configurationText) {
       log("compiler::host.configure", path);
       const { options, ...result } = configure(
         this.#options,
@@ -693,10 +703,7 @@ delete Object.prototype.__proto__;
       return notImplemented();
     }
 
-    resolveModuleNames(
-      moduleNames,
-      containingFile,
-    ) {
+    resolveModuleNames(moduleNames, containingFile) {
       log("compiler::host.resolveModuleNames", {
         moduleNames,
         containingFile,
@@ -735,13 +742,7 @@ delete Object.prototype.__proto__;
       return true;
     }
 
-    writeFile(
-      fileName,
-      data,
-      _writeByteOrderMark,
-      _onError,
-      sourceFiles,
-    ) {
+    writeFile(fileName, data, _writeByteOrderMark, _onError, sourceFiles) {
       log("compiler::host.writeFile", fileName);
       this.#writeFile(fileName, data, sourceFiles);
     }
@@ -779,6 +780,7 @@ delete Object.prototype.__proto__;
   // as these are internal APIs of TypeScript which maintain valid libs
   ts.libs.push("deno.ns", "deno.window", "deno.worker", "deno.shared_globals");
   ts.libMap.set("deno.ns", "lib.deno.ns.d.ts");
+  ts.libMap.set("deno.web", "lib.deno.web.d.ts");
   ts.libMap.set("deno.window", "lib.deno.window.d.ts");
   ts.libMap.set("deno.worker", "lib.deno.worker.d.ts");
   ts.libMap.set("deno.shared_globals", "lib.deno.shared_globals.d.ts");
@@ -790,6 +792,10 @@ delete Object.prototype.__proto__;
     `${ASSETS}/lib.deno.ns.d.ts`,
     ts.ScriptTarget.ESNext,
   );
+  SNAPSHOT_HOST.getSourceFile(
+    `${ASSETS}/lib.deno.web.d.ts`,
+    ts.ScriptTarget.ESNext,
+  );
   SNAPSHOT_HOST.getSourceFile(
     `${ASSETS}/lib.deno.window.d.ts`,
     ts.ScriptTarget.ESNext,
@@ -823,9 +829,7 @@ delete Object.prototype.__proto__;
   const SYSTEM_LOADER = getAsset("system_loader.js");
   const SYSTEM_LOADER_ES5 = getAsset("system_loader_es5.js");
 
-  function buildLocalSourceFileCache(
-    sourceFileMap,
-  ) {
+  function buildLocalSourceFileCache(sourceFileMap) {
     for (const entry of Object.values(sourceFileMap)) {
       assert(entry.sourceCode.length > 0);
       SourceFile.addToCache({
@@ -844,11 +848,13 @@ delete Object.prototype.__proto__;
           importedFile.mediaType === MediaType.JSX;
         // If JS or JSX perform substitution for types if available
         if (isJsOrJsx) {
-          if (importedFile.typeHeaders.length > 0) {
+          // @deno-types has highest precedence, followed by
+          // X-TypeScript-Types header
+          if (importDesc.resolvedTypeDirective) {
+            mappedUrl = importDesc.resolvedTypeDirective;
+          } else if (importedFile.typeHeaders.length > 0) {
             const typeHeaders = importedFile.typeHeaders[0];
             mappedUrl = typeHeaders.resolvedSpecifier;
-          } else if (importDesc.resolvedTypeDirective) {
-            mappedUrl = importDesc.resolvedTypeDirective;
           } else if (importedFile.typesDirectives.length > 0) {
             const typeDirective = importedFile.typesDirectives[0];
             mappedUrl = typeDirective.resolvedSpecifier;
@@ -875,9 +881,7 @@ delete Object.prototype.__proto__;
     }
   }
 
-  function buildSourceFileCache(
-    sourceFileMap,
-  ) {
+  function buildSourceFileCache(sourceFileMap) {
     for (const entry of Object.values(sourceFileMap)) {
       SourceFile.addToCache({
         url: entry.url,
@@ -903,11 +907,13 @@ delete Object.prototype.__proto__;
           importedFile.mediaType === MediaType.JSX;
         // If JS or JSX perform substitution for types if available
         if (isJsOrJsx) {
-          if (importedFile.typeHeaders.length > 0) {
+          // @deno-types has highest precedence, followed by
+          // X-TypeScript-Types header
+          if (importDesc.resolvedTypeDirective) {
+            mappedUrl = importDesc.resolvedTypeDirective;
+          } else if (importedFile.typeHeaders.length > 0) {
             const typeHeaders = importedFile.typeHeaders[0];
             mappedUrl = typeHeaders.resolvedSpecifier;
-          } else if (importDesc.resolvedTypeDirective) {
-            mappedUrl = importDesc.resolvedTypeDirective;
           } else if (importedFile.typesDirectives.length > 0) {
             const typeDirective = importedFile.typesDirectives[0];
             mappedUrl = typeDirective.resolvedSpecifier;
@@ -945,11 +951,7 @@ delete Object.prototype.__proto__;
   };
 
   function createBundleWriteFile(state) {
-    return function writeFile(
-      _fileName,
-      data,
-      sourceFiles,
-    ) {
+    return function writeFile(_fileName, data, sourceFiles) {
       assert(sourceFiles != null);
       assert(state.host);
       // we only support single root names for bundles
@@ -963,14 +965,8 @@ delete Object.prototype.__proto__;
     };
   }
 
-  function createCompileWriteFile(
-    state,
-  ) {
-    return function writeFile(
-      fileName,
-      data,
-      sourceFiles,
-    ) {
+  function createCompileWriteFile(state) {
+    return function writeFile(fileName, data, sourceFiles) {
       const isBuildInfo = fileName === TS_BUILD_INFO;
 
       if (isBuildInfo) {
@@ -988,14 +984,8 @@ delete Object.prototype.__proto__;
     };
   }
 
-  function createRuntimeCompileWriteFile(
-    state,
-  ) {
-    return function writeFile(
-      fileName,
-      data,
-      sourceFiles,
-    ) {
+  function createRuntimeCompileWriteFile(state) {
+    return function writeFile(fileName, data, sourceFiles) {
       assert(sourceFiles);
       assert(sourceFiles.length === 1);
       state.emitMap[fileName] = {
@@ -1136,14 +1126,11 @@ delete Object.prototype.__proto__;
   function performanceStart() {
     stats.length = 0;
     // TODO(kitsonk) replace with performance.mark() when landed
-    statsStart = performance.now();
+    statsStart = opNow();
     ts.performance.enable();
   }
 
-  function performanceProgram({
-    program,
-    fileCount,
-  }) {
+  function performanceProgram({ program, fileCount }) {
     if (program) {
       if ("getProgram" in program) {
         program = program.getProgram();
@@ -1176,23 +1163,22 @@ delete Object.prototype.__proto__;
 
   function performanceEnd() {
     // TODO(kitsonk) replace with performance.measure() when landed
-    const duration = performance.now() - statsStart;
+    const duration = opNow() - statsStart;
     stats.push({ key: "Compile time", value: duration });
     return stats;
   }
 
   // TODO(Bartlomieju): this check should be done in Rust; there should be no
-  function processConfigureResponse(
-    configResult,
-    configPath,
-  ) {
+  function processConfigureResponse(configResult, configPath) {
     const { ignoredOptions, diagnostics } = configResult;
     if (ignoredOptions) {
-      console.warn(
-        yellow(`Unsupported compiler options in "${configPath}"\n`) +
-          cyan(`  The following options were ignored:\n`) +
-          `    ${ignoredOptions.map((value) => bold(value)).join(", ")}`,
-      );
+      const msg =
+        `Unsupported compiler options in "${configPath}"\n  The following options were ignored:\n    ${
+          ignoredOptions
+            .map((value) => value)
+            .join(", ")
+        }\n`;
+      core.print(msg, true);
     }
     return diagnostics;
   }
@@ -1290,12 +1276,7 @@ delete Object.prototype.__proto__;
     }
   }
 
-  function buildBundle(
-    rootName,
-    data,
-    sourceFiles,
-    target,
-  ) {
+  function buildBundle(rootName, data, sourceFiles, target) {
     // when outputting to AMD and a single outfile, TypeScript makes up the module
     // specifiers which are used to define the modules, and doesn't expose them
     // publicly, so we have to try to replicate
@@ -1545,6 +1526,7 @@ delete Object.prototype.__proto__;
     cwd,
     sourceFileMap,
     type,
+    performance,
   }) {
     if (performance) {
       performanceStart();
@@ -1634,9 +1616,7 @@ delete Object.prototype.__proto__;
     return result;
   }
 
-  function runtimeCompile(
-    request,
-  ) {
+  function runtimeCompile(request) {
     const { options, rootNames, target, unstable, sourceFileMap } = request;
 
     log(">>> runtime compile start", {
@@ -1778,9 +1758,7 @@ delete Object.prototype.__proto__;
     };
   }
 
-  function runtimeTranspile(
-    request,
-  ) {
+  function runtimeTranspile(request) {
     const result = {};
     const { sources, options } = request;
     const compilerOptions = options
@@ -1804,64 +1782,104 @@ delete Object.prototype.__proto__;
     return Promise.resolve(result);
   }
 
-  async function tsCompilerOnMessage({
-    data: request,
-  }) {
+  function opCompilerRespond(msg) {
+    dispatchJson.sendSync("op_compiler_respond", msg);
+  }
+
+  async function tsCompilerOnMessage(msg) {
+    const request = msg.data;
     switch (request.type) {
       case CompilerRequestType.Compile: {
         const result = compile(request);
-        globalThis.postMessage(result);
+        opCompilerRespond(result);
         break;
       }
       case CompilerRequestType.Transpile: {
         const result = transpile(request);
-        globalThis.postMessage(result);
+        opCompilerRespond(result);
         break;
       }
       case CompilerRequestType.Bundle: {
         const result = bundle(request);
-        globalThis.postMessage(result);
+        opCompilerRespond(result);
         break;
       }
       case CompilerRequestType.RuntimeCompile: {
         const result = runtimeCompile(request);
-        globalThis.postMessage(result);
+        opCompilerRespond(result);
         break;
       }
       case CompilerRequestType.RuntimeBundle: {
         const result = runtimeBundle(request);
-        globalThis.postMessage(result);
+        opCompilerRespond(result);
         break;
       }
       case CompilerRequestType.RuntimeTranspile: {
         const result = await runtimeTranspile(request);
-        globalThis.postMessage(result);
+        opCompilerRespond(result);
         break;
       }
       default:
-        log(
+        throw new Error(
           `!!! unhandled CompilerRequestType: ${request.type} (${
             CompilerRequestType[request.type]
           })`,
         );
     }
-    // Shutdown after single request
-    globalThis.close();
   }
 
-  function bootstrapTsCompilerRuntime() {
-    globalThis.bootstrap.workerRuntime("TS", false);
-    globalThis.onmessage = tsCompilerOnMessage;
+  // TODO(bartlomieju): temporary solution, must be fixed when moving
+  // dispatches to separate crates
+  function initOps() {
+    const opsMap = core.ops();
+    for (const [_name, opId] of Object.entries(opsMap)) {
+      core.setAsyncHandler(opId, dispatchJson.asyncMsgFromRust);
+    }
   }
 
-  Object.defineProperties(globalThis, {
-    bootstrap: {
-      value: {
-        ...globalThis.bootstrap,
-        tsCompilerRuntime: bootstrapTsCompilerRuntime,
-      },
-      configurable: true,
-      writable: true,
-    },
-  });
+  function runtimeStart(source) {
+    initOps();
+    // First we send an empty `Start` message to let the privileged side know we
+    // are ready. The response should be a `StartRes` message containing the CLI
+    // args and other info.
+    const s = dispatchJson.sendSync("op_start");
+    util.setLogDebug(s.debugFlag, source);
+    errorStack.setPrepareStackTrace(Error);
+    return s;
+  }
+
+  let hasBootstrapped = false;
+
+  function bootstrapCompilerRuntime() {
+    if (hasBootstrapped) {
+      throw new Error("Worker runtime already bootstrapped");
+    }
+    hasBootstrapped = true;
+    core.registerErrorClass("NotFound", errors.NotFound);
+    core.registerErrorClass("PermissionDenied", errors.PermissionDenied);
+    core.registerErrorClass("ConnectionRefused", errors.ConnectionRefused);
+    core.registerErrorClass("ConnectionReset", errors.ConnectionReset);
+    core.registerErrorClass("ConnectionAborted", errors.ConnectionAborted);
+    core.registerErrorClass("NotConnected", errors.NotConnected);
+    core.registerErrorClass("AddrInUse", errors.AddrInUse);
+    core.registerErrorClass("AddrNotAvailable", errors.AddrNotAvailable);
+    core.registerErrorClass("BrokenPipe", errors.BrokenPipe);
+    core.registerErrorClass("AlreadyExists", errors.AlreadyExists);
+    core.registerErrorClass("InvalidData", errors.InvalidData);
+    core.registerErrorClass("TimedOut", errors.TimedOut);
+    core.registerErrorClass("Interrupted", errors.Interrupted);
+    core.registerErrorClass("WriteZero", errors.WriteZero);
+    core.registerErrorClass("UnexpectedEof", errors.UnexpectedEof);
+    core.registerErrorClass("BadResource", errors.BadResource);
+    core.registerErrorClass("Http", errors.Http);
+    core.registerErrorClass("URIError", URIError);
+    core.registerErrorClass("TypeError", TypeError);
+    core.registerErrorClass("Other", Error);
+    core.registerErrorClass("Busy", errors.Busy);
+    globalThis.__bootstrap = undefined;
+    runtimeStart("TS");
+  }
+
+  globalThis.bootstrapCompilerRuntime = bootstrapCompilerRuntime;
+  globalThis.tsCompilerOnMessage = tsCompilerOnMessage;
 })(this);
diff --git a/cli/tsc/README.md b/cli/tsc/README.md
index d3263c4bdc6fa8..e680138857ae94 100644
--- a/cli/tsc/README.md
+++ b/cli/tsc/README.md
@@ -3,7 +3,7 @@
 This directory contains the code for the typescript compiler snapshot
 
 There is currently A LOT of overlap between this code and the runtime snapshot
-code in cli/js2.
+code in cli/rt.
 
 This is intentionally ugly because there should be no overlap.
 
diff --git a/cli/web_worker.rs b/cli/web_worker.rs
index 9ac26fca0d0b4a..8d9c00499c72b1 100644
--- a/cli/web_worker.rs
+++ b/cli/web_worker.rs
@@ -14,6 +14,7 @@ use std::future::Future;
 use std::ops::Deref;
 use std::ops::DerefMut;
 use std::pin::Pin;
+use std::rc::Rc;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
@@ -84,11 +85,10 @@ impl WebWorker {
   pub fn new(
     name: String,
     startup_data: StartupData,
-    state: State,
+    state: &Rc<State>,
     has_deno_namespace: bool,
   ) -> Self {
-    let state_ = state.clone();
-    let mut worker = Worker::new(name, startup_data, state_);
+    let mut worker = Worker::new(name, startup_data, &state);
 
     let terminated = Arc::new(AtomicBool::new(false));
     let isolate_handle = worker.isolate.thread_safe_handle();
@@ -254,7 +254,7 @@ mod tests {
     let mut worker = WebWorker::new(
       "TEST".to_string(),
       startup_data::deno_isolate_init(),
-      state,
+      &state,
       false,
     );
     worker
diff --git a/cli/worker.rs b/cli/worker.rs
index 6076b1cb6d0606..928d3316fb8ee7 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -92,19 +92,23 @@ pub struct Worker {
   pub name: String,
   pub isolate: deno_core::EsIsolate,
   pub inspector: Option<Box<DenoInspector>>,
-  pub state: State,
+  pub state: Rc<State>,
   pub waker: AtomicWaker,
   pub(crate) internal_channels: WorkerChannelsInternal,
   external_channels: WorkerHandle,
 }
 
 impl Worker {
-  pub fn new(name: String, startup_data: StartupData, state: State) -> Self {
-    let loader = Rc::new(state.clone());
-    let mut isolate = deno_core::EsIsolate::new(loader, startup_data, false);
+  pub fn new(
+    name: String,
+    startup_data: StartupData,
+    state: &Rc<State>,
+  ) -> Self {
+    let mut isolate =
+      deno_core::EsIsolate::new(state.clone(), startup_data, false);
 
     {
-      let global_state = state.borrow().global_state.clone();
+      let global_state = state.global_state.clone();
       let core_state_rc = CoreIsolate::state(&isolate);
       let mut core_state = core_state_rc.borrow_mut();
       core_state.set_js_error_create_fn(move |core_js_error| {
@@ -113,7 +117,6 @@ impl Worker {
     }
 
     let inspector = {
-      let state = state.borrow();
       let global_state = &state.global_state;
       global_state
         .flags
@@ -129,7 +132,7 @@ impl Worker {
       name,
       isolate,
       inspector,
-      state,
+      state: state.clone(),
       waker: AtomicWaker::new(),
       internal_channels,
       external_channels,
@@ -193,8 +196,7 @@ impl Worker {
 
   fn wait_for_inspector_session(&mut self) {
     let should_break_on_first_statement = self.inspector.is_some() && {
-      let state = self.state.borrow();
-      state.is_main && state.global_state.flags.inspect_brk.is_some()
+      self.state.is_main && self.state.global_state.flags.inspect_brk.is_some()
     };
     if should_break_on_first_statement {
       self
@@ -250,9 +252,8 @@ pub struct MainWorker(Worker);
 
 impl MainWorker {
   // TODO(ry) combine MainWorker::new and MainWorker::create.
-  fn new(name: String, startup_data: StartupData, state: State) -> Self {
-    let state_ = state.clone();
-    let mut worker = Worker::new(name, startup_data, state_);
+  fn new(name: String, startup_data: StartupData, state: &Rc<State>) -> Self {
+    let mut worker = Worker::new(name, startup_data, state);
     {
       let isolate = &mut worker.isolate;
       ops::runtime::init(isolate, &state);
@@ -281,11 +282,11 @@ impl MainWorker {
   }
 
   pub fn create(
-    global_state: GlobalState,
+    global_state: &Arc<GlobalState>,
     main_module: ModuleSpecifier,
   ) -> Result<MainWorker, ErrBox> {
     let state = State::new(
-      global_state.clone(),
+      &global_state,
       None,
       main_module,
       global_state.maybe_import_map.clone(),
@@ -294,7 +295,7 @@ impl MainWorker {
     let mut worker = MainWorker::new(
       "main".to_string(),
       startup_data::deno_isolate_init(),
-      state,
+      &state,
     );
     {
       let (stdin, stdout, stderr) = get_stdio();
@@ -335,7 +336,6 @@ mod tests {
   use crate::flags;
   use crate::global_state::GlobalState;
   use crate::startup_data;
-  use crate::state::State;
   use crate::tokio_util;
   use std::sync::atomic::Ordering;
 
@@ -349,12 +349,11 @@ mod tests {
       ModuleSpecifier::resolve_url_or_path(&p.to_string_lossy()).unwrap();
     let global_state = GlobalState::new(flags::Flags::default()).unwrap();
     let state =
-      State::new(global_state, None, module_specifier.clone(), None, false)
+      State::new(&global_state, None, module_specifier.clone(), None, false)
         .unwrap();
-    let state_ = state.clone();
-    tokio_util::run_basic(async move {
+    tokio_util::run_basic(async {
       let mut worker =
-        MainWorker::new("TEST".to_string(), StartupData::None, state);
+        MainWorker::new("TEST".to_string(), StartupData::None, &state);
       let result = worker.execute_module(&module_specifier).await;
       if let Err(err) = result {
         eprintln!("execute_mod err {:?}", err);
@@ -363,8 +362,7 @@ mod tests {
         panic!("Future got unexpected error: {:?}", e);
       }
     });
-    let state = state_.borrow();
-    assert_eq!(state.metrics.resolve_count, 2);
+    assert_eq!(state.metrics.borrow().resolve_count, 2);
     // Check that we didn't start the compiler.
     assert_eq!(state.global_state.compiler_starts.load(Ordering::SeqCst), 0);
   }
@@ -379,12 +377,11 @@ mod tests {
       ModuleSpecifier::resolve_url_or_path(&p.to_string_lossy()).unwrap();
     let global_state = GlobalState::new(flags::Flags::default()).unwrap();
     let state =
-      State::new(global_state, None, module_specifier.clone(), None, false)
+      State::new(&global_state, None, module_specifier.clone(), None, false)
         .unwrap();
-    let state_ = state.clone();
-    tokio_util::run_basic(async move {
+    tokio_util::run_basic(async {
       let mut worker =
-        MainWorker::new("TEST".to_string(), StartupData::None, state);
+        MainWorker::new("TEST".to_string(), StartupData::None, &state);
       let result = worker.execute_module(&module_specifier).await;
       if let Err(err) = result {
         eprintln!("execute_mod err {:?}", err);
@@ -394,14 +391,13 @@ mod tests {
       }
     });
 
-    let state = state_.borrow();
     // Check that we didn't start the compiler.
     assert_eq!(state.global_state.compiler_starts.load(Ordering::SeqCst), 0);
   }
 
   #[tokio::test]
   async fn execute_006_url_imports() {
-    let http_server_guard = test_util::http_server();
+    let _http_server_guard = test_util::http_server();
     let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
       .parent()
       .unwrap()
@@ -416,18 +412,13 @@ mod tests {
       ..flags::Flags::default()
     };
     let global_state = GlobalState::new(flags).unwrap();
-    let state = State::new(
-      global_state.clone(),
-      None,
-      module_specifier.clone(),
-      None,
-      false,
-    )
-    .unwrap();
+    let state =
+      State::new(&global_state, None, module_specifier.clone(), None, false)
+        .unwrap();
     let mut worker = MainWorker::new(
       "TEST".to_string(),
       startup_data::deno_isolate_init(),
-      state.clone(),
+      &state,
     );
     worker.execute("bootstrap.mainRuntime()").unwrap();
     let result = worker.execute_module(&module_specifier).await;
@@ -437,11 +428,9 @@ mod tests {
     if let Err(e) = (&mut *worker).await {
       panic!("Future got unexpected error: {:?}", e);
     }
-    let state = state.borrow();
-    assert_eq!(state.metrics.resolve_count, 3);
+    assert_eq!(state.metrics.borrow().resolve_count, 3);
     // Check that we've only invoked the compiler once.
     assert_eq!(state.global_state.compiler_starts.load(Ordering::SeqCst), 1);
-    drop(http_server_guard);
   }
 
   fn create_test_worker() -> MainWorker {
@@ -449,7 +438,7 @@ mod tests {
     let mut worker = MainWorker::new(
       "TEST".to_string(),
       startup_data::deno_isolate_init(),
-      state,
+      &state,
     );
     worker.execute("bootstrap.mainRuntime()").unwrap();
     worker
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 065948f822691d..74c80872eedf41 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,8 +1,7 @@
 # Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
 [package]
 name = "deno_core"
-version = "0.49.0"
+version = "0.54.0"
 edition = "2018"
 description = "A secure JavaScript/TypeScript runtime built with V8, Rust, and Tokio"
 authors = ["the Deno authors"]
@@ -14,21 +13,24 @@ repository = "https://github.com/denoland/deno"
 path = "lib.rs"
 
 [dependencies]
-downcast-rs = "1.1.1"
-futures = { version = "0.3.5", features = ["thread-pool", "compat"] }
+downcast-rs = "1.2.0"
+futures = "0.3.5"
 lazy_static = "1.4.0"
-libc = "0.2.71"
-log = "0.4.8"
-rusty_v8 = "0.7.0"
-serde_json = "1.0.55"
-smallvec = "1.4.0"
+libc = "0.2.74"
+log = "0.4.11"
+rusty_v8 = "0.8.1"
+serde_json = { version = "1.0.57", features = ["preserve_order"] }
+smallvec = "1.4.2"
 url = "2.1.1"
 
 [[example]]
-name = "deno_core_http_bench"
-path = "examples/http_bench.rs"
+name = "http_bench_bin_ops"
+path = "examples/http_bench_bin_ops.rs"
+
+[[example]]
+name = "http_bench_json_ops"
+path = "examples/http_bench_json_ops.rs"
 
-# These dependendencies are only used for deno_core_http_bench.
+# These dependendencies are only used for the 'http_bench_*_ops' examples.
 [dev-dependencies]
-derive_deref = "1.1.0"
 tokio = { version = "0.2.22", features = ["full"] }
diff --git a/core/README.md b/core/README.md
index e1a469159071d3..94fe29de9de2af 100644
--- a/core/README.md
+++ b/core/README.md
@@ -18,7 +18,9 @@ function to trigger the "dispatch" callback in Rust. The user is responsible for
 encoding both the request and response into a Uint8Array.
 
 Documentation for this crate is thin at the moment. Please see
-[http_bench.rs](https://github.com/denoland/deno/blob/master/core/examples/http_bench.rs)
+[http_bench_bin_ops.rs](https://github.com/denoland/deno/blob/master/core/examples/http_bench_bin_ops.rs)
+and
+[http_bench_json_ops.rs](https://github.com/denoland/deno/blob/master/core/examples/http_bench_json_ops.rs)
 as a simple example of usage.
 
 TypeScript support and a lot of other functionality is not available at this
diff --git a/core/bindings.rs b/core/bindings.rs
index 1c76cf56f54c6c..f0181a2271478d 100644
--- a/core/bindings.rs
+++ b/core/bindings.rs
@@ -381,7 +381,8 @@ fn send(
     Err(err) => {
       let msg = format!("invalid op id: {}", err);
       let msg = v8::String::new(scope, &msg).unwrap();
-      scope.throw_exception(msg.into());
+      let exc = v8::Exception::type_error(scope, msg);
+      scope.throw_exception(exc);
       return;
     }
   };
diff --git a/core/core.js b/core/core.js
index b3c0ddc13cc5d4..82a81203030472 100644
--- a/core/core.js
+++ b/core/core.js
@@ -38,6 +38,7 @@ SharedQueue Binary Layout
 
   let initialized = false;
   let opsCache = {};
+  const errorMap = {};
 
   function maybeInit() {
     if (!initialized) {
@@ -60,7 +61,7 @@ SharedQueue Binary Layout
 
   function ops() {
     // op id 0 is a special value to retrieve the map of registered ops.
-    const opsMapBytes = send(0, new Uint8Array([]));
+    const opsMapBytes = send(0);
     const opsMapJson = String.fromCharCode.apply(null, opsMapBytes);
     opsCache = JSON.parse(opsMapJson);
     return { ...opsCache };
@@ -187,11 +188,83 @@ SharedQueue Binary Layout
     return send(opsCache[opName], control, ...zeroCopy);
   }
 
+  function registerErrorClass(errorName, errorClass) {
+    if (typeof errorMap[errorName] !== "undefined") {
+      throw new TypeError(`Error class for "${errorName}" already registered`);
+    }
+    errorMap[errorName] = errorClass;
+  }
+
+  function getErrorClass(errorName) {
+    const errorClass = errorMap[errorName];
+    assert(errorClass);
+    return errorClass;
+  }
+
+  // Returns Uint8Array
+  function encodeJson(args) {
+    const s = JSON.stringify(args);
+    return core.encode(s);
+  }
+
+  function decodeJson(ui8) {
+    const s = Deno.core.decode(ui8);
+    return JSON.parse(s);
+  }
+
+  let nextPromiseId = 1;
+  const promiseTable = {};
+
+  function jsonOpAsync(opName, args, ...zeroCopy) {
+    setAsyncHandler(opsCache[opName], jsonOpAsyncHandler);
+
+    args.promiseId = nextPromiseId++;
+    const argsBuf = encodeJson(args);
+    dispatch(opName, argsBuf, ...zeroCopy);
+    let resolve, reject;
+    const promise = new Promise((resolve_, reject_) => {
+      resolve = resolve_;
+      reject = reject_;
+    });
+    promise.resolve = resolve;
+    promise.reject = reject;
+    promiseTable[args.promiseId] = promise;
+    return promise;
+  }
+
+  function jsonOpSync(opName, args, ...zeroCopy) {
+    const argsBuf = encodeJson(args);
+    const res = dispatch(opName, argsBuf, ...zeroCopy);
+    const r = decodeJson(res);
+    if ("ok" in r) {
+      return r.ok;
+    } else {
+      throw r.err;
+    }
+  }
+
+  function jsonOpAsyncHandler(buf) {
+    // Json Op.
+    const msg = decodeJson(buf);
+    const { ok, err, promiseId } = msg;
+    const promise = promiseTable[promiseId];
+    delete promiseTable[promiseId];
+    if (ok) {
+      promise.resolve(ok);
+    } else {
+      promise.reject(err);
+    }
+  }
+
   Object.assign(window.Deno.core, {
+    jsonOpAsync,
+    jsonOpSync,
     setAsyncHandler,
     dispatch: send,
     dispatchByName: dispatch,
     ops,
+    registerErrorClass,
+    getErrorClass,
     // sharedQueue is private but exposed for testing.
     sharedQueue: {
       MAX_RECORDS,
diff --git a/core/core_isolate.rs b/core/core_isolate.rs
index 74bb2f545f70e4..160e37f1d63d45 100644
--- a/core/core_isolate.rs
+++ b/core/core_isolate.rs
@@ -20,9 +20,13 @@ use futures::stream::FuturesUnordered;
 use futures::stream::StreamExt;
 use futures::task::AtomicWaker;
 use futures::Future;
+use serde_json::json;
+use serde_json::Value;
+use std::any::Any;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::convert::From;
+use std::ffi::c_void;
 use std::mem::forget;
 use std::ops::Deref;
 use std::ops::DerefMut;
@@ -71,8 +75,25 @@ pub enum StartupData<'a> {
   None,
 }
 
+impl StartupData<'_> {
+  fn into_options(self) -> (Option<OwnedScript>, Option<Snapshot>) {
+    match self {
+      Self::Script(script) => (Some(script.into()), None),
+      Self::Snapshot(snapshot) => (None, Some(snapshot)),
+      Self::None => (None, None),
+    }
+  }
+}
+
 type JSErrorCreateFn = dyn Fn(JSError) -> ErrBox;
 
+/// Objects that need to live as long as the isolate
+#[derive(Default)]
+struct IsolateAllocations {
+  near_heap_limit_callback_data:
+    Option<(Box<RefCell<dyn Any>>, v8::NearHeapLimitCallback)>,
+}
+
 /// A single execution context of JavaScript. Corresponds roughly to the "Web
 /// Worker" concept in the DOM. An CoreIsolate is a Future that can be used with
 /// Tokio. The CoreIsolate future completes when there is an error or when all
@@ -89,6 +110,7 @@ pub struct CoreIsolate {
   has_snapshotted: bool,
   needs_init: bool,
   startup_script: Option<OwnedScript>,
+  allocations: IsolateAllocations,
 }
 
 /// Internal state for CoreIsolate which is stored in one of v8::Isolate's
@@ -155,6 +177,7 @@ pub unsafe fn v8_init() {
   // See https://github.com/denoland/deno/issues/2544
   let argv = vec![
     "".to_string(),
+    "--wasm-test-streaming".to_string(),
     "--no-wasm-async-compilation".to_string(),
     "--harmony-top-level-await".to_string(),
     "--experimental-wasm-bigint".to_string(),
@@ -162,25 +185,75 @@ pub unsafe fn v8_init() {
   v8::V8::set_flags_from_command_line(argv);
 }
 
+/// Minimum and maximum bytes of heap used in an isolate
+pub struct HeapLimits {
+  /// By default V8 starts with a small heap and dynamically grows it to match
+  /// the set of live objects. This may lead to ineffective garbage collections
+  /// at startup if the live set is large. Setting the initial heap size avoids
+  /// such garbage collections. Note that this does not affect young generation
+  /// garbage collections.
+  pub initial: usize,
+  /// When the heap size approaches `max`, V8 will perform series of
+  /// garbage collections and invoke the
+  /// [NearHeapLimitCallback](TODO).
+  /// If the garbage collections do not help and the callback does not
+  /// increase the limit, then V8 will crash with V8::FatalProcessOutOfMemory.
+  pub max: usize,
+}
+
+pub(crate) struct IsolateOptions {
+  will_snapshot: bool,
+  startup_script: Option<OwnedScript>,
+  startup_snapshot: Option<Snapshot>,
+  heap_limits: Option<HeapLimits>,
+}
+
 impl CoreIsolate {
   /// startup_data defines the snapshot or script used at startup to initialize
   /// the isolate.
   pub fn new(startup_data: StartupData, will_snapshot: bool) -> Self {
+    let (startup_script, startup_snapshot) = startup_data.into_options();
+    let options = IsolateOptions {
+      will_snapshot,
+      startup_script,
+      startup_snapshot,
+      heap_limits: None,
+    };
+
+    Self::from_options(options)
+  }
+
+  /// This is useful for controlling memory usage of scripts.
+  ///
+  /// See [`HeapLimits`](struct.HeapLimits.html) for more details.
+  ///
+  /// Make sure to use [`add_near_heap_limit_callback`](#method.add_near_heap_limit_callback)
+  /// to prevent v8 from crashing when reaching the upper limit.
+  pub fn with_heap_limits(
+    startup_data: StartupData,
+    heap_limits: HeapLimits,
+  ) -> Self {
+    let (startup_script, startup_snapshot) = startup_data.into_options();
+    let options = IsolateOptions {
+      will_snapshot: false,
+      startup_script,
+      startup_snapshot,
+      heap_limits: Some(heap_limits),
+    };
+
+    Self::from_options(options)
+  }
+
+  fn from_options(options: IsolateOptions) -> Self {
     static DENO_INIT: Once = Once::new();
     DENO_INIT.call_once(|| {
       unsafe { v8_init() };
     });
 
-    let (startup_script, startup_snapshot) = match startup_data {
-      StartupData::Script(script) => (Some(script.into()), None),
-      StartupData::Snapshot(snapshot) => (None, Some(snapshot)),
-      StartupData::None => (None, None),
-    };
-
     let global_context;
-    let (mut isolate, maybe_snapshot_creator) = if will_snapshot {
+    let (mut isolate, maybe_snapshot_creator) = if options.will_snapshot {
       // TODO(ry) Support loading snapshots before snapshotting.
-      assert!(startup_snapshot.is_none());
+      assert!(options.startup_snapshot.is_none());
       let mut creator =
         v8::SnapshotCreator::new(Some(&bindings::EXTERNAL_REFERENCES));
       let isolate = unsafe { creator.get_owned_isolate() };
@@ -195,7 +268,7 @@ impl CoreIsolate {
     } else {
       let mut params = v8::Isolate::create_params()
         .external_references(&**bindings::EXTERNAL_REFERENCES);
-      let snapshot_loaded = if let Some(snapshot) = startup_snapshot {
+      let snapshot_loaded = if let Some(snapshot) = options.startup_snapshot {
         params = match snapshot {
           Snapshot::Static(data) => params.snapshot_blob(data),
           Snapshot::JustCreated(data) => params.snapshot_blob(data),
@@ -206,6 +279,10 @@ impl CoreIsolate {
         false
       };
 
+      if let Some(heap_limits) = options.heap_limits {
+        params = params.heap_limits(heap_limits.initial, heap_limits.max)
+      }
+
       let isolate = v8::Isolate::new(params);
       let mut isolate = CoreIsolate::setup_isolate(isolate);
       {
@@ -243,7 +320,8 @@ impl CoreIsolate {
       snapshot_creator: maybe_snapshot_creator,
       has_snapshotted: false,
       needs_init: true,
-      startup_script,
+      startup_script: options.startup_script,
+      allocations: IsolateAllocations::default(),
     }
   }
 
@@ -344,15 +422,129 @@ impl CoreIsolate {
   /// corresponds to the second argument of Deno.core.dispatch().
   ///
   /// Requires runtime to explicitly ask for op ids before using any of the ops.
-  pub fn register_op(
-    &mut self,
-    name: &str,
-    op: impl OpDispatcher + 'static,
-  ) -> OpId {
+  pub fn register_op<F>(&mut self, name: &str, op: F) -> OpId
+  where
+    F: Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op + 'static,
+  {
     let state_rc = Self::state(self);
     let mut state = state_rc.borrow_mut();
     state.op_registry.register(name, op)
   }
+
+  pub fn register_op_json_sync<F>(&mut self, name: &str, op: F) -> OpId
+  where
+    F: 'static
+      + Fn(
+        &mut CoreIsolateState,
+        serde_json::Value,
+        &mut [ZeroCopyBuf],
+      ) -> Result<serde_json::Value, ErrBox>,
+  {
+    let core_op =
+      move |state: &mut CoreIsolateState, bufs: &mut [ZeroCopyBuf]| -> Op {
+        let value = serde_json::from_slice(&bufs[0]).unwrap();
+        let result = op(state, value, &mut bufs[1..]);
+        let buf = serialize_result(None, result);
+        Op::Sync(buf)
+      };
+
+    let state_rc = Self::state(self);
+    let mut state = state_rc.borrow_mut();
+    state.op_registry.register(name, core_op)
+  }
+
+  pub fn register_op_json_async<F, Fut>(&mut self, name: &str, op: F) -> OpId
+  where
+    Fut: 'static + Future<Output = Result<serde_json::Value, ErrBox>>,
+    F: 'static
+      + Fn(&mut CoreIsolateState, serde_json::Value, &mut [ZeroCopyBuf]) -> Fut,
+  {
+    let core_op = move |state: &mut CoreIsolateState,
+                        bufs: &mut [ZeroCopyBuf]|
+          -> Op {
+      let value: serde_json::Value = serde_json::from_slice(&bufs[0]).unwrap();
+      let promise_id = value.get("promiseId").unwrap().as_u64().unwrap();
+      let fut = op(state, value, &mut bufs[1..]);
+      let fut2 =
+        fut.map(move |result| serialize_result(Some(promise_id), result));
+      Op::Async(Box::pin(fut2))
+    };
+
+    let state_rc = Self::state(self);
+    let mut state = state_rc.borrow_mut();
+    state.op_registry.register(name, core_op)
+  }
+
+  /// Registers a callback on the isolate when the memory limits are approached.
+  /// Use this to prevent V8 from crashing the process when reaching the limit.
+  ///
+  /// Calls the closure with the current heap limit and the initial heap limit.
+  /// The return value of the closure is set as the new limit.
+  pub fn add_near_heap_limit_callback<C>(&mut self, cb: C)
+  where
+    C: FnMut(usize, usize) -> usize + 'static,
+  {
+    let boxed_cb = Box::new(RefCell::new(cb));
+    let data = boxed_cb.as_ptr() as *mut c_void;
+
+    let prev = self
+      .allocations
+      .near_heap_limit_callback_data
+      .replace((boxed_cb, near_heap_limit_callback::<C>));
+    if let Some((_, prev_cb)) = prev {
+      self
+        .v8_isolate
+        .as_mut()
+        .unwrap()
+        .remove_near_heap_limit_callback(prev_cb, 0);
+    }
+
+    self
+      .v8_isolate
+      .as_mut()
+      .unwrap()
+      .add_near_heap_limit_callback(near_heap_limit_callback::<C>, data);
+  }
+
+  pub fn remove_near_heap_limit_callback(&mut self, heap_limit: usize) {
+    if let Some((_, cb)) = self.allocations.near_heap_limit_callback_data.take()
+    {
+      self
+        .v8_isolate
+        .as_mut()
+        .unwrap()
+        .remove_near_heap_limit_callback(cb, heap_limit);
+    }
+  }
+}
+
+extern "C" fn near_heap_limit_callback<F>(
+  data: *mut c_void,
+  current_heap_limit: usize,
+  initial_heap_limit: usize,
+) -> usize
+where
+  F: FnMut(usize, usize) -> usize,
+{
+  let callback = unsafe { &mut *(data as *mut F) };
+  callback(current_heap_limit, initial_heap_limit)
+}
+
+fn serialize_result(
+  promise_id: Option<u64>,
+  result: Result<Value, ErrBox>,
+) -> Buf {
+  let value = match result {
+    Ok(v) => json!({ "ok": v, "promiseId": promise_id }),
+    Err(err) => json!({
+      "promiseId": promise_id ,
+      "err": {
+        "message": err.to_string(),
+        "kind": "Other", // TODO(ry) Figure out how to propagate errors.
+      }
+    }),
+  };
+  serde_json::to_vec(&value).unwrap().into_boxed_slice()
 }
 
 impl Future for CoreIsolate {
@@ -461,7 +653,7 @@ impl CoreIsolateState {
   /// Requires runtime to explicitly ask for op ids before using any of the ops.
   pub fn register_op<F>(&mut self, name: &str, op: F) -> OpId
   where
-    F: OpDispatcher + 'static,
+    F: Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op + 'static,
   {
     self.op_registry.register(name, op)
   }
@@ -483,7 +675,7 @@ impl CoreIsolateState {
     zero_copy_bufs: &mut [ZeroCopyBuf],
   ) -> Option<(OpId, Box<[u8]>)> {
     let op = if let Some(dispatcher) = self.op_registry.get(op_id) {
-      dispatcher.dispatch(self, zero_copy_bufs)
+      dispatcher(self, zero_copy_bufs)
     } else {
       let message =
         v8::String::new(scope, &format!("Unknown op id: {}", op_id)).unwrap();
@@ -862,10 +1054,7 @@ pub mod tests {
          "#,
       ));
       assert_eq!(dispatch_count.load(Ordering::Relaxed), 1);
-      assert!(match isolate.poll_unpin(cx) {
-        Poll::Ready(Ok(_)) => true,
-        _ => false,
-      });
+      assert!(matches!(isolate.poll_unpin(cx), Poll::Ready(Ok(_))));
       assert_eq!(dispatch_count.load(Ordering::Relaxed), 1);
       js_check(isolate.execute(
         "check2.js",
@@ -876,17 +1065,11 @@ pub mod tests {
          "#,
       ));
       assert_eq!(dispatch_count.load(Ordering::Relaxed), 2);
-      assert!(match isolate.poll_unpin(cx) {
-        Poll::Ready(Ok(_)) => true,
-        _ => false,
-      });
+      assert!(matches!(isolate.poll_unpin(cx), Poll::Ready(Ok(_))));
       js_check(isolate.execute("check3.js", "assert(nrecv == 2)"));
       assert_eq!(dispatch_count.load(Ordering::Relaxed), 2);
       // We are idle, so the next poll should be the last.
-      assert!(match isolate.poll_unpin(cx) {
-        Poll::Ready(Ok(_)) => true,
-        _ => false,
-      });
+      assert!(matches!(isolate.poll_unpin(cx), Poll::Ready(Ok(_))));
     });
   }
 
@@ -908,10 +1091,7 @@ pub mod tests {
       assert_eq!(dispatch_count.load(Ordering::Relaxed), 1);
       // The above op never finish, but isolate can finish
       // because the op is an unreffed async op.
-      assert!(match isolate.poll_unpin(cx) {
-        Poll::Ready(Ok(_)) => true,
-        _ => false,
-      });
+      assert!(matches!(isolate.poll_unpin(cx), Poll::Ready(Ok(_))));
     })
   }
 
@@ -1038,10 +1218,7 @@ pub mod tests {
          "#,
       ));
       assert_eq!(dispatch_count.load(Ordering::Relaxed), 1);
-      assert!(match isolate.poll_unpin(cx) {
-        Poll::Ready(Ok(_)) => true,
-        _ => false,
-      });
+      assert!(matches!(isolate.poll_unpin(cx), Poll::Ready(Ok(_))));
       js_check(isolate.execute("check.js", "assert(asyncRecv == 1);"));
     });
   }
@@ -1188,4 +1365,91 @@ pub mod tests {
     let mut isolate2 = CoreIsolate::new(startup_data, false);
     js_check(isolate2.execute("check.js", "if (a != 3) throw Error('x')"));
   }
+
+  #[test]
+  fn test_heap_limits() {
+    let heap_limits = HeapLimits {
+      initial: 0,
+      max: 20 * 1024, // 20 kB
+    };
+    let mut isolate =
+      CoreIsolate::with_heap_limits(StartupData::None, heap_limits);
+    let cb_handle = isolate.thread_safe_handle();
+
+    let callback_invoke_count = Rc::new(AtomicUsize::default());
+    let inner_invoke_count = Rc::clone(&callback_invoke_count);
+
+    isolate.add_near_heap_limit_callback(
+      move |current_limit, _initial_limit| {
+        inner_invoke_count.fetch_add(1, Ordering::SeqCst);
+        cb_handle.terminate_execution();
+        current_limit * 2
+      },
+    );
+    let err = isolate
+      .execute(
+        "script name",
+        r#"let s = ""; while(true) { s += "Hello"; }"#,
+      )
+      .expect_err("script should fail");
+    assert_eq!(
+      "Uncaught Error: execution terminated",
+      err.downcast::<JSError>().unwrap().message
+    );
+    assert!(callback_invoke_count.load(Ordering::SeqCst) > 0)
+  }
+
+  #[test]
+  fn test_heap_limit_cb_remove() {
+    let mut isolate = CoreIsolate::new(StartupData::None, false);
+
+    isolate.add_near_heap_limit_callback(|current_limit, _initial_limit| {
+      current_limit * 2
+    });
+    isolate.remove_near_heap_limit_callback(20 * 1024);
+    assert!(isolate.allocations.near_heap_limit_callback_data.is_none());
+  }
+
+  #[test]
+  fn test_heap_limit_cb_multiple() {
+    let heap_limits = HeapLimits {
+      initial: 0,
+      max: 20 * 1024, // 20 kB
+    };
+    let mut isolate =
+      CoreIsolate::with_heap_limits(StartupData::None, heap_limits);
+    let cb_handle = isolate.thread_safe_handle();
+
+    let callback_invoke_count_first = Rc::new(AtomicUsize::default());
+    let inner_invoke_count_first = Rc::clone(&callback_invoke_count_first);
+    isolate.add_near_heap_limit_callback(
+      move |current_limit, _initial_limit| {
+        inner_invoke_count_first.fetch_add(1, Ordering::SeqCst);
+        current_limit * 2
+      },
+    );
+
+    let callback_invoke_count_second = Rc::new(AtomicUsize::default());
+    let inner_invoke_count_second = Rc::clone(&callback_invoke_count_second);
+    isolate.add_near_heap_limit_callback(
+      move |current_limit, _initial_limit| {
+        inner_invoke_count_second.fetch_add(1, Ordering::SeqCst);
+        cb_handle.terminate_execution();
+        current_limit * 2
+      },
+    );
+
+    let err = isolate
+      .execute(
+        "script name",
+        r#"let s = ""; while(true) { s += "Hello"; }"#,
+      )
+      .expect_err("script should fail");
+    assert_eq!(
+      "Uncaught Error: execution terminated",
+      err.downcast::<JSError>().unwrap().message
+    );
+    assert_eq!(0, callback_invoke_count_first.load(Ordering::SeqCst));
+    assert!(callback_invoke_count_second.load(Ordering::SeqCst) > 0);
+  }
 }
diff --git a/core/es_isolate.rs b/core/es_isolate.rs
index 35e215cd7cafe2..3ede1a5e42de3f 100644
--- a/core/es_isolate.rs
+++ b/core/es_isolate.rs
@@ -891,23 +891,14 @@ pub mod tests {
       ));
 
       // First poll runs `prepare_load` hook.
-      assert!(match isolate.poll_unpin(cx) {
-        Poll::Pending => true,
-        _ => false,
-      });
+      assert!(matches!(isolate.poll_unpin(cx), Poll::Pending));
       assert_eq!(prepare_load_count.load(Ordering::Relaxed), 1);
 
       // Second poll actually loads modules into the isolate.
-      assert!(match isolate.poll_unpin(cx) {
-        Poll::Ready(Ok(_)) => true,
-        _ => false,
-      });
+      assert!(matches!(isolate.poll_unpin(cx), Poll::Ready(Ok(_))));
       assert_eq!(resolve_count.load(Ordering::Relaxed), 4);
       assert_eq!(load_count.load(Ordering::Relaxed), 2);
-      assert!(match isolate.poll_unpin(cx) {
-        Poll::Ready(Ok(_)) => true,
-        _ => false,
-      });
+      assert!(matches!(isolate.poll_unpin(cx), Poll::Ready(Ok(_))));
       assert_eq!(resolve_count.load(Ordering::Relaxed), 4);
       assert_eq!(load_count.load(Ordering::Relaxed), 2);
     })
diff --git a/core/examples/http_bench.js b/core/examples/http_bench_bin_ops.js
similarity index 95%
rename from core/examples/http_bench.js
rename to core/examples/http_bench_bin_ops.js
index eba9bb67743663..b4d7add2266ae0 100644
--- a/core/examples/http_bench.js
+++ b/core/examples/http_bench_bin_ops.js
@@ -128,11 +128,10 @@ async function main() {
     Deno.core.setAsyncHandler(ops[opName], handleAsyncMsgFromRust);
   }
 
-  Deno.core.print("http_bench.js start\n");
-
   const listenerRid = listen();
-  Deno.core.print(`listening http://127.0.0.1:4544/ rid=${listenerRid}\n`);
-  while (true) {
+  Deno.core.print(`http_bench_bin_ops listening on http://127.0.0.1:4544/\n`);
+
+  for (;;) {
     const rid = await accept(listenerRid);
     // Deno.core.print(`accepted ${rid}`);
     if (rid < 0) {
diff --git a/core/examples/http_bench.rs b/core/examples/http_bench_bin_ops.rs
similarity index 70%
rename from core/examples/http_bench.rs
rename to core/examples/http_bench_bin_ops.rs
index 92e69d215f41a7..366779e8c4d16a 100644
--- a/core/examples/http_bench.rs
+++ b/core/examples/http_bench_bin_ops.rs
@@ -1,6 +1,4 @@
 #[macro_use]
-extern crate derive_deref;
-#[macro_use]
 extern crate log;
 
 use deno_core::CoreIsolate;
@@ -11,9 +9,9 @@ use deno_core::Script;
 use deno_core::StartupData;
 use deno_core::ZeroCopyBuf;
 use futures::future::poll_fn;
-use futures::prelude::*;
-use futures::task::Context;
-use futures::task::Poll;
+use futures::future::FutureExt;
+use futures::future::TryFuture;
+use futures::future::TryFutureExt;
 use std::cell::RefCell;
 use std::convert::TryInto;
 use std::env;
@@ -77,56 +75,37 @@ impl From<Record> for RecordBuf {
   }
 }
 
-struct Isolate {
-  core_isolate: CoreIsolate,
-  state: State,
-}
-
-#[derive(Clone, Default, Deref)]
-struct State(Rc<RefCell<StateInner>>);
-
-#[derive(Default)]
-struct StateInner {
-  resource_table: ResourceTable,
-}
-
-impl Isolate {
-  pub fn new() -> Self {
-    let startup_data = StartupData::Script(Script {
-      source: include_str!("http_bench.js"),
-      filename: "http_bench.js",
-    });
-
-    let mut isolate = Self {
-      core_isolate: CoreIsolate::new(startup_data, false),
-      state: Default::default(),
-    };
-
-    isolate.register_sync_op("listen", op_listen);
-    isolate.register_op("accept", op_accept);
-    isolate.register_op("read", op_read);
-    isolate.register_op("write", op_write);
-    isolate.register_sync_op("close", op_close);
+pub fn isolate_new() -> CoreIsolate {
+  let startup_data = StartupData::Script(Script {
+    source: include_str!("http_bench_bin_ops.js"),
+    filename: "http_bench_bin_ops.js",
+  });
 
-    isolate
-  }
+  let mut isolate = CoreIsolate::new(startup_data, false);
 
-  fn register_sync_op<F>(&mut self, name: &'static str, handler: F)
-  where
-    F: 'static + Fn(State, u32, &mut [ZeroCopyBuf]) -> Result<u32, Error>,
+  fn register_sync_op<F>(
+    isolate: &mut CoreIsolate,
+    name: &'static str,
+    handler: F,
+  ) where
+    F: 'static
+      + Fn(
+        Rc<RefCell<ResourceTable>>,
+        u32,
+        &mut [ZeroCopyBuf],
+      ) -> Result<u32, Error>,
   {
-    let state = self.state.clone();
-    let core_handler = move |_isolate_state: &mut CoreIsolateState,
+    let core_handler = move |state: &mut CoreIsolateState,
                              zero_copy_bufs: &mut [ZeroCopyBuf]|
           -> Op {
       assert!(!zero_copy_bufs.is_empty());
-      let state = state.clone();
       let record = Record::from(zero_copy_bufs[0].as_ref());
       let is_sync = record.promise_id == 0;
       assert!(is_sync);
 
+      let resource_table = state.resource_table.clone();
       let result: i32 =
-        match handler(state, record.rid, &mut zero_copy_bufs[1..]) {
+        match handler(resource_table, record.rid, &mut zero_copy_bufs[1..]) {
           Ok(r) => r as i32,
           Err(_) => -1,
         };
@@ -134,31 +113,32 @@ impl Isolate {
       Op::Sync(buf)
     };
 
-    self.core_isolate.register_op(name, core_handler);
+    isolate.register_op(name, core_handler);
   }
 
-  fn register_op<F>(
-    &mut self,
+  fn register_async_op<F>(
+    isolate: &mut CoreIsolate,
     name: &'static str,
-    handler: impl Fn(State, u32, &mut [ZeroCopyBuf]) -> F + Copy + 'static,
+    handler: impl Fn(Rc<RefCell<ResourceTable>>, u32, &mut [ZeroCopyBuf]) -> F
+      + Copy
+      + 'static,
   ) where
     F: TryFuture,
     F::Ok: TryInto<i32>,
     <F::Ok as TryInto<i32>>::Error: Debug,
   {
-    let state = self.state.clone();
-    let core_handler = move |_isolate_state: &mut CoreIsolateState,
+    let core_handler = move |state: &mut CoreIsolateState,
                              zero_copy_bufs: &mut [ZeroCopyBuf]|
           -> Op {
       assert!(!zero_copy_bufs.is_empty());
-      let state = state.clone();
       let record = Record::from(zero_copy_bufs[0].as_ref());
       let is_sync = record.promise_id == 0;
       assert!(!is_sync);
 
       let mut zero_copy = zero_copy_bufs[1..].to_vec();
+      let resource_table = state.resource_table.clone();
       let fut = async move {
-        let op = handler(state, record.rid, &mut zero_copy);
+        let op = handler(resource_table, record.rid, &mut zero_copy);
         let result = op
           .map_ok(|r| r.try_into().expect("op result does not fit in i32"))
           .unwrap_or_else(|_| -1)
@@ -169,25 +149,25 @@ impl Isolate {
       Op::Async(fut.boxed_local())
     };
 
-    self.core_isolate.register_op(name, core_handler);
+    isolate.register_op(name, core_handler);
   }
-}
 
-impl Future for Isolate {
-  type Output = <CoreIsolate as Future>::Output;
+  register_sync_op(&mut isolate, "listen", op_listen);
+  register_async_op(&mut isolate, "accept", op_accept);
+  register_async_op(&mut isolate, "read", op_read);
+  register_async_op(&mut isolate, "write", op_write);
+  register_sync_op(&mut isolate, "close", op_close);
 
-  fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
-    self.core_isolate.poll_unpin(cx)
-  }
+  isolate
 }
 
 fn op_close(
-  state: State,
+  resource_table: Rc<RefCell<ResourceTable>>,
   rid: u32,
   _buf: &mut [ZeroCopyBuf],
 ) -> Result<u32, Error> {
   debug!("close rid={}", rid);
-  let resource_table = &mut state.borrow_mut().resource_table;
+  let resource_table = &mut resource_table.borrow_mut();
   resource_table
     .close(rid)
     .map(|_| 0)
@@ -195,7 +175,7 @@ fn op_close(
 }
 
 fn op_listen(
-  state: State,
+  resource_table: Rc<RefCell<ResourceTable>>,
   _rid: u32,
   _buf: &mut [ZeroCopyBuf],
 ) -> Result<u32, Error> {
@@ -203,20 +183,20 @@ fn op_listen(
   let addr = "127.0.0.1:4544".parse::<SocketAddr>().unwrap();
   let std_listener = std::net::TcpListener::bind(&addr)?;
   let listener = TcpListener::from_std(std_listener)?;
-  let resource_table = &mut state.borrow_mut().resource_table;
+  let resource_table = &mut resource_table.borrow_mut();
   let rid = resource_table.add("tcpListener", Box::new(listener));
   Ok(rid)
 }
 
 fn op_accept(
-  state: State,
+  resource_table: Rc<RefCell<ResourceTable>>,
   rid: u32,
   _buf: &mut [ZeroCopyBuf],
 ) -> impl TryFuture<Ok = u32, Error = Error> {
   debug!("accept rid={}", rid);
 
   poll_fn(move |cx| {
-    let resource_table = &mut state.borrow_mut().resource_table;
+    let resource_table = &mut resource_table.borrow_mut();
     let listener = resource_table
       .get_mut::<TcpListener>(rid)
       .ok_or_else(bad_resource)?;
@@ -227,7 +207,7 @@ fn op_accept(
 }
 
 fn op_read(
-  state: State,
+  resource_table: Rc<RefCell<ResourceTable>>,
   rid: u32,
   bufs: &mut [ZeroCopyBuf],
 ) -> impl TryFuture<Ok = usize, Error = Error> {
@@ -237,7 +217,7 @@ fn op_read(
   debug!("read rid={}", rid);
 
   poll_fn(move |cx| {
-    let resource_table = &mut state.borrow_mut().resource_table;
+    let resource_table = &mut resource_table.borrow_mut();
     let stream = resource_table
       .get_mut::<TcpStream>(rid)
       .ok_or_else(bad_resource)?;
@@ -246,7 +226,7 @@ fn op_read(
 }
 
 fn op_write(
-  state: State,
+  resource_table: Rc<RefCell<ResourceTable>>,
   rid: u32,
   bufs: &mut [ZeroCopyBuf],
 ) -> impl TryFuture<Ok = usize, Error = Error> {
@@ -255,7 +235,7 @@ fn op_write(
   debug!("write rid={}", rid);
 
   poll_fn(move |cx| {
-    let resource_table = &mut state.borrow_mut().resource_table;
+    let resource_table = &mut resource_table.borrow_mut();
     let stream = resource_table
       .get_mut::<TcpStream>(rid)
       .ok_or_else(bad_resource)?;
@@ -279,7 +259,7 @@ fn main() {
   // NOTE: `--help` arg will display V8 help and exit
   deno_core::v8_set_flags(env::args().collect());
 
-  let isolate = Isolate::new();
+  let isolate = isolate_new();
   let mut runtime = tokio::runtime::Builder::new()
     .basic_scheduler()
     .enable_all()
diff --git a/core/examples/http_bench_json_ops.js b/core/examples/http_bench_json_ops.js
new file mode 100644
index 00000000000000..865b04d7ee1749
--- /dev/null
+++ b/core/examples/http_bench_json_ops.js
@@ -0,0 +1,73 @@
+// This is not a real HTTP server. We read blindly one time into 'requestBuf',
+// then write this fixed 'responseBuf'. The point of this benchmark is to
+// exercise the event loop in a simple yet semi-realistic way.
+const requestBuf = new Uint8Array(64 * 1024);
+const responseBuf = new Uint8Array(
+  "HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\nHello World\n"
+    .split("")
+    .map((c) => c.charCodeAt(0)),
+);
+
+/** Listens on 0.0.0.0:4500, returns rid. */
+function listen() {
+  const { rid } = Deno.core.jsonOpSync("listen", {});
+  return rid;
+}
+
+/** Accepts a connection, returns rid. */
+async function accept(serverRid) {
+  const { rid } = await Deno.core.jsonOpAsync("accept", { rid: serverRid });
+  return rid;
+}
+
+/**
+ * Reads a packet from the rid, presumably an http request. data is ignored.
+ * Returns bytes read.
+ */
+async function read(rid, data) {
+  const { nread } = await Deno.core.jsonOpAsync("read", { rid }, data);
+  return nread;
+}
+
+/** Writes a fixed HTTP response to the socket rid. Returns bytes written. */
+async function write(rid, data) {
+  const { nwritten } = await Deno.core.jsonOpAsync("write", { rid }, data);
+  return nwritten;
+}
+
+function close(rid) {
+  Deno.core.jsonOpSync("close", { rid });
+}
+
+async function serve(rid) {
+  while (true) {
+    const nread = await read(rid, requestBuf);
+    if (nread <= 0) {
+      break;
+    }
+
+    const nwritten = await write(rid, responseBuf);
+    if (nwritten < 0) {
+      break;
+    }
+  }
+  close(rid);
+}
+
+async function main() {
+  Deno.core.ops();
+
+  const listenerRid = listen();
+  Deno.core.print(`http_bench_json_ops listening on http://127.0.0.1:4544/\n`);
+
+  for (;;) {
+    const rid = await accept(listenerRid);
+    if (rid < 0) {
+      Deno.core.print(`accept error ${rid}`);
+      return;
+    }
+    serve(rid);
+  }
+}
+
+main();
diff --git a/core/examples/http_bench_json_ops.rs b/core/examples/http_bench_json_ops.rs
new file mode 100644
index 00000000000000..f0fc5f94c2fe75
--- /dev/null
+++ b/core/examples/http_bench_json_ops.rs
@@ -0,0 +1,178 @@
+#[macro_use]
+extern crate log;
+
+use deno_core::serde_json;
+use deno_core::CoreIsolate;
+use deno_core::CoreIsolateState;
+use deno_core::ErrBox;
+use deno_core::Script;
+use deno_core::StartupData;
+use deno_core::ZeroCopyBuf;
+use futures::future::poll_fn;
+use futures::future::Future;
+use std::env;
+use std::io::Error;
+use std::io::ErrorKind;
+use std::net::SocketAddr;
+use std::pin::Pin;
+use std::task::Poll;
+use tokio::io::AsyncRead;
+use tokio::io::AsyncWrite;
+use tokio::net::TcpListener;
+use tokio::net::TcpStream;
+
+struct Logger;
+
+impl log::Log for Logger {
+  fn enabled(&self, metadata: &log::Metadata) -> bool {
+    metadata.level() <= log::max_level()
+  }
+
+  fn log(&self, record: &log::Record) {
+    if self.enabled(record.metadata()) {
+      println!("{} - {}", record.level(), record.args());
+    }
+  }
+
+  fn flush(&self) {}
+}
+
+pub fn isolate_new() -> CoreIsolate {
+  let startup_data = StartupData::Script(Script {
+    source: include_str!("http_bench_json_ops.js"),
+    filename: "http_bench_json_ops.js",
+  });
+
+  let mut isolate = CoreIsolate::new(startup_data, false);
+
+  isolate.register_op_json_sync("listen", op_listen);
+  isolate.register_op_json_async("accept", op_accept);
+  isolate.register_op_json_async("read", op_read);
+  isolate.register_op_json_async("write", op_write);
+  isolate.register_op_json_sync("close", op_close);
+
+  isolate
+}
+
+fn op_close(
+  state: &mut CoreIsolateState,
+  args: serde_json::Value,
+  _buf: &mut [ZeroCopyBuf],
+) -> Result<serde_json::Value, ErrBox> {
+  let rid = args.get("rid").unwrap().as_u64().unwrap() as u32;
+  debug!("close rid={}", rid);
+
+  let resource_table = &mut state.resource_table.borrow_mut();
+  resource_table
+    .close(rid)
+    .map(|_| serde_json::json!(()))
+    .ok_or_else(bad_resource)
+}
+
+fn op_listen(
+  state: &mut CoreIsolateState,
+  _args: serde_json::Value,
+  _buf: &mut [ZeroCopyBuf],
+) -> Result<serde_json::Value, ErrBox> {
+  debug!("listen");
+  let addr = "127.0.0.1:4544".parse::<SocketAddr>().unwrap();
+  let std_listener = std::net::TcpListener::bind(&addr)?;
+  let listener = TcpListener::from_std(std_listener)?;
+  let resource_table = &mut state.resource_table.borrow_mut();
+  let rid = resource_table.add("tcpListener", Box::new(listener));
+  Ok(serde_json::json!({ "rid": rid }))
+}
+
+fn op_accept(
+  state: &mut CoreIsolateState,
+  args: serde_json::Value,
+  _buf: &mut [ZeroCopyBuf],
+) -> impl Future<Output = Result<serde_json::Value, ErrBox>> {
+  let rid = args.get("rid").unwrap().as_u64().unwrap() as u32;
+  debug!("accept rid={}", rid);
+
+  let resource_table = state.resource_table.clone();
+  poll_fn(move |cx| {
+    let resource_table = &mut resource_table.borrow_mut();
+    let listener = resource_table
+      .get_mut::<TcpListener>(rid)
+      .ok_or_else(bad_resource)?;
+    listener.poll_accept(cx)?.map(|(stream, _addr)| {
+      let rid = resource_table.add("tcpStream", Box::new(stream));
+      Ok(serde_json::json!({ "rid": rid }))
+    })
+  })
+}
+
+fn op_read(
+  state: &mut CoreIsolateState,
+  args: serde_json::Value,
+  bufs: &mut [ZeroCopyBuf],
+) -> impl Future<Output = Result<serde_json::Value, ErrBox>> {
+  assert_eq!(bufs.len(), 1, "Invalid number of arguments");
+
+  let rid = args.get("rid").unwrap().as_u64().unwrap() as u32;
+  debug!("read rid={}", rid);
+
+  let mut buf = bufs[0].clone();
+  let resource_table = state.resource_table.clone();
+
+  poll_fn(move |cx| -> Poll<Result<serde_json::Value, ErrBox>> {
+    let resource_table = &mut resource_table.borrow_mut();
+    let stream = resource_table
+      .get_mut::<TcpStream>(rid)
+      .ok_or_else(bad_resource)?;
+    Pin::new(stream)
+      .poll_read(cx, &mut buf)?
+      .map(|nread| Ok(serde_json::json!({ "nread": nread })))
+  })
+}
+
+fn op_write(
+  state: &mut CoreIsolateState,
+  args: serde_json::Value,
+  bufs: &mut [ZeroCopyBuf],
+) -> impl Future<Output = Result<serde_json::Value, ErrBox>> {
+  assert_eq!(bufs.len(), 1, "Invalid number of arguments");
+
+  let rid = args.get("rid").unwrap().as_u64().unwrap() as u32;
+  debug!("write rid={}", rid);
+
+  let buf = bufs[0].clone();
+  let resource_table = state.resource_table.clone();
+
+  poll_fn(move |cx| {
+    let resource_table = &mut resource_table.borrow_mut();
+    let stream = resource_table
+      .get_mut::<TcpStream>(rid)
+      .ok_or_else(bad_resource)?;
+    Pin::new(stream)
+      .poll_write(cx, &buf)?
+      .map(|nwritten| Ok(serde_json::json!({ "nwritten": nwritten })))
+  })
+}
+
+fn bad_resource() -> ErrBox {
+  Error::new(ErrorKind::NotFound, "bad resource id").into()
+}
+
+fn main() {
+  log::set_logger(&Logger).unwrap();
+  log::set_max_level(
+    env::args()
+      .find(|a| a == "-D")
+      .map(|_| log::LevelFilter::Debug)
+      .unwrap_or(log::LevelFilter::Warn),
+  );
+
+  // NOTE: `--help` arg will display V8 help and exit
+  deno_core::v8_set_flags(env::args().collect());
+
+  let isolate = isolate_new();
+  let mut runtime = tokio::runtime::Builder::new()
+    .basic_scheduler()
+    .enable_all()
+    .build()
+    .unwrap();
+  deno_core::js_check(runtime.block_on(isolate));
+}
diff --git a/core/lib.rs b/core/lib.rs
index f348ed6cf468ec..940e0c026906af 100644
--- a/core/lib.rs
+++ b/core/lib.rs
@@ -15,6 +15,7 @@ mod es_isolate;
 mod flags;
 mod module_specifier;
 mod modules;
+mod normalize_path;
 mod ops;
 pub mod plugin_api;
 mod resources;
@@ -26,6 +27,7 @@ pub use rusty_v8 as v8;
 pub use crate::core_isolate::js_check;
 pub use crate::core_isolate::CoreIsolate;
 pub use crate::core_isolate::CoreIsolateState;
+pub use crate::core_isolate::HeapLimits;
 pub use crate::core_isolate::Script;
 pub use crate::core_isolate::Snapshot;
 pub use crate::core_isolate::StartupData;
@@ -43,13 +45,15 @@ pub use crate::modules::ModuleLoader;
 pub use crate::modules::ModuleSource;
 pub use crate::modules::ModuleSourceFuture;
 pub use crate::modules::RecursiveModuleLoad;
+pub use crate::normalize_path::normalize_path;
 pub use crate::ops::Buf;
 pub use crate::ops::Op;
 pub use crate::ops::OpAsyncFuture;
-pub use crate::ops::OpDispatcher;
 pub use crate::ops::OpId;
 pub use crate::resources::ResourceTable;
+pub use crate::zero_copy_buf::BufVec;
 pub use crate::zero_copy_buf::ZeroCopyBuf;
+pub use serde_json;
 
 pub fn v8_version() -> &'static str {
   v8::V8::get_version()
diff --git a/core/module_specifier.rs b/core/module_specifier.rs
index 1ad4bcc93eb3df..e5a0413ca9da21 100644
--- a/core/module_specifier.rs
+++ b/core/module_specifier.rs
@@ -1,8 +1,7 @@
+use crate::normalize_path;
 use std::env::current_dir;
 use std::error::Error;
 use std::fmt;
-use std::path::Component;
-use std::path::Path;
 use std::path::PathBuf;
 use url::ParseError;
 use url::Url;
@@ -206,42 +205,10 @@ impl PartialEq<String> for ModuleSpecifier {
   }
 }
 
-/// Normalize all itermediate components of the path (ie. remove "./" and "../" components).
-/// Similar to `fs::canonicalize()` but doesn't resolve symlinks.
-///
-/// Taken from Cargo
-/// https://github.com/rust-lang/cargo/blob/af307a38c20a753ec60f0ad18be5abed3db3c9ac/src/cargo/util/paths.rs#L60-L85
-pub fn normalize_path(path: &Path) -> PathBuf {
-  let mut components = path.components().peekable();
-  let mut ret =
-    if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
-      components.next();
-      PathBuf::from(c.as_os_str())
-    } else {
-      PathBuf::new()
-    };
-
-  for component in components {
-    match component {
-      Component::Prefix(..) => unreachable!(),
-      Component::RootDir => {
-        ret.push(component.as_os_str());
-      }
-      Component::CurDir => {}
-      Component::ParentDir => {
-        ret.pop();
-      }
-      Component::Normal(c) => {
-        ret.push(c);
-      }
-    }
-  }
-  ret
-}
-
 #[cfg(test)]
 mod tests {
   use super::*;
+  use std::path::Path;
 
   #[test]
   fn test_resolve_import() {
diff --git a/core/modules.rs b/core/modules.rs
index 58ad767b9dd830..7ff9634d46aec5 100644
--- a/core/modules.rs
+++ b/core/modules.rs
@@ -340,10 +340,7 @@ impl ModuleNameMap {
   /// Check if a name is an alias to another module.
   pub fn is_alias(&self, name: &str) -> bool {
     let cond = self.inner.get(name);
-    match cond {
-      Some(SymbolicModule::Alias(_)) => true,
-      _ => false,
-    }
+    matches!(cond, Some(SymbolicModule::Alias(_)))
   }
 }
 
diff --git a/core/normalize_path.rs b/core/normalize_path.rs
new file mode 100644
index 00000000000000..6a0e448967d136
--- /dev/null
+++ b/core/normalize_path.rs
@@ -0,0 +1,36 @@
+use std::path::Component;
+use std::path::Path;
+use std::path::PathBuf;
+
+/// Normalize all itermediate components of the path (ie. remove "./" and "../" components).
+/// Similar to `fs::canonicalize()` but doesn't resolve symlinks.
+///
+/// Taken from Cargo
+/// https://github.com/rust-lang/cargo/blob/af307a38c20a753ec60f0ad18be5abed3db3c9ac/src/cargo/util/paths.rs#L60-L85
+pub fn normalize_path(path: &Path) -> PathBuf {
+  let mut components = path.components().peekable();
+  let mut ret =
+    if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
+      components.next();
+      PathBuf::from(c.as_os_str())
+    } else {
+      PathBuf::new()
+    };
+
+  for component in components {
+    match component {
+      Component::Prefix(..) => unreachable!(),
+      Component::RootDir => {
+        ret.push(component.as_os_str());
+      }
+      Component::CurDir => {}
+      Component::ParentDir => {
+        ret.pop();
+      }
+      Component::Normal(c) => {
+        ret.push(c);
+      }
+    }
+  }
+  ret
+}
diff --git a/core/ops.rs b/core/ops.rs
index 603526dbcbcc88..65a0f325b136f1 100644
--- a/core/ops.rs
+++ b/core/ops.rs
@@ -20,53 +20,31 @@ pub enum Op {
   AsyncUnref(OpAsyncFuture),
 }
 
-/// Main type describing Op
-pub trait OpDispatcher {
-  fn dispatch(
-    &self,
-    isolate_state: &mut CoreIsolateState,
-    zero_copy: &mut [ZeroCopyBuf],
-  ) -> Op;
-}
-
-impl<F> OpDispatcher for F
-where
-  F: Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op,
-{
-  fn dispatch(
-    &self,
-    isolate_state: &mut CoreIsolateState,
-    zero_copy: &mut [ZeroCopyBuf],
-  ) -> Op {
-    self(isolate_state, zero_copy)
-  }
-}
+/// Main type describing op
+pub type OpDispatcher =
+  dyn Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op + 'static;
 
 #[derive(Default)]
 pub struct OpRegistry {
-  dispatchers: Vec<Rc<dyn OpDispatcher>>,
+  dispatchers: Vec<Rc<OpDispatcher>>,
   name_to_id: HashMap<String, OpId>,
 }
 
 impl OpRegistry {
   pub fn new() -> Self {
     let mut registry = Self::default();
-    let op_id = registry.register(
-      "ops",
-      |state: &mut CoreIsolateState, _: &mut [ZeroCopyBuf]| {
-        let buf = state.op_registry.json_map();
-        Op::Sync(buf)
-      },
-    );
+    let op_id = registry.register("ops", |state, _| {
+      let buf = state.op_registry.json_map();
+      Op::Sync(buf)
+    });
     assert_eq!(op_id, 0);
     registry
   }
 
-  pub fn register(
-    &mut self,
-    name: &str,
-    op: impl OpDispatcher + 'static,
-  ) -> OpId {
+  pub fn register<F>(&mut self, name: &str, op: F) -> OpId
+  where
+    F: Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op + 'static,
+  {
     let op_id = self.dispatchers.len() as u32;
 
     let existing = self.name_to_id.insert(name.to_string(), op_id);
@@ -83,8 +61,8 @@ impl OpRegistry {
     op_map_json.as_bytes().to_owned().into_boxed_slice()
   }
 
-  pub fn get(&self, op_id: OpId) -> Option<Rc<dyn OpDispatcher>> {
-    self.dispatchers.get(op_id as usize).cloned()
+  pub fn get(&self, op_id: OpId) -> Option<Rc<OpDispatcher>> {
+    self.dispatchers.get(op_id as usize).map(Rc::clone)
   }
 
   pub fn unregister_op(&mut self, name: &str) {
@@ -103,13 +81,10 @@ fn test_op_registry() {
   let c = Arc::new(atomic::AtomicUsize::new(0));
   let c_ = c.clone();
 
-  let test_id = op_registry.register(
-    "test",
-    move |_: &mut CoreIsolateState, _: &mut [ZeroCopyBuf]| {
-      c_.fetch_add(1, atomic::Ordering::SeqCst);
-      Op::Sync(Box::new([]))
-    },
-  );
+  let test_id = op_registry.register("test", move |_, _| {
+    c_.fetch_add(1, atomic::Ordering::SeqCst);
+    Op::Sync(Box::new([]))
+  });
   assert!(test_id != 0);
 
   let mut expected = HashMap::new();
@@ -122,7 +97,7 @@ fn test_op_registry() {
   let dispatch = op_registry.get(test_id).unwrap();
   let state_rc = CoreIsolate::state(&isolate);
   let mut state = state_rc.borrow_mut();
-  let res = dispatch.dispatch(&mut state, &mut []);
+  let res = dispatch(&mut state, &mut []);
   if let Op::Sync(buf) = res {
     assert_eq!(buf.len(), 0);
   } else {
@@ -152,21 +127,15 @@ fn register_op_during_call() {
 
   let test_id = {
     let mut g = op_registry.lock().unwrap();
-    g.register(
-      "dynamic_register_op",
-      move |_: &mut CoreIsolateState, _: &mut [ZeroCopyBuf]| {
-        let c__ = c_.clone();
-        let mut g = op_registry_.lock().unwrap();
-        g.register(
-          "test",
-          move |_: &mut CoreIsolateState, _: &mut [ZeroCopyBuf]| {
-            c__.fetch_add(1, atomic::Ordering::SeqCst);
-            Op::Sync(Box::new([]))
-          },
-        );
+    g.register("dynamic_register_op", move |_, _| {
+      let c__ = c_.clone();
+      let mut g = op_registry_.lock().unwrap();
+      g.register("test", move |_, _| {
+        c__.fetch_add(1, atomic::Ordering::SeqCst);
         Op::Sync(Box::new([]))
-      },
-    )
+      });
+      Op::Sync(Box::new([]))
+    })
   };
   assert!(test_id != 0);
 
@@ -179,7 +148,7 @@ fn register_op_during_call() {
   {
     let state_rc = CoreIsolate::state(&isolate);
     let mut state = state_rc.borrow_mut();
-    dispatcher1.dispatch(&mut state, &mut []);
+    dispatcher1(&mut state, &mut []);
   }
 
   let mut expected = HashMap::new();
@@ -197,7 +166,7 @@ fn register_op_during_call() {
   };
   let state_rc = CoreIsolate::state(&isolate);
   let mut state = state_rc.borrow_mut();
-  let res = dispatcher2.dispatch(&mut state, &mut []);
+  let res = dispatcher2(&mut state, &mut []);
   if let Op::Sync(buf) = res {
     assert_eq!(buf.len(), 0);
   } else {
diff --git a/core/zero_copy_buf.rs b/core/zero_copy_buf.rs
index a2625b8aa0cd46..05357654741dec 100644
--- a/core/zero_copy_buf.rs
+++ b/core/zero_copy_buf.rs
@@ -1,8 +1,11 @@
 use crate::bindings;
 use rusty_v8 as v8;
+use smallvec::SmallVec;
 use std::ops::Deref;
 use std::ops::DerefMut;
 
+pub type BufVec = SmallVec<[ZeroCopyBuf; 2]>;
+
 /// A ZeroCopyBuf encapsulates a slice that's been borrowed from a JavaScript
 /// ArrayBuffer object. JavaScript objects can normally be garbage collected,
 /// but the existence of a ZeroCopyBuf inhibits this until it is dropped. It
diff --git a/docs/contributing.md b/docs/contributing.md
index dcc2c7472e8ad8..dba1b62d13392a 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -2,7 +2,7 @@
 
 - Read the [style guide](./contributing/style_guide.md).
 
-- Please don't make [the benchmarks](https://deno.land/benchmarks.html) worse.
+- Please don't make [the benchmarks](https://deno.land/benchmarks) worse.
 
 - Ask for help in the [community chat room](https://discord.gg/deno).
 
@@ -11,7 +11,7 @@
 
 - Please be professional in the forums. We follow
   [Rust's code of conduct](https://www.rust-lang.org/policies/code-of-conduct)
-  (CoC) Have a problem? Email ry@tinyclouds.org.
+  (CoC). Have a problem? Email ry@tinyclouds.org.
 
 ## Development
 
diff --git a/docs/contributing/architecture.md b/docs/contributing/architecture.md
index 8600b5eaefde13..898fb04b6a5cd1 100644
--- a/docs/contributing/architecture.md
+++ b/docs/contributing/architecture.md
@@ -47,3 +47,8 @@ Metrics is Deno's internal counter for various statistics.
 ### Schematic diagram
 
 ![architectural schematic](https://deno.land/images/schematic_v0.2.png)
+
+### Conference
+
+[Ryan Dahl - An interesting case with
+Deno](https://www.youtube.com/watch?v=1b7FoBwxc7E)
diff --git a/docs/contributing/development_tools.md b/docs/contributing/development_tools.md
index c05a1ee987e294..844ce31f3eb4f6 100644
--- a/docs/contributing/development_tools.md
+++ b/docs/contributing/development_tools.md
@@ -34,7 +34,7 @@ Format the code:
 
 ### Profiling
 
-To start profiling,
+To start profiling:
 
 ```sh
 # Make sure we're only building release.
@@ -107,7 +107,7 @@ Current executable set to '../deno/target/debug/deno' (x86_64).
 
 ### V8 flags
 
-V8 has many many internal command-line flags.
+V8 has many many internal command-line flags:
 
 ```shell
 $ deno run --v8-flags=--help _
diff --git a/docs/contributing/style_guide.md b/docs/contributing/style_guide.md
index a54f292814f9a2..4d93818f089e7f 100644
--- a/docs/contributing/style_guide.md
+++ b/docs/contributing/style_guide.md
@@ -1,7 +1,5 @@
 # Deno Style Guide
 
-## Table of Contents
-
 ## Copyright Headers
 
 Most modules in the repository should have the following copyright header:
@@ -49,7 +47,7 @@ https://chromium.googlesource.com/chromium/src/+/master/styleguide/inclusive_cod
 
 Follow Rust conventions and be consistent with existing code.
 
-## Typescript
+## TypeScript
 
 The TypeScript portions of the codebase include `cli/js` for the built-ins and
 the standard library `std`.
@@ -90,7 +88,7 @@ When designing function interfaces, stick to the following rules.
    Other arguments can be objects, but they must be distinguishable from a
    'plain' Object runtime, by having either:
 
-   - a distinguishing prototype (e.g. `Array`, `Map`, `Date`, `class MyThing`)
+   - a distinguishing prototype (e.g. `Array`, `Map`, `Date`, `class MyThing`).
    - a well-known symbol property (e.g. an iterable with `Symbol.iterator`).
 
    This allows the API to evolve in a backwards compatible way, even when the
@@ -193,7 +191,7 @@ underscore. By convention, only files in its own directory should import it.
 We strive for complete documentation. Every exported symbol ideally should have
 a documentation line.
 
-If possible, use a single line for the JS Doc. Example:
+If possible, use a single line for the JSDoc. Example:
 
 ```ts
 /** foo does bar. */
@@ -235,7 +233,7 @@ comments should be written as:
 /** This is a good single line JSDoc. */
 ```
 
-And not
+And not:
 
 ```ts
 /**
@@ -278,10 +276,10 @@ test myTestFunction ... ok
 Example of test:
 
 ```ts
-import { assertEquals } from "https://deno.land/std@v0.11/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@$STD_VERSION/testing/asserts.ts";
 import { foo } from "./mod.ts";
 
-Deno.test("myTestFunction" function() {
+Deno.test("myTestFunction", function () {
   assertEquals(foo(), { bar: "bar" });
 });
 ```
@@ -291,7 +289,7 @@ Deno.test("myTestFunction" function() {
 Top level functions should use the `function` keyword. Arrow syntax should be
 limited to closures.
 
-Bad
+Bad:
 
 ```ts
 export const foo = (): string => {
@@ -299,7 +297,7 @@ export const foo = (): string => {
 };
 ```
 
-Good
+Good:
 
 ```ts
 export function foo(): string {
diff --git a/docs/examples.md b/docs/examples.md
index 13c15a2c703be5..5a323b3451252d 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -2,3 +2,20 @@
 
 In this chapter you can find some example programs that you can use to learn
 more about the runtime.
+
+## Basic
+
+- [Hello World](./examples/hello_world)
+- [Import and Export Modules](./examples/import_export)
+- [How to Manage Dependencies](./examples/manage_dependencies)
+
+## Advanced
+
+- [Unix Cat](./examples/unix_cat)
+- [File Server](./examples/file_server)
+- [TCP Echo](./examples/tcp_echo)
+- [Subprocess](./examples/subprocess)
+- [Permissions](./examples/permissions)
+- [OS Signals](./examples/os_signals)
+- [File System Events](./examples/file_system_events)
+- [Testing If Main](./examples/testing_if_main)
diff --git a/docs/examples/file_server.md b/docs/examples/file_server.md
index b5916876476307..4559b5e3d00579 100644
--- a/docs/examples/file_server.md
+++ b/docs/examples/file_server.md
@@ -3,14 +3,14 @@
 This one serves a local directory in HTTP.
 
 ```shell
-deno install --allow-net --allow-read https://deno.land/std/http/file_server.ts
+deno install --allow-net --allow-read https://deno.land/std@$STD_VERSION/http/file_server.ts
 ```
 
 Run it:
 
 ```shell
 $ file_server .
-Downloading https://deno.land/std/http/file_server.ts...
+Downloading https://deno.land/std@$STD_VERSION/http/file_server.ts...
 [...]
 HTTP server listening on http://0.0.0.0:4500/
 ```
diff --git a/docs/examples/file_system_events.md b/docs/examples/file_system_events.md
index 2abebc33e863fe..2999ccdfe1603c 100644
--- a/docs/examples/file_system_events.md
+++ b/docs/examples/file_system_events.md
@@ -1,4 +1,4 @@
-### File system events
+## File system events
 
 To poll for file system events:
 
diff --git a/docs/examples/hello_world.md b/docs/examples/hello_world.md
new file mode 100644
index 00000000000000..90a833f71d5bbf
--- /dev/null
+++ b/docs/examples/hello_world.md
@@ -0,0 +1,66 @@
+# Hello World
+
+Deno is a secure runtime for both JavaScript and TypeScript. As the hello world
+examples below highlight the same functionality can be created in JavaScript or
+TypeScript, and Deno will execute both.
+
+## JavaScript
+
+In this JavaScript example the message `Hello [name]` is printed to the console
+and the code ensures the name provided is capitalized.
+
+**Command:** `deno run hello-world.js`
+
+```js
+function capitalize(word) {
+  return word.charAt(0).toUpperCase() + word.slice(1);
+}
+
+function hello(name) {
+  return "Hello " + capitalize(name);
+}
+
+console.log(hello("john"));
+console.log(hello("Sarah"));
+console.log(hello("kai"));
+
+/**
+ * Output:
+ *
+ * Hello John
+ * Hello Sarah
+ * Hello Kai
+**/
+```
+
+## TypeScript
+
+This TypeScript example is exactly the same as the JavaScript example above, the
+code just has the additional type information which TypeScript supports.
+
+The `deno run` command is exactly the same, it just references a `*.ts` file
+rather than a `*.js` file.
+
+**Command:** `deno run hello-world.ts`
+
+```ts
+function capitalize(word: string): string {
+  return word.charAt(0).toUpperCase() + word.slice(1);
+}
+
+function hello(name: string): string {
+  return "Hello " + capitalize(name);
+}
+
+console.log(hello("john"));
+console.log(hello("Sarah"));
+console.log(hello("kai"));
+
+/**
+ * Output:
+ *
+ * Hello John
+ * Hello Sarah
+ * Hello Kai
+**/
+```
diff --git a/docs/examples/import_export.md b/docs/examples/import_export.md
new file mode 100644
index 00000000000000..22d02eea70664d
--- /dev/null
+++ b/docs/examples/import_export.md
@@ -0,0 +1,102 @@
+# Import and Export Modules
+
+Deno by default standardizes the way modules are imported in both JavaScript and
+TypeScript. It follows the ECMAScript 6 `import/export` standard with one
+caveat, the file type must be included at the end of import statement.
+
+```js
+import {
+  add,
+  multiply,
+} from "./arithmetic.ts";
+```
+
+Dependencies are also imported directly, there is no package management
+overhead. Local modules are imported in exactly the same way as remote modules.
+As the examples show below, the same functionality can be produced in the same
+way with local or remote modules.
+
+## Local Import
+
+In this example the `add` and `multiply` functions are imported from a local
+`arithmetic.ts` module.
+
+**Command:** `deno run local.ts`
+
+```ts
+import { add, multiply } from "./arithmetic.ts";
+
+function totalCost(outbound: number, inbound: number, tax: number): number {
+  return multiply(add(outbound, inbound), tax);
+}
+
+console.log(totalCost(19, 31, 1.2));
+console.log(totalCost(45, 27, 1.15));
+
+/**
+ * Output
+ *
+ * 60
+ * 82.8
+ */
+```
+
+## Export
+
+In the example above the `add` and `multiply` functions are imported from a
+locally stored arithmetic module. To make this possible the functions stored in
+the arithmetic module must be exported.
+
+To do this just add the keyword `export` to the beginning of the function
+signature as is shown below.
+
+```ts
+export function add(a: number, b: number): number {
+  return a + b;
+}
+
+export function multiply(a: number, b: number): number {
+  return a * b;
+}
+```
+
+All functions, classes, constants and variables which need to be accessible
+inside external modules must be exported. Either by prepending them with the
+`export` keyword or including them in an export statement at the bottom of the
+file.
+
+To find out more on ECMAScript Export functionality please read the
+[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/export).
+
+## Remote Import
+
+In the local import example above an `add` and `multiply` method are imported
+from a locally stored arithmetic module. The same functionality can be created
+by importing `add` and `multiply` methods from a remote module too.
+
+In this case the Ramda module is referenced, including the version number. Also
+note a JavaScript module is imported directly into a TypeSript module, Deno has
+no problem handling this.
+
+**Command:** `deno run ./remote.ts`
+
+```ts
+import {
+  add,
+  multiply,
+} from "https://x.nest.land/ramda@0.27.0/source/index.js";
+
+function totalCost(outbound: number, inbound: number, tax: number): number {
+  return multiply(add(outbound, inbound), tax);
+}
+
+console.log(totalCost(19, 31, 1.2));
+console.log(totalCost(45, 27, 1.15));
+
+/**
+ * Output
+ *
+ * 60
+ * 82.8
+ */
+```
diff --git a/docs/examples/manage_dependencies.md b/docs/examples/manage_dependencies.md
new file mode 100644
index 00000000000000..142d66bac39842
--- /dev/null
+++ b/docs/examples/manage_dependencies.md
@@ -0,0 +1,56 @@
+# Managing Dependencies
+
+In Deno there is no concept of a package manager as external modules are
+imported directly into local modules. This raises the question of how to manage
+remote dependencies without a package manager. In big projects with many
+dependencies it will become cumbersome and time consuming to update modules if
+they are all imported individually into individual modules.
+
+The standard practice for solving this problem in Deno is to create a `deps.ts`
+file. All required remote dependencies are referenced in this file and the
+required methods and classes are re-exported. The dependent local modules then
+reference the `deps.ts` rather than the remote dependencies.
+
+This enables easy updates to modules across a large codebase and solves the
+'package manager problem', if it ever existed. Dev dependencies can also be
+managed in a separate `dev_deps.ts` file.
+
+**deps.ts example**
+
+```ts
+/**
+ * deps.ts re-exports the required methods from the remote Ramda module.
+ **/
+export {
+  add,
+  multiply,
+} from "https://x.nest.land/ramda@0.27.0/source/index.js";
+```
+
+In this example the same functionality is created as is the case in the
+[local and remote import examples](./import_export.md). But in this case instead
+of the Ramda module being referenced directly it is referenced by proxy using a
+local `deps.ts` module.
+
+**Command:** `deno run dependencies.ts`
+
+```ts
+import {
+  add,
+  multiply,
+} from "./deps.ts";
+
+function totalCost(outbound: number, inbound: number, tax: number): number {
+  return multiply(add(outbound, inbound), tax);
+}
+
+console.log(totalCost(19, 31, 1.2));
+console.log(totalCost(45, 27, 1.15));
+
+/**
+ * Output
+ *
+ * 60
+ * 82.8
+ */
+```
diff --git a/docs/examples/os_signals.md b/docs/examples/os_signals.md
index 7fbe8503bee919..3b2411bde659fd 100644
--- a/docs/examples/os_signals.md
+++ b/docs/examples/os_signals.md
@@ -3,9 +3,9 @@
 > This program makes use of an unstable Deno feature. Learn more about
 > [unstable features](../runtime/stability.md).
 
-[API Reference](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/js/lib.deno.unstable.d.ts#Deno.signal)
+[API Reference](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/dts/lib.deno.unstable.d.ts#Deno.signal)
 
-You can use `Deno.signal()` function for handling OS signals.
+You can use `Deno.signal()` function for handling OS signals:
 
 ```ts
 for await (const _ of Deno.signal(Deno.Signal.SIGINT)) {
@@ -13,7 +13,7 @@ for await (const _ of Deno.signal(Deno.Signal.SIGINT)) {
 }
 ```
 
-`Deno.signal()` also works as a promise.
+`Deno.signal()` also works as a promise:
 
 ```ts
 await Deno.signal(Deno.Signal.SIGINT);
@@ -21,7 +21,7 @@ console.log("interrupted!");
 ```
 
 If you want to stop watching the signal, you can use `dispose()` method of the
-signal object.
+signal object:
 
 ```ts
 const sig = Deno.signal(Deno.Signal.SIGINT);
@@ -34,4 +34,4 @@ for await (const _ of sig) {
 }
 ```
 
-The above for-await loop exits after 5 seconds when sig.dispose() is called.
+The above for-await loop exits after 5 seconds when `sig.dispose()` is called.
diff --git a/docs/examples/permissions.md b/docs/examples/permissions.md
deleted file mode 100644
index 78dfcc59dbf56a..00000000000000
--- a/docs/examples/permissions.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Inspecting and revoking permissions
-
-> This program makes use of an unstable Deno feature. Learn more about
-> [unstable features](../runtime/stability.md).
-
-Sometimes a program may want to revoke previously granted permissions. When a
-program, at a later stage, needs those permissions, it will fail.
-
-```ts
-// lookup a permission
-const status = await Deno.permissions.query({ name: "write" });
-if (status.state !== "granted") {
-  throw new Error("need write permission");
-}
-
-const log = await Deno.open("request.log", { write: true, append: true });
-
-// revoke some permissions
-await Deno.permissions.revoke({ name: "read" });
-await Deno.permissions.revoke({ name: "write" });
-
-// use the log file
-const encoder = new TextEncoder();
-await log.write(encoder.encode("hello\n"));
-
-// this will fail.
-await Deno.remove("request.log");
-```
diff --git a/docs/examples/subprocess.md b/docs/examples/subprocess.md
index 80d0cc7da55d7e..72a3bc8627325d 100644
--- a/docs/examples/subprocess.md
+++ b/docs/examples/subprocess.md
@@ -38,7 +38,7 @@ const p = Deno.run({
     "deno",
     "run",
     "--allow-read",
-    "https://deno.land/std/examples/cat.ts",
+    "https://deno.land/std@$STD_VERSION/examples/cat.ts",
     ...fileNames,
   ],
   stdout: "piped",
diff --git a/docs/examples/tcp_echo.md b/docs/examples/tcp_echo.md
index 5dfc71b8317bba..99e8cbd04db2db 100644
--- a/docs/examples/tcp_echo.md
+++ b/docs/examples/tcp_echo.md
@@ -14,7 +14,7 @@ for await (const conn of listener) {
 When this program is started, it throws PermissionDenied error.
 
 ```shell
-$ deno run https://deno.land/std/examples/echo_server.ts
+$ deno run https://deno.land/std@$STD_VERSION/examples/echo_server.ts
 error: Uncaught PermissionDenied: network access to "0.0.0.0:8080", run again with the --allow-net flag
 ► $deno$/dispatch_json.ts:40:11
     at DenoError ($deno$/errors.ts:20:5)
@@ -25,7 +25,7 @@ For security reasons, Deno does not allow programs to access the network without
 explicit permission. To allow accessing the network, use a command-line flag:
 
 ```shell
-deno run --allow-net https://deno.land/std/examples/echo_server.ts
+deno run --allow-net https://deno.land/std@$STD_VERSION/examples/echo_server.ts
 ```
 
 To test it, try sending data to it with netcat:
diff --git a/docs/examples/unix_cat.md b/docs/examples/unix_cat.md
index b45f2e680914ed..efec9e3fb3f23a 100644
--- a/docs/examples/unix_cat.md
+++ b/docs/examples/unix_cat.md
@@ -20,5 +20,5 @@ I/O streams in Deno.
 Try the program:
 
 ```shell
-deno run --allow-read https://deno.land/std/examples/cat.ts /etc/passwd
+deno run --allow-read https://deno.land/std@$STD_VERSION/examples/cat.ts /etc/passwd
 ```
diff --git a/docs/getting_started.md b/docs/getting_started.md
index d36623c1875a19..2643a22ca4a7e7 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -2,11 +2,11 @@
 
 In this chapter we'll discuss:
 
-- Installing Deno
-- Setting up your environment
-- Running a `Hello World` script
-- Writing our own script
-- Command line interface
-- Understanding permissions
-- Using Deno with TypeScript
-- Using WebAssembly
+- [Installing Deno](./getting_started/installation.md)
+- [Setting up your environment](./getting_started/setup_your_environment.md)
+- [Running a `Hello World` script](./getting_started/first_steps.md)
+- [Writing our own script](./getting_started/first_steps.md)
+- [Command line interface](./getting_started/command_line_interface.md)
+- [Understanding permissions](./getting_started/permissions.md)
+- [Using Deno with TypeScript](./getting_started/typescript.md)
+- [Using WebAssembly](./getting_started/webassembly.md)
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index 4a551c41566f1e..7bb51bb15e06ba 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -23,7 +23,7 @@ console.log("Welcome to Deno 🦕");
 Try the program:
 
 ```shell
-deno run https://deno.land/std/examples/welcome.ts
+deno run https://deno.land/std@$STD_VERSION/examples/welcome.ts
 ```
 
 ### Making an HTTP request
@@ -59,7 +59,7 @@ Let's walk through what this application does:
 Try it out:
 
 ```shell
-deno run https://deno.land/std/examples/curl.ts https://example.com
+deno run https://deno.land/std@$STD_VERSION/examples/curl.ts https://example.com
 ```
 
 You will see this program returns an error regarding network access, so what did
@@ -70,7 +70,7 @@ permission to do certain 'privileged' actions, such as access the network.
 Try it out again with the correct permission flag:
 
 ```shell
-deno run --allow-net=example.com https://deno.land/std/examples/curl.ts https://example.com
+deno run --allow-net=example.com https://deno.land/std@$STD_VERSION/examples/curl.ts https://example.com
 ```
 
 ### Reading a file
@@ -102,7 +102,7 @@ I/O streams in Deno.
 Try the program:
 
 ```shell
-deno run --allow-read https://deno.land/std/examples/cat.ts /etc/passwd
+deno run --allow-read https://deno.land/std@$STD_VERSION/examples/cat.ts /etc/passwd
 ```
 
 ### TCP server
@@ -124,7 +124,7 @@ For security reasons, Deno does not allow programs to access the network without
 explicit permission. To allow accessing the network, use a command-line flag:
 
 ```shell
-deno run --allow-net https://deno.land/std/examples/echo_server.ts
+deno run --allow-net https://deno.land/std@$STD_VERSION/examples/echo_server.ts
 ```
 
 To test it, try sending data to it with netcat:
diff --git a/docs/getting_started/permissions.md b/docs/getting_started/permissions.md
index 72cd9d6d67eea6..1044a3080ed825 100644
--- a/docs/getting_started/permissions.md
+++ b/docs/getting_started/permissions.md
@@ -2,11 +2,11 @@
 
 Deno is secure by default. Therefore, unless you specifically enable it, a deno
 module has no file, network, or environment access for example. Access to
-security sensitive areas or functions requires the use of permissions to be
+security-sensitive areas or functions requires the use of permissions to be
 granted to a deno process on the command line.
 
 For the following example, `mod.ts` has been granted read-only access to the
-file system. It cannot write to it, or perform any other security sensitive
+file system. It cannot write to it, or perform any other security-sensitive
 functions.
 
 ```shell
@@ -20,21 +20,21 @@ The following permissions are available:
 - **-A, --allow-all** Allow all permissions. This disables all security.
 - **--allow-env** Allow environment access for things like getting and setting
   of environment variables.
-- **--allow-hrtime** Allow high resolution time measurement. High resolution
+- **--allow-hrtime** Allow high-resolution time measurement. High-resolution
   time can be used in timing attacks and fingerprinting.
 - **--allow-net=\<allow-net\>** Allow network access. You can specify an
-  optional, comma separated list of domains to provide a allow-list of allowed
+  optional, comma-separated list of domains to provide an allow-list of allowed
   domains.
 - **--allow-plugin** Allow loading plugins. Please note that --allow-plugin is
   an unstable feature.
 - **--allow-read=\<allow-read\>** Allow file system read access. You can specify
-  an optional, comma separated list of directories or files to provide a
+  an optional, comma-separated list of directories or files to provide a
   allow-list of allowed file system access.
 - **--allow-run** Allow running subprocesses. Be aware that subprocesses are not
   run in a sandbox and therefore do not have the same security restrictions as
   the deno process. Therefore, use with caution.
 - **--allow-write=\<allow-write\>** Allow file system write access. You can
-  specify an optional, comma separated list of directories or files to provide a
+  specify an optional, comma-separated list of directories or files to provide a
   allow-list of allowed file system access.
 
 ### Permissions allow-list
@@ -47,7 +47,7 @@ directory, however the execution fails as the process was attempting to access a
 file in the `/etc` directory:
 
 ```shell
-$ deno run --allow-read=/usr https://deno.land/std/examples/cat.ts /etc/passwd
+$ deno run --allow-read=/usr https://deno.land/std@$STD_VERSION/examples/cat.ts /etc/passwd
 error: Uncaught PermissionDenied: read access to "/etc/passwd", run again with the --allow-read flag
 ► $deno$/dispatch_json.ts:40:11
     at DenoError ($deno$/errors.ts:20:5)
@@ -57,7 +57,7 @@ error: Uncaught PermissionDenied: read access to "/etc/passwd", run again with t
 Try it out again with the correct permissions by allow-listing `/etc` instead:
 
 ```shell
-deno run --allow-read=/etc https://deno.land/std/examples/cat.ts /etc/passwd
+deno run --allow-read=/etc https://deno.land/std@$STD_VERSION/examples/cat.ts /etc/passwd
 ```
 
 `--allow-write` works the same as `--allow-read`.
@@ -70,7 +70,7 @@ _fetch.ts_:
 const result = await fetch("https://deno.land/");
 ```
 
-This is an example on how to allow-list hosts/urls:
+This is an example of how to allow-list hosts/urls:
 
 ```shell
 deno run --allow-net=github.com,deno.land fetch.ts
diff --git a/docs/getting_started/setup_your_environment.md b/docs/getting_started/setup_your_environment.md
index 8f34a70ef4d466..89532ce07b8dc0 100644
--- a/docs/getting_started/setup_your_environment.md
+++ b/docs/getting_started/setup_your_environment.md
@@ -36,14 +36,35 @@ deno completions bash > /usr/local/etc/bash_completion.d/deno.bash
 source /usr/local/etc/bash_completion.d/deno.bash
 ```
 
-Example (zsh):
+Example (zsh without framework):
+
+```shell
+mkdir ~/.zsh # create a folder to save your completions. it can be anywhere
+deno completions zsh > .zsh/_deno
+```
+
+then add this to your `.zshrc`
+
+```shell
+fpath=(~/.zsh $fpath)
+autoload -Uz compinit
+compinit -u
+```
+
+and restart your terminal. note that if completions are still not loading, you
+may need to run `rm ~/.zcompdump/` to remove previously generated completions
+and then `compinit` to generate them again.
+
+Example (zsh + oh-my-zsh) [recommended for zsh users] :
 
 ```shell
 mkdir ~/.oh-my-zsh/custom/plugins/deno
 deno completions zsh > ~/.oh-my-zsh/custom/plugins/deno/_deno
 ```
 
-After this add `deno` plugin under plugins tag in `~/.zshrc` file.
+After this add deno plugin under plugins tag in `~/.zshrc` file. for tools like
+`antigen` path will be `~/.antigen/bundles/robbyrussell/oh-my-zsh/plugins` and
+command will be `antigen bundle deno` and so on.
 
 ### Editors and IDEs
 
diff --git a/docs/getting_started/typescript.md b/docs/getting_started/typescript.md
index 265911d5142927..a72fd36895efc4 100644
--- a/docs/getting_started/typescript.md
+++ b/docs/getting_started/typescript.md
@@ -10,13 +10,13 @@ no "magical" module resolution. Instead, imported modules are specified as files
 directly imported. E.g.
 
 ```
-import { Response } from "https://deno.land/std@0.53.0/http/server.ts";
+import { Response } from "https://deno.land/std@$STD_VERSION/http/server.ts";
 import { queue } from "./collections.ts";
 ```
 
 ### `--no-check` option
 
-When using `deno run`, `deno test`, `deno cache`,`deno info`, or `deno bundle`
+When using `deno run`, `deno test`, `deno cache`, `deno info`, or `deno bundle`
 you can specify the `--no-check` flag to disable TypeScript type checking. This
 can significantly reduce the time that program startup takes. This can be very
 useful when type checking is provided by your editor and you want startup time
@@ -30,14 +30,14 @@ information. For this purpose TypeScript provides the
 To export a type in a different file use
 `export type { AnInterface } from "./mod.ts";`. To import a type use
 `import type { AnInterface } from "./mod.ts";`. You can check that you are using
-`import type` and `export type` where necessary by setting the
-`importsNotUsedAsValues` TypeScript compiler option to `"error"`. You can see an
-example `tsconfig.json` with this option
+`import type` and `export type` where necessary by setting the `isolatedModules`
+TypeScript compiler option to `true`. You can see an example `tsconfig.json`
+with this option
 [in the standard library](https://github.com/denoland/deno/blob/master/std/tsconfig_test.json).
 
 Because there is no type information when using `--no-check`, `const enum` is
-not supported because it is are type-directed. `--no-check` also does not
-support the legacy `import =` and `export =` syntax.
+not supported because it is type-directed. `--no-check` also does not support
+the legacy `import =` and `export =` syntax.
 
 ### Using external type definitions
 
diff --git a/docs/introduction.md b/docs/introduction.md
index 7383058854547d..8fd255756d644b 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -60,7 +60,7 @@ have been historically written with bash or python.
   imported via URLs:
 
   ```javascript
-  import * as log from "https://deno.land/std/log/mod.ts";
+  import * as log from "https://deno.land/std@$STD_VERSION/log/mod.ts";
   ```
 
 ## Other key behaviors
diff --git a/docs/linking_to_external_code.md b/docs/linking_to_external_code.md
index ad6cfab0954bfc..d440d39d2d0e3c 100644
--- a/docs/linking_to_external_code.md
+++ b/docs/linking_to_external_code.md
@@ -7,7 +7,7 @@ directly from URLs. This example uses a URL to import an assertion library:
 **test.ts**
 
 ```ts
-import { assertEquals } from "https://deno.land/std/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@$STD_VERSION/testing/asserts.ts";
 
 assertEquals("hello", "hello");
 assertEquals("world", "world");
@@ -20,9 +20,9 @@ Try running this:
 ```shell
 $ deno run test.ts
 Compile file:///mnt/f9/Projects/github.com/denoland/deno/docs/test.ts
-Download https://deno.land/std/testing/asserts.ts
-Download https://deno.land/std/fmt/colors.ts
-Download https://deno.land/std/testing/diff.ts
+Download https://deno.land/std@$STD_VERSION/testing/asserts.ts
+Download https://deno.land/std@$STD_VERSION/fmt/colors.ts
+Download https://deno.land/std@$STD_VERSION/testing/diff.ts
 Asserted! ✓
 ```
 
@@ -57,8 +57,9 @@ being run: `https://unpkg.com/liltest@0.0.5/dist/liltest.js`.
 The solution is to import and re-export your external libraries in a central
 `deps.ts` file (which serves the same purpose as Node's `package.json` file).
 For example, let's say you were using the above assertion library across a large
-project. Rather than importing `"https://deno.land/std/testing/asserts.ts"`
-everywhere, you could create a `deps.ts` file that exports the third-party code:
+project. Rather than importing
+`"https://deno.land/std@$STD_VERSION/testing/asserts.ts"` everywhere, you could
+create a `deps.ts` file that exports the third-party code:
 
 **deps.ts**
 
@@ -67,7 +68,7 @@ export {
   assert,
   assertEquals,
   assertStrContains,
-} from "https://deno.land/std/testing/asserts.ts";
+} from "https://deno.land/std@$STD_VERSION/testing/asserts.ts";
 ```
 
 And throughout the same project, you can import from the `deps.ts` and avoid
diff --git a/docs/linking_to_external_code/import_maps.md b/docs/linking_to_external_code/import_maps.md
index 21b0477e4bb539..6954019c2db395 100644
--- a/docs/linking_to_external_code/import_maps.md
+++ b/docs/linking_to_external_code/import_maps.md
@@ -21,7 +21,7 @@ Example:
 ```js
 {
    "imports": {
-      "fmt/": "https://deno.land/std@0.55.0/fmt/"
+      "fmt/": "https://deno.land/std@$STD_VERSION/fmt/"
    }
 }
 ```
@@ -40,7 +40,7 @@ Then:
 $ deno run --importmap=import_map.json --unstable color.ts
 ```
 
-To use staring directory for absolute imports:
+To use starting directory for absolute imports:
 
 ```json
 // import_map.json
diff --git a/docs/linking_to_external_code/integrity_checking.md b/docs/linking_to_external_code/integrity_checking.md
index df0774865bd802..3de2a5fca57a65 100644
--- a/docs/linking_to_external_code/integrity_checking.md
+++ b/docs/linking_to_external_code/integrity_checking.md
@@ -25,9 +25,9 @@ dependency:
 
 ```json
 {
-  "https://deno.land/std@v0.50.0/textproto/mod.ts": "3118d7a42c03c242c5a49c2ad91c8396110e14acca1324e7aaefd31a999b71a4",
-  "https://deno.land/std@v0.50.0/io/util.ts": "ae133d310a0fdcf298cea7bc09a599c49acb616d34e148e263bcb02976f80dee",
-  "https://deno.land/std@v0.50.0/async/delay.ts": "35957d585a6e3dd87706858fb1d6b551cb278271b03f52c5a2cb70e65e00c26a",
+  "https://deno.land/std@$STD_VERSION/textproto/mod.ts": "3118d7a42c03c242c5a49c2ad91c8396110e14acca1324e7aaefd31a999b71a4",
+  "https://deno.land/std@$STD_VERSION/io/util.ts": "ae133d310a0fdcf298cea7bc09a599c49acb616d34e148e263bcb02976f80dee",
+  "https://deno.land/std@$STD_VERSION/async/delay.ts": "35957d585a6e3dd87706858fb1d6b551cb278271b03f52c5a2cb70e65e00c26a",
    ...
 }
 ```
diff --git a/docs/linking_to_external_code/reloading_modules.md b/docs/linking_to_external_code/reloading_modules.md
index 136107a6346b0b..e96cfb0aa47ec1 100644
--- a/docs/linking_to_external_code/reloading_modules.md
+++ b/docs/linking_to_external_code/reloading_modules.md
@@ -17,17 +17,17 @@ deno cache --reload my_module.ts
 Sometimes we want to upgrade only some modules. You can control it by passing an
 argument to a `--reload` flag.
 
-To reload all v0.55.0 standard modules
+To reload all \$STD_VERSION standard modules
 
 ```ts
-deno cache --reload=https://deno.land/std@v0.55.0 my_module.ts
+deno cache --reload=https://deno.land/std@$STD_VERSION my_module.ts
 ```
 
 To reload specific modules (in this example - colors and file system copy) use a
 comma to separate URLs
 
 ```ts
-deno cache --reload=https://deno.land/std/fs/copy.ts,https://deno.land/std/fmt/colors.ts my_module.ts
+deno cache --reload=https://deno.land/std@$STD_VERSION/fs/copy.ts,https://deno.land/std@$STD_VERSION/fmt/colors.ts my_module.ts
 ```
 
 <!-- Should this be part of examples? -->
diff --git a/docs/runtime.md b/docs/runtime.md
index 50cca6def8adb6..f035d75b44d13b 100644
--- a/docs/runtime.md
+++ b/docs/runtime.md
@@ -10,19 +10,19 @@ For APIs where a web standard already exists, like `fetch` for HTTP requests,
 Deno uses these rather than inventing a new proprietary API.
 
 The detailed documentation for implemented Web APIs can be found on
-[doc.deno.land](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/js/lib.deno.shared_globals.d.ts).
+[doc.deno.land](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/dts/lib.deno.shared_globals.d.ts).
 Additionally, a full list of the Web APIs which Deno implements is also
 available
-[in the repository](https://github.com/denoland/deno/blob/master/cli/js/web/README.md).
+[in the repository](https://github.com/denoland/deno/blob/master/cli/rt/README.md).
 
 The TypeScript definitions for the implemented web APIs can be found in the
-[`lib.deno.shared_globals.d.ts`](https://github.com/denoland/deno/blob/master/cli/js/lib.deno.shared_globals.d.ts)
+[`lib.deno.shared_globals.d.ts`](https://github.com/denoland/deno/blob/master/cli/dts/lib.deno.shared_globals.d.ts)
 and
-[`lib.deno.window.d.ts`](https://github.com/denoland/deno/blob/master/cli/js/lib.deno.window.d.ts)
+[`lib.deno.window.d.ts`](https://github.com/denoland/deno/blob/master/cli/dts/lib.deno.window.d.ts)
 files.
 
 Definitions that are specific to workers can be found in the
-[`lib.deno.worker.d.ts`](https://github.com/denoland/deno/blob/master/cli/js/lib.deno.worker.d.ts)
+[`lib.deno.worker.d.ts`](https://github.com/denoland/deno/blob/master/cli/dts/lib.deno.worker.d.ts)
 file.
 
 ## `Deno` global
@@ -32,8 +32,8 @@ It has the APIs for reading from files, opening TCP sockets, and executing
 subprocesses, etc.
 
 The TypeScript definitions for the Deno namespaces can be found in the
-[`lib.deno.ns.d.ts`](https://github.com/denoland/deno/blob/master/cli/js/lib.deno.ns.d.ts)
+[`lib.deno.ns.d.ts`](https://github.com/denoland/deno/blob/master/cli/dts/lib.deno.ns.d.ts)
 file.
 
 The documentation for all of the Deno specific APIs can be found on
-[doc.deno.land](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/js/lib.deno.ns.d.ts).
+[doc.deno.land](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/dts/lib.deno.ns.d.ts).
diff --git a/docs/runtime/compiler_apis.md b/docs/runtime/compiler_apis.md
index 31d0af2d14c0f2..3424c2b5fda7ac 100644
--- a/docs/runtime/compiler_apis.md
+++ b/docs/runtime/compiler_apis.md
@@ -1,7 +1,7 @@
-## Compiler API
+## Compiler APIs
 
-> This is an unstable Deno feature. Learn more about
-> [unstable features](./stability.md).
+> This API is unstable. Learn more about
+> [unstable features](../runtime/stability.md).
 
 Deno supports runtime access to the built-in TypeScript compiler. There are
 three methods in the `Deno` namespace that provide this access.
@@ -48,7 +48,7 @@ could do on the command line. So you could do something like this:
 
 ```ts
 const [diagnostics, emitMap] = await Deno.compile(
-  "https://deno.land/std/examples/welcome.ts",
+  "https://deno.land/std@$STD_VERSION/examples/welcome.ts",
 );
 ```
 
@@ -95,7 +95,7 @@ could do on the command line. So you could do something like this:
 
 ```ts
 const [diagnostics, emit] = await Deno.bundle(
-  "https://deno.land/std/http/server.ts",
+  "https://deno.land/std@$STD_VERSION/http/server.ts",
 );
 ```
 
@@ -202,7 +202,7 @@ errors logged as part of the compilation.
 #### Using the triple slash reference
 
 You do not have to specify the `lib` in the compiler options. Deno also supports
-[the triple-slash reference to a lib](https://www.typescriptlang.org/docs/handbook/triple-slash-directives.html#-reference-lib-).
+[the triple-slash reference to a lib](https://www.typescriptlang.org/docs/handbook/triple-slash-directives.html#-reference-lib-)
 which can be embedded in the contents of the file. For example, if you have a
 `main.ts` like:
 
diff --git a/docs/runtime/permission_apis.md b/docs/runtime/permission_apis.md
new file mode 100644
index 00000000000000..a76f0c0d44f743
--- /dev/null
+++ b/docs/runtime/permission_apis.md
@@ -0,0 +1,189 @@
+## Permission APIs
+
+> This API is unstable. Learn more about
+> [unstable features](../runtime/stability.md).
+
+Permissions are granted from the CLI when running the `deno` command. User code
+will often assume its own set of required permissions, but there is no guarantee
+during execution that the set of _granted_ permissions will align with this.
+
+In some cases, ensuring a fault-tolerant program requires a way to interact with
+the permission system at runtime.
+
+### Permission descriptors
+
+On the CLI, read permission for `/foo/bar` is represented as
+`--allow-read=/foo/bar`. In runtime JS, it is represented as the following:
+
+```ts
+const desc = { name: "read", path: "/foo/bar" };
+```
+
+Other examples:
+
+```ts
+// Global write permission.
+const desc1 = { name: "write" };
+
+// Write permission to `$PWD/foo/bar`.
+const desc2 = { name: "write", path: "foo/bar" };
+
+// Global net permission.
+const desc3 = { name: "net" };
+
+// Net permission to 127.0.0.1:8000.
+const desc4 = { name: "net", url: "127.0.0.1:8000" };
+
+// High-resolution time permission.
+const desc5 = { name: "hrtime" };
+```
+
+### Query permissions
+
+Check, by descriptor, if a permission is granted or not.
+
+```ts
+// deno run --unstable --allow-read=/foo main.ts
+
+const desc1 = { name: "read", path: "/foo" };
+console.log(await Deno.permissions.query(desc1));
+// PermissionStatus { state: "granted" }
+
+const desc2 = { name: "read", path: "/foo/bar" };
+console.log(await Deno.permissions.query(desc2));
+// PermissionStatus { state: "granted" }
+
+const desc3 = { name: "read", path: "/bar" };
+console.log(await Deno.permissions.query(desc3));
+// PermissionStatus { state: "prompt" }
+```
+
+### Permission states
+
+A permission state can be either "granted", "prompt" or "denied". Permissions
+which have been granted from the CLI will query to `{ state: "granted" }`. Those
+which have not been granted query to `{ state: "prompt" }` by default, while
+`{ state: "denied" }` reserved for those which have been explicitly refused.
+This will come up in [Request permissions](#request-permissions).
+
+### Permission strength
+
+The intuitive understanding behind the result of the second query in
+[Query permissions](#query-permissions) is that read access was granted to
+`/foo` and `/foo/bar` is within `/foo` so `/foo/bar` is allowed to be read.
+
+We can also say that `desc1` is
+_[stronger than](https://www.w3.org/TR/permissions/#ref-for-permissiondescriptor-stronger-than)_
+`desc2`. This means that for any set of CLI-granted permissions:
+
+1. If `desc1` queries to `{ state: "granted" }` then so must `desc2`.
+2. If `desc2` queries to `{ state: "denied" }` then so must `desc1`.
+
+More examples:
+
+```ts
+const desc1 = { name: "write" };
+// is stronger than
+const desc2 = { name: "write", path: "/foo" };
+
+const desc3 = { name: "net" };
+// is stronger than
+const desc4 = { name: "net", url: "127.0.0.1:8000" };
+```
+
+### Request permissions
+
+Request an ungranted permission from the user via CLI prompt.
+
+```ts
+// deno run --unstable main.ts
+
+const desc1 = { name: "read", path: "/foo" };
+const status1 = await Deno.permissions.request(desc1);
+// ⚠️ Deno requests read access to "/foo". Grant? [g/d (g = grant, d = deny)] g
+console.log(status1);
+// PermissionStatus { state: "granted" }
+
+const desc2 = { name: "read", path: "/bar" };
+const status2 = await Deno.permissions.request(desc2);
+// ⚠️ Deno requests read access to "/bar". Grant? [g/d (g = grant, d = deny)] d
+console.log(status2);
+// PermissionStatus { state: "denied" }
+```
+
+If the current permission state is "prompt", a prompt will appear on the user's
+terminal asking them if they would like to grant the request. The request for
+`desc1` was granted so its new status is returned and execution will continue as
+if `--allow-read=/foo` was specified on the CLI. The request for `desc2` was
+denied so its permission state is downgraded from "prompt" to "denied".
+
+If the current permission state is already either "granted" or "denied", the
+request will behave like a query and just return the current status. This
+prevents prompts both for already granted permissions and previously denied
+requests.
+
+### Revoke permissions
+
+Downgrade a permission from "granted" to "prompt".
+
+```ts
+// deno run --unstable --allow-read=/foo main.ts
+
+const desc = { name: "read", path: "/foo" };
+console.log(await Deno.permissions.revoke(desc));
+// PermissionStatus { state: "prompt" }
+```
+
+However, what happens when you try to revoke a permission which is _partial_ to
+one granted on the CLI?
+
+```ts
+// deno run --unstable --allow-read=/foo main.ts
+
+const desc = { name: "read", path: "/foo/bar" };
+console.log(await Deno.permissions.revoke(desc));
+// PermissionStatus { state: "granted" }
+```
+
+It was not revoked.
+
+To understand this behaviour, imagine that Deno stores an internal set of
+_explicitly granted permission descriptors_. Specifying `--allow-read=/foo,/bar`
+on the CLI initializes this set to:
+
+```ts
+[
+  { name: "read", path: "/foo" },
+  { name: "read", path: "/bar" },
+];
+```
+
+Granting a runtime request for `{ name: "write", path: "/foo" }` updates the set
+to:
+
+```ts
+[
+  { name: "read", path: "/foo" },
+  { name: "read", path: "/bar" },
+  { name: "write", path: "/foo" },
+];
+```
+
+Deno's permission revocation algorithm works by removing every element from this
+set which the argument permission descriptor is _stronger than_. So to ensure
+`desc` is not longer granted, pass an argument descriptor _stronger than_
+whichever _explicitly granted permission descriptor_ is _stronger than_ `desc`.
+
+```ts
+// deno run --unstable --allow-read=/foo main.ts
+
+const desc = { name: "read", path: "/foo/bar" };
+console.log(await Deno.permissions.revoke(desc)); // Insufficient.
+// PermissionStatus { state: "granted" }
+
+const strongDesc = { name: "read", path: "/foo" };
+await Deno.permissions.revoke(strongDesc); // Good.
+
+console.log(await Deno.permissions.query(desc));
+// PermissionStatus { state: "prompt" }
+```
diff --git a/docs/runtime/stability.md b/docs/runtime/stability.md
index 298a788d4605c0..6bb60ae5c0db3f 100644
--- a/docs/runtime/stability.md
+++ b/docs/runtime/stability.md
@@ -15,7 +15,7 @@ Passing this flag does a few things:
 
 - It enables the use of unstable APIs during runtime.
 - It adds the
-  [`lib.deno.unstable.d.ts`](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/js/lib.deno.unstable.d.ts)
+  [`lib.deno.unstable.d.ts`](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/dts/lib.deno.unstable.d.ts)
   file to the list of TypeScript definitions that are used for type checking.
   This includes the output of `deno types`.
 
diff --git a/docs/standard_library.md b/docs/standard_library.md
index fd1a5e8e8c4cdd..ada5b36e7b7f3d 100644
--- a/docs/standard_library.md
+++ b/docs/standard_library.md
@@ -27,7 +27,7 @@ change:
 
 ```typescript
 // imports from v0.50.0 of std, never changes
-import { copy } from "https://deno.land/std@0.50.0/fs/copy.ts";
+import { copy } from "https://deno.land/std@$STD_VERSION/fs/copy.ts";
 ```
 
 ## Troubleshooting
@@ -40,7 +40,7 @@ exist:
 
 ```typescript
 // main.ts
-import { copy } from "https://deno.land/std@0.50.0/fs/copy.ts";
+import { copy } from "https://deno.land/std@$STD_VERSION/fs/copy.ts";
 
 copy("log.txt", "log-old.txt");
 ```
@@ -48,18 +48,18 @@ copy("log.txt", "log-old.txt");
 ```shell
 $ deno run --allow-read --allow-write main.ts
 Compile file:///dev/deno/main.ts
-Download https://deno.land/std@0.50.0/fs/copy.ts
-Download https://deno.land/std@0.50.0/fs/ensure_dir.ts
-Download https://deno.land/std@0.50.0/fs/_util.ts
+Download https://deno.land/std@$STD_VERSION/fs/copy.ts
+Download https://deno.land/std@$STD_VERSION/fs/ensure_dir.ts
+Download https://deno.land/std@$STD_VERSION/fs/_util.ts
 error: TS2339 [ERROR]: Property 'utime' does not exist on type 'typeof Deno'.
     await Deno.utime(dest, statInfo.atime, statInfo.mtime);
                ~~~~~
-    at https://deno.land/std@0.50.0/fs/copy.ts:90:16
+    at https://deno.land/std@$STD_VERSION/fs/copy.ts:90:16
 
 TS2339 [ERROR]: Property 'utimeSync' does not exist on type 'typeof Deno'.
     Deno.utimeSync(dest, statInfo.atime, statInfo.mtime);
          ~~~~~~~~~
-    at https://deno.land/std@0.50.0/fs/copy.ts:101:10
+    at https://deno.land/std@$STD_VERSION/fs/copy.ts:101:10
 ```
 
 Solution to that problem requires adding `--unstable` flag:
@@ -69,7 +69,7 @@ deno run --allow-read --allow-write --unstable main.ts
 ```
 
 To make sure that API producing error is unstable check
-[`lib.deno.unstable.d.ts`](https://github.com/denoland/deno/blob/master/cli/js/lib.deno.unstable.d.ts)
+[`lib.deno.unstable.d.ts`](https://github.com/denoland/deno/blob/master/cli/dts/lib.deno.unstable.d.ts)
 declaration.
 
 This problem should be fixed in the near future. Feel free to omit the flag if
diff --git a/docs/testing.md b/docs/testing.md
index c71de1113899b8..bb2790670196e2 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -27,14 +27,14 @@ Deno.test({
 
 ## Assertions
 
-There are some useful assertion utilities at https://deno.land/std/testing#usage
-to make testing easier:
+There are some useful assertion utilities at
+https://deno.land/std@$STD_VERSION/testing#usage to make testing easier:
 
 ```ts
 import {
   assertEquals,
   assertArrayContains,
-} from "https://deno.land/std/testing/asserts.ts";
+} from "https://deno.land/std@$STD_VERSION/testing/asserts.ts";
 
 Deno.test("hello world", () => {
   const x = 1 + 2;
@@ -49,7 +49,7 @@ You can also test asynchronous code by passing a test function that returns a
 promise. For this you can use the `async` keyword when defining a function:
 
 ```ts
-import { delay } from "https://deno.land/std/async/delay.ts";
+import { delay } from "https://deno.land/std@$STD_VERSION/async/delay.ts";
 
 Deno.test("async hello world", async () => {
   const x = 1 + 2;
@@ -99,7 +99,7 @@ current directory (recursively) that match the glob
 files in the directory that match this glob will be run.
 
 ```shell
-# Run all tests in the current directly and all sub-directories
+# Run all tests in the current directory and all sub-directories
 deno test
 
 # Run all tests in the util directory
diff --git a/docs/testing/assertions.md b/docs/testing/assertions.md
index b8874a0e9faef0..9016ddf48dcfe9 100644
--- a/docs/testing/assertions.md
+++ b/docs/testing/assertions.md
@@ -1,11 +1,11 @@
 ## Assertions
 
 To help developers write tests the Deno standard library comes with a built in
-[assertions module](https://deno.land/std/testing/asserts.ts) which can be
-imported from `https://deno.land/std/testing/asserts.ts`.
+[assertions module](https://deno.land/std@$STD_VERSION/testing/asserts.ts) which
+can be imported from `https://deno.land/std@$STD_VERSION/testing/asserts.ts`.
 
 ```js
-import { assert } from "https://deno.land/std/testing/asserts.ts";
+import { assert } from "https://deno.land/std@$STD_VERSION/testing/asserts.ts";
 
 Deno.test("Hello Test", () => {
   assert("Hello");
diff --git a/docs/toc.json b/docs/toc.json
index e902720d02bc87..2df5be811a71f6 100644
--- a/docs/toc.json
+++ b/docs/toc.json
@@ -19,6 +19,7 @@
     "children": {
       "stability": "Stability",
       "program_lifecycle": "Program lifecycle",
+      "permission_apis": "Permission APIs",
       "compiler_apis": "Compiler APIs",
       "workers": "Workers"
     }
@@ -68,11 +69,13 @@
   "examples": {
     "name": "Examples",
     "children": {
+      "hello_world": "Hello World",
+      "import_export": "Import and Export Modules",
+      "manage_dependencies": "Manage Dependencies",
       "unix_cat": "Unix cat program",
       "file_server": "File server",
       "tcp_echo": "TCP echo server",
       "subprocess": "Creating a subprocess",
-      "permissions": "Inspecting and revoking permissions",
       "os_signals": "OS Signals",
       "file_system_events": "File system events",
       "testing_if_main": "Checking if file is main"
diff --git a/docs/tools/bundler.md b/docs/tools/bundler.md
index 72a492132abfd4..292adb5f42b184 100644
--- a/docs/tools/bundler.md
+++ b/docs/tools/bundler.md
@@ -4,7 +4,7 @@
 dependencies of the specified input. For example:
 
 ```
-> deno bundle https://deno.land/std/examples/colors.ts colors.bundle.js
+> deno bundle https://deno.land/std@$STD_VERSION/examples/colors.ts colors.bundle.js
 Bundling "colors.bundle.js"
 Emitting bundle to "colors.bundle.js"
 9.2 kB emitted.
diff --git a/docs/tools/debugger.md b/docs/tools/debugger.md
index 0edbfe8a68557b..2a4c7f0d8141a9 100644
--- a/docs/tools/debugger.md
+++ b/docs/tools/debugger.md
@@ -15,16 +15,16 @@ the first line of code.
 ### Chrome Devtools
 
 Let's try debugging a program using Chrome Devtools. For this, we'll use
-[file_server.ts](https://deno.land/std@v0.50.0/http/file_server.ts) from `std`,
-a static file server.
+[file_server.ts](https://deno.land/std@$STD_VERSION/http/file_server.ts) from
+`std`, a static file server.
 
 Use the `--inspect-brk` flag to break execution on the first line:
 
 ```shell
-$ deno run --inspect-brk --allow-read --allow-net https://deno.land/std@v0.50.0/http/file_server.ts
+$ deno run --inspect-brk --allow-read --allow-net https://deno.land/std@$STD_VERSION/http/file_server.ts
 Debugger listening on ws://127.0.0.1:9229/ws/1e82c406-85a9-44ab-86b6-7341583480b1
-Download https://deno.land/std@v0.50.0/http/file_server.ts
-Compile https://deno.land/std@v0.50.0/http/file_server.ts
+Download https://deno.land/std@$STD_VERSION/http/file_server.ts
+Compile https://deno.land/std@$STD_VERSION/http/file_server.ts
 ...
 ```
 
@@ -32,7 +32,7 @@ Open `chrome://inspect` and click `Inspect` next to target:
 
 ![chrome://inspect](../images/debugger1.jpg)
 
-It might take a few seconds after opening the devtools to load all modules.
+It might take a few seconds after opening the Devtools to load all modules.
 
 ![Devtools opened](../images/debugger2.jpg)
 
@@ -93,12 +93,12 @@ config:
   "configurations": [
     {
       "name": "Deno",
-      "type": "node",
+      "type": "pwa-node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
       "runtimeExecutable": "deno",
       "runtimeArgs": ["run", "--inspect-brk", "-A", "${file}"],
-      "port": 9229
+      "attachSimplePort": 9229
     }
   ]
 }
@@ -110,7 +110,7 @@ with a script name if you want a fixed entry point.
 Let's try out debugging a local source file. Create `server.ts`:
 
 ```ts
-import { serve } from "https://deno.land/std@v0.50.0/http/server.ts";
+import { serve } from "https://deno.land/std@$STD_VERSION/http/server.ts";
 const server = serve({ port: 8000 });
 console.log("http://localhost:8000/");
 
diff --git a/docs/tools/linter.md b/docs/tools/linter.md
index 96c9c1b4e330f3..684da4a14e8032 100644
--- a/docs/tools/linter.md
+++ b/docs/tools/linter.md
@@ -62,7 +62,7 @@ deno lint --unstable myfile1.ts myfile2.ts
 #### Files
 
 To ignore whole file `// deno-lint-ignore-file` directive should placed at the
-top of the file.
+top of the file:
 
 ```ts
 // deno-lint-ignore-file
@@ -93,7 +93,7 @@ function foo(): any {
 #### Diagnostics
 
 To ignore certain diagnostic `// deno-lint-ignore <codes...>` directive should
-be placed before offending line. Specifying ignored rule name is required.
+be placed before offending line. Specifying ignored rule name is required:
 
 ```ts
 // deno-lint-ignore no-explicit-any
@@ -108,8 +108,8 @@ function bar(a: any) {
 ```
 
 To provide some compatibility with ESLint `deno lint` also supports
-`// eslint-ignore-next-line` directive. Just like in `// deno-lint-ignore` it's
-required to specify ignored rule name is required.
+`// eslint-ignore-next-line` directive. Just like with `// deno-lint-ignore`,
+it's required to specify the ignored rule name:
 
 ```ts
 // eslint-ignore-next-line no-empty
diff --git a/docs/tools/script_installer.md b/docs/tools/script_installer.md
index 68db10d61978a1..e588a39d6e4c9a 100644
--- a/docs/tools/script_installer.md
+++ b/docs/tools/script_installer.md
@@ -12,8 +12,8 @@ the specified CLI flags and main module. It is placed in the installation root's
 Example:
 
 ```shell
-$ deno install --allow-net --allow-read https://deno.land/std/http/file_server.ts
-[1/1] Compiling https://deno.land/std/http/file_server.ts
+$ deno install --allow-net --allow-read https://deno.land/std@$STD_VERSION/http/file_server.ts
+[1/1] Compiling https://deno.land/std@$STD_VERSION/http/file_server.ts
 
 ✅ Successfully installed file_server.
 /Users/deno/.deno/bin/file_server
@@ -22,7 +22,7 @@ $ deno install --allow-net --allow-read https://deno.land/std/http/file_server.t
 To change the executable name, use `-n`/`--name`:
 
 ```shell
-deno install --allow-net --allow-read -n serve https://deno.land/std/http/file_server.ts
+deno install --allow-net --allow-read -n serve https://deno.land/std@$STD_VERSION/http/file_server.ts
 ```
 
 The executable name is inferred by default:
@@ -36,7 +36,7 @@ The executable name is inferred by default:
 To change the installation root, use `--root`:
 
 ```shell
-deno install --allow-net --allow-read --root /usr/local https://deno.land/std/http/file_server.ts
+deno install --allow-net --allow-read --root /usr/local https://deno.land/std@$STD_VERSION/http/file_server.ts
 ```
 
 The installation root is determined, in order of precedence:
@@ -55,7 +55,7 @@ You must specify permissions that will be used to run the script at installation
 time.
 
 ```shell
-deno install --allow-net --allow-read https://deno.land/std/http/file_server.ts -p 8080
+deno install --allow-net --allow-read https://deno.land/std@$STD_VERSION/http/file_server.ts -p 8080
 ```
 
 The above command creates an executable called `file_server` that runs with
diff --git a/cli/js2/00_dom_exception.js b/op_crates/web/00_dom_exception.js
similarity index 100%
rename from cli/js2/00_dom_exception.js
rename to op_crates/web/00_dom_exception.js
diff --git a/cli/tsc/01_event.js b/op_crates/web/01_event.js
similarity index 98%
rename from cli/tsc/01_event.js
rename to op_crates/web/01_event.js
index 35967e0a16ae60..48899e6fd8c98d 100644
--- a/cli/tsc/01_event.js
+++ b/op_crates/web/01_event.js
@@ -1038,6 +1038,10 @@
   window.EventTarget = EventTarget;
   window.ErrorEvent = ErrorEvent;
   window.CustomEvent = CustomEvent;
+  window.dispatchEvent = EventTarget.prototype.dispatchEvent;
+  window.addEventListener = EventTarget.prototype.addEventListener;
+  window.removeEventListener = EventTarget.prototype.removeEventListener;
+  window.__bootstrap = (window.__bootstrap || {});
   window.__bootstrap.eventTarget = {
     setEventTargetData,
   };
diff --git a/cli/js2/02_abort_signal.js b/op_crates/web/02_abort_signal.js
similarity index 91%
rename from cli/js2/02_abort_signal.js
rename to op_crates/web/02_abort_signal.js
index cd38fff640ea11..908e85ac97a4c0 100644
--- a/cli/js2/02_abort_signal.js
+++ b/op_crates/web/02_abort_signal.js
@@ -65,11 +65,12 @@
     }
   }
 
+  window.AbortSignal = AbortSignal;
+  window.AbortController = AbortController;
+  window.__bootstrap = window.__bootstrap || {};
   window.__bootstrap.abortSignal = {
-    AbortSignal,
     add,
     signalAbort,
     remove,
-    AbortController,
   };
 })(this);
diff --git a/cli/js2/08_text_encoding.js b/op_crates/web/08_text_encoding.js
similarity index 78%
rename from cli/js2/08_text_encoding.js
rename to op_crates/web/08_text_encoding.js
index f1242964140bad..e938eecd1e9415 100644
--- a/cli/js2/08_text_encoding.js
+++ b/op_crates/web/08_text_encoding.js
@@ -26,7 +26,6 @@
 
 ((window) => {
   const core = Deno.core;
-  const base64 = window.__base64;
 
   const CONTINUE = null;
   const END_OF_STREAM = -1;
@@ -396,7 +395,8 @@
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function isEitherArrayBuffer(x) {
-    return x instanceof SharedArrayBuffer || x instanceof ArrayBuffer;
+    return x instanceof SharedArrayBuffer || x instanceof ArrayBuffer ||
+      typeof x === "undefined";
   }
 
   class TextDecoder {
@@ -443,6 +443,7 @@
         bytes = new Uint8Array(input);
       } else if (
         typeof input === "object" &&
+        input !== null &&
         "buffer" in input &&
         isEitherArrayBuffer(input.buffer)
       ) {
@@ -452,7 +453,9 @@
           input.byteLength,
         );
       } else {
-        bytes = new Uint8Array(0);
+        throw new TypeError(
+          "Provided input is not of type ArrayBuffer or ArrayBufferView",
+        );
       }
 
       // For simple utf-8 decoding "Deno.core.decode" can be used for performance
@@ -679,8 +682,163 @@
     return outString;
   }
 
+  // Following code is forked from https://github.com/beatgammit/base64-js
+  // Copyright (c) 2014 Jameson Little. MIT License.
+  const lookup = [];
+  const revLookup = [];
+
+  const code =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  for (let i = 0, len = code.length; i < len; ++i) {
+    lookup[i] = code[i];
+    revLookup[code.charCodeAt(i)] = i;
+  }
+
+  // Support decoding URL-safe base64 strings, as Node.js does.
+  // See: https://en.wikipedia.org/wiki/Base64#URL_applications
+  revLookup["-".charCodeAt(0)] = 62;
+  revLookup["_".charCodeAt(0)] = 63;
+
+  function getLens(b64) {
+    const len = b64.length;
+
+    if (len % 4 > 0) {
+      throw new Error("Invalid string. Length must be a multiple of 4");
+    }
+
+    // Trim off extra bytes after placeholder bytes are found
+    // See: https://github.com/beatgammit/base64-js/issues/42
+    let validLen = b64.indexOf("=");
+    if (validLen === -1) validLen = len;
+
+    const placeHoldersLen = validLen === len ? 0 : 4 - (validLen % 4);
+
+    return [validLen, placeHoldersLen];
+  }
+
+  // base64 is 4/3 + up to two characters of the original data
+  function byteLength(b64) {
+    const lens = getLens(b64);
+    const validLen = lens[0];
+    const placeHoldersLen = lens[1];
+    return ((validLen + placeHoldersLen) * 3) / 4 - placeHoldersLen;
+  }
+
+  function _byteLength(
+    b64,
+    validLen,
+    placeHoldersLen,
+  ) {
+    return ((validLen + placeHoldersLen) * 3) / 4 - placeHoldersLen;
+  }
+
+  function toByteArray(b64) {
+    let tmp;
+    const lens = getLens(b64);
+    const validLen = lens[0];
+    const placeHoldersLen = lens[1];
+
+    const arr = new Uint8Array(_byteLength(b64, validLen, placeHoldersLen));
+
+    let curByte = 0;
+
+    // if there are placeholders, only get up to the last complete 4 chars
+    const len = placeHoldersLen > 0 ? validLen - 4 : validLen;
+
+    let i;
+    for (i = 0; i < len; i += 4) {
+      tmp = (revLookup[b64.charCodeAt(i)] << 18) |
+        (revLookup[b64.charCodeAt(i + 1)] << 12) |
+        (revLookup[b64.charCodeAt(i + 2)] << 6) |
+        revLookup[b64.charCodeAt(i + 3)];
+      arr[curByte++] = (tmp >> 16) & 0xff;
+      arr[curByte++] = (tmp >> 8) & 0xff;
+      arr[curByte++] = tmp & 0xff;
+    }
+
+    if (placeHoldersLen === 2) {
+      tmp = (revLookup[b64.charCodeAt(i)] << 2) |
+        (revLookup[b64.charCodeAt(i + 1)] >> 4);
+      arr[curByte++] = tmp & 0xff;
+    }
+
+    if (placeHoldersLen === 1) {
+      tmp = (revLookup[b64.charCodeAt(i)] << 10) |
+        (revLookup[b64.charCodeAt(i + 1)] << 4) |
+        (revLookup[b64.charCodeAt(i + 2)] >> 2);
+      arr[curByte++] = (tmp >> 8) & 0xff;
+      arr[curByte++] = tmp & 0xff;
+    }
+
+    return arr;
+  }
+
+  function tripletToBase64(num) {
+    return (
+      lookup[(num >> 18) & 0x3f] +
+      lookup[(num >> 12) & 0x3f] +
+      lookup[(num >> 6) & 0x3f] +
+      lookup[num & 0x3f]
+    );
+  }
+
+  function encodeChunk(uint8, start, end) {
+    let tmp;
+    const output = [];
+    for (let i = start; i < end; i += 3) {
+      tmp = ((uint8[i] << 16) & 0xff0000) +
+        ((uint8[i + 1] << 8) & 0xff00) +
+        (uint8[i + 2] & 0xff);
+      output.push(tripletToBase64(tmp));
+    }
+    return output.join("");
+  }
+
+  function fromByteArray(uint8) {
+    let tmp;
+    const len = uint8.length;
+    const extraBytes = len % 3; // if we have 1 byte left, pad 2 bytes
+    const parts = [];
+    const maxChunkLength = 16383; // must be multiple of 3
+
+    // go through the array every three bytes, we'll deal with trailing stuff later
+    for (let i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
+      parts.push(
+        encodeChunk(
+          uint8,
+          i,
+          i + maxChunkLength > len2 ? len2 : i + maxChunkLength,
+        ),
+      );
+    }
+
+    // pad the end with zeros, but make sure to not forget the extra bytes
+    if (extraBytes === 1) {
+      tmp = uint8[len - 1];
+      parts.push(lookup[tmp >> 2] + lookup[(tmp << 4) & 0x3f] + "==");
+    } else if (extraBytes === 2) {
+      tmp = (uint8[len - 2] << 8) + uint8[len - 1];
+      parts.push(
+        lookup[tmp >> 10] +
+          lookup[(tmp >> 4) & 0x3f] +
+          lookup[(tmp << 2) & 0x3f] +
+          "=",
+      );
+    }
+
+    return parts.join("");
+  }
+
+  const base64 = {
+    byteLength,
+    toByteArray,
+    fromByteArray,
+  };
+
   window.TextEncoder = TextEncoder;
   window.TextDecoder = TextDecoder;
   window.atob = atob;
   window.btoa = btoa;
+  window.__bootstrap = (window.__bootstrap || {});
+  window.__bootstrap.base64 = base64;
 })(this);
diff --git a/op_crates/web/Cargo.toml b/op_crates/web/Cargo.toml
new file mode 100644
index 00000000000000..7d5ca6c2e6b025
--- /dev/null
+++ b/op_crates/web/Cargo.toml
@@ -0,0 +1,20 @@
+# Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+
+[package]
+name = "deno_web"
+version = "0.4.0"
+edition = "2018"
+description = "Collection of Web APIs"
+authors = ["the Deno authors"]
+license = "MIT"
+readme = "README.md"
+repository = "https://github.com/denoland/deno"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+deno_core = { version = "0.54.0", path = "../../core" }
+
+[dev-dependencies]
+futures = "0.3.5"
diff --git a/op_crates/web/README.md b/op_crates/web/README.md
new file mode 100644
index 00000000000000..3ad8d43d89d904
--- /dev/null
+++ b/op_crates/web/README.md
@@ -0,0 +1,3 @@
+# deno web
+
+Op crate that implements Event, TextEncoder, TextDecoder
diff --git a/op_crates/web/abort_controller_test.js b/op_crates/web/abort_controller_test.js
new file mode 100644
index 00000000000000..a2fb12c65e051a
--- /dev/null
+++ b/op_crates/web/abort_controller_test.js
@@ -0,0 +1,75 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+function assert(cond) {
+  if (!cond) {
+    throw Error("assert");
+  }
+}
+
+function assertEquals(left, right) {
+  assert(left === right);
+}
+
+function basicAbortController() {
+  controller = new AbortController();
+  assert(controller);
+  const { signal } = controller;
+  assert(signal);
+  assertEquals(signal.aborted, false);
+  controller.abort();
+  assertEquals(signal.aborted, true);
+}
+
+function signalCallsOnabort() {
+  const controller = new AbortController();
+  const { signal } = controller;
+  let called = false;
+  signal.onabort = (evt) => {
+    assert(evt);
+    assertEquals(evt.type, "abort");
+    called = true;
+  };
+  controller.abort();
+  assert(called);
+}
+
+function signalEventListener() {
+  const controller = new AbortController();
+  const { signal } = controller;
+  let called = false;
+  signal.addEventListener("abort", function (ev) {
+    assert(this === signal);
+    assertEquals(ev.type, "abort");
+    called = true;
+  });
+  controller.abort();
+  assert(called);
+}
+
+function onlyAbortsOnce() {
+  const controller = new AbortController();
+  const { signal } = controller;
+  let called = 0;
+  signal.addEventListener("abort", () => called++);
+  signal.onabort = () => {
+    called++;
+  };
+  controller.abort();
+  assertEquals(called, 2);
+  controller.abort();
+  assertEquals(called, 2);
+}
+
+function controllerHasProperToString() {
+  const actual = Object.prototype.toString.call(new AbortController());
+  assertEquals(actual, "[object AbortController]");
+}
+
+function main() {
+  basicAbortController();
+  signalCallsOnabort();
+  signalEventListener();
+  onlyAbortsOnce();
+  controllerHasProperToString();
+}
+
+main();
diff --git a/op_crates/web/event_target_test.js b/op_crates/web/event_target_test.js
new file mode 100644
index 00000000000000..5e86c6efb47593
--- /dev/null
+++ b/op_crates/web/event_target_test.js
@@ -0,0 +1,244 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+function assert(cond) {
+  if (!cond) {
+    throw Error("assert");
+  }
+}
+
+function addEventListenerTest() {
+  const document = new EventTarget();
+
+  assert(document.addEventListener("x", null, false) === undefined);
+  assert(document.addEventListener("x", null, true) === undefined);
+  assert(document.addEventListener("x", null) === undefined);
+}
+
+function constructedEventTargetCanBeUsedAsExpected() {
+  const target = new EventTarget();
+  const event = new Event("foo", { bubbles: true, cancelable: false });
+  let callCount = 0;
+
+  const listener = (e) => {
+    assert(e === event);
+    ++callCount;
+  };
+
+  target.addEventListener("foo", listener);
+
+  target.dispatchEvent(event);
+  assert(callCount === 1);
+
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+
+  target.removeEventListener("foo", listener);
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+}
+
+function anEventTargetCanBeSubclassed() {
+  class NicerEventTarget extends EventTarget {
+    on(
+      type,
+      callback,
+      options,
+    ) {
+      this.addEventListener(type, callback, options);
+    }
+
+    off(
+      type,
+      callback,
+      options,
+    ) {
+      this.removeEventListener(type, callback, options);
+    }
+  }
+
+  const target = new NicerEventTarget();
+  new Event("foo", { bubbles: true, cancelable: false });
+  let callCount = 0;
+
+  const listener = () => {
+    ++callCount;
+  };
+
+  target.on("foo", listener);
+  assert(callCount === 0);
+
+  target.off("foo", listener);
+  assert(callCount === 0);
+}
+
+function removingNullEventListenerShouldSucceed() {
+  const document = new EventTarget();
+  assert(document.removeEventListener("x", null, false) === undefined);
+  assert(document.removeEventListener("x", null, true) === undefined);
+  assert(document.removeEventListener("x", null) === undefined);
+}
+
+function constructedEventTargetUseObjectPrototype() {
+  const target = new EventTarget();
+  const event = new Event("toString", { bubbles: true, cancelable: false });
+  let callCount = 0;
+
+  const listener = (e) => {
+    assert(e === event);
+    ++callCount;
+  };
+
+  target.addEventListener("toString", listener);
+
+  target.dispatchEvent(event);
+  assert(callCount === 1);
+
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+
+  target.removeEventListener("toString", listener);
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+}
+
+function toStringShouldBeWebCompatible() {
+  const target = new EventTarget();
+  assert(target.toString() === "[object EventTarget]");
+}
+
+function dispatchEventShouldNotThrowError() {
+  let hasThrown = false;
+
+  try {
+    const target = new EventTarget();
+    const event = new Event("hasOwnProperty", {
+      bubbles: true,
+      cancelable: false,
+    });
+    const listener = () => {};
+    target.addEventListener("hasOwnProperty", listener);
+    target.dispatchEvent(event);
+  } catch {
+    hasThrown = true;
+  }
+
+  assert(hasThrown === false);
+}
+
+function eventTargetThisShouldDefaultToWindow() {
+  const {
+    addEventListener,
+    dispatchEvent,
+    removeEventListener,
+  } = EventTarget.prototype;
+  let n = 1;
+  const event = new Event("hello");
+  const listener = () => {
+    n = 2;
+  };
+
+  addEventListener("hello", listener);
+  globalThis.dispatchEvent(event);
+  assert(n === 2);
+  n = 1;
+  removeEventListener("hello", listener);
+  globalThis.dispatchEvent(event);
+  assert(n === 1);
+
+  globalThis.addEventListener("hello", listener);
+  dispatchEvent(event);
+  assert(n === 2);
+  n = 1;
+  globalThis.removeEventListener("hello", listener);
+  dispatchEvent(event);
+  assert(n === 1);
+}
+
+function eventTargetShouldAcceptEventListenerObject() {
+  const target = new EventTarget();
+  const event = new Event("foo", { bubbles: true, cancelable: false });
+  let callCount = 0;
+
+  const listener = {
+    handleEvent(e) {
+      assert(e === event);
+      ++callCount;
+    },
+  };
+
+  target.addEventListener("foo", listener);
+
+  target.dispatchEvent(event);
+  assert(callCount === 1);
+
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+
+  target.removeEventListener("foo", listener);
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+}
+
+function eventTargetShouldAcceptAsyncFunction() {
+  const target = new EventTarget();
+  const event = new Event("foo", { bubbles: true, cancelable: false });
+  let callCount = 0;
+
+  const listener = (e) => {
+    assert(e === event);
+    ++callCount;
+  };
+
+  target.addEventListener("foo", listener);
+
+  target.dispatchEvent(event);
+  assert(callCount === 1);
+
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+
+  target.removeEventListener("foo", listener);
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+}
+
+function eventTargetShouldAcceptAsyncFunctionForEventListenerObject() {
+  const target = new EventTarget();
+  const event = new Event("foo", { bubbles: true, cancelable: false });
+  let callCount = 0;
+
+  const listener = {
+    handleEvent(e) {
+      assert(e === event);
+      ++callCount;
+    },
+  };
+
+  target.addEventListener("foo", listener);
+
+  target.dispatchEvent(event);
+  assert(callCount === 1);
+
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+
+  target.removeEventListener("foo", listener);
+  target.dispatchEvent(event);
+  assert(callCount === 2);
+}
+
+function main() {
+  globalThis.__bootstrap.eventTarget.setEventTargetData(globalThis);
+  addEventListenerTest();
+  constructedEventTargetCanBeUsedAsExpected();
+  anEventTargetCanBeSubclassed();
+  removingNullEventListenerShouldSucceed();
+  constructedEventTargetUseObjectPrototype();
+  toStringShouldBeWebCompatible();
+  dispatchEventShouldNotThrowError();
+  eventTargetThisShouldDefaultToWindow();
+  eventTargetShouldAcceptEventListenerObject();
+  eventTargetShouldAcceptAsyncFunction();
+  eventTargetShouldAcceptAsyncFunctionForEventListenerObject();
+}
+
+main();
diff --git a/op_crates/web/event_test.js b/op_crates/web/event_test.js
new file mode 100644
index 00000000000000..4f9f94fa966083
--- /dev/null
+++ b/op_crates/web/event_test.js
@@ -0,0 +1,111 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+function assert(cond) {
+  if (!cond) {
+    throw Error("assert");
+  }
+}
+
+function eventInitializedWithType() {
+  const type = "click";
+  const event = new Event(type);
+
+  assert(event.isTrusted === false);
+  assert(event.target === null);
+  assert(event.currentTarget === null);
+  assert(event.type === "click");
+  assert(event.bubbles === false);
+  assert(event.cancelable === false);
+}
+
+function eventInitializedWithTypeAndDict() {
+  const init = "submit";
+  const eventInit = { bubbles: true, cancelable: true };
+  const event = new Event(init, eventInit);
+
+  assert(event.isTrusted === false);
+  assert(event.target === null);
+  assert(event.currentTarget === null);
+  assert(event.type === "submit");
+  assert(event.bubbles === true);
+  assert(event.cancelable === true);
+}
+
+function eventComposedPathSuccess() {
+  const type = "click";
+  const event = new Event(type);
+  const composedPath = event.composedPath();
+
+  assert(composedPath.length === 0);
+}
+
+function eventStopPropagationSuccess() {
+  const type = "click";
+  const event = new Event(type);
+
+  assert(event.cancelBubble === false);
+  event.stopPropagation();
+  assert(event.cancelBubble === true);
+}
+
+function eventStopImmediatePropagationSuccess() {
+  const type = "click";
+  const event = new Event(type);
+
+  assert(event.cancelBubble === false);
+  event.stopImmediatePropagation();
+  assert(event.cancelBubble === true);
+}
+
+function eventPreventDefaultSuccess() {
+  const type = "click";
+  const event = new Event(type);
+
+  assert(event.defaultPrevented === false);
+  event.preventDefault();
+  assert(event.defaultPrevented === false);
+
+  const eventInit = { bubbles: true, cancelable: true };
+  const cancelableEvent = new Event(type, eventInit);
+  assert(cancelableEvent.defaultPrevented === false);
+  cancelableEvent.preventDefault();
+  assert(cancelableEvent.defaultPrevented === true);
+}
+
+function eventInitializedWithNonStringType() {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const type = undefined;
+  const event = new Event(type);
+
+  assert(event.isTrusted === false);
+  assert(event.target === null);
+  assert(event.currentTarget === null);
+  assert(event.type === "undefined");
+  assert(event.bubbles === false);
+  assert(event.cancelable === false);
+}
+
+// ref https://github.com/web-platform-tests/wpt/blob/master/dom/events/Event-isTrusted.any.js
+function eventIsTrusted() {
+  const desc1 = Object.getOwnPropertyDescriptor(new Event("x"), "isTrusted");
+  assert(desc1);
+  assert(typeof desc1.get === "function");
+
+  const desc2 = Object.getOwnPropertyDescriptor(new Event("x"), "isTrusted");
+  assert(desc2);
+  assert(typeof desc2.get === "function");
+
+  assert(desc1.get === desc2.get);
+}
+
+function main() {
+  eventInitializedWithType();
+  eventInitializedWithTypeAndDict();
+  eventComposedPathSuccess();
+  eventStopPropagationSuccess();
+  eventStopImmediatePropagationSuccess();
+  eventPreventDefaultSuccess();
+  eventInitializedWithNonStringType();
+  eventIsTrusted();
+}
+
+main();
diff --git a/op_crates/web/lib.deno_web.d.ts b/op_crates/web/lib.deno_web.d.ts
new file mode 100644
index 00000000000000..d24a3b76f55bc8
--- /dev/null
+++ b/op_crates/web/lib.deno_web.d.ts
@@ -0,0 +1,237 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+/// <reference no-default-lib="true" />
+/// <reference lib="esnext" />
+
+declare class DOMException extends Error {
+  constructor(message?: string, name?: string);
+  readonly name: string;
+  readonly message: string;
+}
+
+interface EventInit {
+  bubbles?: boolean;
+  cancelable?: boolean;
+  composed?: boolean;
+}
+
+/** An event which takes place in the DOM. */
+declare class Event {
+  constructor(type: string, eventInitDict?: EventInit);
+  /** Returns true or false depending on how event was initialized. True if
+     * event goes through its target's ancestors in reverse tree order, and
+     * false otherwise. */
+  readonly bubbles: boolean;
+  cancelBubble: boolean;
+  /** Returns true or false depending on how event was initialized. Its return
+     * value does not always carry meaning, but true can indicate that part of the
+     * operation during which event was dispatched, can be canceled by invoking
+     * the preventDefault() method. */
+  readonly cancelable: boolean;
+  /** Returns true or false depending on how event was initialized. True if
+     * event invokes listeners past a ShadowRoot node that is the root of its
+     * target, and false otherwise. */
+  readonly composed: boolean;
+  /** Returns the object whose event listener's callback is currently being
+     * invoked. */
+  readonly currentTarget: EventTarget | null;
+  /** Returns true if preventDefault() was invoked successfully to indicate
+     * cancellation, and false otherwise. */
+  readonly defaultPrevented: boolean;
+  /** Returns the event's phase, which is one of NONE, CAPTURING_PHASE,
+     * AT_TARGET, and BUBBLING_PHASE. */
+  readonly eventPhase: number;
+  /** Returns true if event was dispatched by the user agent, and false
+     * otherwise. */
+  readonly isTrusted: boolean;
+  /** Returns the object to which event is dispatched (its target). */
+  readonly target: EventTarget | null;
+  /** Returns the event's timestamp as the number of milliseconds measured
+     * relative to the time origin. */
+  readonly timeStamp: number;
+  /** Returns the type of event, e.g. "click", "hashchange", or "submit". */
+  readonly type: string;
+  /** Returns the invocation target objects of event's path (objects on which
+     * listeners will be invoked), except for any nodes in shadow trees of which
+     * the shadow root's mode is "closed" that are not reachable from event's
+     * currentTarget. */
+  composedPath(): EventTarget[];
+  /** If invoked when the cancelable attribute value is true, and while
+     * executing a listener for the event with passive set to false, signals to
+     * the operation that caused event to be dispatched that it needs to be
+     * canceled. */
+  preventDefault(): void;
+  /** Invoking this method prevents event from reaching any registered event
+     * listeners after the current one finishes running and, when dispatched in a
+     * tree, also prevents event from reaching any other objects. */
+  stopImmediatePropagation(): void;
+  /** When dispatched in a tree, invoking this method prevents event from
+     * reaching any objects other than the current object. */
+  stopPropagation(): void;
+  readonly AT_TARGET: number;
+  readonly BUBBLING_PHASE: number;
+  readonly CAPTURING_PHASE: number;
+  readonly NONE: number;
+  static readonly AT_TARGET: number;
+  static readonly BUBBLING_PHASE: number;
+  static readonly CAPTURING_PHASE: number;
+  static readonly NONE: number;
+}
+
+/**
+   * EventTarget is a DOM interface implemented by objects that can receive events
+   * and may have listeners for them.
+   */
+declare class EventTarget {
+  /** Appends an event listener for events whose type attribute value is type.
+     * The callback argument sets the callback that will be invoked when the event
+     * is dispatched.
+     *
+     * The options argument sets listener-specific options. For compatibility this
+     * can be a boolean, in which case the method behaves exactly as if the value
+     * was specified as options's capture.
+     *
+     * When set to true, options's capture prevents callback from being invoked
+     * when the event's eventPhase attribute value is BUBBLING_PHASE. When false
+     * (or not present), callback will not be invoked when event's eventPhase
+     * attribute value is CAPTURING_PHASE. Either way, callback will be invoked if
+     * event's eventPhase attribute value is AT_TARGET.
+     *
+     * When set to true, options's passive indicates that the callback will not
+     * cancel the event by invoking preventDefault(). This is used to enable
+     * performance optimizations described in § 2.8 Observing event listeners.
+     *
+     * When set to true, options's once indicates that the callback will only be
+     * invoked once after which the event listener will be removed.
+     *
+     * The event listener is appended to target's event listener list and is not
+     * appended if it has the same type, callback, and capture. */
+  addEventListener(
+    type: string,
+    listener: EventListenerOrEventListenerObject | null,
+    options?: boolean | AddEventListenerOptions,
+  ): void;
+  /** Dispatches a synthetic event event to target and returns true if either
+     * event's cancelable attribute value is false or its preventDefault() method
+     * was not invoked, and false otherwise. */
+  dispatchEvent(event: Event): boolean;
+  /** Removes the event listener in target's event listener list with the same
+     * type, callback, and options. */
+  removeEventListener(
+    type: string,
+    callback: EventListenerOrEventListenerObject | null,
+    options?: EventListenerOptions | boolean,
+  ): void;
+  [Symbol.toStringTag]: string;
+}
+
+interface EventListener {
+  (evt: Event): void | Promise<void>;
+}
+
+interface EventListenerObject {
+  handleEvent(evt: Event): void | Promise<void>;
+}
+
+declare type EventListenerOrEventListenerObject =
+  | EventListener
+  | EventListenerObject;
+
+interface AddEventListenerOptions extends EventListenerOptions {
+  once?: boolean;
+  passive?: boolean;
+}
+
+interface EventListenerOptions {
+  capture?: boolean;
+}
+
+/** Decodes a string of data which has been encoded using base-64 encoding.
+ *
+ *     console.log(atob("aGVsbG8gd29ybGQ=")); // outputs 'hello world'
+ */
+declare function atob(s: string): string;
+
+/** Creates a base-64 ASCII encoded string from the input string.
+ *
+ *     console.log(btoa("hello world"));  // outputs "aGVsbG8gd29ybGQ="
+ */
+declare function btoa(s: string): string;
+
+declare class TextDecoder {
+  /** Returns encoding's name, lowercased. */
+  readonly encoding: string;
+  /** Returns `true` if error mode is "fatal", and `false` otherwise. */
+  readonly fatal: boolean;
+  /** Returns `true` if ignore BOM flag is set, and `false` otherwise. */
+  readonly ignoreBOM = false;
+  constructor(
+    label?: string,
+    options?: { fatal?: boolean; ignoreBOM?: boolean },
+  );
+  /** Returns the result of running encoding's decoder. */
+  decode(input?: BufferSource, options?: { stream?: false }): string;
+  readonly [Symbol.toStringTag]: string;
+}
+
+declare class TextEncoder {
+  /** Returns "utf-8". */
+  readonly encoding = "utf-8";
+  /** Returns the result of running UTF-8's encoder. */
+  encode(input?: string): Uint8Array;
+  encodeInto(
+    input: string,
+    dest: Uint8Array,
+  ): { read: number; written: number };
+  readonly [Symbol.toStringTag]: string;
+}
+
+/** A controller object that allows you to abort one or more DOM requests as and
+ * when desired. */
+declare class AbortController {
+  /** Returns the AbortSignal object associated with this object. */
+  readonly signal: AbortSignal;
+  /** Invoking this method will set this object's AbortSignal's aborted flag and
+    * signal to any observers that the associated activity is to be aborted. */
+  abort(): void;
+}
+
+interface AbortSignalEventMap {
+  abort: Event;
+}
+
+/** A signal object that allows you to communicate with a DOM request (such as a
+  * Fetch) and abort it if required via an AbortController object. */
+interface AbortSignal extends EventTarget {
+  /** Returns true if this AbortSignal's AbortController has signaled to abort,
+    * and false otherwise. */
+  readonly aborted: boolean;
+  onabort: ((this: AbortSignal, ev: Event) => any) | null;
+  addEventListener<K extends keyof AbortSignalEventMap>(
+    type: K,
+    listener: (this: AbortSignal, ev: AbortSignalEventMap[K]) => any,
+    options?: boolean | AddEventListenerOptions,
+  ): void;
+  addEventListener(
+    type: string,
+    listener: EventListenerOrEventListenerObject,
+    options?: boolean | AddEventListenerOptions,
+  ): void;
+  removeEventListener<K extends keyof AbortSignalEventMap>(
+    type: K,
+    listener: (this: AbortSignal, ev: AbortSignalEventMap[K]) => any,
+    options?: boolean | EventListenerOptions,
+  ): void;
+  removeEventListener(
+    type: string,
+    listener: EventListenerOrEventListenerObject,
+    options?: boolean | EventListenerOptions,
+  ): void;
+}
+
+declare const AbortSignal: {
+  prototype: AbortSignal;
+  new (): AbortSignal;
+};
diff --git a/op_crates/web/lib.rs b/op_crates/web/lib.rs
new file mode 100644
index 00000000000000..03c0c89af420a7
--- /dev/null
+++ b/op_crates/web/lib.rs
@@ -0,0 +1,121 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+
+use deno_core::crate_modules;
+use std::path::PathBuf;
+
+crate_modules!();
+
+pub struct WebScripts {
+  pub abort_signal: String,
+  pub declaration: String,
+  pub dom_exception: String,
+  pub event: String,
+  pub text_encoding: String,
+}
+
+fn get_str_path(file_name: &str) -> String {
+  PathBuf::from(DENO_CRATE_PATH)
+    .join(file_name)
+    .to_string_lossy()
+    .to_string()
+}
+
+pub fn get_scripts() -> WebScripts {
+  WebScripts {
+    abort_signal: get_str_path("02_abort_signal.js"),
+    declaration: get_str_path("lib.deno_web.d.ts"),
+    dom_exception: get_str_path("00_dom_exception.js"),
+    event: get_str_path("01_event.js"),
+    text_encoding: get_str_path("08_text_encoding.js"),
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use deno_core::js_check;
+  use deno_core::CoreIsolate;
+  use deno_core::StartupData;
+  use futures::future::lazy;
+  use futures::future::FutureExt;
+  use futures::task::Context;
+  use futures::task::Poll;
+
+  fn run_in_task<F>(f: F)
+  where
+    F: FnOnce(&mut Context) + Send + 'static,
+  {
+    futures::executor::block_on(lazy(move |cx| f(cx)));
+  }
+
+  fn setup() -> CoreIsolate {
+    let mut isolate = CoreIsolate::new(StartupData::None, false);
+    js_check(
+      isolate
+        .execute("00_dom_exception.js", include_str!("00_dom_exception.js")),
+    );
+    js_check(isolate.execute("01_event.js", include_str!("01_event.js")));
+    js_check(
+      isolate.execute("02_abort_signal.js", include_str!("02_abort_signal.js")),
+    );
+    js_check(
+      isolate
+        .execute("08_text_encoding.js", include_str!("08_text_encoding.js")),
+    );
+    isolate
+  }
+
+  #[test]
+  fn test_abort_controller() {
+    run_in_task(|mut cx| {
+      let mut isolate = setup();
+      js_check(isolate.execute(
+        "abort_controller_test.js",
+        include_str!("abort_controller_test.js"),
+      ));
+      if let Poll::Ready(Err(_)) = isolate.poll_unpin(&mut cx) {
+        unreachable!();
+      }
+    });
+  }
+
+  #[test]
+  fn test_event() {
+    run_in_task(|mut cx| {
+      let mut isolate = setup();
+      js_check(isolate.execute("event_test.js", include_str!("event_test.js")));
+      if let Poll::Ready(Err(_)) = isolate.poll_unpin(&mut cx) {
+        unreachable!();
+      }
+    });
+  }
+
+  #[test]
+  fn test_event_target() {
+    run_in_task(|mut cx| {
+      let mut isolate = setup();
+      js_check(
+        isolate.execute(
+          "event_target_test.js",
+          include_str!("event_target_test.js"),
+        ),
+      );
+      if let Poll::Ready(Err(_)) = isolate.poll_unpin(&mut cx) {
+        unreachable!();
+      }
+    });
+  }
+
+  #[test]
+  fn test_text_encoding() {
+    run_in_task(|mut cx| {
+      let mut isolate = setup();
+      js_check(isolate.execute(
+        "text_encoding_test.js",
+        include_str!("text_encoding_test.js"),
+      ));
+      if let Poll::Ready(Err(_)) = isolate.poll_unpin(&mut cx) {
+        unreachable!();
+      }
+    });
+  }
+}
diff --git a/op_crates/web/text_encoding_test.js b/op_crates/web/text_encoding_test.js
new file mode 100644
index 00000000000000..06537df2469cf5
--- /dev/null
+++ b/op_crates/web/text_encoding_test.js
@@ -0,0 +1,284 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+function assert(cond) {
+  if (!cond) {
+    throw Error("assert");
+  }
+}
+
+function assertArrayEquals(a1, a2) {
+  if (a1.length !== a2.length) throw Error("assert");
+
+  for (const index in a1) {
+    if (a1[index] !== a2[index]) {
+      throw Error("assert");
+    }
+  }
+}
+
+function btoaSuccess() {
+  const text = "hello world";
+  const encoded = btoa(text);
+  assert(encoded === "aGVsbG8gd29ybGQ=");
+}
+
+function atobSuccess() {
+  const encoded = "aGVsbG8gd29ybGQ=";
+  const decoded = atob(encoded);
+  assert(decoded === "hello world");
+}
+
+function atobWithAsciiWhitespace() {
+  const encodedList = [
+    " aGVsbG8gd29ybGQ=",
+    "  aGVsbG8gd29ybGQ=",
+    "aGVsbG8gd29ybGQ= ",
+    "aGVsbG8gd29ybGQ=\n",
+    "aGVsbG\t8gd29ybGQ=",
+    `aGVsbG\t8g
+                d29ybGQ=`,
+  ];
+
+  for (const encoded of encodedList) {
+    const decoded = atob(encoded);
+    assert(decoded === "hello world");
+  }
+}
+
+function atobThrows() {
+  let threw = false;
+  try {
+    atob("aGVsbG8gd29ybGQ==");
+  } catch (e) {
+    threw = true;
+  }
+  assert(threw);
+}
+
+function atobThrows2() {
+  let threw = false;
+  try {
+    atob("aGVsbG8gd29ybGQ===");
+  } catch (e) {
+    threw = true;
+  }
+  assert(threw);
+}
+
+function btoaFailed() {
+  let threw = false;
+  const text = "你好";
+  try {
+    btoa(text);
+  } catch (e) {
+    assert(e instanceof TypeError);
+    threw = true;
+  }
+  assert(threw);
+}
+
+function textDecoder2() {
+  // deno-fmt-ignore
+  const fixture = new Uint8Array([
+    0xf0, 0x9d, 0x93, 0xbd,
+    0xf0, 0x9d, 0x93, 0xae,
+    0xf0, 0x9d, 0x94, 0x81,
+    0xf0, 0x9d, 0x93, 0xbd
+  ]);
+  const decoder = new TextDecoder();
+  assert(decoder.decode(fixture) === "𝓽𝓮𝔁𝓽");
+}
+
+function textDecoderIgnoreBOM() {
+  // deno-fmt-ignore
+  const fixture = new Uint8Array([
+    0xef, 0xbb, 0xbf,
+    0xf0, 0x9d, 0x93, 0xbd,
+    0xf0, 0x9d, 0x93, 0xae,
+    0xf0, 0x9d, 0x94, 0x81,
+    0xf0, 0x9d, 0x93, 0xbd
+  ]);
+  const decoder = new TextDecoder("utf-8", { ignoreBOM: true });
+  assert(decoder.decode(fixture) === "𝓽𝓮𝔁𝓽");
+}
+
+function textDecoderNotBOM() {
+  // deno-fmt-ignore
+  const fixture = new Uint8Array([
+    0xef, 0xbb, 0x89,
+    0xf0, 0x9d, 0x93, 0xbd,
+    0xf0, 0x9d, 0x93, 0xae,
+    0xf0, 0x9d, 0x94, 0x81,
+    0xf0, 0x9d, 0x93, 0xbd
+  ]);
+  const decoder = new TextDecoder("utf-8", { ignoreBOM: true });
+  assert(decoder.decode(fixture) === "ﻉ𝓽𝓮𝔁𝓽");
+}
+
+function textDecoderASCII() {
+  const fixture = new Uint8Array([0x89, 0x95, 0x9f, 0xbf]);
+  const decoder = new TextDecoder("ascii");
+  assert(decoder.decode(fixture) === "‰•Ÿ¿");
+}
+
+function textDecoderErrorEncoding() {
+  let didThrow = false;
+  try {
+    new TextDecoder("foo");
+  } catch (e) {
+    didThrow = true;
+    assert(e.message === "The encoding label provided ('foo') is invalid.");
+  }
+  assert(didThrow);
+}
+
+function textDecoderHandlesUndefined() {
+  const fixture = undefined;
+  const decoder = new TextDecoder();
+  assert(decoder.decode(fixture) === "");
+}
+
+function textDecoderThrowsOnEmpty() {
+  const fixture = "";
+  const decoder = new TextDecoder();
+  let didThrow = false;
+  try {
+    decoder.decode(fixture);
+  } catch (e) {
+    didThrow = true;
+    assert(
+      e.message ===
+        "Provided input is not of type ArrayBuffer or ArrayBufferView",
+    );
+  }
+  assert(didThrow);
+}
+
+function textDecoderThrowsOnNull() {
+  const fixture = null;
+  const decoder = new TextDecoder();
+  let didThrow = false;
+  try {
+    decoder.decode(fixture);
+  } catch (e) {
+    didThrow = true;
+    assert(
+      e.message ===
+        "Provided input is not of type ArrayBuffer or ArrayBufferView",
+    );
+  }
+  assert(didThrow);
+}
+
+function textEncoder() {
+  const fixture = "𝓽𝓮𝔁𝓽";
+  const encoder = new TextEncoder();
+  // deno-fmt-ignore
+  assertArrayEquals(Array.from(encoder.encode(fixture)), [
+    0xf0, 0x9d, 0x93, 0xbd,
+    0xf0, 0x9d, 0x93, 0xae,
+    0xf0, 0x9d, 0x94, 0x81,
+    0xf0, 0x9d, 0x93, 0xbd
+  ]);
+}
+
+function textEncodeInto() {
+  const fixture = "text";
+  const encoder = new TextEncoder();
+  const bytes = new Uint8Array(5);
+  const result = encoder.encodeInto(fixture, bytes);
+  assert(result.read === 4);
+  assert(result.written === 4);
+  // deno-fmt-ignore
+  assertArrayEquals(Array.from(bytes), [
+    0x74, 0x65, 0x78, 0x74, 0x00,
+  ]);
+}
+
+function textEncodeInto2() {
+  const fixture = "𝓽𝓮𝔁𝓽";
+  const encoder = new TextEncoder();
+  const bytes = new Uint8Array(17);
+  const result = encoder.encodeInto(fixture, bytes);
+  assert(result.read === 8);
+  assert(result.written === 16);
+  // deno-fmt-ignore
+  assertArrayEquals(Array.from(bytes), [
+    0xf0, 0x9d, 0x93, 0xbd,
+    0xf0, 0x9d, 0x93, 0xae,
+    0xf0, 0x9d, 0x94, 0x81,
+    0xf0, 0x9d, 0x93, 0xbd, 0x00,
+  ]);
+}
+
+function textEncodeInto3() {
+  const fixture = "𝓽𝓮𝔁𝓽";
+  const encoder = new TextEncoder();
+  const bytes = new Uint8Array(5);
+  const result = encoder.encodeInto(fixture, bytes);
+  assert(result.read === 2);
+  assert(result.written === 4);
+  // deno-fmt-ignore
+  assertArrayEquals(Array.from(bytes), [
+    0xf0, 0x9d, 0x93, 0xbd, 0x00,
+  ]);
+}
+
+function textDecoderSharedUint8Array() {
+  const ab = new SharedArrayBuffer(6);
+  const dataView = new DataView(ab);
+  const charCodeA = "A".charCodeAt(0);
+  for (let i = 0; i < ab.byteLength; i++) {
+    dataView.setUint8(i, charCodeA + i);
+  }
+  const ui8 = new Uint8Array(ab);
+  const decoder = new TextDecoder();
+  const actual = decoder.decode(ui8);
+  assert(actual === "ABCDEF");
+}
+
+function textDecoderSharedInt32Array() {
+  const ab = new SharedArrayBuffer(8);
+  const dataView = new DataView(ab);
+  const charCodeA = "A".charCodeAt(0);
+  for (let i = 0; i < ab.byteLength; i++) {
+    dataView.setUint8(i, charCodeA + i);
+  }
+  const i32 = new Int32Array(ab);
+  const decoder = new TextDecoder();
+  const actual = decoder.decode(i32);
+  assert(actual === "ABCDEFGH");
+}
+
+function toStringShouldBeWebCompatibility() {
+  const encoder = new TextEncoder();
+  assert(encoder.toString() === "[object TextEncoder]");
+
+  const decoder = new TextDecoder();
+  assert(decoder.toString() === "[object TextDecoder]");
+}
+
+function main() {
+  btoaSuccess();
+  atobSuccess();
+  atobWithAsciiWhitespace();
+  atobThrows();
+  atobThrows2();
+  btoaFailed();
+  textDecoder2();
+  textDecoderIgnoreBOM();
+  textDecoderNotBOM();
+  textDecoderASCII();
+  textDecoderErrorEncoding();
+  textDecoderHandlesUndefined();
+  textDecoderThrowsOnEmpty();
+  textDecoderThrowsOnNull();
+  textEncoder();
+  textEncodeInto();
+  textEncodeInto2();
+  textEncodeInto3();
+  textDecoderSharedUint8Array();
+  textDecoderSharedInt32Array();
+  toStringShouldBeWebCompatibility();
+}
+
+main();
diff --git a/std/archive/tar.ts b/std/archive/tar.ts
index 5fcfedc0ff8645..9e417007f4abbf 100644
--- a/std/archive/tar.ts
+++ b/std/archive/tar.ts
@@ -105,15 +105,16 @@ function pad(num: number, bytes: number, base?: number): string {
   return "000000000000".substr(numString.length + 12 - bytes) + numString;
 }
 
-const types: { [key: string]: string } = {
-  "": "file",
-  "0": "file",
-  "1": "link",
-  "2": "symlink",
-  "3": "character-device",
-  "4": "block-device",
-  "5": "directory",
-};
+enum FileTypes {
+  "file" = 0,
+  "link" = 1,
+  "symlink" = 2,
+  "character-device" = 3,
+  "block-device" = 4,
+  "directory" = 5,
+  "fifo" = 6,
+  "contiguous-file" = 7,
+}
 
 /*
 struct posix_header {           // byte offset
@@ -352,6 +353,10 @@ export class Tar {
     let info: Deno.FileInfo | undefined;
     if (opts.filePath) {
       info = await Deno.stat(opts.filePath);
+      if (info.isDirectory) {
+        info.size = 0;
+        opts.reader = new Deno.Buffer();
+      }
     }
 
     const mode = opts.fileMode || (info && info.mode) ||
@@ -374,6 +379,10 @@ export class Tar {
 
     const fileSize = info?.size ?? opts.contentSize;
     assert(fileSize != null, "fileSize must be set");
+
+    const type = opts.type
+      ? FileTypes[opts.type as keyof typeof FileTypes]
+      : (info?.isDirectory ? FileTypes.directory : FileTypes.file);
     const tarData: TarDataWithSource = {
       fileName,
       fileNamePrefix,
@@ -383,7 +392,7 @@ export class Tar {
       fileSize: pad(fileSize, 11),
       mtime: pad(mtime, 11),
       checksum: "        ",
-      type: "0", // just a file
+      type: type.toString(),
       ustar,
       owner: opts.owner || "",
       group: opts.group || "",
@@ -593,7 +602,7 @@ export class Untar {
     );
 
     meta.fileSize = parseInt(decoder.decode(header.fileSize), 8);
-    meta.type = types[meta.type as string] || meta.type;
+    meta.type = FileTypes[parseInt(meta.type!)] ?? meta.type;
 
     return meta;
   };
diff --git a/std/archive/tar_test.ts b/std/archive/tar_test.ts
index 17dfe77451ce2e..0f7f51e30f85a2 100644
--- a/std/archive/tar_test.ts
+++ b/std/archive/tar_test.ts
@@ -395,3 +395,32 @@ Deno.test("untarLinuxGeneratedTar", async function (): Promise<void> {
 
   file.close();
 });
+
+Deno.test("directoryEntryType", async function (): Promise<void> {
+  const tar = new Tar();
+
+  tar.append("directory/", {
+    reader: new Deno.Buffer(),
+    contentSize: 0,
+    type: "directory",
+  });
+
+  const filePath = resolve("archive", "testdata");
+  tar.append("archive/testdata/", {
+    filePath,
+  });
+
+  const outputFile = resolve("archive", "testdata", "directory_type_test.tar");
+  const file = await Deno.open(outputFile, { create: true, write: true });
+  await Deno.copy(tar.getReader(), file);
+  await file.close();
+
+  const reader = await Deno.open(outputFile, { read: true });
+  const untar = new Untar(reader);
+  for await (const entry of untar) {
+    assertEquals(entry.type, "directory");
+  }
+
+  await reader.close();
+  await Deno.remove(outputFile);
+});
diff --git a/std/async/mod.ts b/std/async/mod.ts
index 9efead91da47ba..ad4ab515685485 100644
--- a/std/async/mod.ts
+++ b/std/async/mod.ts
@@ -2,3 +2,4 @@
 export * from "./deferred.ts";
 export * from "./delay.ts";
 export * from "./mux_async_iterator.ts";
+export * from "./pool.ts";
diff --git a/std/async/pool.ts b/std/async/pool.ts
new file mode 100644
index 00000000000000..fc85170414cc53
--- /dev/null
+++ b/std/async/pool.ts
@@ -0,0 +1,46 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+
+/**
+ * pooledMap transforms values from an (async) iterable into another async
+ * iterable. The transforms are done concurrently, with a max concurrency
+ * defined by the poolLimit.
+ * 
+ * @param poolLimit The maximum count of items being processed concurrently. 
+ * @param array The input array for mapping.
+ * @param iteratorFn The function to call for every item of the array.
+ */
+export function pooledMap<T, R>(
+  poolLimit: number,
+  array: Iterable<T> | AsyncIterable<T>,
+  iteratorFn: (data: T) => Promise<R>,
+): AsyncIterableIterator<R> {
+  // Create the async iterable that is returned from this function.
+  const res = new TransformStream<Promise<R>, R>({
+    async transform(
+      p: Promise<R>,
+      controller: TransformStreamDefaultController<R>,
+    ): Promise<void> {
+      controller.enqueue(await p);
+    },
+  });
+  // Start processing items from the iterator
+  (async (): Promise<void> => {
+    const writer = res.writable.getWriter();
+    const executing: Array<Promise<unknown>> = [];
+    for await (const item of array) {
+      const p = Promise.resolve().then(() => iteratorFn(item));
+      writer.write(p);
+      const e: Promise<unknown> = p.then(() =>
+        executing.splice(executing.indexOf(e), 1)
+      );
+      executing.push(e);
+      if (executing.length >= poolLimit) {
+        await Promise.race(executing);
+      }
+    }
+    // Wait until all ongoing events have processed, then close the writer.
+    await Promise.all(executing);
+    writer.close();
+  })();
+  return res.readable.getIterator();
+}
diff --git a/std/async/pool_test.ts b/std/async/pool_test.ts
new file mode 100644
index 00000000000000..1be4556be7f7d3
--- /dev/null
+++ b/std/async/pool_test.ts
@@ -0,0 +1,19 @@
+import { pooledMap } from "./pool.ts";
+import { assert } from "../testing/asserts.ts";
+
+Deno.test("[async] pooledMap", async function (): Promise<void> {
+  const start = new Date();
+  const results = pooledMap(
+    2,
+    [1, 2, 3],
+    (i) => new Promise((r) => setTimeout(() => r(i), 1000)),
+  );
+  for await (const value of results) {
+    console.log(value);
+  }
+  const diff = new Date().getTime() - start.getTime();
+  assert(diff >= 2000);
+  assert(diff < 3000);
+});
+
+export {};
diff --git a/std/datetime/README.md b/std/datetime/README.md
index e9142f48ad8d36..62e15df2e3ee2e 100644
--- a/std/datetime/README.md
+++ b/std/datetime/README.md
@@ -4,38 +4,74 @@ Simple helper to help parse date strings into `Date`, with additional functions.
 
 ## Usage
 
-### parseDate / parseDateTime
+The following symbols are supported:
 
-- `parseDate()` - Take an input string and a format to parse the date. Supported
-  formats are exported in `DateFormat`.
-- `parseDateTime()` - Take an input string and a format to parse the dateTime.
-  Supported formats are exported in `DateTimeFormat`.
+- `yyyy` - numeric year
+- `yy` - 2-digit year
+- `M` - numeric month
+- `MM` - 2-digit month
+- `d` - numeric day
+- `dd` - 2-digit day
+
+- `h` - numeric hour
+- `hh` - 2-digit hour
+- `m` - numeric minute
+- `mm` - 2-digit minute
+- `s` - numeric second
+- `ss` - 2-digit second
+- `S` - 1-digit fractionalSecond
+- `SS` - 2-digit fractionalSecond
+- `SSS` - 3-digit fractionalSecond
+
+- `a` - dayPeriod, either `AM` or `PM`
+
+- `'foo'` - quoted literal
+- `./-` - unquoted literal
+
+### parse
+
+Takes an input `string` and a `formatString` to parse to a `date`.
 
 ```ts
-import { parseDate, parseDateTime } from 'https://deno.land/std/datetime/mod.ts'
+import { parse } from 'https://deno.land/std/datetime/mod.ts'
 
-parseDate("20-01-2019", "dd-mm-yyyy") // output : new Date(2019, 0, 20)
-parseDate("2019-01-20", "yyyy-mm-dd") // output : new Date(2019, 0, 20)
+parse("20-01-2019", "dd-MM-yyyy") // output : new Date(2019, 0, 20)
+parse("2019-01-20", "yyyy-MM-dd") // output : new Date(2019, 0, 20)
+parse("2019-01-20", "dd.MM.yyyy") // output : new Date(2019, 0, 20)
+parse("01-20-2019 16:34", "MM-dd-yyyy hh:mm") // output : new Date(2019, 0, 20, 16, 34)
+parse("01-20-2019 04:34 PM", "MM-dd-yyyy hh:mm a") // output : new Date(2019, 0, 20, 16, 34)
+parse("16:34 01-20-2019", "hh:mm MM-dd-yyyy") // output : new Date(2019, 0, 20, 16, 34)
+parse("01-20-2019 16:34:23.123", "MM-dd-yyyy hh:mm:ss.SSS") // output : new Date(2019, 0, 20, 16, 34, 23, 123)
 ...
+```
+
+### format
+
+Takes an input `date` and a `formatString` to format to a `string`.
+
+```ts
+import { format } from 'https://deno.land/std/datetime/mod.ts'
+
+format(new Date(2019, 0, 20), "dd-MM-yyyy") // output : "20-01-2019"
+format(new Date(2019, 0, 20), "yyyy-MM-dd") // output : "2019-01-20"
+format(new Date(2019, 0, 20), "dd.MM.yyyy") // output : "2019-01-20"
+format(new Date(2019, 0, 20, 16, 34), "MM-dd-yyyy hh:mm") // output : "01-20-2019 16:34"
+format(new Date(2019, 0, 20, 16, 34), "MM-dd-yyyy hh:mm a") // output : "01-20-2019 04:34 PM"
+format(new Date(2019, 0, 20, 16, 34), "hh:mm MM-dd-yyyy") // output : "16:34 01-20-2019"
+format(new Date(2019, 0, 20, 16, 34, 23, 123), "MM-dd-yyyy hh:mm:ss.SSS") // output : "01-20-2019 16:34:23.123"
+format(new Date(2019, 0, 20), "'today:' yyyy-MM-dd") // output : "today: 2019-01-20"
 
-parseDateTime("01-20-2019 16:34", "mm-dd-yyyy hh:mm") // output : new Date(2019, 0, 20, 16, 34)
-parseDateTime("16:34 01-20-2019", "hh:mm mm-dd-yyyy") // output : new Date(2019, 0, 20, 16, 34)
 ...
 ```
 
-### dayOfYear / currentDayOfYear
+### dayOfYear
 
-- `dayOfYear()` - Returns the number of the day in the year.
-- `currentDayOfYear()` - Returns the number of the current day in the year.
+Returns the number of the day in the year.
 
 ```ts
-import {
-  dayOfYear,
-  currentDayOfYear,
-} from "https://deno.land/std/datetime/mod.ts";
+import { dayOfYear } from "https://deno.land/std/datetime/mod.ts";
 
 dayOfYear(new Date("2019-03-11T03:24:00")); // output: 70
-currentDayOfYear(); // output: ** depends on when you run it :) **
 ```
 
 ### weekOfYear
diff --git a/std/datetime/formatter.ts b/std/datetime/formatter.ts
new file mode 100644
index 00000000000000..0e872cb4016ae3
--- /dev/null
+++ b/std/datetime/formatter.ts
@@ -0,0 +1,534 @@
+import {
+  CallbackResult,
+  Rule,
+  TestFunction,
+  TestResult,
+  Tokenizer,
+} from "./tokenizer.ts";
+
+function digits(value: string | number, count = 2): string {
+  return String(value).padStart(count, "0");
+}
+
+// as declared as in namespace Intl
+type DateTimeFormatPartTypes =
+  | "day"
+  | "dayPeriod"
+  // | "era"
+  | "hour"
+  | "literal"
+  | "minute"
+  | "month"
+  | "second"
+  | "timeZoneName"
+  // | "weekday"
+  | "year"
+  | "fractionalSecond";
+
+interface DateTimeFormatPart {
+  type: DateTimeFormatPartTypes;
+  value: string;
+}
+
+type TimeZone = "UTC";
+
+interface Options {
+  timeZone?: TimeZone;
+}
+
+function createLiteralTestFunction(value: string): TestFunction {
+  return (string: string): TestResult => {
+    return string.startsWith(value)
+      ? { value, length: value.length }
+      : undefined;
+  };
+}
+
+function createMatchTestFunction(match: RegExp): TestFunction {
+  return (string: string): TestResult => {
+    const result = match.exec(string);
+    if (result) return { value: result, length: result[0].length };
+  };
+}
+
+// according to unicode symbols (http://userguide.icu-project.org/formatparse/datetime)
+const defaultRules = [
+  {
+    test: createLiteralTestFunction("yyyy"),
+    fn: (): CallbackResult => ({ type: "year", value: "numeric" }),
+  },
+  {
+    test: createLiteralTestFunction("yy"),
+    fn: (): CallbackResult => ({ type: "year", value: "2-digit" }),
+  },
+
+  {
+    test: createLiteralTestFunction("MM"),
+    fn: (): CallbackResult => ({ type: "month", value: "2-digit" }),
+  },
+  {
+    test: createLiteralTestFunction("M"),
+    fn: (): CallbackResult => ({ type: "month", value: "numeric" }),
+  },
+  {
+    test: createLiteralTestFunction("dd"),
+    fn: (): CallbackResult => ({ type: "day", value: "2-digit" }),
+  },
+  {
+    test: createLiteralTestFunction("d"),
+    fn: (): CallbackResult => ({ type: "day", value: "numeric" }),
+  },
+
+  {
+    test: createLiteralTestFunction("hh"),
+    fn: (): CallbackResult => ({ type: "hour", value: "2-digit" }),
+  },
+  {
+    test: createLiteralTestFunction("h"),
+    fn: (): CallbackResult => ({ type: "hour", value: "numeric" }),
+  },
+  {
+    test: createLiteralTestFunction("mm"),
+    fn: (): CallbackResult => ({ type: "minute", value: "2-digit" }),
+  },
+  {
+    test: createLiteralTestFunction("m"),
+    fn: (): CallbackResult => ({ type: "minute", value: "numeric" }),
+  },
+  {
+    test: createLiteralTestFunction("ss"),
+    fn: (): CallbackResult => ({ type: "second", value: "2-digit" }),
+  },
+  {
+    test: createLiteralTestFunction("s"),
+    fn: (): CallbackResult => ({ type: "second", value: "numeric" }),
+  },
+  {
+    test: createLiteralTestFunction("SSS"),
+    fn: (): CallbackResult => ({ type: "fractionalSecond", value: 3 }),
+  },
+  {
+    test: createLiteralTestFunction("SS"),
+    fn: (): CallbackResult => ({ type: "fractionalSecond", value: 2 }),
+  },
+  {
+    test: createLiteralTestFunction("S"),
+    fn: (): CallbackResult => ({ type: "fractionalSecond", value: 1 }),
+  },
+
+  {
+    test: createLiteralTestFunction("a"),
+    fn: (value: unknown): CallbackResult => ({
+      type: "dayPeriod",
+      value: value as string,
+    }),
+  },
+
+  // quoted literal
+  {
+    test: createMatchTestFunction(/^(')(?<value>\\.|[^\']*)\1/),
+    fn: (match: unknown): CallbackResult => ({
+      type: "literal",
+      value: (match as RegExpExecArray).groups!.value as string,
+    }),
+  },
+  // literal
+  {
+    test: createMatchTestFunction(/^.+?\s*/),
+    fn: (match: unknown): CallbackResult => ({
+      type: "literal",
+      value: (match as RegExpExecArray)[0],
+    }),
+  },
+];
+
+type FormatPart = { type: DateTimeFormatPartTypes; value: string | number };
+type Format = FormatPart[];
+
+export class DateTimeFormatter {
+  #format: Format;
+
+  constructor(formatString: string, rules: Rule[] = defaultRules) {
+    const tokenizer = new Tokenizer(rules);
+    this.#format = tokenizer.tokenize(formatString, ({ type, value }) => ({
+      type,
+      value,
+    })) as Format;
+  }
+
+  format(date: Date, options: Options = {}): string {
+    let string = "";
+
+    const utc = options.timeZone === "UTC";
+    const hour12 = this.#format.find(
+      (token: FormatPart) => token.type === "dayPeriod",
+    );
+
+    for (const token of this.#format) {
+      const type = token.type;
+
+      switch (type) {
+        case "year": {
+          const value = utc ? date.getUTCFullYear() : date.getFullYear();
+          switch (token.value) {
+            case "numeric": {
+              string += value;
+              break;
+            }
+            case "2-digit": {
+              string += digits(value, 2).slice(-2);
+              break;
+            }
+            default:
+              throw Error(
+                `FormatterError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "month": {
+          const value = (utc ? date.getUTCMonth() : date.getMonth()) + 1;
+          switch (token.value) {
+            case "numeric": {
+              string += value;
+              break;
+            }
+            case "2-digit": {
+              string += digits(value, 2);
+              break;
+            }
+            default:
+              throw Error(
+                `FormatterError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "day": {
+          const value = utc ? date.getUTCDate() : date.getDate();
+          switch (token.value) {
+            case "numeric": {
+              string += value;
+              break;
+            }
+            case "2-digit": {
+              string += digits(value, 2);
+              break;
+            }
+            default:
+              throw Error(
+                `FormatterError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "hour": {
+          let value = utc ? date.getUTCHours() : date.getHours();
+          value -= hour12 && date.getHours() > 12 ? 12 : 0;
+          switch (token.value) {
+            case "numeric": {
+              string += value;
+              break;
+            }
+            case "2-digit": {
+              string += digits(value, 2);
+              break;
+            }
+            default:
+              throw Error(
+                `FormatterError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "minute": {
+          const value = utc ? date.getUTCMinutes() : date.getMinutes();
+          switch (token.value) {
+            case "numeric": {
+              string += value;
+              break;
+            }
+            case "2-digit": {
+              string += digits(value, 2);
+              break;
+            }
+            default:
+              throw Error(
+                `FormatterError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "second": {
+          const value = utc ? date.getUTCSeconds() : date.getSeconds();
+          switch (token.value) {
+            case "numeric": {
+              string += value;
+              break;
+            }
+            case "2-digit": {
+              string += digits(value, 2);
+              break;
+            }
+            default:
+              throw Error(
+                `FormatterError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "fractionalSecond": {
+          const value = utc
+            ? date.getUTCMilliseconds()
+            : date.getMilliseconds();
+          string += digits(value, Number(token.value));
+          break;
+        }
+        case "timeZoneName": {
+          // string += utc ? "Z" : token.value
+          // break
+        }
+        case "dayPeriod": {
+          string += hour12 ? (date.getHours() >= 12 ? "PM" : "AM") : "";
+          break;
+        }
+        case "literal": {
+          string += token.value;
+          break;
+        }
+
+        default:
+          throw Error(`FormatterError: { ${token.type} ${token.value} }`);
+      }
+    }
+
+    return string;
+  }
+
+  parseToParts(string: string): DateTimeFormatPart[] {
+    const parts: DateTimeFormatPart[] = [];
+
+    for (const token of this.#format) {
+      const type = token.type;
+
+      let value = "";
+      switch (token.type) {
+        case "year": {
+          switch (token.value) {
+            case "numeric": {
+              value = /^\d{1,4}/.exec(string)?.[0] as string;
+              break;
+            }
+            case "2-digit": {
+              value = /^\d{1,2}/.exec(string)?.[0] as string;
+              break;
+            }
+          }
+          break;
+        }
+        case "month": {
+          switch (token.value) {
+            case "numeric": {
+              value = /^\d{1,2}/.exec(string)?.[0] as string;
+              break;
+            }
+            case "2-digit": {
+              value = /^\d{2}/.exec(string)?.[0] as string;
+              break;
+            }
+            case "narrow": {
+              value = /^[a-zA-Z]+/.exec(string)?.[0] as string;
+              break;
+            }
+            case "short": {
+              value = /^[a-zA-Z]+/.exec(string)?.[0] as string;
+              break;
+            }
+            case "long": {
+              value = /^[a-zA-Z]+/.exec(string)?.[0] as string;
+              break;
+            }
+            default:
+              throw Error(
+                `ParserError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "day": {
+          switch (token.value) {
+            case "numeric": {
+              value = /^\d{1,2}/.exec(string)?.[0] as string;
+              break;
+            }
+            case "2-digit": {
+              value = /^\d{2}/.exec(string)?.[0] as string;
+              break;
+            }
+            default:
+              throw Error(
+                `ParserError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "hour": {
+          switch (token.value) {
+            case "numeric": {
+              value = /^\d{1,2}/.exec(string)?.[0] as string;
+              break;
+            }
+            case "2-digit": {
+              value = /^\d{2}/.exec(string)?.[0] as string;
+              break;
+            }
+            default:
+              throw Error(
+                `ParserError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "minute": {
+          switch (token.value) {
+            case "numeric": {
+              value = /^\d{1,2}/.exec(string)?.[0] as string;
+              break;
+            }
+            case "2-digit": {
+              value = /^\d{2}/.exec(string)?.[0] as string;
+              break;
+            }
+            default:
+              throw Error(
+                `ParserError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "second": {
+          switch (token.value) {
+            case "numeric": {
+              value = /^\d{1,2}/.exec(string)?.[0] as string;
+              break;
+            }
+            case "2-digit": {
+              value = /^\d{2}/.exec(string)?.[0] as string;
+              break;
+            }
+            default:
+              throw Error(
+                `ParserError: value "${token.value}" is not supported`,
+              );
+          }
+          break;
+        }
+        case "fractionalSecond": {
+          value = new RegExp(`^\\d{${token.value}}`).exec(
+            string,
+          )?.[0] as string;
+          break;
+        }
+        case "timeZoneName": {
+          value = token.value as string;
+          break;
+        }
+        case "dayPeriod": {
+          value = /^(A|P)M/.exec(string)?.[0] as string;
+          break;
+        }
+        case "literal": {
+          if (!string.startsWith(token.value as string)) {
+            throw Error(
+              `Literal "${token.value}" not found "${string.slice(0, 25)}"`,
+            );
+          }
+          value = token.value as string;
+          break;
+        }
+
+        default:
+          throw Error(`${token.type} ${token.value}`);
+      }
+
+      if (!value) {
+        throw Error(
+          `value not valid for token { ${type} ${value} } ${
+            string.slice(
+              0,
+              25,
+            )
+          }`,
+        );
+      }
+      parts.push({ type, value });
+      string = string.slice(value.length);
+    }
+
+    if (string.length) {
+      throw Error(
+        `datetime string was not fully parsed! ${string.slice(0, 25)}`,
+      );
+    }
+
+    return parts;
+  }
+
+  partsToDate(parts: DateTimeFormatPart[]): Date {
+    const date = new Date();
+    const utc = parts.find(
+      (part) => part.type === "timeZoneName" && part.value === "UTC",
+    );
+
+    utc ? date.setUTCHours(0, 0, 0, 0) : date.setHours(0, 0, 0, 0);
+    for (const part of parts) {
+      switch (part.type) {
+        case "year": {
+          const value = Number(part.value.padStart(4, "20"));
+          utc ? date.setUTCFullYear(value) : date.setFullYear(value);
+          break;
+        }
+        case "month": {
+          const value = Number(part.value) - 1;
+          utc ? date.setUTCMonth(value) : date.setMonth(value);
+          break;
+        }
+        case "day": {
+          const value = Number(part.value);
+          utc ? date.setUTCDate(value) : date.setDate(value);
+          break;
+        }
+        case "hour": {
+          let value = Number(part.value);
+          const dayPeriod = parts.find(
+            (part: DateTimeFormatPart) => part.type === "dayPeriod",
+          );
+          if (dayPeriod?.value === "PM") value += 12;
+          utc ? date.setUTCHours(value) : date.setHours(value);
+          break;
+        }
+        case "minute": {
+          const value = Number(part.value);
+          utc ? date.setUTCMinutes(value) : date.setMinutes(value);
+          break;
+        }
+        case "second": {
+          const value = Number(part.value);
+          utc ? date.setUTCSeconds(value) : date.setSeconds(value);
+          break;
+        }
+        case "fractionalSecond": {
+          const value = Number(part.value);
+          utc ? date.setUTCMilliseconds(value) : date.setMilliseconds(value);
+          break;
+        }
+      }
+    }
+    return date;
+  }
+
+  parse(string: string): Date {
+    const parts = this.parseToParts(string);
+    return this.partsToDate(parts);
+  }
+}
diff --git a/std/datetime/mod.ts b/std/datetime/mod.ts
index fe6fe6b3c202bd..64ca49196018fe 100644
--- a/std/datetime/mod.ts
+++ b/std/datetime/mod.ts
@@ -1,7 +1,6 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { assert } from "../_util/assert.ts";
 
-export type DateFormat = "mm-dd-yyyy" | "dd-mm-yyyy" | "yyyy-mm-dd";
+import { DateTimeFormatter } from "./formatter.ts";
 
 export const SECOND = 1e3;
 export const MINUTE = SECOND * 60;
@@ -20,92 +19,27 @@ enum Day {
   Sat,
 }
 
-function execForce(reg: RegExp, pat: string): RegExpExecArray {
-  const v = reg.exec(pat);
-  assert(v != null);
-  return v;
-}
 /**
  * Parse date from string using format string
- * @param dateStr Date string
+ * @param dateString Date string
  * @param format Format string
  * @return Parsed date
  */
-export function parseDate(dateStr: string, format: DateFormat): Date {
-  let m, d, y: string;
-  let datePattern: RegExp;
-
-  switch (format) {
-    case "mm-dd-yyyy":
-      datePattern = /^(\d{2})-(\d{2})-(\d{4})$/;
-      [, m, d, y] = execForce(datePattern, dateStr);
-      break;
-    case "dd-mm-yyyy":
-      datePattern = /^(\d{2})-(\d{2})-(\d{4})$/;
-      [, d, m, y] = execForce(datePattern, dateStr);
-      break;
-    case "yyyy-mm-dd":
-      datePattern = /^(\d{4})-(\d{2})-(\d{2})$/;
-      [, y, m, d] = execForce(datePattern, dateStr);
-      break;
-    default:
-      throw new Error("Invalid date format!");
-  }
-
-  return new Date(Number(y), Number(m) - 1, Number(d));
+export function parse(dateString: string, formatString: string): Date {
+  const formatter = new DateTimeFormatter(formatString);
+  const parts = formatter.parseToParts(dateString);
+  return formatter.partsToDate(parts);
 }
 
-export type DateTimeFormat =
-  | "mm-dd-yyyy hh:mm"
-  | "dd-mm-yyyy hh:mm"
-  | "yyyy-mm-dd hh:mm"
-  | "hh:mm mm-dd-yyyy"
-  | "hh:mm dd-mm-yyyy"
-  | "hh:mm yyyy-mm-dd";
-
 /**
- * Parse date & time from string using format string
- * @param dateStr Date & time string
+ * Format date using format string
+ * @param date Date
  * @param format Format string
- * @return Parsed date
+ * @return formatted date string
  */
-export function parseDateTime(
-  datetimeStr: string,
-  format: DateTimeFormat,
-): Date {
-  let m, d, y, ho, mi: string;
-  let datePattern: RegExp;
-
-  switch (format) {
-    case "mm-dd-yyyy hh:mm":
-      datePattern = /^(\d{2})-(\d{2})-(\d{4}) (\d{2}):(\d{2})$/;
-      [, m, d, y, ho, mi] = execForce(datePattern, datetimeStr);
-      break;
-    case "dd-mm-yyyy hh:mm":
-      datePattern = /^(\d{2})-(\d{2})-(\d{4}) (\d{2}):(\d{2})$/;
-      [, d, m, y, ho, mi] = execForce(datePattern, datetimeStr);
-      break;
-    case "yyyy-mm-dd hh:mm":
-      datePattern = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})$/;
-      [, y, m, d, ho, mi] = execForce(datePattern, datetimeStr);
-      break;
-    case "hh:mm mm-dd-yyyy":
-      datePattern = /^(\d{2}):(\d{2}) (\d{2})-(\d{2})-(\d{4})$/;
-      [, ho, mi, m, d, y] = execForce(datePattern, datetimeStr);
-      break;
-    case "hh:mm dd-mm-yyyy":
-      datePattern = /^(\d{2}):(\d{2}) (\d{2})-(\d{2})-(\d{4})$/;
-      [, ho, mi, d, m, y] = execForce(datePattern, datetimeStr);
-      break;
-    case "hh:mm yyyy-mm-dd":
-      datePattern = /^(\d{2}):(\d{2}) (\d{4})-(\d{2})-(\d{2})$/;
-      [, ho, mi, y, m, d] = execForce(datePattern, datetimeStr);
-      break;
-    default:
-      throw new Error("Invalid datetime format!");
-  }
-
-  return new Date(Number(y), Number(m) - 1, Number(d), Number(ho), Number(mi));
+export function format(date: Date, formatString: string): string {
+  const formatter = new DateTimeFormatter(formatString);
+  return formatter.format(date);
 }
 
 /**
@@ -120,14 +54,6 @@ export function dayOfYear(date: Date): number {
   return Math.floor(diff / DAY);
 }
 
-/**
- * Get number of current day in year
- * @return Number of current day in year
- */
-export function currentDayOfYear(): number {
-  return dayOfYear(new Date());
-}
-
 /**
  * Get number of the week in the year (ISO-8601)
  * @return Number of the week in year
diff --git a/std/datetime/test.ts b/std/datetime/test.ts
index d5dccee73c3d9e..d8f38202363c3f 100644
--- a/std/datetime/test.ts
+++ b/std/datetime/test.ts
@@ -3,77 +3,103 @@ import { assert, assertEquals, assertThrows } from "../testing/asserts.ts";
 import * as datetime from "./mod.ts";
 
 Deno.test({
-  name: "[std/datetime] parseDate",
+  name: "[std/datetime] parse",
   fn: () => {
     assertEquals(
-      datetime.parseDateTime("01-03-2019 16:30", "mm-dd-yyyy hh:mm"),
+      datetime.parse("01-03-2019 16:30", "MM-dd-yyyy hh:mm"),
       new Date(2019, 0, 3, 16, 30),
     );
     assertEquals(
-      datetime.parseDateTime("03-01-2019 16:31", "dd-mm-yyyy hh:mm"),
+      datetime.parse("01.03.2019 16:30", "MM.dd.yyyy hh:mm"),
+      new Date(2019, 0, 3, 16, 30),
+    );
+    assertEquals(
+      datetime.parse("03-01-2019 16:31", "dd-MM-yyyy hh:mm"),
       new Date(2019, 0, 3, 16, 31),
     );
     assertEquals(
-      datetime.parseDateTime("2019-01-03 16:32", "yyyy-mm-dd hh:mm"),
+      datetime.parse("2019-01-03 16:32", "yyyy-MM-dd hh:mm"),
       new Date(2019, 0, 3, 16, 32),
     );
     assertEquals(
-      datetime.parseDateTime("16:33 01-03-2019", "hh:mm mm-dd-yyyy"),
+      datetime.parse("16:33 01-03-2019", "hh:mm MM-dd-yyyy"),
       new Date(2019, 0, 3, 16, 33),
     );
     assertEquals(
-      datetime.parseDateTime("16:34 03-01-2019", "hh:mm dd-mm-yyyy"),
+      datetime.parse("01-03-2019 16:33:23.123", "MM-dd-yyyy hh:mm:ss.SSS"),
+      new Date(2019, 0, 3, 16, 33, 23, 123),
+    );
+    assertEquals(
+      datetime.parse("01-03-2019 09:33 PM", "MM-dd-yyyy hh:mm a"),
+      new Date(2019, 0, 3, 21, 33),
+    );
+    assertEquals(
+      datetime.parse("16:34 03-01-2019", "hh:mm dd-MM-yyyy"),
       new Date(2019, 0, 3, 16, 34),
     );
     assertEquals(
-      datetime.parseDateTime("16:35 2019-01-03", "hh:mm yyyy-mm-dd"),
+      datetime.parse("16:35 2019-01-03", "hh:mm yyyy-MM-dd"),
       new Date(2019, 0, 3, 16, 35),
     );
+    assertEquals(
+      datetime.parse("01-03-2019", "MM-dd-yyyy"),
+      new Date(2019, 0, 3),
+    );
+    assertEquals(
+      datetime.parse("03-01-2019", "dd-MM-yyyy"),
+      new Date(2019, 0, 3),
+    );
+    assertEquals(
+      datetime.parse("2019-01-03", "yyyy-MM-dd"),
+      new Date(2019, 0, 3),
+    );
   },
 });
 
 Deno.test({
   name: "[std/datetime] invalidParseDateTimeFormatThrows",
   fn: () => {
-    assertThrows(
-      (): void => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (datetime as any).parseDateTime("2019-01-01 00:00", "x-y-z");
-      },
-      Error,
-      "Invalid datetime format!",
-    );
+    assertThrows((): void => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (datetime as any).parse("2019-01-01 00:00", "x-y-z");
+    }, Error);
+    assertThrows((): void => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (datetime as any).parse("2019-01-01", "x-y-z");
+    }, Error);
   },
 });
 
 Deno.test({
-  name: "[std/datetime] parseDate",
+  name: "[std/datetime] format",
   fn: () => {
     assertEquals(
-      datetime.parseDate("01-03-2019", "mm-dd-yyyy"),
-      new Date(2019, 0, 3),
+      "2019-01-01",
+      datetime.format(new Date("2019-01-01T03:24:00"), "yyyy-MM-dd"),
     );
     assertEquals(
-      datetime.parseDate("03-01-2019", "dd-mm-yyyy"),
-      new Date(2019, 0, 3),
+      "01.01.2019",
+      datetime.format(new Date("2019-01-01T03:24:00"), "dd.MM.yyyy"),
     );
     assertEquals(
-      datetime.parseDate("2019-01-03", "yyyy-mm-dd"),
-      new Date(2019, 0, 3),
+      "03:24:00",
+      datetime.format(new Date("2019-01-01T03:24:00"), "hh:mm:ss"),
     );
-  },
-});
-
-Deno.test({
-  name: "[std/datetime] invalidParseDateFormatThrows",
-  fn: () => {
-    assertThrows(
-      (): void => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (datetime as any).parseDate("2019-01-01", "x-y-z");
-      },
-      Error,
-      "Invalid date format!",
+    assertEquals(
+      "03:24:00.532",
+      datetime.format(new Date("2019-01-01T03:24:00.532"), "hh:mm:ss.SSS"),
+    );
+    assertEquals(
+      "03:24:00 AM",
+      datetime.format(new Date("2019-01-01T03:24:00"), "hh:mm:ss a"),
+    );
+    assertEquals(
+      "09:24:00 PM",
+      datetime.format(new Date("2019-01-01T21:24:00"), "hh:mm:ss a"),
+    );
+    assertEquals(
+      datetime.format(new Date(2019, 0, 20), "'today:' yyyy-MM-dd"),
+      "today: 2019-01-20",
     );
   },
 });
@@ -87,13 +113,6 @@ Deno.test({
   },
 });
 
-Deno.test({
-  name: "[std/datetime] currentDayOfYear",
-  fn: () => {
-    assertEquals(datetime.dayOfYear(new Date()), datetime.currentDayOfYear());
-  },
-});
-
 Deno.test({
   name: "[std/datetime] weekOfYear",
   fn: () => {
@@ -186,7 +205,7 @@ Deno.test({
 });
 
 Deno.test({
-  name: "[std/datetime] Difference",
+  name: "[std/datetime] difference",
   fn(): void {
     const denoInit = new Date("2018/5/14");
     const denoRelaseV1 = new Date("2020/5/13");
diff --git a/std/datetime/tokenizer.ts b/std/datetime/tokenizer.ts
new file mode 100644
index 00000000000000..05314b7706acfa
--- /dev/null
+++ b/std/datetime/tokenizer.ts
@@ -0,0 +1,69 @@
+export type Token = {
+  type: string;
+  value: string | number;
+  index: number;
+};
+
+interface ReceiverResult {
+  [name: string]: string | number;
+}
+export type CallbackResult = { type: string; value: string | number };
+type CallbackFunction = (value: unknown) => CallbackResult;
+
+export type TestResult = { value: unknown; length: number } | undefined;
+export type TestFunction = (
+  string: string,
+) => TestResult | undefined;
+
+export interface Rule {
+  test: TestFunction;
+  fn: CallbackFunction;
+}
+
+export class Tokenizer {
+  rules: Rule[];
+
+  constructor(rules: Rule[] = []) {
+    this.rules = rules;
+  }
+
+  addRule(test: TestFunction, fn: CallbackFunction): Tokenizer {
+    this.rules.push({ test, fn });
+    return this;
+  }
+
+  tokenize(
+    string: string,
+    receiver = (token: Token): ReceiverResult => token,
+  ): ReceiverResult[] {
+    function* generator(rules: Rule[]): IterableIterator<ReceiverResult> {
+      let index = 0;
+      for (const rule of rules) {
+        const result = rule.test(string);
+        if (result) {
+          const { value, length } = result;
+          index += length;
+          string = string.slice(length);
+          const token = { ...rule.fn(value), index };
+          yield receiver(token);
+          yield* generator(rules);
+        }
+      }
+    }
+    const tokenGenerator = generator(this.rules);
+
+    const tokens: ReceiverResult[] = [];
+
+    for (const token of tokenGenerator) {
+      tokens.push(token);
+    }
+
+    if (string.length) {
+      throw new Error(
+        `parser error: string not fully parsed! ${string.slice(0, 25)}`,
+      );
+    }
+
+    return tokens;
+  }
+}
diff --git a/std/encoding/README.md b/std/encoding/README.md
index 0ec5f4e7231f04..fa97537771138a 100644
--- a/std/encoding/README.md
+++ b/std/encoding/README.md
@@ -93,31 +93,28 @@ console.log(
 ## TOML
 
 This module parse TOML files. It follows as much as possible the
-[TOML specs](https://github.com/toml-lang/toml). Be sure to read the supported
-types as not every specs is supported at the moment and the handling in
-TypeScript side is a bit different.
+[TOML specs](https://toml.io/en/latest). Be sure to read the supported types as
+not every specs is supported at the moment and the handling in TypeScript side
+is a bit different.
 
 ### Supported types and handling
 
-- :heavy_check_mark: [Keys](https://github.com/toml-lang/toml#string)
-- :exclamation: [String](https://github.com/toml-lang/toml#string)
+- :heavy_check_mark: [Keys](https://toml.io/en/latest#keys)
+- :exclamation: [String](https://toml.io/en/latest#string)
+- :heavy_check_mark: [Multiline String](https://toml.io/en/latest#string)
+- :heavy_check_mark: [Literal String](https://toml.io/en/latest#string)
+- :exclamation: [Integer](https://toml.io/en/latest#integer)
+- :heavy_check_mark: [Float](https://toml.io/en/latest#float)
+- :heavy_check_mark: [Boolean](https://toml.io/en/latest#boolean)
 - :heavy_check_mark:
-  [Multiline String](https://github.com/toml-lang/toml#string)
-- :heavy_check_mark: [Literal String](https://github.com/toml-lang/toml#string)
-- :exclamation: [Integer](https://github.com/toml-lang/toml#integer)
-- :heavy_check_mark: [Float](https://github.com/toml-lang/toml#float)
-- :heavy_check_mark: [Boolean](https://github.com/toml-lang/toml#boolean)
+  [Offset Date-time](https://toml.io/en/latest#offset-date-time)
 - :heavy_check_mark:
-  [Offset Date-time](https://github.com/toml-lang/toml#offset-date-time)
-- :heavy_check_mark:
-  [Local Date-time](https://github.com/toml-lang/toml#local-date-time)
-- :heavy_check_mark: [Local Date](https://github.com/toml-lang/toml#local-date)
-- :exclamation: [Local Time](https://github.com/toml-lang/toml#local-time)
-- :heavy_check_mark: [Table](https://github.com/toml-lang/toml#table)
-- :heavy_check_mark:
-  [Inline Table](https://github.com/toml-lang/toml#inline-table)
-- :exclamation:
-  [Array of Tables](https://github.com/toml-lang/toml#array-of-tables)
+  [Local Date-time](https://toml.io/en/latest#local-date-time)
+- :heavy_check_mark: [Local Date](https://toml.io/en/latest#local-date)
+- :exclamation: [Local Time](https://toml.io/en/latest#local-time)
+- :heavy_check_mark: [Table](https://toml.io/en/latest#table)
+- :heavy_check_mark: [Inline Table](https://toml.io/en/latest#inline-table)
+- :exclamation: [Array of Tables](https://toml.io/en/latest#array-of-tables)
 
 :exclamation: _Supported with warnings see [Warning](#Warning)._
 
@@ -144,14 +141,13 @@ Inline tables are supported. See below:
 
 ```toml
 animal = { type = { name = "pug" } }
-## Output
+## Output { animal: { type: { name: "pug" } } }
 animal = { type.name = "pug" }
-## Output { animal : { type : { name : "pug" } }
+## Output { animal: { type : { name : "pug" } }
 animal.as.leaders = "tosin"
 ## Output { animal: { as: { leaders: "tosin" } } }
 "tosin.abasi" = "guitarist"
-## Output
-"tosin.abasi" : "guitarist"
+## Output { tosin.abasi: "guitarist" }
 ```
 
 ##### Array of Tables
diff --git a/std/encoding/csv.ts b/std/encoding/csv.ts
index 27b40c566809af..bab856b51efdca 100644
--- a/std/encoding/csv.ts
+++ b/std/encoding/csv.ts
@@ -16,13 +16,38 @@ export const ERR_QUOTE = 'extraneous or missing " in quoted-field';
 export const ERR_INVALID_DELIM = "Invalid Delimiter";
 export const ERR_FIELD_COUNT = "wrong number of fields";
 
+/**
+ * A ParseError is returned for parsing errors.
+ * Line numbers are 1-indexed and columns are 0-indexed.
+ */
 export class ParseError extends Error {
-  StartLine: number;
-  Line: number;
-  constructor(start: number, line: number, message: string) {
-    super(message);
-    this.StartLine = start;
-    this.Line = line;
+  /** Line where the record starts*/
+  startLine: number;
+  /** Line where the error occurred */
+  line: number;
+  /** Column (rune index) where the error occurred */
+  column: number | null;
+
+  constructor(
+    start: number,
+    line: number,
+    column: number | null,
+    message: string,
+  ) {
+    super();
+    this.startLine = start;
+    this.column = column;
+    this.line = line;
+
+    if (message === ERR_FIELD_COUNT) {
+      this.message = `record on line ${line}: ${message}`;
+    } else if (start !== line) {
+      this.message =
+        `record on line ${start}; parse error on line ${line}, column ${column}: ${message}`;
+    } else {
+      this.message =
+        `parse error on line ${line}, column ${column}: ${message}`;
+    }
   }
 }
 
@@ -61,13 +86,13 @@ function chkOptions(opt: ReadOptions): void {
 }
 
 async function readRecord(
-  Startline: number,
+  startLine: number,
   reader: BufReader,
   opt: ReadOptions = { comma: ",", trimLeadingSpace: false },
 ): Promise<string[] | null> {
   const tp = new TextProtoReader(reader);
-  const lineIndex = Startline;
   let line = await readLine(tp);
+  let lineIndex = startLine + 1;
 
   if (line === null) return null;
   if (line.length === 0) {
@@ -80,7 +105,8 @@ async function readRecord(
 
   assert(opt.comma != null);
 
-  let quoteError: string | null = null;
+  let fullLine = line;
+  let quoteError: ParseError | null = null;
   const quote = '"';
   const quoteLen = quote.length;
   const commaLen = opt.comma.length;
@@ -103,7 +129,15 @@ async function readRecord(
       if (!opt.lazyQuotes) {
         const j = field.indexOf(quote);
         if (j >= 0) {
-          quoteError = ERR_BARE_QUOTE;
+          const col = runeCount(
+            fullLine.slice(0, fullLine.length - line.slice(j).length),
+          );
+          quoteError = new ParseError(
+            startLine + 1,
+            lineIndex,
+            col,
+            ERR_BARE_QUOTE,
+          );
           break parseField;
         }
       }
@@ -141,27 +175,50 @@ async function readRecord(
             recordBuffer += quote;
           } else {
             // `"*` sequence (invalid non-escaped quote).
-            quoteError = ERR_QUOTE;
+            const col = runeCount(
+              fullLine.slice(0, fullLine.length - line.length - quoteLen),
+            );
+            quoteError = new ParseError(
+              startLine + 1,
+              lineIndex,
+              col,
+              ERR_QUOTE,
+            );
             break parseField;
           }
         } else if (line.length > 0 || !(await isEOF(tp))) {
           // Hit end of line (copy all data so far).
           recordBuffer += line;
           const r = await readLine(tp);
+          lineIndex++;
+          line = r ?? ""; // This is a workaround for making this module behave similarly to the encoding/csv/reader.go.
+          fullLine = line;
           if (r === null) {
+            // Abrupt end of file (EOF or error).
             if (!opt.lazyQuotes) {
-              quoteError = ERR_QUOTE;
+              const col = runeCount(fullLine);
+              quoteError = new ParseError(
+                startLine + 1,
+                lineIndex,
+                col,
+                ERR_QUOTE,
+              );
               break parseField;
             }
             fieldIndexes.push(recordBuffer.length);
             break parseField;
           }
           recordBuffer += "\n"; // preserve line feed (This is because TextProtoReader removes it.)
-          line = r;
         } else {
           // Abrupt end of file (EOF on error).
           if (!opt.lazyQuotes) {
-            quoteError = ERR_QUOTE;
+            const col = runeCount(fullLine);
+            quoteError = new ParseError(
+              startLine + 1,
+              lineIndex,
+              col,
+              ERR_QUOTE,
+            );
             break parseField;
           }
           fieldIndexes.push(recordBuffer.length);
@@ -171,7 +228,7 @@ async function readRecord(
     }
   }
   if (quoteError) {
-    throw new ParseError(Startline, lineIndex, quoteError);
+    throw quoteError;
   }
   const result = [] as string[];
   let preIdx = 0;
@@ -186,6 +243,11 @@ async function isEOF(tp: TextProtoReader): Promise<boolean> {
   return (await tp.r.peek(0)) === null;
 }
 
+function runeCount(s: string): number {
+  // Array.from considers the surrogate pair.
+  return Array.from(s).length;
+}
+
 async function readLine(tp: TextProtoReader): Promise<string | null> {
   let line: string;
   const r = await tp.readLine();
@@ -251,7 +313,7 @@ export async function readMatrix(
 
     if (lineResult.length > 0) {
       if (_nbFields && _nbFields !== lineResult.length) {
-        throw new ParseError(lineIndex, lineIndex, ERR_FIELD_COUNT);
+        throw new ParseError(lineIndex, lineIndex, null, ERR_FIELD_COUNT);
       }
       result.push(lineResult);
     }
diff --git a/std/encoding/csv_test.ts b/std/encoding/csv_test.ts
index 07a8e0965bc96b..aab9e86b11907e 100644
--- a/std/encoding/csv_test.ts
+++ b/std/encoding/csv_test.ts
@@ -4,7 +4,7 @@
 // https://github.com/golang/go/blob/master/LICENSE
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
-import { assertEquals, assert } from "../testing/asserts.ts";
+import { assertEquals, assertThrowsAsync } from "../testing/asserts.ts";
 import {
   readMatrix,
   parse,
@@ -12,6 +12,7 @@ import {
   ERR_QUOTE,
   ERR_INVALID_DELIM,
   ERR_FIELD_COUNT,
+  ParseError,
 } from "./csv.ts";
 import { StringReader } from "../io/readers.ts";
 import { BufReader } from "../io/bufio.ts";
@@ -133,8 +134,7 @@ field"`,
   {
     Name: "BadDoubleQuotes",
     Input: `a""b,c`,
-    Error: ERR_BARE_QUOTE,
-    // Error: &ParseError{StartLine: 1, Line: 1, Column: 1, Err: ErrBareQuote},
+    Error: new ParseError(1, 1, 1, ERR_BARE_QUOTE),
   },
   {
     Name: "TrimQuote",
@@ -145,33 +145,31 @@ field"`,
   {
     Name: "BadBareQuote",
     Input: `a "word","b"`,
-    Error: ERR_BARE_QUOTE,
-    // &ParseError{StartLine: 1, Line: 1, Column: 2, Err: ErrBareQuote}
+    Error: new ParseError(1, 1, 2, ERR_BARE_QUOTE),
   },
   {
     Name: "BadTrailingQuote",
     Input: `"a word",b"`,
-    Error: ERR_BARE_QUOTE,
+    Error: new ParseError(1, 1, 10, ERR_BARE_QUOTE),
   },
   {
     Name: "ExtraneousQuote",
     Input: `"a "word","b"`,
-    Error: ERR_QUOTE,
+    Error: new ParseError(1, 1, 3, ERR_QUOTE),
   },
   {
     Name: "BadFieldCount",
     Input: "a,b,c\nd,e",
-    Error: ERR_FIELD_COUNT,
+    Error: new ParseError(2, 2, null, ERR_FIELD_COUNT),
     UseFieldsPerRecord: true,
     FieldsPerRecord: 0,
   },
   {
     Name: "BadFieldCount1",
     Input: `a,b,c`,
-    // Error: &ParseError{StartLine: 1, Line: 1, Err: ErrFieldCount},
     UseFieldsPerRecord: true,
     FieldsPerRecord: 2,
-    Error: ERR_FIELD_COUNT,
+    Error: new ParseError(1, 1, null, ERR_FIELD_COUNT),
   },
   {
     Name: "FieldCount",
@@ -265,14 +263,12 @@ x,,,
   {
     Name: "StartLine1", // Issue 19019
     Input: 'a,"b\nc"d,e',
-    Error: ERR_QUOTE,
-    // Error: &ParseError{StartLine: 1, Line: 2, Column: 1, Err: ErrQuote},
+    Error: new ParseError(1, 2, 1, ERR_QUOTE),
   },
   {
     Name: "StartLine2",
-    Input: 'a,b\n"d\n\n,e',
-    Error: ERR_QUOTE,
-    // Error: &ParseError{StartLine: 2, Line: 5, Column: 0, Err: ErrQuote},
+    Input: 'a,b\n\"d\n\n,e',
+    Error: new ParseError(2, 5, 0, ERR_QUOTE),
   },
   {
     Name: "CRLFInQuotedField", // Issue 21201
@@ -297,8 +293,7 @@ x,,,
   {
     Name: "QuotedTrailingCRCR",
     Input: '"field"\r\r',
-    Error: ERR_QUOTE,
-    // Error: &ParseError{StartLine: 1, Line: 1, Column: 6, Err: ErrQuote},
+    Error: new ParseError(1, 1, 6, ERR_QUOTE),
   },
   {
     Name: "FieldCR",
@@ -389,8 +384,7 @@ x,,,
   {
     Name: "QuoteWithTrailingCRLF",
     Input: '"foo"bar"\r\n',
-    Error: ERR_QUOTE,
-    // Error: &ParseError{StartLine: 1, Line: 1, Column: 4, Err: ErrQuote},
+    Error: new ParseError(1, 1, 4, ERR_QUOTE),
   },
   {
     Name: "LazyQuoteWithTrailingCRLF",
@@ -411,8 +405,7 @@ x,,,
   {
     Name: "OddQuotes",
     Input: `"""""""`,
-    Error: ERR_QUOTE,
-    // Error:" &ParseError{StartLine: 1, Line: 1, Column: 7, Err: ErrQuote}",
+    Error: new ParseError(1, 1, 7, ERR_QUOTE),
   },
   {
     Name: "LazyOddQuotes",
@@ -423,33 +416,33 @@ x,,,
   {
     Name: "BadComma1",
     Comma: "\n",
-    Error: ERR_INVALID_DELIM,
+    Error: new Error(ERR_INVALID_DELIM),
   },
   {
     Name: "BadComma2",
     Comma: "\r",
-    Error: ERR_INVALID_DELIM,
+    Error: new Error(ERR_INVALID_DELIM),
   },
   {
     Name: "BadComma3",
     Comma: '"',
-    Error: ERR_INVALID_DELIM,
+    Error: new Error(ERR_INVALID_DELIM),
   },
   {
     Name: "BadComment1",
     Comment: "\n",
-    Error: ERR_INVALID_DELIM,
+    Error: new Error(ERR_INVALID_DELIM),
   },
   {
     Name: "BadComment2",
     Comment: "\r",
-    Error: ERR_INVALID_DELIM,
+    Error: new Error(ERR_INVALID_DELIM),
   },
   {
     Name: "BadCommaComment",
     Comma: "X",
     Comment: "X",
-    Error: ERR_INVALID_DELIM,
+    Error: new Error(ERR_INVALID_DELIM),
   },
 ];
 for (const t of testCases) {
@@ -457,8 +450,8 @@ for (const t of testCases) {
     name: `[CSV] ${t.Name}`,
     async fn(): Promise<void> {
       let comma = ",";
-      let comment;
-      let fieldsPerRec;
+      let comment: string | undefined;
+      let fieldsPerRec: number | undefined;
       let trim = false;
       let lazyquote = false;
       if (t.Comma) {
@@ -478,9 +471,8 @@ for (const t of testCases) {
       }
       let actual;
       if (t.Error) {
-        let err;
-        try {
-          actual = await readMatrix(
+        const err = await assertThrowsAsync(async () => {
+          await readMatrix(
             new BufReader(new StringReader(t.Input ?? "")),
             {
               comma: comma,
@@ -490,11 +482,9 @@ for (const t of testCases) {
               lazyQuotes: lazyquote,
             },
           );
-        } catch (e) {
-          err = e;
-        }
-        assert(err);
-        assertEquals(err.message, t.Error);
+        });
+
+        assertEquals(err, t.Error);
       } else {
         actual = await readMatrix(
           new BufReader(new StringReader(t.Input ?? "")),
@@ -625,3 +615,23 @@ for (const testCase of parseTestCases) {
     },
   });
 }
+
+Deno.test({
+  name: "[CSV] ParseError.message",
+  fn(): void {
+    assertEquals(
+      new ParseError(2, 2, null, ERR_FIELD_COUNT).message,
+      `record on line 2: ${ERR_FIELD_COUNT}`,
+    );
+
+    assertEquals(
+      new ParseError(1, 2, 1, ERR_QUOTE).message,
+      `record on line 1; parse error on line 2, column 1: ${ERR_QUOTE}`,
+    );
+
+    assertEquals(
+      new ParseError(1, 1, 7, ERR_QUOTE).message,
+      `parse error on line 1, column 7: ${ERR_QUOTE}`,
+    );
+  },
+});
diff --git a/std/encoding/testdata/boolean.toml b/std/encoding/testdata/boolean.toml
index 242d29c9692261..e3e287981baf80 100644
--- a/std/encoding/testdata/boolean.toml
+++ b/std/encoding/testdata/boolean.toml
@@ -1,3 +1,4 @@
 [boolean] # i hate comments
 bool1 = true
-bool2 = false
\ No newline at end of file
+bool2 = false
+bool3 = true # I love comments
\ No newline at end of file
diff --git a/std/encoding/testdata/string.toml b/std/encoding/testdata/string.toml
index 55e3fca34f1c3f..05f425f1109348 100644
--- a/std/encoding/testdata/string.toml
+++ b/std/encoding/testdata/string.toml
@@ -31,3 +31,4 @@ trimmed in raw strings.
 
 withApostrophe = "What if it's not?"
 withSemicolon = "const message = 'hello world';"
+withHexNumberLiteral = "Prevent bug from stripping string here ->0xabcdef"
diff --git a/std/encoding/toml.ts b/std/encoding/toml.ts
index 43788c06ac25fe..121459dbfc69e9 100644
--- a/std/encoding/toml.ts
+++ b/std/encoding/toml.ts
@@ -218,7 +218,7 @@ class Parser {
     }
 
     // If binary / octal / hex
-    const hex = /(0(?:x|o|b)[0-9a-f_]*)[^#]/gi.exec(dataString);
+    const hex = /^(0(?:x|o|b)[0-9a-f_]*)[^#]/gi.exec(dataString);
     if (hex && hex[0]) {
       return hex[0].trim();
     }
@@ -280,7 +280,7 @@ class Parser {
       return dataString.slice(0, endOfString);
     }
 
-    const m = /(?:|\[|{|).*(?:|\]||})\s*[^#]/g.exec(dataString);
+    const m = /(?:|\[|{).*(?:|\]|})\s*^((?!#).)*/g.exec(dataString);
     if (m) {
       return m[0].trim();
     } else {
@@ -471,6 +471,8 @@ class Dumper {
         out.push(this._strDeclaration([prop], value.toString()));
       } else if (typeof value === "number") {
         out.push(this._numberDeclaration([prop], value));
+      } else if (typeof value === "boolean") {
+        out.push(this._boolDeclaration([prop], value));
       } else if (
         value instanceof Array &&
         this._isSimplySerializable(value[0])
@@ -504,6 +506,7 @@ class Dumper {
     return (
       typeof value === "string" ||
       typeof value === "number" ||
+      typeof value === "boolean" ||
       value instanceof RegExp ||
       value instanceof Date ||
       value instanceof Array
@@ -538,6 +541,9 @@ class Dumper {
         return `${this._declaration(keys)}${value}`;
     }
   }
+  _boolDeclaration(keys: string[], value: boolean): string {
+    return `${this._declaration(keys)}${value}`;
+  }
   _dateDeclaration(keys: string[], value: Date): string {
     function dtPad(v: string, lPad = 2): string {
       return v.padStart(lPad, "0");
diff --git a/std/encoding/toml_test.ts b/std/encoding/toml_test.ts
index 45d0a66e64bf4e..565fe1eebd6f7f 100644
--- a/std/encoding/toml_test.ts
+++ b/std/encoding/toml_test.ts
@@ -29,6 +29,8 @@ Deno.test({
           "whitespace\n   is preserved.",
         withApostrophe: "What if it's not?",
         withSemicolon: `const message = 'hello world';`,
+        withHexNumberLiteral:
+          "Prevent bug from stripping string here ->0xabcdef",
       },
     };
     const actual = parseFile(path.join(testFilesDir, "string.toml"));
@@ -48,7 +50,7 @@ Deno.test({
 Deno.test({
   name: "[TOML] Boolean",
   fn(): void {
-    const expected = { boolean: { bool1: true, bool2: false } };
+    const expected = { boolean: { bool1: true, bool2: false, bool3: true } };
     const actual = parseFile(path.join(testFilesDir, "boolean.toml"));
     assertEquals(actual, expected);
   },
@@ -349,6 +351,8 @@ Deno.test({
         [1, 2],
       ],
       hosts: ["alpha", "omega"],
+      bool: true,
+      bool2: false,
     };
     const expected = `deno    = "is"
 not     = "[node]"
@@ -383,6 +387,8 @@ sf5     = NaN
 sf6     = NaN
 data    = [["gamma","delta"],[1,2]]
 hosts   = ["alpha","omega"]
+bool    = true
+bool2   = false
 
 [foo]
 bar     = "deno"
diff --git a/std/examples/chat/server_test.ts b/std/examples/chat/server_test.ts
index 872f4ee1218c55..27745e6596f699 100644
--- a/std/examples/chat/server_test.ts
+++ b/std/examples/chat/server_test.ts
@@ -9,13 +9,11 @@ async function startServer(): Promise<
   Deno.Process<Deno.RunOptions & { stdout: "piped" }>
 > {
   const server = Deno.run({
-    // TODO(lucacasonato): remove unstable once possible
     cmd: [
       Deno.execPath(),
       "run",
       "--allow-net",
       "--allow-read",
-      "--unstable",
       "server.ts",
     ],
     cwd: "examples/chat",
diff --git a/std/fs/README.md b/std/fs/README.md
index aad81acee877b7..0b71b2b9d5baa8 100644
--- a/std/fs/README.md
+++ b/std/fs/README.md
@@ -133,18 +133,24 @@ const foo = readJsonSync("./foo.json");
 
 Writes an object to a JSON file.
 
-**WriteJsonOptions**
+#### WriteJsonOptions
 
 - replacer : An array of strings and numbers that acts as a approved list for
   selecting the object properties that will be stringified.
 - space : Adds indentation, white space, and line break characters to the
   return-value JSON text to make it easier to read.
 
+You can also specify options from `Deno.WriteFileOptions` to configure how the
+file is written.
+
 ```ts
 import { writeJson, writeJsonSync } from "https://deno.land/std/fs/mod.ts";
 
 writeJson("./target.dat", { foo: "bar" }, { spaces: 2 }); // returns a promise
 writeJsonSync("./target.dat", { foo: "bar" }, { replacer: ["foo"] }); // void
+
+// appends to the file instead of rewriting
+writeJsonSync("./target.dat", { foo: "bar" }, { append: true });
 ```
 
 ### walk
diff --git a/std/fs/empty_dir_test.ts b/std/fs/empty_dir_test.ts
index 6c06c9d52385d3..b71ae16f8de349 100644
--- a/std/fs/empty_dir_test.ts
+++ b/std/fs/empty_dir_test.ts
@@ -203,8 +203,7 @@ for (const s of scenes) {
       );
 
       try {
-        // TODO(lucacasonato): remove unstable when stabilized
-        const args = [Deno.execPath(), "run", "--unstable"];
+        const args = [Deno.execPath(), "run"];
 
         if (s.read) {
           args.push("--allow-read");
diff --git a/std/fs/exists_test.ts b/std/fs/exists_test.ts
index 3c280f4c4b7d1d..5f3c8565083a36 100644
--- a/std/fs/exists_test.ts
+++ b/std/fs/exists_test.ts
@@ -112,8 +112,7 @@ for (const s of scenes) {
   let title = `test ${s.async ? "exists" : "existsSync"}("testdata/${s.file}")`;
   title += ` ${s.read ? "with" : "without"} --allow-read`;
   Deno.test(`[fs] existsPermission ${title}`, async function (): Promise<void> {
-    // TODO(lucacasonato): remove unstable when stabilized
-    const args = [Deno.execPath(), "run", "--unstable"];
+    const args = [Deno.execPath(), "run"];
 
     if (s.read) {
       args.push("--allow-read");
diff --git a/std/fs/expand_glob.ts b/std/fs/expand_glob.ts
index 6d1f883b56032b..7d9f0d8709e91c 100644
--- a/std/fs/expand_glob.ts
+++ b/std/fs/expand_glob.ts
@@ -18,7 +18,7 @@ import { assert } from "../_util/assert.ts";
 
 const isWindows = Deno.build.os == "windows";
 
-export interface ExpandGlobOptions extends GlobOptions {
+export interface ExpandGlobOptions extends Omit<GlobOptions, "os"> {
   root?: string;
   exclude?: string[];
   includeDirs?: boolean;
diff --git a/std/fs/walk.ts b/std/fs/walk.ts
index 8f21968331b28b..06d889b0e42ee0 100644
--- a/std/fs/walk.ts
+++ b/std/fs/walk.ts
@@ -76,10 +76,11 @@ export interface WalkEntry extends Deno.DirEntry {
  * - match?: RegExp[];
  * - skip?: RegExp[];
  *
- *      for await (const entry of walk(".")) {
- *        console.log(entry.path);
- *        assert(entry.isFile);
- *      };
+ *
+ *       for await (const entry of walk(".")) {
+ *         console.log(entry.path);
+ *         assert(entry.isFile);
+ *       }
  */
 export async function* walk(
   root: string,
diff --git a/std/fs/write_json.ts b/std/fs/write_json.ts
index 015957bba51889..46c33572a7f733 100644
--- a/std/fs/write_json.ts
+++ b/std/fs/write_json.ts
@@ -2,32 +2,43 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type Replacer = (key: string, value: any) => any;
 
-export interface WriteJsonOptions {
-  spaces?: number | string;
+export interface WriteJsonOptions extends Deno.WriteFileOptions {
   replacer?: Array<number | string> | Replacer;
+  spaces?: number | string;
 }
 
-/* Writes an object to a JSON file. */
-export async function writeJson(
+function serialize(
   filePath: string,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   object: any,
-  options: WriteJsonOptions = {},
-): Promise<void> {
-  let contentRaw = "";
-
+  options: WriteJsonOptions,
+): string {
   try {
-    contentRaw = JSON.stringify(
+    const jsonString = JSON.stringify(
       object,
       options.replacer as string[],
       options.spaces,
     );
+    return `${jsonString}\n`;
   } catch (err) {
     err.message = `${filePath}: ${err.message}`;
     throw err;
   }
+}
 
-  await Deno.writeFile(filePath, new TextEncoder().encode(contentRaw));
+/* Writes an object to a JSON file. */
+export async function writeJson(
+  filePath: string,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  object: any,
+  options: WriteJsonOptions = {},
+): Promise<void> {
+  const jsonString = serialize(filePath, object, options);
+  await Deno.writeTextFile(filePath, jsonString, {
+    append: options.append,
+    create: options.create,
+    mode: options.mode,
+  });
 }
 
 /* Writes an object to a JSON file. */
@@ -37,18 +48,10 @@ export function writeJsonSync(
   object: any,
   options: WriteJsonOptions = {},
 ): void {
-  let contentRaw = "";
-
-  try {
-    contentRaw = JSON.stringify(
-      object,
-      options.replacer as string[],
-      options.spaces,
-    );
-  } catch (err) {
-    err.message = `${filePath}: ${err.message}`;
-    throw err;
-  }
-
-  Deno.writeFileSync(filePath, new TextEncoder().encode(contentRaw));
+  const jsonString = serialize(filePath, object, options);
+  Deno.writeTextFileSync(filePath, jsonString, {
+    append: options.append,
+    create: options.create,
+    mode: options.mode,
+  });
 }
diff --git a/std/fs/write_json_test.ts b/std/fs/write_json_test.ts
index c22bd7bf162216..3b249ba9bec772 100644
--- a/std/fs/write_json_test.ts
+++ b/std/fs/write_json_test.ts
@@ -1,243 +1,201 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+import * as path from "../path/mod.ts";
 import {
   assertEquals,
-  assertThrowsAsync,
   assertThrows,
+  assertThrowsAsync,
 } from "../testing/asserts.ts";
-import * as path from "../path/mod.ts";
+import {
+  exists,
+  existsSync,
+} from "./exists.ts";
 import { writeJson, writeJsonSync } from "./write_json.ts";
 
 const testdataDir = path.resolve("fs", "testdata");
 
-Deno.test("writeJsonIfNotExists", async function (): Promise<void> {
-  const notExistsJsonFile = path.join(testdataDir, "file_not_exists.json");
+Deno.test("writeJson not exists", async function (): Promise<void> {
+  const notExistsJsonFile = path.join(testdataDir, "writeJson_not_exists.json");
 
-  await assertThrowsAsync(
-    async (): Promise<void> => {
-      await writeJson(notExistsJsonFile, { a: "1" });
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
-  );
+  await writeJson(notExistsJsonFile, { a: "1" });
 
-  const content = await Deno.readFile(notExistsJsonFile);
+  const content = await Deno.readTextFile(notExistsJsonFile);
 
   await Deno.remove(notExistsJsonFile);
 
-  assertEquals(new TextDecoder().decode(content), `{"a":"1"}`);
-});
-
-Deno.test("writeJsonIfExists", async function (): Promise<void> {
-  const existsJsonFile = path.join(testdataDir, "file_write_exists.json");
-
-  await Deno.writeFile(existsJsonFile, new Uint8Array());
-
-  await assertThrowsAsync(
-    async (): Promise<void> => {
-      await writeJson(existsJsonFile, { a: "1" });
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
-  );
-
-  const content = await Deno.readFile(existsJsonFile);
-
-  await Deno.remove(existsJsonFile);
-
-  assertEquals(new TextDecoder().decode(content), `{"a":"1"}`);
+  assertEquals(content, `{"a":"1"}\n`);
 });
 
-Deno.test("writeJsonIfExistsAnInvalidJson", async function (): Promise<void> {
-  const existsInvalidJsonFile = path.join(
+Deno.test("writeJson if not exists", async function (): Promise<void> {
+  const notExistsJsonFile = path.join(
     testdataDir,
-    "file_write_invalid.json",
+    "writeJson_file_not_exists.json",
   );
 
-  const invalidJsonContent = new TextEncoder().encode("[123}");
-  await Deno.writeFile(existsInvalidJsonFile, invalidJsonContent);
-
-  await assertThrowsAsync(
-    async (): Promise<void> => {
-      await writeJson(existsInvalidJsonFile, { a: "1" });
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
-  );
-
-  const content = await Deno.readFile(existsInvalidJsonFile);
-
-  await Deno.remove(existsInvalidJsonFile);
-
-  assertEquals(new TextDecoder().decode(content), `{"a":"1"}`);
+  try {
+    assertThrowsAsync(
+      async function (): Promise<void> {
+        await writeJson(notExistsJsonFile, { a: "1" }, { create: false });
+      },
+      Deno.errors.NotFound,
+    );
+  } finally {
+    if (await exists(notExistsJsonFile)) await Deno.remove(notExistsJsonFile);
+  }
 });
 
-Deno.test("writeJsonWithSpaces", async function (): Promise<void> {
-  const existsJsonFile = path.join(testdataDir, "file_write_spaces.json");
-
-  const invalidJsonContent = new TextEncoder().encode();
-  await Deno.writeFile(existsJsonFile, invalidJsonContent);
-
-  await assertThrowsAsync(
-    async (): Promise<void> => {
-      await writeJson(existsJsonFile, { a: "1" }, { spaces: 2 });
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
-  );
-
-  const content = await Deno.readFile(existsJsonFile);
-
-  await Deno.remove(existsJsonFile);
+Deno.test("writeJson exists", async function (): Promise<void> {
+  const existsJsonFile = path.join(testdataDir, "writeJson_exists.json");
+  await Deno.writeFile(existsJsonFile, new Uint8Array());
 
-  assertEquals(new TextDecoder().decode(content), `{\n  "a": "1"\n}`);
+  try {
+    await writeJson(existsJsonFile, { a: "1" });
+    const content = await Deno.readTextFile(existsJsonFile);
+    assertEquals(content, `{"a":"1"}\n`);
+  } finally {
+    await Deno.remove(existsJsonFile);
+  }
 });
 
-Deno.test("writeJsonWithReplacer", async function (): Promise<void> {
-  const existsJsonFile = path.join(testdataDir, "file_write_replacer.json");
-
-  const invalidJsonContent = new TextEncoder().encode();
-  await Deno.writeFile(existsJsonFile, invalidJsonContent);
-
-  await assertThrowsAsync(
-    async (): Promise<void> => {
-      await writeJson(
-        existsJsonFile,
-        { a: "1", b: "2", c: "3" },
-        {
-          replacer: ["a"],
-        },
-      );
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
-  );
-
-  const content = await Deno.readFile(existsJsonFile);
-
-  await Deno.remove(existsJsonFile);
+Deno.test("writeJson spaces", async function (): Promise<void> {
+  const existsJsonFile = path.join(testdataDir, "writeJson_spaces.json");
+  await Deno.writeFile(existsJsonFile, new Uint8Array());
 
-  assertEquals(new TextDecoder().decode(content), `{"a":"1"}`);
+  try {
+    await writeJson(existsJsonFile, { a: "1" }, { spaces: 2 });
+    const content = await Deno.readTextFile(existsJsonFile);
+    assertEquals(content, `{\n  "a": "1"\n}\n`);
+  } finally {
+    await Deno.remove(existsJsonFile);
+  }
 });
 
-Deno.test("writeJsonSyncIfNotExists", function (): void {
-  const notExistsJsonFile = path.join(testdataDir, "file_not_exists_sync.json");
+Deno.test("writeJson replacer", async function (): Promise<void> {
+  const existsJsonFile = path.join(testdataDir, "writeJson_replacer.json");
+  await Deno.writeFile(existsJsonFile, new Uint8Array());
 
-  assertThrows(
-    (): void => {
-      writeJsonSync(notExistsJsonFile, { a: "1" });
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
-  );
+  try {
+    await writeJson(
+      existsJsonFile,
+      { a: "1", b: "2", c: "3" },
+      { replacer: ["a"] },
+    );
+
+    const content = await Deno.readTextFile(existsJsonFile);
+    assertEquals(content, `{"a":"1"}\n`);
+  } finally {
+    await Deno.remove(existsJsonFile);
+  }
+});
 
-  const content = Deno.readFileSync(notExistsJsonFile);
+Deno.test("writeJson append", async function (): Promise<void> {
+  const existsJsonFile = path.join(testdataDir, "writeJson_append.json");
+  await Deno.writeFile(existsJsonFile, new Uint8Array());
 
-  Deno.removeSync(notExistsJsonFile);
+  try {
+    await writeJson(existsJsonFile, { a: "1" }, { append: true });
+    await writeJson(existsJsonFile, { b: "2" }, { append: true });
 
-  assertEquals(new TextDecoder().decode(content), `{"a":"1"}`);
+    const content = await Deno.readTextFile(existsJsonFile);
+    assertEquals(content, `{"a":"1"}\n{"b":"2"}\n`);
+  } finally {
+    await Deno.remove(existsJsonFile);
+  }
 });
 
-Deno.test("writeJsonSyncIfExists", function (): void {
-  const existsJsonFile = path.join(testdataDir, "file_write_exists_sync.json");
-
-  Deno.writeFileSync(existsJsonFile, new Uint8Array());
-
-  assertThrows(
-    (): void => {
-      writeJsonSync(existsJsonFile, { a: "1" });
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
+Deno.test("writeJsonSync not exists", function (): void {
+  const notExistsJsonFile = path.join(
+    testdataDir,
+    "writeJsonSync_not_exists.json",
   );
 
-  const content = Deno.readFileSync(existsJsonFile);
+  writeJsonSync(notExistsJsonFile, { a: "1" });
 
-  Deno.removeSync(existsJsonFile);
+  const content = Deno.readTextFileSync(notExistsJsonFile);
 
-  assertEquals(new TextDecoder().decode(content), `{"a":"1"}`);
+  Deno.removeSync(notExistsJsonFile);
+
+  assertEquals(content, `{"a":"1"}\n`);
 });
 
-Deno.test("writeJsonSyncIfExistsAnInvalidJson", function (): void {
-  const existsInvalidJsonFile = path.join(
+Deno.test("writeJsonSync if not exists", function (): void {
+  const notExistsJsonFile = path.join(
     testdataDir,
-    "file_write_invalid_sync.json",
-  );
-
-  const invalidJsonContent = new TextEncoder().encode("[123}");
-  Deno.writeFileSync(existsInvalidJsonFile, invalidJsonContent);
-
-  assertThrows(
-    (): void => {
-      writeJsonSync(existsInvalidJsonFile, { a: "1" });
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
+    "writeJsonSync_file_not_exists.json",
   );
 
-  const content = Deno.readFileSync(existsInvalidJsonFile);
-
-  Deno.removeSync(existsInvalidJsonFile);
-
-  assertEquals(new TextDecoder().decode(content), `{"a":"1"}`);
+  try {
+    assertThrows(
+      function (): void {
+        writeJsonSync(notExistsJsonFile, { a: "1" }, { create: false });
+      },
+      Deno.errors.NotFound,
+    );
+  } finally {
+    if (existsSync(notExistsJsonFile)) Deno.removeSync(notExistsJsonFile);
+  }
 });
 
-Deno.test("writeJsonWithSpaces", function (): void {
-  const existsJsonFile = path.join(testdataDir, "file_write_spaces_sync.json");
-
-  const invalidJsonContent = new TextEncoder().encode();
-  Deno.writeFileSync(existsJsonFile, invalidJsonContent);
+Deno.test("writeJsonSync exists", function (): void {
+  const existsJsonFile = path.join(testdataDir, "writeJsonSync_exists.json");
+  Deno.writeFileSync(existsJsonFile, new Uint8Array());
 
-  assertThrows(
-    (): void => {
-      writeJsonSync(existsJsonFile, { a: "1" }, { spaces: 2 });
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
-  );
+  try {
+    writeJsonSync(existsJsonFile, { a: "1" });
+    const content = Deno.readTextFileSync(existsJsonFile);
+    assertEquals(content, `{"a":"1"}\n`);
+  } finally {
+    Deno.removeSync(existsJsonFile);
+  }
+});
 
-  const content = Deno.readFileSync(existsJsonFile);
+Deno.test("writeJsonSync spaces", function (): void {
+  const existsJsonFile = path.join(testdataDir, "writeJsonSync_spaces.json");
 
-  Deno.removeSync(existsJsonFile);
+  Deno.writeFileSync(existsJsonFile, new Uint8Array());
 
-  assertEquals(new TextDecoder().decode(content), `{\n  "a": "1"\n}`);
+  try {
+    writeJsonSync(existsJsonFile, { a: "1" }, { spaces: 2 });
+    const content = Deno.readTextFileSync(existsJsonFile);
+    assertEquals(content, `{\n  "a": "1"\n}\n`);
+  } finally {
+    Deno.removeSync(existsJsonFile);
+  }
 });
 
-Deno.test("writeJsonWithReplacer", function (): void {
+Deno.test("writeJsonSync replacer", function (): void {
   const existsJsonFile = path.join(
     testdataDir,
-    "file_write_replacer_sync.json",
+    "writeJsonSync_replacer.json",
   );
 
-  const invalidJsonContent = new TextEncoder().encode();
-  Deno.writeFileSync(existsJsonFile, invalidJsonContent);
-
-  assertThrows(
-    (): void => {
-      writeJsonSync(
-        existsJsonFile,
-        { a: "1", b: "2", c: "3" },
-        {
-          replacer: ["a"],
-        },
-      );
-      throw new Error("should write success");
-    },
-    Error,
-    "should write success",
-  );
+  Deno.writeFileSync(existsJsonFile, new Uint8Array());
 
-  const content = Deno.readFileSync(existsJsonFile);
+  try {
+    writeJsonSync(
+      existsJsonFile,
+      { a: "1", b: "2", c: "3" },
+      { replacer: ["a"] },
+    );
+
+    const content = Deno.readTextFileSync(existsJsonFile);
+    assertEquals(content, `{"a":"1"}\n`);
+  } finally {
+    Deno.removeSync(existsJsonFile);
+  }
+});
+
+Deno.test("writeJsonSync append", function (): void {
+  const existsJsonFile = path.join(testdataDir, "writeJsonSync_append.json");
+
+  Deno.writeFileSync(existsJsonFile, new Uint8Array());
 
-  Deno.removeSync(existsJsonFile);
+  try {
+    writeJsonSync(existsJsonFile, { a: "1" }, { append: true });
+    writeJsonSync(existsJsonFile, { b: "2" }, { append: true });
 
-  assertEquals(new TextDecoder().decode(content), `{"a":"1"}`);
+    const content = Deno.readTextFileSync(existsJsonFile);
+    assertEquals(content, `{"a":"1"}\n{"b":"2"}\n`);
+  } finally {
+    Deno.removeSync(existsJsonFile);
+  }
 });
diff --git a/std/http/file_server.ts b/std/http/file_server.ts
old mode 100755
new mode 100644
index ffcf31e5483238..ff9a073e72119b
--- a/std/http/file_server.ts
+++ b/std/http/file_server.ts
@@ -7,7 +7,13 @@
 // https://github.com/indexzero/http-server/blob/master/test/http-server-test.js
 
 import { posix, extname } from "../path/mod.ts";
-import { listenAndServe, ServerRequest, Response } from "./server.ts";
+import {
+  listenAndServe,
+  listenAndServeTLS,
+  ServerRequest,
+  Response,
+  HTTPSOptions,
+} from "./server.ts";
 import { parse } from "../flags/mod.ts";
 import { assert } from "../_util/assert.ts";
 
@@ -18,16 +24,26 @@ interface EntryInfo {
   name: string;
 }
 
-interface FileServerArgs {
+export interface FileServerArgs {
   _: string[];
   // -p --port
-  p: number;
-  port: number;
+  p?: number;
+  port?: number;
   // --cors
-  cors: boolean;
+  cors?: boolean;
+  // --no-dir-listing
+  "dir-listing"?: boolean;
+  // --host
+  host?: string;
+  // -c --cert
+  c?: string;
+  cert?: string;
+  // -k --key
+  k?: string;
+  key?: string;
   // -h --help
-  h: boolean;
-  help: boolean;
+  h?: boolean;
+  help?: boolean;
 }
 
 const encoder = new TextEncoder();
@@ -49,6 +65,7 @@ const MEDIA_TYPES: Record<string, string> = {
   ".gz": "application/gzip",
   ".css": "text/css",
   ".wasm": "application/wasm",
+  ".mjs": "application/javascript",
 };
 
 /** Returns the content-type based on the extension of a path. */
@@ -306,7 +323,20 @@ function html(strings: TemplateStringsArray, ...values: unknown[]): string {
 
 function main(): void {
   const CORSEnabled = serverArgs.cors ? true : false;
-  const addr = `0.0.0.0:${serverArgs.port ?? serverArgs.p ?? 4507}`;
+  const port = serverArgs.port ?? serverArgs.p ?? 4507;
+  const host = serverArgs.host ?? "0.0.0.0";
+  const addr = `${host}:${port}`;
+  const tlsOpts = {} as HTTPSOptions;
+  tlsOpts.certFile = serverArgs.cert ?? serverArgs.c ?? "";
+  tlsOpts.keyFile = serverArgs.key ?? serverArgs.k ?? "";
+  const dirListingEnabled = serverArgs["dir-listing"] ?? true;
+
+  if (tlsOpts.keyFile || tlsOpts.certFile) {
+    if (tlsOpts.keyFile === "" || tlsOpts.certFile === "") {
+      console.log("--key and --cert are required for TLS");
+      serverArgs.h = true;
+    }
+  }
 
   if (serverArgs.h ?? serverArgs.help) {
     console.log(`Deno File Server
@@ -321,50 +351,66 @@ function main(): void {
   OPTIONS:
     -h, --help          Prints help information
     -p, --port <PORT>   Set port
-    --cors              Enable CORS via the "Access-Control-Allow-Origin" header`);
+    --cors              Enable CORS via the "Access-Control-Allow-Origin" header
+    --host     <HOST>   Hostname (default is 0.0.0.0)
+    -c, --cert <FILE>   TLS certificate file (enables TLS)
+    -k, --key  <FILE>   TLS key file (enables TLS)
+    --no-dir-listing    Disable directory listing
+
+    All TLS options are required when one is provided.`);
     Deno.exit();
   }
 
-  listenAndServe(
-    addr,
-    async (req): Promise<void> => {
-      let normalizedUrl = posix.normalize(req.url);
-      try {
-        normalizedUrl = decodeURIComponent(normalizedUrl);
-      } catch (e) {
-        if (!(e instanceof URIError)) {
-          throw e;
-        }
+  const handler = async (req: ServerRequest): Promise<void> => {
+    let normalizedUrl = posix.normalize(req.url);
+    try {
+      normalizedUrl = decodeURIComponent(normalizedUrl);
+    } catch (e) {
+      if (!(e instanceof URIError)) {
+        throw e;
       }
-      const fsPath = posix.join(target, normalizedUrl);
+    }
+    const fsPath = posix.join(target, normalizedUrl);
 
-      let response: Response | undefined;
-      try {
-        const fileInfo = await Deno.stat(fsPath);
-        if (fileInfo.isDirectory) {
+    let response: Response | undefined;
+    try {
+      const fileInfo = await Deno.stat(fsPath);
+      if (fileInfo.isDirectory) {
+        if (dirListingEnabled) {
           response = await serveDir(req, fsPath);
         } else {
-          response = await serveFile(req, fsPath);
+          throw new Deno.errors.NotFound();
         }
+      } else {
+        response = await serveFile(req, fsPath);
+      }
+    } catch (e) {
+      console.error(e.message);
+      response = await serveFallback(req, e);
+    } finally {
+      if (CORSEnabled) {
+        assert(response);
+        setCORS(response);
+      }
+      serverLog(req, response!);
+      try {
+        await req.respond(response!);
       } catch (e) {
         console.error(e.message);
-        response = await serveFallback(req, e);
-      } finally {
-        if (CORSEnabled) {
-          assert(response);
-          setCORS(response);
-        }
-        serverLog(req, response!);
-        try {
-          await req.respond(response!);
-        } catch (e) {
-          console.error(e.message);
-        }
       }
-    },
-  );
+    }
+  };
 
-  console.log(`HTTP server listening on http://${addr}/`);
+  let proto = "http";
+  if (tlsOpts.keyFile || tlsOpts.certFile) {
+    proto += "s";
+    tlsOpts.hostname = host;
+    tlsOpts.port = port;
+    listenAndServeTLS(tlsOpts, handler);
+  } else {
+    listenAndServe(addr, handler);
+  }
+  console.log(`${proto.toUpperCase()} server listening on ${proto}://${addr}/`);
 }
 
 if (import.meta.main) {
diff --git a/std/http/file_server_test.ts b/std/http/file_server_test.ts
index 486bc514cc520c..818fd5ecb587fc 100644
--- a/std/http/file_server_test.ts
+++ b/std/http/file_server_test.ts
@@ -3,17 +3,15 @@ import { assert, assertEquals } from "../testing/asserts.ts";
 import { BufReader } from "../io/bufio.ts";
 import { TextProtoReader } from "../textproto/mod.ts";
 import { ServerRequest } from "./server.ts";
-import { serveFile } from "./file_server.ts";
+import { serveFile, FileServerArgs } from "./file_server.ts";
 let fileServer: Deno.Process<Deno.RunOptions & { stdout: "piped" }>;
 
-type FileServerCfg = {
-  target?: string;
-  port?: number;
-};
+type FileServerCfg = Omit<FileServerArgs, "_"> & { target?: string };
 
 async function startFileServer({
   target = ".",
   port = 4507,
+  "dir-listing": dirListing = true,
 }: FileServerCfg = {}): Promise<void> {
   fileServer = Deno.run({
     cmd: [
@@ -26,6 +24,7 @@ async function startFileServer({
       "--cors",
       "-p",
       `${port}`,
+      `${dirListing ? "" : "--no-dir-listing"}`,
     ],
     stdout: "piped",
     stderr: "null",
@@ -100,7 +99,6 @@ Deno.test(
       const localFile = new TextDecoder().decode(
         await Deno.readFile("./http/README.md"),
       );
-      console.log(downloadedFile, localFile);
       assertEquals(downloadedFile, localFile);
     } finally {
       await killFileServer();
@@ -199,3 +197,105 @@ Deno.test("file_server running as library", async function (): Promise<void> {
     await killFileServer();
   }
 });
+
+async function startTlsFileServer({
+  target = ".",
+  port = 4577,
+}: FileServerCfg = {}): Promise<void> {
+  fileServer = Deno.run({
+    cmd: [
+      Deno.execPath(),
+      "run",
+      "--allow-read",
+      "--allow-net",
+      "http/file_server.ts",
+      target,
+      "--host",
+      "localhost",
+      "--cert",
+      "./http/testdata/tls/localhost.crt",
+      "--key",
+      "./http/testdata/tls/localhost.key",
+      "--cors",
+      "-p",
+      `${port}`,
+    ],
+    stdout: "piped",
+    stderr: "null",
+  });
+  // Once fileServer is ready it will write to its stdout.
+  assert(fileServer.stdout != null);
+  const r = new TextProtoReader(new BufReader(fileServer.stdout));
+  const s = await r.readLine();
+  assert(s !== null && s.includes("server listening"));
+}
+
+Deno.test("serveDirectory TLS", async function (): Promise<void> {
+  await startTlsFileServer();
+  try {
+    // Valid request after invalid
+    const conn = await Deno.connectTls({
+      hostname: "localhost",
+      port: 4577,
+      certFile: "./http/testdata/tls/RootCA.pem",
+    });
+
+    await Deno.writeAll(
+      conn,
+      new TextEncoder().encode("GET /http HTTP/1.0\r\n\r\n"),
+    );
+    const res = new Uint8Array(128 * 1024);
+    const nread = await conn.read(res);
+    assert(nread !== null);
+    conn.close();
+    const page = new TextDecoder().decode(res.subarray(0, nread));
+    assert(page.includes("<title>Deno File Server</title>"));
+  } finally {
+    await killFileServer();
+  }
+});
+
+Deno.test("partial TLS arguments fail", async function (): Promise<void> {
+  fileServer = Deno.run({
+    cmd: [
+      Deno.execPath(),
+      "run",
+      "--allow-read",
+      "--allow-net",
+      "http/file_server.ts",
+      ".",
+      "--host",
+      "localhost",
+      "--cert",
+      "./http/testdata/tls/localhost.crt",
+      "-p",
+      `4578`,
+    ],
+    stdout: "piped",
+    stderr: "null",
+  });
+  try {
+    // Once fileServer is ready it will write to its stdout.
+    assert(fileServer.stdout != null);
+    const r = new TextProtoReader(new BufReader(fileServer.stdout));
+    const s = await r.readLine();
+    assert(
+      s !== null && s.includes("--key and --cert are required for TLS"),
+    );
+  } finally {
+    await killFileServer();
+  }
+});
+
+Deno.test("file_server disable dir listings", async function (): Promise<void> {
+  await startFileServer({ "dir-listing": false });
+  try {
+    const res = await fetch("http://localhost:4507/");
+    assert(res.headers.has("access-control-allow-origin"));
+    assert(res.headers.has("access-control-allow-headers"));
+    assertEquals(res.status, 404);
+    const _ = await res.text();
+  } finally {
+    await killFileServer();
+  }
+});
diff --git a/std/http/racing_server_test.ts b/std/http/racing_server_test.ts
index 7e510f13d03f1a..8daf7c4dc1b41e 100644
--- a/std/http/racing_server_test.ts
+++ b/std/http/racing_server_test.ts
@@ -5,8 +5,7 @@ import { TextProtoReader } from "../textproto/mod.ts";
 let server: Deno.Process<Deno.RunOptions & { stdout: "piped" }>;
 async function startServer(): Promise<void> {
   server = Deno.run({
-    // TODO(lucacasonato): remove unstable when stabilized
-    cmd: [Deno.execPath(), "run", "--unstable", "-A", "http/racing_server.ts"],
+    cmd: [Deno.execPath(), "run", "-A", "http/racing_server.ts"],
     stdout: "piped",
   });
   // Once racing server is ready it will write to its stdout.
diff --git a/std/log/logger.ts b/std/log/logger.ts
index ef4bfd58f46cc3..d1e1d975557a70 100644
--- a/std/log/logger.ts
+++ b/std/log/logger.ts
@@ -3,8 +3,8 @@ import {
   LogLevels,
   getLevelByName,
   getLevelName,
-  LevelName,
 } from "./levels.ts";
+import type { LevelName } from "./levels.ts";
 import type { BaseHandler } from "./handlers.ts";
 
 export interface LogRecordOptions {
diff --git a/std/log/mod.ts b/std/log/mod.ts
index 3960a65a3bfd18..10feb04b1c1a6a 100644
--- a/std/log/mod.ts
+++ b/std/log/mod.ts
@@ -10,7 +10,8 @@ import {
 import { assert } from "../_util/assert.ts";
 import type { LevelName } from "./levels.ts";
 
-export { LogLevels, LevelName } from "./levels.ts";
+export { LogLevels } from "./levels.ts";
+export type { LevelName } from "./levels.ts";
 export { Logger } from "./logger.ts";
 
 export class LoggerConfig {
diff --git a/std/node/_util/_util_promisify.ts b/std/node/_util/_util_promisify.ts
index 9e86b5a0936356..03ebeba041fc5b 100644
--- a/std/node/_util/_util_promisify.ts
+++ b/std/node/_util/_util_promisify.ts
@@ -60,11 +60,10 @@ export function promisify(original: Function): Function {
   if (typeof original !== "function") {
     throw new NodeInvalidArgTypeError("original", "Function", original);
   }
-
-  // @ts-ignore TypeScript (as of 3.7) does not support indexing namespaces by symbol
-  if (original[kCustomPromisifiedSymbol]) {
-    // @ts-ignore TypeScript (as of 3.7) does not support indexing namespaces by symbol
-    const fn = original[kCustomPromisifiedSymbol];
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  if ((original as any)[kCustomPromisifiedSymbol]) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const fn = (original as any)[kCustomPromisifiedSymbol];
     if (typeof fn !== "function") {
       throw new NodeInvalidArgTypeError(
         "util.promisify.custom",
@@ -82,12 +81,11 @@ export function promisify(original: Function): Function {
 
   // Names to create an object from in case the callback receives multiple
   // arguments, e.g. ['bytesRead', 'buffer'] for fs.read.
-  // @ts-ignore TypeScript (as of 3.7) does not support indexing namespaces by symbol
-  const argumentNames = original[kCustomPromisifyArgsSymbol];
-
-  function fn(...args: unknown[]): Promise<unknown> {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const argumentNames = (original as any)[kCustomPromisifyArgsSymbol];
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  function fn(this: any, ...args: unknown[]): Promise<unknown> {
     return new Promise((resolve, reject) => {
-      // @ts-ignore: 'this' implicitly has type 'any' because it does not have a type annotation
       original.call(this, ...args, (err: Error, ...values: unknown[]) => {
         if (err) {
           return reject(err);
@@ -95,8 +93,8 @@ export function promisify(original: Function): Function {
         if (argumentNames !== undefined && values.length > 1) {
           const obj = {};
           for (let i = 0; i < argumentNames.length; i++) {
-            // @ts-ignore TypeScript
-            obj[argumentNames[i]] = values[i];
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (obj as any)[argumentNames[i]] = values[i];
           }
           resolve(obj);
         } else {
diff --git a/std/node/_util/_util_promisify_test.ts b/std/node/_util/_util_promisify_test.ts
index 5148bc60915a6f..67ca6af5800d68 100644
--- a/std/node/_util/_util_promisify_test.ts
+++ b/std/node/_util/_util_promisify_test.ts
@@ -43,7 +43,7 @@ Deno.test("Promisify.custom", async function testPromisifyCustom() {
   function fn(): void {}
 
   function promisifedFn(): void {}
-  // @ts-ignore TypeScript (as of 3.7) does not support indexing namespaces by symbol
+  // @ts-expect-error TypeScript (as of 3.7) does not support indexing namespaces by symbol
   fn[promisify.custom] = promisifedFn;
 
   const promisifiedFnA = promisify(fn);
@@ -63,7 +63,7 @@ Deno.test("promiisfy.custom symbol", function testPromisifyCustomSymbol() {
   // util.promisify.custom is a shared symbol which can be accessed
   // as `Symbol.for("nodejs.util.promisify.custom")`.
   const kCustomPromisifiedSymbol = Symbol.for("nodejs.util.promisify.custom");
-  // @ts-ignore TypeScript (as of 3.7) does not support indexing namespaces by symbol
+  // @ts-expect-error TypeScript (as of 3.7) does not support indexing namespaces by symbol
   fn[kCustomPromisifiedSymbol] = promisifiedFn;
 
   assertStrictEquals(kCustomPromisifiedSymbol, promisify.custom);
@@ -73,7 +73,7 @@ Deno.test("promiisfy.custom symbol", function testPromisifyCustomSymbol() {
 
 Deno.test("Invalid argument should throw", function testThrowInvalidArgument() {
   function fn(): void {}
-  // @ts-ignore TypeScript (as of 3.7) does not support indexing namespaces by symbol
+  // @ts-expect-error TypeScript (as of 3.7) does not support indexing namespaces by symbol
   fn[promisify.custom] = 42;
   try {
     promisify(fn);
@@ -91,7 +91,7 @@ Deno.test("Custom promisify args", async function testPromisifyCustomArgs() {
     callback(null, firstValue, secondValue);
   }
 
-  // @ts-ignore TypeScript (as of 3.7) does not support indexing namespaces by symbol
+  // @ts-expect-error TypeScript (as of 3.7) does not support indexing namespaces by symbol
   fn[customPromisifyArgs] = ["first", "second"];
 
   const obj = await promisify(fn)();
@@ -159,7 +159,7 @@ Deno.test(
 Deno.test("Rejected value", async function testPromisifyWithAsObjectMethod() {
   const o: { fn?: Function } = {};
   const fn = promisify(function (cb: Function): void {
-    // @ts-ignore TypeScript
+    // @ts-expect-error TypeScript
     cb(null, this === o);
   });
 
@@ -220,7 +220,7 @@ Deno.test("Test error", async function testInvalidArguments() {
 Deno.test("Test invalid arguments", function testInvalidArguments() {
   [undefined, null, true, 0, "str", {}, [], Symbol()].forEach((input) => {
     try {
-      // @ts-ignore TypeScript
+      // @ts-expect-error TypeScript
       promisify(input);
     } catch (e) {
       assertStrictEquals(e.code, "ERR_INVALID_ARG_TYPE");
diff --git a/std/node/assert.ts b/std/node/assert.ts
new file mode 100644
index 00000000000000..3d738cbbf3010b
--- /dev/null
+++ b/std/node/assert.ts
@@ -0,0 +1,22 @@
+import {
+  assertEquals,
+  assertNotEquals,
+  assertStrictEquals,
+  assertNotStrictEquals,
+  assertMatch,
+  assertThrows,
+} from "../testing/asserts.ts";
+
+export {
+  assert as default,
+  assert as ok,
+  assert,
+  fail,
+} from "../testing/asserts.ts";
+
+export const deepStrictEqual = assertEquals;
+export const notDeepStrictEqual = assertNotEquals;
+export const strictEqual = assertStrictEquals;
+export const notStrictEqual = assertNotStrictEquals;
+export const match = assertMatch;
+export const throws = assertThrows;
diff --git a/std/node/assert_test.ts b/std/node/assert_test.ts
new file mode 100644
index 00000000000000..8df13187bbd558
--- /dev/null
+++ b/std/node/assert_test.ts
@@ -0,0 +1,65 @@
+import {
+  assert as denoAssert,
+  assertEquals,
+  assertNotEquals,
+  assertStrictEquals,
+  assertNotStrictEquals,
+  assertMatch,
+  assertThrows,
+  fail as denoFail,
+} from "../testing/asserts.ts";
+
+import assert from "./assert.ts";
+
+import {
+  ok,
+  assert as assert_,
+  deepStrictEqual,
+  notDeepStrictEqual,
+  strictEqual,
+  notStrictEqual,
+  match,
+  throws,
+  fail,
+} from "./assert.ts";
+
+Deno.test("API should be exposed", () => {
+  assertStrictEquals(
+    assert_,
+    assert,
+    "`assert()` should be the default export",
+  );
+  assertStrictEquals(assert_, denoAssert, "`assert()` should be exposed");
+  assertStrictEquals(assert_, ok, "`assert()` should be an alias of `ok()`");
+  assertStrictEquals(
+    assertEquals,
+    deepStrictEqual,
+    "`assertEquals()` should be exposed as `deepStrictEqual()`",
+  );
+  assertStrictEquals(
+    assertNotEquals,
+    notDeepStrictEqual,
+    "`assertNotEquals()` should be exposed as `notDeepStrictEqual()`",
+  );
+  assertStrictEquals(
+    assertStrictEquals,
+    strictEqual,
+    "`assertStrictEquals()` should be exposed as `strictEqual()`",
+  );
+  assertStrictEquals(
+    assertNotStrictEquals,
+    notStrictEqual,
+    "`assertNotStrictEquals()` should be exposed as `notStrictEqual()`",
+  );
+  assertStrictEquals(
+    assertMatch,
+    match,
+    "`assertMatch()` should be exposed as `match()`",
+  );
+  assertStrictEquals(
+    assertThrows,
+    throws,
+    "`assertThrows()` should be exposed as `throws()`",
+  );
+  assertStrictEquals(fail, denoFail, "`fail()` should be exposed");
+});
diff --git a/std/node/buffer_test.ts b/std/node/buffer_test.ts
index 5d01a4b671deb0..a72569b7c7af27 100644
--- a/std/node/buffer_test.ts
+++ b/std/node/buffer_test.ts
@@ -5,10 +5,10 @@ Deno.test({
   name: "Buffer global scope",
   fn() {
     // deno-lint-ignore ban-ts-comment
-    // @ts-ignore
+    // @ts-expect-error
     assert(window.Buffer === Buffer);
     // deno-lint-ignore ban-ts-comment
-    // @ts-ignore
+    // @ts-expect-error
     assert(globalThis.Buffer === Buffer);
   },
 });
@@ -36,7 +36,7 @@ Deno.test({
       assertThrows(
         () => {
           // deno-lint-ignore ban-ts-comment
-          // @ts-ignore
+          // @ts-expect-error
           Buffer.alloc(size);
         },
         TypeError,
@@ -55,8 +55,6 @@ Deno.test({
     for (const value of invalidValues) {
       assertThrows(
         () => {
-          // deno-lint-ignore ban-ts-comment
-          // @ts-ignore
           console.log(value.constructor.name);
           Buffer.alloc(1, value);
         },
@@ -399,7 +397,7 @@ Deno.test({
       assertThrows(
         () => {
           // deno-lint-ignore ban-ts-comment
-          // @ts-ignore
+          // @ts-expect-error
           buffer.toString(encoding);
         },
         TypeError,
@@ -418,15 +416,13 @@ Deno.test({
 
     for (const encoding of defaultToUtf8Encodings) {
       // deno-lint-ignore ban-ts-comment
-      // @ts-ignore
+      // @ts-expect-error
       assertEquals(Buffer.from("yes", encoding).toString(), "yes");
     }
 
     for (const encoding of invalidEncodings) {
       assertThrows(
         () => {
-          // deno-lint-ignore ban-ts-comment
-          // @ts-ignore
           Buffer.from("yes", encoding);
         },
         TypeError,
@@ -445,8 +441,6 @@ Deno.test({
     for (const encoding of notImplemented) {
       assertThrows(
         () => {
-          // deno-lint-ignore ban-ts-comment
-          // @ts-ignore
           buffer.toString(encoding);
         },
         Error,
@@ -456,8 +450,6 @@ Deno.test({
 
       assertThrows(
         () => {
-          // deno-lint-ignore ban-ts-comment
-          // @ts-ignore
           Buffer.from("", encoding);
         },
         Error,
@@ -586,7 +578,7 @@ Deno.test({
 
     assertThrows(
       // deno-lint-ignore ban-ts-comment
-      // @ts-ignore
+      // @ts-expect-error
       () => Buffer.alloc(1).equals("abc"),
       TypeError,
       `The "otherBuffer" argument must be an instance of Buffer or Uint8Array. Received type string`,
diff --git a/std/node/global.ts b/std/node/global.ts
index 0cb6b8b06bfa27..1049f8ba151889 100644
--- a/std/node/global.ts
+++ b/std/node/global.ts
@@ -7,3 +7,5 @@ Object.defineProperty(globalThis, Symbol.toStringTag, {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 (globalThis as any)["global"] = globalThis;
+
+export {};
diff --git a/std/node/url.ts b/std/node/url.ts
index 826a274f85a6f4..577c5eaf278f47 100644
--- a/std/node/url.ts
+++ b/std/node/url.ts
@@ -36,6 +36,9 @@ const newlineRegEx = /\n/g;
 const carriageReturnRegEx = /\r/g;
 const tabRegEx = /\t/g;
 
+const _url = URL;
+export { _url as URL };
+
 export function fileURLToPath(path: string | URL): string {
   if (typeof path === "string") path = new URL(path);
   else if (!(path instanceof URL)) {
diff --git a/std/node/url_test.ts b/std/node/url_test.ts
new file mode 100644
index 00000000000000..5e64b6295900a1
--- /dev/null
+++ b/std/node/url_test.ts
@@ -0,0 +1,9 @@
+import { assertEquals } from "../testing/asserts.ts";
+import * as url from "./url.ts";
+
+Deno.test({
+  name: "[url] URL",
+  fn() {
+    assertEquals(url.URL, URL);
+  },
+});
diff --git a/std/node/util.ts b/std/node/util.ts
index 8e3c50b879152d..e897931f2e4738 100644
--- a/std/node/util.ts
+++ b/std/node/util.ts
@@ -4,6 +4,16 @@ import * as types from "./_util/_util_types.ts";
 
 export { types };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function inspect(object: unknown, ...opts: any): string {
+  return Deno.inspect(object, {
+    depth: opts.depth ?? 4,
+    iterableLimit: opts.iterableLimit ?? 100,
+    compact: !!(opts.compact ?? true),
+    sorted: !!(opts.sorted ?? false),
+  });
+}
+
 export function isArray(value: unknown): boolean {
   return Array.isArray(value);
 }
diff --git a/std/node/util_test.ts b/std/node/util_test.ts
index cedd85a87ef483..b1be36ce1a3166 100644
--- a/std/node/util_test.ts
+++ b/std/node/util_test.ts
@@ -1,6 +1,14 @@
-import { assert } from "../testing/asserts.ts";
+import { assert, assertEquals } from "../testing/asserts.ts";
+import { stripColor } from "../fmt/colors.ts";
 import * as util from "./util.ts";
 
+Deno.test({
+  name: "[util] inspect",
+  fn() {
+    assertEquals(stripColor(util.inspect({ foo: 123 })), "{ foo: 123 }");
+  },
+});
+
 Deno.test({
   name: "[util] isBoolean",
   fn() {
diff --git a/std/path/_constants.ts b/std/path/_constants.ts
index 186c32ab532635..920979432a1b89 100644
--- a/std/path/_constants.ts
+++ b/std/path/_constants.ts
@@ -47,14 +47,16 @@ export const CHAR_EQUAL = 61; /* = */
 export const CHAR_0 = 48; /* 0 */
 export const CHAR_9 = 57; /* 9 */
 
+let NATIVE_OS: typeof Deno.build.os = "linux";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const navigator = (globalThis as any).navigator;
-
-let isWindows = false;
 if (globalThis.Deno != null) {
-  isWindows = Deno.build.os == "windows";
-} else if (navigator?.appVersion != null) {
-  isWindows = navigator.appVersion.includes("Win");
+  NATIVE_OS = Deno.build.os;
+} else if (navigator?.appVersion?.includes?.("Win") ?? false) {
+  NATIVE_OS = "windows";
 }
+// TODO(nayeemrmn): Improve OS detection in browsers beyond Windows.
+
+export const isWindows = NATIVE_OS == "windows";
 
-export { isWindows };
+export { NATIVE_OS };
diff --git a/std/path/_globrex.ts b/std/path/_globrex.ts
deleted file mode 100644
index 0cc5399fa23efc..00000000000000
--- a/std/path/_globrex.ts
+++ /dev/null
@@ -1,328 +0,0 @@
-// This file is ported from globrex@0.1.2
-// MIT License
-// Copyright (c) 2018 Terkel Gjervig Nielsen
-/** This module is browser compatible. */
-
-import { isWindows as isWin } from "./_constants.ts";
-
-const SEP = isWin ? `(?:\\\\|\\/)` : `\\/`;
-const SEP_ESC = isWin ? `\\\\` : `/`;
-const SEP_RAW = isWin ? `\\` : `/`;
-const GLOBSTAR = `(?:(?:[^${SEP_ESC}/]*(?:${SEP_ESC}|\/|$))*)`;
-const WILDCARD = `(?:[^${SEP_ESC}/]*)`;
-const GLOBSTAR_SEGMENT = `((?:[^${SEP_ESC}/]*(?:${SEP_ESC}|\/|$))*)`;
-const WILDCARD_SEGMENT = `(?:[^${SEP_ESC}/]*)`;
-
-export interface GlobrexOptions {
-  /** Allow ExtGlob features.
-   * @default false */
-  extended?: boolean;
-  /** Support globstar.
-   * @remarks When globstar is `true`, '/foo/**' is equivalent
-   * to '/foo/*' when globstar is `false`.
-   * Having globstar set to `true` is the same usage as
-   * using wildcards in bash.
-   * @default false */
-  globstar?: boolean;
-  /** Be laissez-faire about mutiple slashes.
-   * @default true */
-  strict?: boolean;
-  /** Parse as filepath for extra path related features.
-   * @default false */
-  filepath?: boolean;
-  /** Flag to use in the generated RegExp. */
-  flags?: string;
-}
-
-export interface GlobrexResult {
-  regex: RegExp;
-  path?: {
-    regex: RegExp;
-    segments: RegExp[];
-    globstar?: RegExp;
-  };
-}
-
-/**
- * Convert any glob pattern to a JavaScript Regexp object
- * @param glob Glob pattern to convert
- * @param opts Configuration object
- * @returns Converted object with string, segments and RegExp object
- */
-export function globrex(
-  glob: string,
-  {
-    extended = false,
-    globstar = false,
-    strict = false,
-    filepath = false,
-    flags = "",
-  }: GlobrexOptions = {},
-): GlobrexResult {
-  const sepPattern = new RegExp(`^${SEP}${strict ? "" : "+"}$`);
-  let regex = "";
-  let segment = "";
-  let pathRegexStr = "";
-  const pathSegments = [];
-
-  // If we are doing extended matching, this boolean is true when we are inside
-  // a group (eg {*.html,*.js}), and false otherwise.
-  let inGroup = false;
-  let inRange = false;
-
-  // extglob stack. Keep track of scope
-  const ext = [];
-
-  interface AddOptions {
-    split?: boolean;
-    last?: boolean;
-    only?: string;
-  }
-
-  // Helper function to build string and segments
-  function add(
-    str: string,
-    options: AddOptions = { split: false, last: false, only: "" },
-  ): void {
-    const { split, last, only } = options;
-    if (only !== "path") regex += str;
-    if (filepath && only !== "regex") {
-      pathRegexStr += str.match(sepPattern) ? SEP : str;
-      if (split) {
-        if (last) segment += str;
-        if (segment !== "") {
-          // change it 'includes'
-          if (!flags.includes("g")) segment = `^${segment}$`;
-          pathSegments.push(new RegExp(segment, flags));
-        }
-        segment = "";
-      } else {
-        segment += str;
-      }
-    }
-  }
-
-  let c, n;
-  for (let i = 0; i < glob.length; i++) {
-    c = glob[i];
-    n = glob[i + 1];
-
-    if (["\\", "$", "^", ".", "="].includes(c)) {
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c.match(sepPattern)) {
-      add(SEP, { split: true });
-      if (n != null && n.match(sepPattern) && !strict) regex += "?";
-      continue;
-    }
-
-    if (c === "(") {
-      if (ext.length) {
-        add(`${c}?:`);
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === ")") {
-      if (ext.length) {
-        add(c);
-        const type: string | undefined = ext.pop();
-        if (type === "@") {
-          add("{1}");
-        } else if (type === "!") {
-          add(WILDCARD);
-        } else {
-          add(type as string);
-        }
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "|") {
-      if (ext.length) {
-        add(c);
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "+") {
-      if (n === "(" && extended) {
-        ext.push(c);
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "@" && extended) {
-      if (n === "(") {
-        ext.push(c);
-        continue;
-      }
-    }
-
-    if (c === "!") {
-      if (extended) {
-        if (inRange) {
-          add("^");
-          continue;
-        }
-        if (n === "(") {
-          ext.push(c);
-          add("(?!");
-          i++;
-          continue;
-        }
-        add(`\\${c}`);
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "?") {
-      if (extended) {
-        if (n === "(") {
-          ext.push(c);
-        } else {
-          add(".");
-        }
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "[") {
-      if (inRange && n === ":") {
-        i++; // skip [
-        let value = "";
-        while (glob[++i] !== ":") value += glob[i];
-        if (value === "alnum") add("(?:\\w|\\d)");
-        else if (value === "space") add("\\s");
-        else if (value === "digit") add("\\d");
-        i++; // skip last ]
-        continue;
-      }
-      if (extended) {
-        inRange = true;
-        add(c);
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "]") {
-      if (extended) {
-        inRange = false;
-        add(c);
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "{") {
-      if (extended) {
-        inGroup = true;
-        add("(?:");
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "}") {
-      if (extended) {
-        inGroup = false;
-        add(")");
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === ",") {
-      if (inGroup) {
-        add("|");
-        continue;
-      }
-      add(`\\${c}`);
-      continue;
-    }
-
-    if (c === "*") {
-      if (n === "(" && extended) {
-        ext.push(c);
-        continue;
-      }
-      // Move over all consecutive "*"'s.
-      // Also store the previous and next characters
-      const prevChar = glob[i - 1];
-      let starCount = 1;
-      while (glob[i + 1] === "*") {
-        starCount++;
-        i++;
-      }
-      const nextChar = glob[i + 1];
-      if (!globstar) {
-        // globstar is disabled, so treat any number of "*" as one
-        add(".*");
-      } else {
-        // globstar is enabled, so determine if this is a globstar segment
-        const isGlobstar = starCount > 1 && // multiple "*"'s
-          // from the start of the segment
-          [SEP_RAW, "/", undefined].includes(prevChar) &&
-          // to the end of the segment
-          [SEP_RAW, "/", undefined].includes(nextChar);
-        if (isGlobstar) {
-          // it's a globstar, so match zero or more path segments
-          add(GLOBSTAR, { only: "regex" });
-          add(GLOBSTAR_SEGMENT, { only: "path", last: true, split: true });
-          i++; // move over the "/"
-        } else {
-          // it's not a globstar, so only match one path segment
-          add(WILDCARD, { only: "regex" });
-          add(WILDCARD_SEGMENT, { only: "path" });
-        }
-      }
-      continue;
-    }
-
-    add(c);
-  }
-
-  // When regexp 'g' flag is specified don't
-  // constrain the regular expression with ^ & $
-  if (!flags.includes("g")) {
-    regex = `^${regex}$`;
-    segment = `^${segment}$`;
-    if (filepath) pathRegexStr = `^${pathRegexStr}$`;
-  }
-
-  const result: GlobrexResult = { regex: new RegExp(regex, flags) };
-
-  // Push the last segment
-  if (filepath) {
-    pathSegments.push(new RegExp(segment, flags));
-    result.path = {
-      regex: new RegExp(pathRegexStr, flags),
-      segments: pathSegments,
-      globstar: new RegExp(
-        !flags.includes("g") ? `^${GLOBSTAR_SEGMENT}$` : GLOBSTAR_SEGMENT,
-        flags,
-      ),
-    };
-  }
-
-  return result;
-}
diff --git a/std/path/_globrex_test.ts b/std/path/_globrex_test.ts
deleted file mode 100644
index 19eabc983077b1..00000000000000
--- a/std/path/_globrex_test.ts
+++ /dev/null
@@ -1,825 +0,0 @@
-// This file is ported from globrex@0.1.2
-// MIT License
-// Copyright (c) 2018 Terkel Gjervig Nielsen
-import { assertEquals } from "../testing/asserts.ts";
-import { GlobrexOptions, globrex } from "./_globrex.ts";
-
-const isWin = Deno.build.os === "windows";
-const t = { equal: assertEquals, is: assertEquals };
-
-function match(
-  glob: string,
-  strUnix: string,
-  strWin?: string | object,
-  opts: GlobrexOptions = {},
-): boolean {
-  if (typeof strWin === "object") {
-    opts = strWin;
-    strWin = "";
-  }
-  const { regex } = globrex(glob, opts);
-  const match = (isWin && strWin ? strWin : strUnix).match(regex);
-  if (match && !regex.flags.includes("g")) {
-    assertEquals(match.length, 1);
-  }
-  return !!match;
-}
-
-Deno.test({
-  name: "globrex: standard",
-  fn(): void {
-    const res = globrex("*.js");
-    t.equal(typeof globrex, "function", "constructor is a typeof function");
-    t.equal(res instanceof Object, true, "returns object");
-    t.equal(res.regex.toString(), "/^.*\\.js$/", "returns regex object");
-  },
-});
-
-Deno.test({
-  name: "globrex: Standard * matching",
-  fn(): void {
-    t.equal(match("*", "foo"), true, "match everything");
-    t.equal(match("*", "foo", { flags: "g" }), true, "match everything");
-    t.equal(match("f*", "foo"), true, "match the end");
-    t.equal(match("f*", "foo", { flags: "g" }), true, "match the end");
-    t.equal(match("*o", "foo"), true, "match the start");
-    t.equal(match("*o", "foo", { flags: "g" }), true, "match the start");
-    t.equal(match("u*orn", "unicorn"), true, "match the middle");
-    t.equal(
-      match("u*orn", "unicorn", { flags: "g" }),
-      true,
-      "match the middle",
-    );
-    t.equal(match("ico", "unicorn"), false, "do not match without g");
-    t.equal(
-      match("ico", "unicorn", { flags: "g" }),
-      true,
-      'match anywhere with RegExp "g"',
-    );
-    t.equal(match("u*nicorn", "unicorn"), true, "match zero characters");
-    t.equal(
-      match("u*nicorn", "unicorn", { flags: "g" }),
-      true,
-      "match zero characters",
-    );
-  },
-});
-
-Deno.test({
-  name: "globrex: advance * matching",
-  fn(): void {
-    t.equal(
-      match("*.min.js", "http://example.com/jquery.min.js", {
-        globstar: false,
-      }),
-      true,
-      "complex match",
-    );
-    t.equal(
-      match("*.min.*", "http://example.com/jquery.min.js", { globstar: false }),
-      true,
-      "complex match",
-    );
-    t.equal(
-      match("*/js/*.js", "http://example.com/js/jquery.min.js", {
-        globstar: false,
-      }),
-      true,
-      "complex match",
-    );
-    t.equal(
-      match("*.min.*", "http://example.com/jquery.min.js", { flags: "g" }),
-      true,
-      "complex match global",
-    );
-    t.equal(
-      match("*.min.js", "http://example.com/jquery.min.js", { flags: "g" }),
-      true,
-      "complex match global",
-    );
-    t.equal(
-      match("*/js/*.js", "http://example.com/js/jquery.min.js", { flags: "g" }),
-      true,
-      "complex match global",
-    );
-
-    const str = "\\/$^+?.()=!|{},[].*";
-    t.equal(match(str, str), true, "battle test complex string - strict");
-    t.equal(
-      match(str, str, { flags: "g" }),
-      true,
-      "battle test complex string - strict",
-    );
-
-    t.equal(
-      match(".min.", "http://example.com/jquery.min.js"),
-      false,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match("*.min.*", "http://example.com/jquery.min.js"),
-      true,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match(".min.", "http://example.com/jquery.min.js", { flags: "g" }),
-      true,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match("http:", "http://example.com/jquery.min.js"),
-      false,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match("http:*", "http://example.com/jquery.min.js"),
-      true,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match("http:", "http://example.com/jquery.min.js", { flags: "g" }),
-      true,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match("min.js", "http://example.com/jquery.min.js"),
-      false,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match("*.min.js", "http://example.com/jquery.min.js"),
-      true,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match("min.js", "http://example.com/jquery.min.js", { flags: "g" }),
-      true,
-      'matches without/with using RegExp "g"',
-    );
-    t.equal(
-      match("min", "http://example.com/jquery.min.js", { flags: "g" }),
-      true,
-      'match anywhere (globally) using RegExp "g"',
-    );
-    t.equal(
-      match("/js/", "http://example.com/js/jquery.min.js", { flags: "g" }),
-      true,
-      'match anywhere (globally) using RegExp "g"',
-    );
-    t.equal(match("/js*jq*.js", "http://example.com/js/jquery.min.js"), false);
-    t.equal(
-      match("/js*jq*.js", "http://example.com/js/jquery.min.js", {
-        flags: "g",
-      }),
-      true,
-    );
-  },
-});
-
-Deno.test({
-  name: "globrex: ? match one character, no more and no less",
-  fn(): void {
-    t.equal(match("f?o", "foo", { extended: true }), true);
-    t.equal(match("f?o", "fooo", { extended: true }), false);
-    t.equal(match("f?oo", "foo", { extended: true }), false);
-
-    const tester = (globstar: boolean): void => {
-      t.equal(
-        match("f?o", "foo", { extended: true, globstar, flags: "g" }),
-        true,
-      );
-      t.equal(
-        match("f?o", "fooo", { extended: true, globstar, flags: "g" }),
-        true,
-      );
-      t.equal(
-        match("f?o?", "fooo", { extended: true, globstar, flags: "g" }),
-        true,
-      );
-
-      t.equal(
-        match("?fo", "fooo", { extended: true, globstar, flags: "g" }),
-        false,
-      );
-      t.equal(
-        match("f?oo", "foo", { extended: true, globstar, flags: "g" }),
-        false,
-      );
-      t.equal(
-        match("foo?", "foo", { extended: true, globstar, flags: "g" }),
-        false,
-      );
-    };
-
-    tester(true);
-    tester(false);
-  },
-});
-
-Deno.test({
-  name: "globrex: [] match a character range",
-  fn(): void {
-    t.equal(match("fo[oz]", "foo", { extended: true }), true);
-    t.equal(match("fo[oz]", "foz", { extended: true }), true);
-    t.equal(match("fo[oz]", "fog", { extended: true }), false);
-    t.equal(match("fo[a-z]", "fob", { extended: true }), true);
-    t.equal(match("fo[a-d]", "fot", { extended: true }), false);
-    t.equal(match("fo[!tz]", "fot", { extended: true }), false);
-    t.equal(match("fo[!tz]", "fob", { extended: true }), true);
-
-    const tester = (globstar: boolean): void => {
-      t.equal(
-        match("fo[oz]", "foo", { extended: true, globstar, flags: "g" }),
-        true,
-      );
-      t.equal(
-        match("fo[oz]", "foz", { extended: true, globstar, flags: "g" }),
-        true,
-      );
-      t.equal(
-        match("fo[oz]", "fog", { extended: true, globstar, flags: "g" }),
-        false,
-      );
-    };
-
-    tester(true);
-    tester(false);
-  },
-});
-
-Deno.test({
-  name: "globrex: [] extended character ranges",
-  fn(): void {
-    t.equal(
-      match("[[:alnum:]]/bar.txt", "a/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("@([[:alnum:]abc]|11)/bar.txt", "11/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("@([[:alnum:]abc]|11)/bar.txt", "a/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("@([[:alnum:]abc]|11)/bar.txt", "b/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("@([[:alnum:]abc]|11)/bar.txt", "c/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("@([[:alnum:]abc]|11)/bar.txt", "abc/bar.txt", { extended: true }),
-      false,
-    );
-    t.equal(
-      match("@([[:alnum:]abc]|11)/bar.txt", "3/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[[:digit:]]/bar.txt", "1/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[[:digit:]b]/bar.txt", "b/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[![:digit:]b]/bar.txt", "a/bar.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[[:alnum:]]/bar.txt", "!/bar.txt", { extended: true }),
-      false,
-    );
-    t.equal(
-      match("[[:digit:]]/bar.txt", "a/bar.txt", { extended: true }),
-      false,
-    );
-    t.equal(
-      match("[[:digit:]b]/bar.txt", "a/bar.txt", { extended: true }),
-      false,
-    );
-  },
-});
-
-Deno.test({
-  name: "globrex: {} match a choice of different substrings",
-  fn(): void {
-    t.equal(match("foo{bar,baaz}", "foobaaz", { extended: true }), true);
-    t.equal(match("foo{bar,baaz}", "foobar", { extended: true }), true);
-    t.equal(match("foo{bar,baaz}", "foobuzz", { extended: true }), false);
-    t.equal(match("foo{bar,b*z}", "foobuzz", { extended: true }), true);
-
-    const tester = (globstar: boolean): void => {
-      t.equal(
-        match("foo{bar,baaz}", "foobaaz", {
-          extended: true,
-          globstar,
-          flag: "g",
-        }),
-        true,
-      );
-      t.equal(
-        match("foo{bar,baaz}", "foobar", {
-          extended: true,
-          globstar,
-          flag: "g",
-        }),
-        true,
-      );
-      t.equal(
-        match("foo{bar,baaz}", "foobuzz", {
-          extended: true,
-          globstar,
-          flag: "g",
-        }),
-        false,
-      );
-      t.equal(
-        match("foo{bar,b*z}", "foobuzz", {
-          extended: true,
-          globstar,
-          flag: "g",
-        }),
-        true,
-      );
-    };
-
-    tester(true);
-    tester(false);
-  },
-});
-
-Deno.test({
-  name: "globrex: complex extended matches",
-  fn(): void {
-    t.equal(
-      match(
-        "http://?o[oz].b*z.com/{*.js,*.html}",
-        "http://foo.baaz.com/jquery.min.js",
-        { extended: true },
-      ),
-      true,
-    );
-    t.equal(
-      match(
-        "http://?o[oz].b*z.com/{*.js,*.html}",
-        "http://moz.buzz.com/index.html",
-        { extended: true },
-      ),
-      true,
-    );
-    t.equal(
-      match(
-        "http://?o[oz].b*z.com/{*.js,*.html}",
-        "http://moz.buzz.com/index.htm",
-        { extended: true },
-      ),
-      false,
-    );
-    t.equal(
-      match(
-        "http://?o[oz].b*z.com/{*.js,*.html}",
-        "http://moz.bar.com/index.html",
-        { extended: true },
-      ),
-      false,
-    );
-    t.equal(
-      match(
-        "http://?o[oz].b*z.com/{*.js,*.html}",
-        "http://flozz.buzz.com/index.html",
-        { extended: true },
-      ),
-      false,
-    );
-
-    const tester = (globstar: boolean): void => {
-      t.equal(
-        match(
-          "http://?o[oz].b*z.com/{*.js,*.html}",
-          "http://foo.baaz.com/jquery.min.js",
-          { extended: true, globstar, flags: "g" },
-        ),
-        true,
-      );
-      t.equal(
-        match(
-          "http://?o[oz].b*z.com/{*.js,*.html}",
-          "http://moz.buzz.com/index.html",
-          { extended: true, globstar, flags: "g" },
-        ),
-        true,
-      );
-      t.equal(
-        match(
-          "http://?o[oz].b*z.com/{*.js,*.html}",
-          "http://moz.buzz.com/index.htm",
-          { extended: true, globstar, flags: "g" },
-        ),
-        false,
-      );
-      t.equal(
-        match(
-          "http://?o[oz].b*z.com/{*.js,*.html}",
-          "http://moz.bar.com/index.html",
-          { extended: true, globstar, flags: "g" },
-        ),
-        false,
-      );
-      t.equal(
-        match(
-          "http://?o[oz].b*z.com/{*.js,*.html}",
-          "http://flozz.buzz.com/index.html",
-          { extended: true, globstar, flags: "g" },
-        ),
-        false,
-      );
-    };
-
-    tester(true);
-    tester(false);
-  },
-});
-
-Deno.test({
-  name: "globrex: standard globstar",
-  fn(): void {
-    const tester = (globstar: boolean): void => {
-      t.equal(
-        match(
-          "http://foo.com/**/{*.js,*.html}",
-          "http://foo.com/bar/jquery.min.js",
-          { extended: true, globstar, flags: "g" },
-        ),
-        true,
-      );
-      t.equal(
-        match(
-          "http://foo.com/**/{*.js,*.html}",
-          "http://foo.com/bar/baz/jquery.min.js",
-          { extended: true, globstar, flags: "g" },
-        ),
-        true,
-      );
-      t.equal(
-        match("http://foo.com/**", "http://foo.com/bar/baz/jquery.min.js", {
-          extended: true,
-          globstar,
-          flags: "g",
-        }),
-        true,
-      );
-    };
-
-    tester(true);
-    tester(false);
-  },
-});
-
-Deno.test({
-  name: "globrex: remaining chars should match themself",
-  fn(): void {
-    const tester = (globstar: boolean): void => {
-      const testExtStr = "\\/$^+.()=!|,.*";
-      t.equal(match(testExtStr, testExtStr, { extended: true }), true);
-      t.equal(
-        match(testExtStr, testExtStr, { extended: true, globstar, flags: "g" }),
-        true,
-      );
-    };
-
-    tester(true);
-    tester(false);
-  },
-});
-
-Deno.test({
-  name: "globrex: globstar advance testing",
-  fn(): void {
-    t.equal(match("/foo/*", "/foo/bar.txt", { globstar: true }), true);
-    t.equal(match("/foo/**", "/foo/bar.txt", { globstar: true }), true);
-    t.equal(match("/foo/**", "/foo/bar/baz.txt", { globstar: true }), true);
-    t.equal(match("/foo/**", "/foo/bar/baz.txt", { globstar: true }), true);
-    t.equal(
-      match("/foo/*/*.txt", "/foo/bar/baz.txt", { globstar: true }),
-      true,
-    );
-    t.equal(
-      match("/foo/**/*.txt", "/foo/bar/baz.txt", { globstar: true }),
-      true,
-    );
-    t.equal(
-      match("/foo/**/*.txt", "/foo/bar/baz/qux.txt", { globstar: true }),
-      true,
-    );
-    t.equal(match("/foo/**/bar.txt", "/foo/bar.txt", { globstar: true }), true);
-    t.equal(
-      match("/foo/**/**/bar.txt", "/foo/bar.txt", { globstar: true }),
-      true,
-    );
-    t.equal(
-      match("/foo/**/*/baz.txt", "/foo/bar/baz.txt", { globstar: true }),
-      true,
-    );
-    t.equal(match("/foo/**/*.txt", "/foo/bar.txt", { globstar: true }), true);
-    t.equal(
-      match("/foo/**/**/*.txt", "/foo/bar.txt", { globstar: true }),
-      true,
-    );
-    t.equal(
-      match("/foo/**/*/*.txt", "/foo/bar/baz.txt", { globstar: true }),
-      true,
-    );
-    t.equal(
-      match("**/*.txt", "/foo/bar/baz/qux.txt", { globstar: true }),
-      true,
-    );
-    t.equal(match("**/foo.txt", "foo.txt", { globstar: true }), true);
-    t.equal(match("**/*.txt", "foo.txt", { globstar: true }), true);
-    t.equal(match("/foo/*", "/foo/bar/baz.txt", { globstar: true }), false);
-    t.equal(match("/foo/*.txt", "/foo/bar/baz.txt", { globstar: true }), false);
-    t.equal(
-      match("/foo/*/*.txt", "/foo/bar/baz/qux.txt", { globstar: true }),
-      false,
-    );
-    t.equal(match("/foo/*/bar.txt", "/foo/bar.txt", { globstar: true }), false);
-    t.equal(
-      match("/foo/*/*/baz.txt", "/foo/bar/baz.txt", { globstar: true }),
-      false,
-    );
-    t.equal(
-      match("/foo/**.txt", "/foo/bar/baz/qux.txt", { globstar: true }),
-      false,
-    );
-    t.equal(
-      match("/foo/bar**/*.txt", "/foo/bar/baz/qux.txt", { globstar: true }),
-      false,
-    );
-    t.equal(match("/foo/bar**", "/foo/bar/baz.txt", { globstar: true }), false);
-    t.equal(
-      match("**/.txt", "/foo/bar/baz/qux.txt", { globstar: true }),
-      false,
-    );
-    t.equal(
-      match("*/*.txt", "/foo/bar/baz/qux.txt", { globstar: true }),
-      false,
-    );
-    t.equal(match("*/*.txt", "foo.txt", { globstar: true }), false);
-    t.equal(
-      match("http://foo.com/*", "http://foo.com/bar/baz/jquery.min.js", {
-        extended: true,
-        globstar: true,
-      }),
-      false,
-    );
-    t.equal(
-      match("http://foo.com/*", "http://foo.com/bar/baz/jquery.min.js", {
-        globstar: true,
-      }),
-      false,
-    );
-    t.equal(
-      match("http://foo.com/*", "http://foo.com/bar/baz/jquery.min.js", {
-        globstar: false,
-      }),
-      true,
-    );
-    t.equal(
-      match("http://foo.com/**", "http://foo.com/bar/baz/jquery.min.js", {
-        globstar: true,
-      }),
-      true,
-    );
-    t.equal(
-      match(
-        "http://foo.com/*/*/jquery.min.js",
-        "http://foo.com/bar/baz/jquery.min.js",
-        { globstar: true },
-      ),
-      true,
-    );
-    t.equal(
-      match(
-        "http://foo.com/**/jquery.min.js",
-        "http://foo.com/bar/baz/jquery.min.js",
-        { globstar: true },
-      ),
-      true,
-    );
-    t.equal(
-      match(
-        "http://foo.com/*/*/jquery.min.js",
-        "http://foo.com/bar/baz/jquery.min.js",
-        { globstar: false },
-      ),
-      true,
-    );
-    t.equal(
-      match(
-        "http://foo.com/*/jquery.min.js",
-        "http://foo.com/bar/baz/jquery.min.js",
-        { globstar: false },
-      ),
-      true,
-    );
-    t.equal(
-      match(
-        "http://foo.com/*/jquery.min.js",
-        "http://foo.com/bar/baz/jquery.min.js",
-        { globstar: true },
-      ),
-      false,
-    );
-  },
-});
-
-Deno.test({
-  name: "globrex: extended extglob ?",
-  fn(): void {
-    t.equal(match("(foo).txt", "(foo).txt", { extended: true }), true);
-    t.equal(match("?(foo).txt", "foo.txt", { extended: true }), true);
-    t.equal(match("?(foo).txt", ".txt", { extended: true }), true);
-    t.equal(match("?(foo|bar)baz.txt", "foobaz.txt", { extended: true }), true);
-    t.equal(
-      match("?(ba[zr]|qux)baz.txt", "bazbaz.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("?(ba[zr]|qux)baz.txt", "barbaz.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("?(ba[zr]|qux)baz.txt", "quxbaz.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("?(ba[!zr]|qux)baz.txt", "batbaz.txt", { extended: true }),
-      true,
-    );
-    t.equal(match("?(ba*|qux)baz.txt", "batbaz.txt", { extended: true }), true);
-    t.equal(
-      match("?(ba*|qux)baz.txt", "batttbaz.txt", { extended: true }),
-      true,
-    );
-    t.equal(match("?(ba*|qux)baz.txt", "quxbaz.txt", { extended: true }), true);
-    t.equal(
-      match("?(ba?(z|r)|qux)baz.txt", "bazbaz.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("?(ba?(z|?(r))|qux)baz.txt", "bazbaz.txt", { extended: true }),
-      true,
-    );
-    t.equal(match("?(foo).txt", "foo.txt", { extended: false }), false);
-    t.equal(
-      match("?(foo|bar)baz.txt", "foobarbaz.txt", { extended: true }),
-      false,
-    );
-    t.equal(
-      match("?(ba[zr]|qux)baz.txt", "bazquxbaz.txt", { extended: true }),
-      false,
-    );
-    t.equal(
-      match("?(ba[!zr]|qux)baz.txt", "bazbaz.txt", { extended: true }),
-      false,
-    );
-  },
-});
-
-Deno.test({
-  name: "globrex: extended extglob *",
-  fn(): void {
-    t.equal(match("*(foo).txt", "foo.txt", { extended: true }), true);
-    t.equal(match("*foo.txt", "bofoo.txt", { extended: true }), true);
-    t.equal(match("*(foo).txt", "foofoo.txt", { extended: true }), true);
-    t.equal(match("*(foo).txt", ".txt", { extended: true }), true);
-    t.equal(match("*(fooo).txt", ".txt", { extended: true }), true);
-    t.equal(match("*(fooo).txt", "foo.txt", { extended: true }), false);
-    t.equal(match("*(foo|bar).txt", "foobar.txt", { extended: true }), true);
-    t.equal(match("*(foo|bar).txt", "barbar.txt", { extended: true }), true);
-    t.equal(match("*(foo|bar).txt", "barfoobar.txt", { extended: true }), true);
-    t.equal(match("*(foo|bar).txt", ".txt", { extended: true }), true);
-    t.equal(match("*(foo|ba[rt]).txt", "bat.txt", { extended: true }), true);
-    t.equal(match("*(foo|b*[rt]).txt", "blat.txt", { extended: true }), true);
-    t.equal(match("*(foo|b*[rt]).txt", "tlat.txt", { extended: true }), false);
-    t.equal(
-      match("*(*).txt", "whatever.txt", { extended: true, globstar: true }),
-      true,
-    );
-    t.equal(
-      match("*(foo|bar)/**/*.txt", "foo/hello/world/bar.txt", {
-        extended: true,
-        globstar: true,
-      }),
-      true,
-    );
-    t.equal(
-      match("*(foo|bar)/**/*.txt", "foo/world/bar.txt", {
-        extended: true,
-        globstar: true,
-      }),
-      true,
-    );
-  },
-});
-
-Deno.test({
-  name: "globrex: extended extglob +",
-  fn(): void {
-    t.equal(match("+(foo).txt", "foo.txt", { extended: true }), true);
-    t.equal(match("+foo.txt", "+foo.txt", { extended: true }), true);
-    t.equal(match("+(foo).txt", ".txt", { extended: true }), false);
-    t.equal(match("+(foo|bar).txt", "foobar.txt", { extended: true }), true);
-  },
-});
-
-Deno.test({
-  name: "globrex: extended extglob @",
-  fn(): void {
-    t.equal(match("@(foo).txt", "foo.txt", { extended: true }), true);
-    t.equal(match("@foo.txt", "@foo.txt", { extended: true }), true);
-    t.equal(match("@(foo|baz)bar.txt", "foobar.txt", { extended: true }), true);
-    t.equal(
-      match("@(foo|baz)bar.txt", "foobazbar.txt", { extended: true }),
-      false,
-    );
-    t.equal(
-      match("@(foo|baz)bar.txt", "foofoobar.txt", { extended: true }),
-      false,
-    );
-    t.equal(
-      match("@(foo|baz)bar.txt", "toofoobar.txt", { extended: true }),
-      false,
-    );
-  },
-});
-
-Deno.test({
-  name: "globrex: extended extglob !",
-  fn(): void {
-    t.equal(match("!(boo).txt", "foo.txt", { extended: true }), true);
-    t.equal(match("!(foo|baz)bar.txt", "buzbar.txt", { extended: true }), true);
-    t.equal(match("!bar.txt", "!bar.txt", { extended: true }), true);
-    t.equal(
-      match("!({foo,bar})baz.txt", "notbaz.txt", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("!({foo,bar})baz.txt", "foobaz.txt", { extended: true }),
-      false,
-    );
-  },
-});
-
-Deno.test({
-  name: "globrex: strict",
-  fn(): void {
-    t.equal(match("foo//bar.txt", "foo/bar.txt"), true);
-    t.equal(match("foo///bar.txt", "foo/bar.txt"), true);
-    t.equal(match("foo///bar.txt", "foo/bar.txt", { strict: true }), false);
-  },
-});
-
-Deno.test({
-  name: "globrex: stress testing",
-  fn(): void {
-    t.equal(
-      match("**/*/?yfile.{md,js,txt}", "foo/bar/baz/myfile.md", {
-        extended: true,
-      }),
-      true,
-    );
-    t.equal(
-      match("**/*/?yfile.{md,js,txt}", "foo/baz/myfile.md", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("**/*/?yfile.{md,js,txt}", "foo/baz/tyfile.js", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[[:digit:]_.]/file.js", "1/file.js", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[[:digit:]_.]/file.js", "2/file.js", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[[:digit:]_.]/file.js", "_/file.js", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[[:digit:]_.]/file.js", "./file.js", { extended: true }),
-      true,
-    );
-    t.equal(
-      match("[[:digit:]_.]/file.js", "z/file.js", { extended: true }),
-      false,
-    );
-  },
-});
diff --git a/std/path/from_file_url_test.ts b/std/path/from_file_url_test.ts
index 8bbc4e9865a2e6..e69310a37b612c 100644
--- a/std/path/from_file_url_test.ts
+++ b/std/path/from_file_url_test.ts
@@ -1,39 +1,51 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 import { posix, win32 } from "./mod.ts";
-import { assertEquals } from "../testing/asserts.ts";
+import { assertEquals, assertThrows } from "../testing/asserts.ts";
 
 Deno.test("[path] fromFileUrl", function () {
   assertEquals(posix.fromFileUrl(new URL("file:///home/foo")), "/home/foo");
-  assertEquals(posix.fromFileUrl("file:///home/foo"), "/home/foo");
-  assertEquals(posix.fromFileUrl("https://example.com/foo"), "/foo");
   assertEquals(posix.fromFileUrl("file:///"), "/");
-  // FIXME(nayeemrmn): Remove the condition. UNC paths are supported here when
-  // run on Windows (matching the underlying URL class), but
-  // `posix.fromFileUrl()` should not support them under any circumstance.
-  if (Deno.build.os != "windows") {
-    assertEquals(posix.fromFileUrl("file:////"), "//");
-    assertEquals(posix.fromFileUrl("file:////server"), "//server");
-    assertEquals(posix.fromFileUrl("file:////server/file"), "//server/file");
-  }
+  assertEquals(posix.fromFileUrl("file:///home/foo"), "/home/foo");
+  assertEquals(posix.fromFileUrl("file:///home/foo%20bar"), "/home/foo bar");
+  assertEquals(posix.fromFileUrl("file:///%"), "/%");
+  assertEquals(posix.fromFileUrl("file://localhost/foo"), "/foo");
+  assertEquals(posix.fromFileUrl("file:///C:"), "/C:");
+  assertEquals(posix.fromFileUrl("file:///C:/"), "/C:/");
+  assertEquals(posix.fromFileUrl("file:///C:/Users/"), "/C:/Users/");
+  assertEquals(posix.fromFileUrl("file:///C:foo/bar"), "/C:foo/bar");
+  assertThrows(
+    () => posix.fromFileUrl("http://localhost/foo"),
+    TypeError,
+    "Must be a file URL.",
+  );
+  assertThrows(
+    () => posix.fromFileUrl("abcd://localhost/foo"),
+    TypeError,
+    "Must be a file URL.",
+  );
 });
 
 Deno.test("[path] fromFileUrl (win32)", function () {
   assertEquals(win32.fromFileUrl(new URL("file:///home/foo")), "\\home\\foo");
-  assertEquals(win32.fromFileUrl("file:///home/foo"), "\\home\\foo");
-  assertEquals(win32.fromFileUrl("https://example.com/foo"), "\\foo");
   assertEquals(win32.fromFileUrl("file:///"), "\\");
-  // FIXME(nayeemrmn): Remove the condition. UNC paths are only supported here
-  // when run on Windows (matching the underlying URL class), but
-  // `win32.fromFileUrl()` should support them under every circumstance.
-  if (Deno.build.os == "windows") {
-    assertEquals(win32.fromFileUrl("file:////"), "\\");
-    assertEquals(win32.fromFileUrl("file:////server"), "\\");
-    assertEquals(win32.fromFileUrl("file:////server/file"), "\\file");
-  }
-  assertEquals(win32.fromFileUrl("file:///c"), "\\c");
-  assertEquals(win32.fromFileUrl("file:///c:"), "c:\\");
-  assertEquals(win32.fromFileUrl("file:///c:/"), "c:\\");
+  assertEquals(win32.fromFileUrl("file:///home/foo"), "\\home\\foo");
+  assertEquals(win32.fromFileUrl("file:///home/foo%20bar"), "\\home\\foo bar");
+  assertEquals(win32.fromFileUrl("file:///%"), "\\%");
+  assertEquals(win32.fromFileUrl("file://localhost/foo"), "\\\\localhost\\foo");
+  assertEquals(win32.fromFileUrl("file:///C:"), "C:\\");
   assertEquals(win32.fromFileUrl("file:///C:/"), "C:\\");
+  // Drop the hostname if a drive letter is parsed.
+  assertEquals(win32.fromFileUrl("file://localhost/C:/"), "C:\\");
   assertEquals(win32.fromFileUrl("file:///C:/Users/"), "C:\\Users\\");
-  assertEquals(win32.fromFileUrl("file:///C:cwd/another"), "\\C:cwd\\another");
+  assertEquals(win32.fromFileUrl("file:///C:foo/bar"), "\\C:foo\\bar");
+  assertThrows(
+    () => win32.fromFileUrl("http://localhost/foo"),
+    TypeError,
+    "Must be a file URL.",
+  );
+  assertThrows(
+    () => win32.fromFileUrl("abcd://localhost/foo"),
+    TypeError,
+    "Must be a file URL.",
+  );
 });
diff --git a/std/path/glob.ts b/std/path/glob.ts
index 1725876268d2f8..2fff76f3475f52 100644
--- a/std/path/glob.ts
+++ b/std/path/glob.ts
@@ -1,56 +1,254 @@
+// globToRegExp() is originall ported from globrex@0.1.2.
+// Copyright 2018 Terkel Gjervig Nielsen. All rights reserved. MIT license.
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-/** This module is browser compatible. */
+// This module is browser compatible.
 
-import { SEP, SEP_PATTERN } from "./separator.ts";
-import { globrex } from "./_globrex.ts";
+import { NATIVE_OS } from "./_constants.ts";
 import { join, normalize } from "./mod.ts";
-import { assert } from "../_util/assert.ts";
+import { SEP, SEP_PATTERN } from "./separator.ts";
 
 export interface GlobOptions {
+  /** Extended glob syntax.
+   * See https://www.linuxjournal.com/content/bash-extended-globbing. Defaults
+   * to true. */
   extended?: boolean;
+  /** Globstar syntax.
+   * See https://www.linuxjournal.com/content/globstar-new-bash-globbing-option.
+   * If false, `**` is treated like `*`. Defaults to true. */
   globstar?: boolean;
+  /** Operating system. Defaults to the native OS. */
+  os?: typeof Deno.build.os;
 }
 
-export interface GlobToRegExpOptions extends GlobOptions {
-  flags?: string;
-}
+export type GlobToRegExpOptions = GlobOptions;
 
-/**
- * Generate a regex based on glob pattern and options
- * This was meant to be using the the `fs.walk` function
- * but can be used anywhere else.
- * Examples:
- *
- *     Looking for all the `ts` files:
- *     walkSync(".", {
- *       match: [globToRegExp("*.ts")]
- *     })
+/** Convert a glob string to a regular expressions.
  *
- *     Looking for all the `.json` files in any subfolder:
- *     walkSync(".", {
- *       match: [globToRegExp(join("a", "**", "*.json"),{
- *         flags: "g",
- *         extended: true,
- *         globstar: true
- *       })]
- *     })
+ *      // Looking for all the `ts` files:
+ *      walkSync(".", {
+ *        match: [globToRegExp("*.ts")]
+ *      });
  *
- * @param glob - Glob pattern to be used
- * @param options - Specific options for the glob pattern
- * @returns A RegExp for the glob pattern
- */
+ *      Looking for all the `.json` files in any subfolder:
+ *      walkSync(".", {
+ *        match: [globToRegExp(join("a", "**", "*.json"), {
+ *          extended: true,
+ *          globstar: true
+ *        })]
+ *      }); */
 export function globToRegExp(
   glob: string,
-  { extended = false, globstar = true }: GlobToRegExpOptions = {},
+  { extended = true, globstar: globstarOption = true, os = NATIVE_OS }:
+    GlobToRegExpOptions = {},
 ): RegExp {
-  const result = globrex(glob, {
-    extended,
-    globstar,
-    strict: false,
-    filepath: true,
-  });
-  assert(result.path != null);
-  return result.path.regex;
+  const sep = os == "windows" ? `(?:\\\\|\\/)+` : `\\/+`;
+  const sepMaybe = os == "windows" ? `(?:\\\\|\\/)*` : `\\/*`;
+  const seps = os == "windows" ? ["\\", "/"] : ["/"];
+  const sepRaw = os == "windows" ? `\\` : `/`;
+  const globstar = os == "windows"
+    ? `(?:[^\\\\/]*(?:\\\\|\\/|$)+)*`
+    : `(?:[^/]*(?:\\/|$)+)*`;
+  const wildcard = os == "windows" ? `[^\\\\/]*` : `[^/]*`;
+
+  // Keep track of scope for extended syntaxes.
+  const extStack = [];
+
+  // If we are doing extended matching, this boolean is true when we are inside
+  // a group (eg {*.html,*.js}), and false otherwise.
+  let inGroup = false;
+  let inRange = false;
+
+  let regExpString = "";
+
+  // Remove trailing separators.
+  let newLength = glob.length;
+  for (; newLength > 0 && seps.includes(glob[newLength - 1]); newLength--);
+  glob = glob.slice(0, newLength);
+
+  let c, n;
+  for (let i = 0; i < glob.length; i++) {
+    c = glob[i];
+    n = glob[i + 1];
+
+    if (seps.includes(c)) {
+      regExpString += sep;
+      while (seps.includes(glob[i + 1])) i++;
+      continue;
+    }
+
+    if (c == "[") {
+      if (inRange && n == ":") {
+        i++; // skip [
+        let value = "";
+        while (glob[++i] !== ":") value += glob[i];
+        if (value == "alnum") regExpString += "\\w\\d";
+        else if (value == "space") regExpString += "\\s";
+        else if (value == "digit") regExpString += "\\d";
+        i++; // skip last ]
+        continue;
+      }
+      inRange = true;
+      regExpString += c;
+      continue;
+    }
+
+    if (c == "]") {
+      inRange = false;
+      regExpString += c;
+      continue;
+    }
+
+    if (c == "!") {
+      if (inRange) {
+        if (glob[i - 1] == "[") {
+          regExpString += "^";
+          continue;
+        }
+      } else if (extended) {
+        if (n == "(") {
+          extStack.push(c);
+          regExpString += "(?!";
+          i++;
+          continue;
+        }
+        regExpString += `\\${c}`;
+        continue;
+      } else {
+        regExpString += `\\${c}`;
+        continue;
+      }
+    }
+
+    if (inRange) {
+      if (c == "\\" || c == "^" && glob[i - 1] == "[") regExpString += `\\${c}`;
+      else regExpString += c;
+      continue;
+    }
+
+    if (["\\", "$", "^", ".", "="].includes(c)) {
+      regExpString += `\\${c}`;
+      continue;
+    }
+
+    if (c == "(") {
+      if (extStack.length) {
+        regExpString += `${c}?:`;
+        continue;
+      }
+      regExpString += `\\${c}`;
+      continue;
+    }
+
+    if (c == ")") {
+      if (extStack.length) {
+        regExpString += c;
+        const type = extStack.pop()!;
+        if (type == "@") {
+          regExpString += "{1}";
+        } else if (type == "!") {
+          regExpString += wildcard;
+        } else {
+          regExpString += type;
+        }
+        continue;
+      }
+      regExpString += `\\${c}`;
+      continue;
+    }
+
+    if (c == "|") {
+      if (extStack.length) {
+        regExpString += c;
+        continue;
+      }
+      regExpString += `\\${c}`;
+      continue;
+    }
+
+    if (c == "+") {
+      if (n == "(" && extended) {
+        extStack.push(c);
+        continue;
+      }
+      regExpString += `\\${c}`;
+      continue;
+    }
+
+    if (c == "@" && extended) {
+      if (n == "(") {
+        extStack.push(c);
+        continue;
+      }
+    }
+
+    if (c == "?") {
+      if (extended) {
+        if (n == "(") {
+          extStack.push(c);
+        }
+        continue;
+      } else {
+        regExpString += ".";
+        continue;
+      }
+    }
+
+    if (c == "{") {
+      inGroup = true;
+      regExpString += "(?:";
+      continue;
+    }
+
+    if (c == "}") {
+      inGroup = false;
+      regExpString += ")";
+      continue;
+    }
+
+    if (c == ",") {
+      if (inGroup) {
+        regExpString += "|";
+        continue;
+      }
+      regExpString += `\\${c}`;
+      continue;
+    }
+
+    if (c == "*") {
+      if (n == "(" && extended) {
+        extStack.push(c);
+        continue;
+      }
+      // Move over all consecutive "*"'s.
+      // Also store the previous and next characters
+      const prevChar = glob[i - 1];
+      let starCount = 1;
+      while (glob[i + 1] == "*") {
+        starCount++;
+        i++;
+      }
+      const nextChar = glob[i + 1];
+      const isGlobstar = globstarOption && starCount > 1 &&
+        // from the start of the segment
+        [sepRaw, "/", undefined].includes(prevChar) &&
+        // to the end of the segment
+        [sepRaw, "/", undefined].includes(nextChar);
+      if (isGlobstar) {
+        // it's a globstar, so match zero or more path segments
+        regExpString += globstar;
+        while (seps.includes(glob[i + 1])) i++;
+      } else {
+        // it's not a globstar, so only match one path segment
+        regExpString += wildcard;
+      }
+      continue;
+    }
+
+    regExpString += c;
+  }
+
+  regExpString = `^${regExpString}${regExpString != "" ? sepMaybe : ""}$`;
+  return new RegExp(regExpString);
 }
 
 /** Test whether the given string is a glob */
diff --git a/std/path/glob_test.ts b/std/path/glob_test.ts
index dba79c3028d13c..bb3f8add0f6684 100644
--- a/std/path/glob_test.ts
+++ b/std/path/glob_test.ts
@@ -1,130 +1,456 @@
 import { assert, assertEquals } from "../testing/asserts.ts";
-import { testWalk, touch, walkArray } from "../fs/walk_test.ts";
-import { globToRegExp, isGlob, joinGlobs, normalizeGlob } from "./glob.ts";
-import { SEP, join } from "./mod.ts";
-
-Deno.test({
-  name: "glob: glob to regex",
-  fn(): void {
-    assertEquals(globToRegExp("unicorn.*") instanceof RegExp, true);
-    assertEquals(globToRegExp("unicorn.*").test("poney.ts"), false);
-    assertEquals(globToRegExp("unicorn.*").test("unicorn.py"), true);
-    assertEquals(globToRegExp("*.ts").test("poney.ts"), true);
-    assertEquals(globToRegExp("*.ts").test("unicorn.js"), false);
-    assertEquals(
-      globToRegExp(join("unicorn", "**", "cathedral.ts")).test(
-        join("unicorn", "in", "the", "cathedral.ts"),
-      ),
-      true,
-    );
-    assertEquals(
-      globToRegExp(join("unicorn", "**", "cathedral.ts")).test(
-        join("unicorn", "in", "the", "kitchen.ts"),
-      ),
-      false,
-    );
-    assertEquals(
-      globToRegExp(join("unicorn", "**", "bathroom.*")).test(
-        join("unicorn", "sleeping", "in", "bathroom.py"),
-      ),
-      true,
-    );
-    assertEquals(
-      globToRegExp(join("unicorn", "!(sleeping)", "bathroom.ts"), {
-        extended: true,
-      }).test(join("unicorn", "flying", "bathroom.ts")),
-      true,
-    );
-    assertEquals(
-      globToRegExp(join("unicorn", "(!sleeping)", "bathroom.ts"), {
-        extended: true,
-      }).test(join("unicorn", "sleeping", "bathroom.ts")),
-      false,
-    );
-  },
-});
-
-testWalk(
-  async (d: string): Promise<void> => {
-    await Deno.mkdir(d + "/a");
-    await Deno.mkdir(d + "/b");
-    await touch(d + "/a/x.ts");
-    await touch(d + "/b/z.ts");
-    await touch(d + "/b/z.js");
-  },
-  async function globInWalkWildcard(): Promise<void> {
-    const arr = await walkArray(".", {
-      match: [globToRegExp(join("*", "*.ts"))],
-    });
-    assertEquals(arr.length, 2);
-    assertEquals(arr[0], "a/x.ts");
-    assertEquals(arr[1], "b/z.ts");
-  },
-);
-
-testWalk(
-  async (d: string): Promise<void> => {
-    await Deno.mkdir(d + "/a");
-    await Deno.mkdir(d + "/a/yo");
-    await touch(d + "/a/yo/x.ts");
-  },
-  async function globInWalkFolderWildcard(): Promise<void> {
-    const arr = await walkArray(".", {
-      match: [
-        globToRegExp(join("a", "**", "*.ts"), {
-          flags: "g",
-          globstar: true,
-        }),
-      ],
-    });
-    assertEquals(arr.length, 1);
-    assertEquals(arr[0], "a/yo/x.ts");
-  },
-);
-
-testWalk(
-  async (d: string): Promise<void> => {
-    await Deno.mkdir(d + "/a");
-    await Deno.mkdir(d + "/a/unicorn");
-    await Deno.mkdir(d + "/a/deno");
-    await Deno.mkdir(d + "/a/raptor");
-    await touch(d + "/a/raptor/x.ts");
-    await touch(d + "/a/deno/x.ts");
-    await touch(d + "/a/unicorn/x.ts");
-  },
-  async function globInWalkFolderExtended(): Promise<void> {
-    const arr = await walkArray(".", {
-      match: [
-        globToRegExp(join("a", "+(raptor|deno)", "*.ts"), {
-          flags: "g",
-          extended: true,
-        }),
-      ],
-    });
-    assertEquals(arr.length, 2);
-    assertEquals(arr[0], "a/deno/x.ts");
-    assertEquals(arr[1], "a/raptor/x.ts");
-  },
-);
-
-testWalk(
-  async (d: string): Promise<void> => {
-    await touch(d + "/x.ts");
-    await touch(d + "/x.js");
-    await touch(d + "/b.js");
-  },
-  async function globInWalkWildcardExtension(): Promise<void> {
-    const arr = await walkArray(".", {
-      match: [globToRegExp("x.*", { flags: "g", globstar: true })],
-    });
-    assertEquals(arr.length, 2);
-    assertEquals(arr[0], "x.js");
-    assertEquals(arr[1], "x.ts");
-  },
-);
-
-Deno.test({
-  name: "isGlob: pattern to test",
+import {
+  GlobToRegExpOptions,
+  globToRegExp,
+  isGlob,
+  joinGlobs,
+  normalizeGlob,
+} from "./glob.ts";
+import { SEP } from "./mod.ts";
+
+function match(
+  glob: string,
+  path: string,
+  opts: GlobToRegExpOptions = {},
+): boolean {
+  if (opts.os == null) {
+    const matchDarwin = path.match(
+      globToRegExp(glob, { ...opts, os: "darwin" }),
+    );
+    if (matchDarwin) {
+      assertEquals(matchDarwin.length, 1);
+    }
+    const matchLinux = path.match(globToRegExp(glob, { ...opts, os: "linux" }));
+    if (matchLinux) {
+      assertEquals(matchLinux.length, 1);
+    }
+    const matchWindows = path.match(
+      globToRegExp(glob, { ...opts, os: "windows" }),
+    );
+    if (matchWindows) {
+      assertEquals(matchWindows.length, 1);
+    }
+    return !!matchDarwin && !!matchLinux && !!matchWindows;
+  } else {
+    const match = path.match(globToRegExp(glob, opts));
+    if (match) {
+      assertEquals(match.length, 1);
+    }
+    return !!match;
+  }
+}
+
+Deno.test({
+  name: "[path] globToRegExp() Basic RegExp",
+  fn(): void {
+    assertEquals(globToRegExp(""), /^$/);
+    assertEquals(globToRegExp("*.js", { os: "linux" }), /^[^/]*\.js\/*$/);
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() * (wildcard)",
+  fn(): void {
+    assert(match("*", "foo", { extended: false, globstar: false }));
+    assert(match("*", "foo", { extended: false, globstar: false }));
+    assert(match("f*", "foo", { extended: false, globstar: false }));
+    assert(match("f*", "foo", { extended: false, globstar: false }));
+    assert(match("*o", "foo", { extended: false, globstar: false }));
+    assert(match("*o", "foo", { extended: false, globstar: false }));
+    assert(match("u*orn", "unicorn", { extended: false, globstar: false }));
+    assert(match("u*orn", "unicorn", { extended: false, globstar: false }));
+    assert(!match("ico", "unicorn", { extended: false, globstar: false }));
+    assert(match("u*nicorn", "unicorn", { extended: false, globstar: false }));
+    assert(match("u*nicorn", "unicorn", { extended: false, globstar: false }));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() ? (match one character)",
+  fn(): void {
+    assert(match("f?o", "foo", { extended: false, globstar: false }));
+    assert(match("f?o?", "fooo", { extended: false, globstar: false }));
+    assert(!match("f?oo", "foo", { extended: false, globstar: false }));
+    assert(!match("?fo", "fooo", { extended: false, globstar: false }));
+    assert(!match("f?oo", "foo", { extended: false, globstar: false }));
+    assert(!match("foo?", "foo", { extended: false, globstar: false }));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() [seq] (character range)",
+  fn(): void {
+    assert(match("fo[oz]", "foo", { extended: false, globstar: false }));
+    assert(match("fo[oz]", "foz", { extended: false, globstar: false }));
+    assert(!match("fo[oz]", "fog", { extended: false, globstar: false }));
+    assert(match("fo[a-z]", "fob", { extended: false, globstar: false }));
+    assert(!match("fo[a-d]", "fot", { extended: false, globstar: false }));
+    assert(!match("fo[!tz]", "fot", { extended: false, globstar: false }));
+    assert(match("fo[!tz]", "fob", { extended: false, globstar: false }));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() [[:alnum:]] (character class in range)",
+  fn(): void {
+    assert(
+      match(
+        "[[:alnum:]]/bar.txt",
+        "a/bar.txt",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      match(
+        "[[:alnum:]abc]/bar.txt",
+        "1/bar.txt",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      match(
+        "[[:digit:]]/bar.txt",
+        "1/bar.txt",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      match(
+        "[[:digit:]b]/bar.txt",
+        "b/bar.txt",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      match(
+        "[![:digit:]b]/bar.txt",
+        "a/bar.txt",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      !match(
+        "[[:alnum:]]/bar.txt",
+        "!/bar.txt",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      !match(
+        "[[:digit:]]/bar.txt",
+        "a/bar.txt",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      !match(
+        "[[:digit:]b]/bar.txt",
+        "a/bar.txt",
+        { extended: false, globstar: false },
+      ),
+    );
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() {} (brace expansion)",
+  fn(): void {
+    assert(
+      match("foo{bar,baaz}", "foobaaz", { extended: false, globstar: false }),
+    );
+    assert(
+      match("foo{bar,baaz}", "foobar", { extended: false, globstar: false }),
+    );
+    assert(
+      !match("foo{bar,baaz}", "foobuzz", { extended: false, globstar: false }),
+    );
+    assert(
+      match("foo{bar,b*z}", "foobuzz", { extended: false, globstar: false }),
+    );
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() Complex matches",
+  fn(): void {
+    assert(
+      match(
+        "http://?o[oz].b*z.com/{*.js,*.html}",
+        "http://foo.baaz.com/jquery.min.js",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      match(
+        "http://?o[oz].b*z.com/{*.js,*.html}",
+        "http://moz.buzz.com/index.html",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      !match(
+        "http://?o[oz].b*z.com/{*.js,*.html}",
+        "http://moz.buzz.com/index.htm",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      !match(
+        "http://?o[oz].b*z.com/{*.js,*.html}",
+        "http://moz.bar.com/index.html",
+        { extended: false, globstar: false },
+      ),
+    );
+    assert(
+      !match(
+        "http://?o[oz].b*z.com/{*.js,*.html}",
+        "http://flozz.buzz.com/index.html",
+        { extended: false, globstar: false },
+      ),
+    );
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() ** (globstar)",
+  fn(): void {
+    assert(match("/foo/**", "/foo/bar.txt"));
+    assert(match("/foo/**", "/foo/bar/baz.txt"));
+    assert(!match("/foo/**", "/foo/bar/baz.txt", { globstar: false }));
+    assert(match("/foo/**", "/foo/bar", { globstar: false }));
+    assert(match("/foo/**/*.txt", "/foo/bar/baz.txt"));
+    assert(match("/foo/**/*.txt", "/foo/bar/baz/qux.txt"));
+    assert(match("/foo/**/bar.txt", "/foo/bar.txt"));
+    assert(match("/foo/**/**/bar.txt", "/foo/bar.txt"));
+    assert(match("/foo/**/*/baz.txt", "/foo/bar/baz.txt"));
+    assert(match("/foo/**/*.txt", "/foo/bar.txt"));
+    assert(match("/foo/**/**/*.txt", "/foo/bar.txt"));
+    assert(match("/foo/**/*/*.txt", "/foo/bar/baz.txt"));
+    assert(match("**/*.txt", "/foo/bar/baz/qux.txt"));
+    assert(match("**/foo.txt", "foo.txt"));
+    assert(match("**/*.txt", "foo.txt"));
+    assert(!match("/foo/**.txt", "/foo/bar/baz/qux.txt"));
+    assert(
+      !match("/foo/bar**/*.txt", "/foo/bar/baz/qux.txt"),
+    );
+    assert(!match("/foo/bar**", "/foo/bar/baz.txt"));
+    assert(!match("**/.txt", "/foo/bar/baz/qux.txt"));
+    assert(
+      !match(
+        "http://foo.com/*",
+        "http://foo.com/bar/baz/jquery.min.js",
+      ),
+    );
+    assert(
+      !match("http://foo.com/*", "http://foo.com/bar/baz/jquery.min.js"),
+    );
+    assert(
+      match("http://foo.com/**", "http://foo.com/bar/baz/jquery.min.js"),
+    );
+    assert(
+      match(
+        "http://foo.com/**/jquery.min.js",
+        "http://foo.com/bar/baz/jquery.min.js",
+      ),
+    );
+    assert(
+      !match(
+        "http://foo.com/*/jquery.min.js",
+        "http://foo.com/bar/baz/jquery.min.js",
+      ),
+    );
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() ?(pattern-list) (extended: match zero or one)",
+  fn(): void {
+    assert(match("?(foo).txt", "foo.txt"));
+    assert(!match("?(foo).txt", "foo.txt", { extended: false }));
+    assert(match("?(foo).txt", "a(foo).txt", { extended: false }));
+    assert(match("?(foo).txt", ".txt"));
+    assert(match("?(foo|bar)baz.txt", "foobaz.txt"));
+    assert(match("?(ba[zr]|qux)baz.txt", "bazbaz.txt"));
+    assert(match("?(ba[zr]|qux)baz.txt", "barbaz.txt"));
+    assert(match("?(ba[zr]|qux)baz.txt", "quxbaz.txt"));
+    assert(match("?(ba[!zr]|qux)baz.txt", "batbaz.txt"));
+    assert(match("?(ba*|qux)baz.txt", "batbaz.txt"));
+    assert(match("?(ba*|qux)baz.txt", "batttbaz.txt"));
+    assert(match("?(ba*|qux)baz.txt", "quxbaz.txt"));
+    assert(match("?(ba?(z|r)|qux)baz.txt", "bazbaz.txt"));
+    assert(match("?(ba?(z|?(r))|qux)baz.txt", "bazbaz.txt"));
+    assert(!match("?(foo|bar)baz.txt", "foobarbaz.txt"));
+    assert(!match("?(ba[zr]|qux)baz.txt", "bazquxbaz.txt"));
+    assert(!match("?(ba[!zr]|qux)baz.txt", "bazbaz.txt"));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() *(pattern-list) (extended: match zero or more)",
+  fn(): void {
+    assert(match("*(foo).txt", "foo.txt"));
+    assert(!match("*(foo).txt", "foo.txt", { extended: false }));
+    assert(match("*(foo).txt", "bar(foo).txt", { extended: false }));
+    assert(match("*(foo).txt", "foofoo.txt"));
+    assert(match("*(foo).txt", ".txt"));
+    assert(match("*(fooo).txt", ".txt"));
+    assert(!match("*(fooo).txt", "foo.txt"));
+    assert(match("*(foo|bar).txt", "foobar.txt"));
+    assert(match("*(foo|bar).txt", "barbar.txt"));
+    assert(match("*(foo|bar).txt", "barfoobar.txt"));
+    assert(match("*(foo|bar).txt", ".txt"));
+    assert(match("*(foo|ba[rt]).txt", "bat.txt"));
+    assert(match("*(foo|b*[rt]).txt", "blat.txt"));
+    assert(!match("*(foo|b*[rt]).txt", "tlat.txt"));
+    assert(match("*(*).txt", "whatever.txt"));
+    assert(match("*(foo|bar)/**/*.txt", "foo/hello/world/bar.txt"));
+    assert(match("*(foo|bar)/**/*.txt", "foo/world/bar.txt"));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() +(pattern-list) (extended: match 1 or more)",
+  fn(): void {
+    assert(match("+(foo).txt", "foo.txt"));
+    assert(!match("+(foo).txt", "foo.txt", { extended: false }));
+    assert(match("+(foo).txt", "+(foo).txt", { extended: false }));
+    assert(!match("+(foo).txt", ".txt"));
+    assert(match("+(foo|bar).txt", "foobar.txt"));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() @(pattern-list) (extended: match one)",
+  fn(): void {
+    assert(match("@(foo).txt", "foo.txt"));
+    assert(!match("@(foo).txt", "foo.txt", { extended: false }));
+    assert(match("@(foo).txt", "@(foo).txt", { extended: false }));
+    assert(match("@(foo|baz)bar.txt", "foobar.txt"));
+    assert(!match("@(foo|baz)bar.txt", "foobazbar.txt"));
+    assert(!match("@(foo|baz)bar.txt", "foofoobar.txt"));
+    assert(!match("@(foo|baz)bar.txt", "toofoobar.txt"));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() !(pattern-list) (extended: match any except)",
+  fn(): void {
+    assert(match("!(boo).txt", "foo.txt"));
+    assert(!match("!(boo).txt", "foo.txt", { extended: false }));
+    assert(match("!(boo).txt", "!(boo).txt", { extended: false }));
+    assert(match("!(foo|baz)bar.txt", "buzbar.txt"));
+    assert(match("!({foo,bar})baz.txt", "notbaz.txt"));
+    assert(!match("!({foo,bar})baz.txt", "foobaz.txt"));
+  },
+});
+
+Deno.test({
+  name:
+    "[path] globToRegExp() Special extended characters should match themselves",
+  fn(): void {
+    const glob = "\\/$^+.()=!|,.*";
+    assert(match(glob, glob));
+    assert(match(glob, glob, { extended: false }));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() Special extended characters in range",
+  fn(): void {
+    assertEquals(globToRegExp("[?*+@!|]", { os: "linux" }), /^[?*+@!|]\/*$/);
+    assertEquals(globToRegExp("[!?*+@!|]", { os: "linux" }), /^[^?*+@!|]\/*$/);
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() Special RegExp characters in range",
+  fn(): void {
+    // Excluding characters checked in the previous test.
+    assertEquals(globToRegExp("[\\$^.=]", { os: "linux" }), /^[\\$^.=]\/*$/);
+    assertEquals(globToRegExp("[!\\$^.=]", { os: "linux" }), /^[^\\$^.=]\/*$/);
+    assertEquals(globToRegExp("[^^]", { os: "linux" }), /^[\^^]\/*$/);
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() Repeating separators",
+  fn() {
+    assert(match("foo/bar", "foo//bar"));
+    assert(match("foo//bar", "foo/bar"));
+    assert(match("foo//bar", "foo//bar"));
+    assert(match("**/bar", "foo//bar"));
+    assert(match("**//bar", "foo/bar"));
+    assert(match("**//bar", "foo//bar"));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() Trailing separators",
+  fn() {
+    assert(match("foo", "foo/"));
+    assert(match("foo/", "foo"));
+    assert(match("foo/", "foo/"));
+    assert(match("**", "foo/"));
+    assert(match("**/", "foo"));
+    assert(match("**/", "foo/"));
+  },
+});
+
+Deno.test({
+  name: "[path] globToRegExp() Backslashes on Windows",
+  fn() {
+    assert(match("foo/bar", "foo\\bar", { os: "windows" }));
+    assert(match("foo\\bar", "foo/bar", { os: "windows" }));
+    assert(match("foo\\bar", "foo\\bar", { os: "windows" }));
+    assert(match("**/bar", "foo\\bar", { os: "windows" }));
+    assert(match("**\\bar", "foo/bar", { os: "windows" }));
+    assert(match("**\\bar", "foo\\bar", { os: "windows" }));
+  },
+});
+
+Deno.test({
+  name: "[path] GlobToRegExpOptions::extended",
+  fn() {
+    const pattern1 = globToRegExp("?(foo|bar)");
+    assertEquals("foo".match(pattern1)?.[0], "foo");
+    assertEquals("bar".match(pattern1)?.[0], "bar");
+
+    const pattern2 = globToRegExp("?(foo|bar)", { extended: false });
+    assertEquals("foo".match(pattern2)?.[0], undefined);
+    assertEquals("bar".match(pattern2)?.[0], undefined);
+    assertEquals("?(foo|bar)".match(pattern2)?.[0], "?(foo|bar)");
+  },
+});
+
+Deno.test({
+  name: "[path] GlobToRegExpOptions::globstar",
+  fn() {
+    const pattern1 = globToRegExp("**/foo");
+    assertEquals("foo".match(pattern1)?.[0], "foo");
+    assertEquals("path/to/foo".match(pattern1)?.[0], "path/to/foo");
+
+    const pattern2 = globToRegExp("**/foo", { globstar: false });
+    assertEquals("foo".match(pattern2)?.[0], undefined);
+    assertEquals("path/to/foo".match(pattern2)?.[0], undefined);
+    assertEquals("path-to/foo".match(pattern2)?.[0], "path-to/foo");
+  },
+});
+
+Deno.test({
+  name: "[path] GlobToRegExpOptions::os",
+  fn() {
+    const pattern1 = globToRegExp("foo/bar", { os: "linux" });
+    assertEquals("foo/bar".match(pattern1)?.[0], "foo/bar");
+    assertEquals("foo\\bar".match(pattern1)?.[0], undefined);
+
+    const pattern2 = globToRegExp("foo/bar", { os: "windows" });
+    assertEquals("foo/bar".match(pattern2)?.[0], "foo/bar");
+    assertEquals("foo\\bar".match(pattern2)?.[0], "foo\\bar");
+  },
+});
+
+Deno.test({
+  name: "[path] isGlob()",
   fn(): void {
     // should be true if valid glob pattern
     assert(isGlob("!foo.js"));
@@ -238,10 +564,10 @@ Deno.test({
   },
 });
 
-Deno.test("normalizeGlobGlobstar", function (): void {
+Deno.test("[path] normalizeGlob() Globstar", function (): void {
   assertEquals(normalizeGlob(`**${SEP}..`, { globstar: true }), `**${SEP}..`);
 });
 
-Deno.test("joinGlobsGlobstar", function (): void {
+Deno.test("[path] joinGlobs() Globstar", function (): void {
   assertEquals(joinGlobs(["**", ".."], { globstar: true }), `**${SEP}..`);
 });
diff --git a/std/path/posix.ts b/std/path/posix.ts
index 03d07a84a89ccf..33b94a91641640 100644
--- a/std/path/posix.ts
+++ b/std/path/posix.ts
@@ -430,10 +430,13 @@ export function parse(path: string): ParsedPath {
 /** Converts a file URL to a path string.
  *
  *      fromFileUrl("file:///home/foo"); // "/home/foo"
- *
- * Note that non-file URLs are treated as file URLs and irrelevant components
- * are ignored.
  */
 export function fromFileUrl(url: string | URL): string {
-  return new URL(String(url)).pathname;
+  url = url instanceof URL ? url : new URL(url);
+  if (url.protocol != "file:") {
+    throw new TypeError("Must be a file URL.");
+  }
+  return decodeURIComponent(
+    url.pathname.replace(/%(?![0-9A-Fa-f]{2})/g, "%25"),
+  );
 }
diff --git a/std/path/win32.ts b/std/path/win32.ts
index 66ed1ff1492e1e..19b29a6b918aeb 100644
--- a/std/path/win32.ts
+++ b/std/path/win32.ts
@@ -907,14 +907,26 @@ export function parse(path: string): ParsedPath {
 
 /** Converts a file URL to a path string.
  *
- *      fromFileUrl("file:///C:/Users/foo"); // "C:\\Users\\foo"
  *      fromFileUrl("file:///home/foo"); // "\\home\\foo"
- *
- * Note that non-file URLs are treated as file URLs and irrelevant components
- * are ignored.
+ *      fromFileUrl("file:///C:/Users/foo"); // "C:\\Users\\foo"
+ *      fromFileUrl("file://localhost/home/foo"); // "\\\\localhost\\home\\foo"
  */
 export function fromFileUrl(url: string | URL): string {
-  return new URL(String(url)).pathname
-    .replace(/^\/*([A-Za-z]:)(\/|$)/, "$1/")
-    .replace(/\//g, "\\");
+  url = url instanceof URL ? url : new URL(url);
+  if (url.protocol != "file:") {
+    throw new TypeError("Must be a file URL.");
+  }
+  let path = decodeURIComponent(
+    url.pathname
+      .replace(/^\/*([A-Za-z]:)(\/|$)/, "$1/")
+      .replace(/\//g, "\\")
+      .replace(/%(?![0-9A-Fa-f]{2})/g, "%25"),
+  );
+  if (url.hostname != "") {
+    // Note: The `URL` implementation guarantees that the drive letter and
+    // hostname are mutually exclusive. Otherwise it would not have been valid
+    // to append the hostname and path like this.
+    path = `\\\\${url.hostname}${path}`;
+  }
+  return path;
 }
diff --git a/std/testing/asserts.ts b/std/testing/asserts.ts
index 4b9241e55cfb22..fe8b90f63243fd 100644
--- a/std/testing/asserts.ts
+++ b/std/testing/asserts.ts
@@ -242,10 +242,20 @@ export function assertNotEquals(
  * assertStrictEquals(1, 2)
  * ```
  */
+export function assertStrictEquals(
+  actual: unknown,
+  expected: unknown,
+  msg?: string,
+): void;
 export function assertStrictEquals<T>(
   actual: T,
   expected: T,
   msg?: string,
+): void;
+export function assertStrictEquals(
+  actual: unknown,
+  expected: unknown,
+  msg?: string,
 ): void {
   if (actual === expected) {
     return;
@@ -285,6 +295,37 @@ export function assertStrictEquals<T>(
   throw new AssertionError(message);
 }
 
+/**
+ * Make an assertion that `actual` and `expected` are not strictly equal.  
+ * If the values are strictly equal then throw.
+ * ```ts
+ * assertNotStrictEquals(1, 1)
+ * ```
+ */
+export function assertNotStrictEquals(
+  actual: unknown,
+  expected: unknown,
+  msg?: string,
+): void;
+export function assertNotStrictEquals<T>(
+  actual: T,
+  expected: T,
+  msg?: string,
+): void;
+export function assertNotStrictEquals(
+  actual: unknown,
+  expected: unknown,
+  msg?: string,
+): void {
+  if (actual !== expected) {
+    return;
+  }
+
+  throw new AssertionError(
+    msg ?? `Expected "actual" to be strictly unequal to: ${_format(actual)}\n`,
+  );
+}
+
 /**
  * Make an assertion that actual contains expected. If not
  * then thrown.
diff --git a/std/testing/asserts_test.ts b/std/testing/asserts_test.ts
index 7ea73b5c0493f7..65645b06bcea00 100644
--- a/std/testing/asserts_test.ts
+++ b/std/testing/asserts_test.ts
@@ -8,6 +8,7 @@ import {
   assertMatch,
   assertEquals,
   assertStrictEquals,
+  assertNotStrictEquals,
   assertThrows,
   assertThrowsAsync,
   AssertionError,
@@ -463,13 +464,42 @@ Deno.test({
 });
 
 Deno.test({
-  name: "assert* functions with specified type paratemeter",
+  name: "strictly unequal pass case",
+  fn(): void {
+    assertNotStrictEquals(true, false);
+    assertNotStrictEquals(10, 11);
+    assertNotStrictEquals("abc", "xyz");
+    assertNotStrictEquals(1, "1");
+
+    const xs = [1, false, "foo"];
+    const ys = [1, true, "bar"];
+    assertNotStrictEquals(xs, ys);
+
+    const x = { a: 1 };
+    const y = { a: 2 };
+    assertNotStrictEquals(x, y);
+  },
+});
+
+Deno.test({
+  name: "strictly unequal fail case",
+  fn(): void {
+    assertThrows(
+      () => assertNotStrictEquals(1, 1),
+      AssertionError,
+    );
+  },
+});
+
+Deno.test({
+  name: "assert* functions with specified type parameter",
   fn(): void {
     assertEquals<string>("hello", "hello");
     assertNotEquals<number>(1, 2);
     assertArrayContains<boolean>([true, false], [true]);
     const value = { x: 1 };
     assertStrictEquals<typeof value>(value, value);
+    assertNotStrictEquals<object>(value, { x: 1 });
   },
 });
 
diff --git a/std/tsconfig_test.json b/std/tsconfig_test.json
index 1dbf69fb2ec2d6..8dee5fa2a4a133 100644
--- a/std/tsconfig_test.json
+++ b/std/tsconfig_test.json
@@ -1,5 +1,5 @@
 {
   "compilerOptions": {
-    "importsNotUsedAsValues": "error"
+    "isolatedModules": true
   }
 }
diff --git a/std/version.ts b/std/version.ts
index 7df2195709d7bd..6efc0fe51684fc 100644
--- a/std/version.ts
+++ b/std/version.ts
@@ -4,4 +4,4 @@
  * the cli's API is stable. In the future when std becomes stable, likely we
  * will match versions with cli as we have in the past.
  */
-export const VERSION = "0.61.0";
+export const VERSION = "0.66.0";
diff --git a/std/wasi/README.md b/std/wasi/README.md
index 06dc36ff5bec48..580e7ddd01448e 100644
--- a/std/wasi/README.md
+++ b/std/wasi/README.md
@@ -55,9 +55,9 @@ This module provides an implementation of the WebAssembly System Interface
 ## Usage
 
 ```typescript
-import WASI from "https://deno.land/std/wasi/snapshot_preview1.ts";
+import Context from "https://deno.land/std/wasi/snapshot_preview1.ts";
 
-const wasi = new WASI({
+const context = new Context({
   args: Deno.args,
   env: Deno.env,
 });
@@ -65,10 +65,10 @@ const wasi = new WASI({
 const binary = await Deno.readFile("path/to/your/module.wasm");
 const module = await WebAssembly.compile(binary);
 const instance = await WebAssembly.instantiate(module, {
-  wasi_snapshot_preview1: wasi.exports,
+  wasi_snapshot_preview1: context.exports,
 });
 
-wasi.memory = module.exports.memory;
+context.memory = context.exports.memory;
 
 if (module.exports._start) {
   instance.exports._start();
diff --git a/std/wasi/snapshot_preview1.ts b/std/wasi/snapshot_preview1.ts
index a89957373f708c..ab9da73ecebe1e 100644
--- a/std/wasi/snapshot_preview1.ts
+++ b/std/wasi/snapshot_preview1.ts
@@ -277,14 +277,14 @@ function errno(err: Error) {
   }
 }
 
-export interface ModuleOptions {
+export interface ContextOptions {
   args?: string[];
   env?: { [key: string]: string | undefined };
   preopens?: { [key: string]: string };
   memory?: WebAssembly.Memory;
 }
 
-export default class Module {
+export default class Context {
   args: string[];
   env: { [key: string]: string | undefined };
   memory: WebAssembly.Memory;
@@ -292,10 +292,9 @@ export default class Module {
   // deno-lint-ignore no-explicit-any
   fds: any[];
 
-  // deno-lint-ignore no-explicit-any
-  exports: { [key: string]: any };
+  exports: Record<string, Function>;
 
-  constructor(options: ModuleOptions) {
+  constructor(options: ContextOptions) {
     this.args = options.args ? options.args : [];
     this.env = options.env ? options.env : {};
     this.memory = options.memory!;
diff --git a/std/wasi/snapshot_preview1_test.ts b/std/wasi/snapshot_preview1_test.ts
index 748ba7772d11b6..dce37d220fcebb 100644
--- a/std/wasi/snapshot_preview1_test.ts
+++ b/std/wasi/snapshot_preview1_test.ts
@@ -2,24 +2,24 @@
 
 import { assert, assertEquals } from "../testing/asserts.ts";
 import * as path from "../path/mod.ts";
-import WASI from "./snapshot_preview1.ts";
+import Context from "./snapshot_preview1.ts";
 
 if (import.meta.main) {
   const options = JSON.parse(Deno.args[0]);
   const binary = await Deno.readFile(Deno.args[1]);
   const module = await WebAssembly.compile(binary);
 
-  const wasi = new WASI({
+  const context = new Context({
     env: options.env,
     args: options.args,
     preopens: options.preopens,
   });
 
   const instance = new WebAssembly.Instance(module, {
-    wasi_snapshot_preview1: wasi.exports,
+    wasi_snapshot_preview1: context.exports,
   });
 
-  wasi.memory = instance.exports.memory;
+  context.memory = instance.exports.memory;
 
   instance.exports._start();
 } else {
diff --git a/test_util/Cargo.toml b/test_util/Cargo.toml
index b9444a5946d2c5..c1b4f51ec8d29b 100644
--- a/test_util/Cargo.toml
+++ b/test_util/Cargo.toml
@@ -11,10 +11,13 @@ path = "src/test_server.rs"
 
 [dependencies]
 tokio = { version = "0.2.22", features = ["full"] }
-futures = { version = "0.3.5", features = ["compat", "io-compat"] }
-bytes = "0.5.5"
+futures = "0.3.5"
+bytes = "0.5.6"
 lazy_static = "1.4.0"
 os_pipe = "0.9.2"
 regex = "1.3.9"
 tempfile = "3.1.0"
-warp = { version = "0.2.3", features = ["tls"] }
+warp = { version = "0.2.4", features = ["tls"] }
+
+[target.'cfg(unix)'.dependencies]
+pty = "0.2.2"
diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs
index 10e803f5f68673..9b029c35561472 100644
--- a/test_util/src/lib.rs
+++ b/test_util/src/lib.rs
@@ -7,6 +7,8 @@ extern crate lazy_static;
 
 use futures::future::{self, FutureExt};
 use os_pipe::pipe;
+#[cfg(unix)]
+pub use pty;
 use regex::Regex;
 use std::env;
 use std::io::Read;
@@ -293,6 +295,39 @@ pub async fn run_all_servers() {
       );
       res
     }))
+    .or(warp::path!("type_headers_deno_types.foo.js").map(|| {
+      let mut res = Response::new(Body::from("export function foo(text) { console.log(text); }"));
+      let h = res.headers_mut();
+      h.insert(
+        "Content-type",
+        HeaderValue::from_static("application/javascript"),
+      );
+      h.insert(
+        "X-TypeScript-Types",
+        HeaderValue::from_static(
+          "http://localhost:4545/type_headers_deno_types.d.ts",
+        ),
+      );
+      res
+    }))
+    .or(warp::path!("type_headers_deno_types.d.ts").map(|| {
+      let mut res = Response::new(Body::from("export function foo(text: number): void;"));
+      let h = res.headers_mut();
+      h.insert(
+        "Content-type",
+        HeaderValue::from_static("application/typescript"),
+      );
+      res
+    }))
+    .or(warp::path!("type_headers_deno_types.foo.d.ts").map(|| {
+      let mut res = Response::new(Body::from("export function foo(text: string): void;"));
+      let h = res.headers_mut();
+      h.insert(
+        "Content-type",
+        HeaderValue::from_static("application/typescript"),
+      );
+      res
+    }))
     .or(warp::path!("cli"/"tests"/"subdir"/"xTypeScriptTypesRedirect.d.ts").map(|| {
       let mut res = Response::new(Body::from(
         "import './xTypeScriptTypesRedirected.d.ts';",
@@ -321,6 +356,17 @@ pub async fn run_all_servers() {
         HeaderValue::from_static("application/javascript"),
       );
       res
+    }))
+    .or(warp::path!("cli"/"tests"/"subdir"/"file_with_:_in_name.ts").map(|| {
+      let mut res = Response::new(Body::from(
+        "console.log('Hello from file_with_:_in_name.ts');",
+      ));
+      let h = res.headers_mut();
+      h.insert(
+        "Content-type",
+        HeaderValue::from_static("application/typescript"),
+      );
+      res
     }));
 
   let content_type_handler = warp::any()
@@ -386,6 +432,19 @@ fn custom_headers(path: warp::path::Peek, f: warp::fs::File) -> Box<dyn Reply> {
     let f = with_header(f, "Content-Length", "39");
     return Box::new(f);
   }
+  if p.contains("cli/tests/encoding/") {
+    let charset = p
+      .split_terminator('/')
+      .last()
+      .unwrap()
+      .trim_end_matches(".ts");
+    let f = with_header(
+      f,
+      "Content-Type",
+      &format!("application/typescript;charset={}", charset)[..],
+    );
+    return Box::new(f);
+  }
 
   let content_type = if p.contains(".t1.") {
     Some("text/typescript")
@@ -536,7 +595,7 @@ pub fn run_and_collect_output(
   if let Some(envs) = envs {
     deno_process_builder.envs(envs);
   }
-  let http_guard = if need_http_server {
+  let _http_guard = if need_http_server {
     Some(http_server())
   } else {
     None
@@ -555,7 +614,6 @@ pub fn run_and_collect_output(
     stderr,
     status,
   } = deno.wait_with_output().expect("failed to wait on child");
-  drop(http_guard);
   let stdout = String::from_utf8(stdout).unwrap();
   let stderr = String::from_utf8(stderr).unwrap();
   if expect_success != status.success() {
@@ -648,7 +706,7 @@ impl CheckOutputIntegrationTest {
     println!("root path {}", root.display());
     println!("deno_exe path {}", deno_exe.display());
 
-    let http_server_guard = if self.http_server {
+    let _http_server_guard = if self.http_server {
       Some(http_server())
     } else {
       None
@@ -685,8 +743,6 @@ impl CheckOutputIntegrationTest {
     let status = process.wait().expect("failed to finish process");
     let exit_code = status.code().unwrap();
 
-    drop(http_server_guard);
-
     actual = strip_ansi_codes(&actual).to_string();
 
     if self.exit_code != exit_code {
@@ -713,7 +769,7 @@ impl CheckOutputIntegrationTest {
   }
 }
 
-fn wildcard_match(pattern: &str, s: &str) -> bool {
+pub fn wildcard_match(pattern: &str, s: &str) -> bool {
   pattern_match(pattern, s, "[WILDCARD]")
 }
 
@@ -766,6 +822,39 @@ pub fn pattern_match(pattern: &str, s: &str, wildcard: &str) -> bool {
   t.1.is_empty()
 }
 
+/// Kind of reflects `itest!()`. Note that the pty's output (which also contains
+/// stdin content) is compared against the content of the `output` path.
+#[cfg(unix)]
+pub fn test_pty(args: &str, output_path: &str, input: &[u8]) {
+  use pty::fork::Fork;
+
+  let tests_path = tests_path();
+  let fork = Fork::from_ptmx().unwrap();
+  if let Ok(mut master) = fork.is_parent() {
+    let mut output_actual = String::new();
+    master.write_all(input).unwrap();
+    master.read_to_string(&mut output_actual).unwrap();
+    fork.wait().unwrap();
+
+    let output_expected =
+      std::fs::read_to_string(tests_path.join(output_path)).unwrap();
+    if !wildcard_match(&output_expected, &output_actual) {
+      println!("OUTPUT\n{}\nOUTPUT", output_actual);
+      println!("EXPECTED\n{}\nEXPECTED", output_expected);
+      panic!("pattern match failed");
+    }
+  } else {
+    deno_cmd()
+      .current_dir(tests_path)
+      .env("NO_COLOR", "1")
+      .args(args.split_whitespace())
+      .spawn()
+      .unwrap()
+      .wait()
+      .unwrap();
+  }
+}
+
 #[test]
 fn test_wildcard_match() {
   let fixtures = vec![
diff --git a/third_party b/third_party
index 3662fcf08cd960..581cc9d4f63b0a 160000
--- a/third_party
+++ b/third_party
@@ -1 +1 @@
-Subproject commit 3662fcf08cd9608c4da73e0b4033c5a9ea06091b
+Subproject commit 581cc9d4f63b0a9032adb8f0617cf64a75b1e4a5
diff --git a/tools/http_benchmark.py b/tools/http_benchmark.py
index fbd5dc7466df08..17420fe84b4d6a 100755
--- a/tools/http_benchmark.py
+++ b/tools/http_benchmark.py
@@ -85,8 +85,13 @@ def deno_http_proxy(deno_exe, hyper_hello_exe):
         origin_cmd=http_proxy_origin(hyper_hello_exe, origin_port))
 
 
-def deno_core_http_bench(exe):
-    print "http_benchmark testing deno_core_http_bench"
+def core_http_bin_ops(exe):
+    print "http_benchmark testing CORE http_bench_bin_ops"
+    return run([exe], 4544)
+
+
+def core_http_json_ops(exe):
+    print "http_benchmark testing CORE http_bench_json_ops"
     return run([exe], 4544)
 
 
@@ -134,10 +139,12 @@ def hyper_http(hyper_hello_exe):
 
 
 def http_benchmark(build_dir):
-    hyper_hello_exe = os.path.join(build_dir, "test_server")
-    deno_core_http_bench_exe = os.path.join(build_dir,
-                                            "examples/deno_core_http_bench")
     deno_exe = os.path.join(build_dir, "deno")
+    hyper_hello_exe = os.path.join(build_dir, "test_server")
+    core_http_bin_ops_exe = os.path.join(build_dir,
+                                         "examples/http_bench_bin_ops")
+    core_http_json_ops_exe = os.path.join(build_dir,
+                                          "examples/http_bench_json_ops")
     return {
         # "deno_tcp" was once called "deno"
         "deno_tcp": deno_tcp(deno_exe),
@@ -146,8 +153,10 @@ def http_benchmark(build_dir):
         # TODO(ry) deno_proxy disabled to make fetch() standards compliant.
         # "deno_proxy": deno_http_proxy(deno_exe, hyper_hello_exe),
         "deno_proxy_tcp": deno_tcp_proxy(deno_exe, hyper_hello_exe),
-        # "deno_core_http_bench" was once called "deno_core_single"
-        "deno_core_http_bench": deno_core_http_bench(deno_core_http_bench_exe),
+        # "core_http_bin_ops" was once called "deno_core_single"
+        # "core_http_bin_ops" was once called "deno_core_http_bench"
+        "core_http_bin_ops": core_http_bin_ops(core_http_bin_ops_exe),
+        "core_http_json_ops": core_http_json_ops(core_http_json_ops_exe),
         # "node_http" was once called "node"
         "node_http": node_http(),
         "node_proxy": node_http_proxy(hyper_hello_exe),
diff --git a/tools/lint.py b/tools/lint.py
index fc9a73c90b6584..5891ba9f9a3356 100755
--- a/tools/lint.py
+++ b/tools/lint.py
@@ -69,6 +69,7 @@ def eslint():
         ":!:cli/compilers/wasm_wrap.js",
         ":!:cli/tests/error_syntax.js",
         ":!:cli/tests/lint/**",
+        ":!:cli/tests/encoding/**",
         ":!:cli/dts/**",
         ":!:cli/tsc/*typescript.js",
     ])
diff --git a/tools/third_party.py b/tools/third_party.py
index a506fd6614c0e6..e8ab5043c47396 100644
--- a/tools/third_party.py
+++ b/tools/third_party.py
@@ -7,7 +7,7 @@
 import site
 import sys
 from tempfile import mkdtemp
-from util import add_env_path, executable_suffix, libdeno_path, make_env, rmtree
+from util import add_env_path, executable_suffix, make_env, rmtree
 from util import root_path, run, third_party_path
 
 depot_tools_path = os.path.join(third_party_path, "depot_tools")
@@ -31,8 +31,6 @@ def python_env(env=None, merge_env=None):
         python_site_env = {}
         temp = os.environ["PATH"], sys.path
         os.environ["PATH"], sys.path = "", []
-        site.addsitedir(os.path.join(libdeno_path,
-                                     "build"))  # Modifies PATH and sys.path.
         site.addsitedir(python_packages_path)  # Modifies PATH and sys.path.
         python_site_env = {"PATH": os.environ["PATH"], "PYTHONPATH": sys.path}
         os.environ["PATH"], sys.path = temp
diff --git a/tools/util.py b/tools/util.py
index e5dcaccce016d8..889afae82e779b 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -20,7 +20,6 @@
 executable_suffix = ".exe" if os.name == "nt" else ""
 
 root_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-libdeno_path = os.path.join(root_path, "core", "libdeno")
 tests_path = os.path.join(root_path, "cli/tests")
 third_party_path = os.path.join(root_path, "third_party")