@friggframework/devtools 2.0.0--canary.606.7d3473f.0 → 2.0.0--canary.608.ba60ba6.0

package/infrastructure/domains/shared/utilities/base-definition-factory.js

@@ -1,8 +1,8 @@
 /**
  * Base Serverless Definition Factory
- * 
+ *
  * Utility Layer - Hexagonal Architecture
- * 
+ *
  * Creates the base serverless.yml configuration with core functions,
  * resources, plugins, and provider settings.
  */
@@ -11,14 +11,14 @@ const { buildEnvironment } = require('../environment-builder');
 
 /**
  * Create base serverless definition with core functions and resources
- * 
+ *
  * This creates the foundation serverless configuration that all
  * Frigg applications need, including:
  * - Core Lambda functions (auth, user, health, dbMigrate)
  * - Error handling infrastructure (SQS, SNS, CloudWatch)
  * - Prisma Lambda Layer (optional)
  * - Base plugins and esbuild configuration
- * 
+ *
  * @param {Object} AppDefinition - Application definition
  * @param {Object} appEnvironmentVars - Environment variables from app definition
  * @param {Object} discoveredResources - AWS resources discovered during build
@@ -39,18 +39,25 @@ function createBaseDefinition(
         // Explicitly include project files that handlers need
         include: [
             // Include DocumentDB TLS certificate if configured
-            ...(AppDefinition.database?.documentDB?.tlsCAFile 
-                ? [AppDefinition.database.documentDB.tlsCAFile.replace(/^\.\//, '')] 
+            ...(AppDefinition.database?.documentDB?.tlsCAFile
+                ? [
+                      AppDefinition.database.documentDB.tlsCAFile.replace(
+                          /^\.\//,
+                          ''
+                      ),
+                  ]
                 : []),
         ],
         exclude: [
             // Exclude Prisma (provided via Lambda Layer)
-            ...(usePrismaLayer ? [
-                'node_modules/@prisma/**',
-                'node_modules/.prisma/**',
-                'node_modules/prisma/**',
-                'node_modules/@friggframework/core/generated/**',
-            ] : []),
+            ...(usePrismaLayer
+                ? [
+                      'node_modules/@prisma/**',
+                      'node_modules/.prisma/**',
+                      'node_modules/prisma/**',
+                      'node_modules/@friggframework/core/generated/**',
+                  ]
+                : []),
 
             // Exclude AWS SDK (provided by Lambda runtime)
             'node_modules/aws-sdk/**',
@@ -119,12 +126,14 @@ function createBaseDefinition(
             'node_modules/@aws-sdk/**',
 
             // Exclude Prisma (provided via Lambda Layer)
-            ...(usePrismaLayer ? [
-                'node_modules/@prisma/**',
-                'node_modules/.prisma/**',
-                'node_modules/prisma/**',
-                'node_modules/@friggframework/core/generated/**',
-            ] : []),
+            ...(usePrismaLayer
+                ? [
+                      'node_modules/@prisma/**',
+                      'node_modules/.prisma/**',
+                      'node_modules/prisma/**',
+                      'node_modules/@friggframework/core/generated/**',
+                  ]
+                : []),
 
             // Exclude nested node_modules from symlinked frigg packages (for npm link development)
             'node_modules/@friggframework/core/node_modules/**',
@@ -174,12 +183,17 @@ function createBaseDefinition(
         useDotenv: process.argv.includes('offline'),
         provider: {
             name: AppDefinition.provider || 'aws',
-            ...(process.env.AWS_PROFILE && { profile: process.env.AWS_PROFILE }),
-            runtime: 'nodejs22.x',  // Node.js 22.x (latest Lambda runtime with AWS SDK v3)
-            timeout: 29,  // Set to 29s to give buffer before API Gateway's 30s timeout
+            ...(process.env.AWS_PROFILE && {
+                profile: process.env.AWS_PROFILE,
+            }),
+            runtime: 'nodejs22.x', // Node.js 22.x (latest Lambda runtime with AWS SDK v3)
+            timeout: 29, // Set to 29s to give buffer before API Gateway's 30s timeout
             region,
             stage: '${opt:stage}',
-            environment: buildEnvironment(appEnvironmentVars, discoveredResources),
+            environment: buildEnvironment(
+                appEnvironmentVars,
+                discoveredResources
+            ),
             iamRoleStatements: [
                 {
                     Effect: 'Allow',
@@ -196,6 +210,10 @@ function createBaseDefinition(
                     ],
                     Resource: [
                         { 'Fn::GetAtt': ['InternalErrorQueue', 'Arn'] },
+                        // Explicit ARN: the per-integration glob below ends in
+                        // "-*Queue" and does NOT match the ".fifo" suffix, so the
+                        // app-level FIFO queue must be listed directly.
+                        { 'Fn::GetAtt': ['FriggUserActionQueue', 'Arn'] },
                         {
                             'Fn::Join': [
                                 ':',
@@ -222,7 +240,9 @@ function createBaseDefinition(
         plugins: [
             'serverless-esbuild',
             // Only load dotenv plugin for offline mode
-            ...(process.argv.includes('offline') ? ['serverless-dotenv-plugin'] : []),
+            ...(process.argv.includes('offline')
+                ? ['serverless-dotenv-plugin']
+                : []),
             'serverless-offline-sqs',
             'serverless-offline',
             '@friggframework/serverless-plugin',
@@ -238,33 +258,32 @@ function createBaseDefinition(
                 external: [
                     '@aws-sdk/*',
                     'aws-sdk',
-                    ...(usePrismaLayer ? [
-                        '@prisma/client',
-                        'prisma',
-                        '.prisma/*',
-                    ] : []),
+                    ...(usePrismaLayer
+                        ? ['@prisma/client', 'prisma', '.prisma/*']
+                        : []),
                 ],
                 packager: 'npm',
                 keepNames: true,
-                keepOutputDirectory: true,  // Keep .esbuild directory to prevent ENOENT errors during packaging
+                keepOutputDirectory: true, // Keep .esbuild directory to prevent ENOENT errors during packaging
                 exclude: [
                     'aws-sdk',
                     '@aws-sdk/*',
-                    ...(usePrismaLayer ? [
-                        '@prisma/client',
-                        'prisma',
-                    ] : []),
+                    ...(usePrismaLayer ? ['@prisma/client', 'prisma'] : []),
                 ],
                 // Reduce file scanning overhead - tell esbuild to skip these during watch/scan but still bundle them
                 watch: {
-                    ignore: ['node_modules/@aws-sdk/**', 'node_modules/@babel/**', 'node_modules/@smithy/**']
+                    ignore: [
+                        'node_modules/@aws-sdk/**',
+                        'node_modules/@babel/**',
+                        'node_modules/@smithy/**',
+                    ],
                 },
             },
             'serverless-offline': {
                 httpPort: 3001,
                 lambdaPort: 4001,
                 websocketPort: 3002,
-                location: '.',  // Set base directory for handler resolution to current directory
+                location: '.', // Set base directory for handler resolution to current directory
                 skipCacheInvalidation: false,
             },
             'serverless-offline-sqs': {
@@ -279,9 +298,12 @@ function createBaseDefinition(
         },
         functions: {
             auth: {
-                handler: 'node_modules/@friggframework/core/handlers/routers/auth.handler',
-                ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
-                skipEsbuild: true,  // Handlers in node_modules don't need bundling
+                handler:
+                    'node_modules/@friggframework/core/handlers/routers/auth.handler',
+                ...(usePrismaLayer && {
+                    layers: [{ Ref: 'PrismaLambdaLayer' }],
+                }),
+                skipEsbuild: true, // Handlers in node_modules don't need bundling
                 package: skipEsbuildPackageConfig,
                 events: [
                     { httpApi: { path: '/api/integrations', method: 'ANY' } },
@@ -295,34 +317,63 @@ function createBaseDefinition(
                 ],
             },
             user: {
-                handler: 'node_modules/@friggframework/core/handlers/routers/user.handler',
-                ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
-                skipEsbuild: true,  // Handlers in node_modules don't need bundling
+                handler:
+                    'node_modules/@friggframework/core/handlers/routers/user.handler',
+                ...(usePrismaLayer && {
+                    layers: [{ Ref: 'PrismaLambdaLayer' }],
+                }),
+                skipEsbuild: true, // Handlers in node_modules don't need bundling
                 package: skipEsbuildPackageConfig,
-                events: [{ httpApi: { path: '/user/{proxy+}', method: 'ANY' } }],
+                events: [
+                    { httpApi: { path: '/user/{proxy+}', method: 'ANY' } },
+                ],
             },
             health: {
-                handler: 'node_modules/@friggframework/core/handlers/routers/health.handler',
-                ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
-                skipEsbuild: true,  // Handlers in node_modules don't need bundling
+                handler:
+                    'node_modules/@friggframework/core/handlers/routers/health.handler',
+                ...(usePrismaLayer && {
+                    layers: [{ Ref: 'PrismaLambdaLayer' }],
+                }),
+                skipEsbuild: true, // Handlers in node_modules don't need bundling
                 package: skipEsbuildPackageConfig,
                 events: [
                     { httpApi: { path: '/health', method: 'GET' } },
                     { httpApi: { path: '/health/{proxy+}', method: 'GET' } },
                 ],
             },
+            reporting: {
+                handler:
+                    'node_modules/@friggframework/core/handlers/routers/reporting.handler',
+                ...(usePrismaLayer && {
+                    layers: [{ Ref: 'PrismaLambdaLayer' }],
+                }),
+                skipEsbuild: true, // Handlers in node_modules don't need bundling
+                package: skipEsbuildPackageConfig,
+                events: [
+                    { httpApi: { path: '/api/v2/reports', method: 'GET' } },
+                    {
+                        httpApi: {
+                            path: '/api/v2/reports/{proxy+}',
+                            method: 'GET',
+                        },
+                    },
+                ],
+            },
             // Note: dbMigrate removed - MigrationBuilder now handles migration infrastructure
             // See: packages/devtools/infrastructure/domains/database/migration-builder.js
         },
-        layers: usePrismaLayer ? {
-            prisma: {
-                path: 'layers/prisma',
-                name: '${self:service}-prisma-${sls:stage}',
-                description: 'Prisma runtime client only (NO CLI) with rhel-openssl-3.0.x binaries (~10-15MB). CLI packaged separately in dbMigrate function.',
-                compatibleRuntimes: ['nodejs20.x', 'nodejs22.x'],
-                retain: false,
-            },
-        } : {},
+        layers: usePrismaLayer
+            ? {
+                  prisma: {
+                      path: 'layers/prisma',
+                      name: '${self:service}-prisma-${sls:stage}',
+                      description:
+                          'Prisma runtime client only (NO CLI) with rhel-openssl-3.0.x binaries (~10-15MB). CLI packaged separately in dbMigrate function.',
+                      compatibleRuntimes: ['nodejs20.x', 'nodejs22.x'],
+                      retain: false,
+                  },
+              }
+            : {},
         resources: {
             Resources: {
                 InternalErrorQueue: {
@@ -405,4 +456,3 @@ function createBaseDefinition(
 module.exports = {
     createBaseDefinition,
 };
-

package/infrastructure/domains/shared/utilities/base-definition-factory.test.js

@@ -1,6 +1,6 @@
 /**
  * Tests for Base Definition Factory
- * 
+ *
  * Tests creation of base serverless configuration
  */
 
