WIP ugggghhhhh .create()

emberjs · Jun 29, 2023 · 6d08306 · 6d08306
1 parent 1efc0dc
commit 6d08306
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,4 +1,5 @@
 import type {
+  Factory,
   FactoryClass,
   FullName,
   InternalFactory,
@@ -18,18 +19,11 @@ export interface Injection {
   specifier: FullName;
 }
 
-interface ResolverClassFromConstructor {
-  new (...args: any): Resolver;
-}
-
-interface ResolverClassFromCreate {
-  create(...args: unknown[]): Resolver;
-}
-
-export type ResolverClass =
-  | ResolverClassFromConstructor
-  | ResolverClassFromCreate
-  | (ResolverClassFromConstructor & ResolverClassFromCreate);
+export interface ResolverClass
+  extends Factory<Resolver>,
+    Partial<{
+      new (...args: any): Resolver;
+    }> {}
 
 export interface RegistryOptions {
   fallback?: Registry;

diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
@@ -763,14 +763,21 @@ class CoreObject {
     @param [arguments]*
     @public
   */
+  static create<C extends typeof CoreObject>(this: C): InstanceType<C>;
   static create<
     C extends typeof CoreObject,
     I extends InstanceType<C>,
     K extends keyof I,
-    Args extends Array<Partial<Record<K, I[K]>>>
+    Args extends Array<Partial<{ [Key in K]: I[Key] }>>
+  >(this: C, ...args: Args): InstanceType<C> & MergeArray<Args>;
+  static create<
+    C extends typeof CoreObject,
+    I extends InstanceType<C>,
+    K extends keyof I,
+    Args extends Array<Partial<{ [Key in K]: I[Key] }>>
   >(this: C, ...args: Args): InstanceType<C> & MergeArray<Args> {
     let props = args[0];
-    let instance;
+    let instance: InstanceType<C>;
 
     if (props !== undefined) {
       instance = new this(getOwner(props)) as InstanceType<C>;