Merge remote-tracking branch 'upstream/master' into microsoft-build-dir

Author: saschanaz

baselines/dom.generated.d.ts

@@ -4538,7 +4538,8 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
     /**
      * Contains information about the current URL.
      */
-    location: Location;
+    get location(): Location;
+    set location(href: string | Location);
     onfullscreenchange: ((this: Document, ev: Event) => any) | null;
     onfullscreenerror: ((this: Document, ev: Event) => any) | null;
     onpointerlockchange: ((this: Document, ev: Event) => any) | null;
@@ -18225,7 +18226,8 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler
     readonly innerHeight: number;
     readonly innerWidth: number;
     readonly length: number;
-    location: Location;
+    get location(): Location;
+    set location(href: string | Location);
     readonly locationbar: BarProp;
     readonly menubar: BarProp;
     readonly msContentScript: ExtensionScriptApis;

package.json

@@ -17,24 +17,24 @@
   },
   "dependencies": {
     "@mdn/browser-compat-data": "2.0.7",
-    "@types/jsdom": "^16.2.4",
-    "@types/node": "^14.6.4",
-    "@types/node-fetch": "^2.5.7",
-    "@types/webidl2": "^23.13.2",
-    "@typescript-eslint/eslint-plugin": "^4.16.1",
-    "@typescript-eslint/parser": "^4.16.1",
-    "cpx2": "^2.0.0",
-    "danger": "^10.5.4",
-    "eslint": "^7.21.0",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
-    "jsdom": "^16.4.0",
+    "@types/jsdom": "^16.2.10",
+    "@types/node": "^15.6.1",
+    "@types/node-fetch": "^2.5.10",
+    "@types/webidl2": "^23.13.5",
+    "@typescript-eslint/eslint-plugin": "^4.25.0",
+    "@typescript-eslint/parser": "^4.25.0",
+    "cpx2": "^3.0.0",
+    "danger": "^10.6.4",
+    "eslint": "^7.27.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "jsdom": "^16.6.0",
     "node-fetch": "^2.6.1",
-    "parse-diff": "^0.7.0",
-    "prettier": "^2.2.1",
+    "parse-diff": "^0.8.1",
+    "prettier": "^2.3.0",
     "print-diff": "^1.0.0",
-    "styleless-innertext": "^1.1.2",
-    "typescript": "^4.2.3",
-    "webidl2": "^23.13.0"
+    "styleless-innertext": "^1.1.3",
+    "typescript": "^4.3.0-dev.20210327",
+    "webidl2": "^24.1.1"
   }
 }

src/build/emitter.ts

@@ -413,9 +413,10 @@ export function emitWebIdl(
     return type;
   }
 
