yeoman-test 7.1.0 → 7.2.0

package/dist/helpers.d.ts

@@ -9,7 +9,7 @@ import type { RunContextSettings } from './run-context.js';
 /**
  * Dependencies can be path (autodiscovery) or an array [<generator>, <name>]
  */
-export type Dependency = string | Parameters<Environment['registerStub']>;
+export type Dependency = string | Parameters<Environment['registerStub']> | Parameters<Environment['register']>;
 type GeneratorNew<GenParameter extends YeomanGenerator = YeomanGenerator> = new (...args: ConstructorParameters<typeof YeomanGenerator<GenParameter['options']>>) => YeomanGenerator<GenParameter['options']>;
 type GeneratorBuilder<GenParameter extends YeomanGenerator = YeomanGenerator> = (...args: ConstructorParameters<typeof YeomanGenerator<GenParameter['options']>>) => YeomanGenerator<GenParameter['options']>;
 export type GeneratorConstructor<GenParameter extends YeomanGenerator = YeomanGenerator> = GeneratorNew<GenParameter> | GeneratorBuilder<GenParameter>;

package/dist/helpers.js

@@ -168,7 +168,12 @@ export class YeomanTest {
     registerDependencies(env, dependencies) {
         for (const dependency of dependencies) {
             if (Array.isArray(dependency)) {
-                env.registerStub(dependency[0], dependency[1]);
+                if (typeof dependency[0] === 'string') {
+                    env.register(...dependency);
+                }
+                else {
+                    env.registerStub(...dependency);
+                }
             }
             else {
                 env.register(dependency);

package/dist/run-context.d.ts

@@ -31,7 +31,7 @@ export type RunContextSettings = {
     namespace?: string;
 };
 type PromiseRunResult<GeneratorType extends Generator> = Promise<RunResult<GeneratorType>>;
-export declare class RunContextBase<GeneratorType extends Generator> extends EventEmitter {
+export declare class RunContextBase<GeneratorType extends Generator = Generator> extends EventEmitter {
     readonly mockedGenerators: Record<string, Generator>;
     env: Environment;
     generator: GeneratorType;
@@ -54,6 +54,7 @@ export declare class RunContextBase<GeneratorType extends Generator> extends Eve
     private oldCwd?;
     private eventListenersSet;
     private envCB;
+    private built;
     private ran;
     private errored;
     /**

package/dist/run-context.js

@@ -32,6 +32,7 @@ export class RunContextBase extends EventEmitter {
     oldCwd;
     eventListenersSet = false;
     envCB;
+    built = false;
     ran = false;
     errored = false;
     /**
@@ -47,14 +48,9 @@ export class RunContextBase extends EventEmitter {
     constructor(generatorType, settings, envOptions = {}, helpers = defaultHelpers) {
         super();
         this.settings = {
-            namespace: 'gen:test',
             ...settings,
         };
         this.Generator = generatorType;
-        if (typeof generatorType !== 'string') {
-            const { namespace, resolved } = this.settings;
-            this.withGenerators([[generatorType, namespace, resolved]]);
-        }
         this.envOptions = envOptions;
         this.withOptions({
             force: true,
@@ -72,7 +68,8 @@ export class RunContextBase extends EventEmitter {
      * @return {PromiseRunResult} Promise a RunResult instance.
      */
     async run() {
-        if (!this.ran) {
+        this.ran = true;
+        if (!this.built) {
             await this.build();
         }
         try {
@@ -288,13 +285,20 @@ export class RunContextBase extends EventEmitter {
      */
     withGenerators(dependencies) {
         assert(Array.isArray(dependencies), 'dependencies should be an array');
-        return this.onEnvironment(env => {
+        return this.onEnvironment(async (env) => {
             for (const dependency of dependencies) {
                 if (Array.isArray(dependency)) {
-                    env.registerStub(...dependency);
+                    if (typeof dependency[0] === 'string') {
+                        // eslint-disable-next-line no-await-in-loop, @typescript-eslint/await-thenable
+                        await env.register(...dependency);
+                    }
+                    else {
+                        env.registerStub(...dependency);
+                    }
                 }
                 else {
-                    env.register(dependency);
+                    // eslint-disable-next-line no-await-in-loop, @typescript-eslint/await-thenable
+                    await env.register(dependency);
                 }
             }
         });
@@ -397,7 +401,7 @@ export class RunContextBase extends EventEmitter {
         return this;
     }
     assertNotBuild() {
-        if (this.ran || this.completed) {
+        if (this.built || this.completed) {
             throw new Error('The context is already built');
         }
     }
@@ -407,7 +411,7 @@ export class RunContextBase extends EventEmitter {
      */
     async build() {
         this.assertNotBuild();
-        this.ran = true;
+        this.built = true;
         if (!this.targetDirectory && this.settings.tmpdir !== false) {
             this.inTmpDir();
         }
@@ -439,13 +443,14 @@ export class RunContextBase extends EventEmitter {
             // eslint-disable-next-line no-await-in-loop
             await onEnvironmentCallback.call(this, this.env);
         }
-        let { namespace } = this.settings;
-        if (typeof this.Generator === 'string') {
-            namespace = this.env.namespace(this.Generator);
-            if (namespace !== this.Generator) {
-                // Generator is a file path, it should be registered.
-                this.env.register(this.Generator);
-            }
+        const { namespace = typeof this.Generator === 'string' ? this.env.namespace(this.Generator) : 'gen:test' } = this.settings;
+        if (typeof this.Generator === 'string' && namespace !== this.Generator) {
+            // Generator is a file path, it should be registered.
+            this.env.register(this.Generator, namespace);
+        }
+        else if (typeof this.Generator !== 'string') {
+            const { resolved } = this.settings;
+            this.env.registerStub(this.Generator, namespace, resolved);
         }
         // eslint-disable-next-line @typescript-eslint/await-thenable
         this.generator = (await this.env.create(namespace, this.args, this.options));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-test",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Test utilities for Yeoman generators",
   "homepage": "http://yeoman.io/authoring/testing.html",
   "author": "The Yeoman Team",