@sprucelabs/data-stores 26.2.2 → 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/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);
@@ -345,7 +348,9 @@ 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);
+                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);
             }

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/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);
@@ -331,7 +334,9 @@ 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);
+            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);
         }

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/package.json

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