@friggframework/devtools 2.0.0--canary.395.495dc7d.0 → 2.0.0--canary.395.ada1d9d.0

package/frigg-cli/__tests__/unit/utils/database-validator.test.js

@@ -308,7 +308,7 @@ describe('Database Validator Utility', () => {
             const result = checkPrismaClientGenerated('mongodb', '/nonexistent/path');
 
             expect(result.generated).toBe(false);
-            expect(result.error).toContain('@prisma-mongo/client');
+            expect(result.error).toContain('@prisma-mongodb/client');
         });
 
         it('should use correct package name for PostgreSQL', () => {
@@ -316,7 +316,7 @@ describe('Database Validator Utility', () => {
             const result = checkPrismaClientGenerated('postgresql', '/nonexistent/path');
 
             expect(result.generated).toBe(false);
-            expect(result.error).toContain('@prisma-postgres/client');
+            expect(result.error).toContain('@prisma-postgresql/client');
         });
 
         it('should return error when MongoDB client not found', () => {
@@ -325,7 +325,7 @@ describe('Database Validator Utility', () => {
             expect(result.generated).toBe(false);
             expect(result.error).toBeDefined();
             expect(result.error).toContain('not found');
-            expect(result.error).toContain('@prisma-mongo/client');
+            expect(result.error).toContain('@prisma-mongodb/client');
             expect(result.error).toContain('frigg db:setup');
         });
 
@@ -335,7 +335,7 @@ describe('Database Validator Utility', () => {
             expect(result.generated).toBe(false);
             expect(result.error).toBeDefined();
             expect(result.error).toContain('not found');
-            expect(result.error).toContain('@prisma-postgres/client');
+            expect(result.error).toContain('@prisma-postgresql/client');
             expect(result.error).toContain('frigg db:setup');
         });
 

package/frigg-cli/__tests__/unit/utils/error-messages.test.js

@@ -184,13 +184,13 @@ describe('Error Messages Utility', () => {
         it('should include correct client package name for MongoDB', () => {
             const message = getPrismaClientNotGeneratedError('mongodb');
 
-            expect(message).toContain('@prisma-mongo/client');
+            expect(message).toContain('@prisma-mongodb/client');
         });
 
         it('should include correct client package name for PostgreSQL', () => {
             const message = getPrismaClientNotGeneratedError('postgresql');
 
-            expect(message).toContain('@prisma-postgres/client');
+            expect(message).toContain('@prisma-postgresql/client');
         });
 
         it('should suggest running frigg db:setup', () => {

package/frigg-cli/__tests__/unit/utils/prisma-runner.test.js

@@ -1,3 +1,16 @@
+// Mock dependencies BEFORE requiring modules
+jest.mock('child_process', () => ({
+    execSync: jest.fn(),
+    spawn: jest.fn()
+}));
+jest.mock('fs', () => ({
+    existsSync: jest.fn(),
+    readFileSync: jest.fn(),
+    writeFileSync: jest.fn()
+}));
+
+const { execSync, spawn } = require('child_process');
+const fs = require('fs');
 const {
     getPrismaSchemaPath,
     runPrismaGenerate,
@@ -7,13 +20,6 @@ const {
     getMigrationCommand
 } = require('../../../utils/prisma-runner');
 
-// Mock dependencies
-jest.mock('child_process');
-jest.mock('fs');
-
-const { execSync, spawn } = require('child_process');
-const fs = require('fs');
-
 describe('Prisma Runner Utility', () => {
     beforeEach(() => {
         jest.clearAllMocks();

package/frigg-cli/__tests__/utils/test-setup.js

@@ -6,7 +6,9 @@
 // Store original environment
 const originalEnv = process.env;
 const originalConsole = { ...console };
-const originalProcess = { ...process };
+// Store original process methods (not entire object due to read-only properties)
+const originalProcessExit = process.exit;
+const originalProcessCwd = process.cwd;
 
 // Mock console to prevent noisy output during tests
 global.console = {
@@ -37,14 +39,10 @@ beforeEach(() => {
   
   // Reset modules
   jest.resetModules();
-  
-  // Restore original process methods
-  process.exit = originalProcess.exit;
-  process.cwd = originalProcess.cwd;
-  
+
   // Mock process.exit to prevent actual exit
   process.exit = jest.fn();
-  
+
   // Mock process.cwd to return predictable path
   process.cwd = jest.fn().mockReturnValue('/mock/cwd');
   
@@ -60,14 +58,14 @@ beforeEach(() => {
 afterEach(() => {
   // Restore environment
   process.env = { ...originalEnv };
-  
+
   // Restore process methods
-  process.exit = originalProcess.exit;
-  process.cwd = originalProcess.cwd;
-  
+  process.exit = originalProcessExit;
+  process.cwd = originalProcessCwd;
+
   // Clear any remaining timers
   jest.clearAllTimers();
-  
+
   // Unmock all modules
   jest.restoreAllMocks();
 });
@@ -76,12 +74,13 @@ afterEach(() => {
 afterAll(() => {
   // Restore original environment completely
   process.env = originalEnv;
-  
+
   // Restore original console
   global.console = originalConsole;
-  
-  // Restore original process
-  Object.assign(process, originalProcess);
+
+  // Restore original process methods
+  process.exit = originalProcessExit;
+  process.cwd = originalProcessCwd;
 });
 
 // Custom matchers for CLI testing
@@ -274,13 +273,15 @@ global.TestHelpers = {
 jest.setTimeout(30000);
 
 // Suppress specific warnings during tests
-const originalWarn = console.warn;
-console.warn = (...args) => {
+// Note: console.warn is already mocked above, so we keep the mock
+// and just suppress certain warnings in the implementation
+const originalWarnMock = global.console.warn;
+global.console.warn = jest.fn((...args) => {
   // Suppress specific warnings that are expected during testing
   const message = args.join(' ');
-  if (message.includes('ExperimentalWarning') || 
+  if (message.includes('ExperimentalWarning') ||
       message.includes('DeprecationWarning')) {
     return;
   }
-  originalWarn.apply(console, args);
-};
+  // Still track the call in the mock
+});

package/frigg-cli/db-setup-command/index.js

@@ -4,7 +4,7 @@ const dotenv = require('dotenv');
 const {
     validateDatabaseUrl,
     getDatabaseType,
-    testDatabaseConnection
+    checkPrismaClientGenerated
 } = require('../utils/database-validator');
 const {
     runPrismaGenerate,
@@ -16,7 +16,6 @@ const {
 const {
     getDatabaseUrlMissingError,
     getDatabaseTypeNotConfiguredError,
-    getDatabaseConnectionError,
     getPrismaCommandError,
     getDatabaseSetupSuccess
 } = require('../utils/error-messages');
@@ -75,44 +74,52 @@ async function dbSetupCommand(options = {}) {
             console.log(chalk.green(`✓ Using ${dbType}\n`));
         }
 
-        // Step 3: Test database connection
+        // Step 3: Check if Prisma client exists, generate if needed
         if (verbose) {
-            console.log(chalk.gray('Step 3: Testing database connection...'));
+            console.log(chalk.gray('Step 3: Checking Prisma client...'));
         }
 
-        console.log(chalk.gray('Connecting to database...'));
-        const connectionTest = await testDatabaseConnection(urlValidation.url, dbType);
+        const clientCheck = checkPrismaClientGenerated(dbType);
+        const forceRegenerate = options.force || false;
 
-        if (!connectionTest.connected) {
-            console.error(getDatabaseConnectionError(connectionTest.error, dbType));
-            process.exit(1);
-        }
-
-        console.log(chalk.green('✓ Database connection verified\n'));
-
-        // Step 4: Generate Prisma client
-        console.log(chalk.cyan('Generating Prisma client...'));
+        if (clientCheck.generated && !forceRegenerate) {
+            // Client already exists and --force not specified
+            console.log(chalk.green('✓ Prisma client already exists (skipping generation)\n'));
+            if (verbose) {
+                console.log(chalk.gray(`  Client location: ${clientCheck.path}\n`));
+            }
+        } else {
+            // Client doesn't exist OR --force specified - generate it
+            if (forceRegenerate && clientCheck.generated) {
+                console.log(chalk.yellow('⚠️  Forcing Prisma client regeneration...'));
+            } else {
+                console.log(chalk.cyan('Generating Prisma client...'));
+            }
 
-        const generateResult = await runPrismaGenerate(dbType, verbose);
+            const generateResult = await runPrismaGenerate(dbType, verbose);
 
-        if (!generateResult.success) {
-            console.error(getPrismaCommandError('generate', generateResult.error));
-            if (generateResult.output) {
-                console.error(chalk.gray(generateResult.output));
+            if (!generateResult.success) {
+                console.error(getPrismaCommandError('generate', generateResult.error));
+                if (generateResult.output) {
+                    console.error(chalk.gray(generateResult.output));
+                }
+                process.exit(1);
             }
-            process.exit(1);
-        }
 
-        console.log(chalk.green('✓ Prisma client generated\n'));
+            console.log(chalk.green('✓ Prisma client generated\n'));
+        }
 
-        // Step 5: Check database state
+        // Step 4: Check database state
+        // Note: We skip connection testing in db:setup because when using frigg:local,
+        // the CLI code runs from tmp/frigg but the client is in backend/node_modules,
+        // causing module resolution mismatches. Connection testing happens in frigg start.
         if (verbose) {
-            console.log(chalk.gray('Step 5: Checking database state...'));
+            console.log(chalk.gray('Step 4: Checking database state...'));
         }
 
         const stateCheck = await checkDatabaseState(dbType);
 
-        // Step 6: Run migrations or db push
+        // Step 5: Run migrations or db push
         if (dbType === 'postgresql') {
             console.log(chalk.cyan('Running database migrations...'));