@@ -20,7 +20,11 @@ describe('Base Definition Factory', () => {
             const appEnvironmentVars = {};
             const discoveredResources = {};
 
-            const result = createBaseDefinition(appDefinition, appEnvironmentVars, discoveredResources);
+            const result = createBaseDefinition(
+                appDefinition,
+                appEnvironmentVars,
+                discoveredResources
+            );
 
             expect(result.service).toBe('test-app');
             expect(result.frameworkVersion).toBe('>=3.17.0');
@@ -52,7 +56,9 @@ describe('Base Definition Factory', () => {
             const result = createBaseDefinition({}, {}, {});
 
             expect(result.provider.region).toBe('eu-west-1');
-            expect(result.custom['serverless-offline-sqs'].region).toBe('eu-west-1');
+            expect(result.custom['serverless-offline-sqs'].region).toBe(
+                'eu-west-1'
+            );
         });
 
         it('should default to us-east-1 region', () => {
@@ -92,8 +98,12 @@ describe('Base Definition Factory', () => {
         it('should configure auth function correctly', () => {
             const result = createBaseDefinition({}, {}, {});
 
-            expect(result.functions.auth.handler).toBe('node_modules/@friggframework/core/handlers/routers/auth.handler');
-            expect(result.functions.auth.layers).toEqual([{ Ref: 'PrismaLambdaLayer' }]);
+            expect(result.functions.auth.handler).toBe(
+                'node_modules/@friggframework/core/handlers/routers/auth.handler'
+            );
+            expect(result.functions.auth.layers).toEqual([
+                { Ref: 'PrismaLambdaLayer' },
+            ]);
             expect(result.functions.auth.events).toHaveLength(3);
         });
 
@@ -109,15 +119,21 @@ describe('Base Definition Factory', () => {
 
             expect(result.layers.prisma).toBeDefined();
             expect(result.layers.prisma.path).toBe('layers/prisma');
-            expect(result.layers.prisma.description).toContain('runtime client only');
+            expect(result.layers.prisma.description).toContain(
+                'runtime client only'
+            );
         });
 
         it('should include error handling resources', () => {
             const result = createBaseDefinition({}, {}, {});
 
             expect(result.resources.Resources.InternalErrorQueue).toBeDefined();
-            expect(result.resources.Resources.InternalErrorBridgeTopic).toBeDefined();
-            expect(result.resources.Resources.InternalErrorBridgePolicy).toBeDefined();
+            expect(
+                result.resources.Resources.InternalErrorBridgeTopic
+            ).toBeDefined();
+            expect(
+                result.resources.Resources.InternalErrorBridgePolicy
+            ).toBeDefined();
             expect(result.resources.Resources.ApiGatewayAlarm5xx).toBeDefined();
         });
 
@@ -125,14 +141,20 @@ describe('Base Definition Factory', () => {
             const result = createBaseDefinition({}, {}, {});
 
             const snsPermission = result.provider.iamRoleStatements.find(
-                stmt => stmt.Action.includes('sns:Publish')
+                (stmt) => stmt.Action.includes('sns:Publish')
             );
             expect(snsPermission).toBeDefined();
 
             const sqsPermission = result.provider.iamRoleStatements.find(
-                stmt => stmt.Action.includes('sqs:SendMessage')
+                (stmt) => stmt.Action.includes('sqs:SendMessage')
             );
             expect(sqsPermission).toBeDefined();
+
+            // The per-integration glob ends in "-*Queue" and won't match the
+            // ".fifo" app-level queue, so its ARN must be listed explicitly.
+            expect(sqsPermission.Resource).toContainEqual({
+                'Fn::GetAtt': ['FriggUserActionQueue', 'Arn'],
+            });
         });
 
         it('should include required plugins', () => {
@@ -142,7 +164,9 @@ describe('Base Definition Factory', () => {
             // serverless-dotenv-plugin is conditionally loaded only in offline mode
             expect(result.plugins).toContain('serverless-offline-sqs');
             expect(result.plugins).toContain('serverless-offline');
-            expect(result.plugins).toContain('@friggframework/serverless-plugin');
+            expect(result.plugins).toContain(
+                '@friggframework/serverless-plugin'
+            );
         });
 
         it('should configure esbuild correctly', () => {
@@ -170,16 +194,26 @@ describe('Base Definition Factory', () => {
 
             const result = createBaseDefinition({}, appEnvironmentVars, {});
 
-            expect(result.provider.environment.API_KEY).toBe("${env:API_KEY, ''}");
-            expect(result.provider.environment.CUSTOM_VAR).toBe("${env:CUSTOM_VAR, ''}");
+            expect(result.provider.environment.API_KEY).toBe(
+                "${env:API_KEY, ''}"
+            );
+            expect(result.provider.environment.CUSTOM_VAR).toBe(
+                "${env:CUSTOM_VAR, ''}"
+            );
         });
 
         it('should add standard Frigg environment variables', () => {
             const result = createBaseDefinition({}, {}, {});
 
-            expect(result.provider.environment.FRIGG_STACK).toBe('${self:service}');
-            expect(result.provider.environment.FRIGG_STAGE).toBe('${self:provider.stage}');
-            expect(result.provider.environment.FRIGG_REGION).toBe('${self:provider.region}');
+            expect(result.provider.environment.FRIGG_STACK).toBe(
+                '${self:service}'
+            );
+            expect(result.provider.environment.FRIGG_STAGE).toBe(
+                '${self:provider.stage}'
+            );
+            expect(result.provider.environment.FRIGG_REGION).toBe(
+                '${self:provider.region}'
+            );
         });
 
         it('should add KMS key ARN from discovered resources', () => {
@@ -189,7 +223,9 @@ describe('Base Definition Factory', () => {
 
             const result = createBaseDefinition({}, {}, discoveredResources);
 
-            expect(result.provider.environment.KMS_KEY_ARN).toBe('arn:aws:kms:us-east-1:123:key/abc');
+            expect(result.provider.environment.KMS_KEY_ARN).toBe(
+                'arn:aws:kms:us-east-1:123:key/abc'
+            );
         });
 
         it('should add database connection info from discovered resources', () => {
@@ -200,18 +236,23 @@ describe('Base Definition Factory', () => {
 
             const result = createBaseDefinition({}, {}, discoveredResources);
 
-            expect(result.provider.environment.DATABASE_HOST).toBe('db.example.com');
+            expect(result.provider.environment.DATABASE_HOST).toBe(
+                'db.example.com'
+            );
             expect(result.provider.environment.DATABASE_PORT).toBe('5432');
         });
 
         it('should add database secret ARN from discovered resources', () => {
             const discoveredResources = {
-                databaseSecretArn: 'arn:aws:secretsmanager:us-east-1:123:secret:db',
+                databaseSecretArn:
+                    'arn:aws:secretsmanager:us-east-1:123:secret:db',
             };
 
             const result = createBaseDefinition({}, {}, discoveredResources);
 
-            expect(result.provider.environment.DATABASE_SECRET_ARN).toBe('arn:aws:secretsmanager:us-east-1:123:secret:db');
+            expect(result.provider.environment.DATABASE_SECRET_ARN).toBe(
+                'arn:aws:secretsmanager:us-east-1:123:secret:db'
+            );
         });
 
         it('should configure serverless-offline ports', () => {
@@ -219,15 +260,23 @@ describe('Base Definition Factory', () => {
 
             expect(result.custom['serverless-offline'].httpPort).toBe(3001);
             expect(result.custom['serverless-offline'].lambdaPort).toBe(4001);
-            expect(result.custom['serverless-offline'].websocketPort).toBe(3002);
+            expect(result.custom['serverless-offline'].websocketPort).toBe(
+                3002
+            );
         });
 
         it('should configure serverless-offline-sqs for LocalStack', () => {
             const result = createBaseDefinition({}, {}, {});
 
-            expect(result.custom['serverless-offline-sqs'].endpoint).toBe('http://localhost:4566');
-            expect(result.custom['serverless-offline-sqs'].accessKeyId).toBe('root');
-            expect(result.custom['serverless-offline-sqs'].secretAccessKey).toBe('root');
+            expect(result.custom['serverless-offline-sqs'].endpoint).toBe(
+                'http://localhost:4566'
+            );
+            expect(result.custom['serverless-offline-sqs'].accessKeyId).toBe(
+                'root'
+            );
+            expect(
+                result.custom['serverless-offline-sqs'].secretAccessKey
+            ).toBe('root');
         });
 
         it('should set package.individually to true', () => {
@@ -249,7 +298,9 @@ describe('Base Definition Factory', () => {
                 const result = createBaseDefinition({}, {}, {});
 
                 expect(result.layers.prisma).toBeDefined();
-                expect(result.functions.auth.layers).toEqual([{ Ref: 'PrismaLambdaLayer' }]);
+                expect(result.functions.auth.layers).toEqual([
+                    { Ref: 'PrismaLambdaLayer' },
+                ]);
                 expect(result.functions.auth.package.exclude).toEqual(
                     expect.arrayContaining([
                         'node_modules/@prisma/**',
@@ -283,9 +334,10 @@ describe('Base Definition Factory', () => {
 
             it('defaults to usePrismaLayer=true when omitted', () => {
                 const result = createBaseDefinition({}, {}, {});
-                expect(result.functions.auth.layers).toEqual([{ Ref: 'PrismaLambdaLayer' }]);
+                expect(result.functions.auth.layers).toEqual([
+                    { Ref: 'PrismaLambdaLayer' },
+                ]);
             });
         });
     });
 });
-

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.606.7d3473f.0",
+  "version": "2.0.0--canary.608.ba60ba6.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -25,9 +25,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.606.7d3473f.0",
-    "@friggframework/schemas": "2.0.0--canary.606.7d3473f.0",
-    "@friggframework/test": "2.0.0--canary.606.7d3473f.0",
+    "@friggframework/core": "2.0.0--canary.608.ba60ba6.0",
+    "@friggframework/schemas": "2.0.0--canary.608.ba60ba6.0",
+    "@friggframework/test": "2.0.0--canary.608.ba60ba6.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.18.0",
@@ -55,8 +55,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.606.7d3473f.0",
-    "@friggframework/prettier-config": "2.0.0--canary.606.7d3473f.0",
+    "@friggframework/eslint-config": "2.0.0--canary.608.ba60ba6.0",
+    "@friggframework/prettier-config": "2.0.0--canary.608.ba60ba6.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7d3473f1b054f3233a49461d117116dfd7d06499"
+  "gitHead": "ba60ba64c680647ce1fdb2e5453b29acc38d6f49"
 }