@glint/template 1.7.2-unstable.3f50b40 → 1.7.3-unstable.07406b3

package/-private/dsl/elements.d.ts

@@ -1,4 +1,4 @@
-//generated by scrips/build-elements.mjs
+// Auto-generated by bin/build-elements.mjs
 // this server to provide the html attributes for each element
 
 import { AttrValue } from '../index';
@@ -628,7 +628,6 @@ interface HTMLVideoElementAttributes extends GlobalHTMLAttributes {
 }
 interface HTMLElementAttributes extends GlobalHTMLAttributes {
 }
-
 /**
  * @internal
  * @private - not for use outside of Glint
@@ -637,49 +636,44 @@ interface GlintHtmlElementAttributesMap {
   ['HTMLAnchorElement']: HTMLAnchorElementAttributes;
   ['HTMLAreaElement']: HTMLAreaElementAttributes;
   ['HTMLAudioElement']: HTMLAudioElementAttributes;
-  ['HTMLBaseElement']: HTMLBaseElementAttributes;
-  ['HTMLQuoteElement']: HTMLQuoteElementAttributes;
   ['HTMLBRElement']: HTMLBRElementAttributes;
+  ['HTMLBaseElement']: HTMLBaseElementAttributes;
+  ['HTMLBodyElement']: GlobalHTMLAttributes;
   ['HTMLButtonElement']: HTMLButtonElementAttributes;
   ['HTMLCanvasElement']: HTMLCanvasElementAttributes;
-  ['HTMLTableCaptionElement']: HTMLTableCaptionElementAttributes;
-  ['HTMLTableColElement']: HTMLTableColElementAttributes;
-  ['HTMLTableColElement']: HTMLTableColElementAttributes;
+  ['HTMLDListElement']: HTMLDListElementAttributes;
   ['HTMLDataElement']: HTMLDataElementAttributes;
-  ['HTMLModElement']: HTMLModElementAttributes;
+  ['HTMLDataListElement']: GlobalHTMLAttributes;
   ['HTMLDetailsElement']: HTMLDetailsElementAttributes;
   ['HTMLDialogElement']: HTMLDialogElementAttributes;
   ['HTMLDivElement']: HTMLDivElementAttributes;
-  ['HTMLDListElement']: HTMLDListElementAttributes;
+  ['HTMLElement']: GlobalHTMLAttributes;
   ['HTMLEmbedElement']: HTMLEmbedElementAttributes;
   ['HTMLFieldSetElement']: HTMLFieldSetElementAttributes;
   ['HTMLFormElement']: HTMLFormElementAttributes;
-  ['HTMLHeadingElement']: HTMLHeadingElementAttributes;
-  ['HTMLHeadingElement']: HTMLHeadingElementAttributes;
-  ['HTMLHeadingElement']: HTMLHeadingElementAttributes;
-  ['HTMLHeadingElement']: HTMLHeadingElementAttributes;
-  ['HTMLHeadingElement']: HTMLHeadingElementAttributes;
-  ['HTMLHeadingElement']: HTMLHeadingElementAttributes;
-  ['HTMLHeadElement']: HTMLHeadElementAttributes;
   ['HTMLHRElement']: HTMLHRElementAttributes;
+  ['HTMLHeadElement']: HTMLHeadElementAttributes;
+  ['HTMLHeadingElement']: HTMLHeadingElementAttributes;
+  ['HTMLHtmlElement']: GlobalHTMLAttributes;
   ['HTMLIFrameElement']: HTMLIFrameElementAttributes;
   ['HTMLImageElement']: HTMLImageElementAttributes;
   ['HTMLInputElement']: HTMLInputElementAttributes;
-  ['HTMLModElement']: HTMLModElementAttributes;
+  ['HTMLLIElement']: HTMLLIElementAttributes;
   ['HTMLLabelElement']: HTMLLabelElementAttributes;
   ['HTMLLegendElement']: HTMLLegendElementAttributes;
-  ['HTMLLIElement']: HTMLLIElementAttributes;
   ['HTMLLinkElement']: HTMLLinkElementAttributes;
   ['HTMLMapElement']: HTMLMapElementAttributes;
   ['HTMLMenuElement']: HTMLMenuElementAttributes;
   ['HTMLMetaElement']: HTMLMetaElementAttributes;
   ['HTMLMeterElement']: HTMLMeterElementAttributes;
-  ['HTMLObjectElement']: HTMLObjectElementAttributes;
+  ['HTMLModElement']: HTMLModElementAttributes;
   ['HTMLOListElement']: HTMLOListElementAttributes;
+  ['HTMLObjectElement']: HTMLObjectElementAttributes;
   ['HTMLOptGroupElement']: HTMLOptGroupElementAttributes;
   ['HTMLOptionElement']: HTMLOptionElementAttributes;
   ['HTMLOutputElement']: HTMLOutputElementAttributes;
   ['HTMLParagraphElement']: HTMLParagraphElementAttributes;
+  ['HTMLPictureElement']: GlobalHTMLAttributes;
   ['HTMLPreElement']: HTMLPreElementAttributes;
   ['HTMLProgressElement']: HTMLProgressElementAttributes;
   ['HTMLQuoteElement']: HTMLQuoteElementAttributes;
@@ -687,21 +681,21 @@ interface GlintHtmlElementAttributesMap {
   ['HTMLSelectElement']: HTMLSelectElementAttributes;
   ['HTMLSlotElement']: HTMLSlotElementAttributes;
   ['HTMLSourceElement']: HTMLSourceElementAttributes;
+  ['HTMLSpanElement']: GlobalHTMLAttributes;
   ['HTMLStyleElement']: HTMLStyleElementAttributes;
+  ['HTMLTableCaptionElement']: HTMLTableCaptionElementAttributes;
+  ['HTMLTableCellElement']: HTMLTableCellElementAttributes;
+  ['HTMLTableColElement']: HTMLTableColElementAttributes;
   ['HTMLTableElement']: HTMLTableElementAttributes;
+  ['HTMLTableRowElement']: HTMLTableRowElementAttributes;
   ['HTMLTableSectionElement']: HTMLTableSectionElementAttributes;
-  ['HTMLTableCellElement']: HTMLTableCellElementAttributes;
   ['HTMLTemplateElement']: HTMLTemplateElementAttributes;
   ['HTMLTextAreaElement']: HTMLTextAreaElementAttributes;
-  ['HTMLTableSectionElement']: HTMLTableSectionElementAttributes;
-  ['HTMLTableCellElement']: HTMLTableCellElementAttributes;
-  ['HTMLTableSectionElement']: HTMLTableSectionElementAttributes;
   ['HTMLTimeElement']: HTMLTimeElementAttributes;
-  ['HTMLTableRowElement']: HTMLTableRowElementAttributes;
+  ['HTMLTitleElement']: GlobalHTMLAttributes;
   ['HTMLTrackElement']: HTMLTrackElementAttributes;
   ['HTMLUListElement']: HTMLUListElementAttributes;
   ['HTMLVideoElement']: HTMLVideoElementAttributes;
-  ['HTMLElement']: GlobalHTMLAttributes;
 }
 }
 
@@ -4323,8 +4317,6 @@ interface SVGViewElementAttributes extends GlobalSVGAttributes {
 }
 interface SVGElementAttributes extends GlobalSVGAttributes {
 }
-
-
 /**
  * @internal
  * @private - not for use outside of Glint
@@ -4338,6 +4330,7 @@ interface GlintSvgElementAttributesMap {
   ['SVGClipPathElement']: SVGClipPathElementAttributes;
   ['SVGDefsElement']: SVGDefsElementAttributes;
   ['SVGDescElement']: SVGDescElementAttributes;
+  ['SVGElement']: GlobalSVGAttributes;
   ['SVGEllipseElement']: SVGEllipseElementAttributes;
   ['SVGFEBlendElement']: SVGFEBlendElementAttributes;
   ['SVGFEColorMatrixElement']: SVGFEColorMatrixElementAttributes;
@@ -4370,29 +4363,28 @@ interface GlintSvgElementAttributesMap {
   ['SVGImageElement']: SVGImageElementAttributes;
   ['SVGLineElement']: SVGLineElementAttributes;
   ['SVGLinearGradientElement']: SVGLinearGradientElementAttributes;
+  ['SVGMPathElement']: SVGMPathElementAttributes;
   ['SVGMarkerElement']: SVGMarkerElementAttributes;
   ['SVGMaskElement']: SVGMaskElementAttributes;
   ['SVGMetadataElement']: SVGMetadataElementAttributes;
-  ['SVGMPathElement']: SVGMPathElementAttributes;
   ['SVGPathElement']: SVGPathElementAttributes;
   ['SVGPatternElement']: SVGPatternElementAttributes;
   ['SVGPolygonElement']: SVGPolygonElementAttributes;
   ['SVGPolylineElement']: SVGPolylineElementAttributes;
   ['SVGRadialGradientElement']: SVGRadialGradientElementAttributes;
   ['SVGRectElement']: SVGRectElementAttributes;
+  ['SVGSVGElement']: SVGSVGElementAttributes;
   ['SVGScriptElement']: SVGScriptElementAttributes;
   ['SVGSetElement']: SVGSetElementAttributes;
   ['SVGStopElement']: SVGStopElementAttributes;
   ['SVGStyleElement']: SVGStyleElementAttributes;
-  ['SVGSVGElement']: SVGSVGElementAttributes;
   ['SVGSwitchElement']: SVGSwitchElementAttributes;
   ['SVGSymbolElement']: SVGSymbolElementAttributes;
+  ['SVGTSpanElement']: SVGTSpanElementAttributes;
   ['SVGTextElement']: SVGTextElementAttributes;
   ['SVGTextPathElement']: SVGTextPathElementAttributes;
   ['SVGTitleElement']: SVGTitleElementAttributes;
-  ['SVGTSpanElement']: SVGTSpanElementAttributes;
   ['SVGUseElement']: SVGUseElementAttributes;
   ['SVGViewElement']: SVGViewElementAttributes;
-  ['SVGElement']: GlobalSVGAttributes;
 }
 }

package/-private/dsl/lib.dom.augmentation.d.ts

@@ -1,53 +1,49 @@
-// generated by <Glint root>/bin/build-augmentations.mjs
+// Auto-generated by bin/build-augmentations.mjs
 //
-// This serves to provide a UNIQUE mapping for HtmlElementType -> Html Element Name -> Html Element Attributes
+// This serves to provide a UNIQUE mapping for element type -> element name -> element attributes
 //   (in combination with elements.d.ts)
-// 
-// The TypeScript lib.dom.d.ts already has HTMLElementTagNameMap, 
+//
+// The TypeScript lib.dom.d.ts already has HTMLElementTagNameMap,
 // but it does not provide unique types for each element, and the technique
 // we use for looking up the type-string for each element does not work with the built in types.
 
-export interface GlintElementRegistry {
-  'SVGElement': SVGElement;
+export type HTMLElementMap = {
   'HTMLAnchorElement': HTMLAnchorElement;
-  'HTMLElement': HTMLElement;
   'HTMLAreaElement': HTMLAreaElement;
   'HTMLAudioElement': HTMLAudioElement;
+  'HTMLBRElement': HTMLBRElement;
   'HTMLBaseElement': HTMLBaseElement;
-  'HTMLQuoteElement': HTMLQuoteElement;
   'HTMLBodyElement': HTMLBodyElement;
-  'HTMLBRElement': HTMLBRElement;
   'HTMLButtonElement': HTMLButtonElement;
   'HTMLCanvasElement': HTMLCanvasElement;
-  'HTMLTableCaptionElement': HTMLTableCaptionElement;
-  'HTMLTableColElement': HTMLTableColElement;
+  'HTMLDListElement': HTMLDListElement;
   'HTMLDataElement': HTMLDataElement;
   'HTMLDataListElement': HTMLDataListElement;
-  'HTMLModElement': HTMLModElement;
   'HTMLDetailsElement': HTMLDetailsElement;
   'HTMLDialogElement': HTMLDialogElement;
   'HTMLDivElement': HTMLDivElement;
-  'HTMLDListElement': HTMLDListElement;
+  'HTMLElement': HTMLElement;
   'HTMLEmbedElement': HTMLEmbedElement;
   'HTMLFieldSetElement': HTMLFieldSetElement;
   'HTMLFormElement': HTMLFormElement;
-  'HTMLHeadingElement': HTMLHeadingElement;
-  'HTMLHeadElement': HTMLHeadElement;
   'HTMLHRElement': HTMLHRElement;
+  'HTMLHeadElement': HTMLHeadElement;
+  'HTMLHeadingElement': HTMLHeadingElement;
   'HTMLHtmlElement': HTMLHtmlElement;
   'HTMLIFrameElement': HTMLIFrameElement;
   'HTMLImageElement': HTMLImageElement;
   'HTMLInputElement': HTMLInputElement;
+  'HTMLLIElement': HTMLLIElement;
   'HTMLLabelElement': HTMLLabelElement;
   'HTMLLegendElement': HTMLLegendElement;
-  'HTMLLIElement': HTMLLIElement;
   'HTMLLinkElement': HTMLLinkElement;
   'HTMLMapElement': HTMLMapElement;
   'HTMLMenuElement': HTMLMenuElement;
   'HTMLMetaElement': HTMLMetaElement;
   'HTMLMeterElement': HTMLMeterElement;
-  'HTMLObjectElement': HTMLObjectElement;
+  'HTMLModElement': HTMLModElement;
   'HTMLOListElement': HTMLOListElement;
+  'HTMLObjectElement': HTMLObjectElement;
   'HTMLOptGroupElement': HTMLOptGroupElement;
   'HTMLOptionElement': HTMLOptionElement;
   'HTMLOutputElement': HTMLOutputElement;
@@ -55,23 +51,29 @@ export interface GlintElementRegistry {
   'HTMLPictureElement': HTMLPictureElement;
   'HTMLPreElement': HTMLPreElement;
   'HTMLProgressElement': HTMLProgressElement;
+  'HTMLQuoteElement': HTMLQuoteElement;
   'HTMLScriptElement': HTMLScriptElement;
   'HTMLSelectElement': HTMLSelectElement;
   'HTMLSlotElement': HTMLSlotElement;
   'HTMLSourceElement': HTMLSourceElement;
   'HTMLSpanElement': HTMLSpanElement;
   'HTMLStyleElement': HTMLStyleElement;
+  'HTMLTableCaptionElement': HTMLTableCaptionElement;
+  'HTMLTableCellElement': HTMLTableCellElement;
+  'HTMLTableColElement': HTMLTableColElement;
   'HTMLTableElement': HTMLTableElement;
+  'HTMLTableRowElement': HTMLTableRowElement;
   'HTMLTableSectionElement': HTMLTableSectionElement;
-  'HTMLTableCellElement': HTMLTableCellElement;
   'HTMLTemplateElement': HTMLTemplateElement;
   'HTMLTextAreaElement': HTMLTextAreaElement;
   'HTMLTimeElement': HTMLTimeElement;
   'HTMLTitleElement': HTMLTitleElement;
-  'HTMLTableRowElement': HTMLTableRowElement;
   'HTMLTrackElement': HTMLTrackElement;
   'HTMLUListElement': HTMLUListElement;
   'HTMLVideoElement': HTMLVideoElement;
+};
+
+export type SVGElementMap = {
   'SVGAElement': SVGAElement;
   'SVGAnimateElement': SVGAnimateElement;
   'SVGAnimateMotionElement': SVGAnimateMotionElement;
@@ -80,6 +82,7 @@ export interface GlintElementRegistry {
   'SVGClipPathElement': SVGClipPathElement;
   'SVGDefsElement': SVGDefsElement;
   'SVGDescElement': SVGDescElement;
+  'SVGElement': SVGElement;
   'SVGEllipseElement': SVGEllipseElement;
   'SVGFEBlendElement': SVGFEBlendElement;
   'SVGFEColorMatrixElement': SVGFEColorMatrixElement;
@@ -112,27 +115,27 @@ export interface GlintElementRegistry {
   'SVGImageElement': SVGImageElement;
   'SVGLineElement': SVGLineElement;
   'SVGLinearGradientElement': SVGLinearGradientElement;
+  'SVGMPathElement': SVGMPathElement;
   'SVGMarkerElement': SVGMarkerElement;
   'SVGMaskElement': SVGMaskElement;
   'SVGMetadataElement': SVGMetadataElement;
-  'SVGMPathElement': SVGMPathElement;
   'SVGPathElement': SVGPathElement;
   'SVGPatternElement': SVGPatternElement;
   'SVGPolygonElement': SVGPolygonElement;
   'SVGPolylineElement': SVGPolylineElement;
   'SVGRadialGradientElement': SVGRadialGradientElement;
   'SVGRectElement': SVGRectElement;
+  'SVGSVGElement': SVGSVGElement;
   'SVGScriptElement': SVGScriptElement;
   'SVGSetElement': SVGSetElement;
   'SVGStopElement': SVGStopElement;
   'SVGStyleElement': SVGStyleElement;
-  'SVGSVGElement': SVGSVGElement;
   'SVGSwitchElement': SVGSwitchElement;
   'SVGSymbolElement': SVGSymbolElement;
+  'SVGTSpanElement': SVGTSpanElement;
   'SVGTextElement': SVGTextElement;
   'SVGTextPathElement': SVGTextPathElement;
   'SVGTitleElement': SVGTitleElement;
-  'SVGTSpanElement': SVGTSpanElement;
   'SVGUseElement': SVGUseElement;
   'SVGViewElement': SVGViewElement;
-}
+};

package/-private/dsl/types.d.ts

@@ -1,28 +1,6 @@
 import './elements';
 import { AttrValue } from '../index';
-import { GlintElementRegistry } from './lib.dom.augmentation';
-
-type Registry = GlintElementRegistry;
-
-/**
- * This doesn't generate _totally_ unique mappings, but they all have the same attributes.
- *
- * For example, given T = HTMLDivElement,
- * we get back:
- *   - "HTMLTableCaptionElement"
- *     | "HTMLDivElement"
- *     | "HTMLHeadingElement"
- *     | "HTMLParagraphElement"
- *
- * And for the purposes of attribute lookup, that's good enough.
- */
-type Lookup<T> = {
-  [K in keyof Registry]: [Registry[K]] extends [T] // check assignability in one direction
-    ? [T] extends [Registry[K]] // and in the other
-      ? K // if both true, exact match
-      : never
-    : never;
-}[keyof Registry];
+import type { HTMLElementMap, SVGElementMap } from './lib.dom.augmentation';
 
 /**
  * A utility for constructing the type of an environment's `resolveOrReturn` from
@@ -45,15 +23,38 @@ export type SVGElementForTagName<Name extends string> = Name extends keyof SVGEl
 export type MathMlElementForTagName<Name extends string> =
   Name extends keyof MathMLElementTagNameMap ? MathMLElementTagNameMap[Name] : Element;
 
+/**
+ * This doesn't generate _totally_ unique mappings, but they all have the same attributes.
+ *
+ * For example, given T = HTMLDivElement,
+ * we get back:
+ *   - "HTMLTableCaptionElement"
+ *     | "HTMLDivElement"
+ *     | "HTMLHeadingElement"
+ *     | "HTMLParagraphElement"
+ *
+ * And for the purposes of attribute lookup, that's good enough.
+ */
+type HTMLElementLookup<T> = {
+  [K in keyof HTMLElementMap]: T extends HTMLElementMap[K]
+    ? HTMLElementMap[K] extends T
+      ? K
+      : never
+    : never;
+}[keyof HTMLElementMap];
+
+type SVGElementLookup<T> = {
+  [K in keyof SVGElementMap]: T extends SVGElementMap[K]
+    ? SVGElementMap[K] extends T
+      ? K
+      : never
+    : never;
+}[keyof SVGElementMap];
+
 type WithDataAttributes<T> = T & Record<`data-${string}`, AttrValue>;
 
-export type AttributesForElement<Elem extends Element, K = Lookup<Elem>> =
-  // Is K in the HTML attributes map?
-  K extends keyof GlintHtmlElementAttributesMap
-    ? WithDataAttributes<GlintHtmlElementAttributesMap[K]>
-    : // Or is K in the SVG attributes map?
-      K extends keyof GlintSvgElementAttributesMap
-      ? WithDataAttributes<GlintSvgElementAttributesMap[K]>
-      : // If the element can't be found: fallback to just allow general AttrValue
-        // NOTE: MathML has no attributes
-        Record<string, AttrValue>;
+export type AttributesForElement<T extends Element> = T extends HTMLElement
+  ? WithDataAttributes<GlintHtmlElementAttributesMap[HTMLElementLookup<T>]>
+  : T extends SVGElement
+    ? WithDataAttributes<GlintSvgElementAttributesMap[SVGElementLookup<T>]>
+    : Record<string, AttrValue>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glint/template",
-  "version": "1.7.2-unstable.3f50b40",
+  "version": "1.7.3-unstable.07406b3",
   "repository": "typed-ember/glint",
   "description": "Type definitions to back typechecking for Glimmer templates",
   "license": "MIT",