Skip to content

Commit 6cddee3

Browse files
author
falsandtru
committed
Move HTML definitions from ElementTagNameMap to HTMLElementTagNameMap
1 parent 5f5ebdb commit 6cddee3

File tree

2 files changed

+46
-53
lines changed

2 files changed

+46
-53
lines changed

TS.fsx

+2-8
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ module Emit =
812812
Pt.Printl "interface HTMLElementTagNameMap {"
813813
Pt.IncreaseIndent()
814814
for e in tagNameToEleName do
815-
if iNameToIDependList.ContainsKey e.Value && Seq.contains "HTMLElement" iNameToIDependList.[e.Value] then
815+
if iNameToIDependList.ContainsKey e.Value && not (Seq.contains "SVGElement" iNameToIDependList.[e.Value]) then
816816
Pt.Printl "\"%s\": %s;" (e.Key.ToLower()) e.Value
817817
Pt.DecreaseIndent()
818818
Pt.Printl "}"
@@ -829,13 +829,7 @@ module Emit =
829829
Pt.Printl ""
830830

831831
let EmitElementTagNameMap () =
832-
Pt.Printl "interface ElementTagNameMap extends HTMLElementTagNameMap, SVGElementTagNameMap {"
833-
Pt.IncreaseIndent()
834-
for e in tagNameToEleName do
835-
if iNameToIDependList.ContainsKey e.Value && not (Seq.contains "HTMLElement" iNameToIDependList.[e.Value]) && not (Seq.contains "SVGElement" iNameToIDependList.[e.Value]) then
836-
Pt.Printl "\"%s\": %s;" (e.Key.ToLower()) e.Value
837-
Pt.DecreaseIndent()
838-
Pt.Printl "}"
832+
Pt.Printl "interface ElementTagNameMap extends HTMLElementTagNameMap, SVGElementTagNameMap { }"
839833
Pt.Printl ""
840834

841835
let EmitElementListTagNameMap () =

baselines/dom.generated.d.ts

