Merge master, and use new migrate script

Author: orta

.github/workflows/test_typescript.yml

@@ -17,11 +17,13 @@ jobs:
 
           # Clone TypeScript, set it up
           git clone https://github.com/microsoft/TypeScript --depth 1
+
+          # Migrate the generated files into the repo
+          npm run migrate
+
           cd TypeScript
           npm i
           
-          # Move in the generated dom APIs into a new version of TSC
-          cp -rf ../generated/* src/lib
 
           # Run TypeScript's tests with the new DOM libs, but don't fail
           npm test || true

README.md

@@ -25,6 +25,14 @@ To test:
 npm run test
 ```
 
+To deploy:
+
+```sh
+npm run migrate
+```
+
+The script will look in for a clone of the TypeScript repo in "../TypeScript", or "./TypeScript" to move the generated files in. 
+
 ## Contribution Guidelines
 
 The `dom.generated.d.ts`, `webworker.generated.d.ts` and `dom.iterable.generated.d.ts` files from the TypeScript repo are used as baselines.

baselines/dom.generated.d.ts

@@ -5756,13 +5756,17 @@ interface GlobalEventHandlersEventMap {
     "animationiteration": AnimationEvent;
     "animationstart": AnimationEvent;
     "auxclick": MouseEvent;
+    "beforeinput": InputEvent;
     "blur": FocusEvent;
     "cancel": Event;
     "canplay": Event;
     "canplaythrough": Event;
     "change": Event;
     "click": MouseEvent;
     "close": Event;
+    "compositionend": CompositionEvent;
+    "compositionstart": CompositionEvent;
+    "compositionupdate": CompositionEvent;
     "contextmenu": MouseEvent;
     "cuechange": Event;
     "dblclick": MouseEvent;
@@ -14983,7 +14987,7 @@ interface ServiceWorkerContainer extends EventTarget {
     readonly ready: Promise<ServiceWorkerRegistration>;
     getRegistration(clientURL?: string): Promise<ServiceWorkerRegistration | undefined>;
     getRegistrations(): Promise<ReadonlyArray<ServiceWorkerRegistration>>;
-    register(scriptURL: string, options?: RegistrationOptions): Promise<ServiceWorkerRegistration>;
+    register(scriptURL: string | URL, options?: RegistrationOptions): Promise<ServiceWorkerRegistration>;
     startMessages(): void;
     addEventListener<K extends keyof ServiceWorkerContainerEventMap>(type: K, listener: (this: ServiceWorkerContainer, ev: ServiceWorkerContainerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -18537,7 +18541,7 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler
     readonly event: Event | undefined;
     /** @deprecated */
     readonly external: External;
-    readonly frameElement: Element;
+    readonly frameElement: Element | null;
     readonly frames: Window;
     readonly history: History;
     readonly innerHeight: number;
@@ -19586,7 +19590,7 @@ declare var document: Document;
 declare var event: Event | undefined;
 /** @deprecated */
 declare var external: External;
-declare var frameElement: Element;
+declare var frameElement: Element | null;
 declare var frames: Window;
 declare var history: History;
 declare var innerHeight: number;
@@ -20138,7 +20142,7 @@ type OverSampleType = "2x" | "4x" | "none";
 type PanningModelType = "HRTF" | "equalpower";
 type PaymentComplete = "fail" | "success" | "unknown";
 type PaymentShippingType = "delivery" | "pickup" | "shipping";
-type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-sync" | "bluetooth" | "camera" | "clipboard" | "device-info" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "notifications" | "persistent-storage" | "push" | "speaker";
+type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-fetch" | "background-sync" | "bluetooth" | "camera" | "clipboard-read" | "clipboard-write" | "device-info" | "display-capture" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "nfc" | "notifications" | "persistent-storage" | "push" | "speaker";
 type PermissionState = "denied" | "granted" | "prompt";
 type PlaybackDirection = "alternate" | "alternate-reverse" | "normal" | "reverse";
 type PositionAlignSetting = "auto" | "center" | "line-left" | "line-right";

baselines/webworker.generated.d.ts

