@friggframework/devtools 2.0.0--canary.454.1c50057.0 → 2.0.0--canary.454.16de0f8.0

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

@@ -24,20 +24,42 @@ const fs = require('fs-extra');
 const path = require('path');
 const { execSync } = require('child_process');
 
+/**
+ * Find @friggframework/core package, handling workspace hoisting
+ * Searches up the directory tree to find node_modules/@friggframework/core
+ */
+function findCorePackage(startDir) {
+    let currentDir = startDir;
+    const root = path.parse(currentDir).root;
+
+    while (currentDir !== root) {
+        const candidatePath = path.join(currentDir, 'node_modules/@friggframework/core');
+        if (fs.existsSync(candidatePath)) {
+            return candidatePath;
+        }
+        currentDir = path.dirname(currentDir);
+    }
+
+    throw new Error(
+        '@friggframework/core not found in node_modules.\n' +
+        'Run "npm install" to install dependencies.'
+    );
+}
+
 // Configuration
 // Script runs from integration project root (e.g., backend/)
 // and reads Prisma packages from @friggframework/core
 const PROJECT_ROOT = process.cwd();
-const CORE_PACKAGE_PATH = path.join(PROJECT_ROOT, 'node_modules/@friggframework/core');
+const CORE_PACKAGE_PATH = findCorePackage(PROJECT_ROOT);
 const LAYER_OUTPUT_PATH = path.join(PROJECT_ROOT, 'layers/prisma');
 const LAYER_NODE_MODULES = path.join(LAYER_OUTPUT_PATH, 'nodejs/node_modules');
 
 // Packages to include in the layer
 const PRISMA_PACKAGES = [
-    '@prisma/client',
-    '@prisma-mongodb/client',
-    '@prisma-postgresql/client',
-    'prisma',  // CLI for migrations
+    '@prisma/client',                 // From project node_modules
+    'generated/prisma-mongodb',       // From @friggframework/core package
+    'generated/prisma-postgresql',    // From @friggframework/core package
+    'prisma',                         // CLI from project node_modules
 ];
 
 // Binary patterns to remove (non-rhel)
@@ -123,13 +145,19 @@ async function createLayerStructure() {
 async function copyPrismaPackages() {
     logStep(3, 'Copying Prisma packages from @friggframework/core');
 
-    // Prisma packages can be in:
-    // 1. node_modules/@friggframework/core/node_modules/ (if core has its own)
-    // 2. node_modules/ (if hoisted by npm/yarn to project root)
-    const coreNodeModules = path.join(CORE_PACKAGE_PATH, 'node_modules');
-    const projectNodeModules = path.join(PROJECT_ROOT, 'node_modules');
-
-    const nodeModulesPaths = [coreNodeModules, projectNodeModules];
+    // Build search paths, handling workspace hoisting
+    // Packages can be in:
+    // 1. Core's own node_modules (if not hoisted)
+    // 2. Project root node_modules (if hoisted from project)
+    // 3. Workspace root node_modules (where core is located - handles hoisting)
+    // 4. Core package itself (for generated/ directories)
+    const workspaceNodeModules = path.join(path.dirname(CORE_PACKAGE_PATH), '..');
+    const searchPaths = [
+        path.join(CORE_PACKAGE_PATH, 'node_modules'),  // Core's own node_modules
+        path.join(PROJECT_ROOT, 'node_modules'),        // Project node_modules
+        workspaceNodeModules,                           // Workspace root node_modules
+        CORE_PACKAGE_PATH,                              // Core package itself (for generated/)
+    ];
 
     let copiedCount = 0;
     let missingPackages = [];
@@ -137,9 +165,9 @@ async function copyPrismaPackages() {
     for (const pkg of PRISMA_PACKAGES) {
         let sourcePath = null;
 
-        // Try to find package in core or root node_modules
-        for (const nodeModulesPath of nodeModulesPaths) {
-            const candidatePath = path.join(nodeModulesPath, pkg);
+        // Try to find package in search paths
+        for (const searchPath of searchPaths) {
+            const candidatePath = path.join(searchPath, pkg);
             if (await fs.pathExists(candidatePath)) {
                 sourcePath = candidatePath;
                 break;
@@ -155,9 +183,11 @@ async function copyPrismaPackages() {
                     return !src.includes('/node_modules/node_modules/');
                 }
             });
-            const fromLocation = sourcePath.includes('@friggframework/core/node_modules')
-                ? 'core package'
-                : 'project root';
+            const fromLocation = sourcePath.includes('@friggframework/core/generated')
+                ? 'core package (generated)'
+                : sourcePath.includes('@friggframework/core/node_modules')
+                ? 'core node_modules'
+                : 'workspace';
             logSuccess(`Copied ${pkg} (from ${fromLocation})`);
             copiedCount++;
         } else {
@@ -254,8 +284,8 @@ async function verifyLayerStructure() {
     const requiredPaths = [
         '@prisma/client/runtime',
         '@prisma/client/index.d.ts',
-        '@prisma-mongodb/client/schema.prisma',
-        '@prisma-postgresql/client/schema.prisma',
+        'generated/prisma-mongodb/schema.prisma',
+        'generated/prisma-postgresql/schema.prisma',
         'prisma/build',
     ];
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.454.1c50057.0",
+  "version": "2.0.0--canary.454.16de0f8.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -11,8 +11,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.454.1c50057.0",
-    "@friggframework/test": "2.0.0--canary.454.1c50057.0",
+    "@friggframework/schemas": "2.0.0--canary.454.16de0f8.0",
+    "@friggframework/test": "2.0.0--canary.454.16de0f8.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -34,8 +34,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.454.1c50057.0",
-    "@friggframework/prettier-config": "2.0.0--canary.454.1c50057.0",
+    "@friggframework/eslint-config": "2.0.0--canary.454.16de0f8.0",
+    "@friggframework/prettier-config": "2.0.0--canary.454.16de0f8.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1c5005735e6a245830ae658d28c0448c54bf0e6a"
+  "gitHead": "16de0f8e421d3d1b83cc686c3c1d3629169bc9a6"
 }