+44-45
Original file line numberDiff line numberDiff line change
@@ -14838,28 +14838,46 @@ interface VoidFunction {
1483814838
}
1483914839
interface HTMLElementTagNameMap {
1484014840
"a": HTMLAnchorElement;
14841+
"abbr": HTMLElement;
14842+
"acronym": HTMLElement;
14843+
"address": HTMLElement;
1484114844
"applet": HTMLAppletElement;
1484214845
"area": HTMLAreaElement;
14846+
"article": HTMLElement;
14847+
"aside": HTMLElement;
1484314848
"audio": HTMLAudioElement;
14849+
"b": HTMLElement;
1484414850
"base": HTMLBaseElement;
1484514851
"basefont": HTMLBaseFontElement;
14852+
"bdo": HTMLElement;
14853+
"big": HTMLElement;
1484614854
"blockquote": HTMLQuoteElement;
1484714855
"body": HTMLBodyElement;
1484814856
"br": HTMLBRElement;
1484914857
"button": HTMLButtonElement;
1485014858
"canvas": HTMLCanvasElement;
1485114859
"caption": HTMLTableCaptionElement;
14860+
"center": HTMLElement;
14861+
"cite": HTMLElement;
14862+
"code": HTMLElement;
1485214863
"col": HTMLTableColElement;
1485314864
"colgroup": HTMLTableColElement;
1485414865
"data": HTMLDataElement;
1485514866
"datalist": HTMLDataListElement;
14867+
"dd": HTMLElement;
1485614868
"del": HTMLModElement;
14869+
"dfn": HTMLElement;
1485714870
"dir": HTMLDirectoryElement;
1485814871
"div": HTMLDivElement;
1485914872
"dl": HTMLDListElement;
14873+
"dt": HTMLElement;
14874+
"em": HTMLElement;
1486014875
"embed": HTMLEmbedElement;
1486114876
"fieldset": HTMLFieldSetElement;
14877+
"figcaption": HTMLElement;
14878+
"figure": HTMLElement;
1486214879
"font": HTMLFontElement;
14880+
"footer": HTMLElement;
1486314881
"form": HTMLFormElement;
1486414882
"frame": HTMLFrameElement;
1486514883
"frameset": HTMLFrameSetElement;
@@ -14870,24 +14888,34 @@ interface HTMLElementTagNameMap {
1487014888
"h5": HTMLHeadingElement;
1487114889
"h6": HTMLHeadingElement;
1487214890
"head": HTMLHeadElement;
14891+
"header": HTMLElement;
14892+
"hgroup": HTMLElement;
1487314893
"hr": HTMLHRElement;
1487414894
"html": HTMLHtmlElement;
14895+
"i": HTMLElement;
1487514896
"iframe": HTMLIFrameElement;
1487614897
"img": HTMLImageElement;
1487714898
"input": HTMLInputElement;
1487814899
"ins": HTMLModElement;
1487914900
"isindex": HTMLUnknownElement;
14901+
"kbd": HTMLElement;
14902+
"keygen": HTMLElement;
1488014903
"label": HTMLLabelElement;
1488114904
"legend": HTMLLegendElement;
1488214905
"li": HTMLLIElement;
1488314906
"link": HTMLLinkElement;
1488414907
"listing": HTMLPreElement;
1488514908
"map": HTMLMapElement;
14909+
"mark": HTMLElement;
1488614910
"marquee": HTMLMarqueeElement;
1488714911
"menu": HTMLMenuElement;
1488814912
"meta": HTMLMetaElement;
1488914913
"meter": HTMLMeterElement;
14914+
"nav": HTMLElement;
1489014915
"nextid": HTMLUnknownElement;
14916+
"nobr": HTMLElement;
14917+
"noframes": HTMLElement;
14918+
"noscript": HTMLElement;
1489114919
"object": HTMLObjectElement;
1489214920
"ol": HTMLOListElement;
1489314921
"optgroup": HTMLOptGroupElement;
@@ -14896,14 +14924,25 @@ interface HTMLElementTagNameMap {
1489614924
"p": HTMLParagraphElement;
1489714925
"param": HTMLParamElement;
1489814926
"picture": HTMLPictureElement;
14927+
"plaintext": HTMLElement;
1489914928
"pre": HTMLPreElement;
1490014929
"progress": HTMLProgressElement;
1490114930
"q": HTMLQuoteElement;
14931+
"rt": HTMLElement;
14932+
"ruby": HTMLElement;
14933+
"s": HTMLElement;
14934+
"samp": HTMLElement;
1490214935
"script": HTMLScriptElement;
14936+
"section": HTMLElement;
1490314937
"select": HTMLSelectElement;
14938+
"small": HTMLElement;
1490414939
"source": HTMLSourceElement;
1490514940
"span": HTMLSpanElement;
14941+
"strike": HTMLElement;
14942+
"strong": HTMLElement;
1490614943
"style": HTMLStyleElement;
14944+
"sub": HTMLElement;
14945+
"sup": HTMLElement;
1490714946
"table": HTMLTableElement;
1490814947
"tbody": HTMLTableSectionElement;
1490914948
"td": HTMLTableDataCellElement;
@@ -14916,8 +14955,12 @@ interface HTMLElementTagNameMap {
1491614955
"title": HTMLTitleElement;
1491714956
"tr": HTMLTableRowElement;
1491814957
"track": HTMLTrackElement;
14958+
"tt": HTMLElement;
14959+
"u": HTMLElement;
1491914960
"ul": HTMLUListElement;
14961+
"var": HTMLElement;
1492014962
"video": HTMLVideoElement;
14963+
"wbr": HTMLElement;
1492114964
"x-ms-webview": MSHTMLWebViewElement;
1492214965
"xmp": HTMLPreElement;
1492314966
}
@@ -14978,51 +15021,7 @@ interface SVGElementTagNameMap {
1497815021
"view": SVGViewElement;
1497915022
}
1498015023

14981-
interface ElementTagNameMap extends HTMLElementTagNameMap, SVGElementTagNameMap {
14982-
"abbr": HTMLElement;
14983-
"acronym": HTMLElement;
14984-
"address": HTMLElement;
14985-
"article": HTMLElement;
14986-
"aside": HTMLElement;
14987-
"b": HTMLElement;
14988-
"bdo": HTMLElement;
14989-
"big": HTMLElement;
14990-
"center": HTMLElement;
14991-
"cite": HTMLElement;
14992-
"code": HTMLElement;
14993-
"dd": HTMLElement;
14994-
"dfn": HTMLElement;
14995-
"dt": HTMLElement;
14996-
"em": HTMLElement;
14997-
"figcaption": HTMLElement;
14998-
"figure": HTMLElement;
14999-
"footer": HTMLElement;
15000-
"header": HTMLElement;
15001-
"hgroup": HTMLElement;
15002-
"i": HTMLElement;
15003-
"kbd": HTMLElement;
15004-
"keygen": HTMLElement;
15005-
"mark": HTMLElement;
15006-
"nav": HTMLElement;
15007-
"nobr": HTMLElement;
15008-
"noframes": HTMLElement;
15009-
"noscript": HTMLElement;
15010-
"plaintext": HTMLElement;
15011-
"rt": HTMLElement;
15012-
"ruby": HTMLElement;
15013-
"s": HTMLElement;
15014-
"samp": HTMLElement;
15015-
"section": HTMLElement;
15016-
"small": HTMLElement;
15017-
"strike": HTMLElement;
15018-
"strong": HTMLElement;
15019-
"sub": HTMLElement;
15020-
"sup": HTMLElement;
15021-
"tt": HTMLElement;
15022-
"u": HTMLElement;
15023-
"var": HTMLElement;
15024-
"wbr": HTMLElement;
15025-
}
15024+
interface ElementTagNameMap extends HTMLElementTagNameMap, SVGElementTagNameMap { }
1502615025

1502715026
type ElementListTagNameMap = {
1502815027
[key in keyof ElementTagNameMap]: NodeListOf<ElementTagNameMap[key]>

0 commit comments

Comments
 (0)