From 342b08c9f803574befb695608b5a24eb88e184d1 Mon Sep 17 00:00:00 2001 From: Kenta Moriuchi Date: Mon, 29 Jul 2024 00:46:50 +0900 Subject: [PATCH 1/3] `ChildNode` and `ParentNode` stopped inheriting `Node` --- baselines/dom.generated.d.ts | 4 ++-- inputfiles/overridingTypes.jsonc | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index ce55651bd..1d0ae361a 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -5683,7 +5683,7 @@ declare var CharacterData: { new(): CharacterData; }; -interface ChildNode extends Node { +interface ChildNode { /** * Inserts nodes just after node, while replacing strings in nodes with equivalent Text nodes. * @@ -16502,7 +16502,7 @@ declare var PannerNode: { new(context: BaseAudioContext, options?: PannerOptions): PannerNode; }; -interface ParentNode extends Node { +interface ParentNode { /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/childElementCount) */ readonly childElementCount: number; /** diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc index b18dc06e1..a1d84c388 100644 --- a/inputfiles/overridingTypes.jsonc +++ b/inputfiles/overridingTypes.jsonc @@ -1,12 +1,6 @@ { "mixins": { "mixin": { - "ChildNode": { - "extends": "Node" - }, - "ParentNode": { - "extends": "Node" - }, "Animatable": { "methods": { "method": { From 418edcb299e96e8a8d7e0a081d36e25213124360 Mon Sep 17 00:00:00 2001 From: Kenta Moriuchi Date: Mon, 29 Jul 2024 00:51:33 +0900 Subject: [PATCH 2/3] `SVGSymbolElement` inherits from `SVGGraphicsElement` --- baselines/dom.generated.d.ts | 2 +- inputfiles/overridingTypes.jsonc | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 1d0ae361a..e1aaab983 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -20413,7 +20413,7 @@ declare var SVGSwitchElement: { * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SVGSymbolElement) */ -interface SVGSymbolElement extends SVGElement, SVGFitToViewBox { +interface SVGSymbolElement extends SVGGraphicsElement, SVGFitToViewBox { addEventListener(type: K, listener: (this: SVGSymbolElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; removeEventListener(type: K, listener: (this: SVGSymbolElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc index a1d84c388..47643a64e 100644 --- a/inputfiles/overridingTypes.jsonc +++ b/inputfiles/overridingTypes.jsonc @@ -1262,9 +1262,6 @@ } } }, - "SVGSymbolElement": { - "extends": "SVGElement" - }, "FormData": { "methods": { "method": { From 6f360b0f153663252745c8f4964b07c235ae97ab Mon Sep 17 00:00:00 2001 From: Kenta Moriuchi Date: Mon, 29 Jul 2024 01:13:36 +0900 Subject: [PATCH 3/3] fix --- baselines/dom.generated.d.ts | 12 ++++++------ inputfiles/overridingTypes.jsonc | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index e1aaab983..88d85ab15 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -15817,13 +15817,13 @@ interface Node extends EventTarget { * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/childNodes) */ - readonly childNodes: NodeListOf; + readonly childNodes: NodeListOf; /** * Returns the first child. * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/firstChild) */ - readonly firstChild: ChildNode | null; + readonly firstChild: (Node & ChildNode) | null; /** * Returns true if node is connected and false otherwise. * @@ -15835,13 +15835,13 @@ interface Node extends EventTarget { * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/lastChild) */ - readonly lastChild: ChildNode | null; + readonly lastChild: (Node & ChildNode) | null; /** * Returns the next sibling. * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/nextSibling) */ - readonly nextSibling: ChildNode | null; + readonly nextSibling: (Node & ChildNode) | null; /** * Returns a string appropriate for the type of node. * @@ -15873,13 +15873,13 @@ interface Node extends EventTarget { * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/parentNode) */ - readonly parentNode: ParentNode | null; + readonly parentNode: (Node & ParentNode) | null; /** * Returns the previous sibling. * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/previousSibling) */ - readonly previousSibling: ChildNode | null; + readonly previousSibling: (Node & ChildNode) | null; /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/textContent) */ textContent: string | null; /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/appendChild) */ diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc index 47643a64e..92b2da760 100644 --- a/inputfiles/overridingTypes.jsonc +++ b/inputfiles/overridingTypes.jsonc @@ -896,25 +896,25 @@ "properties": { "property": { "parentNode": { - "overrideType": "ParentNode" + "overrideType": "Node & ParentNode" }, "parentElement": { "overrideType": "HTMLElement" }, "childNodes": { - "overrideType": "NodeListOf" + "overrideType": "NodeListOf" }, "firstChild": { - "overrideType": "ChildNode" + "overrideType": "Node & ChildNode" }, "lastChild": { - "overrideType": "ChildNode" + "overrideType": "Node & ChildNode" }, "nextSibling": { - "overrideType": "ChildNode" + "overrideType": "Node & ChildNode" }, "previousSibling": { - "overrideType": "ChildNode" + "overrideType": "Node & ChildNode" } } }