@loomcore/api 0.1.74 → 0.1.75

package/dist/databases/migrations/migration-runner.d.ts

@@ -1,5 +1,4 @@
 import { IBaseApiConfig } from '../../models/base-api-config.interface.js';
-import { IEmailClient } from '../../models/email-client.interface.js';
 export declare class MigrationRunner {
     private config;
     private dbType;
@@ -7,8 +6,7 @@ export declare class MigrationRunner {
     private migrationsDir;
     private primaryTimezone;
     private dbConnection;
-    private emailClient?;
-    constructor(config: IBaseApiConfig, emailClient?: IEmailClient);
+    constructor(config: IBaseApiConfig);
     private getTimestamp;
     private parseSql;
     private getMigrator;

package/dist/databases/migrations/migration-runner.js

@@ -15,15 +15,13 @@ export class MigrationRunner {
     migrationsDir;
     primaryTimezone;
     dbConnection;
-    emailClient;
-    constructor(config, emailClient) {
+    constructor(config) {
         setBaseApiConfig(config);
         this.config = config;
         this.dbType = config.app.dbType;
         this.dbUrl = this.dbType === 'postgres' ? buildPostgresUrl(config) : buildMongoUrl(config);
         this.migrationsDir = path.join(process.cwd(), 'database', 'migrations');
         this.primaryTimezone = config.app.primaryTimezone || 'UTC';
-        this.emailClient = emailClient;
     }
     getTimestamp() {
         const now = new Date();
@@ -66,7 +64,7 @@ export class MigrationRunner {
             this.dbConnection = pool;
             return new Umzug({
                 migrations: async () => {
-                    const initialSchema = getPostgresInitialSchema(this.config, this.emailClient).map(m => ({
+                    const initialSchema = getPostgresInitialSchema(this.config).map(m => ({
                         name: m.name,
                         up: async () => {
                             console.log(`   Running [LIBRARY] ${m.name}...`);
@@ -105,7 +103,7 @@ export class MigrationRunner {
             console.log(`🔎 Looking for migrations in: ${globPattern}`);
             return new Umzug({
                 migrations: async () => {
-                    const initialSchema = getMongoInitialSchema(this.config, this.emailClient).map(m => ({
+                    const initialSchema = getMongoInitialSchema(this.config).map(m => ({
                         name: m.name,
                         up: async () => {
                             console.log(`   Running [LIBRARY] ${m.name}...`);
@@ -253,31 +251,31 @@ export class MigrationRunner {
         let content = '';
         if (this.dbType === 'postgres') {
             extension = 'sql';
-            content = `-- Migration: ${safeName}
--- Created: ${new Date().toISOString()}
-
--- up
--- Write your CREATE/ALTER statements here...
-
-
--- down
--- Write your DROP/UNDO statements here...
+            content = `-- Migration: ${safeName}
+-- Created: ${new Date().toISOString()}
+
+-- up
+-- Write your CREATE/ALTER statements here...
+
+
+-- down
+-- Write your DROP/UNDO statements here...
 `;
         }
         else {
             extension = 'ts';
-            content = `import { Db } from 'mongodb';
-
-// Migration: ${safeName}
-// Created: ${new Date().toISOString()}
-
-export const up = async ({ context: db }: { context: Db }) => {
-  // await db.collection('...')....
-};
-
-export const down = async ({ context: db }: { context: Db }) => {
-  // await db.collection('...')....
-};
+            content = `import { Db } from 'mongodb';
+
+// Migration: ${safeName}
+// Created: ${new Date().toISOString()}
+
+export const up = async ({ context: db }: { context: Db }) => {
+  // await db.collection('...')....
+};
+
+export const down = async ({ context: db }: { context: Db }) => {
+  // await db.collection('...')....
+};
 `;
         }
         const fullPath = path.join(this.migrationsDir, `${filename}.${extension}`);

package/dist/databases/mongo-db/migrations/mongo-initial-schema.d.ts

@@ -1,6 +1,5 @@
 import { Db } from 'mongodb';
 import { IBaseApiConfig } from '../../../models/base-api-config.interface.js';
-import { IEmailClient } from '../../../models/email-client.interface.js';
 export interface ISyntheticMigration {
     name: string;
     up: (context: {
@@ -10,4 +9,4 @@ export interface ISyntheticMigration {
         context: Db;
     }) => Promise<void>;
 }
-export declare const getMongoInitialSchema: (config: IBaseApiConfig, emailClient?: IEmailClient) => ISyntheticMigration[];
+export declare const getMongoInitialSchema: (config: IBaseApiConfig) => ISyntheticMigration[];

package/dist/databases/mongo-db/migrations/mongo-initial-schema.js

@@ -2,7 +2,7 @@ import { randomUUID } from 'crypto';
 import { initializeSystemUserContext, EmptyUserContext, getSystemUserContext, isSystemUserContextInitialized } from '@loomcore/common/models';
 import { MongoDBDatabase } from '../mongo-db.database.js';
 import { AuthService, OrganizationService } from '../../../services/index.js';
-export const getMongoInitialSchema = (config, emailClient) => {
+export const getMongoInitialSchema = (config) => {
     const migrations = [];
     const isMultiTenant = config.app.isMultiTenant;
     if (isMultiTenant && !config.multiTenant) {
@@ -12,7 +12,7 @@ export const getMongoInitialSchema = (config, emailClient) => {
     if (isAuthEnabled && !config.auth) {
         throw new Error('Auth enabled without auth configuration');
     }
-    if (isAuthEnabled && (!emailClient || !config.email)) {
+    if (isAuthEnabled && (!config.thirdPartyClients?.emailClient || !config.email)) {
         throw new Error('Auth enabled without email client or email configuration');
     }
     if (isMultiTenant)
@@ -166,7 +166,7 @@ export const getMongoInitialSchema = (config, emailClient) => {
             name: '00000000000009_data-admin-user',
             up: async ({ context: db }) => {
                 const database = new MongoDBDatabase(db);
-                const authService = new AuthService(database, emailClient);
+                const authService = new AuthService(database);
                 if (!isSystemUserContextInitialized()) {
                     const errorMessage = isMultiTenant
                         ? 'SystemUserContext has not been initialized. The meta-org migration (00000000000008_data-meta-org) should have run before this migration. ' +
@@ -201,7 +201,7 @@ export const getMongoInitialSchema = (config, emailClient) => {
             up: async ({ context: db }) => {
                 const database = new MongoDBDatabase(db);
                 const organizationService = new OrganizationService(database);
-                const authService = new AuthService(database, emailClient);
+                const authService = new AuthService(database);
                 const metaOrg = await organizationService.getMetaOrg(EmptyUserContext);
                 if (!metaOrg) {
                     throw new Error('Meta organization not found. Ensure meta-org migration ran successfully.');

package/dist/databases/postgres/commands/postgres-batch-update.command.js

@@ -31,10 +31,10 @@ export async function batchUpdate(client, entities, operations, queryObject, plu
             const setClause = columns.map((col, index) => `${col} = $${index + 1}`).join(', ');
             queryObject.filters._id = { eq: _id };
             const { whereClause } = buildWhereClause(queryObject, values);
-            const query = `
-                UPDATE "${pluralResourceName}"
-                SET ${setClause}
-                ${whereClause}
+            const query = `
+                UPDATE "${pluralResourceName}"
+                SET ${setClause}
+                ${whereClause}
             `;
             await client.query(query, values);
         }
@@ -47,9 +47,9 @@ export async function batchUpdate(client, entities, operations, queryObject, plu
         const selectClause = hasJoins
             ? await buildSelectClause(client, pluralResourceName, pluralResourceName, operations)
             : '*';
-        const selectQuery = `
-            SELECT ${selectClause} FROM "${pluralResourceName}" ${joinClauses}
-            ${whereClause}
+        const selectQuery = `
+            SELECT ${selectClause} FROM "${pluralResourceName}" ${joinClauses}
+            ${whereClause}
         `;
         const result = await client.query(selectQuery, values);
         return hasJoins

package/dist/databases/postgres/commands/postgres-create-many.command.js

@@ -33,10 +33,10 @@ export async function createMany(client, pluralResourceName, entities) {
             valueClauses.push(`(${placeholders})`);
             allValues.push(...values);
         });
-        const query = `
-            INSERT INTO "${pluralResourceName}" (${columns.map(col => `"${col}"`).join(', ')})
-            VALUES ${valueClauses.join(', ')}
-            RETURNING *
+        const query = `
+            INSERT INTO "${pluralResourceName}" (${columns.map(col => `"${col}"`).join(', ')})
+            VALUES ${valueClauses.join(', ')}
+            RETURNING *
         `;
         const result = await client.query(query, allValues);
         if (result.rows.length !== entities.length) {

package/dist/databases/postgres/commands/postgres-create.command.js

@@ -5,10 +5,10 @@ export async function create(client, pluralResourceName, entity) {
         delete entity._id;
         const { columns, values } = columnsAndValuesFromEntity(entity);
         const placeholders = columns.map((_, index) => `$${index + 1}`).join(', ');
-        const query = `
-            INSERT INTO "${pluralResourceName}" (${columns.join(', ')})
-            VALUES (${placeholders})
-            RETURNING *
+        const query = `
+            INSERT INTO "${pluralResourceName}" (${columns.join(', ')})
+            VALUES (${placeholders})
+            RETURNING *
         `;
         const result = await client.query(query, values);
         if (result.rows.length === 0) {

package/dist/databases/postgres/commands/postgres-full-update-by-id.command.js

@@ -2,12 +2,12 @@ import { BadRequestError, IdNotFoundError } from "../../../errors/index.js";
 import { buildJoinClauses } from '../utils/build-join-clauses.js';
 export async function fullUpdateById(client, operations, id, entity, pluralResourceName) {
     try {
-        const tableColumns = await client.query(`
-                SELECT column_name, column_default
-                FROM information_schema.columns
-                WHERE table_schema = current_schema()
-                  AND table_name = $1
-                ORDER BY ordinal_position
+        const tableColumns = await client.query(`
+                SELECT column_name, column_default
+                FROM information_schema.columns
+                WHERE table_schema = current_schema()
+                  AND table_name = $1
+                ORDER BY ordinal_position
             `, [pluralResourceName]);
         if (tableColumns.rows.length === 0) {
             throw new BadRequestError(`Unable to resolve columns for ${pluralResourceName}`);
@@ -40,19 +40,19 @@ export async function fullUpdateById(client, operations, id, entity, pluralResou
             throw new BadRequestError('Cannot perform full update with no fields to update');
         }
         const setClause = updateColumns.join(', ');
-        const query = `
-            UPDATE "${pluralResourceName}"
-            SET ${setClause}
-            WHERE "_id" = $${paramIndex}
+        const query = `
+            UPDATE "${pluralResourceName}"
+            SET ${setClause}
+            WHERE "_id" = $${paramIndex}
         `;
         const result = await client.query(query, [...updateValues, id]);
         if (result.rowCount === 0) {
             throw new IdNotFoundError();
         }
         const joinClauses = buildJoinClauses(operations);
-        const selectQuery = `
-            SELECT * FROM "${pluralResourceName}" ${joinClauses}
-            WHERE "_id" = $1 LIMIT 1
+        const selectQuery = `
+            SELECT * FROM "${pluralResourceName}" ${joinClauses}
+            WHERE "_id" = $1 LIMIT 1
         `;
         const selectResult = await client.query(selectQuery, [id]);
         if (selectResult.rows.length === 0) {

package/dist/databases/postgres/commands/postgres-partial-update-by-id.command.js

@@ -10,19 +10,19 @@ export async function partialUpdateById(client, operations, id, entity, pluralRe
             throw new BadRequestError('Cannot perform partial update with no fields to update');
         }
         const setClause = updateColumns.map((col, index) => `${col} = $${index + 1}`).join(', ');
-        const query = `
-            UPDATE "${pluralResourceName}"
-            SET ${setClause}
-            WHERE "_id" = $${updateValues.length + 1}
+        const query = `
+            UPDATE "${pluralResourceName}"
+            SET ${setClause}
+            WHERE "_id" = $${updateValues.length + 1}
         `;
         const result = await client.query(query, [...updateValues, id]);
         if (result.rowCount === 0) {
             throw new IdNotFoundError();
         }
         const joinClauses = buildJoinClauses(operations);
-        const selectQuery = `
-            SELECT * FROM "${pluralResourceName}" ${joinClauses}
-            WHERE "_id" = $1 LIMIT 1
+        const selectQuery = `
+            SELECT * FROM "${pluralResourceName}" ${joinClauses}
+            WHERE "_id" = $1 LIMIT 1
         `;
         const selectResult = await client.query(selectQuery, [id]);
         if (selectResult.rows.length === 0) {

package/dist/databases/postgres/commands/postgres-update.command.js

@@ -17,10 +17,10 @@ export async function update(client, queryObject, entity, operations, pluralReso
             const originalIndex = parseInt(num, 10);
             return `$${originalIndex + updateValues.length}`;
         });
-        const updateQuery = `
-            UPDATE "${pluralResourceName}"
-            SET ${setClause}
-            ${whereClauseWithAdjustedParams}
+        const updateQuery = `
+            UPDATE "${pluralResourceName}"
+            SET ${setClause}
+            ${whereClauseWithAdjustedParams}
         `;
         const allUpdateValues = [...updateValues, ...whereValues];
         const result = await client.query(updateQuery, allUpdateValues);
@@ -29,9 +29,9 @@ export async function update(client, queryObject, entity, operations, pluralReso
         }
         const joinClauses = buildJoinClauses(operations);
         const orderByClause = buildOrderByClause(queryObject);
-        const selectQuery = `
-            SELECT * FROM "${pluralResourceName}" ${joinClauses}
-            ${whereClause} ${orderByClause}
+        const selectQuery = `
+            SELECT * FROM "${pluralResourceName}" ${joinClauses}
+            ${whereClause} ${orderByClause}
         `.trim();
         const selectResult = await client.query(selectQuery, whereValues);
         return selectResult.rows;

package/dist/databases/postgres/migrations/__tests__/test-migration-helper.js

@@ -1,9 +1,8 @@
 import { Umzug } from 'umzug';
 import { getPostgresInitialSchema } from '../postgres-initial-schema.js';
 import { getPostgresTestSchema } from '../../../../__tests__/postgres-test-migrations/postgres-test-schema.js';
-import { TestEmailClient } from '../../../../__tests__/test-email-client.js';
 export async function runInitialSchemaMigrations(pool, config) {
-    const initialSchema = getPostgresInitialSchema(config, new TestEmailClient());
+    const initialSchema = getPostgresInitialSchema(config);
     const umzug = new Umzug({
         migrations: async () => {
             return initialSchema.map(m => ({

package/dist/databases/postgres/migrations/postgres-initial-schema.d.ts

@@ -1,6 +1,5 @@
 import { Pool } from 'pg';
 import { IBaseApiConfig } from '../../../models/base-api-config.interface.js';
-import { IEmailClient } from '../../../models/email-client.interface.js';
 export interface SyntheticMigration {
     name: string;
     up: (context: {
@@ -10,4 +9,4 @@ export interface SyntheticMigration {
         context: Pool;
     }) => Promise<void>;
 }
-export declare const getPostgresInitialSchema: (config: IBaseApiConfig, emailClient?: IEmailClient) => SyntheticMigration[];
+export declare const getPostgresInitialSchema: (config: IBaseApiConfig) => SyntheticMigration[];