removeTypes cleanup

Author: saschanaz

inputfiles/removedTypes.json

@@ -87,13 +87,6 @@
                     }
                 }
             },
-            "Document": {
-                "methods": {
-                    "method": {
-                        "evaluate": null
-                    }
-                }
-            },
             "FederatedCredential": null,
             "HTMLAreasCollection": null,
             "HTMLBodyElement": {
@@ -108,27 +101,6 @@
                     }
                 }
             },
-            "HTMLElement": {
-                "methods": {
-                    "method": {
-                        "scrollIntoView": null,
-                        "insertAdjacentElement": null,
-                        "insertAdjacentHTML": null,
-                        "insertAdjacentText": null
-                    }
-                }
-            },
-            "HTMLHRElement": {
-                "implements": null
-            },
-            "HTMLIFrameElement": {
-                "properties": {
-                    "property": {
-                        "onload": null
-                    }
-                }
-            },
-            "MediaQueryListListener": null,
             "MessageEvent": {
                 "methods": {
                     "method": {
@@ -139,18 +111,8 @@
             "MSCredentials": null,
             "MSDCCEvent": null,
             "MSDSHEvent": null,
-            "MSPortRange": null,
             "MSStreamReader": null,
-            "OverconstrainedErrorEvent": null,
             "PasswordCredential": null,
-            "Screen": {
-                "methods": {
-                    "method": {
-                        "msLockOrientation": null,
-                        "msUnlockOrientation": null
-                    }
-                }
-            },
             "StorageEvent": {
                 "methods": {
                     "method": {
@@ -265,27 +227,11 @@
                     "GlobalFetch"
                 ]
             },
-            "WheelEvent": {
-                "properties": {
-                    "property": {
-                        "wheelDelta": null,
-                        "wheelDeltaX": null,
-                        "wheelDeltaY": null
-                    }
-                }
-            },
             "WorkerGlobalScope": {
                 "implements": [
                     "GlobalFetch"
                 ]
             },
-            "XPathEvaluator": {
-                "methods": {
-                    "method": {
-                        "evaluate": null
-                    }
-                }
-            },
             "XPathNSResolver": null
         }
     },
@@ -314,20 +260,6 @@
                         "portRange": null
                     }
                 }
-            },
-            "RTCRtpContributingSource": {
-                "members": {
-                    "member": {
-                        "csrc": null
-                    }
-                }
-            },
-            "MediaTrackConstraintSet": {
-                "members": {
-                    "member": {
-                        "echoCancelation": null
-                    }
-                }
             }
         }
     },

src/index.ts

@@ -197,12 +197,11 @@ function emitDom() {
 
         function filterByNull(obj: any, template: any) {
             if (!template) return obj;
-            const filtered: any = {};
-            for (const k in obj) {
-                if (!template.hasOwnProperty(k)) {
-                    filtered[k] = obj[k];
-                }
-                else if (Array.isArray(template[k])) {
+            const filtered = { ...obj };
+            for (const k in template) {
+                if (!obj[k]) {
+                    console.warn(`removedTypes.json has a redundant field ${k} in ${JSON.stringify(template)}`);
+                } else if (Array.isArray(template[k])) {
                     if (!Array.isArray(obj[k])) {
                         throw new Error(`Removal template ${k} is an array but the original field is not`);
                     }
@@ -214,6 +213,8 @@ function emitDom() {
                 }
                 else if (template[k] !== null) {
                     filtered[k] = filterByNull(obj[k], template[k]);
+                } else {
+                    delete filtered[k];
                 }
             }
             return filtered;