chore: split web op crate

This commit starts splitting out the deno_web op crate into multiple smaller crates. This commit splits out WebIDL and URL API, but in the future I want to split out each spec into its own crate. That means we will have (in rough order of loading): `webidl`, `dom`, `streams`, `console`, `encoding`, `url`, `file`, `fetch`, `websocket`, and `webgpu` crates.
denoland · Mar 12, 2021 · ac244dd · ac244dd
1 parent 2f9d7c0
commit ac244dd
Show file tree

Hide file tree

Showing 34 changed files with 785 additions and 647 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,9 +7,13 @@ members = [
   "runtime",
   "test_plugin",
   "test_util",
+  "op_crates/crypto",
   "op_crates/fetch",
+  "op_crates/url",
   "op_crates/web",
-  "op_crates/crypto"
+  "op_crates/webgpu",
+  "op_crates/webidl",
+  "op_crates/websocket",
 ]
 exclude = [
   "std/hash/_wasm"

diff --git a/cli/build.rs b/cli/build.rs
@@ -10,6 +10,7 @@ use deno_core::JsRuntime;
 use deno_core::RuntimeOptions;
 use deno_runtime::deno_crypto;
 use deno_runtime::deno_fetch;
+use deno_runtime::deno_url;
 use deno_runtime::deno_web;
 use deno_runtime::deno_webgpu;
 use deno_runtime::deno_websocket;
@@ -61,6 +62,7 @@ fn create_compiler_snapshot(
 ) {
   // libs that are being provided by op crates.
   let mut op_crate_libs = HashMap::new();
+  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.fetch", deno_fetch::get_declaration());
   op_crate_libs.insert("deno.webgpu", deno_webgpu::get_declaration());
@@ -254,6 +256,10 @@ fn main() {
 
   println!("cargo:rustc-env=TS_VERSION={}", ts_version());
   println!("cargo:rustc-env=GIT_COMMIT_HASH={}", git_commit_hash());
+  println!(
+    "cargo:rustc-env=DENO_URL_LIB_PATH={}",
+    deno_url::get_declaration().display()
+  );
   println!(
     "cargo:rustc-env=DENO_WEB_LIB_PATH={}",
     deno_web::get_declaration().display()

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

diff --git a/cli/main.rs b/cli/main.rs
@@ -278,8 +278,9 @@ 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{}",
     crate::tsc::DENO_NS_LIB,
+    crate::tsc::DENO_URL_LIB,
     crate::tsc::DENO_WEB_LIB,
     crate::tsc::DENO_FETCH_LIB,
     crate::tsc::DENO_WEBGPU_LIB,

diff --git a/cli/tsc.rs b/cli/tsc.rs
@@ -29,6 +29,7 @@ use std::sync::Mutex;
 // Declaration files
 
 pub static DENO_NS_LIB: &str = include_str!("dts/lib.deno.ns.d.ts");
+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_FETCH_LIB: &str = include_str!(env!("DENO_FETCH_LIB_PATH"));
 pub static DENO_WEBGPU_LIB: &str = include_str!(env!("DENO_WEBGPU_LIB_PATH"));

diff --git a/op_crates/crypto/Cargo.toml b/op_crates/crypto/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_crypto"
 version = "0.14.1"
 edition = "2018"
-description = "Collection of WebCrypto APIs"
+description = "Web Cryptography API implementation for Deno"
 authors = ["the Deno authors"]
 license = "MIT"
 readme = "README.md"

diff --git a/op_crates/crypto/README.md b/op_crates/crypto/README.md
@@ -1,3 +1,5 @@
-# deno crypto
+# deno_crypto
 
-Op crate that implements crypto functions.
+This crate implements the Web Cryptography API.
+
+Spec: https://www.w3.org/TR/WebCryptoAPI/
diff --git a/op_crates/fetch/Cargo.toml b/op_crates/fetch/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_fetch"
 version = "0.22.3"
 edition = "2018"
-description = "provides fetch Web API to deno_core"
+description = "Fetch API implementation for Deno"
 authors = ["the Deno authors"]
 license = "MIT"
 readme = "README.md"

diff --git a/op_crates/fetch/README.md b/op_crates/fetch/README.md
@@ -1 +1,5 @@
-This crate provides the web standard fetch API to `deno_core`.
+# deno_fetch
+
+This crate implements the Fetch API.
+
+Spec: https://fetch.spec.whatwg.org/
diff --git a/op_crates/web/11_url.js → op_crates/url/00_url.js b/op_crates/web/11_url.js → op_crates/url/00_url.js
@@ -28,7 +28,7 @@
           init = init.slice(1);
         }
 
-        this.#params = core.jsonOpSync("op_parse_url_search_params", init);
+        this.#params = core.jsonOpSync("op_url_parse_search_params", init);
       } else if (
         Array.isArray(init) ||
         typeof init?.[Symbol.iterator] == "function"
@@ -64,7 +64,7 @@
         return;
       }
       const parseArgs = { href: url.href, setSearch: this.toString() };
-      parts.set(url, core.jsonOpSync("op_parse_url", parseArgs));
+      parts.set(url, core.jsonOpSync("op_url_parse", parseArgs));
     };
 
     append(name, value) {
@@ -189,7 +189,7 @@
     }
 
     toString() {
-      return core.jsonOpSync("op_stringify_url_search_params", this.#params);
+      return core.jsonOpSync("op_url_stringify_search_params", this.#params);
     }
   }
 
@@ -206,7 +206,7 @@
       } else {
         base = base !== undefined ? String(base) : base;
         const parseArgs = { href: String(url), baseHref: base };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       }
     }
 
