improve types

package.json

@@ -67,7 +67,8 @@
     "semver": "^7.5.4",
     "simple-git": "^3.20.0",
     "sort-keys": "^5.0.0",
-    "text-table": "^0.2.0"
+    "text-table": "^0.2.0",
+    "type-fest": "^4.26.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.9",

src/actions/lifecycle.ts

@@ -455,12 +455,12 @@ export abstract class TasksMixin {
   async composeWith<G extends BaseGenerator = BaseGenerator>(generator: string[], immediately?: boolean): Promise<G[]>;
   async composeWith<G extends BaseGenerator = BaseGenerator>(
     generator: string | { Generator: any; path: string },
-    options: Partial<GetGeneratorOptions<G>>,
+    options: { generatorOptions: never; generatorArgs: never } & Partial<GetGeneratorOptions<G>>,
     immediately?: boolean,
   ): Promise<G>;
   async composeWith<G extends BaseGenerator = BaseGenerator>(
     generator: string[],
-    options: Partial<GetGeneratorOptions<G>>,
+    options: { generatorOptions: never; generatorArgs: never } & Partial<GetGeneratorOptions<G>>,
     immediately?: boolean,
   ): Promise<G[]>;
   async composeWith<G extends BaseGenerator = BaseGenerator>(
@@ -475,9 +475,10 @@ export abstract class TasksMixin {
     options?: Partial<GetGeneratorOptions<G>>,
     immediately?: boolean,
   ): Promise<G[]>;
-  async composeWith<G extends BaseGenerator = BaseGenerator>(
+  async composeWith<const G extends BaseGenerator = BaseGenerator>(
+    this: G,
     generator: string,
-    options?: ComposeOptions<G>,
+    options: ComposeOptions<G>,
   ): Promise<G[]>;
 
   async composeWith<G extends BaseGenerator = BaseGenerator>(

src/types.d.ts

@@ -2,9 +2,11 @@ import type {
   BaseGenerator,
   ComposeOptions as EnvironmentComposeOptions,
   GeneratorFeatures as FeaturesApi,
+  GetGeneratorOptions,
   GeneratorOptions as OptionsApi,
   ProgressOptions,
 } from '@yeoman/types';
+import type { Simplify } from 'type-fest';
 import type { JSONSchema7Type } from 'json-schema';
 import type { PipelineOptions } from 'mem-fs';
 import type { MemFsEditorFile } from 'mem-fs-editor';
@@ -174,9 +176,15 @@ export type CliOptionSpec = {
   storage?: string | Storage;
 };
 
-export type ComposeOptions<G extends BaseGenerator = BaseGenerator> = EnvironmentComposeOptions<G> & {
-  destinationRoot?: string;
-  skipEnvRegister?: boolean;
-  forceResolve?: boolean;
-  forwardOptions?: boolean;
-};
+export type ComposeOptions<G extends BaseGenerator = BaseGenerator> = Simplify<
+    EnvironmentComposeOptions<G> &
+    {
+      generatorOptions?: {
+        destinationRoot?: string;
+      } & Partial<GetGeneratorOptions<G>>;
+      skipEnvRegister?: boolean;
+      forceResolve?: boolean;
+      forwardOptions?: boolean;
+    }
+
+>;