-

Author: Bashamega

inputfiles/AutoFill/addedTypes.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"
+}

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"
-                ]
             }
         }
     },

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 readKDL from "./build/utils/kdl.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 readKDL(inputFolder, "addedTypes.kdl");
 
   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/utils/kdl.ts

@@ -1,6 +1,7 @@
 import { parse } from "kdljs";
 import { Enum, Event, Method, Property } from "../types";
-import { readFile } from "fs/promises";
+import { readdir, readFile } from "fs/promises";
+import { merge } from "../helpers.js";
 
 interface MethodDescriptor {
   [x: string]: Omit<Method, "signature">;
@@ -103,10 +104,46 @@ export function parseKDL(kdlText: string) {
 
   return { mixins: { mixin: interfaces }, enums: { enum: enums } };
 }
-export default async function readInputKDL(
-  path: string,
+
+/**
+ * Recursively collect all KDL file URLs in a directory.
+ */
+async function getAllKDLFileURLs(folder: URL, file: string): Promise<URL[]> {
+  const entries = await readdir(folder, { withFileTypes: true });
+
+  const results: URL[] = [];
+
+  for (const entry of entries) {
+    const child = new URL(entry.name + "/", folder);
+
+    if (entry.isDirectory()) {
+      results.push(...(await getAllKDLFileURLs(child, file)));
+    } else if (entry.isFile() && entry.name == file) {
+      results.push(new URL(entry.name, folder));
+    }
+  }
+
+  return results;
+}
+
+/**
+ * Read and parse a single KDL file.
+ */
+export async function readInputKDL(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 readKDL(
   inputFolder: URL,
+  file: string,
 ): Promise<any> {
-  const text = await readFile(new URL(path, inputFolder), "utf8");
-  return parseKDL(text);
+  const fileUrls = await getAllKDLFileURLs(inputFolder, file);
+
+  const parsedContents = await Promise.all(fileUrls.map(readInputKDL));
+
+  return parsedContents.reduce((acc, current) => merge(acc, current), {});
 }