@memberjunction/cli 3.3.0 → 3.4.0

package/README.md

@@ -114,6 +114,34 @@ mj codegen [--skipdb]
 Options:
 - `--skipdb`: Skip database migration before running code generation
 
+#### `mj codegen manifest`
+
+Generates a class registrations manifest to prevent tree-shaking of `@RegisterClass` decorated classes. The tool walks the app's transitive dependency tree and produces a tailored import manifest.
+
+```bash
+mj codegen manifest [--output <path>] [--appDir <path>] [--filter <class>] [--quiet]
+```
+
+Options:
+- `--output, -o <path>`: Output manifest file path (default: `./src/generated/class-registrations-manifest.ts`)
+- `--appDir, -a <path>`: App directory containing `package.json` (default: current directory)
+- `--filter, -f <class>`: Only include classes with this base class (can be repeated)
+- `--quiet, -q`: Suppress progress output
+
+Examples:
+```bash
+# Generate manifest for the current app
+mj codegen manifest --output ./src/generated/class-registrations-manifest.ts
+
+# Generate for a specific app directory
+mj codegen manifest --appDir ./packages/MJAPI --output ./packages/MJAPI/src/generated/class-registrations-manifest.ts
+
+# Only include engine and action classes
+mj codegen manifest --filter BaseEngine --filter BaseAction
+```
+
+The generated manifest imports all packages in the app's dependency tree that contain `@RegisterClass` decorators, ensuring the class factory system works correctly even with aggressive tree-shaking. See the [CodeGenLib README](../CodeGenLib/README.md) for programmatic usage.
+
 #### `mj migrate`
 
 Applies database migrations to update your MemberJunction schema to the latest version.

package/dist/commands/codegen/manifest.d.ts

