Merge pull request #623 from ro0gr/relax-getter-type

relax `getter` types a bit
san650 · Oct 2, 2023 · 1119e05 · 1119e05
2 parents cd28086 + 26b4c57
commit 1119e05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/addon/types.d.ts b/addon/types.d.ts
@@ -94,7 +94,7 @@ declare module 'ember-cli-page-object/extend' {
 declare module 'ember-cli-page-object/macros' {
   import { Component, GetterDescriptor } from 'ember-cli-page-object/-private';
 
-  function getter<P extends Record<string, unknown>, T = any>
+  function getter<P, T = any>
     (body: (this: Component<P>, key: string) => T)
     : GetterDescriptor<T>;
 

diff --git a/test-app/tests/unit/-private/properties/getter-test.ts b/test-app/tests/unit/-private/properties/getter-test.ts
@@ -30,7 +30,7 @@ module('getter', function(hooks) {
   test('executes the passed-in function with the correct context for `this`', async function (this: TestContext, assert) {
     assert.expect(1);
 
-    type Getter<T> = ReturnType<typeof getter<Record<string, unknown>, T>>;
+    type Getter<T> = ReturnType<typeof getter<unknown, T>>;
 
     type Definition = {
       inputValue: Getter<string>,
@@ -59,7 +59,7 @@ module('getter', function(hooks) {
     assert.expect(2);
 
     const page = create({
-      foo: getter(function(key: string) {
+      foo: getter(function(key) {
         assert.equal(key, 'foo');
         return true;
       })
@@ -108,7 +108,7 @@ PageObject: \'page.foo\'`)
     assert.expect(1);
 
     const page = create({
-      foo: getter(function(this: any) {
+      foo: getter(function() {
         findOne(this, '.non-existing-scope');
       }),
     });