@@ -231,7 +231,7 @@
       if (this.#searchParams != null) {
         const params = paramLists.get(this.#searchParams);
         const newParams = core.jsonOpSync(
-          "op_parse_url_search_params",
+          "op_url_parse_search_params",
           this.search.slice(1),
         );
         params.splice(0, params.length, ...newParams);
@@ -245,7 +245,7 @@
     set hash(value) {
       try {
         const parseArgs = { href: this.href, setHash: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         /* pass */
       }
@@ -258,7 +258,7 @@
     set host(value) {
       try {
         const parseArgs = { href: this.href, setHost: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         /* pass */
       }
@@ -271,7 +271,7 @@
     set hostname(value) {
       try {
         const parseArgs = { href: this.href, setHostname: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         /* pass */
       }
@@ -284,7 +284,7 @@
     set href(value) {
       try {
         const parseArgs = { href: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         throw new TypeError("Invalid URL");
       }
@@ -302,7 +302,7 @@
     set password(value) {
       try {
         const parseArgs = { href: this.href, setPassword: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         /* pass */
       }
@@ -315,7 +315,7 @@
     set pathname(value) {
       try {
         const parseArgs = { href: this.href, setPathname: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         /* pass */
       }
@@ -328,7 +328,7 @@
     set port(value) {
       try {
         const parseArgs = { href: this.href, setPort: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         /* pass */
       }
@@ -341,7 +341,7 @@
     set protocol(value) {
       try {
         const parseArgs = { href: this.href, setProtocol: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         /* pass */
       }
@@ -354,7 +354,7 @@
     set search(value) {
       try {
         const parseArgs = { href: this.href, setSearch: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
         this.#updateSearchParams();
       } catch {
         /* pass */
@@ -368,7 +368,7 @@
     set username(value) {
       try {
         const parseArgs = { href: this.href, setUsername: String(value) };
-        parts.set(this, core.jsonOpSync("op_parse_url", parseArgs));
+        parts.set(this, core.jsonOpSync("op_url_parse", parseArgs));
       } catch {
         /* pass */
       }

diff --git a/op_crates/url/Cargo.toml b/op_crates/url/Cargo.toml
@@ -0,0 +1,19 @@
+# Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+
+[package]
+name = "deno_url"
+version = "0.1.0"
+edition = "2018"
+description = "URL API implementation for Deno"
+authors = ["the Deno authors"]
+license = "MIT"
+readme = "README.md"
+repository = "https://github.com/denoland/deno"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+deno_core = { version = "0.80.2", path = "../../core" }
+idna = "0.2.1"
+serde = { version = "1.0.123", features = ["derive"] }
diff --git a/op_crates/url/README.md b/op_crates/url/README.md
@@ -0,0 +1,5 @@
+# deno_url
+
+This crate implements the URL API for Deno.
+
+Spec: https://url.spec.whatwg.org/
diff --git a/op_crates/url/internal.d.ts b/op_crates/url/internal.d.ts
@@ -0,0 +1,13 @@
+// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
+
+/// <reference no-default-lib="true" />
+/// <reference lib="esnext" />
+
+declare namespace globalThis {
+  declare namespace __bootstrap {
+    declare var url: {
+      URL: typeof URL;
+      URLSearchParams: typeof URLSearchParams;
+    };
+  }
+}