Skip to content

Commit

Permalink
fix(cli): add dom.extras lib (#14430)
Browse files Browse the repository at this point in the history
Closes: #12558
Fixes: #14344
  • Loading branch information
kitsonk authored and cjihrig committed May 5, 2022
1 parent 58bedd8 commit a567f60
Show file tree
Hide file tree
Showing 8 changed files with 182 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cli/dts/lib.dom.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ and limitations under the License.


/// <reference no-default-lib="true"/>

/// <reference lib="dom.extras" />

/////////////////////////////
/// Window APIs
Expand Down
148 changes: 148 additions & 0 deletions cli/dts/lib.dom.extras.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.

/*
* This library contains DOM standards that are not currently included in the
* distributed `lib.dom.d.ts` file with TypeScript.
*/

/// <reference no-default-lib="true"/>

interface AbortSignal extends EventTarget {
readonly reason?: unknown;
}

declare interface URLPatternInit {
protocol?: string;
username?: string;
password?: string;
hostname?: string;
port?: string;
pathname?: string;
search?: string;
hash?: string;
baseURL?: string;
}

declare type URLPatternInput = string | URLPatternInit;

declare interface URLPatternComponentResult {
input: string;
groups: Record<string, string>;
}

/** `URLPatternResult` is the object returned from `URLPattern.exec`. */
declare interface URLPatternResult {
/** The inputs provided when matching. */
inputs: [URLPatternInit] | [URLPatternInit, string];

/** The matched result for the `protocol` matcher. */
protocol: URLPatternComponentResult;
/** The matched result for the `username` matcher. */
username: URLPatternComponentResult;
/** The matched result for the `password` matcher. */
password: URLPatternComponentResult;
/** The matched result for the `hostname` matcher. */
hostname: URLPatternComponentResult;
/** The matched result for the `port` matcher. */
port: URLPatternComponentResult;
/** The matched result for the `pathname` matcher. */
pathname: URLPatternComponentResult;
/** The matched result for the `search` matcher. */
search: URLPatternComponentResult;
/** The matched result for the `hash` matcher. */
hash: URLPatternComponentResult;
}

/**
* The URLPattern API provides a web platform primitive for matching URLs based
* on a convenient pattern syntax.
*
* The syntax is based on path-to-regexp. Wildcards, named capture groups,
* regular groups, and group modifiers are all supported.
*
* ```ts
* // Specify the pattern as structured data.
* const pattern = new URLPattern({ pathname: "/users/:user" });
* const match = pattern.exec("/users/joe");
* console.log(match.pathname.groups.user); // joe
* ```
*
* ```ts
* // Specify a fully qualified string pattern.
* const pattern = new URLPattern("https://example.com/books/:id");
* console.log(pattern.test("https://example.com/books/123")); // true
* console.log(pattern.test("https://deno.land/books/123")); // false
* ```
*
* ```ts
* // Specify a relative string pattern with a base URL.
* const pattern = new URLPattern("/:article", "https://blog.example.com");
* console.log(pattern.test("https://blog.example.com/article")); // true
* console.log(pattern.test("https://blog.example.com/article/123")); // false
* ```
*/
declare class URLPattern {
constructor(input: URLPatternInput, baseURL?: string);

/**
* Test if the given input matches the stored pattern.
*
* The input can either be provided as a url string (with an optional base),
* or as individual components in the form of an object.
*
* ```ts
* const pattern = new URLPattern("https://example.com/books/:id");
*
* // Test a url string.
* console.log(pattern.test("https://example.com/books/123")); // true
*
* // Test a relative url with a base.
* console.log(pattern.test("/books/123", "https://example.com")); // true
*
* // Test an object of url components.
* console.log(pattern.test({ pathname: "/books/123" })); // true
* ```
*/
test(input: URLPatternInput, baseURL?: string): boolean;

/**
* Match the given input against the stored pattern.
*
* The input can either be provided as a url string (with an optional base),
* or as individual components in the form of an object.
*
* ```ts
* const pattern = new URLPattern("https://example.com/books/:id");
*
* // Match a url string.
* let match = pattern.exec("https://example.com/books/123");
* console.log(match.pathname.groups.id); // 123
*
* // Match a relative url with a base.
* match = pattern.exec("/books/123", "https://example.com");
* console.log(match.pathname.groups.id); // 123
*
* // Match an object of url components.
* match = pattern.exec({ pathname: "/books/123" });
* console.log(match.pathname.groups.id); // 123
* ```
*/
exec(input: URLPatternInput, baseURL?: string): URLPatternResult | null;

/** The pattern string for the `protocol`. */
readonly protocol: string;
/** The pattern string for the `username`. */
readonly username: string;
/** The pattern string for the `password`. */
readonly password: string;
/** The pattern string for the `hostname`. */
readonly hostname: string;
/** The pattern string for the `port`. */
readonly port: string;
/** The pattern string for the `pathname`. */
readonly pathname: string;
/** The pattern string for the `search`. */
readonly search: string;
/** The pattern string for the `hash`. */
readonly hash: string;
}
5 changes: 5 additions & 0 deletions cli/tests/integration/run_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,11 @@ itest!(lib_dom_asynciterable {
output: "lib_dom_asynciterable.ts.out",
});

itest!(lib_dom_extras {
args: "run --quiet --unstable --reload lib_dom_extras.ts",
output: "lib_dom_extras.ts.out",
});

itest!(lib_ref {
args: "run --quiet --unstable --reload lib_ref.ts",
output: "lib_ref.ts.out",
Expand Down
17 changes: 17 additions & 0 deletions cli/tests/testdata/lib_dom_extras.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const { diagnostics, files } = await Deno.emit("/main.ts", {
compilerOptions: {
target: "esnext",
lib: ["esnext", "dom"],
},
sources: {
"/main.ts": `const as = new AbortSignal();
console.log(as.reason);
const up = new URLPattern("https://example.com/books/:id");
console.log(up);
`,
},
});

console.log(diagnostics);
console.log(Object.keys(files).sort());
2 changes: 2 additions & 0 deletions cli/tests/testdata/lib_dom_extras.ts.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[]
[ "[WILDCARD]/main.ts.js", "[WILDCARD]/main.ts.js.map" ]
1 change: 1 addition & 0 deletions cli/tsc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ pub static STATIC_ASSETS: Lazy<HashMap<&'static str, &'static str>> =
inc!("lib.dom.asynciterable.d.ts"),
),
("lib.dom.d.ts", inc!("lib.dom.d.ts")),
("lib.dom.extras.d.ts", inc!("lib.dom.extras.d.ts")),
("lib.dom.iterable.d.ts", inc!("lib.dom.iterable.d.ts")),
("lib.es6.d.ts", inc!("lib.es6.d.ts")),
("lib.es2016.full.d.ts", inc!("lib.es2016.full.d.ts")),
Expand Down
1 change: 1 addition & 0 deletions cli/tsc/00_typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -38443,6 +38443,7 @@ var ts;
["dom", "lib.dom.d.ts"],
["dom.iterable", "lib.dom.iterable.d.ts"],
["dom.asynciterable", "lib.dom.asynciterable.d.ts"],
["dom.extras", "lib.dom.extras.d.ts"],
["webworker", "lib.webworker.d.ts"],
["webworker.importscripts", "lib.webworker.importscripts.d.ts"],
["webworker.iterable", "lib.webworker.iterable.d.ts"],
Expand Down
8 changes: 7 additions & 1 deletion tools/update_typescript.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ contextual awareness, it is the author's opinion that it is best to spend the
- We add `lib.dom.asynciterables.d.ts` because for some reason TypeScript
has not built these into the libraries. (See:
https://github.com/microsoft/TypeScript/issues/29867)
- We add `lib.dom.extras.d.ts` because TypeScript is often behind
supporting some DOM standards that Deno supports and when people use
`lib: ["dom", "deno.ns"]` they will get error messages that are confusing
when using libraries that take advantage of these standards. We add the
library to `lib.dom.d.ts`, so it is automatically included when using the
`dom` lib under Deno.

7. Based on the changes to the lib files, you will need to edit the map of lib
names to files in the TypeScript compiler (`deno/cli/tsc/00_typescript.js`).
Expand All @@ -104,7 +110,7 @@ contextual awareness, it is the author's opinion that it is best to spend the
maps `esnext.*` values to the ratified version of them to ensure they are
less "breaking" so you will want to make sure, like for `esnext.array` that
it points at `lib.esnext.array.d.ts`. You will also want to revert the
deletion of `dom.asynciterables`.
deletion of `dom.asynciterables` and `dom.extras`.

8. For any new lib files that were added, but not included in the snapshot (e.g.
`lib.es####.full.d.ts`) add them to `STATIC_ASSETS` in `deno/cli/tsc.rs`.
Expand Down

0 comments on commit a567f60

Please sign in to comment.