{{get}} handles ObjectProxy instances

typed-ember · Mar 31, 2021 · c7cc5c2 · c7cc5c2
1 parent dc80383
commit c7cc5c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/packages/environment-ember-loose/-private/intrinsics/get.d.ts b/packages/environment-ember-loose/-private/intrinsics/get.d.ts
@@ -1,6 +1,8 @@
 import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
+import ObjectProxy from '@ember/object/proxy';
 
 export type GetHelper = DirectInvokable<{
   <T, K extends keyof T>(args: EmptyObject, obj: T, key: K): T[K];
+  <T extends object, K extends keyof T>(args: EmptyObject, obj: ObjectProxy<T>, key: K): T[K];
   (args: EmptyObject, obj: unknown, key: string): unknown;
 }>;
diff --git a/packages/environment-ember-loose/__tests__/intrinsics/get.test.ts b/packages/environment-ember-loose/__tests__/intrinsics/get.test.ts
@@ -1,5 +1,6 @@
 import { expectTypeOf } from 'expect-type';
 import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
+import ObjectProxy from '@ember/object/proxy';
 
 let get = resolve(Globals['get']);
 
@@ -17,3 +18,10 @@ get(
   {},
   'hi'
 );
+
+// Getting a value off an ObjectProxy
+declare const proxiedObject: ObjectProxy<{ name: string }>;
+
+expectTypeOf(get({}, proxiedObject, 'content')).toEqualTypeOf<{ name: string }>();
+expectTypeOf(get({}, proxiedObject, 'name')).toEqualTypeOf<string>();
+expectTypeOf(get({}, proxiedObject, 'unknownKey')).toEqualTypeOf<unknown>();