@friggframework/core 2.0.0--canary.454.e2a280d.0 → 2.0.0--canary.458.c150d9a.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/config.js

@@ -37,35 +37,7 @@ function getDatabaseType() {
             );
         }
 
-        let backendModule;
-        try {
-            backendModule = require(backendIndexPath);
-        } catch (requireError) {
-            // Extract the actual file with the error from the stack trace
-            // Skip internal Node.js files (node:internal/*) and find first user file
-            let errorFile = 'unknown file';
-            const stackLines = requireError.stack?.split('\n') || [];
-
-            for (const line of stackLines) {
-                // Match file paths in stack trace, excluding node:internal
-                const match = line.match(/\(([^)]+\.js):\d+:\d+\)/) || line.match(/at ([^(]+\.js):\d+:\d+/);
-                if (match && match[1] && !match[1].includes('node:internal')) {
-                    errorFile = match[1];
-                    break;
-                }
-            }
-
-            // Provide better error context for syntax/runtime errors
-            throw new Error(
-                `[Frigg] Failed to load app definition from ${backendIndexPath}\n` +
-                `Error: ${requireError.message}\n` +
-                `File with error: ${errorFile}\n` +
-                `\nFull stack trace:\n${requireError.stack}\n\n` +
-                'This error occurred while loading your app definition or its dependencies. ' +
-                'Check the file listed above for syntax errors (trailing commas, missing brackets, etc.)'
-            );
-        }
-
+        const backendModule = require(backendIndexPath);
         database = backendModule?.Definition?.database;
 
         if (!database) {

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/database/use-cases/test-encryption-use-case.js

@@ -83,14 +83,13 @@ class TestEncryptionUseCase {
      * @private
      */
     _mapTestDataToCredential(testData) {
-        // Note: Using camelCase for Prisma compatibility (both MongoDB and PostgreSQL)
-        // Changed from snake_case (user_id, entity_id) to camelCase (userId, externalId)
         return {
-            externalId: 'test-encryption-entity',
+            user_id: 'test-encryption-user',
+            entity_id: 'test-encryption-entity',
             data: {
-                access_token: testData.testSecret,      // Encrypted field
-                refresh_token: testData.nestedSecret?.value, // Encrypted field
-                domain: testData.normalField,           // Not encrypted
+                access_token: testData.testSecret,
+                refresh_token: testData.nestedSecret?.value,
+                domain: testData.normalField,
             },
         };
     }

package/handlers/routers/user.js

@@ -1,7 +1,9 @@
 const express = require('express');
 const { createAppHandler } = require('../app-handler-helpers');
 const { checkRequiredParams } = require('@friggframework/core');
-const { createUserRepository } = require('../../user/user-repository-factory');
+const {
+    createUserRepository,
+} = require('../../user/repositories/user-repository-factory');
 const {
     CreateIndividualUser,
 } = require('../../user/use-cases/create-individual-user');

package/modules/module.js

@@ -42,7 +42,7 @@ class Module extends Delegate {
         const apiParams = {
             ...this.definition.env,
             delegate: this,
-            ...this.apiParamsFromCredential(this.credential.data), // todo: check if this works for mongo as well
+            ...(this.credential?.data ? this.apiParamsFromCredential(this.credential.data) : {}), // Handle case when credential is undefined
             ...this.apiParamsFromEntity(this.entity),
         };
         this.api = new this.apiClass(apiParams);

package/modules/use-cases/process-authorization-callback.js

@@ -93,7 +93,8 @@ class ProcessAuthorizationCallback {
         );
         credentialDetails.details.authIsValid = true;
 
-        await this.credentialRepository.upsertCredential(credentialDetails);
+        const persisted = await this.credentialRepository.upsertCredential(credentialDetails);
+        module.credential = persisted;
     }
 
     async findOrCreateEntity(entityDetails, moduleName, credentialId) {

package/package.json

@@ -1,81 +1,68 @@
 {
-    "name": "@friggframework/core",
-    "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.454.e2a280d.0",
-    "dependencies": {
-        "@hapi/boom": "^10.0.1",
-        "aws-sdk": "^2.1200.0",
-        "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",
-        "express": "^4.19.2",
-        "express-async-handler": "^1.2.0",
-        "form-data": "^4.0.0",
-        "fs-extra": "^11.2.0",
-        "lodash": "4.17.21",
-        "lodash.get": "^4.4.2",
-        "mongoose": "6.11.6",
-        "node-fetch": "^2.6.7",
-        "serverless-http": "^2.7.0",
-        "uuid": "^9.0.1"
-    },
-    "peerDependencies": {
-        "@prisma/client": "^6.16.3",
-        "prisma": "^6.16.3"
-    },
-    "peerDependenciesMeta": {
-        "@prisma/client": {
-            "optional": true
-        },
-        "prisma": {
-            "optional": true
-        }
-    },
-    "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.454.e2a280d.0",
-        "@friggframework/prettier-config": "2.0.0--canary.454.e2a280d.0",
-        "@friggframework/test": "2.0.0--canary.454.e2a280d.0",
-        "@prisma/client": "^6.17.0",
-        "@types/lodash": "4.17.15",
-        "@typescript-eslint/eslint-plugin": "^8.0.0",
-        "chai": "^4.3.6",
-        "eslint": "^8.22.0",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-n": "^17.10.2",
-        "eslint-plugin-promise": "^7.0.0",
-        "jest": "^29.7.0",
-        "prettier": "^2.7.1",
-        "prisma": "^6.17.0",
-        "sinon": "^16.1.1",
-        "typescript": "^5.0.2"
-    },
-    "scripts": {
-        "lint:fix": "prettier --write --loglevel error . && eslint . --fix",
-        "test": "jest --passWithNoTests # TODO",
-        "prisma:generate:mongo": "npx prisma generate --schema ./prisma-mongodb/schema.prisma",
-        "prisma:generate:postgres": "npx prisma generate --schema ./prisma-postgresql/schema.prisma",
-        "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"
-    },
-    "author": "",
-    "license": "MIT",
-    "main": "index.js",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/friggframework/frigg.git"
-    },
-    "bugs": {
-        "url": "https://github.com/friggframework/frigg/issues"
-    },
-    "homepage": "https://github.com/friggframework/frigg#readme",
-    "description": "",
-    "publishConfig": {
-        "access": "public"
-    },
-    "gitHead": "e2a280d643ad826ce11b8267c98eba09d89d4dfd"
+  "name": "@friggframework/core",
+  "prettier": "@friggframework/prettier-config",
+  "version": "2.0.0--canary.458.c150d9a.0",
+  "dependencies": {
+    "@hapi/boom": "^10.0.1",
+    "@prisma/client": "^6.16.3",
+    "aws-sdk": "^2.1200.0",
+    "bcryptjs": "^2.4.3",
+    "body-parser": "^1.20.2",
+    "common-tags": "^1.8.2",
+    "cors": "^2.8.5",
+    "dotenv": "^16.4.7",
+    "express": "^4.19.2",
+    "express-async-handler": "^1.2.0",
+    "form-data": "^4.0.0",
+    "fs-extra": "^11.2.0",
+    "lodash": "4.17.21",
+    "lodash.get": "^4.4.2",
+    "mongoose": "6.11.6",
+    "node-fetch": "^2.6.7",
+    "serverless-http": "^2.7.0",
+    "uuid": "^9.0.1"
+  },
+  "devDependencies": {
+    "@friggframework/eslint-config": "2.0.0--canary.458.c150d9a.0",
+    "@friggframework/prettier-config": "2.0.0--canary.458.c150d9a.0",
+    "@friggframework/test": "2.0.0--canary.458.c150d9a.0",
+    "@types/lodash": "4.17.15",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "chai": "^4.3.6",
+    "eslint": "^8.22.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-n": "^17.10.2",
+    "eslint-plugin-promise": "^7.0.0",
+    "jest": "^29.7.0",
+    "prettier": "^2.7.1",
+    "prisma": "^6.16.3",
+    "sinon": "^16.1.1",
+    "typescript": "^5.0.2"
+  },
+  "scripts": {
+    "lint:fix": "prettier --write --loglevel error . && eslint . --fix",
+    "test": "jest --passWithNoTests # TODO",
+    "prisma:generate:mongo": "npx prisma generate --schema ./prisma-mongodb/schema.prisma",
+    "prisma:generate:postgres": "npx prisma generate --schema ./prisma-postgresql/schema.prisma",
+    "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",
+    "postinstall": "npm run prisma:generate"
+  },
+  "author": "",
+  "license": "MIT",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/friggframework/frigg.git"
+  },
+  "bugs": {
+    "url": "https://github.com/friggframework/frigg/issues"
+  },
+  "homepage": "https://github.com/friggframework/frigg#readme",
+  "description": "",
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "c150d9a112596c02f6e29eae2944f7dcb1ed1489"
 }

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())
@@ -88,12 +86,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.
@@ -126,11 +124,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[]
@@ -154,16 +152,13 @@ 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)
   entities  Entity[] @relation("IntegrationEntities", fields: [entityIds], references: [id])
   entityIds String[] @db.ObjectId
 
-  // Entity reference map (Map<String, String> stored as JSON)
-  entityReferenceMap Json? @default("{}")
-
   // Message arrays (stored as JSON)
   errors   Json @default("[]")
   warnings Json @default("[]")
@@ -281,11 +276,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
@@ -320,4 +315,4 @@ model WebsocketConnection {
 
   @@index([connectionId])
   @@map("WebsocketConnection")
-}
+}

package/prisma-postgresql/migrations/20251010000000_remove_unused_entity_reference_map/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+-- Remove unused entityReferenceMap field from Integration table
+ALTER TABLE "Integration" DROP COLUMN "entityReferenceMap";

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())
@@ -86,12 +84,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.
@@ -147,15 +145,12 @@ 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)
   entities Entity[]
 
-  // Entity reference map (Map<String, String> stored as JSON)
-  entityReferenceMap Json? @default("{}")
-
   // Message arrays (stored as JSON)
   errors   Json @default("[]")
   warnings Json @default("[]")
@@ -228,11 +223,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
@@ -292,7 +287,7 @@ enum AssociationType {
 
 /// 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,
-};