shallow merge

Author: saschanaz

src/helpers.ts

@@ -26,7 +26,7 @@ export function filterProperties<T>(obj: Record<string, T>, fn: (o: T) => boolea
     return result;
 }
 
-export function merge<T>(src: T, target: T): T {
+export function merge<T>(src: T, target: T, shallow?: boolean): T {
     if (typeof src !== "object" || typeof target !== "object") {
         return target;
     }
@@ -42,7 +42,12 @@ export function merge<T>(src: T, target: T): T {
                     if (Array.isArray(srcProp) !== Array.isArray(targetProp)) {
                         throw new Error("Mismatch on property: " + k + JSON.stringify(targetProp));
                     }
-                    src[k] = merge(src[k], target[k]);
+                    if (shallow && "name" in src[k] && "name" in target[k]) {
+                        src[k] = target[k];
+                    }
+                    else {
+                        src[k] = merge(src[k], target[k], shallow);
+                    }
                 }
             }
             else {
@@ -53,17 +58,19 @@ export function merge<T>(src: T, target: T): T {
     return src;
 }
 
-function mergeNamedArrays<T extends { name: string }>(srcProp: T[], targetProp: T[]) {
+function mergeNamedArrays<T extends { name: string; "new-type": string; }>(srcProp: T[], targetProp: T[]) {
     const map: any = {};
     for (const e1 of srcProp) {
-        if (e1.name) {
-            map[e1.name] = e1;
+        const name = e1.name || e1["new-type"];
+        if (name) {
+            map[name] = e1;
         }
     }
 
     for (const e2 of targetProp) {
-        if (e2.name && map[e2.name]) {
-            merge(map[e2.name], e2);
+        const name = e2.name || e2["new-type"];
+        if (name && map[name]) {
+            merge(map[name], e2);
         }
         else {
             srcProp.push(e2);
@@ -116,7 +123,7 @@ export function isArray(value: any): value is ReadonlyArray<{}> {
     return Array.isArray ? Array.isArray(value) : value instanceof Array;
 }
 
-export function flatMap<T, U>(array: ReadonlyArray<T> | undefined, mapfn: (x: T, i: number) => U | ReadonlyArray<U> | undefined): U[]  {
+export function flatMap<T, U>(array: ReadonlyArray<T> | undefined, mapfn: (x: T, i: number) => U | ReadonlyArray<U> | undefined): U[] {
     let result: U[] | undefined;
     if (array) {
         result = [];
@@ -137,4 +144,4 @@ export function flatMap<T, U>(array: ReadonlyArray<T> | undefined, mapfn: (x: T,
 
 export function concat<T>(a: T[] | undefined, b: T[] | undefined): T[] {
     return !a ? b || [] : a.concat(b || []);
-}
+}

src/index.ts

@@ -92,7 +92,7 @@ function emitDom() {
     const knownWorkerTypes = new Set<string>(require(path.join(inputFolder, "knownWorkerTypes.json")));
 
     for (const w of widlStandardTypes) {
-        webidl = merge(webidl, w.browser);
+        webidl = merge(webidl, w.browser, true);
     }
     webidl = prune(webidl, removedItems);
     webidl = merge(webidl, addedItems);

src/widlprocess.ts

@@ -138,7 +138,6 @@ function convertArgument(arg: webidl2.Argument): Browser.Param {
     return {
         name: arg.name,
         ...convertIdlType(arg.idlType),
-        nullable: arg.idlType.nullable ? 1 : undefined,
         optional: arg.optional ? 1 : undefined,
         variadic: arg.variadic ? 1 : undefined,
     }