@friggframework/devtools 2.0.0--canary.461.ec909cf.0 → 2.0.0--canary.461.7b36f0f.0

package/frigg-cli/__tests__/unit/commands/build.test.js

@@ -52,7 +52,7 @@ describe('CLI Command: build', () => {
       await buildCommand({ stage: 'dev' });
 
       expect(spawnSync).toHaveBeenCalledWith(
-        'serverless',
+        'osls',
         ['package', '--config', 'infrastructure.js', '--stage', 'dev'],
         expect.objectContaining({
           cwd: expect.any(String),
@@ -66,7 +66,7 @@ describe('CLI Command: build', () => {
       await buildCommand({ stage: 'production' });
 
       expect(spawnSync).toHaveBeenCalledWith(
-        'serverless',
+        'osls',
         expect.arrayContaining(['--stage', 'production']),
         expect.any(Object)
       );
@@ -76,7 +76,7 @@ describe('CLI Command: build', () => {
       await buildCommand({ stage: 'staging' });
 
       expect(spawnSync).toHaveBeenCalledWith(
-        'serverless',
+        'osls',
         expect.arrayContaining(['--stage', 'staging']),
         expect.any(Object)
       );
@@ -86,7 +86,7 @@ describe('CLI Command: build', () => {
       await buildCommand({ stage: 'dev', verbose: true });
 
       expect(spawnSync).toHaveBeenCalledWith(
-        'serverless',
+        'osls',
         expect.arrayContaining(['--verbose']),
         expect.any(Object)
       );
@@ -161,7 +161,7 @@ describe('CLI Command: build', () => {
       await buildCommand({ stage: 'dev' });
 
       expect(spawnSync).toHaveBeenCalledWith(
-        'serverless',
+        'osls',
         expect.arrayContaining(['--config', 'infrastructure.js']),
         expect.any(Object)
       );
@@ -188,7 +188,7 @@ describe('CLI Command: build', () => {
       const [cmd, args, opts] = spawnSync.mock.calls[0];
 
       // Verify complete command structure
-      expect(cmd).toBe('serverless');
+      expect(cmd).toBe('osls');
       expect(args).toEqual([
         'package',
         '--config',

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

@@ -19,7 +19,7 @@ async function buildCommand(options) {
     console.log('📦 Packaging serverless application...');
     const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';
-    const command = 'serverless';
+    const command = 'osls';  // OSS-Serverless (drop-in replacement for serverless v3)
     const serverlessArgs = [
         'package',
         '--config',

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

@@ -9,7 +9,7 @@ const PATHS = {
 };
 
 const COMMANDS = {
-    SERVERLESS: 'serverless'
+    SERVERLESS: 'osls'  // OSS-Serverless (drop-in replacement for serverless v3)
 };
 
 /**
@@ -46,7 +46,7 @@ function buildFilteredEnvironment(appDefinedVariables) {
  */
 function loadAppDefinition() {
     const appDefPath = path.join(process.cwd(), PATHS.APP_DEFINITION);
-    
+
     if (!fs.existsSync(appDefPath)) {
         return null;
     }
@@ -71,7 +71,7 @@ function extractEnvironmentVariables(appDefinition) {
     }
 
     console.log('🔧 Loading environment configuration from appDefinition...');
-    
+
     const appDefinedVariables = Object.keys(appDefinition.environment).filter(
         (key) => appDefinition.environment[key] === true
     );
@@ -119,7 +119,7 @@ function validateAndBuildEnvironment(appDefinition, options) {
     } catch (validatorError) {
         // Validator not available, do basic validation
         const missingVariables = appDefinedVariables.filter((variable) => !process.env[variable]);
-        
+
         if (missingVariables.length > 0) {
             console.warn(`⚠️  Warning: Missing ${missingVariables.length} environment variables: ${missingVariables.join(', ')}`);
             console.warn('   These variables are optional and deployment will continue');
@@ -137,7 +137,7 @@ function validateAndBuildEnvironment(appDefinition, options) {
  */
 function executeServerlessDeployment(environment, options) {
     console.log('🚀 Deploying serverless application...');
-    
+
     const serverlessArgs = [
         'deploy',
         '--config',
@@ -168,7 +168,7 @@ async function deployCommand(options) {
 
     const appDefinition = loadAppDefinition();
     const environment = validateAndBuildEnvironment(appDefinition, options);
-    
+
     executeServerlessDeployment(environment, options);
 }
 

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

@@ -4,7 +4,7 @@ const { findNearestBackendPackageJson } = require('../utils/backend-path');
 const { select } = require('@inquirer/prompts');
 
 // Import generators for different formats
-const { generateCloudFormationTemplate } = require('../../infrastructure/iam-generator');
+const { generateCloudFormationTemplate } = require('../../infrastructure/domains/security/iam-generator');
 const { generateTerraformTemplate } = require('./terraform-generator');
 const { generateAzureARMTemplate, generateAzureTerraformTemplate } = require('./azure-generator');
 const { generateGCPDeploymentManagerTemplate, generateGCPTerraformTemplate } = require('./gcp-generator');
@@ -87,7 +87,7 @@ async function generateCommand(options = {}) {
         const backendDir = path.dirname(nearestBackendPackageJson);
         const backendPackageJsonFile = JSON.parse(fs.readFileSync(nearestBackendPackageJson, 'utf8'));
         const appName = backendPackageJsonFile.name || 'frigg-app';
-        
+
         if (options.verbose) {
             console.log('Current directory:', process.cwd());
             console.log('Backend package.json found at:', nearestBackendPackageJson);

package/frigg-cli/generate-iam-command.js

@@ -1,7 +1,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const { findNearestBackendPackageJson } = require('@friggframework/core');
-const { generateIAMCloudFormation, getFeatureSummary } = require('../infrastructure/iam-generator');
+const { generateIAMCloudFormation, getFeatureSummary } = require('../infrastructure/domains/security/iam-generator');
 
 /**
  * Generate IAM CloudFormation stack based on current app definition
@@ -10,7 +10,7 @@ const { generateIAMCloudFormation, getFeatureSummary } = require('../infrastruct
 async function generateIamCommand(options = {}) {
     try {
         console.log('🔍 Finding Frigg application...');
-        
+
         // Find the backend package.json
         const backendPath = findNearestBackendPackageJson();
         if (!backendPath) {
@@ -21,7 +21,7 @@ async function generateIamCommand(options = {}) {
 
         const backendDir = path.dirname(backendPath);
         const backendFilePath = path.join(backendDir, 'index.js');
-        
+
         if (!fs.existsSync(backendFilePath)) {
             console.error('❌ Could not find backend/index.js');
             console.error('   Make sure your Frigg application has a backend/index.js file');
@@ -42,7 +42,7 @@ async function generateIamCommand(options = {}) {
 
         // Get feature summary
         const summary = getFeatureSummary(appDefinition);
-        
+
         console.log('\\n📋 Application Analysis:');
         console.log(`   App Name: ${summary.appName}`);
         console.log(`   Integrations: ${summary.integrationCount}`);
@@ -70,15 +70,15 @@ async function generateIamCommand(options = {}) {
         // Determine output file path
         const outputDir = options.output || path.join(backendDir, 'infrastructure');
         await fs.ensureDir(outputDir);
-        
+
         const outputFile = path.join(outputDir, `${stackName}.yaml`);
-        
+
         // Write the file
         await fs.writeFile(outputFile, cloudFormationYaml);
-        
+
         console.log(`\\n✅ IAM CloudFormation template generated successfully!`);
         console.log(`📄 File: ${outputFile}`);
-        
+
         // Show deployment instructions
         console.log('\\n📚 Next Steps:');
         console.log('\\n1. Deploy the CloudFormation stack:');
@@ -87,13 +87,13 @@ async function generateIamCommand(options = {}) {
         console.log(`     --stack-name ${stackName} \\\\`);
         console.log(`     --capabilities CAPABILITY_NAMED_IAM \\\\`);
         console.log(`     --parameter-overrides DeploymentUserName=${deploymentUserName}`);
-        
+
         console.log('\\n2. Retrieve credentials:');
         console.log(`   aws cloudformation describe-stacks \\\\`);
         console.log(`     --stack-name ${stackName} \\\\`);
         console.log(`     --query 'Stacks[0].Outputs[?OutputKey==\`AccessKeyId\`].OutputValue' \\\\`);
         console.log(`     --output text`);
-        
+
         console.log('\\n3. Get secret access key:');
         console.log(`   aws secretsmanager get-secret-value \\\\`);
         console.log(`     --secret-id frigg-deployment-credentials \\\\`);

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

@@ -44,7 +44,7 @@ async function startCommand(options) {
     const backendPath = path.resolve(process.cwd());
     console.log(`Starting backend in ${backendPath}...`);
     const infrastructurePath = 'infrastructure.js';
-    const command = 'serverless';
+    const command = 'osls';  // OSS-Serverless (drop-in replacement for serverless v3)
     const args = [
         'offline',
         '--config',

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

@@ -107,7 +107,7 @@ describe('startCommand', () => {
         await startCommand(options);
 
         expect(spawn).toHaveBeenCalledWith(
-            'serverless',
+            'osls',
             ['offline', '--config', 'infrastructure.js', '--stage', 'prod'],
             expect.objectContaining({
                 cwd: expect.any(String),
@@ -125,7 +125,7 @@ describe('startCommand', () => {
         await startCommand(options);
 
         expect(spawn).toHaveBeenCalledWith(
-            'serverless',
+            'osls',
             ['offline', '--config', 'infrastructure.js', '--stage', 'dev', '--verbose'],
             expect.any(Object)
         );
@@ -280,7 +280,7 @@ describe('startCommand', () => {
             await startCommand({ stage: 'dev' });
 
             expect(spawn).toHaveBeenCalledWith(
-                'serverless',
+                'osls',
                 expect.arrayContaining(['offline']),
                 expect.any(Object)
             );

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

@@ -107,45 +107,38 @@ async function testDatabaseConnection(databaseUrl, dbType, timeout = 5000) {
 
 /**
  * Checks if Prisma client is generated for the database type
- * Uses require.resolve to find the client in node_modules
+ * Checks for the generated client directory in @friggframework/core/generated
  *
  * @param {'mongodb'|'postgresql'} dbType - Database type
  * @param {string} projectRoot - Project root directory (used for require.resolve context)
  * @returns {Object} { generated: boolean, path?: string, error?: string }
  */
 function checkPrismaClientGenerated(dbType, projectRoot = process.cwd()) {
-    const clientPackageName = `@prisma-${dbType}/client`;
-
     try {
-        // First, resolve where @friggframework/core actually is
+        // 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: [
-                corePackageDir,  // Look in the actual core package location
-                projectRoot      // Fallback to project root
-            ]
-        });
-
-        return {
-            generated: true,
-            path: path.dirname(clientPath)
-        };
+        // Check for the generated client directory (same path core uses)
+        const clientPath = path.join(corePackageDir, 'generated', `prisma-${dbType}`);
+        const clientIndexPath = path.join(clientPath, 'index.js');
 
-    } catch (error) {
-        // require.resolve throws MODULE_NOT_FOUND if the client doesn't exist
-        if (error.code === 'MODULE_NOT_FOUND') {
+        if (fs.existsSync(clientIndexPath)) {
             return {
-                generated: false,
-                error: `Prisma client for ${dbType} (${clientPackageName}) not found. Run 'frigg db:setup' to generate it.`
+                generated: true,
+                path: clientPath
             };
         }
 
+        return {
+            generated: false,
+            error: `Prisma client for ${dbType} not found at ${clientPath}. Run 'frigg db:setup' to generate it.`
+        };
+
+    } catch (error) {
         return {
             generated: false,
             error: `Failed to check Prisma client: ${error.message}`