From e85d69c3981cc71d1c8b9ba8f2f16a8abbcc0ba4 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 3 Aug 2021 00:50:56 +0000 Subject: [PATCH 1/5] Updated overridingTypes for ChildNode and ParentNode. --- inputfiles/overridingTypes.jsonc | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc index 7f00dcffd..d9ba543d2 100644 --- a/inputfiles/overridingTypes.jsonc +++ b/inputfiles/overridingTypes.jsonc @@ -1,6 +1,14 @@ { "mixins": { "mixin": { + "ChildNode": { + "name": "ChildNode", + "extends": "Node" + }, + "ParentNode": { + "name": "ParentNode", + "extends": "Node" + }, "Animatable": { "name": "Animatable", "methods": { @@ -760,26 +768,8 @@ }, "properties": { "property": { - "parentNode": { - "overrideType": "Node & ParentNode" - }, "parentElement": { "overrideType": "HTMLElement" - }, - "childNodes": { - "overrideType": "NodeListOf" - }, - "firstChild": { - "overrideType": "ChildNode & Node" - }, - "lastChild": { - "overrideType": "ChildNode & Node" - }, - "nextSibling": { - "overrideType": "ChildNode & Node" - }, - "previousSibling": { - "overrideType": "ChildNode & Node" } } } From 9d18394723ae201ffc748a437373ed43be36aea7 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 3 Aug 2021 00:52:05 +0000 Subject: [PATCH 2/5] Accept baselines. --- baselines/dom.generated.d.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index ea0ab055f..66423895e 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -3463,7 +3463,7 @@ declare var CharacterData: { new(): CharacterData; }; -interface ChildNode { +interface ChildNode extends Node { /** * Inserts nodes just after node, while replacing strings in nodes with equivalent Text nodes. * @@ -10471,11 +10471,11 @@ interface Node extends EventTarget { /** * Returns the children. */ - readonly childNodes: NodeListOf; + readonly childNodes: NodeList; /** * Returns the first child. */ - readonly firstChild: (ChildNode & Node) | null; + readonly firstChild: Node | null; /** * Returns true if node is connected and false otherwise. */ @@ -10483,11 +10483,11 @@ interface Node extends EventTarget { /** * Returns the last child. */ - readonly lastChild: (ChildNode & Node) | null; + readonly lastChild: Node | null; /** * Returns the next sibling. */ - readonly nextSibling: (ChildNode & Node) | null; + readonly nextSibling: Node | null; /** * Returns a string appropriate for the type of node. */ @@ -10508,11 +10508,11 @@ interface Node extends EventTarget { /** * Returns the parent. */ - readonly parentNode: (Node & ParentNode) | null; + readonly parentNode: Node | null; /** * Returns the previous sibling. */ - readonly previousSibling: (ChildNode & Node) | null; + readonly previousSibling: Node | null; textContent: string | null; appendChild(node: T): T; /** @@ -10929,7 +10929,7 @@ declare var PannerNode: { new(context: BaseAudioContext, options?: PannerOptions): PannerNode; }; -interface ParentNode { +interface ParentNode extends Node { readonly childElementCount: number; /** * Returns the child elements. From 7e6db51ff23b23f0c4cfc6fd81ed6cb05b57d5ea Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 3 Aug 2021 00:57:37 +0000 Subject: [PATCH 3/5] Restore overrides. --- inputfiles/overridingTypes.jsonc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc index d9ba543d2..64d7b75f2 100644 --- a/inputfiles/overridingTypes.jsonc +++ b/inputfiles/overridingTypes.jsonc @@ -768,8 +768,26 @@ }, "properties": { "property": { + "parentNode": { + "overrideType": "ParentNode" + }, "parentElement": { "overrideType": "HTMLElement" + }, + "childNodes": { + "overrideType": "NodeListOf" + }, + "firstChild": { + "overrideType": "ChildNode" + }, + "lastChild": { + "overrideType": "ChildNode" + }, + "nextSibling": { + "overrideType": "ChildNode" + }, + "previousSibling": { + "overrideType": "ChildNode" } } } From 37c2ab2d325fed68252461b5d118090c51ed0227 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 3 Aug 2021 00:58:51 +0000 Subject: [PATCH 4/5] Accepted baselines. --- baselines/dom.generated.d.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 66423895e..980c65030 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -10471,11 +10471,11 @@ interface Node extends EventTarget { /** * Returns the children. */ - readonly childNodes: NodeList; + readonly childNodes: NodeListOf; /** * Returns the first child. */ - readonly firstChild: Node | null; + readonly firstChild: ChildNode | null; /** * Returns true if node is connected and false otherwise. */ @@ -10483,11 +10483,11 @@ interface Node extends EventTarget { /** * Returns the last child. */ - readonly lastChild: Node | null; + readonly lastChild: ChildNode | null; /** * Returns the next sibling. */ - readonly nextSibling: Node | null; + readonly nextSibling: ChildNode | null; /** * Returns a string appropriate for the type of node. */ @@ -10508,11 +10508,11 @@ interface Node extends EventTarget { /** * Returns the parent. */ - readonly parentNode: Node | null; + readonly parentNode: ParentNode | null; /** * Returns the previous sibling. */ - readonly previousSibling: Node | null; + readonly previousSibling: ChildNode | null; textContent: string | null; appendChild(node: T): T; /** From 19f61ec5ab914c821092e88fb4483432ed0551ae Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 3 Aug 2021 14:31:41 -0700 Subject: [PATCH 5/5] Remove unnecessary 'name' fields. --- inputfiles/overridingTypes.jsonc | 2 -- 1 file changed, 2 deletions(-) diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc index 64d7b75f2..7c75f2045 100644 --- a/inputfiles/overridingTypes.jsonc +++ b/inputfiles/overridingTypes.jsonc @@ -2,11 +2,9 @@ "mixins": { "mixin": { "ChildNode": { - "name": "ChildNode", "extends": "Node" }, "ParentNode": { - "name": "ParentNode", "extends": "Node" }, "Animatable": {