@glint/template 0.7.5 → 0.9.0

package/-private/index.d.ts

@@ -2,11 +2,11 @@ import {
   AcceptsBlocks,
   AnyFunction,
   BoundModifier,
-  EmptyObject,
+  GuardEmpty,
   FlattenBlockParams,
   Invokable,
 } from './integration';
-import { ExpandSignature } from '@glimmer/component/dist/types/addon/-private/component';
+import { ExpandSignature } from '@glimmer/component/-private/component';
 
 /**
  * A value that is invokable like a component in a template. In an
@@ -14,12 +14,12 @@ import { ExpandSignature } from '@glimmer/component/dist/types/addon/-private/co
  * `GlimmerComponent` are examples of `ComponentLike` values, as are
  * the values returned from the `{{component}}` helper.
  *
- * The `S` signature paramter here is of the same form as the one
+ * The `S` signature parameter here is of the same form as the one
  * accepted by both the Ember and Glimmer `Component` base classes.
  */
 export type ComponentLike<S = unknown> = InvokableConstructor<
   (
-    named: ExpandSignature<S>['Args']['Named'],
+    named: GuardEmpty<ExpandSignature<S>['Args']['Named']>,
     ...positional: ExpandSignature<S>['Args']['Positional']
   ) => AcceptsBlocks<
     FlattenBlockParams<ExpandSignature<S>['Blocks']>,
@@ -89,7 +89,7 @@ export type WithBoundArgs<
 >
   ? InvokableConstructor<
       (
-        named: Omit<Named, BoundArgs> & Partial<Pick<Named, BoundArgs & keyof Named>>,
+        named: GuardEmpty<Omit<Named, BoundArgs> & Partial<Pick<Named, BoundArgs & keyof Named>>>,
         ...positional: Positional
       ) => Result
     >
@@ -109,6 +109,6 @@ type Constrain<T, Constraint, Otherwise = Constraint> = T extends Constraint ? T
 // different layers of possible shorthand, but modifiers and helpers only have
 // one structure they can specify their args in, so this utility is sufficient.
 type InvokableArgs<S> = [
-  named: Get<Get<S, 'Args'>, 'Named', EmptyObject>,
+  named: GuardEmpty<Get<Get<S, 'Args'>, 'Named'>>,
   ...positional: Constrain<Get<Get<S, 'Args'>, 'Positional'>, Array<unknown>, []>
 ];

package/-private/integration.d.ts

@@ -25,6 +25,7 @@ export type HasContext<T extends AnyContext = AnyContext> = { [Context]: T };
 // special-cased in the type system not to trigger EPC.
 declare const EmptyObject: unique symbol;
 export type EmptyObject = { [EmptyObject]?: void };
+export type GuardEmpty<T> = T extends any ? (keyof T extends never ? EmptyObject : T) : never;
 
 declare const Element: unique symbol;
 declare const Modifier: unique symbol;
@@ -53,16 +54,10 @@ export type TemplateContext<This, Args, Yields, Element> = {
   element: Element;
 };
 
-// This is a workaround for the fact that @glimmer/component initially shipped
-// with a bug that causes blocks to expand as `{ default: { Positional: [] } }` rather
-// thatn `{ default: { Params: { Positional: [] } } }`. Once a fix is released,
-// we can require at least that version starting in Glint 0.8 and drop this wrapper.
-type MaybeBlockParams<T> = T | { Params: T };
-
 /**
  * Flattens the fully expanded signature format for Blocks down to a mapping from
  * each block name to a corresponding tuple of parameter types.
  */
 export type FlattenBlockParams<T> = {
-  [K in keyof T]: T[K] extends MaybeBlockParams<{ Positional: infer U }> ? U : T[K];
+  [K in keyof T]: T[K] extends { Params: { Positional: infer U } } ? U : T[K];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glint/template",
-  "version": "0.7.5",
+  "version": "0.9.0",
   "repository": "typed-ember/glint",
   "description": "Type definitions to back typechecking for Glimmer templates",
   "license": "MIT",
@@ -15,10 +15,13 @@
     "-private",
     "*.d.ts"
   ],
+  "peerDependencies": {
+    "@glimmer/component": "^1.1.2"
+  },
   "devDependencies": {
-    "@glimmer/component": "^1.1.0",
+    "@glimmer/component": "^1.1.2",
     "@glimmerx/component": "^0.4.2",
-    "@types/ember__component": "~4.0.0",
+    "@types/ember__component": "~4.0.8",
     "expect-type": "0.11.0",
     "sums-up": "^2.1.0"
   },