@sprucelabs/data-stores 26.2.1 → 26.2.3

package/build/databases/NeDbDatabase.d.ts

@@ -1,5 +1,5 @@
 import AbstractMutexer from '../mutexers/AbstractMutexer';
-import { CreateOptions, Database } from '../types/database.types';
+import { CreateOptions, Database, DatabaseInternalOptions } from '../types/database.types';
 import { QueryOptions } from '../types/query.types';
 export default class NeDbDatabase extends AbstractMutexer implements Database {
     private collections;
@@ -22,8 +22,8 @@ export default class NeDbDatabase extends AbstractMutexer implements Database {
     private loadCollection;
     dropCollection(name: string): Promise<void>;
     dropDatabase(): Promise<void>;
-    findOne(collection: string, query?: Record<string, any>, options?: QueryOptions): Promise<Record<string, any> | null>;
-    find(collection: string, query?: Record<string, any>, options?: QueryOptions): Promise<Record<string, any>[]>;
+    findOne(collection: string, query?: Record<string, any>, options?: QueryOptions, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any> | null>;
+    find(collection: string, query?: Record<string, any>, options?: QueryOptions, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any>[]>;
     update(collection: string, query: Record<string, any>, updates: Record<string, any>, neDbOptions?: Record<string, any>): Promise<number>;
     updateOne(collection: string, query: Record<string, any>, updates: Record<string, any>, neDbOptions?: Record<string, any>, action?: string): Promise<Record<string, any>>;
     upsertOne(collection: string, query: Record<string, any>, updates: Record<string, any>): Promise<Record<string, any>>;

package/build/databases/NeDbDatabase.js

@@ -177,11 +177,12 @@ class NeDbDatabase extends AbstractMutexer_1.default {
         this.collections = {};
         return Promise.resolve();
     }
-    async findOne(collection, query, options) {
-        const results = await this.find(collection, this.prepQuery(query !== null && query !== void 0 ? query : {}), Object.assign({ limit: 1 }, (options || {})));
-        return results[0];
+    async findOne(collection, query, options, dbOptions) {
+        const results = await this.find(collection, query !== null && query !== void 0 ? query : {}, Object.assign({ limit: 1 }, (options || {})), dbOptions);
+        const match = results[0];
+        return match;
     }
-    async find(collection, query, options) {
+    async find(collection, query, options, dbOptions) {
         await this.randomDelay();
         if ((options === null || options === void 0 ? void 0 : options.limit) === 0) {
             return [];
@@ -205,7 +206,7 @@ class NeDbDatabase extends AbstractMutexer_1.default {
                     reject(err);
                 }
                 else {
-                    resolve(results.map((r) => this.normalizeRecord(r)));
+                    resolve(results.map((r) => this.normalizeRecord(r, dbOptions)));
                 }
             });
         });
@@ -242,7 +243,7 @@ class NeDbDatabase extends AbstractMutexer_1.default {
                     }));
                 }
                 else {
-                    resolve(docs ? this.normalizeRecord(docs) : numUpdated);
+                    resolve(docs ? this.normalizeRecord(docs, neDbOptions) : numUpdated);
                 }
             });
         });

package/build/esm/databases/NeDbDatabase.d.ts

@@ -1,5 +1,5 @@
 import AbstractMutexer from '../mutexers/AbstractMutexer';
