yeoman-test 8.0.0-beta.4 → 8.0.0-beta.6

package/dist/default-environment.d.ts

@@ -1 +1 @@
-export function defaultEnvironment(): Promise<any>;
+export function createEnv(options: import('@yeoman/types').BaseEnvironmentOptions): import('@yeoman/types').BaseEnvironment;

package/dist/default-environment.js

@@ -1,4 +1,15 @@
-export const defaultEnvironment = async () => {
-    const dynamicEnv = await import('yeoman-environment');
-    return dynamicEnv.createEnv ?? dynamicEnv.default.createEnv;
+/**
+ * @param {import('@yeoman/types').BaseEnvironmentOptions} options
+ * @returns {import('@yeoman/types').BaseEnvironment}
+ */
+export const createEnv = async (options) => {
+    const DynamicEnv = await import('yeoman-environment');
+    if (typeof DynamicEnv === 'function') {
+        return new DynamicEnv(options);
+    }
+    if (typeof DynamicEnv.default === 'function') {
+        // eslint-disable-next-line new-cap
+        return new DynamicEnv.default(options);
+    }
+    throw new Error(`'yeoman-environment' didn't returned a constructor`);
 };

package/dist/helpers.d.ts

@@ -1,8 +1,9 @@
-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 { DefaultEnvironmentApi, DefaultGeneratorApi } from '../types/type-helpers.js';
 import { type DummyPromptOptions } from './adapter.js';
 import RunContext, { BasicRunContext, type RunContextSettings } from './run-context.js';
+export type CreateEnv = (options: BaseEnvironmentOptions) => Promise<BaseEnvironment>;
 /**
  * Dependencies can be path (autodiscovery) or an array [<generator>, <name>]
  */
@@ -105,7 +106,7 @@ export declare class YeomanTest {
      *   createEnv.restore();
      * });
      */
-    createEnv(...args: any[]): Promise<DefaultEnvironmentApi>;
+    createEnv(options: BaseEnvironmentOptions): Promise<DefaultEnvironmentApi>;
     /**
      * Creates a test environment.
      *
@@ -113,7 +114,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?: CreateEnv, options?: BaseEnvironmentOptions): Promise<BaseEnvironment>;
     /**
      * Get RunContext type
      * @return {RunContext}

package/dist/helpers.js

@@ -7,7 +7,7 @@ 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';
-import { defaultEnvironment } from './default-environment.js';
+import { createEnv } from './default-environment.js';
 let GeneratorImplementation;
 try {
     const GeneratorImport = await import('yeoman-generator');
@@ -171,7 +171,7 @@ export class YeomanTest {
      * var angular = createGenerator('angular:app', deps);
      */
     async createGenerator(name, dependencies, args, options, localConfigOnly = true) {
-        const env = await this.createEnv([], { sharedOptions: { localConfigOnly } });
+        const env = await this.createEnv({ sharedOptions: { localConfigOnly } });
         for (const dependency of dependencies) {
             if (typeof dependency === 'string') {
                 env.register(dependency);
@@ -180,7 +180,7 @@ export class YeomanTest {
                 env.register(...dependency);
             }
         }
-        return env.create(name, args, options);
+        return env.create(name, { generatorArgs: args, generatorOptions: options });
     }
     /**
      * Shortcut to the Environment's createEnv.
@@ -197,8 +197,8 @@ export class YeomanTest {
      *   createEnv.restore();
      * });
      */
-    async createEnv(...args) {
-        return (await defaultEnvironment())(...args);
+    async createEnv(options) {
+        return createEnv(options);
     }
     /**
      * Creates a test environment.
@@ -231,7 +231,7 @@ export class YeomanTest {
                 ...options,
             };
         }
-        return envContructor([], envOptions, new TestAdapter());
+        return envContructor({ ...envOptions, adapter: new TestAdapter() });
     }
     /**
      * Get RunContext type

package/dist/run-context.d.ts

@@ -5,7 +5,7 @@ import type { BaseEnvironmentOptions, BaseGenerator, GetGeneratorConstructor, Ge
 import { type MemFsEditorFile, type MemFsEditor } from 'mem-fs-editor';
 import type { DefaultGeneratorApi, DefaultEnvironmentApi } from '../types/type-helpers.js';
 import RunResult, { type RunResultOptions } from './run-result.js';
-import { type Dependency, type YeomanTest } from './helpers.js';
+import { type CreateEnv, type Dependency, type YeomanTest } from './helpers.js';
 import { type DummyPromptOptions } from './adapter.js';
 /**
  * Provides settings for creating a `RunContext`.
@@ -34,7 +34,7 @@ export type RunContextSettings = {
 type PromiseRunResult<GeneratorType extends BaseGenerator> = Promise<RunResult<GeneratorType>>;
 type MockedGeneratorFactory<GenParameter extends BaseGenerator = DefaultGeneratorApi> = (GeneratorClass?: GetGeneratorConstructor<GenParameter>) => GetGeneratorConstructor<GenParameter>;
 type EnvOptions = BaseEnvironmentOptions & {
-    createEnv?: any;
+    createEnv?: CreateEnv;
 };
 export declare class RunContextBase<GeneratorType extends BaseGenerator = DefaultGeneratorApi> extends EventEmitter {
     readonly mockedGenerators: Record<string, BaseGenerator>;

package/dist/run-context.js

@@ -502,11 +502,14 @@ export class RunContextBase extends EventEmitter {
             const { resolved } = this.settings;
             this.env.register(this.Generator, { namespace, resolved });
         }
-        this.generator = await this.env.create(namespace, this.args, {
-            force: true,
-            skipCache: true,
-            skipInstall: true,
-            ...this.options,
+        this.generator = await this.env.create(namespace, {
+            generatorArgs: this.args,
+            generatorOptions: {
+                force: true,
+                skipCache: true,
+                skipInstall: true,
+                ...this.options,
+            },
         });
         for (const onGeneratorCallback of this.onGeneratorCallbacks) {
             // eslint-disable-next-line no-await-in-loop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-test",
-  "version": "8.0.0-beta.4",
+  "version": "8.0.0-beta.6",
   "description": "Test utilities for Yeoman generators",
   "keywords": [
     "yeoman",
@@ -59,13 +59,13 @@
     "tui-jsdoc-template": "^1.2.2",
     "typescript": "^5.0.4",
     "xo": "^0.54.2",
-    "yeoman-environment": "^3.17.0",
-    "yeoman-generator": "^5.8.0"
+    "yeoman-environment": "^3.18.3",
+    "yeoman-generator": "^5.9.0"
   },
   "peerDependencies": {
-    "@yeoman/types": "^0.4.0",
-    "yeoman-environment": "^3.17.0 || ^4.0.0-alpha.5",
-    "yeoman-generator": "^5.8.0 || ^6.0.0-beta.3"
+    "@yeoman/types": "^1.0.1",
+    "yeoman-environment": "^3.18.3 || ^4.0.0-alpha.6",
+    "yeoman-generator": "^5.9.0 || ^6.0.0-beta.4"
   },
   "peerDependenciesMeta": {
     "yeoman-environment": {