@friggframework/core 2.0.0--canary.454.25d396a.0 → 2.0.0--canary.463.62579dd.0

package/README.md

@@ -62,34 +62,6 @@ npm install @friggframework/core
 yarn add @friggframework/core
 ```
 
-### Prisma Support (Optional)
-
-`@friggframework/core` supports both MongoDB and PostgreSQL via Prisma ORM. **Prisma is an optional peer dependency** - you only need to install it if you're using database features that require migrations or schema generation.
-
-**When you need Prisma:**
-- Running database migrations (`prisma migrate`, `prisma db push`)
-- Generating Prisma clients for your application
-- Using the migration Lambda function (`dbMigrate`)
-
-**Installation:**
-```bash
-# Install Prisma CLI and Client as dev dependencies
-npm install --save-dev prisma @prisma/client
-
-# Or with yarn
-yarn add -D prisma @prisma/client
-```
-
-**Generate Prisma Clients:**
-```bash
-# From @friggframework/core directory
-npm run prisma:generate:mongo      # MongoDB only
-npm run prisma:generate:postgres   # PostgreSQL only
-npm run prisma:generate            # Both databases
-```
-
-**Note:** The published npm package includes pre-generated Prisma clients, so you don't need to install Prisma just to use `@friggframework/core` in production. Prisma is only required if you're actively developing migrations or running the migration Lambda function.
-
 ### Prerequisites
 
 - Node.js 16+ 

package/database/prisma.js

@@ -77,9 +77,9 @@ const prismaClientSingleton = () => {
     let PrismaClient;
 
     if (config.DB_TYPE === 'mongodb') {
-        PrismaClient = require('../generated/prisma-mongodb').PrismaClient;
+        PrismaClient = require('@prisma-mongodb/client').PrismaClient;
     } else if (config.DB_TYPE === 'postgresql') {
-        PrismaClient = require('../generated/prisma-postgresql').PrismaClient;
+        PrismaClient = require('@prisma-postgresql/client').PrismaClient;
     } else {
         throw new Error(
             `Unsupported database type: ${config.DB_TYPE}. Supported values: 'mongodb', 'postgresql'`

package/handlers/backend-utils.js

@@ -19,6 +19,7 @@ const {
 const {
     getModulesDefinitionFromIntegrationClasses,
 } = require('../integrations/utils/map-integration-dto');
+const { loadAppDefinition } = require('./app-definition-loader');
 
 const loadRouterFromObject = (IntegrationClass, routerObject) => {
     const router = Router();
@@ -50,37 +51,29 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
 };
 
 const initializeRepositories = () => {
-    const processRepository = createProcessRepository();
-    const integrationRepository = createIntegrationRepository();
-    const moduleRepository = createModuleRepository();
-
-    return { processRepository, integrationRepository, moduleRepository };
-};
-
-const createModuleFactoryWithDefinitions = (
-    moduleRepository,
-    integrationClasses
-) => {
-    const moduleDefinitions =
-        getModulesDefinitionFromIntegrationClasses(integrationClasses);
-
-    return new ModuleFactory({
-        moduleRepository,
-        moduleDefinitions,
-    });
+    return {
+        processRepository: createProcessRepository(),
+        integrationRepository: createIntegrationRepository(),
+        moduleRepository: createModuleRepository(),
+    };
 };
 
+/**
+ * Load hydrated integration instance for webhook events WITH integrationId.
+ * Must load app definition to find all integration classes, then match
+ * against the integration record's type.
+ */
 const loadIntegrationForWebhook = async (integrationId) => {
-    const { loadAppDefinition } = require('./app-definition-loader');
     const { integrations: integrationClasses } = loadAppDefinition();
+    const { integrationRepository, moduleRepository } = initializeRepositories();
 
-    const { integrationRepository, moduleRepository } =
-        initializeRepositories();
-
-    const moduleFactory = createModuleFactoryWithDefinitions(
-        moduleRepository,
+    const moduleDefinitions = getModulesDefinitionFromIntegrationClasses(
         integrationClasses
     );
+    const moduleFactory = new ModuleFactory({
+        moduleRepository,
+        moduleDefinitions,
+    });
 
     const getIntegrationInstance = new GetIntegrationInstance({
         integrationRepository,
@@ -92,19 +85,42 @@ const loadIntegrationForWebhook = async (integrationId) => {
         integrationId
     );
 
+    if (!integrationRecord) {
+        throw new Error(
+            `No integration found by the ID of ${integrationId}`
+        );
+    }
+
     return await getIntegrationInstance.execute(
         integrationId,
         integrationRecord.userId
     );
 };
 
+/**
+ * Load hydrated integration instance for process-based events.
+ * Integration class is already known from queue worker context,
+ * so we receive it as a parameter rather than loading all classes.
+ */
 const loadIntegrationForProcess = async (processId, integrationClass) => {
+    if (!integrationClass) {
+        throw new Error('integrationClass parameter is required');
+    }
+
+    if (!processId) {
+        throw new Error('processId is required in queue message data');
+    }
+
     const { processRepository, integrationRepository, moduleRepository } =
         initializeRepositories();
 
-    const moduleFactory = createModuleFactoryWithDefinitions(moduleRepository, [
+    const moduleDefinitions = getModulesDefinitionFromIntegrationClasses([
         integrationClass,
     ]);
+    const moduleFactory = new ModuleFactory({
+        moduleRepository,
+        moduleDefinitions,
+    });
 
     const getIntegrationInstance = new GetIntegrationInstance({
         integrationRepository,
@@ -112,10 +128,6 @@ const loadIntegrationForProcess = async (processId, integrationClass) => {
         moduleFactory,
     });
 
-    if (!processId) {
-        throw new Error('processId is required in queue message data');
-    }
-
     const process = await processRepository.findById(processId);
 
     if (!process) {

package/package.json

@@ -1,13 +1,12 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.454.25d396a.0",
+    "version": "2.0.0--canary.463.62579dd.0",
     "dependencies": {
         "@hapi/boom": "^10.0.1",
-        "aws-sdk": "^2.1200.0",
+        "@prisma/client": "^6.16.3",
         "bcryptjs": "^2.4.3",
         "body-parser": "^1.20.2",
-        "chalk": "^4.1.2",
         "common-tags": "^1.8.2",
         "cors": "^2.8.5",
         "dotenv": "^16.4.7",
@@ -23,22 +22,17 @@
         "uuid": "^9.0.1"
     },
     "peerDependencies": {
-        "@prisma/client": "^6.16.3",
-        "prisma": "^6.16.3"
+        "aws-sdk": "^2.1200.0"
     },
     "peerDependenciesMeta": {
-        "@prisma/client": {
-            "optional": true
-        },
-        "prisma": {
+        "aws-sdk": {
             "optional": true
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.454.25d396a.0",
-        "@friggframework/prettier-config": "2.0.0--canary.454.25d396a.0",
-        "@friggframework/test": "2.0.0--canary.454.25d396a.0",
-        "@prisma/client": "^6.17.0",
+        "@friggframework/eslint-config": "2.0.0--canary.463.62579dd.0",
+        "@friggframework/prettier-config": "2.0.0--canary.463.62579dd.0",
+        "@friggframework/test": "2.0.0--canary.463.62579dd.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
         "chai": "^4.3.6",
@@ -48,7 +42,7 @@
         "eslint-plugin-promise": "^7.0.0",
         "jest": "^29.7.0",
         "prettier": "^2.7.1",
-        "prisma": "^6.17.0",
+        "prisma": "^6.16.3",
         "sinon": "^16.1.1",
         "typescript": "^5.0.2"
     },
@@ -60,7 +54,7 @@
         "prisma:generate": "npm run prisma:generate:mongo && npm run prisma:generate:postgres",
         "prisma:push:mongo": "npx prisma db push --schema ./prisma-mongodb/schema.prisma",
         "prisma:migrate:postgres": "npx prisma migrate dev --schema ./prisma-postgresql/schema.prisma",
-        "prepublishOnly": "npm run prisma:generate"
+        "postinstall": "npm run prisma:generate"
     },
     "author": "",
     "license": "MIT",
@@ -77,5 +71,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "25d396ab0d73094bfab4853f9ff15a5500174ca7"
+    "gitHead": "62579dd537cdc5d96c3d36e2441e56778c3a160a"
 }

package/prisma-mongodb/schema.prisma

@@ -3,10 +3,8 @@
 // Migration from Mongoose ODM to Prisma ORM
 
 generator client {
-  provider      = "prisma-client-js"
-  output        = "../generated/prisma-mongodb"
-  binaryTargets = ["native", "rhel-openssl-3.0.x"] // native for local dev, rhel for Lambda deployment
-  engineType    = "binary" // Use binary engines (smaller size)
+  provider = "prisma-client-js"
+  output   = "../node_modules/@prisma-mongodb/client"
 }
 
 datasource db {
@@ -21,8 +19,8 @@ datasource db {
 /// User model with discriminator pattern support
 /// Replaces Mongoose discriminators (IndividualUser, OrganizationUser)
 model User {
-  id   String   @id @default(auto()) @map("_id") @db.ObjectId
-  type UserType
+  id    String   @id @default(auto()) @map("_id") @db.ObjectId
+  type  UserType
 
   // Timestamps
   createdAt DateTime @default(now())
@@ -89,12 +87,12 @@ model Token {
 /// OAuth credentials and API tokens
 /// All sensitive data encrypted with KMS at rest
 model Credential {
-  id          String   @id @default(auto()) @map("_id") @db.ObjectId
-  userId      String?  @db.ObjectId
-  user        User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
-  subType     String?
+  id         String   @id @default(auto()) @map("_id") @db.ObjectId
+  userId     String?  @db.ObjectId
+  user       User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
+  subType    String?
   authIsValid Boolean?
-  externalId  String?
+  externalId String?
 
   // Dynamic OAuth fields stored as JSON (encrypted via Prisma middleware)
   // Contains: access_token, refresh_token, domain, expires_in, token_type, etc.
@@ -127,11 +125,11 @@ model Entity {
   updatedAt DateTime @updatedAt
 
   // Relations - many-to-many with scalar lists
-  integrations   Integration[] @relation("IntegrationEntities", fields: [integrationIds], references: [id])
-  integrationIds String[]      @db.ObjectId
+  integrations    Integration[] @relation("IntegrationEntities", fields: [integrationIds], references: [id])
+  integrationIds  String[]      @db.ObjectId
 
-  syncs   Sync[]   @relation("SyncEntities", fields: [syncIds], references: [id])
-  syncIds String[] @db.ObjectId
+  syncs           Sync[]        @relation("SyncEntities", fields: [syncIds], references: [id])
+  syncIds         String[]      @db.ObjectId
 
   dataIdentifiers    DataIdentifier[]
   associationObjects AssociationObject[]
@@ -155,7 +153,7 @@ model Integration {
   status IntegrationStatus @default(ENABLED)
 
   // Configuration and version
-  config  Json? // Integration configuration object
+  config  Json?   // Integration configuration object
   version String?
 
   // Entity references (many-to-many via explicit scalar list)
@@ -322,11 +320,11 @@ model Association {
 /// Association object entry
 /// Replaces nested array structure in Mongoose
 model AssociationObject {
-  id            String      @id @default(auto()) @map("_id") @db.ObjectId
-  associationId String      @db.ObjectId
-  association   Association @relation(fields: [associationId], references: [id], onDelete: Cascade)
-  entityId      String      @db.ObjectId
-  entity        Entity      @relation(fields: [entityId], references: [id], onDelete: Cascade)
+  id            String       @id @default(auto()) @map("_id") @db.ObjectId
+  associationId String       @db.ObjectId
+  association   Association  @relation(fields: [associationId], references: [id], onDelete: Cascade)
+  entityId      String       @db.ObjectId
+  entity        Entity       @relation(fields: [entityId], references: [id], onDelete: Cascade)
   objectType    String
   objId         String
   metadata      Json? // Optional metadata
@@ -361,4 +359,4 @@ model WebsocketConnection {
 
   @@index([connectionId])
   @@map("WebsocketConnection")
-}
+}

package/prisma-postgresql/schema.prisma

@@ -3,10 +3,8 @@
 // Converted from MongoDB schema for relational database support
 
 generator client {
-  provider      = "prisma-client-js"
-  output        = "../generated/prisma-postgresql"
-  binaryTargets = ["native", "rhel-openssl-3.0.x"] // native for local dev, rhel for Lambda deployment
-  engineType    = "binary" // Use binary engines (smaller size)
+  provider = "prisma-client-js"
+  output   = "../node_modules/@prisma-postgresql/client"
 }
 
 datasource db {
@@ -21,8 +19,8 @@ datasource db {
 /// User model with discriminator pattern support
 /// Replaces Mongoose discriminators (IndividualUser, OrganizationUser)
 model User {
-  id   Int      @id @default(autoincrement())
-  type UserType
+  id    Int      @id @default(autoincrement())
+  type  UserType
 
   // Timestamps
   createdAt DateTime @default(now())
@@ -87,12 +85,12 @@ model Token {
 /// OAuth credentials and API tokens
 /// All sensitive data encrypted with KMS at rest
 model Credential {
-  id          Int      @id @default(autoincrement())
-  userId      Int?
-  user        User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
-  subType     String?
+  id         Int      @id @default(autoincrement())
+  userId     Int?
+  user       User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
+  subType    String?
   authIsValid Boolean?
-  externalId  String?
+  externalId String?
 
   // Dynamic OAuth fields stored as JSON (encrypted via Prisma middleware)
   // Contains: access_token, refresh_token, domain, expires_in, token_type, etc.
@@ -148,7 +146,7 @@ model Integration {
   status IntegrationStatus @default(ENABLED)
 
   // Configuration and version
-  config  Json? // Integration configuration object
+  config  Json?   // Integration configuration object
   version String?
 
   // Entity references (many-to-many via implicit join table)
@@ -227,11 +225,11 @@ model Sync {
 /// Data identifier for sync operations
 /// Replaces nested array structure in Mongoose
 model DataIdentifier {
-  id       Int    @id @default(autoincrement())
+  id       Int     @id @default(autoincrement())
   syncId   Int?
-  sync     Sync?  @relation(fields: [syncId], references: [id], onDelete: Cascade)
+  sync     Sync?   @relation(fields: [syncId], references: [id], onDelete: Cascade)
   entityId Int
-  entity   Entity @relation(fields: [entityId], references: [id], onDelete: Cascade)
+  entity   Entity  @relation(fields: [entityId], references: [id], onDelete: Cascade)
 
   // Identifier data (can be any structure)
   idData Json
@@ -334,7 +332,7 @@ model Process {
 
 /// Generic state storage
 model State {
-  id    Int   @id @default(autoincrement())
+  id    Int  @id @default(autoincrement())
   state Json?
 }
 

package/database/use-cases/run-database-migration-use-case.js

@@ -1,137 +0,0 @@
-/**
- * Run Database Migration Use Case
- *
- * Business logic for running Prisma database migrations.
- * Orchestrates Prisma client generation and migration execution.
- *
- * This use case follows the Frigg hexagonal architecture pattern where:
- * - Handlers (adapters) call use cases
- * - Use cases contain business logic and orchestration
- * - Use cases call repositories/utilities for data access
- */
-
-class RunDatabaseMigrationUseCase {
-    /**
-     * @param {Object} dependencies
-     * @param {Object} dependencies.prismaRunner - Prisma runner utilities
-     */
-    constructor({ prismaRunner }) {
-        if (!prismaRunner) {
-            throw new Error('prismaRunner dependency is required');
-        }
-        this.prismaRunner = prismaRunner;
-    }
-
-    /**
-     * Execute database migration
-     *
-     * @param {Object} params
-     * @param {string} params.dbType - Database type ('postgresql' or 'mongodb')
-     * @param {string} params.stage - Deployment stage (determines migration command)
-     * @param {boolean} [params.verbose=false] - Enable verbose output
-     * @returns {Promise<Object>} Migration result { success, dbType, stage, command, message }
-     * @throws {MigrationError} If migration fails
-     * @throws {ValidationError} If parameters are invalid
-     */
-    async execute({ dbType, stage, verbose = false }) {
-        // Validation
-        this._validateParams({ dbType, stage });
-
-        // Step 1: Generate Prisma client
-        const generateResult = await this.prismaRunner.runPrismaGenerate(dbType, verbose);
-
-        if (!generateResult.success) {
-            throw new MigrationError(
-                `Failed to generate Prisma client: ${generateResult.error || 'Unknown error'}`,
-                { dbType, stage, step: 'generate', output: generateResult.output }
-            );
-        }
-
-        // Step 2: Run migrations based on database type
-        let migrationResult;
-        let migrationCommand;
-
-        if (dbType === 'postgresql') {
-            migrationCommand = this.prismaRunner.getMigrationCommand(stage);
-            migrationResult = await this.prismaRunner.runPrismaMigrate(migrationCommand, verbose);
-
-            if (!migrationResult.success) {
-                throw new MigrationError(
-                    `PostgreSQL migration failed: ${migrationResult.error || 'Unknown error'}`,
-                    { dbType, stage, command: migrationCommand, step: 'migrate', output: migrationResult.output }
-                );
-            }
-        } else if (dbType === 'mongodb') {
-            migrationCommand = 'db push';
-            // Use non-interactive mode for automated/Lambda environments
-            migrationResult = await this.prismaRunner.runPrismaDbPush(verbose, true);
-
-            if (!migrationResult.success) {
-                throw new MigrationError(
-                    `MongoDB push failed: ${migrationResult.error || 'Unknown error'}`,
-                    { dbType, stage, command: migrationCommand, step: 'push', output: migrationResult.output }
-                );
-            }
-        } else {
-            throw new ValidationError(`Unsupported database type: ${dbType}. Must be 'postgresql' or 'mongodb'.`);
-        }
-
-        // Return success result
-        return {
-            success: true,
-            dbType,
-            stage,
-            command: migrationCommand,
-            message: 'Database migration completed successfully',
-        };
-    }
-
-    /**
-     * Validate execution parameters
-     * @private
-     */
-    _validateParams({ dbType, stage }) {
-        if (!dbType) {
-            throw new ValidationError('dbType is required');
-        }
-
-        if (typeof dbType !== 'string') {
-            throw new ValidationError('dbType must be a string');
-        }
-
-        if (!stage) {
-            throw new ValidationError('stage is required');
-        }
-
-        if (typeof stage !== 'string') {
-            throw new ValidationError('stage must be a string');
-        }
-    }
-}
-
-/**
- * Custom error for migration failures
- */
-class MigrationError extends Error {
-    constructor(message, context = {}) {
-        super(message);
-        this.name = 'MigrationError';
-        this.context = context;
-    }
-}
-
-/**
- * Custom error for validation failures
- */
-class ValidationError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'ValidationError';
-    }
-}
-
-module.exports = {
-    RunDatabaseMigrationUseCase,
-    MigrationError,
-    ValidationError,
-};