@sprucelabs/data-stores 25.7.6 → 25.7.8

package/build/cursors/BatchCursor.d.ts

@@ -3,14 +3,16 @@ import AbstractStore from '../stores/AbstractStore';
 import { QueryOptions } from '../types/query.types';
 import { PrepareOptions } from '../types/stores.types';
 export default class BatchCursorImpl<ResponseRecord> implements BatchCursor<ResponseRecord> {
+    static Class?: new (...args: any[]) => BatchCursor<any>;
     private store;
     private options?;
-    private query?;
+    protected query?: Record<string, any>;
     private nextHandler?;
-    private constructor();
+    private lastId?;
+    protected constructor(store: AbstractStore<Schema>, query?: Record<string, any>, options?: FindBatchOptions);
     [Symbol.asyncIterator](): AsyncIterator<ResponseRecord, any, undefined>;
     static Cursor<Response>(store: AbstractStore<Schema>, query?: Record<string, any>, options?: FindBatchOptions): BatchCursor<Response>;
-    setOnNextResults(cb: (results: ResponseRecord[]) => never[]): void;
+    setOnNextResults(cb: OnNextResultsHandler<ResponseRecord>): void;
     getTotalRecords(): Promise<number>;
     next(): Promise<ResponseRecord[] | null>;
     private bumpCursorPosition;

package/build/cursors/BatchCursor.js

@@ -27,8 +27,9 @@ class BatchCursorImpl {
         };
     }
     static Cursor(store, query, options) {
+        var _a;
         (0, schema_1.assertOptions)({ store }, ['store'], 'You need to pass a store to BatchCursor.Cursor()');
-        return new this(store, query, options);
+        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)(store, query, options);
     }
     setOnNextResults(cb) {
         this.nextHandler = cb;
@@ -37,9 +38,15 @@ class BatchCursorImpl {
         return this.store.count(Object.assign({}, this.query));
     }
     async next() {
-        var _a;
-        const _b = (_a = this.options) !== null && _a !== void 0 ? _a : {}, { batchSize = 10 } = _b, rest = __rest(_b, ["batchSize"]);
-        const matches = await this.store.find(Object.assign({}, this.query), {
+        var _a, _b;
+        const _c = (_a = this.options) !== null && _a !== void 0 ? _a : {}, { batchSize = 10 } = _c, rest = __rest(_c, ["batchSize"]);
+        let query = Object.assign({}, this.query);
+        if (this.lastId) {
+            query = {
+                $and: [(_b = this.query) !== null && _b !== void 0 ? _b : {}, { id: { $gt: this.lastId } }],
+            };
+        }
+        const matches = await this.store.find(query, {
             limit: batchSize,
         }, Object.assign({}, rest));
         if (matches.length === 0) {
@@ -57,7 +64,7 @@ class BatchCursorImpl {
             if (!this.query) {
                 this.query = {};
             }
-            this.query.id = { $gt: last.id };
+            this.lastId = last.id;
         }
     }
 }

package/build/esm/cursors/BatchCursor.d.ts

@@ -3,14 +3,16 @@ import AbstractStore from '../stores/AbstractStore';
 import { QueryOptions } from '../types/query.types';
 import { PrepareOptions } from '../types/stores.types';
 export default class BatchCursorImpl<ResponseRecord> implements BatchCursor<ResponseRecord> {
+    static Class?: new (...args: any[]) => BatchCursor<any>;
     private store;
     private options?;
-    private query?;
+    protected query?: Record<string, any>;
     private nextHandler?;
-    private constructor();
+    private lastId?;
+    protected constructor(store: AbstractStore<Schema>, query?: Record<string, any>, options?: FindBatchOptions);
     [Symbol.asyncIterator](): AsyncIterator<ResponseRecord, any, undefined>;
     static Cursor<Response>(store: AbstractStore<Schema>, query?: Record<string, any>, options?: FindBatchOptions): BatchCursor<Response>;
-    setOnNextResults(cb: (results: ResponseRecord[]) => never[]): void;
+    setOnNextResults(cb: OnNextResultsHandler<ResponseRecord>): void;
     getTotalRecords(): Promise<number>;
     next(): Promise<ResponseRecord[] | null>;
     private bumpCursorPosition;

package/build/esm/cursors/BatchCursor.js

@@ -34,8 +34,9 @@ export default class BatchCursorImpl {
         };
     }
     static Cursor(store, query, options) {
+        var _a;
         assertOptions({ store }, ['store'], 'You need to pass a store to BatchCursor.Cursor()');
-        return new this(store, query, options);
+        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)(store, query, options);
     }
     setOnNextResults(cb) {
         this.nextHandler = cb;
@@ -46,10 +47,16 @@ export default class BatchCursorImpl {
         });
     }
     next() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const _b = (_a = this.options) !== null && _a !== void 0 ? _a : {}, { batchSize = 10 } = _b, rest = __rest(_b, ["batchSize"]);
-            const matches = yield this.store.find(Object.assign({}, this.query), {
+            const _c = (_a = this.options) !== null && _a !== void 0 ? _a : {}, { batchSize = 10 } = _c, rest = __rest(_c, ["batchSize"]);
+            let query = Object.assign({}, this.query);
+            if (this.lastId) {
+                query = {
+                    $and: [(_b = this.query) !== null && _b !== void 0 ? _b : {}, { id: { $gt: this.lastId } }],
+                };
+            }
+            const matches = yield this.store.find(query, {
                 limit: batchSize,
             }, Object.assign({}, rest));
             if (matches.length === 0) {
@@ -68,7 +75,7 @@ export default class BatchCursorImpl {
             if (!this.query) {
                 this.query = {};
             }
-            this.query.id = { $gt: last.id };
+            this.lastId = last.id;
         }
     }
 }

package/build/esm/factories/StoreFactory.d.ts

@@ -1,7 +1,7 @@
 import { Database } from '../types/database.types';
-import { Store, StoreMap, StoreName, StoreOptions } from '../types/stores.types';
+import { DataStore, StoreMap, StoreName, StoreOptions } from '../types/stores.types';
 interface StoreContructor {
-    Store(o: any): Promise<Store> | Store;
+    Store(o: any): Promise<DataStore> | DataStore;
 }
 export default class StoreFactory {
     private storeMap;
@@ -18,7 +18,7 @@ export default class StoreFactory {
     Store<Name extends StoreName, Options extends StoreOptions<Name>>(name: Name, options?: Options): Promise<StoreMap[Name]>;
     getStoreNames(): StoreName[];
     setStoreClass(name: string, Class: StoreContructor): void;
-    setStore(name: StoreName, store: Store | null): void;
+    setStore(name: StoreName, store: DataStore | null): void;
     getStore<Name extends StoreName>(name: Name): Promise<StoreMap[Name]>;
     static reset(): void;
 }

package/build/esm/stores/AbstractStore.d.ts

@@ -1,12 +1,12 @@
 import { Schema, SchemaFieldNames, SchemaPartialValues, SchemaPublicFieldNames, SchemaValues } from '@sprucelabs/schema';
 import { FindBatchOptions } from '../cursors/BatchCursor';
 import AbstractMutexer from '../mutexers/AbstractMutexer';
-import { Database } from '../types/database.types';
+import { DataStorePlugin, Database } from '../types/database.types';
 import { QueryBuilder, QueryOptions } from '../types/query.types';
-import { PrepareOptions, PrepareResults, SaveOperations, Store } from '../types/stores.types';
+import { PrepareOptions, PrepareResults, SaveOperations, DataStore } from '../types/stores.types';
 export default abstract class AbstractStore<FullSchema extends Schema, CreateSchema extends Schema = FullSchema, UpdateSchema extends Schema = CreateSchema, DatabaseSchema extends Schema = FullSchema, DatabaseRecord = SchemaValues<DatabaseSchema> & {
     id: string;
-}, QueryRecord = SchemaPartialValues<FullSchema>, FullRecord = SchemaValues<FullSchema>, CreateRecord = SchemaValues<CreateSchema>, UpdateRecord = SchemaValues<UpdateSchema> & SaveOperations> extends AbstractMutexer implements Store {
+}, QueryRecord = SchemaPartialValues<FullSchema>, FullRecord = SchemaValues<FullSchema>, CreateRecord = SchemaValues<CreateSchema>, UpdateRecord = SchemaValues<UpdateSchema> & SaveOperations> extends AbstractMutexer implements DataStore {
     abstract readonly name: string;
     protected abstract collectionName: string;
     protected abstract createSchema: CreateSchema;
@@ -17,6 +17,7 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     protected db: Database;
     protected primaryFieldNames: string[];
     protected shouldMapLowerCaseToCamelCase: boolean;
+    protected plugins: DataStorePlugin[];
     initialize?(): Promise<void>;
     protected prepareRecord?<IncludePrivateFields extends boolean, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>>(record: DatabaseRecord, options?: PrepareOptions<IncludePrivateFields, FullSchema, F>): Promise<PrepareResults<FullSchema, IncludePrivateFields>>;
     protected willCreate?(values: CreateRecord): Promise<Omit<DatabaseRecord, 'id'>>;
@@ -33,7 +34,7 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     protected prepareAndNormalizeRecord<IncludePrivateFields extends boolean = true, CreateEntityInstances extends boolean = false, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>, PF extends SchemaPublicFieldNames<FullSchema> = SchemaPublicFieldNames<FullSchema>>(record: any, options?: PrepareOptions<IncludePrivateFields, FullSchema, F>): Promise<Response<FullSchema, CreateEntityInstances, IncludePrivateFields, PF, F>>;
     private mapCasing;
     create<IncludePrivateFields extends boolean = true, CreateEntityInstances extends boolean = false, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>, PF extends SchemaPublicFieldNames<FullSchema> = SchemaPublicFieldNames<FullSchema>>(values: CreateRecord[], options?: PrepareOptions<CreateEntityInstances, FullSchema, F>): Promise<Response<FullSchema, CreateEntityInstances, IncludePrivateFields, PF, F>[]>;
-    createOne<CreateEntityInstances extends boolean, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>>(values: CreateRecord, options?: PrepareOptions<CreateEntityInstances, FullSchema, F>): Promise<SchemaValues<FullSchema, false, CreateEntityInstances, false, F, SchemaPublicFieldNames<FullSchema>>>;
+    createOne<CreateEntityInstances extends boolean, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>>(values: CreateRecord, options?: PrepareOptions<CreateEntityInstances, FullSchema, F>): Promise<SchemaValues<FullSchema, false, CreateEntityInstances, false, F, SchemaPublicFieldNames<FullSchema>> & {}>;
     private get primaryFieldName();
     findOne<CreateEntityInstances extends boolean, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>>(query: QueryBuilder<QueryRecord>, options?: PrepareOptions<CreateEntityInstances, FullSchema, F>): Promise<SchemaValues<FullSchema, false, CreateEntityInstances, false, F, SchemaPublicFieldNames<FullSchema>> | null>;
     count(query?: QueryBuilder<QueryRecord>): Promise<number>;

package/build/esm/stores/AbstractStore.js

@@ -30,6 +30,7 @@ export default class AbstractStore extends AbstractMutexer {
         super();
         this.primaryFieldNames = ['id'];
         this.shouldMapLowerCaseToCamelCase = false;
+        this.plugins = [];
         this.db = db;
         if (collectionName) {
             this.setCollectionName(collectionName);
@@ -100,7 +101,7 @@ export default class AbstractStore extends AbstractMutexer {
         });
     }
     createOne(values, options) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 //@ts-ignore
@@ -114,10 +115,15 @@ export default class AbstractStore extends AbstractMutexer {
                 const toSave = normalizeSchemaValues(this.databaseSchema, 
                 //@ts-ignore
                 databaseRecord, { shouldCreateEntityInstances: false });
+                let mixinValuesOnReturn = {};
+                for (const plugin of this.plugins) {
+                    const r = yield ((_b = plugin.willCreateOne) === null || _b === void 0 ? void 0 : _b.call(plugin, toSave));
+                    mixinValuesOnReturn = Object.assign(Object.assign({}, mixinValuesOnReturn), r === null || r === void 0 ? void 0 : r.valuesToMixinBeforeReturning);
+                }
                 const record = yield this.db.createOne(this.collectionName, toSave);
-                yield ((_b = this.didCreate) === null || _b === void 0 ? void 0 : _b.call(this, record));
+                yield ((_c = this.didCreate) === null || _c === void 0 ? void 0 : _c.call(this, record));
                 const normalized = yield this.prepareAndNormalizeRecord(record, options);
-                return normalized;
+                return Object.assign(Object.assign({}, normalized), mixinValuesOnReturn);
             }
             catch (err) {
                 const coded = errorUtil.transformToSpruceErrors(err, new SpruceError({
@@ -213,7 +219,7 @@ export default class AbstractStore extends AbstractMutexer {
         });
     }
     findOneAndUpdate(query, updates, notFoundHandler, options = {}) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { ops, updates: initialUpdates } = this.pluckOperations(updates);
             try {
@@ -245,8 +251,11 @@ export default class AbstractStore extends AbstractMutexer {
                 for (const { name, value } of ops) {
                     normalizedValues[name] = value;
                 }
+                for (const plugin of this.plugins) {
+                    yield ((_a = plugin.willUpdateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, query, normalizedValues));
+                }
                 const results = yield this.db.updateOne(this.collectionName, query, normalizedValues);
-                yield ((_a = this.didUpdate) === null || _a === void 0 ? void 0 : _a.call(this, current, results));
+                yield ((_b = this.didUpdate) === null || _b === void 0 ? void 0 : _b.call(this, current, results));
                 return this.prepareAndNormalizeRecord(results, options);
             }
             catch (err) {

package/build/esm/tests/databaseAssertUtil.d.ts

@@ -1,5 +1,5 @@
 import { Database, Index, TestConnect, UniqueIndex } from '../types/database.types';
-import { Store } from '../types/stores.types';
+import { DataStore } from '../types/stores.types';
 declare const databaseAssertUtil: {
     collectionName: string;
     runSuite(connect: TestConnect, tests?: string[]): Promise<void>;
@@ -79,6 +79,6 @@ declare const databaseAssertUtil: {
     _assertThrowsExpectedNotFoundOnUpdateOne(db: Database, query: Record<string, any>): Promise<void>;
     _assert$orReturnsExpectedTotalRecords(db: Database, $or: Record<string, any>[], expected: number): Promise<void>;
     _assertCanCreateMultiFieldIndex(connect: TestConnect, fields: string[]): Promise<void>;
-    assertHasLowerCaseToCamelCaseMappingEnabled(store: Store): void;
+    assertHasLowerCaseToCamelCaseMappingEnabled(store: DataStore): void;
 };
 export default databaseAssertUtil;

package/build/esm/types/database.types.d.ts

@@ -39,3 +39,14 @@ export type TestConnect = (connectionString?: string, dbName?: string) => Promis
     connectionStringWithRandomBadDatabaseName: string;
     badDatabaseName: string;
 }>;
+export interface DataStorePlugin {
+    willCreateOne?: (values: Record<string, any>) => Promise<void | DataStorePluginHookResponse>;
+    willUpdateOne?: (query: Record<string, any>, updates: Record<string, any>) => Promise<void | DataStorePluginWillUpdateOneResponse>;
+    getName(): string;
+}
+export interface DataStorePluginHookResponse {
+    valuesToMixinBeforeReturning?: Record<string, any>;
+}
+export interface DataStorePluginWillUpdateOneResponse {
+    query?: Record<string, any>;
+}

package/build/esm/types/stores.types.d.ts

@@ -8,8 +8,9 @@ export interface UniversalStoreOptions {
     db: Database;
     storeFactory: StoreFactory;
 }
-export interface Store {
+export interface DataStore {
     initialize?(): Promise<void>;
+    getCollectionName?(): string;
 }
 /**
  * @deprecated SimplifiedStoreFactory -> SimpleStoreFactory

package/build/esm/utilities/mongo.utility.js

@@ -15,7 +15,10 @@ const mongoUtil = {
     mapQuery(query, options = {}) {
         const q = query || {};
         const opts = options;
-        if (Object.prototype.hasOwnProperty.call(q, 'id') && q.id === undefined) {
+        const shouldTransformIdToObjectId = opts.shouldTransformToObjectId !== false;
+        if (Object.prototype.hasOwnProperty.call(q, 'id') &&
+            q.id === undefined &&
+            shouldTransformIdToObjectId) {
             throw new SpruceError({
                 code: 'MONGO_ID_MAPPING_ERROR',
                 friendlyMessage: '`id` cannot be undefined',
@@ -30,8 +33,9 @@ const mongoUtil = {
             normalizedValues.$or = $or.map((o) => this.mapQuery(o, options));
         }
         else if (typeof id === 'string') {
-            normalizedValues._id =
-                opts.shouldTransformToObjectId === false ? id : new ObjectId(id);
+            normalizedValues._id = !shouldTransformIdToObjectId
+                ? id
+                : new ObjectId(id);
         }
         else if (id) {
             normalizedValues._id = mapNestedIdValues(id, options);

package/build/factories/StoreFactory.d.ts

@@ -1,7 +1,7 @@
 import { Database } from '../types/database.types';
-import { Store, StoreMap, StoreName, StoreOptions } from '../types/stores.types';
+import { DataStore, StoreMap, StoreName, StoreOptions } from '../types/stores.types';
 interface StoreContructor {
-    Store(o: any): Promise<Store> | Store;
+    Store(o: any): Promise<DataStore> | DataStore;
 }
 export default class StoreFactory {
     private storeMap;
@@ -18,7 +18,7 @@ export default class StoreFactory {
     Store<Name extends StoreName, Options extends StoreOptions<Name>>(name: Name, options?: Options): Promise<StoreMap[Name]>;
     getStoreNames(): StoreName[];
     setStoreClass(name: string, Class: StoreContructor): void;
-    setStore(name: StoreName, store: Store | null): void;
+    setStore(name: StoreName, store: DataStore | null): void;
     getStore<Name extends StoreName>(name: Name): Promise<StoreMap[Name]>;
     static reset(): void;
 }

package/build/stores/AbstractStore.d.ts

@@ -1,12 +1,12 @@
 import { Schema, SchemaFieldNames, SchemaPartialValues, SchemaPublicFieldNames, SchemaValues } from '@sprucelabs/schema';
 import { FindBatchOptions } from '../cursors/BatchCursor';
 import AbstractMutexer from '../mutexers/AbstractMutexer';
-import { Database } from '../types/database.types';
+import { DataStorePlugin, Database } from '../types/database.types';
 import { QueryBuilder, QueryOptions } from '../types/query.types';
-import { PrepareOptions, PrepareResults, SaveOperations, Store } from '../types/stores.types';
+import { PrepareOptions, PrepareResults, SaveOperations, DataStore } from '../types/stores.types';
 export default abstract class AbstractStore<FullSchema extends Schema, CreateSchema extends Schema = FullSchema, UpdateSchema extends Schema = CreateSchema, DatabaseSchema extends Schema = FullSchema, DatabaseRecord = SchemaValues<DatabaseSchema> & {
     id: string;
-}, QueryRecord = SchemaPartialValues<FullSchema>, FullRecord = SchemaValues<FullSchema>, CreateRecord = SchemaValues<CreateSchema>, UpdateRecord = SchemaValues<UpdateSchema> & SaveOperations> extends AbstractMutexer implements Store {
+}, QueryRecord = SchemaPartialValues<FullSchema>, FullRecord = SchemaValues<FullSchema>, CreateRecord = SchemaValues<CreateSchema>, UpdateRecord = SchemaValues<UpdateSchema> & SaveOperations> extends AbstractMutexer implements DataStore {
     abstract readonly name: string;
     protected abstract collectionName: string;
     protected abstract createSchema: CreateSchema;
@@ -17,6 +17,7 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     protected db: Database;
     protected primaryFieldNames: string[];
     protected shouldMapLowerCaseToCamelCase: boolean;
+    protected plugins: DataStorePlugin[];
     initialize?(): Promise<void>;
     protected prepareRecord?<IncludePrivateFields extends boolean, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>>(record: DatabaseRecord, options?: PrepareOptions<IncludePrivateFields, FullSchema, F>): Promise<PrepareResults<FullSchema, IncludePrivateFields>>;
     protected willCreate?(values: CreateRecord): Promise<Omit<DatabaseRecord, 'id'>>;
@@ -33,7 +34,7 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     protected prepareAndNormalizeRecord<IncludePrivateFields extends boolean = true, CreateEntityInstances extends boolean = false, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>, PF extends SchemaPublicFieldNames<FullSchema> = SchemaPublicFieldNames<FullSchema>>(record: any, options?: PrepareOptions<IncludePrivateFields, FullSchema, F>): Promise<Response<FullSchema, CreateEntityInstances, IncludePrivateFields, PF, F>>;
     private mapCasing;
     create<IncludePrivateFields extends boolean = true, CreateEntityInstances extends boolean = false, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>, PF extends SchemaPublicFieldNames<FullSchema> = SchemaPublicFieldNames<FullSchema>>(values: CreateRecord[], options?: PrepareOptions<CreateEntityInstances, FullSchema, F>): Promise<Response<FullSchema, CreateEntityInstances, IncludePrivateFields, PF, F>[]>;
-    createOne<CreateEntityInstances extends boolean, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>>(values: CreateRecord, options?: PrepareOptions<CreateEntityInstances, FullSchema, F>): Promise<SchemaValues<FullSchema, false, CreateEntityInstances, false, F, SchemaPublicFieldNames<FullSchema>>>;
+    createOne<CreateEntityInstances extends boolean, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>>(values: CreateRecord, options?: PrepareOptions<CreateEntityInstances, FullSchema, F>): Promise<SchemaValues<FullSchema, false, CreateEntityInstances, false, F, SchemaPublicFieldNames<FullSchema>> & {}>;
     private get primaryFieldName();
     findOne<CreateEntityInstances extends boolean, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>>(query: QueryBuilder<QueryRecord>, options?: PrepareOptions<CreateEntityInstances, FullSchema, F>): Promise<SchemaValues<FullSchema, false, CreateEntityInstances, false, F, SchemaPublicFieldNames<FullSchema>> | null>;
     count(query?: QueryBuilder<QueryRecord>): Promise<number>;

package/build/stores/AbstractStore.js

@@ -49,6 +49,7 @@ class AbstractStore extends AbstractMutexer_1.default {
         super();
         this.primaryFieldNames = ['id'];
         this.shouldMapLowerCaseToCamelCase = false;
+        this.plugins = [];
         this.db = db;
         if (collectionName) {
             this.setCollectionName(collectionName);
@@ -115,7 +116,7 @@ class AbstractStore extends AbstractMutexer_1.default {
         }
     }
     async createOne(values, options) {
-        var _a, _b;
+        var _a, _b, _c;
         try {
             //@ts-ignore
             (0, schema_1.validateSchemaValues)(this.createSchema, values);
@@ -128,10 +129,15 @@ class AbstractStore extends AbstractMutexer_1.default {
             const toSave = (0, schema_1.normalizeSchemaValues)(this.databaseSchema, 
             //@ts-ignore
             databaseRecord, { shouldCreateEntityInstances: false });
+            let mixinValuesOnReturn = {};
+            for (const plugin of this.plugins) {
+                const r = await ((_b = plugin.willCreateOne) === null || _b === void 0 ? void 0 : _b.call(plugin, toSave));
+                mixinValuesOnReturn = Object.assign(Object.assign({}, mixinValuesOnReturn), r === null || r === void 0 ? void 0 : r.valuesToMixinBeforeReturning);
+            }
             const record = await this.db.createOne(this.collectionName, toSave);
-            await ((_b = this.didCreate) === null || _b === void 0 ? void 0 : _b.call(this, record));
+            await ((_c = this.didCreate) === null || _c === void 0 ? void 0 : _c.call(this, record));
             const normalized = await this.prepareAndNormalizeRecord(record, options);
-            return normalized;
+            return Object.assign(Object.assign({}, normalized), mixinValuesOnReturn);
         }
         catch (err) {
             const coded = error_utility_1.default.transformToSpruceErrors(err, new SpruceError_1.default({
@@ -212,7 +218,7 @@ class AbstractStore extends AbstractMutexer_1.default {
         return this.db.update(this.collectionName, query, updates);
     }
     async findOneAndUpdate(query, updates, notFoundHandler, options = {}) {
-        var _a;
+        var _a, _b;
         const { ops, updates: initialUpdates } = this.pluckOperations(updates);
         try {
             const isScrambled = this.isScrambled(initialUpdates);
@@ -243,8 +249,11 @@ class AbstractStore extends AbstractMutexer_1.default {
             for (const { name, value } of ops) {
                 normalizedValues[name] = value;
             }
+            for (const plugin of this.plugins) {
+                await ((_a = plugin.willUpdateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, query, normalizedValues));
+            }
             const results = await this.db.updateOne(this.collectionName, query, normalizedValues);
-            await ((_a = this.didUpdate) === null || _a === void 0 ? void 0 : _a.call(this, current, results));
+            await ((_b = this.didUpdate) === null || _b === void 0 ? void 0 : _b.call(this, current, results));
             return this.prepareAndNormalizeRecord(results, options);
         }
         catch (err) {

package/build/tests/databaseAssertUtil.d.ts

@@ -1,5 +1,5 @@
 import { Database, Index, TestConnect, UniqueIndex } from '../types/database.types';
-import { Store } from '../types/stores.types';
+import { DataStore } from '../types/stores.types';
 declare const databaseAssertUtil: {
     collectionName: string;
     runSuite(connect: TestConnect, tests?: string[]): Promise<void>;
@@ -79,6 +79,6 @@ declare const databaseAssertUtil: {
     _assertThrowsExpectedNotFoundOnUpdateOne(db: Database, query: Record<string, any>): Promise<void>;
     _assert$orReturnsExpectedTotalRecords(db: Database, $or: Record<string, any>[], expected: number): Promise<void>;
     _assertCanCreateMultiFieldIndex(connect: TestConnect, fields: string[]): Promise<void>;
-    assertHasLowerCaseToCamelCaseMappingEnabled(store: Store): void;
+    assertHasLowerCaseToCamelCaseMappingEnabled(store: DataStore): void;
 };
 export default databaseAssertUtil;

package/build/types/database.types.d.ts

@@ -39,3 +39,14 @@ export type TestConnect = (connectionString?: string, dbName?: string) => Promis
     connectionStringWithRandomBadDatabaseName: string;
     badDatabaseName: string;
 }>;
+export interface DataStorePlugin {
+    willCreateOne?: (values: Record<string, any>) => Promise<void | DataStorePluginHookResponse>;
+    willUpdateOne?: (query: Record<string, any>, updates: Record<string, any>) => Promise<void | DataStorePluginWillUpdateOneResponse>;
+    getName(): string;
+}
+export interface DataStorePluginHookResponse {
+    valuesToMixinBeforeReturning?: Record<string, any>;
+}
+export interface DataStorePluginWillUpdateOneResponse {
+    query?: Record<string, any>;
+}

package/build/types/stores.types.d.ts

@@ -8,8 +8,9 @@ export interface UniversalStoreOptions {
     db: Database;
     storeFactory: StoreFactory;
 }
-export interface Store {
+export interface DataStore {
     initialize?(): Promise<void>;
+    getCollectionName?(): string;
 }
 /**
  * @deprecated SimplifiedStoreFactory -> SimpleStoreFactory

package/build/utilities/mongo.utility.js

@@ -20,7 +20,10 @@ const mongoUtil = {
     mapQuery(query, options = {}) {
         const q = query || {};
         const opts = options;
-        if (Object.prototype.hasOwnProperty.call(q, 'id') && q.id === undefined) {
+        const shouldTransformIdToObjectId = opts.shouldTransformToObjectId !== false;
+        if (Object.prototype.hasOwnProperty.call(q, 'id') &&
+            q.id === undefined &&
+            shouldTransformIdToObjectId) {
             throw new SpruceError_1.default({
                 code: 'MONGO_ID_MAPPING_ERROR',
                 friendlyMessage: '`id` cannot be undefined',
@@ -35,8 +38,9 @@ const mongoUtil = {
             normalizedValues.$or = $or.map((o) => this.mapQuery(o, options));
         }
         else if (typeof id === 'string') {
-            normalizedValues._id =
-                opts.shouldTransformToObjectId === false ? id : new mongodb_1.ObjectId(id);
+            normalizedValues._id = !shouldTransformIdToObjectId
+                ? id
+                : new mongodb_1.ObjectId(id);
         }
         else if (id) {
             normalizedValues._id = mapNestedIdValues(id, options);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "25.7.6",
+  "version": "25.7.8",
   "files": [
     "build/**/*",
     "!build/__tests__",