@friggframework/core 2.0.0--canary.522.cbd3d5a.0 → 2.0.0--canary.517.35ee143.0

package/database/use-cases/trigger-database-migration-use-case.js

@@ -62,7 +62,7 @@ class TriggerDatabaseMigrationUseCase {
         if (!queueUrl) {
             throw new Error(
                 'DB_MIGRATION_QUEUE_URL environment variable is not set. ' +
-                    'Cannot send migration to queue.'
+                'Cannot send migration to queue.'
             );
         }
 
@@ -77,9 +77,7 @@ class TriggerDatabaseMigrationUseCase {
                 queueUrl
             );
 
-            console.log(
-                `Sent migration job to queue: ${migrationStatus.migrationId}`
-            );
+            console.log(`Sent migration job to queue: ${migrationStatus.migrationId}`);
         } catch (error) {
             console.error(`Failed to send migration to queue:`, error);
 
@@ -91,7 +89,9 @@ class TriggerDatabaseMigrationUseCase {
                 error: `Failed to queue migration: ${error.message}`,
             });
 
-            throw new Error(`Failed to queue migration: ${error.message}`);
+            throw new Error(
+                `Failed to queue migration: ${error.message}`
+            );
         }
 
         // Return migration info immediately (don't wait for migration completion)
@@ -99,7 +99,7 @@ class TriggerDatabaseMigrationUseCase {
             success: true,
             migrationId: migrationStatus.migrationId,
             state: migrationStatus.state,
-            statusUrl: `/db-migrate/${migrationStatus.migrationId}`,
+            statusUrl: `/admin/db-migrate/${migrationStatus.migrationId}`,
             s3Key: `migrations/${migrationStatus.stage}/${migrationStatus.migrationId}.json`,
             message: 'Database migration queued successfully',
         };
@@ -126,9 +126,7 @@ class TriggerDatabaseMigrationUseCase {
         const validDbTypes = ['postgresql', 'mongodb', 'documentdb'];
         if (!validDbTypes.includes(dbType)) {
             throw new ValidationError(
-                `Invalid dbType: "${dbType}". Must be one of: ${validDbTypes.join(
-                    ', '
-                )}`
+                `Invalid dbType: "${dbType}". Must be one of: ${validDbTypes.join(', ')}`
             );
         }
 
@@ -156,3 +154,4 @@ module.exports = {
     TriggerDatabaseMigrationUseCase,
     ValidationError,
 };
+

package/database/utils/mongodb-collection-utils.js

@@ -46,10 +46,7 @@ async function ensureCollectionExists(collectionName) {
             // This is expected in race conditions, silently continue
             return;
         }
-        console.warn(
-            `Error ensuring collection ${collectionName} exists:`,
-            error.message
-        );
+        console.warn(`Error ensuring collection ${collectionName} exists:`, error.message);
     }
 }
 
