@loomcore/api 0.0.59 → 0.1.2

package/dist/services/organization.service.js

@@ -1,20 +1,23 @@
-import { GenericApiService } from './generic-api.service.js';
+import { GenericApiService } from './generic-api-service/generic-api.service.js';
 import { OrganizationSpec } from '@loomcore/common/models';
 export class OrganizationService extends GenericApiService {
-    constructor(db) {
-        super(db, 'organizations', 'organization', OrganizationSpec);
+    constructor(database) {
+        super(database, 'organizations', 'organization', OrganizationSpec);
     }
     async getAuthTokenByRepoCode(userContext, orgId) {
         const org = await this.getById(userContext, orgId);
-        return org ? org.authToken : null;
+        return org?.authToken ?? null;
     }
     async validateRepoAuthToken(userContext, orgCode, authToken) {
-        const org = await this.findOne(userContext, { code: orgCode });
+        const org = await this.findOne(userContext, { filters: { code: { eq: orgCode } } });
+        if (!org) {
+            return null;
+        }
         const orgId = org.authToken === authToken ? org._id.toString() : null;
         return orgId;
     }
     async getMetaOrg(userContext) {
-        const org = await this.findOne(userContext, { isMetaOrg: true });
+        const org = await this.findOne(userContext, { filters: { isMetaOrg: { eq: true } } });
         return org;
     }
 }

package/dist/services/password-reset-token.service.d.ts

@@ -1,8 +1,8 @@
-import { Db } from 'mongodb';
 import { IPasswordResetToken } from '@loomcore/common/models';
-import { GenericApiService } from './generic-api.service.js';
+import { GenericApiService } from './generic-api-service/generic-api.service.js';
+import { IDatabase } from '../databases/models/index.js';
 export declare class PasswordResetTokenService extends GenericApiService<IPasswordResetToken> {
-    constructor(db: Db);
+    constructor(database: IDatabase);
     createPasswordResetToken(email: string, expiresOn: number): Promise<IPasswordResetToken | null>;
     getByEmail(email: string): Promise<IPasswordResetToken | null>;
 }

package/dist/services/password-reset-token.service.js

@@ -1,13 +1,13 @@
 import crypto from 'crypto';
 import { EmptyUserContext, PasswordResetTokenSpec } from '@loomcore/common/models';
-import { GenericApiService } from './generic-api.service.js';
+import { GenericApiService } from './generic-api-service/generic-api.service.js';
 export class PasswordResetTokenService extends GenericApiService {
-    constructor(db) {
-        super(db, 'passwordResetTokens', 'passwordResetToken', PasswordResetTokenSpec);
+    constructor(database) {
+        super(database, 'passwordResetTokens', 'passwordResetToken', PasswordResetTokenSpec);
     }
     async createPasswordResetToken(email, expiresOn) {
         const lowerCaseEmail = email.toLowerCase();
-        await this.collection.deleteMany({ email: lowerCaseEmail });
+        await this.deleteMany(EmptyUserContext, { filters: { email: { eq: lowerCaseEmail } } });
         const passwordResetToken = {
             email: lowerCaseEmail,
             token: crypto.randomBytes(40).toString('hex'),
@@ -16,6 +16,6 @@ export class PasswordResetTokenService extends GenericApiService {
         return super.create(EmptyUserContext, passwordResetToken);
     }
     async getByEmail(email) {
-        return await super.findOne(EmptyUserContext, { email: email.toLowerCase() });
+        return await super.findOne(EmptyUserContext, { filters: { email: { eq: email.toLowerCase() } } });
     }
 }

package/dist/services/tenant-query-decorator.d.ts

@@ -7,7 +7,7 @@ export declare const DEFAULT_TENANT_OPTIONS: ITenantQueryOptions;
 export declare class TenantQueryDecorator {
     private options;
     constructor(options?: Partial<ITenantQueryOptions>);
-    applyTenantToQuery(userContext: IUserContext, queryObject: any, collectionName: string): any;
+    applyTenantToQuery(userContext: IUserContext, queryObject: IQueryOptions, collectionName: string): IQueryOptions;
     applyTenantToQueryOptions(userContext: IUserContext, queryOptions: IQueryOptions, collectionName: string): IQueryOptions;
     applyTenantToEntity<T extends IEntity>(userContext: IUserContext, entity: T, collectionName: string): T;
     getOrgIdField(): string;

package/dist/services/tenant-query-decorator.js

@@ -14,7 +14,7 @@ export class TenantQueryDecorator {
             userContext?._orgId;
         if (shouldApplyTenantFilter) {
             const orgIdField = this.options.orgIdField || '_orgId';
-            result = { ...queryObject, [orgIdField]: userContext._orgId };
+            result = { ...queryObject, filters: { ...queryObject.filters, [orgIdField]: { eq: userContext._orgId } } };
         }
         else if (!userContext?._orgId) {
             if (!this.options.excludedCollections?.includes(collectionName)) {

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

@@ -1,10 +1,8 @@
-import { Db } from 'mongodb';
 import { IUser, IUserContext } from '@loomcore/common/models';
 import { MultiTenantApiService } from '../services/index.js';
+import { IDatabase } from '../databases/models/index.js';
 export declare class UserService extends MultiTenantApiService<IUser> {
-    constructor(db: Db);
-    fullUpdateById(userContext: IUserContext, id: string, entity: IUser): Promise<any>;
-    protected prepareEntity(userContext: IUserContext, entity: IUser, isCreate: boolean): Promise<IUser | Partial<IUser>>;
-    transformList(users: IUser[]): IUser[];
-    transformSingle(user: IUser): IUser;
+    constructor(database: IDatabase);
+    fullUpdateById(userContext: IUserContext, id: string, entity: IUser): Promise<IUser>;
+    preprocessEntity(userContext: IUserContext, entity: Partial<IUser>, isCreate: boolean, allowId?: boolean): Promise<Partial<IUser>>;
 }

package/dist/services/user.service.js

@@ -3,14 +3,14 @@ import { UserSpec, PublicUserSchema } from '@loomcore/common/models';
 import { MultiTenantApiService } from '../services/index.js';
 import { ServerError } from '../errors/index.js';
 export class UserService extends MultiTenantApiService {
-    constructor(db) {
-        super(db, 'users', 'user', UserSpec);
+    constructor(database) {
+        super(database, 'users', 'user', UserSpec);
     }
     async fullUpdateById(userContext, id, entity) {
         throw new ServerError('Cannot full update a user. Either use PATCH or /auth/change-password to update password.');
     }
-    async prepareEntity(userContext, entity, isCreate) {
-        const preparedEntity = await super.prepareEntity(userContext, entity, isCreate);
+    async preprocessEntity(userContext, entity, isCreate, allowId = false) {
+        const preparedEntity = await super.preprocessEntity(userContext, entity, isCreate);
         if (preparedEntity.email) {
             preparedEntity.email = preparedEntity.email.toLowerCase();
         }
@@ -19,10 +19,4 @@ export class UserService extends MultiTenantApiService {
         }
         return preparedEntity;
     }
-    transformList(users) {
-        return super.transformList(users);
-    }
-    transformSingle(user) {
-        return super.transformSingle(user);
-    }
 }

package/dist/services/utils/audit-for-create.util.d.ts

@@ -0,0 +1,2 @@
+import { IUserContext } from "@loomcore/common/models";
+export declare function auditForCreate(userContext: IUserContext, doc: any): void;

package/dist/services/utils/audit-for-create.util.js

@@ -0,0 +1,9 @@
+import moment from "moment";
+export function auditForCreate(userContext, doc) {
+    const now = moment().utc().toDate();
+    const userId = userContext.user?._id?.toString() ?? 'system';
+    doc._created = now;
+    doc._createdBy = userId;
+    doc._updated = now;
+    doc._updatedBy = userId;
+}

package/dist/services/utils/audit-for-update.util.d.ts

@@ -0,0 +1,2 @@
+import { IUserContext } from "@loomcore/common/models";
+export declare function auditForUpdate(userContext: IUserContext, doc: any): void;

package/dist/services/utils/audit-for-update.util.js

@@ -0,0 +1,7 @@
+import moment from "moment";
+export function auditForUpdate(userContext, doc) {
+    const userId = userContext.user?._id?.toString() ?? 'system';
+    doc._updated = moment().utc().toDate();
+    doc._updatedBy = userId;
+}
+;

package/dist/services/utils/strip-sender-provided-system-properties.util.d.ts

@@ -0,0 +1,2 @@
+import { IUserContext } from "@loomcore/common/models";
+export declare function stripSenderProvidedSystemProperties(userContext: IUserContext, entity: any, allowId?: boolean): void;

package/dist/services/utils/strip-sender-provided-system-properties.util.js

@@ -0,0 +1,15 @@
+export function stripSenderProvidedSystemProperties(userContext, entity, allowId = false) {
+    const isSystemUser = userContext.user?._id === 'system';
+    if (isSystemUser) {
+        return;
+    }
+    const propertiesToIgnore = ['_orgId'];
+    if (allowId) {
+        propertiesToIgnore.push('_id');
+    }
+    for (const key in entity) {
+        if (Object.prototype.hasOwnProperty.call(entity, key) && key.startsWith('_') && !propertiesToIgnore.includes(key)) {
+            delete entity[key];
+        }
+    }
+}

package/dist/utils/api.utils.js

@@ -14,7 +14,8 @@ function apiResponse(response, status, options = {}, modelSpec, publicSchema) {
             options.data = pagedResult;
         }
         else {
-            options.data = specForEncoding.encode(options.data);
+            const encodedData = specForEncoding.encode(options.data);
+            options.data = encodedData;
         }
     }
     if (success) {

package/dist/utils/index.d.ts

@@ -1,7 +1,6 @@
 export * from './address.utils.js';
 export * from './api.utils.js';
 export * from './conversion.utils.js';
-export * from './db.utils.js';
 export * from './express.utils.js';
 export * from './password.utils.js';
 export * from './string.utils.js';

package/dist/utils/index.js

@@ -1,7 +1,6 @@
 export * from './address.utils.js';
 export * from './api.utils.js';
 export * from './conversion.utils.js';
-export * from './db.utils.js';
 export * from './express.utils.js';
 export * from './password.utils.js';
 export * from './string.utils.js';

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@loomcore/api",
-  "version": "0.0.59",
+  "version": "0.1.2",
   "private": false,
-  "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb",
+  "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",
@@ -17,10 +17,16 @@
     "install-updated-libs": "npm i @loomcore/models",
     "update-libs": "npm-run-all -s update-lib-versions install-updated-libs",
     "typecheck": "tsc",
-    "test": "cross-env NODE_ENV=test vitest run",
-    "test:ci": "cross-env NODE_ENV=test vitest run --reporter=json --outputFile=test-results.json",
+    "test": "npm-run-all -s test:postgres test:mongodb",
+    "test:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres 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": "cross-env NODE_ENV=test vitest run --coverage"
+    "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"
   },
   "author": "Tim Hardy",
   "license": "Apache 2.0",
@@ -31,8 +37,10 @@
     "dist/**/*"
   ],
   "exports": {
+    "./__tests__": "./dist/__tests__/index.js",
     "./config": "./dist/config/index.js",
     "./controllers": "./dist/controllers/index.js",
+    "./database": "./dist/database/index.js",
     "./errors": "./dist/errors/index.js",
     "./middleware": "./dist/middleware/index.js",
     "./models": "./dist/models/index.js",
@@ -45,7 +53,7 @@
     "qs": "^6.14.0"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.14",
+    "@loomcore/common": "^0.0.19",
     "@sinclair/typebox": "0.34.33",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
@@ -53,6 +61,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "mongodb": "^6.16.0",
+    "pg": "^8.15.6",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
@@ -63,6 +72,7 @@
     "@types/lodash": "^4.17.13",
     "@types/qs": "^6.14.0",
     "@types/supertest": "^6.0.3",
+    "@types/pg": "^8.15.6",
     "@vitest/coverage-v8": "^3.0.9",
     "cross-env": "^7.0.3",
     "mongodb-memory-server": "^9.3.0",
@@ -70,6 +80,7 @@
     "rxjs": "^7.8.0",
     "supertest": "^7.1.0",
     "typescript": "^5.8.3",
+    "pg-mem": "^3.0.5",
     "vite": "^6.2.5",
     "vitest": "^3.0.9"
   }

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

@@ -1,27 +0,0 @@
-import { DeleteResult } from 'mongodb';
-import { ValueError } from '@sinclair/typebox/errors';
-import { IUserContext, IEntity, IPagedResult, IQueryOptions } from '@loomcore/common/models';
-export interface IGenericApiService<T extends IEntity> {
-    validate(doc: any, isPartial?: boolean): ValueError[] | null;
-    validateMany(docs: any[], isPartial?: boolean): ValueError[] | null;
-    prepareDataForDb(userContext: IUserContext, entity: T, isCreate?: boolean): Promise<T>;
-    prepareDataForDb(userContext: IUserContext, entity: Partial<T>, isCreate?: boolean): Promise<Partial<T>>;
-    prepareDataForDb(userContext: IUserContext, entity: T[], isCreate?: boolean): Promise<T[]>;
-    prepareDataForDb(userContext: IUserContext, entity: Partial<T>[], isCreate?: boolean): Promise<Partial<T>[]>;
-    prepareDataForBatchUpdate(userContext: IUserContext, entities: Partial<T>[]): Promise<Partial<T>[]>;
-    getAll(userContext: IUserContext): Promise<T[]>;
-    get(userContext: IUserContext, queryOptions: IQueryOptions): Promise<IPagedResult<T>>;
-    getById(userContext: IUserContext, id: string): Promise<T>;
-    getCount(userContext: IUserContext): Promise<number>;
-    create(userContext: IUserContext, entity: T | Partial<T>): Promise<T | null>;
-    createMany(userContext: IUserContext, entities: T[]): Promise<T[]>;
-    batchUpdate(userContext: IUserContext, entities: Partial<T>[]): Promise<T[]>;
-    fullUpdateById(userContext: IUserContext, id: string, entity: T): Promise<T>;
-    partialUpdateById(userContext: IUserContext, id: string, entity: Partial<T>): Promise<T>;
-    partialUpdateByIdWithoutBeforeAndAfter(userContext: IUserContext, id: string, entity: T): Promise<T>;
-    update(userContext: IUserContext, queryObject: any, entity: Partial<T>): Promise<T[]>;
-    deleteById(userContext: IUserContext, id: string): Promise<DeleteResult>;
-    deleteMany(userContext: IUserContext, queryObject: any): Promise<DeleteResult>;
-    find(userContext: IUserContext, mongoQueryObject: any, options?: any): Promise<T[]>;
-    findOne(userContext: IUserContext, mongoQueryObject: any, options?: any): Promise<T>;
-}

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

@@ -1,50 +0,0 @@
-import { Db, Collection, DeleteResult, Document, FindOptions } from 'mongodb';
-import { ValueError } from '@sinclair/typebox/errors';
-import { IUserContext, IEntity, IQueryOptions, IPagedResult, IModelSpec } from '@loomcore/common/models';
-import { IGenericApiService } from './generic-api-service.interface.js';
-export declare class GenericApiService<T extends IEntity> implements IGenericApiService<T> {
-    protected db: Db;
-    protected pluralResourceName: string;
-    protected singularResourceName: string;
-    protected collection: Collection;
-    protected modelSpec?: IModelSpec;
-    constructor(db: Db, pluralResourceName: string, singularResourceName: string, modelSpec?: IModelSpec);
-    validate(doc: any, isPartial?: boolean): ValueError[] | null;
-    validateMany(docs: any[], isPartial?: boolean): ValueError[] | null;
-    protected getAdditionalPipelineStages(): any[];
-    protected createAggregationPipeline(userContext: IUserContext, query: any, queryOptions?: IQueryOptions): any[];
-    getAll(userContext: IUserContext): Promise<T[]>;
-    get(userContext: IUserContext, queryOptions?: IQueryOptions): Promise<IPagedResult<T>>;
-    getById(userContext: IUserContext, id: string): Promise<T>;
-    getCount(userContext: IUserContext): Promise<number>;
-    create(userContext: IUserContext, preparedEntity: T | Partial<T>): Promise<T | null>;
-    createMany(userContext: IUserContext, preparedEntities: T[]): Promise<T[]>;
-    batchUpdate(userContext: IUserContext, preparedEntities: Partial<T>[]): Promise<T[]>;
-    fullUpdateById(userContext: IUserContext, id: string, preparedEntity: T): Promise<T>;
-    partialUpdateById(userContext: IUserContext, id: string, preparedEntity: Partial<T>): Promise<T>;
-    partialUpdateByIdWithoutBeforeAndAfter(userContext: IUserContext, id: string, preparedEntity: T): Promise<T>;
-    update(userContext: IUserContext, queryObject: any, preparedEntity: Partial<T>): Promise<T[]>;
-    deleteById(userContext: IUserContext, id: string): Promise<DeleteResult>;
-    deleteMany(userContext: IUserContext, queryObject: any): Promise<DeleteResult>;
-    find(userContext: IUserContext, mongoQueryObject: any, options?: FindOptions<Document> | undefined): Promise<T[]>;
-    findOne(userContext: IUserContext, mongoQueryObject: any, options?: FindOptions<Document> | undefined): Promise<T>;
-    auditForCreate(userContext: IUserContext, doc: any): void;
-    auditForUpdate(userContext: IUserContext, doc: any): void;
-    onBeforeCreate<E extends T | T[] | Partial<T> | Partial<T>[]>(userContext: IUserContext, entities: E): Promise<E | E[]>;
-    onAfterCreate<E extends T | T[]>(userContext: IUserContext, entities: E): Promise<E | E[]>;
-    onBeforeUpdate<E extends T | T[] | Partial<T> | Partial<T>[]>(userContext: IUserContext, entities: E): Promise<E | E[]>;
-    onAfterUpdate<E extends T | T[] | Partial<T> | Partial<T>[]>(userContext: IUserContext | undefined, entities: E): Promise<E>;
-    onBeforeDelete(userContext: IUserContext, queryObject: any): Promise<any>;
-    onAfterDelete(userContext: IUserContext, queryObject: any): Promise<any>;
-    transformList(list: any[]): T[];
-    transformSingle(single: any): T;
-    private stripSenderProvidedSystemProperties;
-    prepareDataForDb(userContext: IUserContext, entity: T, isCreate?: boolean): Promise<T>;
-    prepareDataForDb(userContext: IUserContext, entity: Partial<T>, isCreate?: boolean): Promise<Partial<T>>;
-    prepareDataForDb(userContext: IUserContext, entity: T[], isCreate?: boolean): Promise<T[]>;
-    prepareDataForDb(userContext: IUserContext, entity: Partial<T>[], isCreate?: boolean): Promise<Partial<T>[]>;
-    prepareDataForBatchUpdate(userContext: IUserContext, entities: Partial<T>[]): Promise<Partial<T>[]>;
-    protected prepareEntity(userContext: IUserContext, entity: T | Partial<T>, isCreate: boolean, allowId?: boolean): Promise<T | Partial<T>>;
-    protected prepareQuery(userContext: IUserContext | undefined, query: any): any;
-    protected prepareQueryOptions(userContext: IUserContext | undefined, queryOptions: IQueryOptions): IQueryOptions;
-}