@@ -2891,7 +2891,7 @@ interface ServiceWorkerContainer extends EventTarget {
     readonly ready: Promise<ServiceWorkerRegistration>;
     getRegistration(clientURL?: string): Promise<ServiceWorkerRegistration | undefined>;
     getRegistrations(): Promise<ReadonlyArray<ServiceWorkerRegistration>>;
-    register(scriptURL: string, options?: RegistrationOptions): Promise<ServiceWorkerRegistration>;
+    register(scriptURL: string | URL, options?: RegistrationOptions): Promise<ServiceWorkerRegistration>;
     startMessages(): void;
     addEventListener<K extends keyof ServiceWorkerContainerEventMap>(type: K, listener: (this: ServiceWorkerContainer, ev: ServiceWorkerContainerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -6001,7 +6001,7 @@ type KeyUsage = "decrypt" | "deriveBits" | "deriveKey" | "encrypt" | "sign" | "u
 type NotificationDirection = "auto" | "ltr" | "rtl";
 type NotificationPermission = "default" | "denied" | "granted";
 type OffscreenRenderingContextId = "2d" | "bitmaprenderer" | "webgl" | "webgl2";
-type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-sync" | "bluetooth" | "camera" | "clipboard" | "device-info" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "notifications" | "persistent-storage" | "push" | "speaker";
+type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-fetch" | "background-sync" | "bluetooth" | "camera" | "clipboard-read" | "clipboard-write" | "device-info" | "display-capture" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "nfc" | "notifications" | "persistent-storage" | "push" | "speaker";
 type PermissionState = "denied" | "granted" | "prompt";
 type PremultiplyAlpha = "default" | "none" | "premultiply";
 type PushEncryptionKeyName = "auth" | "p256dh";

inputfiles/addedTypes.json

@@ -69,6 +69,22 @@
             "GlobalEventHandlers": {
                 "attributeless-events": {
                     "event": [
+                        {
+                            "name": "beforeinput",
+                            "type": "InputEvent"
+                        },
+                        {
+                            "name": "compositionstart",
+                            "type": "CompositionEvent"
+                        },
+                        {
+                            "name": "compositionupdate",
+                            "type": "CompositionEvent"
+                        },
+                        {
+                            "name": "compositionend",
+                            "type": "CompositionEvent"
+                        },
                         {
                             "name": "focusin",
                             "type": "FocusEvent"

inputfiles/idl/Permissions.widl

@@ -16,12 +16,12 @@ interface PermissionStatus : EventTarget {
 
 [Exposed=(Window)]
 partial interface Navigator {
-  readonly attribute Permissions permissions;
+  [SameObject] readonly attribute Permissions permissions;
 };
 
 [Exposed=(Worker)]
 partial interface WorkerNavigator {
-  readonly attribute Permissions permissions;
+  [SameObject] readonly attribute Permissions permissions;
 };
 
 [Exposed=(Window,Worker)]
@@ -38,14 +38,18 @@ enum PermissionName {
   "microphone",
   "speaker",
   "device-info",
+  "background-fetch",
   "background-sync",
   "bluetooth",
   "persistent-storage",
   "ambient-light-sensor",
   "accelerometer",
   "gyroscope",
   "magnetometer",
-  "clipboard",
+  "clipboard-read",
+  "clipboard-write",
+  "display-capture",
+  "nfc",
 };
 
 dictionary PushPermissionDescriptor : PermissionDescriptor {
@@ -59,3 +63,13 @@ dictionary MidiPermissionDescriptor : PermissionDescriptor {
 dictionary DevicePermissionDescriptor : PermissionDescriptor {
   DOMString deviceId;
 };
+
+dictionary CameraDevicePermissionDescriptor : DevicePermissionDescriptor {
+  boolean panTiltZoom = false;
+};
+
+dictionary PermissionSetParameters {
+  required PermissionDescriptor descriptor;
+  required PermissionState state;
+  boolean oneRealm = false;
+};

inputfiles/overridingTypes.json

@@ -481,6 +481,9 @@
                             "override-type": "Event | undefined",
                             "deprecated": 1
                         },
+                        "frameElement": {
+                            "nullable": 1
+                        },
                         "location": {
                             "read-only": 0
                         },
@@ -1574,6 +1577,12 @@
                             "override-signatures": [
                                 "getRegistration(clientURL?: string): Promise<ServiceWorkerRegistration | undefined>"
                             ]
+                        },
+                        "register": {
+                            "name": "register",
+                            "override-signatures": [
+                                "register(scriptURL: string | URL, options?: RegistrationOptions): Promise<ServiceWorkerRegistration>"
+                            ]
                         }
                     }
                 },

package.json

@@ -8,7 +8,8 @@
     "fetch": "echo This could take a few minutes... && npm run fetch-idl && npm run fetch-mdn",
     "baseline-accept": "cpx \"generated\\*\" baselines\\",
     "test": "tsc -p ./tsconfig.json && node ./lib/index.js && node ./lib/test.js",
-    "danger": "danger"
+    "danger": "danger",
+    "migrate": "node ./lib/migrate-to-tsc.js"
   },
   "dependencies": {
     "@types/jsdom": "^16.2.4",

src/migrate-to-tsc.ts

@@ -0,0 +1,21 @@
+// Mainly a quick script to migrate the generated files into the
+// lib folder of a TypeScript clone. 
+//
+// node ./lib/migrate-to-tsc.js [optional/file/path/to/tsc]
+
+import { existsSync, readdirSync, readFileSync, writeFileSync } from "fs"
+import { join } from "path"
+
+const maybeTSWorkingDir = [process.argv[2],  "../TypeScript", "TypeScript"]
+const tscWD = maybeTSWorkingDir.find(wd => existsSync(wd))
+
+if (!tscWD) throw new Error("Could not find a TypeScript clone to put the generated files in.")
+
+const generatedFiles = readdirSync("generated")
+generatedFiles.forEach(file => {
+    const contents = readFileSync(join("generated", file) , "utf8")
+    const newFilePath = join(tscWD, "src", "lib", file)
+    writeFileSync(newFilePath, contents)
+})
+
+console.log(`Moved ${generatedFiles.map(f => f.replace(".generated", "")).join(", ")} to '${tscWD}'.`)