@glint/template 1.7.5 → 1.7.7

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

@@ -7,7 +7,9 @@ import {
   HasContext,
   InvokableInstance,
   TemplateContext,
+  Invokable,
   NamedArgs,
+  UnwrapNamedArgs,
 } from '../integration';
 import {
   AttributesForElement,
@@ -15,6 +17,7 @@ import {
   MathMlElementForTagName,
   SVGElementForTagName,
 } from './types';
+import { MaybeNamed, PrebindArgs } from '../signature';
 
 /**
  * Used during emit to denote an object literal that corresponds
@@ -173,3 +176,36 @@ export declare function applyModifier(boundModifier: ModifierReturn): void;
  * syntax.
  */
 export declare function noop(value: unknown): void;
+
+/*
+ * Pre-binds named args while preserving generic type parameters (#1068).
+ * Uses Args/T holistic capture instead of Named/Return decomposition.
+ * The keyword's old decomposing overloads validate arg types but erase T;
+ * this function preserves T but doesn't validate. The transform emits both
+ * via a comma expression so errors come from the keyword (mapped) and the
+ * result comes from here (T-preserving).
+ */
+type BindNamedResult<Args, T, GivenNamed> =
+  // Named-only args (required or optional — handles double-currying)
+  Args extends [NamedArgs<infer Named>?]
+    ? (
+        ...named: MaybeNamed<
+          PrebindArgs<NonNullable<Named>, keyof GivenNamed & keyof UnwrapNamedArgs<Named>>
+        >
+      ) => T
+    : // Positional + named args
+      Args extends [...infer Positional, NamedArgs<infer Named>]
+      ? (
+          ...args: [
+            ...Positional,
+            ...MaybeNamed<
+              PrebindArgs<NonNullable<Named>, keyof GivenNamed & keyof UnwrapNamedArgs<Named>>
+            >,
+          ]
+        ) => T
+      : (...args: Args extends unknown[] ? Args : never) => T;
+
+export declare function bindInvokable<Args extends unknown[], T, GivenNamed>(
+  invokable: (...args: Args) => T,
+  named: NamedArgs<GivenNamed>,
+): Invokable<BindNamedResult<Args, T, GivenNamed>>;

package/-private/integration.d.ts

@@ -36,9 +36,14 @@ export type ModifierReturn = { [Modifier]: true };
  * Denotes that the associated entity may be invoked with the given
  * blocks, yielding params of the appropriate type.
  */
+// The original conditional `El extends Element ? El : null` deferred for
+// generic conditional types like `ElementFromTagName<T>` (#610). Replaced
+// with `El extends null ? unknown : El` which only fires for literal null
+// (not conditional types) and converts null → unknown for ComponentLike
+// equivalence.
 export type ComponentReturn<BlockDefs, El = null> = {
   [Blocks]: BlockDefs;
-  [Element]: El extends Element ? El : null;
+  [Element]: El extends null ? unknown : El;
 };
 
 /**

package/-private/signature.d.ts

@@ -44,8 +44,14 @@ export type ComponentSignatureBlocks<S> = S extends { Blocks: infer Blocks }
   : {};
 
 /** Given a component signature `S`, get back the `Element` type. */
+// The original `NonNullable<Element> extends never` check deferred for generic
+// conditional types like ElementFromTagName<T>, collapsing them to unknown
+// (#610). Using `Element extends null` instead only fires for literal null
+// (preserving null → unknown for ComponentLike equivalence) without breaking
+// conditional types — TypeScript can verify the deferred result still extends
+// Element because neither branch of ElementFromTagName<T> is null.
 export type ComponentSignatureElement<S> = S extends { Element: infer Element }
-  ? NonNullable<Element> extends never
+  ? Element extends null
     ? unknown
     : Element
   : unknown;

package/README.md

@@ -4,3 +4,4 @@ This package contains type declarations used by other [glint] packages for perfo
 
 [glint]: https://github.com/typed-ember/glint
 
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glint/template",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "repository": "typed-ember/glint",
   "description": "Type definitions to back typechecking for Glimmer templates",
   "license": "MIT",