@@ -0,0 +1,12 @@
+import { Command } from '@oclif/core';
+export default class CodeGenManifest extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        appDir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        filter: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        quiet: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/codegen/manifest.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const codegen_lib_1 = require("@memberjunction/codegen-lib");
+class CodeGenManifest extends core_1.Command {
+    static description = 'Generate a class registrations manifest to prevent tree-shaking of @RegisterClass decorated classes';
+    static examples = [
+        `<%= config.bin %> <%= command.id %> --output ./src/generated/class-registrations-manifest.ts`,
+        `<%= config.bin %> <%= command.id %> --appDir ./packages/MJAPI --output ./packages/MJAPI/src/generated/class-registrations-manifest.ts`,
+        `<%= config.bin %> <%= command.id %> --filter BaseEngine --filter BaseAction`,
+    ];
+    static flags = {
+        output: core_1.Flags.string({
+            char: 'o',
+            description: 'Output manifest file path',
+            default: './src/generated/class-registrations-manifest.ts',
+        }),
+        appDir: core_1.Flags.string({
+            char: 'a',
+            description: 'App directory containing package.json (defaults to current directory)',
+        }),
+        filter: core_1.Flags.string({
+            char: 'f',
+            description: 'Only include classes with this base class (can be repeated)',
+            multiple: true,
+        }),
+        quiet: core_1.Flags.boolean({
+            char: 'q',
+            description: 'Suppress progress output',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(CodeGenManifest);
+        const result = await (0, codegen_lib_1.generateClassRegistrationsManifest)({
+            outputPath: flags.output,
+            appDir: flags.appDir || process.cwd(),
+            verbose: !flags.quiet,
+            filterBaseClasses: flags.filter && flags.filter.length > 0 ? flags.filter : undefined,
+        });
+        if (!result.success) {
+            this.error(`Manifest generation failed:\n${result.errors.map(e => `  - ${e}`).join('\n')}`);
+        }
+        if (!flags.quiet) {
+            this.log('');
+            this.log('Manifest generated successfully:');
+            this.log(`  Dependencies walked: ${result.totalDepsWalked}`);
+            this.log(`  Packages with @RegisterClass: ${result.packages.length}`);
+            this.log(`  Total classes: ${result.classes.length}`);
+            this.log(`  Output: ${result.outputPath}`);
+        }
+    }
+}
+exports.default = CodeGenManifest;

package/dist/commands/migrate/index.d.ts

@@ -5,6 +5,8 @@ export default class Migrate extends Command {
     static flags: {
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         tag: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        schema: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        dir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
     private analyzeFlywayError;

package/dist/commands/migrate/index.js

@@ -11,21 +11,28 @@ class Migrate extends core_1.Command {
     static description = 'Migrate MemberJunction database to latest version';
     static examples = [
         `<%= config.bin %> <%= command.id %>
+`,
+        `<%= config.bin %> <%= command.id %> --schema __BCSaaS --dir ./migrations/v1
+`,
+        `<%= config.bin %> <%= command.id %> --schema __BCSaaS --tag v1.0.0
 `,
     ];
     static flags = {
         verbose: core_1.Flags.boolean({ char: 'v', description: 'Enable additional logging' }),
         tag: core_1.Flags.string({ char: 't', description: 'Version tag to use for running remote migrations' }),
+        schema: core_1.Flags.string({ char: 's', description: 'Target schema (overrides coreSchema from config)' }),
+        dir: core_1.Flags.string({ description: 'Migration source directory (overrides migrationsLocation from config)' }),
     };
     async run() {
         const { flags } = await this.parse(Migrate);
         const config = (0, config_1.getValidatedConfig)();
-        const flywayConfig = await (0, config_1.getFlywayConfig)(config, flags.tag);
+        const targetSchema = flags.schema || config.coreSchema;
+        const flywayConfig = await (0, config_1.getFlywayConfig)(config, flags.tag, flags.schema, flags.dir);
         const flyway = new node_flyway_1.Flyway(flywayConfig);
         if (flags.verbose) {
             this.log(`Connecting to ${flywayConfig.url}`);
             this.log(`Database Connection: ${config.dbHost}, ${config.dbDatabase}, User: ${flywayConfig.user}`);
-            this.log(`Migrating ${config.coreSchema} schema using migrations from:\n\t- ${flywayConfig.migrationLocations.join('\n\t- ')}\n`);
+            this.log(`Migrating ${targetSchema} schema using migrations from:\n\t- ${flywayConfig.migrationLocations.join('\n\t- ')}\n`);
             this.log(`Flyway config settings: baselineVersion: ${config.baselineVersion}, baselineMigrate: ${config.baselineOnMigrate}\n`);
         }
         if (flags.tag) {
@@ -43,15 +50,9 @@ class Migrate extends core_1.Command {
             }
         }
         else if (isParseError) {
-            // Parse error - could be SQL error or connection issue
-            // Run Flyway CLI directly to get the actual error
-            spinner.fail();
-            this.logToStderr('\n❌ Migration failed - unable to parse Flyway response.');
-            this.logToStderr(`Execution time: ${result.additionalDetails.executionTime / 1000}s\n`);
-            this.logToStderr('🔍 Running diagnostic to identify the actual error...');
-            const dbInfo = `${config.dbHost}:${config.dbPort}/${config.dbDatabase}`;
-            this.logToStderr(`   Database: ${dbInfo}`);
-            this.logToStderr(`   User: ${config.codeGenLogin}\n`);
+            // Parse error - could be SQL error or connection issue, or just a node-flyway bug
+            // Run Flyway CLI directly to determine if migration actually succeeded
+            spinner.text = 'Verifying migration status...';
             try {
                 const { spawnSync } = require('child_process');
                 const path = require('path');
@@ -62,13 +63,27 @@ class Migrate extends core_1.Command {
                 const flywayExePath = path.join(flywayDir, flywayExeName);
                 // Use spawnSync to avoid shell interpretation of special characters in password
                 const jdbcUrl = `jdbc:sqlserver://${config.dbHost}:${config.dbPort};databaseName=${config.dbDatabase};trustServerCertificate=${config.dbTrustServerCertificate}`;
-                // Build common args
+                // Build common args - use targetSchema instead of coreSchema
+                // This ensures diagnostic validates the schema being migrated, not the core MJ schema
                 const baseArgs = [
                     `-url=${jdbcUrl}`,
                     `-user=${config.codeGenLogin}`,
                     `-password=${config.codeGenPassword}`,
-                    `-schemas=${config.coreSchema}`
+                    `-schemas=${targetSchema}`
                 ];
+                // Add placeholder arguments from config
+                // Read directly from config.SQLOutput.schemaPlaceholders since node-flyway doesn't use them
+                const schemaPlaceholders = config.SQLOutput?.schemaPlaceholders;
+                if (schemaPlaceholders && schemaPlaceholders.length > 0) {
+                    schemaPlaceholders.forEach(({ schema, placeholder }) => {
+                        const cleanPlaceholder = placeholder.replace(/^\$\{|\}$/g, '');
+                        // Skip Flyway built-in placeholders
+                        if (cleanPlaceholder.startsWith('flyway:'))
+                            return;
+                        // Flyway CLI format: -placeholders.PLACEHOLDER_NAME=value
+                        baseArgs.push(`-placeholders.${cleanPlaceholder}=${schema}`);
+                    });
+                }
                 // Convert relative migration paths to absolute paths
                 const absoluteMigrationPaths = flywayConfig.migrationLocations.map((loc) => {
                     // Remove 'filesystem:' prefix if present
@@ -76,50 +91,50 @@ class Migrate extends core_1.Command {
                     // Convert to absolute path if relative
                     return path.isAbsolute(cleanLoc) ? loc : `filesystem:${path.resolve(cleanLoc)}`;
                 });
-                // First try validate to catch checksum mismatches
-                const validateArgs = [
+                // Skip validation and go straight to migrate
+                // node-flyway already tried and failed, so we just need to run the actual migration
+                const migrateArgs = [
                     ...baseArgs,
+                    `-baselineVersion=${config.baselineVersion}`,
+                    `-baselineOnMigrate=${config.baselineOnMigrate}`,
                     `-locations=${absoluteMigrationPaths.join(',')}`,
-                    'validate'
+                    'migrate'
                 ];
-                const validateResult = spawnSync(flywayExePath, validateArgs, { encoding: 'utf8' });
-                const validateOutput = validateResult.stderr || validateResult.stdout || '';
-                // Check if validation failed
-                if (validateResult.status !== 0 || validateOutput.toLowerCase().includes('validate failed')) {
-                    this.analyzeFlywayError(validateOutput, config);
+                const migrateResult = spawnSync(flywayExePath, migrateArgs, { encoding: 'utf8' });
+                const migrateOutput = migrateResult.stderr || migrateResult.stdout || '';
+                // Check if output contains error messages even if exit code is 0
+                // Exclude SQL Server informational messages and recompilation warnings
+                const hasErrorsInOutput = (migrateOutput.toLowerCase().includes('error') &&
+                    !migrateOutput.includes('Error Code: 0') && // Informational messages
+                    !migrateOutput.includes('Error Code: 15070')) || // Recompilation warnings
+                    migrateOutput.toLowerCase().includes('incorrect syntax') ||
+                    migrateOutput.toLowerCase().includes('must be the only statement');
+                if (migrateResult.status === 0 && !hasErrorsInOutput) {
+                    // Migration actually succeeded - don't throw error
+                    spinner.succeed('Migrations complete');
+                    this.log(`Execution time: ${result.additionalDetails.executionTime / 1000}s`);
+                    if (flags.verbose) {
+                        this.logToStderr('\n💡 Note: Migration succeeded but node-flyway had trouble parsing the response.');
+                        this.logToStderr('   This is a known issue with node-flyway and does not affect migration success.\n');
+                    }
+                    return;
+                }
+                else if (migrateResult.status === 0 && hasErrorsInOutput) {
+                    // Exit code was 0 but output contains errors - SQL script likely has error handling
+                    spinner.fail();
+                    this.logToStderr('\n⚠️  Migration completed but errors were detected in output:\n');
+                    this.analyzeFlywayError(migrateOutput, config);
                 }
                 else {
-                    // Validation passed, try migrate to see the actual SQL error
-                    const migrateArgs = [
-                        ...baseArgs,
-                        `-baselineVersion=${config.baselineVersion}`,
-                        `-baselineOnMigrate=${config.baselineOnMigrate}`,
-                        `-locations=${absoluteMigrationPaths.join(',')}`,
-                        'migrate'
-                    ];
-                    const migrateResult = spawnSync(flywayExePath, migrateArgs, { encoding: 'utf8' });
-                    const migrateOutput = migrateResult.stderr || migrateResult.stdout || '';
-                    // Check if output contains error messages even if exit code is 0
-                    const hasErrorsInOutput = migrateOutput.toLowerCase().includes('error') ||
-                        migrateOutput.toLowerCase().includes('incorrect syntax') ||
-                        migrateOutput.toLowerCase().includes('must be the only statement');
-                    if (migrateResult.status === 0 && !hasErrorsInOutput) {
-                        this.logToStderr('✓ Migration executed successfully (Flyway CLI reports success)');
-                        this.logToStderr('   The issue was with node-flyway response parsing only\n');
-                    }
-                    else if (migrateResult.status === 0 && hasErrorsInOutput) {
-                        // Exit code was 0 but output contains errors - SQL script likely has error handling
-                        this.logToStderr('⚠️  Migration completed but errors were detected in output:\n');
-                        this.analyzeFlywayError(migrateOutput, config);
-                    }
-                    else {
-                        // Migration failed with non-zero exit code
-                        this.analyzeFlywayError(migrateOutput, config);
-                    }
+                    // Migration failed with non-zero exit code
+                    spinner.fail();
+                    this.logToStderr('\n❌ Migration failed:\n');
+                    this.analyzeFlywayError(migrateOutput, config);
                 }
             }
             catch (err) {
-                this.logToStderr(`❌ Error running diagnostic: ${err.message || err}\n`);
+                spinner.fail();
+                this.logToStderr(`\n❌ Error running diagnostic: ${err.message || err}\n`);
             }
             this.error('Migration failed - see diagnostic information above');
         }

package/dist/config.d.ts

@@ -14,6 +14,40 @@ declare const mjConfigSchema: z.ZodObject<{
     mjRepoUrl: z.ZodCatch<z.ZodString>;
     baselineVersion: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     baselineOnMigrate: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    SQLOutput: z.ZodOptional<z.ZodObject<{
+        schemaPlaceholders: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            schema: z.ZodString;
+            placeholder: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            schema: string;
+            placeholder: string;
+        }, {
+            schema: string;
+            placeholder: string;
+        }>, "many">>;
+    }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+        schemaPlaceholders: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            schema: z.ZodString;
+            placeholder: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            schema: string;
+            placeholder: string;
+        }, {
+            schema: string;
+            placeholder: string;
+        }>, "many">>;
+    }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+        schemaPlaceholders: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            schema: z.ZodString;
+            placeholder: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            schema: string;
+            placeholder: string;
+        }, {
+            schema: string;
+            placeholder: string;
+        }>, "many">>;
+    }, z.ZodTypeAny, "passthrough">>>;
 }, "strip", z.ZodTypeAny, {
     dbHost: string;
     dbDatabase: string;
@@ -27,6 +61,18 @@ declare const mjConfigSchema: z.ZodObject<{
     mjRepoUrl: string;
     baselineVersion: string;
     baselineOnMigrate: boolean;
+    SQLOutput?: z.objectOutputType<{
+        schemaPlaceholders: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            schema: z.ZodString;
+            placeholder: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            schema: string;
+            placeholder: string;
+        }, {
+            schema: string;
+            placeholder: string;
+        }>, "many">>;
+    }, z.ZodTypeAny, "passthrough"> | undefined;
 }, {
     dbDatabase: string;
     codeGenLogin: string;
@@ -40,6 +86,18 @@ declare const mjConfigSchema: z.ZodObject<{
     mjRepoUrl?: unknown;
     baselineVersion?: string | undefined;
     baselineOnMigrate?: boolean | undefined;
+    SQLOutput?: z.objectInputType<{
+        schemaPlaceholders: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            schema: z.ZodString;
+            placeholder: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            schema: string;
+            placeholder: string;
+        }, {
+            schema: string;
+            placeholder: string;
+        }>, "many">>;
+    }, z.ZodTypeAny, "passthrough"> | undefined;
 }>;
 export declare const config: {
     dbHost: string;
@@ -54,6 +112,18 @@ export declare const config: {
     mjRepoUrl: string;
     baselineVersion: string;
     baselineOnMigrate: boolean;
+    SQLOutput?: z.objectOutputType<{
+        schemaPlaceholders: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            schema: z.ZodString;
+            placeholder: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            schema: string;
+            placeholder: string;
+        }, {
+            schema: string;
+            placeholder: string;
+        }>, "many">>;
+    }, z.ZodTypeAny, "passthrough"> | undefined;
 } | undefined;
 /**
  * Get validated config for commands that require database connection.
@@ -72,5 +142,5 @@ export declare const getOptionalConfig: () => Partial<MJConfig> | undefined;
  */
 export declare const updatedConfig: () => MJConfig | undefined;
 export declare const createFlywayUrl: (mjConfig: MJConfig) => string;
-export declare const getFlywayConfig: (mjConfig: MJConfig, tag?: string) => Promise<FlywayConfig>;
+export declare const getFlywayConfig: (mjConfig: MJConfig, tag?: string, schema?: string, dir?: string) => Promise<FlywayConfig>;
 export {};

package/dist/config.js

@@ -16,7 +16,7 @@ const DEFAULT_CLI_CONFIG = {
     dbHost: process.env.DB_HOST ?? 'localhost',
     dbPort: process.env.DB_PORT ? parseInt(process.env.DB_PORT) : 1433,
     dbDatabase: process.env.DB_DATABASE ?? '',
-    dbTrustServerCertificate: process.env.DB_TRUST_SERVER_CERTIFICATE === 'true' || process.env.DB_TRUST_SERVER_CERTIFICATE === '1',
+    dbTrustServerCertificate: (0, config_1.parseBooleanEnv)(process.env.DB_TRUST_SERVER_CERTIFICATE),
     codeGenLogin: process.env.CODEGEN_DB_USERNAME ?? '',
     codeGenPassword: process.env.CODEGEN_DB_PASSWORD ?? '',
     coreSchema: '__mj',
@@ -37,6 +37,11 @@ const mergedConfig = searchResult?.config
 const result = searchResult
     ? { ...searchResult, config: mergedConfig }
     : { config: mergedConfig, filepath: '', isEmpty: false };
+// Schema placeholder configuration for cross-schema references
+const schemaPlaceholderSchema = zod_1.z.object({
+    schema: zod_1.z.string(),
+    placeholder: zod_1.z.string(),
+});
 // Schema for database-dependent config (required fields)
 const mjConfigSchema = zod_1.z.object({
     dbHost: zod_1.z.string().default('localhost'),
@@ -51,6 +56,9 @@ const mjConfigSchema = zod_1.z.object({
     mjRepoUrl: zod_1.z.string().url().catch(MJ_REPO_URL),
     baselineVersion: zod_1.z.string().optional().default('202601122300'),
     baselineOnMigrate: zod_1.z.boolean().optional().default(true),
+    SQLOutput: zod_1.z.object({
+        schemaPlaceholders: zod_1.z.array(schemaPlaceholderSchema).optional(),
+    }).passthrough().optional(),
 });
 // Schema for non-database commands (all fields optional)
 const mjConfigSchemaOptional = zod_1.z.object({
@@ -66,6 +74,9 @@ const mjConfigSchemaOptional = zod_1.z.object({
     mjRepoUrl: zod_1.z.string().url().catch(MJ_REPO_URL),
     baselineVersion: zod_1.z.string().optional().default('202601122300'),
     baselineOnMigrate: zod_1.z.boolean().optional().default(true),
+    SQLOutput: zod_1.z.object({
+        schemaPlaceholders: zod_1.z.array(schemaPlaceholderSchema).optional(),
+    }).passthrough().optional(),
 });
 // Don't validate at module load - let commands decide when they need validated config
 exports.config = result?.config;
@@ -111,8 +122,12 @@ const createFlywayUrl = (mjConfig) => {
     return `jdbc:sqlserver://${mjConfig.dbHost}:${mjConfig.dbPort}; databaseName=${mjConfig.dbDatabase}${mjConfig.dbTrustServerCertificate ? '; trustServerCertificate=true' : ''}`;
 };
 exports.createFlywayUrl = createFlywayUrl;
-const getFlywayConfig = async (mjConfig, tag) => {
+const getFlywayConfig = async (mjConfig, tag, schema, dir) => {
+    const targetSchema = schema || mjConfig.coreSchema;
     let location = mjConfig.migrationsLocation;
+    if (dir && !tag) {
+        location = dir.startsWith('filesystem:') ? dir : `filesystem:${dir}`;
+    }
     if (tag) {
         // when tag is set, we want to fetch migrations from the github repo using the tag specified
         // we save those to a tmp dir and set that tmp dir as the migration location
@@ -122,18 +137,58 @@ const getFlywayConfig = async (mjConfig, tag) => {
         await git.clone(mjConfig.mjRepoUrl, tmp, ['--sparse', '--depth=1', '--branch', branch]);
         await git.raw(['sparse-checkout', 'set', 'migrations']);
         location = `filesystem:${tmp}`;
+        if (dir) {
+            const subPath = dir.replace(/^filesystem:/, '').replace(/^\.\//, '');
+            location = `filesystem:${tmp}/${subPath}`;
+        }
+    }
+    // Build advanced config - only include properties with defined values
+    const advancedConfig = {
+        schemas: [targetSchema],
+    };
+    // Only add cleanDisabled if explicitly set to false
+    if (mjConfig.cleanDisabled === false) {
+        advancedConfig.cleanDisabled = false;
+    }
+    // Enable custom placeholders for cross-schema references (e.g., BCSaaS → MJ)
+    // Uses schemaPlaceholders from mj.config.cjs SQLOutput configuration if available
+    // Falls back to legacy behavior (mjSchema placeholder) for backward compatibility
+    // NOTE: The Map entries are swapped (value, key) due to a bug in node-flyway's Map.forEach iteration
+    const schemaPlaceholders = mjConfig.SQLOutput?.schemaPlaceholders;
+    if (schemaPlaceholders && schemaPlaceholders.length > 0) {
+        // Use schemaPlaceholders from config (new behavior - supports BCSaaS and other extensions)
+        // NOTE: node-flyway seems to hang when placeHolders Map is provided
+        // Placeholders will be applied by the diagnostic Flyway CLI call instead
+        // advancedConfig.placeHolderReplacement = true;
+        // const placeholderMap = new Map();
+        //
+        // schemaPlaceholders.forEach(({ schema: schemaName, placeholder }) => {
+        //   const cleanPlaceholder = placeholder.replace(/^\$\{|\}$/g, '');
+        //   if (cleanPlaceholder.startsWith('flyway:')) return;
+        //   placeholderMap.set(cleanPlaceholder, schemaName);
+        // });
+        //
+        // if (placeholderMap.size > 0) {
+        //   advancedConfig.placeHolders = placeholderMap;
+        // }
+    }
+    else if (schema && schema !== mjConfig.coreSchema) {
+        // Legacy behavior: Add mjSchema placeholder for non-core schemas
+        advancedConfig.placeHolderReplacement = true;
+        // Map('mjSchema' => '__mj') generates -placeholders.mjSchema=__mj
+        advancedConfig.placeHolders = new Map([['mjSchema', mjConfig.coreSchema]]);
     }
+    // Merge additional required properties into advancedConfig
+    advancedConfig.baselineVersion = mjConfig.baselineVersion;
+    advancedConfig.baselineOnMigrate = mjConfig.baselineOnMigrate;
     return {
         url: (0, exports.createFlywayUrl)(mjConfig),
         user: mjConfig.codeGenLogin,
         password: mjConfig.codeGenPassword,
+        // Note: Flyway uses the first schema in advanced.schemas as the default schema
+        // Setting both defaultSchema and schemas causes issues due to node-flyway's filtering logic
         migrationLocations: [location],
-        advanced: {
-            schemas: [mjConfig.coreSchema],
-            cleanDisabled: mjConfig.cleanDisabled === false ? false : undefined,
-            baselineVersion: mjConfig.baselineVersion,
-            baselineOnMigrate: mjConfig.baselineOnMigrate,
-        },
+        advanced: advancedConfig,
     };
 };
 exports.getFlywayConfig = getFlywayConfig;

package/oclif.manifest.json

@@ -157,6 +157,65 @@
         "index.js"
       ]
     },
+    "codegen:manifest": {
+      "aliases": [],
+      "args": {},
+      "description": "Generate a class registrations manifest to prevent tree-shaking of @RegisterClass decorated classes",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> --output ./src/generated/class-registrations-manifest.ts",
+        "<%= config.bin %> <%= command.id %> --appDir ./packages/MJAPI --output ./packages/MJAPI/src/generated/class-registrations-manifest.ts",
+        "<%= config.bin %> <%= command.id %> --filter BaseEngine --filter BaseAction"
+      ],
+      "flags": {
+        "output": {
+          "char": "o",
+          "description": "Output manifest file path",
+          "name": "output",
+          "default": "./src/generated/class-registrations-manifest.ts",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "appDir": {
+          "char": "a",
+          "description": "App directory containing package.json (defaults to current directory)",
+          "name": "appDir",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "filter": {
+          "char": "f",
+          "description": "Only include classes with this base class (can be repeated)",
+          "name": "filter",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "quiet": {
+          "char": "q",
+          "description": "Suppress progress output",
+          "name": "quiet",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "codegen:manifest",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "codegen",
+        "manifest.js"
+      ]
+    },
     "dbdoc:analyze": {
       "aliases": [],
       "args": {},
@@ -594,6 +653,63 @@
         "status.js"
       ]
     },
+    "migrate": {
+      "aliases": [],
+      "args": {},
+      "description": "Migrate MemberJunction database to latest version",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>\n",
+        "<%= config.bin %> <%= command.id %> --schema __BCSaaS --dir ./migrations/v1\n",
+        "<%= config.bin %> <%= command.id %> --schema __BCSaaS --tag v1.0.0\n"
+      ],
+      "flags": {
+        "verbose": {
+          "char": "v",
+          "description": "Enable additional logging",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "tag": {
+          "char": "t",
+          "description": "Version tag to use for running remote migrations",
+          "name": "tag",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "schema": {
+          "char": "s",
+          "description": "Target schema (overrides coreSchema from config)",
+          "name": "schema",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "dir": {
+          "description": "Migration source directory (overrides migrationsLocation from config)",
+          "name": "dir",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "migrate",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "migrate",
+        "index.js"
+      ]
+    },
     "install": {
       "aliases": [],
       "args": {},
@@ -1852,169 +1968,6 @@
         "validate.js"
       ]
     },
-    "migrate": {
-      "aliases": [],
-      "args": {},
-      "description": "Migrate MemberJunction database to latest version",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>\n"
-      ],
-      "flags": {
-        "verbose": {
-          "char": "v",
-          "description": "Enable additional logging",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "tag": {
-          "char": "t",
-          "description": "Version tag to use for running remote migrations",
-          "name": "tag",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "migrate",
-      "pluginAlias": "@memberjunction/cli",
-      "pluginName": "@memberjunction/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "migrate",
-        "index.js"
-      ]
-    },
-    "ai:actions:list": {
-      "aliases": [],
-      "args": {},
-      "description": "List available AI actions",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --output=table",
-        "<%= config.bin %> <%= command.id %> --output=json"
-      ],
-      "flags": {
-        "output": {
-          "char": "o",
-          "description": "Output format",
-          "name": "output",
-          "default": "compact",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "compact",
-            "json",
-            "table"
-          ],
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "ai:actions:list",
-      "pluginAlias": "@memberjunction/cli",
-      "pluginName": "@memberjunction/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "ai",
-        "actions",
-        "list.js"
-      ]
-    },
-    "ai:actions:run": {
-      "aliases": [],
-      "args": {},
-      "description": "Execute an AI action with parameters",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> -n \"Get Weather\" --param \"Location=Boston\"",
-        "<%= config.bin %> <%= command.id %> -n \"Get Stock Price\" --param \"Ticker=AAPL\"",
-        "<%= config.bin %> <%= command.id %> -n \"Send Single Message\" --param \"To=user@example.com\" --param \"Subject=Test\" --param \"Body=Hello\" --param \"MessageType=Email\" --param \"Provider=SendGrid\"",
-        "<%= config.bin %> <%= command.id %> -n \"Calculate Expression\" --param \"Expression=2+2*3\" --dry-run"
-      ],
-      "flags": {
-        "name": {
-          "char": "n",
-          "description": "Action name",
-          "name": "name",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "param": {
-          "char": "p",
-          "description": "Action parameters in key=value format",
-          "name": "param",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "dry-run": {
-          "description": "Validate without executing",
-          "name": "dry-run",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "output": {
-          "char": "o",
-          "description": "Output format",
-          "name": "output",
-          "default": "compact",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "compact",
-            "json",
-            "table"
-          ],
-          "type": "option"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Show detailed execution information",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "timeout": {
-          "description": "Execution timeout in milliseconds",
-          "name": "timeout",
-          "default": 300000,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "ai:actions:run",
-      "pluginAlias": "@memberjunction/cli",
-      "pluginName": "@memberjunction/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "ai",
-        "actions",
-        "run.js"
-      ]
-    },
     "ai:agents:list": {
       "aliases": [],
       "args": {},
@@ -2360,6 +2313,129 @@
         "index.js"
       ]
     },
+    "ai:actions:list": {
+      "aliases": [],
+      "args": {},
+      "description": "List available AI actions",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --output=table",
+        "<%= config.bin %> <%= command.id %> --output=json"
+      ],
+      "flags": {
+        "output": {
+          "char": "o",
+          "description": "Output format",
+          "name": "output",
+          "default": "compact",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "compact",
+            "json",
+            "table"
+          ],
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "ai:actions:list",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "ai",
+        "actions",
+        "list.js"
+      ]
+    },
+    "ai:actions:run": {
+      "aliases": [],
+      "args": {},
+      "description": "Execute an AI action with parameters",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> -n \"Get Weather\" --param \"Location=Boston\"",
+        "<%= config.bin %> <%= command.id %> -n \"Get Stock Price\" --param \"Ticker=AAPL\"",
+        "<%= config.bin %> <%= command.id %> -n \"Send Single Message\" --param \"To=user@example.com\" --param \"Subject=Test\" --param \"Body=Hello\" --param \"MessageType=Email\" --param \"Provider=SendGrid\"",
+        "<%= config.bin %> <%= command.id %> -n \"Calculate Expression\" --param \"Expression=2+2*3\" --dry-run"
+      ],
+      "flags": {
+        "name": {
+          "char": "n",
+          "description": "Action name",
+          "name": "name",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "param": {
+          "char": "p",
+          "description": "Action parameters in key=value format",
+          "name": "param",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "dry-run": {
+          "description": "Validate without executing",
+          "name": "dry-run",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "output": {
+          "char": "o",
+          "description": "Output format",
+          "name": "output",
+          "default": "compact",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "compact",
+            "json",
+            "table"
+          ],
+          "type": "option"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Show detailed execution information",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "timeout": {
+          "description": "Execution timeout in milliseconds",
+          "name": "timeout",
+          "default": 300000,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "ai:actions:run",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "ai",
+        "actions",
+        "run.js"
+      ]
+    },
     "ai:prompts:list": {
       "aliases": [],
       "args": {},
@@ -2500,5 +2576,5 @@
       ]
     }
   },
-  "version": "3.3.0"
+  "version": "3.4.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/cli",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "MemberJunction command line tools",
   "keywords": [
     "oclif"
@@ -51,15 +51,15 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^5.0.1",
-    "@memberjunction/ai-cli": "3.3.0",
-    "@memberjunction/codegen-lib": "3.3.0",
-    "@memberjunction/config": "3.3.0",
-    "@memberjunction/core": "3.3.0",
-    "@memberjunction/db-auto-doc": "3.3.0",
-    "@memberjunction/metadata-sync": "3.3.0",
-    "@memberjunction/query-gen": "3.3.0",
-    "@memberjunction/sqlserver-dataprovider": "3.3.0",
-    "@memberjunction/testing-cli": "3.3.0",
+    "@memberjunction/ai-cli": "3.4.0",
+    "@memberjunction/codegen-lib": "3.4.0",
+    "@memberjunction/config": "3.4.0",
+    "@memberjunction/core": "3.4.0",
+    "@memberjunction/db-auto-doc": "3.4.0",
+    "@memberjunction/metadata-sync": "3.4.0",
+    "@memberjunction/query-gen": "3.4.0",
+    "@memberjunction/sqlserver-dataprovider": "3.4.0",
+    "@memberjunction/testing-cli": "3.4.0",
     "@oclif/core": "^3",
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-version": "^2.0.17",