@friggframework/core 2.0.0--canary.546.ce82650.0 → 2.0.0--canary.546.74db90f.0

package/assertions/index.js

@@ -6,7 +6,10 @@ const {
     getArrayParamAndVerifyParamType,
     getAndVerifyType,
 } = require('./get');
+const { expectShallowEqualDbObject } = require('./is-equal');
+
 module.exports = {
+    expectShallowEqualDbObject,
     get,
     getAll,
     verifyType,

package/assertions/is-equal.js

@@ -0,0 +1,19 @@
+const { ObjectId } = require('mongodb');
+
+const expectShallowEqualDbObject = (modelObject, compareObject) => {
+    for (const key in compareObject) {
+        let objVal = modelObject[key];
+
+        if (objVal instanceof Date) {
+            objVal = objVal.toISOString();
+        } else if (objVal instanceof ObjectId) {
+            objVal = objVal.toString();
+        }
+
+        expect(compareObject[key]).toBe(objVal);
+    }
+};
+
+// TODO not sure how much this is needed, but could rewrite with _.isEqualWith for deep equality with custom checks.
+
+module.exports = { expectShallowEqualDbObject };

package/database/repositories/health-check-repository-mongodb.js

@@ -67,16 +67,18 @@ class HealthCheckRepositoryMongoDB extends HealthCheckRepositoryInterface {
 
     /**
      * Get raw credential from database bypassing Prisma encryption extension.
-     * Uses findRaw() to query MongoDB directly.
+     * Uses $runCommandRaw to query MongoDB directly.
      * @param {string} id
      * @returns {Promise<Object|null>}
      */
     async getRawCredentialById(id) {
         if (!id) return null;
-        const results = await this.prisma.credential.findRaw({
+        const result = await this.prisma.$runCommandRaw({
+            find: 'Credential',
             filter: { _id: { $oid: id } },
+            limit: 1,
         });
-        return results[0] || null;
+        return result.cursor?.firstBatch?.[0] || null;
     }
 
     async deleteCredential(id) {

package/index.js

@@ -1,4 +1,5 @@
 const {
+    expectShallowEqualDbObject,
     get,
     getAll,
     verifyType,
@@ -90,6 +91,7 @@ const { QueuerUtil } = require('./queues');
 
 module.exports = {
     // assertions
+    expectShallowEqualDbObject,
     get,
     getAll,
     verifyType,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.546.ce82650.0",
+    "version": "2.0.0--canary.546.74db90f.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -38,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.546.ce82650.0",
-        "@friggframework/prettier-config": "2.0.0--canary.546.ce82650.0",
-        "@friggframework/test": "2.0.0--canary.546.ce82650.0",
+        "@friggframework/eslint-config": "2.0.0--canary.546.74db90f.0",
+        "@friggframework/prettier-config": "2.0.0--canary.546.74db90f.0",
+        "@friggframework/test": "2.0.0--canary.546.74db90f.0",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ce82650a13dcab6618d1928d890f7fd826610d1c"
+    "gitHead": "74db90fe2fb36fe451acf167b78fe8bbae5300ca"
 }

package/types/associations/index.d.ts

@@ -1,3 +1,18 @@
+declare module "@friggframework/associations/model" {
+  export interface Association {
+    integrationId: string;
+    name: string;
+    type: string;
+    primaryObject: string;
+    objects: {
+      entityId: string;
+      objectType: string;
+      objId: string;
+      metadata?: object;
+    }[];
+  }
+}
+
 declare module "@friggframework/associations/association" {
   export default class Association implements IFriggAssociation {
     data: any;

package/types/database/index.d.ts

@@ -2,10 +2,4 @@ declare module "@friggframework/database" {
   export const prisma: any;
   export function connectPrisma(): Promise<any>;
   export function disconnectPrisma(): Promise<void>;
-  export class TokenRepository {
-    constructor(params: { prismaClient: any });
-  }
-  export class WebsocketConnectionRepository {
-    constructor(params: { prismaClient: any });
-  }
 }

package/types/module-plugin/index.d.ts

@@ -2,21 +2,18 @@ declare module "@friggframework/module-plugin" {
   import { Delegate, IFriggDelegate } from "@friggframework/core";
 
   export interface Credential {
-    id?: string;
-    userId?: string;
-    authIsValid?: boolean;
-    externalId?: string;
-    data?: any;
+    userId: string;
+    authIsValid: boolean;
+    externalId: string;
   }
 
+  interface IFriggEntityManager { }
+
   export interface Entity {
-    id?: string;
-    credentialId?: string;
-    userId?: string;
-    name?: string;
-    moduleName?: string;
-    externalId?: string;
-    data?: any;
+    credentialId: string;
+    userId: string;
+    name: string;
+    externalId: string;
   }
 
   export type MappedEntity = Entity & { id: string; type: any };

package/types/syncs/index.d.ts

@@ -1,3 +1,16 @@
+declare module "@friggframework/syncs/model" {
+  export interface Sync {
+    entities: any[];
+    hash: string;
+    name: string;
+    dataIdentifiers: {
+      entity: any;
+      id: object;
+      hash: string;
+    }[];
+  }
+}
+
 declare module "@friggframework/syncs/manager" {
   import Sync from "@friggframework/syncs/sync";