yeoman-test 8.0.0-beta.1 → 8.0.0-beta.2

package/dist/helpers.d.ts

@@ -1,4 +1,4 @@
-import type { BaseEnvironmentOptions, BaseGenerator, BaseGeneratorOptions, GetGeneratorConstructor, GetGeneratorOptions, PromptAnswers } from '@yeoman/types';
+import type { BaseEnvironment, BaseEnvironmentOptions, BaseGenerator, BaseGeneratorOptions, GetGeneratorConstructor, GetGeneratorOptions, PromptAnswers } from '@yeoman/types';
 import type { SinonSpiedInstance } from 'sinon';
 import { type DummyPromptOptions } from './adapter.js';
 import RunContext, { BasicRunContext, type RunContextSettings } from './run-context.js';
@@ -6,7 +6,7 @@ import type { DefaultEnvironmentApi, DefaultGeneratorApi } from './type-helpers.
 /**
  * Dependencies can be path (autodiscovery) or an array [<generator>, <name>]
  */
-export type Dependency = string | Parameters<DefaultEnvironmentApi['registerStub']>;
+export type Dependency = Parameters<DefaultEnvironmentApi['register']> | Parameters<DefaultEnvironmentApi['registerStub']>;
 export type GeneratorFactory<GenParameter extends BaseGenerator = DefaultGeneratorApi> = GetGeneratorConstructor<GenParameter> | ((...args: ConstructorParameters<GetGeneratorConstructor<GenParameter>>) => GenParameter);
 /**
  * Collection of unit test helpers. (mostly related to Mocha syntax)
@@ -66,11 +66,11 @@ export declare class YeomanTest {
     /**
      * Create a mocked generator
      */
-    createMockedGenerator(GeneratorClass: any): Promise<SinonSpiedInstance<DefaultGeneratorApi>>;
+    createMockedGenerator(GeneratorClass?: any): SinonSpiedInstance<DefaultGeneratorApi>;
     /**
      * Create a simple, dummy generator
      */
-    createDummyGenerator<GenParameter extends BaseGenerator = DefaultGeneratorApi>(Generator?: GetGeneratorConstructor<GenParameter>, contents?: Record<string, (...args: any[]) => void>): Promise<new (...args: any[]) => GenParameter>;
+    createDummyGenerator<GenParameter extends BaseGenerator = DefaultGeneratorApi>(Generator?: GetGeneratorConstructor<GenParameter>, contents?: Record<string, (...args: any[]) => void>): new (...args: any[]) => GenParameter;
     /**
      * Create a generator, using the given dependencies and controller arguments
      * Dependecies can be path (autodiscovery) or an array [{generator}, {name}]
@@ -122,7 +122,7 @@ export declare class YeomanTest {
      * @param {Object} - Options to be passed to the environment
      * const env = createTestEnv(require('yeoman-environment').createEnv);
      */
-    createTestEnv(envContructor?: (...args: any[]) => Promise<import("@yeoman/types").BaseEnvironment>, options?: BaseEnvironmentOptions): Promise<import("@yeoman/types").BaseEnvironment>;
+    createTestEnv(envContructor?: (...args: any[]) => Promise<BaseEnvironment>, options?: BaseEnvironmentOptions): Promise<BaseEnvironment>;
     /**
      * Get RunContext type
      * @return {RunContext}

package/dist/helpers.js

@@ -7,6 +7,12 @@ import { spy as sinonSpy, stub as sinonStub } from 'sinon';
 import { DummyPrompt, TestAdapter } from './adapter.js';
 import RunContext, { BasicRunContext } from './run-context.js';
 import testContext from './test-context.js';
+let GeneratorImplementation;
+try {
+    const GeneratorImport = await import('yeoman-generator');
+    GeneratorImplementation = GeneratorImport.default ?? GeneratorImport;
+}
+catch { }
 const { cloneDeep } = _;
 /**
  * Collection of unit test helpers. (mostly related to Mocha syntax)
@@ -107,11 +113,7 @@ export class YeomanTest {
     /**
      * Create a mocked generator
      */
