refactor: add deno_file op crate (denoland#10019)

Also enables WPT for FileReader.
unibg-seclab · Apr 6, 2021 · 00e6330 · 00e6330
1 parent ff5d072
commit 00e6330
Show file tree

Hide file tree

Showing 23 changed files with 470 additions and 321 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/build.rs b/cli/build.rs
@@ -11,6 +11,7 @@ use deno_core::RuntimeOptions;
 use deno_runtime::deno_console;
 use deno_runtime::deno_crypto;
 use deno_runtime::deno_fetch;
+use deno_runtime::deno_file;
 use deno_runtime::deno_url;
 use deno_runtime::deno_web;
 use deno_runtime::deno_webgpu;
@@ -66,6 +67,7 @@ fn create_compiler_snapshot(
  op_crate_libs.insert("deno.console", deno_console::get_declaration());
  op_crate_libs.insert("deno.url", deno_url::get_declaration());
  op_crate_libs.insert("deno.web", deno_web::get_declaration());
+ op_crate_libs.insert("deno.file", deno_file::get_declaration());
  op_crate_libs.insert("deno.fetch", deno_fetch::get_declaration());
  op_crate_libs.insert("deno.webgpu", deno_webgpu::get_declaration());
  op_crate_libs.insert("deno.websocket", deno_websocket::get_declaration());
@@ -270,6 +272,10 @@ fn main() {
  "cargo:rustc-env=DENO_WEB_LIB_PATH={}",
  deno_web::get_declaration().display()
  );
+ println!(
+ "cargo:rustc-env=DENO_FILE_LIB_PATH={}",
+ deno_file::get_declaration().display()
+ );
  println!(
  "cargo:rustc-env=DENO_FETCH_LIB_PATH={}",
  deno_fetch::get_declaration().display()

diff --git a/cli/dts/lib.deno.shared_globals.d.ts b/cli/dts/lib.deno.shared_globals.d.ts
@@ -6,6 +6,7 @@
 /// <reference no-default-lib="true" />
 /// <reference lib="esnext" />
 /// <reference lib="deno.console" />
+/// <reference lib="deno.file" />
 /// <reference lib="deno.url" />
 /// <reference lib="deno.web" />
 /// <reference lib="deno.fetch" />

diff --git a/cli/main.rs b/cli/main.rs
@@ -275,11 +275,12 @@ fn print_cache_info(
 
 pub fn get_types(unstable: bool) -> String {
  let mut types = format!(
- "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}",
+ "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}",
  crate::tsc::DENO_NS_LIB,
  crate::tsc::DENO_CONSOLE_LIB,
  crate::tsc::DENO_URL_LIB,
  crate::tsc::DENO_WEB_LIB,
+ crate::tsc::DENO_FILE_LIB,
  crate::tsc::DENO_FETCH_LIB,
  crate::tsc::DENO_WEBGPU_LIB,
  crate::tsc::DENO_WEBSOCKET_LIB,

diff --git a/cli/tsc.rs b/cli/tsc.rs
@@ -32,6 +32,7 @@ pub static DENO_NS_LIB: &str = include_str!("dts/lib.deno.ns.d.ts");
 pub static DENO_CONSOLE_LIB: &str = include_str!(env!("DENO_CONSOLE_LIB_PATH"));
 pub static DENO_URL_LIB: &str = include_str!(env!("DENO_URL_LIB_PATH"));
 pub static DENO_WEB_LIB: &str = include_str!(env!("DENO_WEB_LIB_PATH"));
+pub static DENO_FILE_LIB: &str = include_str!(env!("DENO_FILE_LIB_PATH"));
 pub static DENO_FETCH_LIB: &str = include_str!(env!("DENO_FETCH_LIB_PATH"));
 pub static DENO_WEBGPU_LIB: &str = include_str!(env!("DENO_WEBGPU_LIB_PATH"));
 pub static DENO_WEBSOCKET_LIB: &str =

diff --git a/op_crates/fetch/internal.d.ts b/op_crates/fetch/internal.d.ts
@@ -19,16 +19,6 @@ declare namespace globalThis {
  Headers: typeof Headers;
  };
 
- declare var file: {
- Blob: typeof Blob & {
- [globalThis.__bootstrap.file._byteSequence]: Uint8Array;
- };
- _byteSequence: unique symbol;
- File: typeof File & {
- [globalThis.__bootstrap.file._byteSequence]: Uint8Array;
- };
- };
-
  declare var streams: {
  ReadableStream: typeof ReadableStream;
  isReadableStreamDisturbed(stream: ReadableStream): boolean;

diff --git a/op_crates/fetch/lib.deno_fetch.d.ts b/op_crates/fetch/lib.deno_fetch.d.ts
@@ -287,42 +287,6 @@ interface TransformStreamDefaultControllerTransformCallback<I, O> {
  ): void | PromiseLike<void>;
 }
 
-type BlobPart = BufferSource | Blob | string;
-
-interface BlobPropertyBag {
- type?: string;
- endings?: "transparent" | "native";
-}
-
-/** A file-like object of immutable, raw data. Blobs represent data that isn't necessarily in a JavaScript-native format. The File interface is based on Blob, inheriting blob functionality and expanding it to support files on the user's system. */
-declare class Blob {
- constructor(blobParts?: BlobPart[], options?: BlobPropertyBag);
-
- readonly size: number;
- readonly type: string;
- arrayBuffer(): Promise<ArrayBuffer>;
- slice(start?: number, end?: number, contentType?: string): Blob;
- stream(): ReadableStream;
- text(): Promise<string>;
-}
-
-interface FilePropertyBag extends BlobPropertyBag {
- lastModified?: number;
-}
-
-/** Provides information about files and allows JavaScript in a web page to
- * access their content. */
-declare class File extends Blob {
- constructor(
- fileBits: BlobPart[],
- fileName: string,
- options?: FilePropertyBag,
- );
-
- readonly lastModified: number;
- readonly name: string;
-}
-
 type FormDataEntryValue = File | string;
 
 /** Provides a way to easily construct a set of key/value pairs representing

diff --git a/op_crates/fetch/lib.rs b/op_crates/fetch/lib.rs
@@ -68,10 +68,6 @@ pub fn init(isolate: &mut JsRuntime) {
  "deno:op_crates/fetch/20_headers.js",
  include_str!("20_headers.js"),
  ),
- (
- "deno:op_crates/fetch/21_file.js",
- include_str!("21_file.js"),
- ),
  (
  "deno:op_crates/fetch/26_fetch.js",
  include_str!("26_fetch.js"),

diff --git a/op_crates/fetch/21_file.js → op_crates/file/01_file.js b/op_crates/fetch/21_file.js → op_crates/file/01_file.js
@@ -6,7 +6,7 @@
 /// <reference path="../web/internal.d.ts" />
 /// <reference path="../web/lib.deno_web.d.ts" />
 /// <reference path="./internal.d.ts" />
-/// <reference path="./lib.deno_fetch.d.ts" />
+/// <reference path="./lib.deno_file.d.ts" />
 /// <reference lib="esnext" />
 "use strict";