-  function convertDomTypeToTsTypeWorker(
-    obj: Browser.Typed
-  ): { name: string; nullable: boolean } {
+  function convertDomTypeToTsTypeWorker(obj: Browser.Typed): {
+    name: string;
+    nullable: boolean;
+  } {
     let type;
     if (typeof obj.type === "string") {
       type = {
@@ -882,11 +883,27 @@ export function emitWebIdl(
       if (!required && prefix) {
         pType += " | undefined";
       }
-      const readOnlyModifier =
-        p["read-only"] === 1 && prefix === "" ? "readonly " : "";
-      printer.printLine(
-        `${prefix}${readOnlyModifier}${p.name}${requiredModifier}: ${pType};`
-      );
+      if (!prefix && !p["read-only"] && p["put-forwards"]) {
+        printer.printLine(`get ${p.name}${requiredModifier}(): ${pType};`);
+
+        const forwardingProperty =
+          allInterfacesMap[pType].properties?.property[p["put-forwards"]];
+        if (!forwardingProperty) {
+          throw new Error("Couldn't find [PutForwards]");
+        }
+        const setterType = `${convertDomTypeToTsType(
+          forwardingProperty
+        )} | ${pType}`;
+        printer.printLine(
+          `set ${p.name}${requiredModifier}(${p["put-forwards"]}: ${setterType});`
+        );
+      } else {
+        const readOnlyModifier =
+          p["read-only"] === 1 && prefix === "" ? "readonly " : "";
+        printer.printLine(
+          `${prefix}${readOnlyModifier}${p.name}${requiredModifier}: ${pType};`
+        );
+      }
     }
 
     if (p.stringifier) {

src/build/expose.ts

@@ -194,7 +194,7 @@ function deepClone<T>(o: T, custom: (o: any) => any): T {
     return o;
   }
   if (Array.isArray(o)) {
-    return (o.map((v) => deepClone(v, custom)) as any) as T;
+    return o.map((v) => deepClone(v, custom)) as any as T;
   }
   const mapped = custom(o);
   if (mapped !== undefined) {

src/build/helpers.ts

@@ -65,9 +65,9 @@ export function filter<T>(
 ): T {
   if (typeof obj === "object") {
     if (Array.isArray(obj)) {
-      return (mapDefined(obj, (e) =>
+      return mapDefined(obj, (e) =>
         fn(e, undefined) ? filter(e, fn) : undefined
-      ) as any) as T;
+      ) as any as T;
     } else {
       const result: any = {};
       for (const e in obj) {

src/build/widlprocess.ts

@@ -29,13 +29,11 @@ export function convert(text: string, commentMap: Record<string, string>) {
     } else if (rootType.type === "namespace") {
       browser.namespaces!.push(convertNamespace(rootType, commentMap));
     } else if (rootType.type === "callback interface") {
-      browser["callback-interfaces"]!.interface[
-        rootType.name
-      ] = convertInterfaceCommon(rootType, commentMap);
+      browser["callback-interfaces"]!.interface[rootType.name] =
+        convertInterfaceCommon(rootType, commentMap);
     } else if (rootType.type === "callback") {
-      browser["callback-functions"]!["callback-function"][
-        rootType.name
-      ] = convertCallbackFunctions(rootType);
+      browser["callback-functions"]!["callback-function"][rootType.name] =
+        convertCallbackFunctions(rootType);
       addComments(
         browser["callback-functions"]!["callback-function"][rootType.name],
         commentMap,
@@ -79,10 +77,9 @@ function getExtAttr(extAttrs: webidl2.ExtendedAttribute[], name: string) {
     attr.rhs.type === "string-list" ||
     attr.rhs.type === "decimal-list" ||
     attr.rhs.type === "integer-list"
-    ? (attr.rhs
-        .value as webidl2.ExtendedAttributeRightHandSideIdentifier[]).map(
-        (item) => item.value
-      )
+    ? (
+        attr.rhs.value as webidl2.ExtendedAttributeRightHandSideIdentifier[]
+      ).map((item) => item.value)
     : [attr.rhs.value];
 }
 
@@ -357,6 +354,7 @@ function convertAttribute(
     exposed:
       getExtAttrConcatenated(attribute.extAttrs, "Exposed") ||
       inheritedExposure,
+    "put-forwards": getExtAttr(attribute.extAttrs, "PutForwards")[0],
   };
 }
 

src/fetch-idl.ts

@@ -26,9 +26,9 @@ const cssPropSelector = [
 ].join(",");
 
 async function fetchIDLs(filter: string[]) {
-  const idlSources = (require("../inputfiles/idlSources.json") as IDLSource[]).filter(
-    (source) => !filter.length || filter.includes(source.title)
-  );
+  const idlSources = (
+    require("../inputfiles/idlSources.json") as IDLSource[]
+  ).filter((source) => !filter.length || filter.includes(source.title));
   await Promise.all(
     idlSources.map(async (source) => {
       const { idl, comments } = await fetchIDL(source);
@@ -92,9 +92,9 @@ function extractIDL(dom: DocumentFragment) {
 }
 
 function extractCSSDefinitions(dom: DocumentFragment) {
-  const properties = Array.from(
-    dom.querySelectorAll(cssPropSelector)
-  ).map((element) => element.textContent!.trim());
+  const properties = Array.from(dom.querySelectorAll(cssPropSelector)).map(
+    (element) => element.textContent!.trim()
+  );
 
   if (!properties.length) {
     return "";