Update fork

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: denoland

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
         run: git config --global core.symlinks true
 
       - name: Clone repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           # Use depth > 1, because sometimes we need to rebuild master and if
           # other commits have landed it will become impossible to rebuild if

cli/deno_dir.rs

@@ -40,7 +40,7 @@ impl DenoDir {
       root,
       gen_cache: DiskCache::new(&gen_path),
     };
-    deno_dir.gen_cache.ensure_location()?;
+    deno_dir.gen_cache.ensure_dir_exists(&gen_path)?;
 
     Ok(deno_dir)
   }

cli/disk_cache.rs

@@ -31,14 +31,14 @@ impl DiskCache {
   }
 
   /// Ensures the location of the cache.
-  pub fn ensure_location(&self) -> io::Result<()> {
-    if self.location.is_dir() {
+  pub fn ensure_dir_exists(&self, path: &Path) -> io::Result<()> {
+    if path.is_dir() {
       return Ok(());
     }
-    fs::create_dir_all(&self.location).map_err(|e| {
+    fs::create_dir_all(&path).map_err(|e| {
       io::Error::new(e.kind(), format!(
         "Could not create TypeScript compiler cache location: {:?}\nCheck the permission of the directory.",
-        self.location
+        path
       ))
     })
   }
@@ -129,8 +129,7 @@ impl DiskCache {
   pub fn set(&self, filename: &Path, data: &[u8]) -> std::io::Result<()> {
     let path = self.location.join(filename);
     match path.parent() {
-      Some(ref parent) => fs::create_dir_all(parent)
-        .map_err(|e| with_io_context(&e, format!("{:#?}", &path))),
+      Some(ref parent) => self.ensure_dir_exists(parent),
       None => Ok(()),
     }?;
     deno_fs::write_file(&path, data, 0o666)
@@ -154,7 +153,9 @@ mod tests {
     let mut cache_path = cache_location.path().to_owned();
     cache_path.push("foo");
     let cache = DiskCache::new(&cache_path);
-    cache.ensure_location().expect("Testing expect:");
+    cache
+      .ensure_dir_exists(&cache.location)
+      .expect("Testing expect:");
     assert!(cache_path.is_dir());
   }
 
@@ -166,7 +167,9 @@ mod tests {
     cache_location.push("foo");
     assert_eq!(cache_location.is_dir(), false);
     let cache = DiskCache::new(&cache_location);
-    cache.ensure_location().expect("Testing expect:");
+    cache
+      .ensure_dir_exists(&cache.location)
+      .expect("Testing expect:");
     assert_eq!(cache_location.is_dir(), true);
   }
 

cli/doc/parser.rs

@@ -1,4 +1,5 @@
 // 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;
@@ -15,6 +16,7 @@ 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;
@@ -57,9 +59,12 @@ impl DocParser {
     file_name: &str,
     source_code: &str,
   ) -> Result<ModuleDoc, SwcDiagnosticBuffer> {
-    self
-      .ast_parser
-      .parse_module(file_name, source_code, |parse_result| {
+    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());
@@ -69,7 +74,8 @@ impl DocParser {
           reexports,
         };
         Ok(module_doc)
-      })
+      },
+    )
   }
 
   pub async fn parse(&self, file_name: &str) -> Result<Vec<DocNode>, ErrBox> {

cli/global_state.rs

@@ -51,7 +51,6 @@ impl GlobalState {
     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);
-    http_cache.ensure_location()?;
 
     let file_fetcher = SourceFileFetcher::new(
       http_cache,

cli/http_cache.rs

@@ -113,16 +113,16 @@ impl HttpCache {
   }
 
   /// Ensures the location of the cache.
-  pub fn ensure_location(&self) -> io::Result<()> {
-    if self.location.is_dir() {
+  fn ensure_dir_exists(&self, path: &Path) -> io::Result<()> {
+    if path.is_dir() {
       return Ok(());
     }
-    fs::create_dir_all(&self.location).map_err(|e| {
+    fs::create_dir_all(&path).map_err(|e| {
       io::Error::new(
         e.kind(),
         format!(
           "Could not create remote modules cache location: {:?}\nCheck the permission of the directory.",
-          self.location
+          path
         ),
       )
     })
@@ -163,7 +163,7 @@ impl HttpCache {
     let parent_filename = cache_filename
       .parent()
       .expect("Cache filename should have a parent dir");
-    fs::create_dir_all(parent_filename)?;
+    self.ensure_dir_exists(parent_filename)?;
     // Cache content
     deno_fs::write_file(&cache_filename, content, 0o666)?;
 
@@ -187,8 +187,25 @@ mod tests {
     let dir = TempDir::new().unwrap();
     let mut cache_path = dir.path().to_owned();
     cache_path.push("foobar");
+    // HttpCache should be created lazily on first use:
+    // when zipping up a local project with no external dependencies
+    // "$DENO_DIR/deps" is empty. When unzipping such project
+    // "$DENO_DIR/deps" might not get restored and in situation
+    // when directory is owned by root we might not be able
+    // to create that directory. However if it's not needed it
+    // doesn't make sense to return error in such specific scenarios.
+    // For more details check issue:
+    // https://github.com/denoland/deno/issues/5688
     let cache = HttpCache::new(&cache_path);
-    assert!(cache.ensure_location().is_ok());
+    assert!(!cache.location.exists());
+    cache
+      .set(
+        &Url::parse("http://example.com/foo/bar.js").unwrap(),
+        HeadersMap::new(),
+        b"hello world",
+      )
+      .expect("Failed to add to cache");
+    assert!(cache.ensure_dir_exists(&cache.location).is_ok());
     assert!(cache_path.is_dir());
   }
 

cli/js/deno.ts

@@ -13,12 +13,6 @@ export { chmodSync, chmod } from "./ops/fs/chmod.ts";
 export { chownSync, chown } from "./ops/fs/chown.ts";
 export { customInspect, inspect } from "./web/console.ts";
 export { copyFileSync, copyFile } from "./ops/fs/copy_file.ts";
-export {
-  Diagnostic,
-  DiagnosticCategory,
-  DiagnosticItem,
-  DiagnosticMessageChain,
-} from "./diagnostics.ts";
 export { chdir, cwd } from "./ops/fs/dir.ts";
 export { errors } from "./errors.ts";
 export {
@@ -59,7 +53,7 @@ export {
 export { metrics, Metrics } from "./ops/runtime.ts";
 export { mkdirSync, mkdir, MkdirOptions } from "./ops/fs/mkdir.ts";
 export { connect, listen, Listener, Conn } from "./net.ts";
-export { dir, env, exit, execPath } from "./ops/os.ts";
+export { env, exit, execPath } from "./ops/os.ts";
 export { run, RunOptions, Process, ProcessStatus } from "./process.ts";
 export { DirEntry, readDirSync, readDir } from "./ops/fs/read_dir.ts";
 export { readFileSync, readFile } from "./read_file.ts";

cli/js/deno_unstable.ts

@@ -23,3 +23,9 @@ export {
   PermissionStatus,
   Permissions,
 } from "./permissions.ts";
+export {
+  Diagnostic,
+  DiagnosticCategory,
+  DiagnosticItem,
+  DiagnosticMessageChain,
+} from "./diagnostics.ts";

cli/js/error_stack.ts

@@ -244,19 +244,19 @@ function prepareStackTrace(
         }
       )
       .map((callSite): string => {
-        // @ts-ignore
+        // @ts-expect-error
         error.__callSiteEvals.push(Object.freeze(evaluateCallSite(callSite)));
         const isInternal =
           callSite.getFileName()?.startsWith("$deno$") ?? false;
         const string = callSiteToString(callSite, isInternal);
-        // @ts-ignore
+        // @ts-expect-error
         error.__formattedFrames.push(string);
         return `    at ${colors.stripColor(string)}`;
       })
       .join("\n");
-  // @ts-ignore
+  // @ts-expect-error
   Object.freeze(error.__callSiteEvals);
-  // @ts-ignore
+  // @ts-expect-error
   Object.freeze(error.__formattedFrames);
   return errorString;
 }

cli/js/lib.deno.ns.d.ts

@@ -62,7 +62,7 @@ declare namespace Deno {
    *
    * Deno.test({
    *   name: "example ignored test",
-   *   ignore: Deno.build.os === "windows"
+   *   ignore: Deno.build.os === "windows",
    *   fn(): void {
    *     // This test is ignored only on Windows machines
    *   },
@@ -73,7 +73,7 @@ declare namespace Deno {
    *   async fn() {
    *     const decoder = new TextDecoder("utf-8");
    *     const data = await Deno.readFile("hello_world.txt");
-   *     assertEquals(decoder.decode(data), "Hello world")
+   *     assertEquals(decoder.decode(data), "Hello world");
    *   }
    * });
    * ```
@@ -94,7 +94,7 @@ declare namespace Deno {
    * Deno.test("My async test description", async ():Promise<void> => {
    *   const decoder = new TextDecoder("utf-8");
    *   const data = await Deno.readFile("hello_world.txt");
-   *   assertEquals(decoder.decode(data), "Hello world")
+   *   assertEquals(decoder.decode(data), "Hello world");
    * });
    * ```
    * */
@@ -1612,10 +1612,9 @@ declare namespace Deno {
    * const conn2 = await Deno.connect({ hostname: "192.0.2.1", port: 80 });
    * const conn3 = await Deno.connect({ hostname: "[2001:db8::1]", port: 80 });
    * const conn4 = await Deno.connect({ hostname: "golang.org", port: 80, transport: "tcp" });
-   * const conn5 = await Deno.connect({ path: "/foo/bar.sock", transport: "unix" });
    * ```
    *
-   * Requires `allow-net` permission for "tcp" and `allow-read` for unix. */
+   * Requires `allow-net` permission for "tcp". */
   export function connect(options: ConnectOptions): Promise<Conn>;
 
   export interface ConnectTlsOptions {
@@ -1828,7 +1827,7 @@ declare namespace Deno {
    * ```ts
    * const obj = {};
    * obj.propA = 10;
-   * obj.propB = "hello"
+   * obj.propB = "hello";
    * const objAsString = Deno.inspect(obj); // { propA: 10, propB: "hello" }
    * console.log(obj);  // prints same value as objAsString, e.g. { propA: 10, propB: "hello" }
    * ```

cli/js/lib.deno.shared_globals.d.ts

@@ -922,6 +922,12 @@ declare const Request: {
   new (input: RequestInfo, init?: RequestInit): Request;
 };
 
+interface ResponseInit {
+  headers?: HeadersInit;
+  status?: number;
+  statusText?: string;
+}
+
 type ResponseType =
   | "basic"
   | "cors"
@@ -945,20 +951,7 @@ interface Response extends Body {
 
 declare const Response: {
   prototype: Response;
-
-  // TODO(#4667) Response constructor is non-standard.
-  // new(body?: BodyInit | null, init?: ResponseInit): Response;
-  new (
-    url: string,
-    status: number,
-    statusText: string,
-    headersList: Array<[string, string]>,
-    rid: number,
-    redirected_: boolean,
-    type_?: null | ResponseType,
-    body_?: null | Body
-  ): Response;
-
+  new (body?: BodyInit | null, init?: ResponseInit): Response;
   error(): Response;
   redirect(url: string, status?: number): Response;
 };

cli/js/lib.deno.unstable.d.ts

@@ -1067,7 +1067,7 @@ declare namespace Deno {
    * const conn5 = await Deno.connect({ path: "/foo/bar.sock", transport: "unix" });
    * ```
    *
-   * Requires `allow-net` permission for "tcp" and `allow-read` for unix. */
+   * Requires `allow-net` permission for "tcp" and `allow-read` for "unix". */
   export function connect(
     options: ConnectOptions | UnixConnectOptions
   ): Promise<Conn>;

cli/js/repl.ts

@@ -35,7 +35,7 @@ function isRecoverableError(e: Error): boolean {
 // Returns `true` if `close()` is called in REPL.
 // We should quit the REPL when this function returns `true`.
 function isCloseCalled(): boolean {
-  // @ts-ignore
+  // @ts-expect-error
   return globalThis.closed;
 }
 

cli/js/runtime_main.ts

@@ -30,7 +30,7 @@ import { log, immutableDefine } from "./util.ts";
 // TODO: factor out `Deno` global assignment to separate function
 // Add internal object to Deno object.
 // This is not exposed as part of the Deno types.
-// @ts-ignore
+// @ts-expect-error
 denoNs[internalSymbol] = internalObject;
 
 let windowIsClosing = false;
@@ -71,7 +71,7 @@ export function bootstrapMainRuntime(): void {
     throw new Error("Worker runtime already bootstrapped");
   }
   // Remove bootstrapping methods from global scope
-  // @ts-ignore
+  // @ts-expect-error
   globalThis.bootstrap = undefined;
   log("bootstrapMainRuntime");
   hasBootstrapped = true;

cli/js/runtime_worker.ts

@@ -33,7 +33,7 @@ import { setSignals } from "./signals.ts";
 // TODO: factor out `Deno` global assignment to separate function
 // Add internal object to Deno object.
 // This is not exposed as part of the Deno types.
-// @ts-ignore
+// @ts-expect-error
 denoNs[internalSymbol] = internalObject;
 
 const encoder = new TextEncoder();
@@ -128,7 +128,7 @@ export function bootstrapWorkerRuntime(
     throw new Error("Worker runtime already bootstrapped");
   }
   // Remove bootstrapping methods from global scope
-  // @ts-ignore
+  // @ts-expect-error
   globalThis.bootstrap = undefined;
   log("bootstrapWorkerRuntime");
   hasBootstrapped = true;

cli/js/testing.ts

@@ -333,11 +333,10 @@ async function runTests({
   const filterFn = createFilterFn(filter, skip);
   const testApi = new TestApi(TEST_REGISTRY, filterFn, failFast);
 
-  // @ts-ignore
   const originalConsole = globalThis.console;
 
   if (disableLog) {
-    // @ts-ignore
+    // @ts-expect-error
     globalThis.console = disabledConsole;
   }
 
@@ -356,7 +355,6 @@ async function runTests({
   }
 
   if (disableLog) {
-    // @ts-ignore
     globalThis.console = originalConsole;
   }