yeoman-test 11.4.2 → 11.5.1

package/dist/helpers.d.ts

@@ -21,7 +21,7 @@ export type Dependency = string | Parameters<DefaultEnvironmentApi['register']>;
 export declare class YeomanTest {
     settings?: RunContextSettings;
     environmentOptions?: EnvironmentOptions;
-    generatorOptions?: GeneratorOptions;
+    generatorOptions?: Partial<Omit<GeneratorOptions, 'env' | 'resolved' | 'namespace'>>;
     adapterOptions?: Omit<TestAdapterOptions, 'mockedAnswers'>;
     defaultGenerator?: string;
     importMeta?: Pick<ImportMeta, 'resolve'>;
@@ -136,21 +136,22 @@ export declare class YeomanTest {
      * @return {RunContext}
      */
     getRunContextType(): typeof RunContext;
+    createRunContext<GeneratorType extends BaseGenerator = DefaultGeneratorApi>(GeneratorOrNamespace: string | GetGeneratorConstructor<GeneratorType>, settings?: RunContextSettings, environmentOptions?: EnvironmentOptions): RunContext<GeneratorType>;
     /**
      * Run the provided Generator
      * @param GeneratorOrNamespace - Generator constructor or namespace
      */
-    run<GeneratorType extends BaseGenerator = DefaultGeneratorApi>(GeneratorOrNamespace: string | GetGeneratorConstructor<GeneratorType>, settings?: RunContextSettings, environmentOptions?: EnvironmentOptions): RunContext<GeneratorType>;
+    run<GeneratorType extends BaseGenerator = DefaultGeneratorApi>(GeneratorOrNamespace: string | GetGeneratorConstructor<GeneratorType>, settings?: RunContextSettings, environmentOptions?: EnvironmentOptions): ReturnType<typeof this.createRunContext<GeneratorType>>;
     /**
      * Run the default generator
      */
-    runDefault<GeneratorType extends BaseGenerator = BaseGenerator>(settings?: RunContextSettings, environmentOptions?: EnvironmentOptions): RunContext<GeneratorType>;
+    runDefault<GeneratorType extends BaseGenerator = BaseGenerator>(settings?: RunContextSettings, environmentOptions?: EnvironmentOptions): ReturnType<typeof this.createRunContext<GeneratorType>>;
     /**
      * Prepare a run context
      * @param  {String|Function} GeneratorOrNamespace - Generator constructor or namespace
      * @return {RunContext}
      */
-    create<GeneratorType extends BaseGenerator = DefaultGeneratorApi>(GeneratorOrNamespace: string | GetGeneratorConstructor<GeneratorType>, settings?: RunContextSettings, environmentOptions?: EnvironmentOptions): RunContext<GeneratorType>;
+    create<GeneratorType extends BaseGenerator = DefaultGeneratorApi>(GeneratorOrNamespace: string | GetGeneratorConstructor<GeneratorType>, settings?: RunContextSettings, environmentOptions?: EnvironmentOptions): ReturnType<typeof this.createRunContext<GeneratorType>>;
     /**
      * Prepare temporary dir without generator support.
      * Generator and environment will be undefined.
@@ -159,4 +160,6 @@ export declare class YeomanTest {
 }
 declare const defaultHelpers: YeomanTest;
 export default defaultHelpers;
-export declare const createHelpers: (options: Partial<YeomanTest>) => YeomanTest;
+export declare const createHelpers: <T extends YeomanTest = YeomanTest>(options: Partial<T> & {
+    factory?: () => T;
+}) => T;

package/dist/helpers.js

@@ -249,6 +249,10 @@ export class YeomanTest {
     getRunContextType() {
         return RunContext;
     }
+    createRunContext(GeneratorOrNamespace, settings, environmentOptions) {
+        const RunContext = this.getRunContextType();
+        return new RunContext(GeneratorOrNamespace, settings, environmentOptions, this);
+    }
     /**
      * Run the provided Generator
      * @param GeneratorOrNamespace - Generator constructor or namespace
@@ -256,7 +260,6 @@ export class YeomanTest {
     run(GeneratorOrNamespace, settings, environmentOptions) {
         const contextSettings = cloneDeep(this.settings ?? {});
         const generatorOptions = cloneDeep(this.generatorOptions ?? {});
-        const RunContext = this.getRunContextType();
         if (typeof GeneratorOrNamespace === 'string') {
             if (GeneratorOrNamespace.startsWith('.')) {
                 if (!this.importMeta) {
@@ -268,7 +271,7 @@ export class YeomanTest {
                 GeneratorOrNamespace = fileURLToPath(GeneratorOrNamespace);
             }
         }
-        const runContext = new RunContext(GeneratorOrNamespace, { ...contextSettings, ...settings }, environmentOptions, this).withOptions(generatorOptions);
+        const runContext = this.createRunContext(GeneratorOrNamespace, { ...contextSettings, ...settings }, environmentOptions).withOptions(generatorOptions);
         if (settings?.autoCleanup !== false) {
             testContext.startNewContext(runContext);
         }
@@ -306,7 +309,8 @@ export class YeomanTest {
 const defaultHelpers = new YeomanTest();
 export default defaultHelpers;
 export const createHelpers = (options) => {
-    const helpers = new YeomanTest();
+    const { factory = () => new YeomanTest() } = options;
+    const helpers = factory();
     Object.assign(helpers, options);
     return helpers;
 };

package/dist/run-context.d.ts

@@ -53,7 +53,7 @@ export declare class RunContextBase<GeneratorType extends BaseGenerator = Defaul
     private args;
     private options;
     private answers?;
-    private readonly adapterOptions?;
+    private readonly adapterOptions;
     private keepFsState?;
     private readonly onGeneratorCallbacks;
     private readonly onTargetDirectoryCallbacks;
@@ -153,7 +153,7 @@ export declare class RunContextBase<GeneratorType extends BaseGenerator = Defaul
      * @param {Function} [cb] - callback who'll receive the folder path as argument
      * @return {this} run context instance
      */
-    withEnvironment(callback: any): this;
+    withEnvironment(callback: (this: this, environment: DefaultEnvironmentApi) => DefaultEnvironmentApi | void): this;
     /**
      * Customize enviroment run method.
      *

package/dist/run-result.d.ts

@@ -44,7 +44,7 @@ export type RunResultOptions<GeneratorType extends BaseGenerator> = {
  * This class provides utilities for testing generated content.
  */
 export default class RunResult<GeneratorType extends BaseGenerator = BaseGenerator> {
-    env: any;
+    env: DefaultEnvironmentApi;
     generator: GeneratorType;
     cwd: string;
     oldCwd: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-test",
-  "version": "11.4.2",
+  "version": "11.5.1",
   "description": "Test utilities for Yeoman generators",
   "keywords": [
     "yeoman",