add exports

Author: mshima

src/commands.ts

@@ -1,16 +1,37 @@
+import { type BaseGeneratorConstructor, type GeneratorMeta } from '@yeoman/types';
 import YeomanCommand, { addEnvironmentOptions } from './util/command.js';
 import { createEnv } from './index.js';
 
+export type CommandPreparation = {
+  resolved?: string;
+  command?: YeomanCommand;
+  generator?: BaseGeneratorConstructor;
+  namespace?: string;
+};
+
 /**
  * Prepare a commander instance for cli support.
  *
  * @param {Command} command - Command to be prepared
  * @param  generatorPath - Generator to create Command
  * @return {Command} return command
  */
-export const prepareGeneratorCommand = async (command: YeomanCommand, generatorPath: string, namespace?: string) => {
+export const prepareGeneratorCommand = async ({
+  command = addEnvironmentOptions(new YeomanCommand()),
+  resolved,
+  generator,
+  namespace,
+}: CommandPreparation) => {
   const env = createEnv();
-  const meta = env.register(generatorPath, { namespace });
+  let meta: GeneratorMeta;
+  if (generator && namespace) {
+    meta = env.register(generator, { namespace, resolved });
+  } else if (resolved) {
+    meta = env.register(resolved, { namespace });
+  } else {
+    throw new Error(`A generator with namespace or a generator path is required`);
+  }
+
   command.env = env;
   command.registerGenerator(await meta.instantiateHelp());
   command.action(async function (this: YeomanCommand) {
@@ -32,7 +53,8 @@ export const prepareGeneratorCommand = async (command: YeomanCommand, generatorP
  * @param generatorPaht - Generator to create Command
  * @return Return a Command instance
  */
-export const prepareCommand = async (generatorPath: string, command = new YeomanCommand()) => {
-  command = addEnvironmentOptions(command);
-  return prepareGeneratorCommand(command, generatorPath);
+export const prepareCommand = async (options: CommandPreparation) => {
+  options.command = options.command ?? new YeomanCommand();
+  addEnvironmentOptions(options.command);
+  return prepareGeneratorCommand(options);
 };

src/commit.ts

@@ -19,9 +19,9 @@ export const commitSharedFsTask = ({
   sharedFs,
   stream,
 }: {
-  sharedFs: Store<MemFsEditorFile>;
   adapter: InputOutputAdapter;
   conflicterOptions?: ConflicterOptions;
+  sharedFs: Store<MemFsEditorFile>;
   stream?: PassThrough;
 }) => {
   const fs = createMemFsEditor(sharedFs);

src/index.ts

@@ -1,6 +1,13 @@
 import { type EnvironmentOptions } from './environment-base.js';
 import Environment from './environment-full.js';
 
+export { default } from './environment-full.js';
+export { default as EnvironmentBase } from './environment-base.js';
+
 export const createEnv = (options?: EnvironmentOptions) => new Environment(options);
 
-export { default } from './environment-full.js';
+export * from './commands.js';
+export * from './util/command.js';
+export * from './package-manager.js';
+export * from './commit.js';
+export { lookupGenerator } from './generator-lookup.js';

src/store.ts

@@ -13,7 +13,7 @@ const debug = createDebug('yeoman:environment:store');
  * @constructor
  * @private
  */
-class Store {
+export default class Store {
   private readonly _meta: Record<string, GeneratorMeta> = {};
   // Store packages paths by ns
   private readonly _packagesPaths: Record<string, string[]> = {};
@@ -197,5 +197,3 @@ class Store {
     return Generator;
   }
 }
-
-export default Store;

test/command.js

@@ -131,7 +131,9 @@ describe('environment (command)', () => {
         let env;
 
         beforeEach(async () => {
-          const command = await prepareCommand(require.resolve('./fixtures/generator-commands/generators/arguments/index.js'));
+          const command = await prepareCommand({
+            resolved: require.resolve('./fixtures/generator-commands/generators/arguments/index.js'),
+          });
           console.log('beforeEach', command);
           await command.parseAsync(['node', 'yo', 'bar']);
 
@@ -152,7 +154,7 @@ describe('environment (command)', () => {
         let env;
 
         beforeEach(async () => {
-          const command = await prepareCommand(require.resolve('./fixtures/generator-commands/generators/options/index.js'));
+          const command = await prepareCommand({ resolved: require.resolve('./fixtures/generator-commands/generators/options/index.js') });
           await command.parseAsync([
             'node',
             'yo',