@loomcore/api 0.1.73 → 0.1.75

package/dist/databases/postgres/utils/build-select-clause.js

@@ -3,12 +3,12 @@ import { JoinMany } from '../../operations/join-many.operation.js';
 import { JoinThrough } from '../../operations/join-through.operation.js';
 import { JoinThroughMany } from '../../operations/join-through-many.operation.js';
 async function getTableColumns(client, tableName) {
-    const result = await client.query(`
-            SELECT column_name
-            FROM information_schema.columns
-            WHERE table_schema = current_schema()
-              AND table_name = $1
-            ORDER BY ordinal_position
+    const result = await client.query(`
+            SELECT column_name
+            FROM information_schema.columns
+            WHERE table_schema = current_schema()
+              AND table_name = $1
+            ORDER BY ordinal_position
         `, [tableName]);
     return result.rows.map(row => row.column_name);
 }

package/dist/databases/postgres/utils/does-table-exist.util.js

@@ -1,8 +1,8 @@
 export async function doesTableExist(client, tableName) {
-    const result = await client.query(`
-        SELECT EXISTS (
-            SELECT 1 FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = $1
-        )
+    const result = await client.query(`
+        SELECT EXISTS (
+            SELECT 1 FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = $1
+        )
     `, [tableName]);
     return result.rows[0].exists;
 }

package/dist/models/base-api-config.interface.d.ts

@@ -1,6 +1,7 @@
 import { DbType } from "../databases/db-type.type.js";
 import { IAuthConfig } from "./auth-config.interface.js";
 import { IEmailConfig } from "./email-config.interface.js";
+import { IEmailClient } from "./email-client.interface.js";
 import { IMultiTenantConfig } from "./multi-tenant-config.interface.js";
 export interface IBaseApiConfig {
     app: {
@@ -30,4 +31,7 @@ export interface IBaseApiConfig {
         hostName: string;
         internalPort?: number;
     };
+    thirdPartyClients?: {
+        emailClient?: IEmailClient;
+    };
 }

package/dist/services/auth.service.d.ts

@@ -5,14 +5,13 @@ import { MultiTenantApiService } from './multi-tenant-api.service.js';
 import { UpdateResult } from '../databases/models/update-result.js';
 import { IRefreshToken } from '../models/refresh-token.model.js';
 import { IDatabase } from '../databases/models/index.js';
-import { IEmailClient } from '../models/email-client.interface.js';
 export declare class AuthService extends MultiTenantApiService<IUser> {
     private refreshTokenService;
     private passwordResetTokenService;
     private emailService;
     private organizationService;
     private authConfig;
-    constructor(database: IDatabase, emailClient: IEmailClient);
+    constructor(database: IDatabase);
     attemptLogin(req: Request, res: Response, email: string, password: string): Promise<ILoginResponse | null>;
     logUserIn(userContext: IUserContext, deviceId: string): Promise<{
         tokens: {

package/dist/services/auth.service.js

@@ -18,11 +18,11 @@ export class AuthService extends MultiTenantApiService {
     emailService;
     organizationService;
     authConfig;
-    constructor(database, emailClient) {
+    constructor(database) {
         super(database, 'users', 'user', UserSpec);
         this.refreshTokenService = new GenericApiService(database, 'refresh_tokens', 'refresh_token', refreshTokenModelSpec);
         this.passwordResetTokenService = new PasswordResetTokenService(database);
-        this.emailService = new EmailService(emailClient);
+        this.emailService = new EmailService();
         this.organizationService = new OrganizationService(database);
         if (!config.auth) {
             throw new ServerError('Auth configuration is not set');

package/dist/services/email.service.d.ts

@@ -1,7 +1,6 @@
-import { IEmailClient } from '../models/email-client.interface.js';
 export declare class EmailService {
     private emailConfig;
     private emailClient;
-    constructor(emailClient: IEmailClient);
+    constructor();
     sendHtmlEmail(emailAddress: string, subject: string, body: string): Promise<void>;
 }

package/dist/services/email.service.js

@@ -3,14 +3,19 @@ import { config } from '../config/index.js';
 export class EmailService {
     emailConfig;
     emailClient;
-    constructor(emailClient) {
+    constructor() {
         if (config.email) {
             this.emailConfig = config.email;
         }
         else {
             throw new ServerError('Email configuration is not available. Email API credentials are not set in the config.');
         }
-        this.emailClient = emailClient;
+        if (config.thirdPartyClients?.emailClient) {
+            this.emailClient = config.thirdPartyClients.emailClient;
+        }
+        else {
+            throw new ServerError('Email client is not available. Email client is not set in the config.');
+        }
     }
     async sendHtmlEmail(emailAddress, subject, body) {
         const messageData = {

package/dist/services/generic-query-service/generic-query-service.interface.d.ts

@@ -7,7 +7,7 @@ export interface IGenericQueryService<T extends IEntity> {
         operations: Operation[];
     };
     prepareQueryOptions(userContext: IUserContext | undefined, queryOptions: IQueryOptions): IQueryOptions;
-    postProcessEntity(userContext: IUserContext, entity: T): T;
+    postProcessEntity(userContext: IUserContext, entity: any): T;
     getAll(userContext: IUserContext): Promise<T[]>;
     get(userContext: IUserContext, queryOptions: IQueryOptions): Promise<IPagedResult<T>>;
     getById(userContext: IUserContext, id: AppIdType): Promise<T>;

package/dist/services/generic-query-service/generic-query.service.d.ts

@@ -14,7 +14,8 @@ export declare class GenericQueryService<T extends IEntity> implements IGenericQ
         operations: Operation[];
     };
     prepareQueryOptions(userContext: IUserContext | undefined, queryOptions: IQueryOptions): IQueryOptions;
-    postProcessEntity(userContext: IUserContext, entity: T): T;
+    protected postProcessEntityInternal(userContext: IUserContext, entity: any): T;
+    postProcessEntity(userContext: IUserContext, entity: any): T;
     getAll(userContext: IUserContext): Promise<T[]>;
     get(userContext: IUserContext, queryOptions?: IQueryOptions): Promise<IPagedResult<T>>;
     getById(userContext: IUserContext, id: AppIdType): Promise<T>;

package/dist/services/generic-query-service/generic-query.service.js

@@ -18,19 +18,23 @@ export class GenericQueryService {
     prepareQueryOptions(userContext, queryOptions) {
         return queryOptions;
     }
+    postProcessEntityInternal(userContext, entity) {
+        const dbPostProcessedEntity = this.database.postProcessEntity(entity, this.modelSpec.fullSchema);
+        return this.postProcessEntity(userContext, dbPostProcessedEntity);
+    }
     postProcessEntity(userContext, entity) {
-        return this.database.postProcessEntity(entity, this.modelSpec.fullSchema);
+        return entity;
     }
     async getAll(userContext) {
         const { operations } = this.prepareQuery(userContext, {}, []);
         const entities = await this.database.getAll(operations, this.rootTableName);
-        return entities.map(entity => this.postProcessEntity(userContext, entity));
+        return entities.map(entity => this.postProcessEntityInternal(userContext, entity));
     }
     async get(userContext, queryOptions = { ...DefaultQueryOptions }) {
         const preparedOptions = this.prepareQueryOptions(userContext, queryOptions);
         const { operations } = this.prepareQuery(userContext, {}, []);
         const pagedResult = await this.database.get(operations, preparedOptions, this.modelSpec, this.rootTableName);
-        const transformedEntities = (pagedResult.entities || []).map(entity => this.postProcessEntity(userContext, entity));
+        const transformedEntities = (pagedResult.entities || []).map(entity => this.postProcessEntityInternal(userContext, entity));
         return {
             ...pagedResult,
             entities: transformedEntities
@@ -42,7 +46,7 @@ export class GenericQueryService {
         if (!entity) {
             throw new IdNotFoundError();
         }
-        return this.postProcessEntity(userContext, entity);
+        return this.postProcessEntityInternal(userContext, entity);
     }
     async getCount(userContext) {
         const { operations } = this.prepareQuery(userContext, {}, []);

package/package.json

@@ -1,92 +1,92 @@
-{
-  "name": "@loomcore/api",
-  "version": "0.1.73",
-  "private": false,
-  "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "tsc": "tsc --project tsconfig.prod.json",
-    "build": "npm-run-all -s clean tsc",
-    "add": "git add .",
-    "commit": "git commit -m \"Updates\"",
-    "patch": "npm version patch",
-    "push": "git push",
-    "publishMe": "npm publish --access public",
-    "pub": "npm-run-all -s add commit patch build push publishMe",
-    "update-lib-versions": "npx --yes npm-check-updates -u -f @loomcore/common",
-    "install-updated-libs": "npm i @loomcore/common",
-    "update-libs": "npm-run-all -s update-lib-versions install-updated-libs",
-    "typecheck": "tsc",
-    "test": "npm-run-all -s test:postgres test:mongodb",
-    "test:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run",
-    "test:postgres:real": "cross-env NODE_ENV=test TEST_DATABASE=postgres USE_REAL_POSTGRES=true vitest run",
-    "test:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run",
-    "test:ci": "npm-run-all -s test:ci:postgres test:ci:mongodb",
-    "test:ci:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --reporter=json --outputFile=test-results-postgres.json",
-    "test:ci:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --reporter=json --outputFile=test-results-mongodb.json",
-    "test:watch": "cross-env NODE_ENV=test vitest",
-    "coverage": "npm-run-all -s coverage:postgres coverage:mongodb",
-    "coverage:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --coverage",
-    "coverage:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --coverage",
-    "test:db:start": "docker-compose -f docker-compose.test.yml up -d",
-    "test:db:stop": "docker-compose -f docker-compose.test.yml down",
-    "test:db:logs": "docker-compose -f docker-compose.test.yml logs -f"
-  },
-  "author": "Tim Hardy",
-  "license": "Apache 2.0",
-  "main": "dist/index.js",
-  "type": "module",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist/**/*"
-  ],
-  "exports": {
-    "./__tests__": "./dist/__tests__/index.js",
-    "./config": "./dist/config/index.js",
-    "./controllers": "./dist/controllers/index.js",
-    "./databases": "./dist/databases/index.js",
-    "./errors": "./dist/errors/index.js",
-    "./middleware": "./dist/middleware/index.js",
-    "./models": "./dist/models/index.js",
-    "./services": "./dist/services/index.js",
-    "./utils": "./dist/utils/index.js"
-  },
-  "dependencies": {
-    "jsonwebtoken": "^9.0.2",
-    "node-mailjet": "^6.0.8",
-    "qs": "^6.14.1"
-  },
-  "peerDependencies": {
-    "@loomcore/common": "^0.0.43",
-    "@sinclair/typebox": "0.34.33",
-    "cookie-parser": "^1.4.6",
-    "cors": "^2.8.5",
-    "express": "^5.1.0",
-    "lodash": "^4.17.21",
-    "moment": "^2.30.1",
-    "mongodb": "^6.16.0",
-    "pg": "^8.15.6",
-    "rxjs": "^7.8.0",
-    "umzug": "^3.8.2"
-  },
-  "devDependencies": {
-    "@types/cookie-parser": "^1.4.7",
-    "@types/cors": "^2.8.18",
-    "@types/express": "^5.0.1",
-    "@types/jsonwebtoken": "^9.0.9",
-    "@types/lodash": "^4.17.13",
-    "@types/pg": "^8.15.6",
-    "@types/qs": "^6.14.0",
-    "@types/supertest": "^6.0.3",
-    "@vitest/coverage-v8": "^3.0.9",
-    "cross-env": "^7.0.3",
-    "mongodb-memory-server": "^9.3.0",
-    "npm-run-all": "^4.1.5",
-    "pg-mem": "^3.0.8",
-    "rxjs": "^7.8.0",
-    "supertest": "^7.1.0",
-    "typescript": "^5.8.3",
-    "vite": "^6.2.5",
-    "vitest": "^3.0.9"
-  }
-}
+{
+  "name": "@loomcore/api",
+  "version": "0.1.75",
+  "private": false,
+  "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
+  "scripts": {
+    "clean": "rm -rf dist",
+    "tsc": "tsc --project tsconfig.prod.json",
+    "build": "npm-run-all -s clean tsc",
+    "add": "git add .",
+    "commit": "git commit -m \"Updates\"",
+    "patch": "npm version patch",
+    "push": "git push",
+    "publishMe": "npm publish --access public",
+    "pub": "npm-run-all -s add commit patch build push publishMe",
+    "update-lib-versions": "npx --yes npm-check-updates -u -f @loomcore/common",
+    "install-updated-libs": "npm i @loomcore/common",
+    "update-libs": "npm-run-all -s update-lib-versions install-updated-libs",
+    "typecheck": "tsc",
+    "test": "npm-run-all -s test:postgres test:mongodb",
+    "test:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run",
+    "test:postgres:real": "cross-env NODE_ENV=test TEST_DATABASE=postgres USE_REAL_POSTGRES=true vitest run",
+    "test:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run",
+    "test:ci": "npm-run-all -s test:ci:postgres test:ci:mongodb",
+    "test:ci:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --reporter=json --outputFile=test-results-postgres.json",
+    "test:ci:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --reporter=json --outputFile=test-results-mongodb.json",
+    "test:watch": "cross-env NODE_ENV=test vitest",
+    "coverage": "npm-run-all -s coverage:postgres coverage:mongodb",
+    "coverage:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --coverage",
+    "coverage:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --coverage",
+    "test:db:start": "docker-compose -f docker-compose.test.yml up -d",
+    "test:db:stop": "docker-compose -f docker-compose.test.yml down",
+    "test:db:logs": "docker-compose -f docker-compose.test.yml logs -f"
+  },
+  "author": "Tim Hardy",
+  "license": "Apache 2.0",
+  "main": "dist/index.js",
+  "type": "module",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*"
+  ],
+  "exports": {
+    "./__tests__": "./dist/__tests__/index.js",
+    "./config": "./dist/config/index.js",
+    "./controllers": "./dist/controllers/index.js",
+    "./databases": "./dist/databases/index.js",
+    "./errors": "./dist/errors/index.js",
+    "./middleware": "./dist/middleware/index.js",
+    "./models": "./dist/models/index.js",
+    "./services": "./dist/services/index.js",
+    "./utils": "./dist/utils/index.js"
+  },
+  "dependencies": {
+    "jsonwebtoken": "^9.0.2",
+    "node-mailjet": "^6.0.8",
+    "qs": "^6.14.1"
+  },
+  "peerDependencies": {
+    "@loomcore/common": "^0.0.43",
+    "@sinclair/typebox": "0.34.33",
+    "cookie-parser": "^1.4.6",
+    "cors": "^2.8.5",
+    "express": "^5.1.0",
+    "lodash": "^4.17.21",
+    "moment": "^2.30.1",
+    "mongodb": "^6.16.0",
+    "pg": "^8.15.6",
+    "rxjs": "^7.8.0",
+    "umzug": "^3.8.2"
+  },
+  "devDependencies": {
+    "@types/cookie-parser": "^1.4.7",
+    "@types/cors": "^2.8.18",
+    "@types/express": "^5.0.1",
+    "@types/jsonwebtoken": "^9.0.9",
+    "@types/lodash": "^4.17.13",
+    "@types/pg": "^8.15.6",
+    "@types/qs": "^6.14.0",
+    "@types/supertest": "^6.0.3",
+    "@vitest/coverage-v8": "^3.0.9",
+    "cross-env": "^7.0.3",
+    "mongodb-memory-server": "^9.3.0",
+    "npm-run-all": "^4.1.5",
+    "pg-mem": "^3.0.8",
+    "rxjs": "^7.8.0",
+    "supertest": "^7.1.0",
+    "typescript": "^5.8.3",
+    "vite": "^6.2.5",
+    "vitest": "^3.0.9"
+  }
+}