@friggframework/devtools 2.0.0--canary.497.a3f25f9.0 → 2.0.0--canary.490.fd1ef7f.0

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

@@ -16,18 +16,20 @@ const { buildEnvironment } = require('../environment-builder');
  * Frigg applications need, including:
  * - Core Lambda functions (auth, user, health, dbMigrate)
  * - Error handling infrastructure (SQS, SNS, CloudWatch)
- * - Prisma Lambda Layer
+ * - Prisma Lambda Layer (optional, controlled by usePrismaLayer)
  * - 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
+ * @param {boolean} usePrismaLayer - Whether to use Prisma Lambda Layer (default true)
  * @returns {Object} Base serverless definition
  */
 function createBaseDefinition(
     AppDefinition,
     appEnvironmentVars,
-    discoveredResources
+    discoveredResources,
+    usePrismaLayer = true
 ) {
     const region = process.env.AWS_REGION || 'us-east-1';
 
@@ -42,11 +44,13 @@ function createBaseDefinition(
                 : []),
         ],
         exclude: [
-            // Exclude Prisma (provided via Lambda Layer)
-            'node_modules/@prisma/**',
-            'node_modules/.prisma/**',
-            'node_modules/prisma/**',
-            'node_modules/@friggframework/core/generated/**',
+            // Conditionally exclude Prisma (only if using Lambda Layer)
+            ...(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/**',
@@ -218,9 +222,12 @@ function createBaseDefinition(
                 external: [
                     '@aws-sdk/*',
                     'aws-sdk',
-                    '@prisma/client',
-                    'prisma',
-                    '.prisma/*',
+                    // Conditionally mark Prisma as external (only if using layer)
+                    ...(usePrismaLayer ? [
+                        '@prisma/client',
+                        'prisma',
+                        '.prisma/*',
+                    ] : []),
                 ],
                 packager: 'npm',
                 keepNames: true,
@@ -228,8 +235,11 @@ function createBaseDefinition(
                 exclude: [
                     'aws-sdk',
                     '@aws-sdk/*',
-                    '@prisma/client',
-                    'prisma',
+                    // Conditionally exclude Prisma (only if using layer)
+                    ...(usePrismaLayer ? [
+                        '@prisma/client',
+                        'prisma',
+                    ] : []),
                 ],
             },
             'serverless-offline': {
@@ -252,7 +262,7 @@ function createBaseDefinition(
         functions: {
             auth: {
                 handler: 'node_modules/@friggframework/core/handlers/routers/auth.handler',
-                layers: [{ Ref: 'PrismaLambdaLayer' }],
+                ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
                 skipEsbuild: true,  // Handlers in node_modules don't need bundling
                 package: skipEsbuildPackageConfig,
                 events: [
@@ -268,14 +278,14 @@ function createBaseDefinition(
             },
             user: {
                 handler: 'node_modules/@friggframework/core/handlers/routers/user.handler',
-                layers: [{ Ref: 'PrismaLambdaLayer' }],
+                ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
                 skipEsbuild: true,  // Handlers in node_modules don't need bundling
                 package: skipEsbuildPackageConfig,
                 events: [{ httpApi: { path: '/user/{proxy+}', method: 'ANY' } }],
             },
             health: {
                 handler: 'node_modules/@friggframework/core/handlers/routers/health.handler',
-                layers: [{ Ref: 'PrismaLambdaLayer' }],
+                ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
                 skipEsbuild: true,  // Handlers in node_modules don't need bundling
                 package: skipEsbuildPackageConfig,
                 events: [
@@ -286,7 +296,7 @@ function createBaseDefinition(
             // Note: dbMigrate removed - MigrationBuilder now handles migration infrastructure
             // See: packages/devtools/infrastructure/domains/database/migration-builder.js
         },
-        layers: {
+        layers: usePrismaLayer ? {
             prisma: {
                 path: 'layers/prisma',
                 name: '${self:service}-prisma-${sls:stage}',
@@ -294,7 +304,7 @@ function createBaseDefinition(
                 compatibleRuntimes: ['nodejs20.x', 'nodejs22.x'],
                 retain: false,
             },
-        },
+        } : {},
         resources: {
             Resources: {
                 InternalErrorQueue: {

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

@@ -243,6 +243,79 @@ describe('Base Definition Factory', () => {
             expect(result.useDotenv).toBeDefined();
             expect(typeof result.useDotenv).toBe('boolean');
         });
+
+        describe('usePrismaLayer configuration', () => {
+            it('should include Prisma layer by default (usePrismaLayer=true)', () => {
+                const result = createBaseDefinition({}, {}, {}, true);
+
+                // Layer definition should exist
+                expect(result.layers.prisma).toBeDefined();
+                expect(result.layers.prisma.path).toBe('layers/prisma');
+
+                // Functions should reference the layer
+                expect(result.functions.auth.layers).toEqual([{ Ref: 'PrismaLambdaLayer' }]);
+                expect(result.functions.user.layers).toEqual([{ Ref: 'PrismaLambdaLayer' }]);
+                expect(result.functions.health.layers).toEqual([{ Ref: 'PrismaLambdaLayer' }]);
+
+                // Prisma should be excluded from packages
+                expect(result.functions.auth.package.exclude).toEqual(
+                    expect.arrayContaining([
+                        'node_modules/@prisma/**',
+                        'node_modules/.prisma/**',
+                        'node_modules/prisma/**',
+                        'node_modules/@friggframework/core/generated/**',
+                    ])
+                );
+
+                // Prisma should be external in esbuild
+                expect(result.custom.esbuild.external).toContain('@prisma/client');
+                expect(result.custom.esbuild.external).toContain('prisma');
+                expect(result.custom.esbuild.exclude).toContain('@prisma/client');
+                expect(result.custom.esbuild.exclude).toContain('prisma');
+            });
+
+            it('should NOT include Prisma layer when usePrismaLayer=false', () => {
+                const result = createBaseDefinition({}, {}, {}, false);
+
+                // Layer definition should NOT exist
+                expect(result.layers).toEqual({});
+
+                // Functions should NOT have layer references
+                expect(result.functions.auth.layers).toBeUndefined();
+                expect(result.functions.user.layers).toBeUndefined();
+                expect(result.functions.health.layers).toBeUndefined();
+            });
+
+            it('should bundle Prisma with functions when usePrismaLayer=false', () => {
+                const result = createBaseDefinition({}, {}, {}, false);
+
+                // Prisma should NOT be excluded from packages
+                expect(result.functions.auth.package.exclude).not.toEqual(
+                    expect.arrayContaining([
+                        'node_modules/@prisma/**',
+                        'node_modules/.prisma/**',
+                        'node_modules/prisma/**',
+                        'node_modules/@friggframework/core/generated/**',
+                    ])
+                );
+
+                // Prisma should NOT be external in esbuild
+                expect(result.custom.esbuild.external).not.toContain('@prisma/client');
+                expect(result.custom.esbuild.external).not.toContain('prisma');
+                expect(result.custom.esbuild.external).not.toContain('.prisma/*');
+                expect(result.custom.esbuild.exclude).not.toContain('@prisma/client');
+                expect(result.custom.esbuild.exclude).not.toContain('prisma');
+            });
+
+            it('should default to usePrismaLayer=true when parameter not provided', () => {
+                // Call without 4th parameter
+                const result = createBaseDefinition({}, {}, {});
+
+                // Should behave as if usePrismaLayer=true
+                expect(result.layers.prisma).toBeDefined();
+                expect(result.functions.auth.layers).toEqual([{ Ref: 'PrismaLambdaLayer' }]);
+            });
+        });
     });
 });
 

package/infrastructure/infrastructure-composer.js

@@ -32,8 +32,15 @@ const { validateAndCleanPlugins, validatePackagingConfiguration } = require('./d
 const composeServerlessDefinition = async (AppDefinition) => {
     console.log('🏗️  Composing serverless definition with domain builders...');
 
-    // Ensure Prisma layer exists (minimal, runtime only)
-    await ensurePrismaLayerExists(AppDefinition.database || {});
+    // Determine if using Prisma Lambda Layer (default true)
+    const usePrismaLayer = AppDefinition.usePrismaLambdaLayer !== false;
+
+    // Ensure Prisma layer exists only if using layer mode
+    if (usePrismaLayer) {
+        await ensurePrismaLayerExists(AppDefinition.database || {});
+    } else {
+        console.log('📦 Skipping Prisma Lambda Layer (usePrismaLambdaLayer=false - will bundle with functions)');
+    }
 
     // Create orchestrator with all domain builders
     const orchestrator = new BuilderOrchestrator([
@@ -55,7 +62,8 @@ const composeServerlessDefinition = async (AppDefinition) => {
     const definition = createBaseDefinition(
         AppDefinition,
         appEnvironmentVars,
-        discoveredResources
+        discoveredResources,
+        usePrismaLayer
     );
 
     // Merge builder results into definition

package/infrastructure/scripts/build-prisma-layer.js

@@ -10,8 +10,8 @@
  * The CLI is only needed for migrations and is packaged separately with the dbMigrate function.
  *
  * The layer is configured based on AppDefinition database settings:
- * - PostgreSQL: Includes PostgreSQL client + query engine + migrations
- * - MongoDB: Includes MongoDB client + query engine + migrations (if needed)
+ * - PostgreSQL: Includes PostgreSQL client + query engine only
+ * - MongoDB: Includes MongoDB client + query engine only (if needed)
  * - Defaults to PostgreSQL only if not specified
  *
  * Usage:
@@ -22,11 +22,7 @@
  *   layers/prisma/nodejs/node_modules/
  *   ├── @prisma/client (runtime only, ~10-15MB)
  *   ├── generated/prisma-postgresql (if PostgreSQL enabled)
- *   │   ├── schema.prisma
- *   │   └── migrations/
  *   └── generated/prisma-mongodb (if MongoDB enabled)
- *       ├── schema.prisma
- *       └── migrations/
  *
  * See: LAMBDA-LAYER-PRISMA.md for complete documentation
  */
@@ -89,27 +85,6 @@ function getGeneratedClientPackages(databaseConfig = {}) {
     return packages;
 }
 
-function getMigrationsPackages(clientPackages) {
-    return clientPackages.map(pkg => ({
-        dbType: pkg.replace('generated/prisma-', ''),
-        clientPackage: pkg
-    }));
-}
-
-function getMigrationSourcePath(searchPaths, dbType) {
-    for (const searchPath of searchPaths) {
-        const candidatePath = path.join(searchPath, `prisma-${dbType}`, 'migrations');
-        if (fs.existsSync(candidatePath)) {
-            return candidatePath;
-        }
-    }
-    return null;
-}
-
-function getMigrationDestinationPath(layerNodeModules, clientPackage) {
-    return path.join(layerNodeModules, clientPackage, 'migrations');
-}
-
 // Configuration
 // Script runs from integration project root (e.g., backend/)
 // and reads Prisma packages from @friggframework/core
@@ -324,47 +299,11 @@ async function copyPrismaPackages(clientPackages) {
     logSuccess(`Copied ${copiedCount} generated client packages from @friggframework/core`);
 }
 
-async function copyMigrations(clientPackages) {
-    logStep(5, 'Copying migrations from @friggframework/core');
-
-    const workspaceNodeModules = path.join(path.dirname(CORE_PACKAGE_PATH), '..');
-    const searchPaths = [
-        path.join(CORE_PACKAGE_PATH, 'node_modules'),
-        path.join(PROJECT_ROOT, 'node_modules'),
-        workspaceNodeModules,
-        CORE_PACKAGE_PATH,
-    ];
-
-    const migrations = getMigrationsPackages(clientPackages);
-    let copiedCount = 0;
-
-    for (const { dbType, clientPackage } of migrations) {
-        const sourcePath = getMigrationSourcePath(searchPaths, dbType);
-
-        if (sourcePath) {
-            const destPath = getMigrationDestinationPath(LAYER_NODE_MODULES, clientPackage);
-            await fs.copy(sourcePath, destPath, { dereference: true });
-            
-            const fromLocation = sourcePath.includes('@friggframework/core/prisma')
-                ? 'core package'
-                : 'workspace';
-            logSuccess(`Copied migrations for ${dbType} (from ${fromLocation})`);
-            copiedCount++;
-        } else {
-            logWarning(`Migrations not found for ${dbType} - this may cause migration failures`);
-        }
-    }
-
-    if (copiedCount > 0) {
-        logSuccess(`Copied migrations for ${copiedCount} database ${copiedCount === 1 ? 'type' : 'types'}`);
-    }
-}
-
 /**
  * Remove unnecessary files to reduce layer size
  */
 async function removeUnnecessaryFiles() {
-    logStep(6, 'Removing unnecessary files (source maps, docs, tests)');
+    logStep(5, 'Removing unnecessary files (source maps, docs, tests)');
 
     let removedCount = 0;
     let totalSize = 0;
@@ -402,7 +341,7 @@ async function removeUnnecessaryFiles() {
  * Remove non-rhel engine binaries to reduce layer size
  */
 async function removeNonRhelBinaries() {
-    logStep(7, 'Removing non-rhel engine binaries');
+    logStep(6, 'Removing non-rhel engine binaries');
 
     let removedCount = 0;
     let totalSize = 0;
@@ -441,7 +380,7 @@ async function removeNonRhelBinaries() {
  * @param {Array} expectedClients - List of client packages that should have binaries
  */
 async function verifyRhelBinaries(expectedClients) {
-    logStep(8, 'Verifying rhel-openssl-3.0.x binaries are present');
+    logStep(7, 'Verifying rhel-openssl-3.0.x binaries are present');
 
     try {
         const findCmd = `find "${LAYER_NODE_MODULES}" -name "*rhel-openssl-3.0.x*" 2>/dev/null || true`;
@@ -475,7 +414,7 @@ async function verifyRhelBinaries(expectedClients) {
  * @param {Array} clientPackages - Generated client packages that were included
  */
 async function verifyLayerStructure(clientPackages) {
-    logStep(9, 'Verifying layer structure (runtime only)');
+    logStep(8, 'Verifying layer structure (runtime only)');
 
     const requiredPaths = [
         '@prisma/client/runtime',
@@ -487,11 +426,6 @@ async function verifyLayerStructure(clientPackages) {
         requiredPaths.push(`${pkg}/schema.prisma`);
     }
 
-    // Add migrations directory for each included client
-    for (const pkg of clientPackages) {
-        requiredPaths.push(`${pkg}/migrations/migration_lock.toml`);
-    }
-
     // Verify CLI is NOT present (keeps layer small)
     const forbiddenPaths = [
         'prisma/build',
@@ -529,7 +463,7 @@ async function verifyLayerStructure(clientPackages) {
  * Calculate and display final layer size
  */
 async function displayLayerSummary() {
-    logStep(10, 'Layer build summary');
+    logStep(9, 'Layer build summary');
 
     const layerSizeMB = getDirectorySize(LAYER_OUTPUT_PATH);
 
@@ -580,7 +514,6 @@ async function buildPrismaLayer(databaseConfig = {}) {
         await createLayerStructure();
         await installPrismaPackages();              // Install runtime client only (NO CLI)
         await copyPrismaPackages(clientPackages);   // Copy generated clients from core
-        await copyMigrations(clientPackages);       // Copy migrations from core
         await removeUnnecessaryFiles();             // Remove source maps, docs, tests (37MB+)
         await removeNonRhelBinaries();              // Remove non-Linux binaries
         await verifyRhelBinaries(clientPackages);   // Verify query engines present
@@ -617,10 +550,4 @@ if (require.main === module) {
         .catch(() => process.exit(1));
 }
 
-module.exports = { 
-    buildPrismaLayer, 
-    getGeneratedClientPackages,
-    getMigrationsPackages,
-    getMigrationSourcePath,
-    getMigrationDestinationPath
-};
+module.exports = { buildPrismaLayer, getGeneratedClientPackages };

package/infrastructure/scripts/build-prisma-layer.test.js

@@ -3,12 +3,7 @@
  * Validates database client selection logic
  */
 
-const { 
-    getGeneratedClientPackages,
-    getMigrationsPackages,
-    getMigrationSourcePath,
-    getMigrationDestinationPath
-} = require('./build-prisma-layer');
+const { getGeneratedClientPackages } = require('./build-prisma-layer');
 
 // Mock the log function
 jest.mock('./build-prisma-layer', () => {
@@ -16,9 +11,6 @@ jest.mock('./build-prisma-layer', () => {
     return {
         ...actual,
         getGeneratedClientPackages: actual.getGeneratedClientPackages,
-        getMigrationsPackages: actual.getMigrationsPackages,
-        getMigrationSourcePath: actual.getMigrationSourcePath,
-        getMigrationDestinationPath: actual.getMigrationDestinationPath,
     };
 });
 
@@ -107,48 +99,4 @@ describe('getGeneratedClientPackages()', () => {
     });
 });
 
-describe('getMigrationsPackages()', () => {
-    it('should extract database types from client packages', () => {
-        const clientPackages = ['generated/prisma-postgresql', 'generated/prisma-mongodb'];
-        const migrations = getMigrationsPackages(clientPackages);
 
-        expect(migrations).toEqual([
-            { dbType: 'postgresql', clientPackage: 'generated/prisma-postgresql' },
-            { dbType: 'mongodb', clientPackage: 'generated/prisma-mongodb' }
-        ]);
-    });
-
-    it('should handle single client package', () => {
-        const clientPackages = ['generated/prisma-postgresql'];
-        const migrations = getMigrationsPackages(clientPackages);
-
-        expect(migrations).toEqual([
-            { dbType: 'postgresql', clientPackage: 'generated/prisma-postgresql' }
-        ]);
-    });
-
-    it('should handle empty array', () => {
-        const migrations = getMigrationsPackages([]);
-        expect(migrations).toEqual([]);
-    });
-});
-
-describe('getMigrationSourcePath()', () => {
-    it('should return correct source path for database type', () => {
-        const searchPaths = ['/workspace/packages/core'];
-        const dbType = 'postgresql';
-        
-        const sourcePath = getMigrationSourcePath(searchPaths, dbType);
-        expect(sourcePath).toBe('/workspace/packages/core/prisma-postgresql/migrations');
-    });
-});
-
-describe('getMigrationDestinationPath()', () => {
-    it('should return correct destination path for client package', () => {
-        const layerNodeModules = '/layers/prisma/nodejs/node_modules';
-        const clientPackage = 'generated/prisma-postgresql';
-        
-        const destPath = getMigrationDestinationPath(layerNodeModules, clientPackage);
-        expect(destPath).toBe('/layers/prisma/nodejs/node_modules/generated/prisma-postgresql/migrations');
-    });
-});

package/layers/prisma/.build-complete

@@ -0,0 +1,3 @@
+Build completed: 2025-10-31T04:18:27.501Z
+Node: v23.5.0
+Platform: darwin

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.497.a3f25f9.0",
+  "version": "2.0.0--canary.490.fd1ef7f.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -16,9 +16,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.497.a3f25f9.0",
-    "@friggframework/schemas": "2.0.0--canary.497.a3f25f9.0",
-    "@friggframework/test": "2.0.0--canary.497.a3f25f9.0",
+    "@friggframework/core": "2.0.0--canary.490.fd1ef7f.0",
+    "@friggframework/schemas": "2.0.0--canary.490.fd1ef7f.0",
+    "@friggframework/test": "2.0.0--canary.490.fd1ef7f.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -46,8 +46,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.497.a3f25f9.0",
-    "@friggframework/prettier-config": "2.0.0--canary.497.a3f25f9.0",
+    "@friggframework/eslint-config": "2.0.0--canary.490.fd1ef7f.0",
+    "@friggframework/prettier-config": "2.0.0--canary.490.fd1ef7f.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a3f25f90c67236e2079d9ca1caa3a0b29875d232"
+  "gitHead": "fd1ef7faa5d1584934b3c2e15d1e0aa4d068fa38"
 }

package/infrastructure/scripts/verify-prisma-layer.js

@@ -1,72 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs-extra');
-const path = require('path');
-
-const PROJECT_ROOT = process.cwd();
-const LAYER_PATH = path.join(PROJECT_ROOT, 'layers/prisma/nodejs/node_modules');
-
-async function verifyLayerStructure() {
-    console.log('Verifying Prisma layer structure...\n');
-
-    const checks = [
-        {
-            name: 'PostgreSQL schema',
-            path: 'generated/prisma-postgresql/schema.prisma'
-        },
-        {
-            name: 'PostgreSQL migrations directory',
-            path: 'generated/prisma-postgresql/migrations'
-        },
-        {
-            name: 'PostgreSQL migration_lock.toml',
-            path: 'generated/prisma-postgresql/migrations/migration_lock.toml'
-        },
-        {
-            name: '@prisma/client runtime',
-            path: '@prisma/client/runtime'
-        }
-    ];
-
-    let allPassed = true;
-
-    for (const check of checks) {
-        const fullPath = path.join(LAYER_PATH, check.path);
-        const exists = await fs.pathExists(fullPath);
-        
-        if (exists) {
-            console.log(`✓ ${check.name}`);
-        } else {
-            console.log(`✗ ${check.name} (missing)`);
-            allPassed = false;
-        }
-    }
-
-    console.log('\n');
-
-    if (allPassed) {
-        console.log('✓ All checks passed!');
-        const migrationsPath = path.join(LAYER_PATH, 'generated/prisma-postgresql/migrations');
-        const migrationFiles = await fs.readdir(migrationsPath);
-        console.log(`\nFound ${migrationFiles.length} items in migrations directory:`);
-        migrationFiles.forEach(file => {
-            console.log(`  - ${file}`);
-        });
-        return 0;
-    } else {
-        console.log('✗ Some checks failed!');
-        return 1;
-    }
-}
-
-if (require.main === module) {
-    verifyLayerStructure()
-        .then(code => process.exit(code))
-        .catch(err => {
-            console.error('Error:', err.message);
-            process.exit(1);
-        });
-}
-
-module.exports = { verifyLayerStructure };
-