@common-stack/store-mongo 7.0.4-alpha.6 → 7.1.1-alpha.5

package/lib/dataloaders/bulk-dataloader-v2.d.ts

@@ -0,0 +1,7 @@
+import DataLoader from 'dataloader';
+import { DataLoaderOptions2 as DataLoaderOptions, IBaseService2 as IBaseService, IDataLoader2 as IDataLoader, AsDomainType } from '../interfaces';
+export declare class BulkDataLoader2<SchemaType> extends DataLoader<string, AsDomainType<SchemaType> | null> implements IDataLoader<SchemaType> {
+    private readonly service;
+    constructor(service: IBaseService<SchemaType>);
+    withOptions: DataLoader<DataLoaderOptions<SchemaType>, AsDomainType<SchemaType>[], DataLoaderOptions<SchemaType>>;
+}

package/lib/dataloaders/{bulk-dataloader.js → bulk-dataloader-v2.js}

@@ -1,4 +1,4 @@
-import {__decorate,__param,__metadata}from'tslib';import DataLoader from'dataloader';import {injectable,unmanaged}from'inversify';let BulkDataLoader = class BulkDataLoader extends DataLoader {
+import {__decorate,__param,__metadata}from'tslib';import DataLoader from'dataloader';import {injectable,unmanaged}from'inversify';let BulkDataLoader2 = class BulkDataLoader2 extends DataLoader {
     service;
     constructor(service) {
         super(async (ids) => {
@@ -10,22 +10,24 @@ import {__decorate,__param,__metadata}from'tslib';import DataLoader from'dataloa
     withOptions = new DataLoader(async (options) => {
         const [{ searchKey, comparator, ...rest }] = options;
         const ids = options.map((option) => option.id);
+        // Create a properly typed criteria object with explicit type assertion
+        const criteria = {
+            ...(rest.criteria || {}),
+            [searchKey]: { $in: ids },
+        };
         const results = await this.service.getAll({
             ...rest,
-            criteria: {
-                ...rest.criteria,
-                [searchKey]: { $in: ids },
-            },
+            criteria,
         });
         return options.map((option) => results.filter((item) => {
             if (typeof comparator === 'function')
                 return comparator(option, item);
-            return item[searchKey].toString() === option.id.toString();
+            return item[searchKey]?.toString() === option.id.toString();
         }));
     });
 };
-BulkDataLoader = __decorate([
+BulkDataLoader2 = __decorate([
     injectable(),
     __param(0, unmanaged()),
     __metadata("design:paramtypes", [Object])
-], BulkDataLoader);export{BulkDataLoader};//# sourceMappingURL=bulk-dataloader.js.map
+], BulkDataLoader2);export{BulkDataLoader2};//# sourceMappingURL=bulk-dataloader-v2.js.map

package/lib/dataloaders/bulk-dataloader-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bulk-dataloader-v2.js","sources":["../../src/dataloaders/bulk-dataloader-v2.ts"],"sourcesContent":[null],"names":[],"mappings":"kIAWO,IAAM,eAAe,GAArB,MAAM,eACT,SAAQ,UAAmD,CAAA;AAGjB,IAAA,OAAA,CAAA;AAA1C,IAAA,WAAA,CAA0C,OAAiC,EAAA;AACvE,QAAA,KAAK,CAAC,OAAO,GAAa,KAAI;YAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC9C,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC;AAC5E,SAAC,CAAC,CAAC;QAJmC,IAAO,CAAA,OAAA,GAAP,OAAO,CAA0B;KAK1E;IAED,WAAW,GAAG,IAAI,UAAU,CAA4D,OAAO,OAAO,KAAI;AACtG,QAAA,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC;AACrD,QAAA,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;;AAG/C,QAAA,MAAM,QAAQ,GAAG;AACb,YAAA,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;AACxB,YAAA,CAAC,SAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;SACX,CAAC;QAE7B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;AACtC,YAAA,GAAG,IAAI;YACP,QAAQ;AACX,SAAA,CAAC,CAAC;AAEH,QAAA,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KACtB,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,KAAI;YACpB,IAAI,OAAO,UAAU,KAAK,UAAU;AAAE,gBAAA,OAAO,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACtE,YAAA,OAAO,IAAI,CAAC,SAA2C,CAAC,EAAE,QAAQ,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;SACjG,CAAC,CACL,CAAC;AACN,KAAC,CAAC,CAAC;EACN;AAjCY,eAAe,GAAA,UAAA,CAAA;AAD3B,IAAA,UAAU,EAAE;IAKI,OAAA,CAAA,CAAA,EAAA,SAAS,EAAE,CAAA;;AAJf,CAAA,EAAA,eAAe,CAiC3B"}

package/lib/dataloaders/bulk-dataloader.test.d.ts

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/lib/dataloaders/index.d.ts

@@ -1 +1 @@
-export * from './bulk-dataloader';
+export * from './bulk-dataloader-v2';

package/lib/graphql/schema/base-services.graphql

@@ -9,6 +9,7 @@ enum BaseServiceCommands {
     bulkCreate
     update
     delete
+    BulkDelete
     deleteMany
     getAllWithCount
 }

package/lib/index.js

@@ -1 +1 @@
-export{PAGINATION_OPTIONS}from'./interfaces/base-repository.js';export{generateMongo}from'./helpers/mongoose-connection.js';export{BaseService}from'./services/base-service.js';export{BaseProxyService}from'./services/base-proxy-service.js';export{addIdVirtualFields,commonModeSchemaOptions}from'./store/models/common-options.js';export{BaseRepository}from'./store/repositories/base-repository.js';export{BulkDataLoader}from'./dataloaders/bulk-dataloader.js';export{BaseServiceMixin}from'./mixins/base-service-mixin.js';//# sourceMappingURL=index.js.map
+export{PAGINATION_OPTIONS}from'./interfaces/get-all-args.js';export{generateMongo}from'./helpers/mongoose-connection.js';export{BaseService2}from'./services/base-service-v2.js';export{BaseProxyService2}from'./services/base-proxy-service-v2.js';export{BaseService}from'./services/base-service.js';export{BaseProxyService}from'./services/base-proxy-service.js';export{addIdVirtualFields2,commonModelSchemaOptions2}from'./store/models/common-options-v2.js';export{addIdVirtualFields,commonModeSchemaOptions}from'./store/models/common-options.js';export{BaseRepository2}from'./store/repositories/base-repository-v2.js';export{BaseRepository}from'./store/repositories/base-repository.js';export{BulkDataLoader2}from'./dataloaders/bulk-dataloader-v2.js';export{BaseServiceMixin2}from'./mixins/base-service-mixin-v2.js';export{BaseServiceMixin}from'./mixins/base-service-mixin.js';//# sourceMappingURL=index.js.map

package/lib/interfaces/base-repository-v2.d.ts

@@ -0,0 +1,26 @@
+import { FilterQuery, Model, PipelineStage, UpdateQuery } from 'mongoose';
+import { AsDomainType, CreateType, GetAllArgs, UpdateType } from './get-all-args';
+export interface IBaseRepository2<SchemaType> {
+    model: Model<SchemaType>;
+    count(conditions?: FilterQuery<SchemaType>): Promise<number>;
+    getAll(options: GetAllArgs<SchemaType>): Promise<AsDomainType<SchemaType>[]>;
+    getAllWithPipeline(options: GetAllArgs<SchemaType>, customPipeline?: PipelineStage[]): Promise<AsDomainType<SchemaType>[]>;
+    getAllWithCount(options: GetAllArgs<SchemaType>): Promise<{
+        data: AsDomainType<SchemaType>[];
+        totalCount: number;
+    }>;
+    getAllWithCountAndPipeline(options: GetAllArgs<SchemaType>, customPipeline?: PipelineStage[]): Promise<{
+        data: AsDomainType<SchemaType>[];
+        totalCount: number;
+    }>;
+    get(conditions?: FilterQuery<SchemaType>, selectedFields?: string): Promise<AsDomainType<SchemaType> | null>;
+    find(conditions: Partial<FilterQuery<SchemaType>>, selectedFields?: string): Promise<AsDomainType<SchemaType> | null>;
+    create<T = CreateType<SchemaType>>(data: T): Promise<AsDomainType<SchemaType>>;
+    upsert<T = UpdateType<SchemaType>>(conditions: FilterQuery<SchemaType>, update: T, options?: Record<string, unknown>): Promise<AsDomainType<SchemaType>>;
+    update<T = UpdateType<SchemaType>>(criteria: FilterQuery<SchemaType>, update: T | UpdateQuery<SchemaType>, options?: Record<string, unknown>): Promise<AsDomainType<SchemaType>>;
+    bulkUpdate<T = UpdateType<SchemaType>>(criteria: FilterQuery<SchemaType>, update: T | UpdateQuery<SchemaType>, options?: Record<string, unknown>): Promise<AsDomainType<SchemaType>[]>;
+    delete(criteria: FilterQuery<SchemaType>): Promise<boolean>;
+    bulkGet(ids: string[], selectedFields?: string): Promise<AsDomainType<SchemaType>[]>;
+    bulkCreate<T = CreateType<SchemaType>>(data: T[]): Promise<AsDomainType<SchemaType>[]>;
+    bulkDelete(criteria: FilterQuery<SchemaType>): Promise<number>;
+}

package/lib/interfaces/base-repository.d.ts

@@ -1,9 +1,5 @@
 import { Document, FilterQuery, Model, UpdateQuery } from 'mongoose';
 import { GetAllArgs } from './get-all-args';
-export declare enum PAGINATION_OPTIONS {
-    limit = 10,
-    skip = 0
-}
 export interface IBaseRepository<T, D = Document<T>> {
     model: Model<D>;
     count(conditions?: FilterQuery<D>): Promise<number>;

package/lib/interfaces/base-service-v2.d.ts

@@ -0,0 +1,21 @@
+import { FilterQuery } from 'mongoose';
+import { GetAllArgs, AsDomainType, CreateType, UpdateType } from './get-all-args';
+export interface IBaseService2<SchemaType> {
+    getAllWithCount(options: GetAllArgs<SchemaType>): Promise<{
+        data: AsDomainType<SchemaType>[];
+        totalCount: number;
+    }>;
+    count(conditions?: FilterQuery<SchemaType>): Promise<number>;
+    get(conditions: string | FilterQuery<SchemaType>): Promise<AsDomainType<SchemaType> | null>;
+    getByName(name: string): Promise<AsDomainType<SchemaType> | null>;
+    getAll(options: GetAllArgs<SchemaType>): Promise<AsDomainType<SchemaType>[]>;
+    getByIds(ids: string[]): Promise<AsDomainType<SchemaType>[]>;
+    create<T = CreateType<SchemaType>>(data: T): Promise<AsDomainType<SchemaType>>;
+    bulkCreate<T = CreateType<SchemaType>>(data: T[]): Promise<AsDomainType<SchemaType>[]>;
+    update<T = UpdateType<SchemaType>>(id: string, data: T, overwrite?: boolean): Promise<AsDomainType<SchemaType>>;
+    insert<T = CreateType<SchemaType>>(data: T & {
+        id?: string;
+    }, overwrite?: boolean): Promise<AsDomainType<SchemaType>>;
+    delete(id: string | FilterQuery<SchemaType>): Promise<boolean>;
+    bulkDelete(criteria: FilterQuery<SchemaType>): Promise<number>;
+}

package/lib/interfaces/dataloader-v2.d.ts

@@ -0,0 +1,17 @@
+import DataLoader from 'dataloader';
+import { FilterQuery } from 'mongoose';
+import { AsDomainType } from './get-all-args';
+export interface DataLoaderOptions2<SchemaType> {
+    id: string;
+    searchKey: keyof AsDomainType<SchemaType> | string;
+    comparator?: (option: DataLoaderOptions2<SchemaType>, item: AsDomainType<SchemaType>) => boolean;
+    criteria?: FilterQuery<SchemaType>;
+    [key: string]: any;
+}
+export interface IDataLoader2<SchemaType> {
+    load: (id: string) => Promise<AsDomainType<SchemaType> | null>;
+    loadMany: (ids: string[]) => Promise<(AsDomainType<SchemaType> | null | Error)[]>;
+    clear: (id: string) => DataLoader<string, AsDomainType<SchemaType> | null>;
+    clearAll: () => DataLoader<string, AsDomainType<SchemaType> | null>;
+    withOptions: DataLoader<DataLoaderOptions2<SchemaType>, AsDomainType<SchemaType>[]>;
+}

package/lib/interfaces/get-all-args.d.ts

@@ -1,5 +1,5 @@
 import { FilterQuery } from 'mongoose';
-import { ISort } from 'common';
+import type { ISort } from 'common';
 export interface GetAllArgs<T> {
     criteria?: FilterQuery<T>;
     sort?: ISort;
@@ -7,3 +7,22 @@ export interface GetAllArgs<T> {
     limit?: number;
     selectedFields?: string;
 }
+export type { ISort };
+export declare enum PAGINATION_OPTIONS {
+    limit = 10,
+    skip = 0
+}
+/**
+ * Type that converts a schema type with _id to a domain type with id
+ */
+export type AsDomainType<SchemaType> = Omit<SchemaType, '_id'> & {
+    id: string;
+};
+/**
+ * Type for create operations - omits _id, id, and auto-generated fields
+ */
+export type CreateType<SchemaType> = Omit<Partial<SchemaType>, '_id' | 'id' | 'createdAt' | 'updatedAt'>;
+/**
+ * Type for update operations - partial of the schema without _id
+ */
+export type UpdateType<SchemaType> = Partial<Omit<SchemaType, '_id'>>;

package/lib/interfaces/{base-repository.js → get-all-args.js}

@@ -2,4 +2,4 @@ var PAGINATION_OPTIONS;
 (function (PAGINATION_OPTIONS) {
     PAGINATION_OPTIONS[PAGINATION_OPTIONS["limit"] = 10] = "limit";
     PAGINATION_OPTIONS[PAGINATION_OPTIONS["skip"] = 0] = "skip";
-})(PAGINATION_OPTIONS || (PAGINATION_OPTIONS = {}));export{PAGINATION_OPTIONS};//# sourceMappingURL=base-repository.js.map
+})(PAGINATION_OPTIONS || (PAGINATION_OPTIONS = {}));export{PAGINATION_OPTIONS};//# sourceMappingURL=get-all-args.js.map

package/lib/interfaces/get-all-args.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-all-args.js","sources":["../../src/interfaces/get-all-args.ts"],"sourcesContent":[null],"names":[],"mappings":"IAaY,mBAGX;AAHD,CAAA,UAAY,kBAAkB,EAAA;AAC1B,IAAA,kBAAA,CAAA,kBAAA,CAAA,OAAA,CAAA,GAAA,EAAA,CAAA,GAAA,OAAU,CAAA;AACV,IAAA,kBAAA,CAAA,kBAAA,CAAA,MAAA,CAAA,GAAA,CAAA,CAAA,GAAA,MAAQ,CAAA;AACZ,CAAC,EAHW,kBAAkB,KAAlB,kBAAkB,GAG7B,EAAA,CAAA,CAAA"}

package/lib/interfaces/index.d.ts

@@ -1,5 +1,8 @@
 export * from './mongoose-settings';
 export * from './get-all-args';
+export * from './base-repository-v2';
+export * from './base-service-v2';
+export * from './dataloader-v2';
 export * from './base-repository';
 export * from './base-service';
 export * from './dataloaders';

package/lib/mixins/base-service-mixin-v2.d.ts

@@ -0,0 +1,4 @@
+import { ServiceBroker, ServiceSchema } from 'moleculer';
+import { BaseServiceCommands } from 'common';
+import { IBaseService2 as IBaseService } from '../interfaces';
+export declare const BaseServiceMixin2: <T>(service: IBaseService<T>, broker?: ServiceBroker, name?: string, events?: BaseServiceCommands[]) => Partial<ServiceSchema>;

package/lib/mixins/base-service-mixin-v2.js

@@ -0,0 +1,123 @@
+import {upperFirst}from'lodash-es';import {BaseServiceCommands}from'common';const defaultEvents = [
+    BaseServiceCommands.Create,
+    BaseServiceCommands.BulkCreate,
+    BaseServiceCommands.Update,
+    BaseServiceCommands.Delete,
+    BaseServiceCommands.DeleteMany,
+];
+const BaseServiceMixin2 = (service, broker, name, events = defaultEvents) => ({
+    name: 'BaseServiceMixin',
+    actions: {
+        [BaseServiceCommands.Get]: {
+            params: {
+                id: 'string',
+            },
+            handler: async (ctx) => service.get({ id: ctx.params.id }),
+        },
+        [BaseServiceCommands.Count]: {
+            params: {
+                criteria: { type: 'object', optional: true },
+            },
+            handler: async (ctx) => service.count(ctx.params.criteria),
+        },
+        [BaseServiceCommands.BulkCreate]: {
+            params: {
+                data: { type: 'array', items: 'object' },
+            },
+            handler: async (ctx) => {
+                const response = await service.bulkCreate(ctx.params.data);
+                if (events.includes(BaseServiceCommands.BulkCreate)) {
+                    await broker?.emit(`${name}.on${upperFirst(BaseServiceCommands.BulkCreate)}`, response);
+                }
+                return response;
+            },
+        },
+        [BaseServiceCommands.Create]: {
+            params: {
+                data: 'object',
+            },
+            handler: async (ctx) => {
+                const response = await service.create(ctx.params.data);
+                if (events.includes(BaseServiceCommands.Create)) {
+                    await broker?.emit(`${name}.on${upperFirst(BaseServiceCommands.Create)}`, response);
+                }
+                return response;
+            },
+        },
+        [BaseServiceCommands.Delete]: {
+            params: {
+                id: 'string',
+            },
+            handler: async (ctx) => {
+                const { id } = ctx.params;
+                const response = await service.delete({ id });
+                if (events.includes(BaseServiceCommands.Delete)) {
+                    await broker?.emit(`${name}.on${upperFirst(BaseServiceCommands.Delete)}`, { id });
+                }
+                return response;
+            },
+        },
+        [BaseServiceCommands.GetAll]: {
+            params: {
+                criteria: 'object|optional',
+                sort: 'object|optional',
+                skip: 'number|optional',
+                limit: 'number|optional',
+                selectedFields: 'string|optional',
+            },
+            handler: async (ctx) => service.getAll(ctx.params),
+        },
+        [BaseServiceCommands.GetAllWithCount]: {
+            params: {
+                criteria: 'object|optional',
+                sort: 'object|optional',
+                skip: 'number|optional',
+                limit: 'number|optional',
+                selectedFields: 'string|optional',
+            },
+            handler: async (ctx) => service.getAllWithCount(ctx.params),
+        },
+        [BaseServiceCommands.Insert]: {
+            params: {
+                data: 'object',
+                overwrite: 'boolean|optional',
+            },
+            handler: async (ctx) => {
+                const { data } = ctx.params;
+                const response = await service.insert(data, ctx.params.overwrite);
+                const action = data?.id ? BaseServiceCommands.Update : BaseServiceCommands.Create;
+                if (events.includes(action)) {
+                    await broker?.emit(`${name}.on${upperFirst(action)}`, response);
+                }
+                return response;
+            },
+        },
+        [BaseServiceCommands.Update]: {
+            params: {
+                id: 'string',
+                data: 'object',
+                overwrite: 'boolean|optional',
+            },
+            handler: async (ctx) => {
+                const response = await service.update(ctx.params.id, ctx.params.data, ctx.params.overwrite);
+                if (events.includes(BaseServiceCommands.Update)) {
+                    await broker?.emit(`${name}.on${upperFirst(BaseServiceCommands.Update)}`, response);
+                }
+                return response;
+            },
+        },
+        [BaseServiceCommands.DeleteMany]: {
+            params: {
+                criteria: 'object',
+            },
+            handler: async (ctx) => {
+                const { criteria } = ctx.params;
+                const response = await service.delete(criteria);
+                if (events.includes(BaseServiceCommands.DeleteMany)) {
+                    await broker?.emit(`${name}.on${upperFirst(BaseServiceCommands.DeleteMany)}`, criteria);
+                }
+                return response;
+            },
+        },
+    },
+});export{BaseServiceMixin2};//# sourceMappingURL=base-service-mixin-v2.js.map

package/lib/mixins/base-service-mixin-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-service-mixin-v2.js","sources":["../../src/mixins/base-service-mixin-v2.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/mixins/index.d.ts

@@ -1 +1,2 @@
+export { BaseServiceMixin2 } from './base-service-mixin-v2';
 export { BaseServiceMixin } from './base-service-mixin';

package/lib/services/base-proxy-service-v2.d.ts

@@ -0,0 +1,28 @@
+import { ServiceBroker } from 'moleculer';
+import { FilterQuery } from 'mongoose';
+import { CdmLogger } from '@cdm-logger/core';
+import { GetAllArgs, IBaseService2 as IBaseService, AsDomainType, CreateType, UpdateType } from '../interfaces';
+export declare abstract class BaseProxyService2<SchemaType> implements IBaseService<SchemaType> {
+    private readonly broker;
+    protected abstract logger?: CdmLogger.ILogger;
+    protected abstract topic: string;
+    constructor(broker: ServiceBroker, logger: CdmLogger.ILogger);
+    getByName(name: string): Promise<AsDomainType<SchemaType> | null>;
+    bulkCreate<T = CreateType<SchemaType>>(data: T[]): Promise<AsDomainType<SchemaType>[]>;
+    count(criteria?: FilterQuery<SchemaType>): Promise<number>;
+    create<T = CreateType<SchemaType>>(data: T): Promise<AsDomainType<SchemaType>>;
+    delete(id: string | FilterQuery<SchemaType>): Promise<boolean>;
+    bulkDelete(criteria: FilterQuery<SchemaType>): Promise<number>;
+    get(id?: string | FilterQuery<SchemaType>): Promise<AsDomainType<SchemaType> | null>;
+    getAll(options?: GetAllArgs<SchemaType>): Promise<AsDomainType<SchemaType>[]>;
+    getByIds(ids: string[]): Promise<AsDomainType<SchemaType>[]>;
+    getAllWithCount(options: GetAllArgs<SchemaType>): Promise<{
+        data: AsDomainType<SchemaType>[];
+        totalCount: number;
+    }>;
+    insert<T = CreateType<SchemaType>>(data: T & {
+        id?: string;
+    }, overwrite?: boolean): Promise<AsDomainType<SchemaType>>;
+    update<T = UpdateType<SchemaType>>(id: string, data: T, overwrite?: boolean): Promise<AsDomainType<SchemaType>>;
+    protected callAction<T, P = unknown>(command: string, params?: P): Promise<T>;
+}

package/lib/services/base-proxy-service-v2.js

@@ -0,0 +1,52 @@
+import {__decorate,__param,__metadata}from'tslib';import {injectable,inject,optional}from'inversify';import {ServiceBroker}from'moleculer';import'@cdm-logger/core';import {CommonType}from'@common-stack/core';import {BaseServiceCommands}from'common';let BaseProxyService2 = class BaseProxyService2 {
+    broker;
+    constructor(broker, logger) {
+        this.broker = broker;
+    }
+    getByName(name) {
+        return this.callAction(BaseServiceCommands.GetByName, { name });
+    }
+    bulkCreate(data) {
+        return this.callAction(BaseServiceCommands.BulkCreate, { data });
+    }
+    count(criteria) {
+        return this.callAction(BaseServiceCommands.Count, { criteria });
+    }
+    create(data) {
+        return this.callAction(BaseServiceCommands.Create, { data });
+    }
+    delete(id) {
+        return this.callAction(BaseServiceCommands.Delete, { id });
+    }
+    bulkDelete(criteria) {
+        return this.callAction(BaseServiceCommands.BulkDelete, { criteria });
+    }
+    get(id) {
+        return this.callAction(BaseServiceCommands.Get, { id });
+    }
+    getAll(options) {
+        return this.callAction(BaseServiceCommands.GetAll, options);
+    }
+    getByIds(ids) {
+        return this.callAction(BaseServiceCommands.GetByIds, { ids });
+    }
+    getAllWithCount(options) {
+        return this.callAction(BaseServiceCommands.GetAllWithCount, options);
+    }
+    insert(data, overwrite) {
+        return this.callAction(BaseServiceCommands.Insert, { data, overwrite });
+    }
+    update(id, data, overwrite) {
+        return this.callAction(BaseServiceCommands.Update, { id, data, overwrite });
+    }
+    async callAction(command, params) {
+        return this.broker.call(`${this.topic}.${command}`, params);
+    }
+};
+BaseProxyService2 = __decorate([
+    injectable(),
+    __param(0, inject(CommonType.MOLECULER_BROKER)),
+    __param(1, inject(CommonType.LOGGER)),
+    __param(1, optional()),
+    __metadata("design:paramtypes", [ServiceBroker, Object])
+], BaseProxyService2);export{BaseProxyService2};//# sourceMappingURL=base-proxy-service-v2.js.map

package/lib/services/base-proxy-service-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-proxy-service-v2.js","sources":["../../src/services/base-proxy-service-v2.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/services/base-service-v2.d.ts

@@ -0,0 +1,23 @@
+import { FilterQuery } from 'mongoose';
+import { GetAllArgs, IBaseRepository2 as IBaseRepository, IBaseService2 as IBaseService, AsDomainType, CreateType, UpdateType } from '../interfaces';
+export declare class BaseService2<SchemaType> implements IBaseService<SchemaType> {
+    protected repository: IBaseRepository<SchemaType>;
+    constructor(repository: IBaseRepository<SchemaType>);
+    getAllWithCount(options: GetAllArgs<SchemaType>): Promise<{
+        data: AsDomainType<SchemaType>[];
+        totalCount: number;
+    }>;
+    count(conditions?: FilterQuery<SchemaType>): Promise<number>;
+    get(conditions: string | FilterQuery<SchemaType>): Promise<AsDomainType<SchemaType> | null>;
+    getByName(name: string): Promise<AsDomainType<SchemaType> | null>;
+    getAll(options: GetAllArgs<SchemaType>): Promise<AsDomainType<SchemaType>[]>;
+    getByIds(ids: string[]): Promise<AsDomainType<SchemaType>[]>;
+    create<T = CreateType<SchemaType>>(data: T): Promise<AsDomainType<SchemaType>>;
+    bulkCreate<T = CreateType<SchemaType>>(data: T[]): Promise<AsDomainType<SchemaType>[]>;
+    update<T = UpdateType<SchemaType>>(id: string, data: T, overwrite?: boolean): Promise<AsDomainType<SchemaType>>;
+    insert<T = CreateType<SchemaType>>(data: T & {
+        id?: string;
+    }, overwrite?: boolean): Promise<AsDomainType<SchemaType>>;
+    delete(id: string | FilterQuery<SchemaType>): Promise<boolean>;
+    bulkDelete(criteria: FilterQuery<SchemaType>): Promise<number>;
+}

package/lib/services/base-service-v2.js

@@ -0,0 +1,64 @@
+import {__decorate,__metadata}from'tslib';import {injectable}from'inversify';let BaseService2 = class BaseService2 {
+    repository;
+    constructor(repository) {
+        this.repository = repository;
+    }
+    async getAllWithCount(options) {
+        return this.repository.getAllWithCount(options);
+    }
+    count(conditions) {
+        return this.repository.count(conditions);
+    }
+    get(conditions) {
+        if (typeof conditions === 'string') {
+            return this.repository.get({ id: conditions });
+        }
+        return this.repository.get(conditions);
+    }
+    getByName(name) {
+        return this.repository.get({ name });
+    }
+    getAll(options) {
+        return this.repository.getAll(options);
+    }
+    getByIds(ids) {
+        return this.repository.bulkGet(ids);
+    }
+    create(data) {
+        return this.repository.create(data);
+    }
+    bulkCreate(data) {
+        return this.repository.bulkCreate(data);
+    }
+    async update(id, data, overwrite = false) {
+        return this.repository.update({ id }, data, { overwrite });
+    }
+    async insert(data, overwrite = true) {
+        const { id, ...rest } = data;
+        if (id) {
+            try {
+                const existing = await this.repository.get({ id });
+                if (existing) {
+                    return this.update(id, rest, overwrite);
+                }
+            }
+            catch (error) {
+                // If not found, continue to create
+            }
+        }
+        return this.create(rest);
+    }
+    delete(id) {
+        if (typeof id === 'string') {
+            return this.repository.delete({ id });
+        }
+        return this.repository.delete(id);
+    }
+    bulkDelete(criteria) {
+        return this.repository.bulkDelete(criteria);
+    }
+};
+BaseService2 = __decorate([
+    injectable(),
+    __metadata("design:paramtypes", [Object])
+], BaseService2);export{BaseService2};//# sourceMappingURL=base-service-v2.js.map

package/lib/services/base-service-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-service-v2.js","sources":["../../src/services/base-service-v2.ts"],"sourcesContent":[null],"names":[],"mappings":"6EAgBa,IAAA,YAAY,GAAlB,MAAM,YAAY,CAAA;AACC,IAAA,UAAA,CAAA;AAAtB,IAAA,WAAA,CAAsB,UAAuC,EAAA;QAAvC,IAAU,CAAA,UAAA,GAAV,UAAU,CAA6B;KAAI;IAEjE,MAAM,eAAe,CACjB,OAA+B,EAAA;QAE/B,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;KACnD;AAED,IAAA,KAAK,CAAC,UAAoC,EAAA;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;KAC5C;AAED,IAAA,GAAG,CAAC,UAA4C,EAAA;AAC5C,QAAA,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;AAChC,YAAA,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,UAAU,EAA6B,CAAC,CAAC;SAC7E;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KAC1C;AAED,IAAA,SAAS,CAAC,IAAY,EAAA;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,EAAS,CAAC,CAAC;KAC/C;AAED,IAAA,MAAM,CAAC,OAA+B,EAAA;QAClC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC1C;AAED,IAAA,QAAQ,CAAC,GAAa,EAAA;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KACvC;AAED,IAAA,MAAM,CAA6B,IAAO,EAAA;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KACvC;AAED,IAAA,UAAU,CAA6B,IAAS,EAAA;QAC5C,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;KAC3C;IAED,MAAM,MAAM,CACR,EAAU,EACV,IAAO,EACP,SAAS,GAAG,KAAK,EAAA;AAEjB,QAAA,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,EAAS,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;KACrE;AAED,IAAA,MAAM,MAAM,CACR,IAAyB,EACzB,SAAS,GAAG,IAAI,EAAA;QAEhB,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAE7B,IAAI,EAAE,EAAE;AACJ,YAAA,IAAI;AACA,gBAAA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,EAAS,CAAC,CAAC;gBAC1D,IAAI,QAAQ,EAAE;oBACV,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAW,EAAE,SAAS,CAAC,CAAC;iBAClD;aACJ;YAAC,OAAO,KAAK,EAAE;;aAEf;SACJ;AAED,QAAA,OAAO,IAAI,CAAC,MAAM,CAAC,IAAS,CAAC,CAAC;KACjC;AAED,IAAA,MAAM,CAAC,EAAoC,EAAA;AACvC,QAAA,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;YACxB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,EAAS,CAAC,CAAC;SAChD;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;KACrC;AAED,IAAA,UAAU,CAAC,QAAiC,EAAA;QACxC,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KAC/C;EACJ;AA9EY,YAAY,GAAA,UAAA,CAAA;AADxB,IAAA,UAAU,EAAE;;AACA,CAAA,EAAA,YAAY,CA8ExB"}

package/lib/services/base-service.test.d.ts

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/lib/services/index.d.ts

@@ -1,2 +1,4 @@
+export * from './base-service-v2';
+export * from './base-proxy-service-v2';
 export * from './base-service';
 export * from './base-proxy-service';

package/lib/store/models/common-options-v2.d.ts

@@ -0,0 +1,16 @@
+import { Schema } from 'mongoose';
+export declare const commonModelSchemaOptions2: {
+    timestamps: boolean;
+    toJSON: {
+        virtuals: boolean;
+        transform(doc: any, ret: any): any;
+    };
+    toObject: {
+        virtuals: boolean;
+        getters: boolean;
+        transform(doc: any, ret: any): any;
+    };
+};
+export declare const addIdVirtualFields2: (schema: Schema) => Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: string]: any;
+}>;

package/lib/store/models/common-options-v2.js

@@ -0,0 +1,40 @@
+const commonModelSchemaOptions2 = {
+    timestamps: true,
+    toJSON: {
+        virtuals: true,
+        transform(doc, ret) {
+            ret.id = ret._id.toString();
+            delete ret.__v;
+            // Uncomment if you don't want _id in output
+            // delete ret._id;
+            return ret;
+        },
+    },
+    toObject: {
+        virtuals: true,
+        getters: true,
+        transform(doc, ret) {
+            ret.id = ret._id.toString();
+            delete ret.__v;
+            // Uncomment if you don't want _id in output
+            // delete ret._id;
+            return ret;
+        },
+    },
+};
+const addIdVirtualFields2 = (schema) => {
+    // Add id virtual getter
+    schema.virtual('id').get(function () {
+        return this._id.toHexString();
+    });
+    // Ensure virtuals are included in JSON
+    schema.set('toJSON', {
+        virtuals: true,
+        transform: (_, ret) => {
+            ret.id = ret._id.toString();
+            delete ret.__v;
+            return ret;
+        },
+    });
+    return schema;
+};export{addIdVirtualFields2,commonModelSchemaOptions2};//# sourceMappingURL=common-options-v2.js.map

package/lib/store/models/common-options-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common-options-v2.js","sources":["../../../src/store/models/common-options-v2.ts"],"sourcesContent":[null],"names":[],"mappings":"AAIa,MAAA,yBAAyB,GAAG;AACrC,IAAA,UAAU,EAAE,IAAI;AAChB,IAAA,MAAM,EAAE;AACJ,QAAA,QAAQ,EAAE,IAAI;QACd,SAAS,CAAC,GAAG,EAAE,GAAG,EAAA;YACd,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,GAAG,CAAC,GAAG,CAAC;;;AAGf,YAAA,OAAO,GAAG,CAAC;SACd;AACJ,KAAA;AACD,IAAA,QAAQ,EAAE;AACN,QAAA,QAAQ,EAAE,IAAI;AACd,QAAA,OAAO,EAAE,IAAI;QACb,SAAS,CAAC,GAAG,EAAE,GAAG,EAAA;YACd,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,GAAG,CAAC,GAAG,CAAC;;;AAGf,YAAA,OAAO,GAAG,CAAC;SACd;AACJ,KAAA;EACH;AAEW,MAAA,mBAAmB,GAAG,CAAC,MAAc,KAAI;;AAElD,IAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,YAAA;AACrB,QAAA,OAAQ,IAAI,CAAC,GAAW,CAAC,WAAW,EAAE,CAAC;AAC3C,KAAC,CAAC,CAAC;;AAGH,IAAA,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;AACjB,QAAA,QAAQ,EAAE,IAAI;AACd,QAAA,SAAS,EAAE,CAAC,CAAC,EAAE,GAAG,KAAI;YAClB,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,GAAG,CAAC,GAAG,CAAC;AACf,YAAA,OAAO,GAAG,CAAC;SACd;AACJ,KAAA,CAAC,CAAC;AAEH,IAAA,OAAO,MAAM,CAAC;AAClB"}

package/lib/store/models/index.d.ts

@@ -1 +1,2 @@
+export * from './common-options-v2';
 export * from './common-options';

package/lib/store/repositories/base-repository-v2.d.ts

@@ -0,0 +1,65 @@
+import { CdmLogger } from '@cdm-logger/core';
+import { Connection, FilterQuery, Model, PipelineStage, UpdateQuery } from 'mongoose';
+import { GetAllArgs, ISort, IBaseRepository2 as IBaseRepository, IMongoOptions, AsDomainType, CreateType, UpdateType } from '../../interfaces';
+export declare class BaseRepository2<SchemaType> implements IBaseRepository<SchemaType> {
+    private modelFunc;
+    private options;
+    protected logger: CdmLogger.ILogger;
+    model: Model<SchemaType>;
+    constructor(modelFunc: (db: Connection) => Model<SchemaType>, db: Connection, logger: CdmLogger.ILogger, options?: IMongoOptions);
+    /**
+     * Transforms a document to the domain model format
+     */
+    protected transformDocument(doc: any): AsDomainType<SchemaType> | null;
+    /**
+     * Transforms an array of documents
+     */
+    protected transformDocuments(docs: SchemaType[]): AsDomainType<SchemaType>[];
+    /**
+     * Maps API criteria with 'id' to MongoDB criteria with '_id'
+     */
+    private mapConditions;
+    /**
+     * Computes sort object from GetAllArgs sort parameter
+     * Handles both string-based and object-based sort specifications
+     */
+    protected computeSort(sort: ISort | string | ISort[]): Record<string, 1 | -1>;
+    /**
+     * Prepares an aggregation pipeline with standard stages
+     * @param options Query options including filtering, sorting, pagination
+     * @param customPipeline Optional custom pipeline stages to include
+     * @returns Complete MongoDB aggregation pipeline
+     */
+    protected preparePipeline(options: GetAllArgs<SchemaType>, customPipeline?: PipelineStage[]): PipelineStage[];
+    /**
+     * Execute an aggregation pipeline and transform the results
+     */
+    protected aggregate(pipeline: PipelineStage[]): Promise<AsDomainType<SchemaType>[]>;
+    count(conditions?: FilterQuery<SchemaType>): Promise<number>;
+    get(conditions?: FilterQuery<SchemaType>, selectedFields?: string): Promise<AsDomainType<SchemaType> | null>;
+    find(conditions: Partial<FilterQuery<SchemaType>>, selectedFields?: string): Promise<AsDomainType<SchemaType> | null>;
+    getAll(options: GetAllArgs<SchemaType>): Promise<AsDomainType<SchemaType>[]>;
+    /**
+     * Get all documents using aggregation pipeline
+     */
+    getAllWithPipeline(options: GetAllArgs<SchemaType>, customPipeline?: PipelineStage[]): Promise<AsDomainType<SchemaType>[]>;
+    getAllWithCount(options: GetAllArgs<SchemaType>): Promise<{
+        data: AsDomainType<SchemaType>[];
+        totalCount: number;
+    }>;
+    /**
+     * Get all documents with count using aggregation pipeline
+     */
+    getAllWithCountAndPipeline(options: GetAllArgs<SchemaType>, customPipeline?: PipelineStage[]): Promise<{
+        data: AsDomainType<SchemaType>[];
+        totalCount: number;
+    }>;
+    create<T = CreateType<SchemaType>>(data: T): Promise<AsDomainType<SchemaType>>;
+    bulkCreate<T = CreateType<SchemaType>>(data: T[]): Promise<AsDomainType<SchemaType>[]>;
+    upsert<T = UpdateType<SchemaType>>(conditions: FilterQuery<SchemaType>, update: T, options?: Record<string, unknown>): Promise<AsDomainType<SchemaType>>;
+    update<T = UpdateType<SchemaType>>(criteria: FilterQuery<SchemaType>, update: T | UpdateQuery<SchemaType>, options?: Record<string, unknown>): Promise<AsDomainType<SchemaType>>;
+    bulkUpdate<T = UpdateType<SchemaType>>(criteria: FilterQuery<SchemaType>, update: T | UpdateQuery<SchemaType>, options?: Record<string, unknown>): Promise<AsDomainType<SchemaType>[]>;
+    delete(criteria: FilterQuery<SchemaType>): Promise<boolean>;
+    bulkDelete(criteria: FilterQuery<SchemaType>): Promise<number>;
+    bulkGet(ids: string[], selectedFields?: string): Promise<AsDomainType<SchemaType>[]>;
+}

package/lib/store/repositories/base-repository-v2.js

@@ -0,0 +1,389 @@
+import {__decorate,__param,__metadata}from'tslib';import {isObject}from'lodash-es';import'@cdm-logger/core';import {Connection,Types}from'mongoose';import {injectable,unmanaged}from'inversify';import {PAGINATION_OPTIONS}from'../../interfaces/get-all-args.js';var BaseRepository2_1;
+let BaseRepository2 = BaseRepository2_1 = class BaseRepository2 {
+    modelFunc;
+    options;
+    logger;
+    model;
+    constructor(modelFunc, db, logger, options) {
+        this.modelFunc = modelFunc;
+        this.model = modelFunc(db);
+        this.options = options;
+        this.logger = logger.child({ className: BaseRepository2_1.name });
+    }
+    /**
+     * Transforms a document to the domain model format
+     */
+    transformDocument(doc) {
+        if (!doc)
+            return null;
+        // If it's already a plain object (not a Mongoose document)
+        if (!doc.toObject) {
+            // Ensure id exists if _id is present
+            if (doc._id && !doc.id) {
+                doc.id = typeof doc._id === 'object' && doc._id.toString ? doc._id.toString() : doc._id;
+            }
+            return doc;
+        }
+        // For Mongoose documents, use the built-in toObject transformation
+        return doc.toObject();
+    }
+    /**
+     * Transforms an array of documents
+     */
+    transformDocuments(docs) {
+        if (!docs || !Array.isArray(docs))
+            return [];
+        return docs.map((doc) => this.transformDocument(doc)).filter(Boolean);
+    }
+    /**
+     * Maps API criteria with 'id' to MongoDB criteria with '_id'
+     */
+    mapConditions(conditions) {
+        if (!conditions)
+            return {};
+        const { id, ...remaining } = conditions;
+        if (!id)
+            return remaining;
+        // Handle custom _id that might not be an ObjectId
+        let _id;
+        if (Types.ObjectId.isValid(id)) {
+            _id = new Types.ObjectId(id);
+        }
+        else {
+            _id = id; // Use the id as-is if it's not a valid ObjectId
+        }
+        return {
+            _id,
+            ...remaining,
+        };
+    }
+    /**
+     * Computes sort object from GetAllArgs sort parameter
+     * Handles both string-based and object-based sort specifications
+     */
+    computeSort(sort) {
+        // Default sort by createdAt descending if available, otherwise empty sort
+        if (!sort) {
+            return { createdAt: -1 };
+        }
+        // Handle object-based sort { key: 'fieldName', value: 'asc'|'desc' }
+        if (isObject(sort) && 'key' in sort) {
+            return {
+                [sort.key]: sort.value?.toLowerCase() === 'asc' ? 1 : -1,
+            };
+        }
+        // Handle string-based sort 'fieldName:asc' or 'fieldName:desc'
+        if (typeof sort === 'string') {
+            const [field, direction] = sort.split(':');
+            if (field) {
+                return {
+                    [field]: direction?.toLowerCase() === 'asc' ? 1 : -1,
+                };
+            }
+        }
+        // Handle array of sort specifications
+        if (Array.isArray(sort)) {
+            return sort.reduce((acc, sortItem) => {
+                if (isObject(sortItem) && sortItem.key) {
+                    acc[sortItem.key] = sortItem.value?.toLowerCase() === 'asc' ? 1 : -1;
+                }
+                return acc;
+            }, {});
+        }
+        // Fallback to default sort
+        return { createdAt: -1 };
+    }
+    /**
+     * Prepares an aggregation pipeline with standard stages
+     * @param options Query options including filtering, sorting, pagination
+     * @param customPipeline Optional custom pipeline stages to include
+     * @returns Complete MongoDB aggregation pipeline
+     */
+    preparePipeline(options, customPipeline = []) {
+        const { criteria, sort, limit, skip } = options;
+        const pipeline = [];
+        // Match stage (filtering)
+        if (criteria) {
+            pipeline.push({
+                $match: this.mapConditions(criteria),
+            });
+        }
+        // Add custom pipeline stages
+        if (customPipeline.length > 0) {
+            pipeline.push(...customPipeline);
+        }
+        // Sort stage
+        const sortBy = this.computeSort(sort);
+        if (Object.keys(sortBy).length > 0) {
+            pipeline.push({ $sort: sortBy });
+        }
+        // Pagination stages
+        if (skip !== undefined) {
+            pipeline.push({ $skip: skip || PAGINATION_OPTIONS.skip });
+        }
+        if (limit !== undefined) {
+            pipeline.push({ $limit: limit || PAGINATION_OPTIONS.limit });
+        }
+        return pipeline;
+    }
+    /**
+     * Execute an aggregation pipeline and transform the results
+     */
+    async aggregate(pipeline) {
+        try {
+            const results = await this.model.aggregate(pipeline).exec();
+            return this.transformDocuments(results);
+        }
+        catch (e) {
+            this.logger.error(e, 'Error executing aggregation pipeline: %j', pipeline);
+            throw e;
+        }
+    }
+    async count(conditions) {
+        return this.model.count(this.mapConditions(conditions)).exec();
+    }
+    async get(conditions, selectedFields) {
+        try {
+            const response = await this.model.findOne(this.mapConditions(conditions), selectedFields).lean().exec();
+            if (!response)
+                return null;
+            // Ensure id exists
+            if (response && response._id && !response.id) {
+                response.id = response._id.toString();
+            }
+            return response;
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to retrieve Model with criteria [%j]', conditions);
+            throw e;
+        }
+    }
+    async find(conditions, selectedFields) {
+        try {
+            const response = await this.model.findOne(conditions, selectedFields).lean().exec();
+            if (!response)
+                return null;
+            // Ensure id exists
+            if (response && response._id && !response.id) {
+                response.id = response._id.toString();
+            }
+            return response;
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to retrieve Model with criteria [%j]', conditions);
+            throw e;
+        }
+    }
+    async getAll(options) {
+        try {
+            const { criteria, selectedFields, sort, limit, skip } = options;
+            const mappedCriteria = this.mapConditions(criteria);
+            const sortBy = this.computeSort(sort);
+            const response = await this.model
+                .find(mappedCriteria, selectedFields)
+                .sort(sortBy)
+                .limit(limit || PAGINATION_OPTIONS.limit)
+                .skip(skip || PAGINATION_OPTIONS.skip)
+                .lean()
+                .exec();
+            // Ensure id exists for each document
+            return response.map((doc) => {
+                if (doc._id && !doc.id) {
+                    doc.id = doc._id.toString();
+                }
+                return doc;
+            });
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to retrieve Model with criteria [%j]', options);
+            throw e;
+        }
+    }
+    /**
+     * Get all documents using aggregation pipeline
+     */
+    async getAllWithPipeline(options, customPipeline = []) {
+        try {
+            const pipeline = this.preparePipeline(options, customPipeline);
+            return this.aggregate(pipeline);
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to retrieve Model with pipeline [%j]', customPipeline);
+            throw e;
+        }
+    }
+    async getAllWithCount(options) {
+        const data = await this.getAll(options);
+        const totalCount = await this.count(options.criteria);
+        return { totalCount, data };
+    }
+    /**
+     * Get all documents with count using aggregation pipeline
+     */
+    async getAllWithCountAndPipeline(options, customPipeline = []) {
+        // Clone options to avoid modifying the original
+        const countOptions = { ...options };
+        // Remove pagination for count
+        delete countOptions.limit;
+        delete countOptions.skip;
+        // Prepare count pipeline (without pagination)
+        const countPipeline = this.preparePipeline(countOptions, customPipeline);
+        countPipeline.push({ $count: 'total' });
+        // Execute both queries in parallel
+        const [data, countResult] = await Promise.all([
+            this.getAllWithPipeline(options, customPipeline),
+            this.model.aggregate(countPipeline).exec(),
+        ]);
+        const totalCount = countResult?.[0]?.total || 0;
+        return { data, totalCount };
+    }
+    async create(data) {
+        try {
+            // Handle custom _id if provided in the data
+            const createData = { ...data };
+            // If id is provided but _id is not, map id to _id
+            if (createData.id && !createData._id) {
+                createData._id = Types.ObjectId.isValid(createData.id)
+                    ? new Types.ObjectId(createData.id)
+                    : createData.id;
+                delete createData.id; // Remove id to avoid conflicts
+            }
+            const response = await this.model.create(createData);
+            return this.transformDocument(response);
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to create Model with data [%j]', data);
+            throw e;
+        }
+    }
+    async bulkCreate(data) {
+        try {
+            const response = await this.model.insertMany(data, {
+                lean: true,
+                ordered: true,
+            });
+            // Ensure id exists for each document
+            return response.map((doc) => {
+                if (doc._id && !doc.id) {
+                    doc.id = doc._id.toString();
+                }
+                return doc;
+            });
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to bulk create due to error [%s]', e.message);
+            throw e;
+        }
+    }
+    async upsert(conditions, update, options = {}) {
+        return this.update(conditions, update, {
+            upsert: true,
+            ...options,
+        });
+    }
+    async update(criteria, update, options = {}) {
+        try {
+            const mappedCriteria = this.mapConditions(criteria);
+            const mergedOptions = {
+                new: true,
+                useFindAndModify: false,
+                ...options,
+            };
+            const { id } = criteria;
+            let response;
+            if (id) {
+                response = await this.model.findByIdAndUpdate(id, update, mergedOptions).exec();
+            }
+            else {
+                response = await this.model.findOneAndUpdate(mappedCriteria, update, mergedOptions).exec();
+            }
+            return this.transformDocument(response);
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to Update with criteria [%j] and data [%j]', criteria, update);
+            throw e;
+        }
+    }
+    async bulkUpdate(criteria, update, options = {}) {
+        try {
+            const mappedCriteria = this.mapConditions(criteria);
+            await this.model.updateMany(mappedCriteria, update, options);
+            // Fetch the updated documents
+            const response = await this.model.find(mappedCriteria).lean().exec();
+            // Ensure id exists for each document
+            return response.map((doc) => {
+                if (doc._id && !doc.id) {
+                    doc.id = doc._id.toString();
+                }
+                return doc;
+            });
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to Bulk Update with criteria [%j] and data [%j]', criteria, update);
+            throw e;
+        }
+    }
+    async delete(criteria) {
+        try {
+            const mappedCriteria = this.mapConditions(criteria);
+            let deleted;
+            if (criteria?.id) {
+                deleted = await this.model.findByIdAndDelete(criteria.id);
+            }
+            else {
+                deleted = await this.model.findOneAndDelete(mappedCriteria);
+            }
+            return !!deleted;
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to delete the model with criteria [%j]', criteria);
+            throw e;
+        }
+    }
+    async bulkDelete(criteria) {
+        try {
+            const mappedCriteria = this.mapConditions(criteria);
+            const deleted = await this.model.deleteMany(mappedCriteria);
+            return deleted?.deletedCount || 0;
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to delete the model with criteria [%j]', criteria);
+            throw e;
+        }
+    }
+    async bulkGet(ids, selectedFields) {
+        try {
+            // Create a query that handles both ObjectId and string IDs
+            const query = { _id: { $in: [] } };
+            // Process each ID
+            ids.forEach((id) => {
+                if (Types.ObjectId.isValid(id)) {
+                    query._id.$in.push(new Types.ObjectId(id));
+                }
+                else {
+                    query._id.$in.push(id); // Add as string
+                }
+            });
+            const results = await this.model.find(query).select(selectedFields).lean().exec();
+            // Ensure id exists for each document
+            return results.map((doc) => {
+                if (doc._id && !doc.id) {
+                    doc.id = doc._id.toString();
+                }
+                return doc;
+            });
+        }
+        catch (e) {
+            this.logger.error(e, 'Unable to retrieve Model with criteria [%j]', ids);
+            throw e;
+        }
+    }
+};
+BaseRepository2 = BaseRepository2_1 = __decorate([
+    injectable(),
+    __param(0, unmanaged()),
+    __param(1, unmanaged()),
+    __param(2, unmanaged()),
+    __param(3, unmanaged()),
+    __metadata("design:paramtypes", [Function, Connection, Object, Object])
+], BaseRepository2);export{BaseRepository2};//# sourceMappingURL=base-repository-v2.js.map

package/lib/store/repositories/base-repository-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-repository-v2.js","sources":["../../../src/store/repositories/base-repository-v2.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/store/repositories/base-repository.js

@@ -1,4 +1,4 @@
-import {__decorate,__param,__metadata}from'tslib';import {isObject}from'lodash-es';import'@cdm-logger/core';import {Connection,Types}from'mongoose';import {injectable,unmanaged}from'inversify';import {PAGINATION_OPTIONS}from'../../interfaces/base-repository.js';var BaseRepository_1;
+import {__decorate,__param,__metadata}from'tslib';import {isObject}from'lodash-es';import'@cdm-logger/core';import {Connection,Types}from'mongoose';import {injectable,unmanaged}from'inversify';import {PAGINATION_OPTIONS}from'../../interfaces/get-all-args.js';var BaseRepository_1;
 let BaseRepository = BaseRepository_1 = class BaseRepository {
     modelFunc;
     options;

package/lib/store/repositories/base-repository.test.d.ts

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/lib/store/repositories/custom-id-repository.test.d.ts

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/lib/store/repositories/index.d.ts

@@ -1 +1,2 @@
+export * from './base-repository-v2';
 export * from './base-repository';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/store-mongo",
-    "version": "7.0.4-alpha.6",
+    "version": "7.1.1-alpha.5",
     "description": "Sample core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -24,9 +24,10 @@
         "watch": "npm run build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/core": "7.0.4-alpha.6"
+        "@common-stack/core": "7.0.4-alpha.17"
     },
     "devDependencies": {
+        "common": "7.1.1-alpha.4",
         "moleculer": "^0.14.33",
         "mongoose": "^6.12.8"
     },
@@ -38,7 +39,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "b2d5f2840f3e0b00015d55715108e8a86e47ff4d",
+    "gitHead": "3976681bf92acdd17287156670aba7c0f0cfa733",
     "typescript": {
         "definition": "lib/index.d.ts"
     }

package/lib/dataloaders/bulk-dataloader.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"bulk-dataloader.js","sources":["../../src/dataloaders/bulk-dataloader.ts"],"sourcesContent":[null],"names":[],"mappings":"kIAKO,IAAM,cAAc,GAApB,MAAM,cAAyC,SAAQ,UAA4B,CAAA;AAC5C,IAAA,OAAA,CAAA;AAA1C,IAAA,WAAA,CAA0C,OAAwB,EAAA;AAC9D,QAAA,KAAK,CAAC,OAAO,GAAa,KAAI;YAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC9C,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC;AAC5E,SAAC,CAAC,CAAC;QAJmC,IAAO,CAAA,OAAA,GAAP,OAAO,CAAiB;KAKjE;IAED,WAAW,GAAG,IAAI,UAAU,CAA4B,OAAO,OAAO,KAAI;AACtE,QAAA,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC;AACrD,QAAA,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;AACtC,YAAA,GAAG,IAAI;AACP,YAAA,QAAQ,EAAE;gBACN,GAAG,IAAI,CAAC,QAAQ;AAChB,gBAAA,CAAC,SAAS,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;AAC5B,aAAA;AACJ,SAAA,CAAC,CAAC;AACH,QAAA,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KACtB,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,KAAI;YACpB,IAAI,OAAO,UAAU,KAAK,UAAU;AAAE,gBAAA,OAAO,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACtE,YAAA,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;SAC9D,CAAC,CACL,CAAC;AACN,KAAC,CAAC,CAAC;EACN;AAzBY,cAAc,GAAA,UAAA,CAAA;AAD1B,IAAA,UAAU,EAAE;IAEI,OAAA,CAAA,CAAA,EAAA,SAAS,EAAE,CAAA;;AADf,CAAA,EAAA,cAAc,CAyB1B"}

package/lib/interfaces/base-repository.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"base-repository.js","sources":["../../src/interfaces/base-repository.ts"],"sourcesContent":[null],"names":[],"mappings":"IAGY,mBAGX;AAHD,CAAA,UAAY,kBAAkB,EAAA;AAC1B,IAAA,kBAAA,CAAA,kBAAA,CAAA,OAAA,CAAA,GAAA,EAAA,CAAA,GAAA,OAAU,CAAA;AACV,IAAA,kBAAA,CAAA,kBAAA,CAAA,MAAA,CAAA,GAAA,CAAA,CAAA,GAAA,MAAQ,CAAA;AACZ,CAAC,EAHW,kBAAkB,KAAlB,kBAAkB,GAG7B,EAAA,CAAA,CAAA"}