-import { CreateOptions, Database } from '../types/database.types';
+import { CreateOptions, Database, DatabaseInternalOptions } from '../types/database.types';
 import { QueryOptions } from '../types/query.types';
 export default class NeDbDatabase extends AbstractMutexer implements Database {
     private collections;
@@ -22,8 +22,8 @@ export default class NeDbDatabase extends AbstractMutexer implements Database {
     private loadCollection;
     dropCollection(name: string): Promise<void>;
     dropDatabase(): Promise<void>;
-    findOne(collection: string, query?: Record<string, any>, options?: QueryOptions): Promise<Record<string, any> | null>;
-    find(collection: string, query?: Record<string, any>, options?: QueryOptions): Promise<Record<string, any>[]>;
+    findOne(collection: string, query?: Record<string, any>, options?: QueryOptions, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any> | null>;
+    find(collection: string, query?: Record<string, any>, options?: QueryOptions, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any>[]>;
     update(collection: string, query: Record<string, any>, updates: Record<string, any>, neDbOptions?: Record<string, any>): Promise<number>;
     updateOne(collection: string, query: Record<string, any>, updates: Record<string, any>, neDbOptions?: Record<string, any>, action?: string): Promise<Record<string, any>>;
     upsertOne(collection: string, query: Record<string, any>, updates: Record<string, any>): Promise<Record<string, any>>;

package/build/esm/databases/NeDbDatabase.js

@@ -199,13 +199,14 @@ export default class NeDbDatabase extends AbstractMutexer {
             return Promise.resolve();
         });
     }
-    findOne(collection, query, options) {
+    findOne(collection, query, options, dbOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const results = yield this.find(collection, this.prepQuery(query !== null && query !== void 0 ? query : {}), Object.assign({ limit: 1 }, (options || {})));
-            return results[0];
+            const results = yield this.find(collection, query !== null && query !== void 0 ? query : {}, Object.assign({ limit: 1 }, (options || {})), dbOptions);
+            const match = results[0];
+            return match;
         });
     }
-    find(collection, query, options) {
+    find(collection, query, options, dbOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.randomDelay();
             if ((options === null || options === void 0 ? void 0 : options.limit) === 0) {
@@ -230,7 +231,7 @@ export default class NeDbDatabase extends AbstractMutexer {
                         reject(err);
                     }
                     else {
-                        resolve(results.map((r) => this.normalizeRecord(r)));
+                        resolve(results.map((r) => this.normalizeRecord(r, dbOptions)));
                     }
                 });
             });
@@ -271,7 +272,7 @@ export default class NeDbDatabase extends AbstractMutexer {
                         }));
                     }
                     else {
-                        resolve(docs ? this.normalizeRecord(docs) : numUpdated);
+                        resolve(docs ? this.normalizeRecord(docs, neDbOptions) : numUpdated);
                     }
                 }));
             });

package/build/esm/plugins/DatabaseFieldMapperPlugin.d.ts

@@ -1,10 +1,11 @@
 import { QueryOptions } from '../types/query.types';
-import { DataStorePlugin, DataStorePluginPrepareResponse, DataStorePluginWillCreateOneResponse, DataStorePluginWillFindResponse } from '../types/stores.types';
+import { DataStorePlugin, DataStorePluginPrepareResponse, DataStorePluginWillCreateOneResponse, DataStorePluginWillFindResponse, DataStorePluginWillUpdateOneResponse } from '../types/stores.types';
 export default class DatabaseFieldMapperPlugin implements DataStorePlugin {
     private mapper;
     constructor(map: Record<string, any>);
     getName(): string;
     willCreateOne(values: Record<string, any>): Promise<void | DataStorePluginWillCreateOneResponse>;
     prepareRecord(record: Record<string, any>): Promise<void | DataStorePluginPrepareResponse>;
+    willUpdateOne(query: Record<string, any>, updates: Record<string, any>): Promise<void | DataStorePluginWillUpdateOneResponse>;
     willFind(query: Record<string, any>, options?: QueryOptions): Promise<void | DataStorePluginWillFindResponse>;
 }

package/build/esm/plugins/DatabaseFieldMapperPlugin.js

@@ -29,6 +29,14 @@ export default class DatabaseFieldMapperPlugin {
             };
         });
     }