-    async createMockedGenerator(GeneratorClass) {
-        if (!GeneratorClass) {
-            const GeneratorImplementation = await import('yeoman-generator');
-            GeneratorClass = (GeneratorImplementation.default ?? GeneratorImplementation);
-        }
+    createMockedGenerator(GeneratorClass = GeneratorImplementation) {
         class MockedGenerator extends GeneratorClass {
         }
         const generator = sinonSpy(MockedGenerator);
@@ -125,17 +127,12 @@ export class YeomanTest {
     /**
      * Create a simple, dummy generator
      */
-    async createDummyGenerator(Generator, contents = {
+    createDummyGenerator(Generator = GeneratorImplementation, contents = {
         test() {
             this.shouldRun = true;
         },
     }) {
-        if (!Generator) {
-            const GeneratorImplementation = await import('yeoman-generator');
-            Generator = (GeneratorImplementation.default ?? GeneratorImplementation);
-        }
-        const GeneratorConstructor = Generator;
-        class DummyGenerator extends GeneratorConstructor {
+        class DummyGenerator extends Generator {
             constructor(...args) {
                 const optIndex = Array.isArray(args[0]) ? 1 : 0;
                 args[optIndex] = args[optIndex] ?? {};

package/dist/run-context.d.ts

@@ -33,7 +33,7 @@ export type RunContextSettings = {
     namespace?: string;
 };
 type PromiseRunResult<GeneratorType extends BaseGenerator> = Promise<RunResult<GeneratorType>>;
-type MockedGeneratorFactory<GenParameter extends BaseGenerator = DefaultGeneratorApi> = (GeneratorClass?: GetGeneratorConstructor<GenParameter>) => Promise<GenParameter>;
+type MockedGeneratorFactory<GenParameter extends BaseGenerator = DefaultGeneratorApi> = (GeneratorClass?: GetGeneratorConstructor<GenParameter>) => GenParameter;
 type EnvOptions = BaseEnvironmentOptions & {
     createEnv?: any;
 };

package/dist/run-context.js

@@ -332,13 +332,10 @@ export class RunContextBase extends EventEmitter {
      */
     withMockedGenerators(namespaces) {
         assert(Array.isArray(namespaces), 'namespaces should be an array');
-        return this.onBeforePrepare(async () => {
-            const MockedGenerator = await this.mockedGeneratorFactory();
-            const dependencies = namespaces.map(namespace => [MockedGenerator, namespace]);
-            const entries = dependencies.map(([generator, namespace]) => [namespace, generator]);
-            Object.assign(this.mockedGenerators, Object.fromEntries(entries));
-            this.withGenerators(dependencies);
-        });
+        const dependencies = namespaces.map(namespace => [this.mockedGeneratorFactory(), namespace]);
+        const entries = dependencies.map(([generator, namespace]) => [namespace, generator]);
+        Object.assign(this.mockedGenerators, Object.fromEntries(entries));
+        return this.withGenerators(dependencies);
     }
     /**
      * Mock the local configuration with the provided config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-test",
-  "version": "8.0.0-beta.1",
+  "version": "8.0.0-beta.2",
   "description": "Test utilities for Yeoman generators",
   "keywords": [
     "yeoman",
@@ -49,7 +49,7 @@
     "@types/sinon": "^10.0.13",
     "c8": "^7.13.0",
     "coveralls": "^3.1.1",
-    "esmocha": "^0.1.4",
+    "esmocha": "^1.0.1",
     "husky": "^8.0.2",
     "jsdoc": "^3.6.10",
     "lint-staged": "^13.0.3",
@@ -59,7 +59,7 @@
     "typescript": "^5.0.4",
     "xo": "^0.54.2",
     "yeoman-environment": "^3.16.1",
-    "yeoman-generator": "^6.0.0-beta.1"
+    "yeoman-generator": "^5.8.0"
   },
   "peerDependencies": {
     "@yeoman/types": "^0.3.0",