@friggframework/devtools 2.0.0--canary.482.411f36e.0 → 2.0.0--canary.482.7be62db.0

package/infrastructure/domains/shared/utilities/prisma-layer-manager.js

@@ -40,30 +40,20 @@ async function ensurePrismaLayerExists(databaseConfig = {}) {
 
     // Check if incomplete build exists (directory without marker)
     if (fs.existsSync(layerPath)) {
-        console.log('⚠ Incomplete Prisma layer detected - cleaning...');
-        try {
-            fs.rmSync(layerPath, { recursive: true, force: true });
-            console.log('✓ Cleaned incomplete build');
-        } catch (cleanupError) {
-            // EBUSY error means another process might be building
-            if (cleanupError.code === 'EBUSY' || cleanupError.message.includes('EBUSY')) {
-                console.warn('⏳ Could not clean (EBUSY) - waiting for concurrent build...', cleanupError.message);
+        console.log('⚠ Incomplete Prisma layer detected');
 
-                // Wait 1 second and check if concurrent process completed
-                await new Promise(resolve => setTimeout(resolve, 1000));
+        // Wait briefly to see if another process completes the build
+        console.log('⏳ Checking if concurrent build is in progress...');
+        await new Promise(resolve => setTimeout(resolve, 1000));
 
-                // Check if concurrent build completed
-                if (fs.existsSync(completionMarkerPath)) {
-                    console.log('✓ Concurrent build completed');
-                    return;
-                }
-
-                // Concurrent build didn't complete, proceed with our build
-                console.log('⚠ Concurrent build incomplete, proceeding with rebuild');
-            } else {
-                throw cleanupError;
-            }
+        // Check if concurrent build completed while we waited
+        if (fs.existsSync(completionMarkerPath)) {
+            console.log('✓ Concurrent build completed');
+            return;
         }
+
+        // Incomplete build still exists - will be cleaned by buildPrismaLayer()
+        console.log('⚠ Proceeding with rebuild (buildPrismaLayer will clean incomplete build)');
     }
 
     // Build layer

package/infrastructure/domains/shared/utilities/prisma-layer-manager.test.js

@@ -179,17 +179,20 @@ describe('Prisma Layer Manager', () => {
                 expect(buildPrismaLayer).not.toHaveBeenCalled();
             });
 
-            it('should clean and rebuild if directory exists without completion marker (TDD)', async () => {
+            it('should wait and rebuild if directory exists without completion marker (TDD)', async () => {
+                jest.useFakeTimers();
                 mockFs.incompleteBuild();
                 buildPrismaLayer.mockResolvedValue();
 
-                await ensurePrismaLayerExists();
+                const promise = ensurePrismaLayerExists();
 
-                // Should clean incomplete build
-                expect(fs.rmSync).toHaveBeenCalledWith(
-                    '/project/layers/prisma',
-                    { recursive: true, force: true }
-                );
+                // Fast-forward through the wait
+                jest.advanceTimersByTime(1000);
+
+                await promise;
+
+                // Should NOT manually clean (buildPrismaLayer handles this)
+                expect(fs.rmSync).not.toHaveBeenCalled();
                 // Should rebuild
                 expect(buildPrismaLayer).toHaveBeenCalled();
                 // Should create completion marker
@@ -197,6 +200,8 @@ describe('Prisma Layer Manager', () => {
                     '/project/layers/prisma/.build-complete',
                     expect.any(String)
                 );
+
+                jest.useRealTimers();
             });
 
             it('should create completion marker after successful build (TDD)', async () => {
@@ -214,50 +219,44 @@ describe('Prisma Layer Manager', () => {
             it('should clean up partial build on failure (TDD)', async () => {
                 mockFs.noBuild();
                 buildPrismaLayer.mockRejectedValue(new Error('Build failed'));
+
+                // After build attempt fails, directory exists
                 fs.existsSync = jest.fn((path) => {
-                    // After build starts, directory exists
+                    if (path.endsWith('.build-complete')) return false;
                     if (path.endsWith('layers/prisma')) return true;
                     return false;
                 });
 
                 await expect(ensurePrismaLayerExists()).rejects.toThrow('Build failed');
 
+                // Should clean up after failure
                 expect(fs.rmSync).toHaveBeenCalledWith(
                     '/project/layers/prisma',
                     { recursive: true, force: true }
                 );
             });
 
-            it('should handle cleanup errors gracefully and attempt rebuild (TDD)', async () => {
+            it('should wait for potential concurrent build before rebuilding (TDD)', async () => {
+                jest.useFakeTimers();
                 mockFs.incompleteBuild();
-                fs.rmSync = jest.fn().mockImplementation(() => {
-                    throw new Error('EBUSY: resource busy');
-                });
                 buildPrismaLayer.mockResolvedValue();
 
-                const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation();
+                const promise = ensurePrismaLayerExists();
 
-                await ensurePrismaLayerExists();
+                // Fast-forward through the wait
+                jest.advanceTimersByTime(1000);
 
-                // Should log warning about cleanup failure
-                expect(consoleWarnSpy).toHaveBeenCalledWith(
-                    expect.stringContaining('Could not clean'),
-                    expect.any(String)
-                );
+                await promise;
+
+                // Should wait before rebuilding
                 // Should still attempt to build
                 expect(buildPrismaLayer).toHaveBeenCalled();
 
-                consoleWarnSpy.mockRestore();
+                jest.useRealTimers();
             });
 
-            it('should wait and check for concurrent process completion (TDD)', async () => {
+            it('should detect when concurrent process completes during wait (TDD)', async () => {
                 jest.useFakeTimers();
-                mockFs.incompleteBuild();
-
-                // First cleanup fails
-                fs.rmSync = jest.fn().mockImplementation(() => {
-                    throw new Error('EBUSY: resource busy');
-                });
 
                 // After 1 second, completion marker appears (concurrent process finished)
                 let callCount = 0;
@@ -269,6 +268,8 @@ describe('Prisma Layer Manager', () => {
                     if (path.endsWith('layers/prisma')) return true;
                     return false;
                 });
+                fs.writeFileSync = jest.fn();
+                fs.rmSync = jest.fn();
 
                 const promise = ensurePrismaLayerExists();
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.482.411f36e.0",
+  "version": "2.0.0--canary.482.7be62db.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -12,8 +12,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.482.411f36e.0",
-    "@friggframework/test": "2.0.0--canary.482.411f36e.0",
+    "@friggframework/schemas": "2.0.0--canary.482.7be62db.0",
+    "@friggframework/test": "2.0.0--canary.482.7be62db.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -35,8 +35,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.482.411f36e.0",
-    "@friggframework/prettier-config": "2.0.0--canary.482.411f36e.0",
+    "@friggframework/eslint-config": "2.0.0--canary.482.7be62db.0",
+    "@friggframework/prettier-config": "2.0.0--canary.482.7be62db.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": "411f36e107a200d437a085479c514d7bd9fd981d"
+  "gitHead": "7be62db49f55502252f0139a12562832210f8a74"
 }