+    willUpdateOne(query, updates) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return {
+                query: this.mapper.mapTo(query),
+                newValues: this.mapper.mapTo(updates),
+            };
+        });
+    }
     willFind(query, options) {
         return __awaiter(this, void 0, void 0, function* () {
             let { sort } = options !== null && options !== void 0 ? options : {};

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

@@ -52,6 +52,7 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     updateOne<IncludePrivateFields extends boolean = false, CreateEntityInstances extends boolean = false, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>, PF extends SchemaPublicFieldNames<FullSchema> = SchemaPublicFieldNames<FullSchema>>(query: QueryBuilder<QueryRecord>, updates: UpdateRecord, options?: PrepareOptions<IncludePrivateFields, FullSchema, F>): Promise<Response<FullSchema, CreateEntityInstances, IncludePrivateFields, PF, F>>;
     update(query: QueryBuilder<QueryRecord>, updates: UpdateRecord): Promise<number>;
     private findOneAndUpdate;
+    private handleWillUpdateOnePlugins;
     private pluckOperations;
     scramble(id: string): Promise<SchemaValues<FullSchema, false, false, false, Extract<keyof FullSchema["fields"], string>, SchemaPublicFieldNames<FullSchema>>>;
     private isScrambled;

package/build/esm/stores/AbstractStore.js

@@ -226,14 +226,17 @@ export default class AbstractStore extends AbstractMutexer {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let resolvedQuery = query;
+            let resolvedOptions = queryOptions;
             const { shouldTriggerWillQuery } = internalOptions;
             if (shouldTriggerWillQuery) {
                 resolvedQuery = ((_b = (yield ((_a = this.willFind) === null || _a === void 0 ? void 0 : _a.call(this, query)))) !== null && _b !== void 0 ? _b : query);
+                const { query: q, options: o } = yield this.handleWillFindPlugins(resolvedQuery, queryOptions);
+                resolvedQuery = q;
+                resolvedOptions = o;
             }
-            const { query: q, options: o } = yield this.handleWillFindPlugins(resolvedQuery, queryOptions);
-            resolvedQuery = q;
-            const resolvedOptions = o !== null && o !== void 0 ? o : queryOptions;
-            const results = yield this.db.find(this.collectionName, resolvedQuery, Object.assign(Object.assign({}, resolvedOptions), { includeFields: options === null || options === void 0 ? void 0 : options.includeFields }));
+            const results = yield this.db.find(this.collectionName, resolvedQuery, Object.assign(Object.assign({}, resolvedOptions), { includeFields: options === null || options === void 0 ? void 0 : options.includeFields }), {
+                primaryFieldNames: this.primaryFieldNames,
+            });
             if (results) {
                 const all = results.map((result) => this.prepareAndNormalizeRecord(result, Object.assign(Object.assign({}, options), { shouldStripUndefinedAndNullValues: true })));
                 const records = yield Promise.all(all);
@@ -306,22 +309,19 @@ export default class AbstractStore extends AbstractMutexer {
         });
     }
     findOneAndUpdate(query, updates, notFoundHandler, options = {}) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const { ops, updates: initialUpdates } = this.pluckOperations(updates);
+            let { ops, updates: initialUpdates } = this.pluckOperations(updates);
             let q = (_b = (yield ((_a = this.willFind) === null || _a === void 0 ? void 0 : _a.call(this, Object.assign({}, query))))) !== null && _b !== void 0 ? _b : query;
-            let shouldUpdate = true;
             try {
                 const isScrambled = this.isScrambled(initialUpdates);
-                for (const plugin of this.plugins) {
-                    const results = yield ((_c = plugin.willUpdateOne) === null || _c === void 0 ? void 0 : _c.call(plugin, q, initialUpdates));
-                    if ((results === null || results === void 0 ? void 0 : results.shouldUpdate) === false) {
-                        shouldUpdate = false;
-                    }
-                    if (results === null || results === void 0 ? void 0 : results.query) {
-                        q = results.query;
-                    }
+                if (!isScrambled) {
+                    //@ts-ignore
+                    validateSchemaValues(this.updateSchema, initialUpdates);
                 }
+                const { query: qPlugins, shouldUpdate, updates: qUpdates, } = yield this.handleWillUpdateOnePlugins(q, initialUpdates);
+                q = qPlugins;
+                initialUpdates = qUpdates;
                 let current = yield this._findOne(q, Object.assign(Object.assign({}, options), { shouldIncludePrivateFields: true }), { shouldTriggerWillQuery: false });
                 if (!current) {
                     current = yield notFoundHandler();
@@ -332,10 +332,6 @@ export default class AbstractStore extends AbstractMutexer {
                         throw new Error('Make sure your notFoundHandler returns a record or throws');
                     }
                 }
-                if (!isScrambled) {
-                    //@ts-ignore
-                    validateSchemaValues(this.updateSchema, initialUpdates);
-                }
                 if (!shouldUpdate) {
                     return current;
                 }
@@ -352,8 +348,10 @@ export default class AbstractStore extends AbstractMutexer {
                 for (const { name, value } of ops) {
                     normalizedValues[name] = value;
                 }
-                const results = yield this.db.updateOne(this.collectionName, q, normalizedValues);
-                yield ((_d = this.didUpdate) === null || _d === void 0 ? void 0 : _d.call(this, current, results));
+                const results = yield this.db.updateOne(this.collectionName, q, normalizedValues, {
+                    primaryFieldNames: this.primaryFieldNames,
+                });
+                yield ((_c = this.didUpdate) === null || _c === void 0 ? void 0 : _c.call(this, current, results));
                 return this.prepareAndNormalizeRecord(results, options);
             }
             catch (err) {
@@ -367,6 +365,27 @@ export default class AbstractStore extends AbstractMutexer {
             }
         });
     }
+    handleWillUpdateOnePlugins(query, updates) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            let shouldUpdate = true;
+            let resolvedQuery = query;
+            let resolvedUpdates = updates;
+            for (const plugin of this.plugins) {
+                const results = yield ((_a = plugin.willUpdateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, query, updates));
+                if ((results === null || results === void 0 ? void 0 : results.shouldUpdate) === false) {
+                    shouldUpdate = false;
+                }
+                if (results === null || results === void 0 ? void 0 : results.query) {
+                    resolvedQuery = results.query;
+                }
+                if (results === null || results === void 0 ? void 0 : results.newValues) {
+                    resolvedUpdates = results.newValues;
+                }
+            }
+            return { query: resolvedQuery, shouldUpdate, updates: resolvedUpdates };
+        });
+    }
     pluckOperations(updates) {
         const initialUpdates = __rest(updates, []);
         const ops = saveOperations

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

@@ -16,9 +16,9 @@ export interface Database {
     create(collection: string, values: Record<string, any>[]): Promise<Record<string, any>[]>;
     dropCollection(name: string): Promise<void>;
     dropDatabase(): Promise<void>;
-    findOne(collection: string, query?: Record<string, any>, options?: QueryOptions): Promise<Record<string, any> | null>;
-    find(collection: string, query?: Record<string, any>, options?: QueryOptions): Promise<Record<string, any>[]>;
-    updateOne(collection: string, query: Record<string, any>, updates: Record<string, any>): Promise<Record<string, any>>;
+    findOne(collection: string, query?: Record<string, any>, options?: QueryOptions, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any> | null>;
+    find(collection: string, query?: Record<string, any>, options?: QueryOptions, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any>[]>;
+    updateOne(collection: string, query: Record<string, any>, updates: Record<string, any>, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any>>;
     update(collection: string, query: Record<string, any>, updates: Record<string, any>): Promise<number>;
     upsertOne(collection: string, query: Record<string, any>, updates: Record<string, any>): Promise<Record<string, any>>;
     delete(collection: string, query: Record<string, any>): Promise<number>;
@@ -40,6 +40,8 @@ export type TestConnect = (connectionString?: string, dbName?: string) => Promis
 }>;
 export type UniqueIndex = string[];
 export type Index = string[];
-export interface CreateOptions {
+export interface CreateOptions extends DatabaseInternalOptions {
+}
+export interface DatabaseInternalOptions {
     primaryFieldNames?: string[];
 }

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

@@ -54,6 +54,7 @@ export interface DataStorePluginWillCreateOneResponse {
 export interface DataStorePluginWillUpdateOneResponse {
     query?: Record<string, any>;
     shouldUpdate?: boolean;
+    newValues?: Record<string, any>;
 }
 export interface DataStorePluginWillDeleteOneResponse {
     query?: Record<string, any>;

package/build/plugins/DatabaseFieldMapperPlugin.d.ts

@@ -1,10 +1,11 @@
 import { QueryOptions } from '../types/query.types';
-import { DataStorePlugin, DataStorePluginPrepareResponse, DataStorePluginWillCreateOneResponse, DataStorePluginWillFindResponse } from '../types/stores.types';
+import { DataStorePlugin, DataStorePluginPrepareResponse, DataStorePluginWillCreateOneResponse, DataStorePluginWillFindResponse, DataStorePluginWillUpdateOneResponse } from '../types/stores.types';
 export default class DatabaseFieldMapperPlugin implements DataStorePlugin {
     private mapper;
     constructor(map: Record<string, any>);
     getName(): string;
     willCreateOne(values: Record<string, any>): Promise<void | DataStorePluginWillCreateOneResponse>;
     prepareRecord(record: Record<string, any>): Promise<void | DataStorePluginPrepareResponse>;
+    willUpdateOne(query: Record<string, any>, updates: Record<string, any>): Promise<void | DataStorePluginWillUpdateOneResponse>;
     willFind(query: Record<string, any>, options?: QueryOptions): Promise<void | DataStorePluginWillFindResponse>;
 }

package/build/plugins/DatabaseFieldMapperPlugin.js

@@ -18,6 +18,12 @@ class DatabaseFieldMapperPlugin {
             newValues: this.mapper.mapFrom(record),
         };
     }
+    async willUpdateOne(query, updates) {
+        return {
+            query: this.mapper.mapTo(query),
+            newValues: this.mapper.mapTo(updates),
+        };
+    }
     async willFind(query, options) {
         let { sort } = options !== null && options !== void 0 ? options : {};
         sort = sort === null || sort === void 0 ? void 0 : sort.map((s) => (Object.assign(Object.assign({}, s), { field: this.mapper.mapFieldNameTo(s.field) })));

package/build/stores/AbstractStore.d.ts

@@ -52,6 +52,7 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     updateOne<IncludePrivateFields extends boolean = false, CreateEntityInstances extends boolean = false, F extends SchemaFieldNames<FullSchema> = SchemaFieldNames<FullSchema>, PF extends SchemaPublicFieldNames<FullSchema> = SchemaPublicFieldNames<FullSchema>>(query: QueryBuilder<QueryRecord>, updates: UpdateRecord, options?: PrepareOptions<IncludePrivateFields, FullSchema, F>): Promise<Response<FullSchema, CreateEntityInstances, IncludePrivateFields, PF, F>>;
     update(query: QueryBuilder<QueryRecord>, updates: UpdateRecord): Promise<number>;
     private findOneAndUpdate;
+    private handleWillUpdateOnePlugins;
     private pluckOperations;
     scramble(id: string): Promise<SchemaValues<FullSchema, false, false, false, Extract<keyof FullSchema["fields"], string>, SchemaPublicFieldNames<FullSchema>>>;
     private isScrambled;

package/build/stores/AbstractStore.js

@@ -224,14 +224,17 @@ class AbstractStore extends AbstractMutexer_1.default {
     }) {
         var _a, _b;
         let resolvedQuery = query;
+        let resolvedOptions = queryOptions;
         const { shouldTriggerWillQuery } = internalOptions;
         if (shouldTriggerWillQuery) {
             resolvedQuery = ((_b = (await ((_a = this.willFind) === null || _a === void 0 ? void 0 : _a.call(this, query)))) !== null && _b !== void 0 ? _b : query);
+            const { query: q, options: o } = await this.handleWillFindPlugins(resolvedQuery, queryOptions);
+            resolvedQuery = q;
+            resolvedOptions = o;
         }
-        const { query: q, options: o } = await this.handleWillFindPlugins(resolvedQuery, queryOptions);
-        resolvedQuery = q;
-        const resolvedOptions = o !== null && o !== void 0 ? o : queryOptions;
-        const results = await this.db.find(this.collectionName, resolvedQuery, Object.assign(Object.assign({}, resolvedOptions), { includeFields: options === null || options === void 0 ? void 0 : options.includeFields }));
+        const results = await this.db.find(this.collectionName, resolvedQuery, Object.assign(Object.assign({}, resolvedOptions), { includeFields: options === null || options === void 0 ? void 0 : options.includeFields }), {
+            primaryFieldNames: this.primaryFieldNames,
+        });
         if (results) {
             const all = results.map((result) => this.prepareAndNormalizeRecord(result, Object.assign(Object.assign({}, options), { shouldStripUndefinedAndNullValues: true })));
             const records = await Promise.all(all);
@@ -293,21 +296,18 @@ class AbstractStore extends AbstractMutexer_1.default {
         return this.db.update(this.collectionName, query, updates);
     }
     async findOneAndUpdate(query, updates, notFoundHandler, options = {}) {
-        var _a, _b, _c, _d;
-        const { ops, updates: initialUpdates } = this.pluckOperations(updates);
+        var _a, _b, _c;
+        let { ops, updates: initialUpdates } = this.pluckOperations(updates);
         let q = (_b = (await ((_a = this.willFind) === null || _a === void 0 ? void 0 : _a.call(this, Object.assign({}, query))))) !== null && _b !== void 0 ? _b : query;
-        let shouldUpdate = true;
         try {
             const isScrambled = this.isScrambled(initialUpdates);
-            for (const plugin of this.plugins) {
-                const results = await ((_c = plugin.willUpdateOne) === null || _c === void 0 ? void 0 : _c.call(plugin, q, initialUpdates));
-                if ((results === null || results === void 0 ? void 0 : results.shouldUpdate) === false) {
-                    shouldUpdate = false;
-                }
-                if (results === null || results === void 0 ? void 0 : results.query) {
-                    q = results.query;
-                }
+            if (!isScrambled) {
+                //@ts-ignore
+                (0, schema_1.validateSchemaValues)(this.updateSchema, initialUpdates);
             }
+            const { query: qPlugins, shouldUpdate, updates: qUpdates, } = await this.handleWillUpdateOnePlugins(q, initialUpdates);
+            q = qPlugins;
+            initialUpdates = qUpdates;
             let current = await this._findOne(q, Object.assign(Object.assign({}, options), { shouldIncludePrivateFields: true }), { shouldTriggerWillQuery: false });
             if (!current) {
                 current = await notFoundHandler();
@@ -318,10 +318,6 @@ class AbstractStore extends AbstractMutexer_1.default {
                     throw new Error('Make sure your notFoundHandler returns a record or throws');
                 }
             }
-            if (!isScrambled) {
-                //@ts-ignore
-                (0, schema_1.validateSchemaValues)(this.updateSchema, initialUpdates);
-            }
             if (!shouldUpdate) {
                 return current;
             }
@@ -338,8 +334,10 @@ class AbstractStore extends AbstractMutexer_1.default {
             for (const { name, value } of ops) {
                 normalizedValues[name] = value;
             }
-            const results = await this.db.updateOne(this.collectionName, q, normalizedValues);
-            await ((_d = this.didUpdate) === null || _d === void 0 ? void 0 : _d.call(this, current, results));
+            const results = await this.db.updateOne(this.collectionName, q, normalizedValues, {
+                primaryFieldNames: this.primaryFieldNames,
+            });
+            await ((_c = this.didUpdate) === null || _c === void 0 ? void 0 : _c.call(this, current, results));
             return this.prepareAndNormalizeRecord(results, options);
         }
         catch (err) {
@@ -352,6 +350,25 @@ class AbstractStore extends AbstractMutexer_1.default {
             throw coded[0];
         }
     }
+    async handleWillUpdateOnePlugins(query, updates) {
+        var _a;
+        let shouldUpdate = true;
+        let resolvedQuery = query;
+        let resolvedUpdates = updates;
+        for (const plugin of this.plugins) {
+            const results = await ((_a = plugin.willUpdateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, query, updates));
+            if ((results === null || results === void 0 ? void 0 : results.shouldUpdate) === false) {
+                shouldUpdate = false;
+            }
+            if (results === null || results === void 0 ? void 0 : results.query) {
+                resolvedQuery = results.query;
+            }
+            if (results === null || results === void 0 ? void 0 : results.newValues) {
+                resolvedUpdates = results.newValues;
+            }
+        }
+        return { query: resolvedQuery, shouldUpdate, updates: resolvedUpdates };
+    }
     pluckOperations(updates) {
         const initialUpdates = __rest(updates, []);
         const ops = stores_types_1.saveOperations

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

@@ -16,9 +16,9 @@ export interface Database {
     create(collection: string, values: Record<string, any>[]): Promise<Record<string, any>[]>;
     dropCollection(name: string): Promise<void>;
     dropDatabase(): Promise<void>;
-    findOne(collection: string, query?: Record<string, any>, options?: QueryOptions): Promise<Record<string, any> | null>;
-    find(collection: string, query?: Record<string, any>, options?: QueryOptions): Promise<Record<string, any>[]>;
-    updateOne(collection: string, query: Record<string, any>, updates: Record<string, any>): Promise<Record<string, any>>;
+    findOne(collection: string, query?: Record<string, any>, options?: QueryOptions, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any> | null>;
+    find(collection: string, query?: Record<string, any>, options?: QueryOptions, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any>[]>;
+    updateOne(collection: string, query: Record<string, any>, updates: Record<string, any>, dbOptions?: DatabaseInternalOptions): Promise<Record<string, any>>;
     update(collection: string, query: Record<string, any>, updates: Record<string, any>): Promise<number>;
     upsertOne(collection: string, query: Record<string, any>, updates: Record<string, any>): Promise<Record<string, any>>;
     delete(collection: string, query: Record<string, any>): Promise<number>;
@@ -40,6 +40,8 @@ export type TestConnect = (connectionString?: string, dbName?: string) => Promis
 }>;
 export type UniqueIndex = string[];
 export type Index = string[];
-export interface CreateOptions {
+export interface CreateOptions extends DatabaseInternalOptions {
+}
+export interface DatabaseInternalOptions {
     primaryFieldNames?: string[];
 }

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

@@ -54,6 +54,7 @@ export interface DataStorePluginWillCreateOneResponse {
 export interface DataStorePluginWillUpdateOneResponse {
     query?: Record<string, any>;
     shouldUpdate?: boolean;
+    newValues?: Record<string, any>;
 }
 export interface DataStorePluginWillDeleteOneResponse {
     query?: Record<string, any>;

package/package.json

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