@friggframework/devtools 2.0.0--canary.395.495dc7d.0 → 2.0.0--canary.395.04851d8.0

package/frigg-cli/{__tests__/jest.config.js → jest.config.js}

@@ -2,16 +2,25 @@ module.exports = {
   displayName: 'Frigg CLI Tests',
   testMatch: [
     '<rootDir>/__tests__/**/*.test.js',
-    '<rootDir>/__tests__/**/*.spec.js'
+    '<rootDir>/__tests__/**/*.spec.js',
+    '<rootDir>/**/start-command.test.js',
+    '<rootDir>/**/__tests__/**/*.test.js'
+  ],
+  // Exclude utility files and config from being treated as tests
+  testPathIgnorePatterns: [
+    '/node_modules/',
+    '/__tests__/utils/',
+    '/__tests__/jest.config.js',
+    '/test-setup.js'
   ],
   testEnvironment: 'node',
   collectCoverageFrom: [
-    '../**/*.js',
-    '!../**/*.test.js',
-    '!../**/*.spec.js',
-    '!../node_modules/**',
-    '!../__tests__/**',
-    '!../coverage/**'
+    '**/*.js',
+    '!**/*.test.js',
+    '!**/*.spec.js',
+    '!**/node_modules/**',
+    '!**/__tests__/**',
+    '!**/coverage/**'
   ],
   coverageDirectory: 'coverage',
   coverageReporters: [
@@ -28,55 +37,55 @@ module.exports = {
       lines: 85,
       statements: 85
     },
-    '../install-command/index.js': {
+    './install-command/index.js': {
       branches: 90,
       functions: 90,
       lines: 90,
       statements: 90
     },
-    '../build-command/index.js': {
+    './build-command/index.js': {
       branches: 90,
       functions: 90,
       lines: 90,
       statements: 90
     },
-    '../deploy-command/index.js': {
+    './deploy-command/index.js': {
       branches: 90,
       functions: 90,
       lines: 90,
       statements: 90
     },
-    '../ui-command/index.js': {
+    './ui-command/index.js': {
       branches: 90,
       functions: 90,
       lines: 90,
       statements: 90
     },
-    '../generate-command/index.js': {
+    './generate-command/index.js': {
       branches: 90,
       functions: 90,
       lines: 90,
       statements: 90
     },
-    '../db-setup-command/index.js': {
+    './db-setup-command/index.js': {
       branches: 90,
       functions: 90,
       lines: 90,
       statements: 90
     },
-    '../utils/database-validator.js': {
+    './utils/database-validator.js': {
       branches: 85,
       functions: 85,
       lines: 85,
       statements: 85
     },
-    '../utils/prisma-runner.js': {
+    './utils/prisma-runner.js': {
       branches: 85,
       functions: 85,
       lines: 85,
       statements: 85
     },
-    '../utils/error-messages.js': {
+    './utils/error-messages.js': {
       branches: 85,
       functions: 85,
       lines: 85,
@@ -84,7 +93,7 @@ module.exports = {
     }
   },
   setupFilesAfterEnv: [
-    '<rootDir>/utils/test-setup.js'
+    '<rootDir>/__tests__/utils/test-setup.js'
   ],
   testTimeout: 10000,
   maxWorkers: '50%',
@@ -103,24 +112,13 @@ module.exports = {
     'node'
   ],
   transform: {},
-  testResultsProcessor: 'jest-sonar-reporter',
+  // testResultsProcessor: 'jest-sonar-reporter', // Optional dependency
   reporters: [
-    'default',
-    [
-      'jest-junit',
-      {
-        outputDirectory: 'coverage',
-        outputName: 'junit.xml',
-        ancestorSeparator: ' › ',
-        uniqueOutputName: 'false',
-        suiteNameTemplate: '{filepath}',
-        classNameTemplate: '{classname}',
-        titleTemplate: '{title}'
-      }
-    ]
+    'default'
+    // jest-junit reporter removed - optional dependency
   ],
   watchman: false,
   forceExit: true,
   detectOpenHandles: true,
   errorOnDeprecated: true
-};
+};

package/frigg-cli/start-command/index.js

@@ -40,7 +40,7 @@ async function startCommand(options) {
     console.log('Starting backend and optional frontend...');
 
     // Suppress AWS SDK warning message about maintenance mode
-    process.env.AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE = 1;
+    process.env.AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE = '1';
     // Skip AWS discovery for local development
     process.env.FRIGG_SKIP_AWS_DISCOVERY = 'true';
     const backendPath = path.resolve(process.cwd());
@@ -124,38 +124,38 @@ async function performDatabaseChecks(verbose) {
         console.log(chalk.green(`✓ Database type: ${dbType}`));
     }
 
-    // Check 3: Test database connection
+    // Check 3: Verify Prisma client is generated (BEFORE connection test to prevent auto-generation)
     if (verbose) {
-        console.log(chalk.gray('Testing database connection...'));
+        console.log(chalk.gray('Checking Prisma client...'));
     }
 
-    const connectionTest = await testDatabaseConnection(urlValidation.url, dbType, 5000);
+    const clientCheck = checkPrismaClientGenerated(dbType);
 
-    if (!connectionTest.connected) {
-        console.error(getDatabaseConnectionError(connectionTest.error, dbType));
-        throw new Error('Database connection failed');
+    if (!clientCheck.generated) {
+        console.error(getPrismaClientNotGeneratedError(dbType));
+        console.error(chalk.yellow('\nRun this command to generate the Prisma client:'));
+        console.error(chalk.cyan('  frigg db:setup\n'));
+        throw new Error('Prisma client not generated');
     }
 
     if (verbose) {
-        console.log(chalk.green('✓ Database connection verified'));
+        console.log(chalk.green('✓ Prisma client generated'));
     }
 
-    // Check 4: Verify Prisma client is generated
+    // Check 4: Test database connection (only after confirming client exists)
     if (verbose) {
-        console.log(chalk.gray('Checking Prisma client...'));
+        console.log(chalk.gray('Testing database connection...'));
     }
 
-    const clientCheck = checkPrismaClientGenerated(dbType);
+    const connectionTest = await testDatabaseConnection(urlValidation.url, dbType, 5000);
 
-    if (!clientCheck.generated) {
-        console.error(getPrismaClientNotGeneratedError(dbType));
-        console.error(chalk.yellow('\nRun this command to generate the Prisma client:'));
-        console.error(chalk.cyan('  frigg db:setup\n'));
-        throw new Error('Prisma client not generated');
+    if (!connectionTest.connected) {
+        console.error(getDatabaseConnectionError(connectionTest.error, dbType));
+        throw new Error('Database connection failed');
     }
 
     if (verbose) {
-        console.log(chalk.green('✓ Prisma client generated'));
+        console.log(chalk.green('✓ Database connection verified'));
     }
 }
 

package/frigg-cli/start-command/start-command.test.js

@@ -36,21 +36,27 @@ describe('startCommand', () => {
     let mockProcessExit;
 
     beforeEach(() => {
-        // Mock process.exit BEFORE clearAllMocks to prevent actual exits
-        mockProcessExit = jest.spyOn(process, 'exit').mockImplementation(() => {});
+        // Mock process.exit to throw error and stop execution (prevents actual exits)
+        const exitError = new Error('process.exit called');
+        exitError.code = 'PROCESS_EXIT';
+        mockProcessExit = jest.spyOn(process, 'exit').mockImplementation(() => {
+            throw exitError;
+        });
 
         // Reset mocks
         jest.clearAllMocks();
 
         // Re-apply process.exit mock after clearAllMocks
-        mockProcessExit = jest.spyOn(process, 'exit').mockImplementation(() => {});
+        mockProcessExit = jest.spyOn(process, 'exit').mockImplementation(() => {
+            throw exitError;
+        });
 
         // Set up default database validator mocks for all tests
         const defaultValidator = createMockDatabaseValidator();
-        mockValidator.validateDatabaseUrl.mockImplementation(defaultValidator.validateDatabaseUrl);
-        mockValidator.getDatabaseType.mockImplementation(defaultValidator.getDatabaseType);
-        mockValidator.testDatabaseConnection.mockImplementation(defaultValidator.testDatabaseConnection);
-        mockValidator.checkPrismaClientGenerated.mockImplementation(defaultValidator.checkPrismaClientGenerated);
+        mockValidator.validateDatabaseUrl.mockReturnValue(defaultValidator.validateDatabaseUrl());
+        mockValidator.getDatabaseType.mockReturnValue(defaultValidator.getDatabaseType());
+        mockValidator.testDatabaseConnection.mockResolvedValue(defaultValidator.testDatabaseConnection());
+        mockValidator.checkPrismaClientGenerated.mockReturnValue(defaultValidator.checkPrismaClientGenerated());
 
         // Mock dotenv
         dotenv.config = jest.fn();
@@ -219,7 +225,7 @@ describe('startCommand', () => {
                 error: 'DATABASE_URL not found'
             });
 
-            await startCommand({});
+            await expect(startCommand({})).rejects.toThrow('process.exit called');
 
             expect(mockConsoleError).toHaveBeenCalled();
             expect(mockProcessExit).toHaveBeenCalledWith(1);
@@ -231,7 +237,7 @@ describe('startCommand', () => {
                 error: 'Database not configured'
             });
 
-            await startCommand({});
+            await expect(startCommand({})).rejects.toThrow('process.exit called');
 
             expect(mockConsoleError).toHaveBeenCalled();
             expect(mockProcessExit).toHaveBeenCalledWith(1);
@@ -244,7 +250,7 @@ describe('startCommand', () => {
                 error: 'Connection failed'
             });
 
-            await startCommand({});
+            await expect(startCommand({})).rejects.toThrow('process.exit called');
 
             expect(mockConsoleError).toHaveBeenCalled();
             expect(mockProcessExit).toHaveBeenCalledWith(1);
@@ -257,7 +263,7 @@ describe('startCommand', () => {
                 error: 'Client not found'
             });
 
-            await startCommand({});
+            await expect(startCommand({})).rejects.toThrow('process.exit called');
 
             expect(mockConsoleError).toHaveBeenCalled();
             expect(mockConsoleError).toHaveBeenCalledWith(expect.stringContaining('frigg db:setup'));
@@ -271,7 +277,7 @@ describe('startCommand', () => {
                 error: 'Client not generated'
             });
 
-            await startCommand({});
+            await expect(startCommand({})).rejects.toThrow('process.exit called');
 
             expect(mockConsoleError).toHaveBeenCalledWith(expect.stringContaining('frigg db:setup'));
         });
@@ -281,7 +287,7 @@ describe('startCommand', () => {
                 valid: false
             });
 
-            await startCommand({});
+            await expect(startCommand({})).rejects.toThrow('process.exit called');
 
             expect(mockProcessExit).toHaveBeenCalledWith(1);
         });

package/frigg-cli/utils/database-validator.js

@@ -111,17 +111,21 @@ async function testDatabaseConnection(databaseUrl, dbType, timeout = 5000) {
  * @returns {Object} { generated: boolean, path?: string, error?: string }
  */
 function checkPrismaClientGenerated(dbType, projectRoot = process.cwd()) {
-    const clientPackageName = dbType === 'mongodb' ? '@prisma-mongo/client' : '@prisma-postgres/client';
+    const clientPackageName = `@prisma-${dbType}/client`;
 
     try {
-        // Use require.resolve to locate the client package
-        // This works with any package manager (npm, yarn, pnpm) and hoisting strategy
+        // First, resolve where @friggframework/core actually is
+        // This handles file: dependencies and symlinks correctly
+        const corePackagePath = require.resolve('@friggframework/core', {
+            paths: [projectRoot]
+        });
+        const corePackageDir = path.dirname(corePackagePath);
+
+        // Now look for the Prisma client within the resolved core package
         const clientPath = require.resolve(clientPackageName, {
             paths: [
-                // Try from @friggframework/core first (most likely location)
-                path.join(projectRoot, 'node_modules', '@friggframework', 'core'),
-                // Fallback to project root (in case of different hoisting)
-                projectRoot
+                corePackageDir,  // Look in the actual core package location
+                projectRoot      // Fallback to project root
             ]
         });
 

package/frigg-cli/utils/error-messages.js

@@ -161,7 +161,7 @@ ${chalk.gray('5.')} Verify network/firewall settings
  * @returns {string} Formatted error message
  */
 function getPrismaClientNotGeneratedError(dbType) {
-    const clientName = dbType === 'mongodb' ? '@prisma-mongo/client' : '@prisma-postgres/client';
+    const clientName = `@prisma-${dbType}/client`;
 
     return `
 ${chalk.red(`❌ Prisma client not generated for ${dbType}`)}

package/frigg-cli/utils/prisma-runner.js

@@ -16,23 +16,25 @@ const chalk = require('chalk');
  * @throws {Error} If schema file doesn't exist
  */
 function getPrismaSchemaPath(dbType, projectRoot = process.cwd()) {
-    const schemaPath = path.join(
-        projectRoot,
-        'node_modules',
-        '@friggframework',
-        'core',
-        `prisma-${dbType}`,
-        'schema.prisma'
-    );
-
-    if (!fs.existsSync(schemaPath)) {
-        throw new Error(
-            `Prisma schema not found at ${schemaPath}. ` +
-            'Ensure @friggframework/core is installed.'
-        );
+    // Try multiple locations for the schema file
+    // 1. Local node_modules (standard install)
+    // 2. Parent node_modules (workspace/monorepo setup)
+    const possiblePaths = [
+        path.join(projectRoot, 'node_modules', '@friggframework', 'core', `prisma-${dbType}`, 'schema.prisma'),
+        path.join(projectRoot, '..', 'node_modules', '@friggframework', 'core', `prisma-${dbType}`, 'schema.prisma')
+    ];
+
+    for (const schemaPath of possiblePaths) {
+        if (fs.existsSync(schemaPath)) {
+            return schemaPath;
+        }
     }
 
-    return schemaPath;
+    // 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.'
+    );
 }
 
 /**

package/infrastructure/IAM-POLICY-TEMPLATES.md

@@ -83,27 +83,45 @@ aws cloudformation update-stack \
 For custom policy generation based on your app definition:
 
 ```javascript
-const { generateIAMPolicy, generateIAMCloudFormation } = require('./iam-generator');
+const { generateIAMPolicy, generateIAMCloudFormation, getFeatureSummary } = require('./iam-generator');
 
 // Generate basic JSON policy
 const basicPolicy = generateIAMPolicy('basic');
 
-// Generate full JSON policy  
+// Generate full JSON policy
 const fullPolicy = generateIAMPolicy('full');
 
-// Generate CloudFormation template with auto-detection
-const autoTemplate = generateIAMCloudFormation(appDefinition, { mode: 'auto' });
-
-// Generate CloudFormation template with specific mode
-const basicTemplate = generateIAMCloudFormation(appDefinition, { mode: 'basic' });
-const fullTemplate = generateIAMCloudFormation(appDefinition, { mode: 'full' });
+// Generate CloudFormation template with auto-detected features
+const summary = getFeatureSummary(appDefinition);
+const template = generateIAMCloudFormation({
+    appName: summary.appName,
+    features: summary.features,
+    userPrefix: 'frigg-deployment-user',
+    stackName: 'frigg-deployment-iam'
+});
+
+// Or manually specify features
+const customTemplate = generateIAMCloudFormation({
+    appName: 'my-app',
+    features: {
+        vpc: true,
+        kms: true,
+        ssm: true,
+        websockets: false
+    },
+    userPrefix: 'my-deployment-user',
+    stackName: 'my-deployment-stack'
+});
 ```
 
-### Generator Modes
+### Feature Detection
+
+Use `getFeatureSummary(appDefinition)` to automatically detect features from your app definition:
 
-- **`basic`** - Core permissions only, ignores app definition features
-- **`full`** - All features enabled, ignores app definition features  
-- **`auto`** - Analyzes app definition and enables features as needed (default)
+```javascript
+const summary = getFeatureSummary(appDefinition);
+// Returns: { appName, features: { core, vpc, kms, ssm, websockets }, integrationCount }
+```
 
 ## Security Best Practices
 

package/infrastructure/iam-generator.js

@@ -1,52 +1,31 @@
 const path = require('path');
 
 /**
- * Generate IAM CloudFormation template based on AppDefinition
- * @param {Object} appDefinition - Application definition object
+ * Generate IAM CloudFormation template
  * @param {Object} options - Generation options
- * @param {string} [options.deploymentUserName='frigg-deployment-user'] - IAM user name
+ * @param {string} [options.appName='Frigg'] - Application name
+ * @param {Object} [options.features={}] - Enabled features { vpc, kms, ssm, websockets }
+ * @param {string} [options.userPrefix='frigg-deployment-user'] - IAM user name prefix
  * @param {string} [options.stackName='frigg-deployment-iam'] - CloudFormation stack name
- * @param {string} [options.mode='auto'] - Policy mode: 'basic', 'full', or 'auto' (auto-detect from appDefinition)
  * @returns {string} CloudFormation YAML template
  */
-function generateIAMCloudFormation(appDefinition, options = {}) {
-    const { deploymentUserName = 'frigg-deployment-user', mode = 'auto' } =
-        options;
-
-    // Determine which features are enabled based on mode
-    let features;
-    if (mode === 'basic') {
-        features = {
-            vpc: false,
-            kms: false,
-            ssm: false,
-            websockets: appDefinition.websockets?.enable === true,
-        };
-    } else if (mode === 'full') {
-        features = {
-            vpc: true,
-            kms: true,
-            ssm: true,
-            websockets: appDefinition.websockets?.enable === true,
-        };
-    } else {
-        // mode === 'auto'
-        features = {
-            vpc: appDefinition.vpc?.enable === true,
-            kms:
-                appDefinition.encryption
-                    ?.fieldLevelEncryptionMethod === 'kms',
-            ssm: appDefinition.ssm?.enable === true,
-            websockets: appDefinition.websockets?.enable === true,
-        };
-    }
+function generateIAMCloudFormation(options = {}) {
+    const {
+        appName = 'Frigg',
+        features = {},
+        userPrefix = 'frigg-deployment-user',
+        stackName = 'frigg-deployment-iam'
+    } = options;
+
+    const deploymentUserName = userPrefix;
+
+    // Features are already analyzed by caller (use getFeatureSummary to extract features from appDefinition)
+    // Expected features: { vpc, kms, ssm, websockets }
 
     // Build the CloudFormation template
     const template = {
         AWSTemplateFormatVersion: '2010-09-09',
-        Description: `IAM roles and policies for ${
-            appDefinition.name || 'Frigg'
-        } application deployment pipeline`,
+        Description: `IAM roles and policies for ${appName} application deployment pipeline`,
 
         Parameters: {
             DeploymentUserName: {
@@ -829,6 +808,7 @@ function generateIAMPolicy(mode = 'basic') {
 
 module.exports = {
     generateIAMCloudFormation,
+    generateCloudFormationTemplate: generateIAMCloudFormation, // Alias for generate-command/index.js compatibility
     getFeatureSummary,
     generateBasicIAMPolicy,
     generateFullIAMPolicy,

package/infrastructure/iam-generator.test.js

@@ -51,7 +51,11 @@ describe('IAM Generator', () => {
                 websockets: { enable: false }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('AWSTemplateFormatVersion');
             expect(yaml).toContain('FriggDeploymentUser');
@@ -66,7 +70,11 @@ describe('IAM Generator', () => {
                 vpc: { enable: true }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('FriggVPCPolicy');
             expect(yaml).toContain('CreateVPCPermissions');
@@ -81,7 +89,11 @@ describe('IAM Generator', () => {
                 encryption: { fieldLevelEncryptionMethod: 'kms' }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('FriggKMSPolicy');
             expect(yaml).toContain('CreateKMSPermissions');
@@ -97,7 +109,11 @@ describe('IAM Generator', () => {
                 ssm: { enable: true }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('FriggSSMPolicy');
             expect(yaml).toContain('CreateSSMPermissions');
@@ -113,7 +129,11 @@ describe('IAM Generator', () => {
                 ssm: { enable: true }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             // Check parameter defaults match the enabled features
             expect(yaml).toContain("Default: 'true'"); // VPC enabled
@@ -127,7 +147,11 @@ describe('IAM Generator', () => {
                 integrations: []
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             // Check for core permissions
             expect(yaml).toContain('cloudformation:CreateStack');
@@ -149,7 +173,11 @@ describe('IAM Generator', () => {
                 integrations: []
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('internal-error-queue-*');
         });
@@ -160,7 +188,11 @@ describe('IAM Generator', () => {
                 integrations: []
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('Outputs:');
             expect(yaml).toContain('DeploymentUserArn:');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.395.495dc7d.0",
+  "version": "2.0.0--canary.395.04851d8.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -9,8 +9,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.395.495dc7d.0",
-    "@friggframework/test": "2.0.0--canary.395.495dc7d.0",
+    "@friggframework/schemas": "2.0.0--canary.395.04851d8.0",
+    "@friggframework/test": "2.0.0--canary.395.04851d8.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -32,8 +32,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.395.495dc7d.0",
-    "@friggframework/prettier-config": "2.0.0--canary.395.495dc7d.0",
+    "@friggframework/eslint-config": "2.0.0--canary.395.04851d8.0",
+    "@friggframework/prettier-config": "2.0.0--canary.395.04851d8.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "495dc7d533e5d12c04e51dc04cb696f372682001"
+  "gitHead": "04851d8d253adc1abe6aeae2d8e26e9887d7334b"
 }