KDL Parser

inputfiles/addedTypes.jsonc

@@ -373,98 +373,6 @@
                     // Full support: https://developer.mozilla.org/en-US/docs/Web/API/Storage_Access_API#browser_compatibility
                     "storage-access"
                 ]
-            },
-            "AutoFillBase": {
-                "name": "AutoFillBase",
-                "value": [
-                    // Off
-                    "off",
-                    // Automatic
-                    "on",
-                    ""
-                ]
-            },
-            "AutoFillAddressKind": {
-                "name": "AutoFillAddressKind",
-                "value": [
-                    "shipping",
-                    "billing"
-                ]
-            },
-            "AutoFillNormalField": {
-                "name": "AutoFillNormalField",
-                "value": [
-                    "name",
-                    "honorific-prefix",
-                    "given-name",
-                    "additional-name",
-                    "family-name",
-                    "honorific-suffix",
-
-                    "username",
-                    "new-password",
-                    "current-password",
-                    // Supported in iOS Safari too even though WPT tests
-                    // for Safari currently fail as of 2023-06.
-                    "one-time-code",
-
-                    "organization",
-                    "street-address",
-                    "address-line1",
-                    "address-line2",
-                    "address-line3",
-                    "address-level4",
-                    "address-level3",
-                    "address-level2",
-                    "address-level1",
-                    "country",
-                    "country-name",
-                    "postal-code",
-
-                    "cc-name",
-                    "cc-given-name",
-                    "cc-family-name",
-                    "cc-number",
-                    "cc-exp",
-                    "cc-exp-month",
-                    "cc-exp-year",
-                    "cc-csc",
-                    "cc-type",
-                    "transaction-currency",
-                    "transaction-amount",
-
-                    "bday-day",
-                    "bday-month",
-                    "bday-year"
-                ]
-            },
-            "AutoFillContactKind": {
-                "name": "AutoFillContactKind",
-                "value": [
-                    "home",
-                    "work",
-                    "mobile"
-                ]
-            },
-            "AutoFillContactField": {
-                "name": "AutoFillContactField",
-                "value": [
-                    "tel",
-                    "tel-country-code",
-                    "tel-national",
-                    "tel-area-code",
-                    "tel-local",
-                    "tel-local-prefix",
-                    "tel-local-suffix",
-                    "tel-extension",
-                    "email"
-                ]
-            },
-            "AutoFillCredentialField": {
-                "name": "AutoFillCredentialField",
-                "value": [
-                    "webauthn"
-                ]
             }
         }
     },

inputfiles/patches/autoFills.kdl

@@ -0,0 +1,70 @@
+enum AutoFillBase {
+  // Off
+  value "off"
+  // Automatic
+  value "on"
+  value ""
+}
+enum AutoFillAddressKind {
+  value "shipping"
+  value "billing"
+}
+enum AutoFillNormalField {
+  value "name"
+  value "honorific-prefix"
+  value "given-name"
+  value "additional-name"
+  value "family-name"
+  value "honorific-suffix"
+  value "username"
+  value "new-password"
+  value "current-password"
+  // Supported in iOS Safari too even though WPT tests
+  // for Safari currently fail as of 2023-06.
+  value "one-time-code"
+  value "organization"
+  value "street-address"
+  value "address-line1"
+  value "address-line2"
+  value "address-line3"
+  value "address-level4"
+  value "address-level3"
+  value "address-level2"
+  value "address-level1"
+  value "country"
+  value "country-name"
+  value "postal-code"
+  value "cc-name"
+  value "cc-given-name"
+  value "cc-family-name"
+  value "cc-number"
+  value "cc-exp"
+  value "cc-exp-month"
+  value "cc-exp-year"
+  value "cc-csc"
+  value "cc-type"
+  value "transaction-currency"
+  value "transaction-amount"
+  value "bday-day"
+  value "bday-month"
+  value "bday-year"
+}
+enum AutoFillContactKind {
+  value "home"
+  value "work"
+  value "mobile"
+}
+enum AutoFillContactField {
+  value "tel"
+  value "tel-country-code"
+  value "tel-national"
+  value "tel-area-code"
+  value "tel-local"
+  value "tel-local-prefix"
+  value "tel-local-suffix"
+  value "tel-extension"
+  value "email"
+}
+enum AutoFillCredentialField {
+  value "webauthn"
+}

