@glint/template 0.6.0 → 0.7.0

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

@@ -1,4 +1,5 @@
-import { DirectInvokable, EmptyObject, Invokable, Invoke, InvokeDirect } from '../integration';
+import { DirectInvokable, Invokable, Invoke, InvokeDirect } from '../integration';
+import { ResolveOrReturn } from './types';
 
 /*
  * We have multiple ways of representing invokable values, dictated by certain constraints
@@ -45,8 +46,4 @@ export declare function resolve<Args extends unknown[], Instance extends Invokab
  * value of the appropriate type.
  */
 
-export declare function resolveOrReturn<T extends DirectInvokable>(item: T): T[typeof InvokeDirect];
-export declare function resolveOrReturn<Args extends unknown[], Instance extends Invokable>(
-  item: (new (...args: Args) => Instance) | null | undefined
-): (...args: Parameters<Instance[typeof Invoke]>) => ReturnType<Instance[typeof Invoke]>;
-export declare function resolveOrReturn<T>(item: T): (args: EmptyObject) => T;
+export declare const resolveOrReturn: ResolveOrReturn<typeof resolve>;

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

@@ -1,7 +1,13 @@
-import { HasContext } from '@glint/template/-private/integration';
+import { EmptyObject, HasContext } from '@glint/template/-private/integration';
 
 type Constructor<T> = new (...args: any) => T;
 
+/**
+ * A utility for constructing the type of an environment's `resolveOrReturn` from
+ * the type of its `resolve` function.
+ */
+export type ResolveOrReturn<T> = T & (<U>(item: U) => (args: EmptyObject) => U);
+
 /**
  * Given a tag name, returns an appropriate `Element` subtype.
  * NOTE: This will return a union for elements that exist both in HTML and SVG. Technically, this will be too permissive.
@@ -15,10 +21,14 @@ export type ElementForTagName<Name extends string> = Name extends keyof HTMLElem
   : Element;
 
 /**
- * Given the instance type of a component backing class, produces the appropriate
+ * Given the constructor or instance type of a component backing class, produces the appropriate
  * `TemplateContext` type for its template.
  */
-export type ResolveContext<T> = T extends HasContext<infer Context> ? Context : unknown;
+export type ResolveContext<T> = T extends HasContext<infer Context>
+  ? Context
+  : T extends Constructor<HasContext<infer Context>>
+  ? Context
+  : unknown;
 
 // This encompasses both @glimmer/runtime and @ember/template's notion of `SafeString`s,
 // and this coverage is tested in `emit-value.test.ts`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glint/template",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "repository": "typed-ember/glint",
   "description": "Type definitions to back typechecking for Glimmer templates",
   "license": "MIT",
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@glimmer/component": "^1.0.2",
     "@glimmerx/component": "^0.4.2",
-    "@types/ember__component": "~3.0.7",
+    "@types/ember__component": "~4.0.0",
     "expect-type": "0.11.0",
     "sums-up": "^2.1.0"
   },