fix(cli): Improve detection of migration file location

packages/cli/src/commands/add/api-extension/add-api-extension.ts

@@ -43,7 +43,7 @@ async function addApiExtension(
     options?: AddApiExtensionOptions,
 ): Promise<CliCommandReturnVal<{ serviceRef: ServiceRef }>> {
     const providedVendurePlugin = options?.plugin;
-    const project = await analyzeProject({ providedVendurePlugin, cancelledMessage });
+    const { project } = await analyzeProject({ providedVendurePlugin, cancelledMessage });
     const plugin = providedVendurePlugin ?? (await selectPlugin(project, cancelledMessage));
     const serviceRef = await selectServiceRef(project, plugin, false);
     const serviceEntityRef = serviceRef.crudEntityRef;

packages/cli/src/commands/add/codegen/add-codegen.ts

@@ -24,7 +24,7 @@ export const addCodegenCommand = new CliCommand({
 
 async function addCodegen(options?: AddCodegenOptions): Promise<CliCommandReturnVal> {
     const providedVendurePlugin = options?.plugin;
-    const project = await analyzeProject({
+    const { project } = await analyzeProject({
         providedVendurePlugin,
         cancelledMessage: 'Add codegen cancelled',
     });

packages/cli/src/commands/add/entity/add-entity.ts

@@ -37,7 +37,7 @@ async function addEntity(
     options?: Partial<AddEntityOptions>,
 ): Promise<CliCommandReturnVal<{ entityRef: EntityRef }>> {
     const providedVendurePlugin = options?.plugin;
-    const project = await analyzeProject({ providedVendurePlugin, cancelledMessage });
+    const { project } = await analyzeProject({ providedVendurePlugin, cancelledMessage });
     const vendurePlugin = providedVendurePlugin ?? (await selectPlugin(project, cancelledMessage));
     const modifiedSourceFiles: SourceFile[] = [];
 

packages/cli/src/commands/add/job-queue/add-job-queue.ts

@@ -25,7 +25,7 @@ async function addJobQueue(
     options?: AddJobQueueOptions,
 ): Promise<CliCommandReturnVal<{ serviceRef: ServiceRef }>> {
     const providedVendurePlugin = options?.plugin;
-    const project = await analyzeProject({ providedVendurePlugin, cancelledMessage });
+    const { project } = await analyzeProject({ providedVendurePlugin, cancelledMessage });
     const plugin = providedVendurePlugin ?? (await selectPlugin(project, cancelledMessage));
     const serviceRef = await selectServiceRef(project, plugin);
 
@@ -107,19 +107,19 @@ async function addJobQueue(
                     const totalItems = 10;
                     for (let i = 0; i < totalItems; i++) {
                         await new Promise(resolve => setTimeout(resolve, 500));
-                        
+
                         // You can optionally respond to the job being cancelled
                         // during processing. This can be useful for very long-running
                         // tasks which can be cancelled by the user.
                         if (job.state === JobState.CANCELLED) {
                             throw new Error('Job was cancelled');
                         }
-                        
+
                         // Progress can be reported as a percentage like this
                         job.setProgress(Math.floor(i / totalItems * 100));
                     }
-                  
-                    // The value returned from the \`process\` function is stored 
+
+                    // The value returned from the \`process\` function is stored
                     // as the "result" field of the job
                     return {
                         processedCount: totalItems,

packages/cli/src/commands/add/plugin/create-new-plugin.ts

@@ -109,7 +109,7 @@ export async function createNewPlugin(): Promise<CliCommandReturnVal> {
         if (featureType === 'no') {
             done = true;
         } else {
-            const newProject = await getTsMorphProject();
+            const { project: newProject } = await getTsMorphProject();
             workingProject = newProject;
             const newPlugin = newProject
                 .getSourceFile(workingPlugin.getSourceFile().getFilePath())
@@ -158,7 +158,7 @@ export async function generatePlugin(
     const projectSpinner = spinner();
     projectSpinner.start('Generating plugin scaffold...');
     await pauseForPromptDisplay();
-    const project = await getTsMorphProject({ skipAddingFilesFromTsConfig: true });
+    const { project } = await getTsMorphProject({ skipAddingFilesFromTsConfig: true });
 
     const pluginFile = createFile(project, path.join(__dirname, 'templates/plugin.template.ts'));
     const pluginClass = pluginFile.getClass('TemplatePlugin');

packages/cli/src/commands/add/service/add-service.ts

@@ -37,7 +37,7 @@ async function addService(
     providedOptions?: Partial<AddServiceOptions>,
 ): Promise<CliCommandReturnVal<{ serviceRef: ServiceRef }>> {
     const providedVendurePlugin = providedOptions?.plugin;
-    const project = await analyzeProject({ providedVendurePlugin, cancelledMessage });
+    const { project } = await analyzeProject({ providedVendurePlugin, cancelledMessage });
     const vendurePlugin = providedVendurePlugin ?? (await selectPlugin(project, cancelledMessage));
     const modifiedSourceFiles: SourceFile[] = [];
     const type =

packages/cli/src/commands/add/ui-extensions/add-ui-extensions.ts

@@ -24,7 +24,7 @@ export const addUiExtensionsCommand = new CliCommand<AddUiExtensionsOptions>({
 
 async function addUiExtensions(options?: AddUiExtensionsOptions): Promise<CliCommandReturnVal> {
     const providedVendurePlugin = options?.plugin;
-    const project = await analyzeProject({ providedVendurePlugin });
+    const { project } = await analyzeProject({ providedVendurePlugin });
     const vendurePlugin =
         providedVendurePlugin ?? (await selectPlugin(project, 'Add UI extensions cancelled'));
     const packageJson = new PackageJson(project);

packages/cli/src/commands/migrate/generate-migration/generate-migration.ts

@@ -1,5 +1,8 @@
-import { cancel, isCancel, log, spinner, text } from '@clack/prompts';
-import { generateMigration } from '@vendure/core';
+import { cancel, isCancel, log, multiselect, select, spinner, text } from '@clack/prompts';
+import { unique } from '@vendure/common/lib/unique';
+import { generateMigration, VendureConfig } from '@vendure/core';
+import * as fs from 'fs-extra';
+import path from 'path';
 
 import { CliCommand, CliCommandReturnVal } from '../../../shared/cli-command';
 import { analyzeProject } from '../../../shared/shared-prompts';
@@ -16,7 +19,7 @@ export const generateMigrationCommand = new CliCommand({
 });
 
 async function runGenerateMigration(): Promise<CliCommandReturnVal> {
-    const project = await analyzeProject({ cancelledMessage });
+    const { project, tsConfigPath } = await analyzeProject({ cancelledMessage });
     const vendureConfig = new VendureConfigRef(project);
     log.info('Using VendureConfig from ' + vendureConfig.getPathRelativeToProjectRoot());
 
@@ -34,10 +37,47 @@ async function runGenerateMigration(): Promise<CliCommandReturnVal> {
         cancel(cancelledMessage);
         process.exit(0);
     }
-    const config = await loadVendureConfigFile(vendureConfig);
+    const config = await loadVendureConfigFile(vendureConfig, tsConfigPath);
+
+    const migrationsDirs = getMigrationsDir(vendureConfig, config);
+    let migrationDir = migrationsDirs[0];
+
+    if (migrationsDirs.length > 1) {
+        const migrationDirSelect = await select({
+            message: 'Migration file location',
+            options: migrationsDirs
+                .map(c => ({
+                    value: c,
+                    label: c,
+                }))
+                .concat({
+                    value: 'other',
+                    label: 'Other',
+                }),
+        });
+        if (isCancel(migrationDirSelect)) {
+            cancel(cancelledMessage);
+            process.exit(0);
+        }
+        migrationDir = migrationDirSelect as string;
+    }
+
+    if (migrationsDirs.length === 1 || migrationDir === 'other') {
+        const confirmation = await text({
+            message: 'Migration file location',
+            initialValue: migrationsDirs[0],
+            placeholder: '',
+        });
+        if (isCancel(confirmation)) {
+            cancel(cancelledMessage);
+            process.exit(0);
+        }
+        migrationDir = confirmation;
+    }
+
     const migrationSpinner = spinner();
     migrationSpinner.start('Generating migration...');
-    const migrationName = await generateMigration(config, { name, outputDir: './src/migrations' });
+    const migrationName = await generateMigration(config, { name, outputDir: migrationDir });
     const report =
         typeof migrationName === 'string'
             ? `New migration generated: ${migrationName}`
@@ -48,3 +88,29 @@ async function runGenerateMigration(): Promise<CliCommandReturnVal> {
         modifiedSourceFiles: [],
     };
 }
+
+function getMigrationsDir(vendureConfigRef: VendureConfigRef, config: VendureConfig): string[] {
+    const options: string[] = [];
+    if (
+        Array.isArray(config.dbConnectionOptions.migrations) &&
+        config.dbConnectionOptions.migrations.length
+    ) {
+        const firstEntry = config.dbConnectionOptions.migrations[0];
+        if (typeof firstEntry === 'string') {
+            options.push(path.dirname(firstEntry));
+        }
+    }
+    const migrationFile = vendureConfigRef.sourceFile
+        .getProject()
+        .getSourceFiles()
+        .find(sf => {
+            return sf
+                .getClasses()
+                .find(c => c.getImplements().find(i => i.getText() === 'MigrationInterface'));
+        });
+    if (migrationFile) {
+        options.push(migrationFile.getDirectory().getPath());
+    }
+    options.push(path.join(vendureConfigRef.sourceFile.getDirectory().getPath(), '../migrations'));
+    return unique(options.map(p => path.normalize(p)));
+}

packages/cli/src/commands/migrate/load-vendure-config-file.ts

@@ -1,3 +1,4 @@
+import { VendureConfig } from '@vendure/core';
 import path from 'node:path';
 import { register } from 'ts-node';
 
@@ -5,12 +6,21 @@ import { VendureConfigRef } from '../../shared/vendure-config-ref';
 import { selectTsConfigFile } from '../../utilities/ast-utils';
 import { isRunningInTsNode } from '../../utilities/utils';
 
-export async function loadVendureConfigFile(vendureConfig: VendureConfigRef) {
+export async function loadVendureConfigFile(
+    vendureConfig: VendureConfigRef,
+    providedTsConfigPath?: string,
+): Promise<VendureConfig> {
     await import('dotenv/config');
     if (!isRunningInTsNode()) {
-        const tsConfigPath = await selectTsConfigFile();
+        let tsConfigPath: string;
+        if (providedTsConfigPath) {
+            tsConfigPath = providedTsConfigPath;
+        } else {
+            const tsConfigFile = await selectTsConfigFile();
+            tsConfigPath = path.join(process.cwd(), tsConfigFile);
+        }
         // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const compilerOptions = require(path.join(process.cwd(), tsConfigPath)).compilerOptions;
+        const compilerOptions = require(tsConfigPath).compilerOptions;
         register({
             compilerOptions: { ...compilerOptions, moduleResolution: 'NodeNext', module: 'NodeNext' },
             transpileOnly: true,

packages/cli/src/commands/migrate/revert-migration/revert-migration.ts

@@ -16,7 +16,7 @@ export const revertMigrationCommand = new CliCommand({
 });
 
 async function runRevertMigration(): Promise<CliCommandReturnVal> {
-    const project = await analyzeProject({ cancelledMessage });
+    const { project } = await analyzeProject({ cancelledMessage });
     const vendureConfig = new VendureConfigRef(project);
     log.info('Using VendureConfig from ' + vendureConfig.getPathRelativeToProjectRoot());
     const config = await loadVendureConfigFile(vendureConfig);

packages/cli/src/commands/migrate/run-migration/run-migration.ts

@@ -16,7 +16,7 @@ export const runMigrationCommand = new CliCommand({
 });
 
 async function runRunMigration(): Promise<CliCommandReturnVal> {
-    const project = await analyzeProject({ cancelledMessage });
+    const { project } = await analyzeProject({ cancelledMessage });
     const vendureConfig = new VendureConfigRef(project);
     log.info('Using VendureConfig from ' + vendureConfig.getPathRelativeToProjectRoot());
     const config = await loadVendureConfigFile(vendureConfig);

packages/cli/src/shared/shared-prompts.ts

@@ -16,14 +16,18 @@ export async function analyzeProject(options: {
 }) {
     const providedVendurePlugin = options.providedVendurePlugin;
     let project = providedVendurePlugin?.classDeclaration.getProject();
+    let tsConfigPath: string | undefined;
+
     if (!providedVendurePlugin) {
         const projectSpinner = spinner();
         projectSpinner.start('Analyzing project...');
         await pauseForPromptDisplay();
-        project = await getTsMorphProject();
+        const { project: _project, tsConfigPath: _tsConfigPath } = await getTsMorphProject();
+        project = _project;
+        tsConfigPath = _tsConfigPath;
         projectSpinner.stop('Project analyzed');
     }
-    return project as Project;
+    return { project: project as Project, tsConfigPath };
 }
 
 export async function selectPlugin(project: Project, cancelledMessage: string): Promise<VendurePluginRef> {

packages/cli/src/utilities/ast-utils.ts

@@ -45,7 +45,7 @@ export async function getTsMorphProject(options: ProjectOptions = {}) {
         ...options,
     });
     project.enableLogging(false);
-    return project;
+    return { project, tsConfigPath };
 }
 
 export function getPluginClasses(project: Project) {