fix: FontFace and FontFaceDescriptors type (#1423)

Co-authored-by: saschanaz <[email protected]>

Author: HomyeeKing

baselines/dom.generated.d.ts

@@ -487,8 +487,11 @@ interface FocusOptions {
 }
 
 interface FontFaceDescriptors {
-    display?: string;
+    ascentOverride?: string;
+    descentOverride?: string;
+    display?: FontDisplay;
     featureSettings?: string;
+    lineGapOverride?: string;
     stretch?: string;
     style?: string;
     unicodeRange?: string;
@@ -5479,7 +5482,7 @@ declare var FocusEvent: {
 interface FontFace {
     ascentOverride: string;
     descentOverride: string;
-    display: string;
+    display: FontDisplay;
     family: string;
     featureSettings: string;
     lineGapOverride: string;
@@ -18371,6 +18374,7 @@ type EndOfStreamError = "decode" | "network";
 type EndingType = "native" | "transparent";
 type FileSystemHandleKind = "directory" | "file";
 type FillMode = "auto" | "backwards" | "both" | "forwards" | "none";
+type FontDisplay = "auto" | "block" | "fallback" | "optional" | "swap";
 type FontFaceLoadStatus = "error" | "loaded" | "loading" | "unloaded";
 type FontFaceSetLoadStatus = "loaded" | "loading";
 type FullscreenNavigationUI = "auto" | "hide" | "show";

baselines/serviceworker.generated.d.ts

@@ -203,8 +203,11 @@ interface FileSystemRemoveOptions {
 }
 
 interface FontFaceDescriptors {
-    display?: string;
+    ascentOverride?: string;
+    descentOverride?: string;
+    display?: FontDisplay;
     featureSettings?: string;
+    lineGapOverride?: string;
     stretch?: string;
     style?: string;
     unicodeRange?: string;
@@ -1683,7 +1686,7 @@ declare var FileSystemHandle: {
 interface FontFace {
     ascentOverride: string;
     descentOverride: string;
-    display: string;
+    display: FontDisplay;
     family: string;
     featureSettings: string;
     lineGapOverride: string;
@@ -5820,6 +5823,7 @@ type ColorSpaceConversion = "default" | "none";
 type DocumentVisibilityState = "hidden" | "visible";
 type EndingType = "native" | "transparent";
 type FileSystemHandleKind = "directory" | "file";
+type FontDisplay = "auto" | "block" | "fallback" | "optional" | "swap";
 type FontFaceLoadStatus = "error" | "loaded" | "loading" | "unloaded";
 type FontFaceSetLoadStatus = "loaded" | "loading";
 type FrameType = "auxiliary" | "nested" | "none" | "top-level";

baselines/sharedworker.generated.d.ts

@@ -178,8 +178,11 @@ interface FileSystemRemoveOptions {
 }
 
 interface FontFaceDescriptors {
-    display?: string;
+    ascentOverride?: string;
+    descentOverride?: string;
+    display?: FontDisplay;
     featureSettings?: string;
+    lineGapOverride?: string;
     stretch?: string;
     style?: string;
     unicodeRange?: string;
@@ -1602,7 +1605,7 @@ declare var FileSystemHandle: {
 interface FontFace {
     ascentOverride: string;
     descentOverride: string;
-    display: string;
+    display: FontDisplay;
     family: string;
     featureSettings: string;
     lineGapOverride: string;
@@ -5829,6 +5832,7 @@ type ColorGamut = "p3" | "rec2020" | "srgb";
 type ColorSpaceConversion = "default" | "none";
 type EndingType = "native" | "transparent";
 type FileSystemHandleKind = "directory" | "file";
+type FontDisplay = "auto" | "block" | "fallback" | "optional" | "swap";
 type FontFaceLoadStatus = "error" | "loaded" | "loading" | "unloaded";
 type FontFaceSetLoadStatus = "loaded" | "loading";
 type GlobalCompositeOperation = "color" | "color-burn" | "color-dodge" | "copy" | "darken" | "destination-atop" | "destination-in" | "destination-out" | "destination-over" | "difference" | "exclusion" | "hard-light" | "hue" | "lighten" | "lighter" | "luminosity" | "multiply" | "overlay" | "saturation" | "screen" | "soft-light" | "source-atop" | "source-in" | "source-out" | "source-over" | "xor";

baselines/webworker.generated.d.ts

@@ -207,8 +207,11 @@ interface FileSystemRemoveOptions {
 }
 
 interface FontFaceDescriptors {
-    display?: string;
+    ascentOverride?: string;
+    descentOverride?: string;
+    display?: FontDisplay;
     featureSettings?: string;
+    lineGapOverride?: string;
     stretch?: string;
     style?: string;
     unicodeRange?: string;
@@ -1778,7 +1781,7 @@ declare var FileSystemSyncAccessHandle: {
 interface FontFace {
     ascentOverride: string;
     descentOverride: string;
-    display: string;
+    display: FontDisplay;
     family: string;
     featureSettings: string;
     lineGapOverride: string;
@@ -6144,6 +6147,7 @@ type ColorSpaceConversion = "default" | "none";
 type DocumentVisibilityState = "hidden" | "visible";
 type EndingType = "native" | "transparent";
 type FileSystemHandleKind = "directory" | "file";
+type FontDisplay = "auto" | "block" | "fallback" | "optional" | "swap";
 type FontFaceLoadStatus = "error" | "loaded" | "loading" | "unloaded";
 type FontFaceSetLoadStatus = "loaded" | "loading";
 type FrameType = "auxiliary" | "nested" | "none" | "top-level";

inputfiles/addedTypes.jsonc

@@ -282,6 +282,17 @@
                 "afterend"
               ]
             },
+            "FontDisplay": {
+              "name": "FontDisplay",
+              // https://w3c.github.io/csswg-drafts/css-fonts-4/#font-display-desc
+              "value": [
+                "auto",
+                "block",
+                "swap",
+                "fallback",
+                "optional"
+              ]
+            },
             "ClientType": {
                 "name": "ClientTypes"
             },

inputfiles/overridingTypes.jsonc

@@ -1247,6 +1247,15 @@
                     }
                 ]
             },
+            "FontFace": {
+              "properties": {
+                "property": {
+                  "display": {
+                    "type": "FontDisplay"
+                  }
+                }
+              }
+            },
             "HTMLFrameSetElement": {
                 "element": [
                     {
@@ -3009,7 +3018,16 @@
         }
     },
     "dictionaries": {
-        "dictionary": {
+          "dictionary": {
+            "FontFaceDescriptors": {
+              "members": {
+                "member": {
+                  "display":{
+                    "type": "FontDisplay"
+                  }
+                }
+              }
+            },
             // https://github.com/microsoft/TypeScript/issues/46036
             "CryptoKeyPair": {
                 "members": {

inputfiles/removedTypes.jsonc

@@ -250,10 +250,7 @@
             "FontFaceDescriptors": {
                 "members": {
                     "member": {
-                        "ascentOverride": null,
-                        "descentOverride": null,
-                        "lineGapOverride": null,
-                        "variationSettings": null
+                        "variationSettings": null // Gecko-only as of 2022-10
                     }
                 }
             },