package.json

@@ -58,6 +58,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "globals": "^16.0.0",
     "jsonc-parser": "^3.2.1",
+    "kdljs": "^0.3.0",
     "node-fetch": "^3.3.2",
     "prettier": "^3.2.5",
     "print-diff": "^2.0.0",

src/build.ts

@@ -14,6 +14,7 @@ import { getInterfaceToEventMap } from "./build/webref/events.js";
 import { getWebidls } from "./build/webref/idl.js";
 import jsonc from "jsonc-parser";
 import { generateDescriptions } from "./build/mdn-comments.js";
+import readPatches from "./build/patches.js";
 
 function mergeNamesakes(filtered: Browser.WebIdl) {
   const targets = [
@@ -97,6 +98,7 @@ async function emitDom() {
   const deprecatedInfo = await readInputJSON("deprecatedMessage.json");
   const documentationFromMDN = await generateDescriptions();
   const removedItems = await readInputJSON("removedTypes.jsonc");
+  const addedItemsKDL = await readPatches();
 
   async function readInputJSON(filename: string) {
     const content = await fs.readFile(new URL(filename, inputFolder), "utf8");
@@ -229,6 +231,7 @@ async function emitDom() {
   webidl = prune(webidl, removedItems);
   webidl = mergeApiDescriptions(webidl, documentationFromMDN);
   webidl = merge(webidl, addedItems);
+  webidl = merge(webidl, addedItemsKDL);
   webidl = merge(webidl, overriddenItems);
   webidl = merge(webidl, comments);
   webidl = mergeDeprecatedMessage(webidl, deprecatedInfo);

src/build/patches.ts

@@ -0,0 +1,70 @@
+import { parse } from "kdljs";
+import { Enum } from "./types";
+import { readdir, readFile } from "fs/promises";
+import { merge } from "./helpers.js";
+
+/**
+ * Converts patch files in KDL to match the [types](types.d.ts).
+ */
+export function parseKDL(kdlText: string) {
+  const { output, errors } = parse(kdlText);
+
+  if (errors.length) {
+    throw new Error("KDL parse errors", { cause: errors });
+  }
+
+  const nodes = output!;
+  const enums: Record<string, Enum> = {};
+
+  for (const node of nodes) {
+    if (node.name === "enum") {
+      // Handle enum
+      const name = node.values[0];
+      if (typeof name !== "string") {
+        throw new Error("Missing enum name");
+      }
+      const values: string[] = [];
+
+      for (const child of node.children ?? []) {
+        if (child.name !== "value" || typeof child.values[0] !== "string") {
+          throw new Error(
+            "enum values should be in the form of `value {name}`",
+          );
+        }
+        values.push(child.values[0]);
+      }
+
+      enums[name] = { name, value: values };
+    }
+  }
+
+  return { enums: { enum: enums } };
+}
+
+/**
+ * Collect all file URLs in a directory.
+ */
+async function getAllKDLFileURLs(folder: URL): Promise<URL[]> {
+  const entries = await readdir(folder, { withFileTypes: true });
+  return entries.map((entry) => new URL(entry.name, folder));
+}
+
+/**
+ * Read and parse a single KDL file.
+ */
+export async function readPatch(fileUrl: URL): Promise<any> {
+  const text = await readFile(fileUrl, "utf8");
+  return parseKDL(text);
+}
+
+/**
+ * Read, parse, and merge all KDL files under the input folder.
+ */
+export default async function readPatches(): Promise<any> {
+  const patchDirectory = new URL("../../inputfiles/patches/", import.meta.url);
+  const fileUrls = await getAllKDLFileURLs(patchDirectory);
+
+  const parsedContents = await Promise.all(fileUrls.map(readPatch));
+
+  return parsedContents.reduce((acc, current) => merge(acc, current), {});
+}