fix: use generic return type

yeoman · May 8, 2023 · e0ab6d4 · e0ab6d4
1 parent 23d5c27
commit e0ab6d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/workspaces/types/types/generator/generator.d.ts b/workspaces/types/types/generator/generator.d.ts
@@ -1,6 +1,6 @@
 import type { BaseEnvironment } from '../environment/environment.js';
-import type { GeneratorCustomFeatures, GeneratorFeatures } from './generator-features.js';
-import type { GeneratorCustomOptions, GeneratorOptions } from './generator-options.js';
+import type { GeneratorFeatures } from './generator-features.js';
+import type { GeneratorOptions } from './generator-options.js';
 
 export type EnvironmentGenerator = {
   readonly env: BaseEnvironment;

diff --git a/workspaces/types/types/generator/utils.d.ts b/workspaces/types/types/generator/utils.d.ts
@@ -5,5 +5,5 @@ export type GetGeneratorOptions<T extends BaseGenerator = BaseGenerator> = T ext
 export type GetGeneratorFeatures<T extends BaseGenerator = BaseGenerator> = T extends BaseGenerator<any, infer features> ? features : never;
 
 export type GetGeneratorConstructor<T extends BaseGenerator = BaseGenerator> =
-  | (new (args: string[], options: GetGeneratorOptions<T>, features: GetGeneratorFeatures<T>) => BaseGenerator)
-  | (new (options: GetGeneratorOptions<T>, features: GetGeneratorFeatures<T>) => BaseGenerator);
+  | (new (args: string[], options: GetGeneratorOptions<T>, features: GetGeneratorFeatures<T>) => T)
+  | (new (options: GetGeneratorOptions<T>, features: GetGeneratorFeatures<T>) => T);