@@ -65,9 +62,7 @@ async function ensureCollectionExists(collectionName) {
  * ```
  */
 async function ensureCollectionsExist(collectionNames) {
-    await Promise.all(
-        collectionNames.map((name) => ensureCollectionExists(name))
-    );
+    await Promise.all(collectionNames.map(name => ensureCollectionExists(name)));
 }
 
 /**
@@ -84,10 +79,7 @@ async function collectionExists(collectionName) {
 
         return collections.length > 0;
     } catch (error) {
-        console.error(
-            `Error checking if collection ${collectionName} exists:`,
-            error.message
-        );
+        console.error(`Error checking if collection ${collectionName} exists:`, error.message);
         return false;
     }
 }

package/database/utils/mongodb-schema-init.js

@@ -49,9 +49,7 @@ const config = require('../config');
 async function initializeMongoDBSchema() {
     // Only run for MongoDB-compatible databases
     if (config.DB_TYPE !== 'mongodb' && config.DB_TYPE !== 'documentdb') {
-        console.log(
-            'Schema initialization skipped - not using MongoDB-compatible database'
-        );
+        console.log('Schema initialization skipped - not using MongoDB-compatible database');
         return;
     }
 
@@ -59,13 +57,11 @@ async function initializeMongoDBSchema() {
     if (mongoose.connection.readyState !== 1) {
         throw new Error(
             'Cannot initialize MongoDB schema - database not connected. ' +
-                'Call connectPrisma() before initializeMongoDBSchema()'
+            'Call connectPrisma() before initializeMongoDBSchema()'
         );
     }
 
-    console.log(
-        'Initializing MongoDB-compatible schema - ensuring all collections exist...'
-    );
+    console.log('Initializing MongoDB-compatible schema - ensuring all collections exist...');
     const startTime = Date.now();
 
     try {
@@ -73,9 +69,7 @@ async function initializeMongoDBSchema() {
         const collections = getCollectionsFromSchemaSync();
 
         if (collections.length === 0) {
-            console.warn(
-                'No collections found in Prisma schema - skipping initialization'
-            );
+            console.warn('No collections found in Prisma schema - skipping initialization');
             return;
         }
 

package/database/utils/prisma-runner.js

@@ -30,23 +30,8 @@ function getPrismaSchemaPath(dbType, projectRoot = process.cwd()) {
         // Lambda layer path - this is where the schema actually exists in deployed Lambda
         `/opt/nodejs/node_modules/generated/prisma-${normalizedType}/schema.prisma`,
         // Check where Frigg is installed via npm (production scenario)
-        path.join(
-            projectRoot,
-            'node_modules',
-            '@friggframework',
-            'core',
-            `prisma-${normalizedType}`,
-            'schema.prisma'
-        ),
-        path.join(
-            projectRoot,
-            '..',
-            'node_modules',
-            '@friggframework',
-            'core',
-            `prisma-${normalizedType}`,
-            'schema.prisma'
-        ),
+        path.join(projectRoot, 'node_modules', '@friggframework', 'core', `prisma-${normalizedType}`, 'schema.prisma'),
+        path.join(projectRoot, '..', 'node_modules', '@friggframework', 'core', `prisma-${normalizedType}`, 'schema.prisma')
     ];
 
     for (const schemaPath of possiblePaths) {
@@ -58,7 +43,7 @@ function getPrismaSchemaPath(dbType, projectRoot = process.cwd()) {
     // If not found in any location, throw error
     throw new Error(
         `Prisma schema not found at:\n${possiblePaths.join('\n')}\n\n` +
-            'Ensure @friggframework/core is installed.'
+        'Ensure @friggframework/core is installed.'
     );
 }
 
@@ -74,76 +59,57 @@ async function runPrismaGenerate(dbType, verbose = false) {
 
         // Check if Prisma client already exists (e.g., in Lambda or pre-generated)
         const normalizedType = normalizeMongoCompatible(dbType);
-        const generatedClientPath = path.join(
-            path.dirname(path.dirname(schemaPath)),
-            'generated',
-            `prisma-${normalizedType}`,
-            'client.js'
-        );
-        const isLambdaEnvironment =
-            !!process.env.AWS_LAMBDA_FUNCTION_NAME ||
-            !!process.env.LAMBDA_TASK_ROOT;
+        const generatedClientPath = path.join(path.dirname(path.dirname(schemaPath)), 'generated', `prisma-${normalizedType}`, 'client.js');
+        const isLambdaEnvironment = !!process.env.AWS_LAMBDA_FUNCTION_NAME || !!process.env.LAMBDA_TASK_ROOT;
 
         // In Lambda, also check the layer path (/opt/nodejs/node_modules)
         const lambdaLayerClientPath = `/opt/nodejs/node_modules/generated/prisma-${normalizedType}/client.js`;
 
-        const clientExists =
-            fs.existsSync(generatedClientPath) ||
-            (isLambdaEnvironment && fs.existsSync(lambdaLayerClientPath));
+        const clientExists = fs.existsSync(generatedClientPath) || (isLambdaEnvironment && fs.existsSync(lambdaLayerClientPath));
 
         if (clientExists) {
-            const foundPath = fs.existsSync(generatedClientPath)
-                ? generatedClientPath
-                : lambdaLayerClientPath;
+            const foundPath = fs.existsSync(generatedClientPath) ? generatedClientPath : lambdaLayerClientPath;
             if (verbose) {
-                console.log(
-                    chalk.gray(
-                        `✓ Prisma client already generated at: ${foundPath}`
-                    )
-                );
+            console.log(chalk.gray(`✓ Prisma client already generated at: ${foundPath}`));
             }
             if (isLambdaEnvironment) {
                 if (verbose) {
-                    console.log(
-                        chalk.gray(
-                            'Skipping generation in Lambda environment (using pre-generated client)'
-                        )
-                    );
+                    console.log(chalk.gray('Skipping generation in Lambda environment (using pre-generated client)'));
                 }
                 return {
                     success: true,
-                    output: 'Using pre-generated Prisma client (Lambda environment)',
+                    output: 'Using pre-generated Prisma client (Lambda environment)'
                 };
             }
         }
 
         if (verbose) {
-            console.log(
-                chalk.gray(
-                    `Running: npx prisma generate --schema=${schemaPath}`
-                )
-            );
+            console.log(chalk.gray(`Running: npx prisma generate --schema=${schemaPath}`));
         }
 
-        const output = execSync(`npx prisma generate --schema=${schemaPath}`, {
-            encoding: 'utf8',
-            stdio: verbose ? 'inherit' : 'pipe',
-            env: {
-                ...process.env,
-                // Suppress Prisma telemetry prompts
-                PRISMA_HIDE_UPDATE_MESSAGE: '1',
-            },
-        });
+        const output = execSync(
+            `npx prisma generate --schema=${schemaPath}`,
+            {
+                encoding: 'utf8',
+                stdio: verbose ? 'inherit' : 'pipe',
+                env: {
+                    ...process.env,
+                    // Suppress Prisma telemetry prompts
+                    PRISMA_HIDE_UPDATE_MESSAGE: '1'
+                }
+            }
+        );
 
         return {
             success: true,
-            output: verbose ? 'Generated successfully' : output,
+            output: verbose ? 'Generated successfully' : output
         };
+
     } catch (error) {
         return {
             success: false,
             error: error.message,
-            output: error.stdout?.toString() || error.stderr?.toString(),
+            output: error.stdout?.toString() || error.stderr?.toString()
         };
     }
 }
@@ -169,14 +135,17 @@ async function checkDatabaseState(dbType) {
             ? `${prismaBin} migrate status --schema=${schemaPath}`
             : `npx prisma migrate status --schema=${schemaPath}`;
 
-        const output = execSync(command, {
-            encoding: 'utf8',
-            stdio: 'pipe',
-            env: {
-                ...process.env,
-                PRISMA_HIDE_UPDATE_MESSAGE: '1',
-            },
-        });
+        const output = execSync(
+            command,
+            {
+                encoding: 'utf8',
+                stdio: 'pipe',
+                env: {
+                    ...process.env,
+                    PRISMA_HIDE_UPDATE_MESSAGE: '1'
+                }
+            }
+        );
 
         if (output.includes('Database schema is up to date')) {
             return { upToDate: true };
@@ -188,25 +157,26 @@ async function checkDatabaseState(dbType) {
 
         return {
             upToDate: false,
-            pendingMigrations,
+            pendingMigrations
         };
+
     } catch (error) {
         // If migrate status fails, database might not be initialized
         return {
             upToDate: false,
-            error: error.message,
+            error: error.message
         };
     }
 }
 
 /**
  * Gets the path to the Prisma CLI entry point
- *
+ * 
  * IMPORTANT: We invoke prisma/build/index.js directly instead of .bin/prisma
  * because .bin/prisma uses __dirname to find WASM files, and when the symlink
  * is resolved during Lambda packaging, __dirname points to .bin/ instead of
  * prisma/build/, causing WASM files to not be found.
- *
+ * 
  * @returns {string} Command to run Prisma CLI (e.g., 'node /path/to/index.js' or 'npx prisma')
  */
 function getPrismaBinaryPath() {
@@ -225,13 +195,7 @@ function getPrismaBinaryPath() {
     }
 
     // Check local node_modules - use actual CLI location
-    const localPrisma = path.join(
-        process.cwd(),
-        'node_modules',
-        'prisma',
-        'build',
-        'index.js'
-    );
+    const localPrisma = path.join(process.cwd(), 'node_modules', 'prisma', 'build', 'index.js');
     if (fs.existsSync(localPrisma)) {
         return `node ${localPrisma}`;
     }
@@ -252,9 +216,7 @@ async function runPrismaMigrate(command = 'dev', verbose = false) {
             const schemaPath = getPrismaSchemaPath('postgresql');
 
             // Get Prisma binary path (checks multiple locations)
-            const isLambdaEnvironment =
-                !!process.env.AWS_LAMBDA_FUNCTION_NAME ||
-                !!process.env.LAMBDA_TASK_ROOT;
+            const isLambdaEnvironment = !!process.env.AWS_LAMBDA_FUNCTION_NAME || !!process.env.LAMBDA_TASK_ROOT;
             const prismaBin = getPrismaBinaryPath();
 
             // Determine args based on whether we're using direct binary or npx
@@ -280,14 +242,14 @@ async function runPrismaMigrate(command = 'dev', verbose = false) {
                 stdio: 'inherit',
                 env: {
                     ...process.env,
-                    PRISMA_HIDE_UPDATE_MESSAGE: '1',
-                },
+                    PRISMA_HIDE_UPDATE_MESSAGE: '1'
+                }
             });
 
             proc.on('error', (error) => {
                 resolve({
                     success: false,
-                    error: error.message,
+                    error: error.message
                 });
             });
 
@@ -295,19 +257,20 @@ async function runPrismaMigrate(command = 'dev', verbose = false) {
                 if (code === 0) {
                     resolve({
                         success: true,
-                        output: 'Migration completed successfully',
+                        output: 'Migration completed successfully'
                     });
                 } else {
                     resolve({
                         success: false,
-                        error: `Migration process exited with code ${code}`,
+                        error: `Migration process exited with code ${code}`
                     });
                 }
             });
+
         } catch (error) {
             resolve({
                 success: false,
-                error: error.message,
+                error: error.message
             });
         }
     });
@@ -330,7 +293,7 @@ async function runPrismaDbPush(verbose = false, nonInteractive = false) {
                 'push',
                 '--schema',
                 schemaPath,
-                '--skip-generate', // We generate separately
+                '--skip-generate' // We generate separately
             ];
 
             // Add non-interactive flag for Lambda/CI environments
@@ -343,25 +306,17 @@ async function runPrismaDbPush(verbose = false, nonInteractive = false) {
             }
 
             if (nonInteractive) {
-                console.log(
-                    chalk.yellow(
-                        '⚠️  Non-interactive mode: Data loss will be automatically accepted'
-                    )
-                );
+                console.log(chalk.yellow('⚠️  Non-interactive mode: Data loss will be automatically accepted'));
             } else {
-                console.log(
-                    chalk.yellow(
-                        '⚠️  Interactive mode: You may be prompted if schema changes cause data loss'
-                    )
-                );
+                console.log(chalk.yellow('⚠️  Interactive mode: You may be prompted if schema changes cause data loss'));
             }
 
             const proc = spawn('npx', args, {
                 stdio: nonInteractive ? 'pipe' : 'inherit', // Use pipe for non-interactive to capture output
                 env: {
                     ...process.env,
-                    PRISMA_HIDE_UPDATE_MESSAGE: '1',
-                },
+                    PRISMA_HIDE_UPDATE_MESSAGE: '1'
+                }
             });
 
             let stdout = '';
@@ -390,7 +345,7 @@ async function runPrismaDbPush(verbose = false, nonInteractive = false) {
             proc.on('error', (error) => {
                 resolve({
                     success: false,
-                    error: error.message,
+                    error: error.message
                 });
             });
 
@@ -398,22 +353,21 @@ async function runPrismaDbPush(verbose = false, nonInteractive = false) {
                 if (code === 0) {
                     resolve({
                         success: true,
-                        output: nonInteractive
-                            ? stdout || 'Database push completed successfully'
-                            : 'Database push completed successfully',
+                        output: nonInteractive ? stdout || 'Database push completed successfully' : 'Database push completed successfully'
                     });
                 } else {
                     resolve({
                         success: false,
                         error: `Database push process exited with code ${code}`,
-                        output: stderr || stdout,
+                        output: stderr || stdout
                     });
                 }
             });
+
         } catch (error) {
             resolve({
                 success: false,
-                error: error.message,
+                error: error.message
             });
         }
     });
@@ -426,11 +380,7 @@ async function runPrismaDbPush(verbose = false, nonInteractive = false) {
  * @param {boolean} verbose - Enable verbose output
  * @returns {Promise<Object>} { success: boolean, output?: string, error?: string }
  */
-async function runPrismaMigrateResolve(
-    migrationName,
-    action = 'applied',
-    verbose = false
-) {
+async function runPrismaMigrateResolve(migrationName, action = 'applied', verbose = false) {
     return new Promise((resolve) => {
         try {
             const schemaPath = getPrismaSchemaPath('postgresql');
@@ -441,23 +391,8 @@ async function runPrismaMigrateResolve(
             // Determine args based on whether we're using direct binary or npx
             const isDirectBinary = prismaBin !== 'npx prisma';
             const args = isDirectBinary
-                ? [
-                      'migrate',
-                      'resolve',
-                      `--${action}`,
-                      migrationName,
-                      '--schema',
-                      schemaPath,
-                  ]
-                : [
-                      'prisma',
-                      'migrate',
-                      'resolve',
-                      `--${action}`,
-                      migrationName,
-                      '--schema',
-                      schemaPath,
-                  ];
+                ? ['migrate', 'resolve', `--${action}`, migrationName, '--schema', schemaPath]
+                : ['prisma', 'migrate', 'resolve', `--${action}`, migrationName, '--schema', schemaPath];
 
             if (verbose) {
                 const displayCmd = isDirectBinary
@@ -474,14 +409,14 @@ async function runPrismaMigrateResolve(
                 stdio: 'inherit',
                 env: {
                     ...process.env,
-                    PRISMA_HIDE_UPDATE_MESSAGE: '1',
-                },
+                    PRISMA_HIDE_UPDATE_MESSAGE: '1'
+                }
             });
 
             proc.on('error', (error) => {
                 resolve({
                     success: false,
-                    error: error.message,
+                    error: error.message
                 });
             });
 
@@ -489,19 +424,20 @@ async function runPrismaMigrateResolve(
                 if (code === 0) {
                     resolve({
                         success: true,
-                        output: `Migration ${migrationName} marked as ${action}`,
+                        output: `Migration ${migrationName} marked as ${action}`
                     });
                 } else {
                     resolve({
                         success: false,
-                        error: `Resolve process exited with code ${code}`,
+                        error: `Resolve process exited with code ${code}`
                     });
                 }
             });
+
         } catch (error) {
             resolve({
                 success: false,
-                error: error.message,
+                error: error.message
             });
         }
     });
@@ -514,18 +450,12 @@ async function runPrismaMigrateResolve(
  */
 function getMigrationCommand(stage) {
     // Always use 'deploy' in Lambda environment (it's non-interactive and doesn't create migrations)
-    const isLambdaEnvironment =
-        !!process.env.AWS_LAMBDA_FUNCTION_NAME ||
-        !!process.env.LAMBDA_TASK_ROOT;
+    const isLambdaEnvironment = !!process.env.AWS_LAMBDA_FUNCTION_NAME || !!process.env.LAMBDA_TASK_ROOT;
     if (isLambdaEnvironment) {
         return 'deploy';
     }
 
-    const normalizedStage = (
-        stage ||
-        process.env.STAGE ||
-        'development'
-    ).toLowerCase();
+    const normalizedStage = (stage || process.env.STAGE || 'development').toLowerCase();
 
     const developmentStages = ['dev', 'local', 'test', 'development'];
 
@@ -543,5 +473,5 @@ module.exports = {
     runPrismaMigrate,
     runPrismaMigrateResolve,
     runPrismaDbPush,
-    getMigrationCommand,
+    getMigrationCommand
 };

package/database/utils/prisma-schema-parser.js

@@ -146,7 +146,7 @@ async function getCollectionsFromSchema() {
     if (!schemaPath) {
         throw new Error(
             'Could not find Prisma MongoDB schema file. ' +
-                'Searched: prisma-mongodb/schema.prisma, prisma/schema.prisma, schema.prisma'
+            'Searched: prisma-mongodb/schema.prisma, prisma/schema.prisma, schema.prisma'
         );
     }
 
@@ -165,7 +165,7 @@ function getCollectionsFromSchemaSync() {
     if (!schemaPath) {
         throw new Error(
             'Could not find Prisma MongoDB schema file. ' +
-                'Searched: prisma-mongodb/schema.prisma, prisma/schema.prisma, schema.prisma'
+            'Searched: prisma-mongodb/schema.prisma, prisma/schema.prisma, schema.prisma'
         );
     }