@sprucelabs/data-stores 29.0.44 → 30.0.0

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

@@ -1,11 +1,11 @@
 import { FullQueryOptions } from '../stores/AbstractStore';
-import { DataStorePlugin, DataStorePluginPrepareResponse, DataStorePluginWillCreateOneResponse, DataStorePluginWillFindResponse, DataStorePluginWillUpdateOneResponse } from '../types/stores.types';
+import { DataStorePlugin, DataStorePluginPrepareResponse, DataStorePluginWillCreateOneResponse, DataStorePluginWillFindResponse, DataStorePluginWillUpdateResponse } 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>;
+    willUpdate(query: Record<string, any>, updates: Record<string, any>): Promise<void | DataStorePluginWillUpdateResponse>;
     willFind(query: Record<string, any>, options?: FullQueryOptions): Promise<void | DataStorePluginWillFindResponse>;
 }

package/build/esm/plugins/DatabaseFieldMapperPlugin.js

@@ -31,7 +31,7 @@ export default class DatabaseFieldMapperPlugin {
             };
         });
     }
-    willUpdateOne(query, updates) {
+    willUpdate(query, updates) {
         return __awaiter(this, void 0, void 0, function* () {
             return {
                 query: this.mapper.mapTo(query),

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

@@ -52,7 +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: ValuesWithPaths<UpdateRecord>, options?: PrepareOptions<IncludePrivateFields, FullSchema, F>): Promise<Response<FullSchema, CreateEntityInstances, IncludePrivateFields, PF, F>>;
     update(query: QueryBuilder<QueryRecord>, updates: ValuesWithPaths<UpdateRecord>): Promise<number>;
     private findOneAndUpdate;
-    private handleWillUpdateOnePlugins;
+    private handleWillUpdatePlugins;
     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

@@ -315,7 +315,8 @@ export default class AbstractStore extends AbstractMutexer {
     }
     update(query, updates) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.db.update(this.collectionName, query, updates);
+            const { updates: pUpdates, query: pQuery } = yield this.handleWillUpdatePlugins(query, updates);
+            return this.db.update(this.collectionName, pQuery, pUpdates);
         });
     }
     findOneAndUpdate(query_1, updates_1, notFoundHandler_1) {
@@ -329,9 +330,9 @@ export default class AbstractStore extends AbstractMutexer {
                     //@ts-ignore
                     validateSchemaValues(this.updateSchema, initialUpdates);
                 }
-                const { query: qPlugins, shouldUpdate, updates: qUpdates, } = yield this.handleWillUpdateOnePlugins(q, initialUpdates);
-                q = qPlugins;
-                initialUpdates = qUpdates;
+                const { query: pQuery, shouldUpdate, updates: pUpdates, } = yield this.handleWillUpdatePlugins(q, initialUpdates);
+                q = pQuery;
+                initialUpdates = pUpdates;
                 let current = yield this._findOne(q, Object.assign(Object.assign({}, options), { shouldIncludePrivateFields: true }), { shouldTriggerWillQuery: false });
                 if (!current) {
                     current = yield notFoundHandler();
@@ -376,14 +377,14 @@ export default class AbstractStore extends AbstractMutexer {
             }
         });
     }
-    handleWillUpdateOnePlugins(query, updates) {
+    handleWillUpdatePlugins(query, updates) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             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));
+                const results = yield ((_a = plugin.willUpdate) === null || _a === void 0 ? void 0 : _a.call(plugin, query, updates));
                 if ((results === null || results === void 0 ? void 0 : results.shouldUpdate) === false) {
                     shouldUpdate = false;
                 }

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

@@ -2,14 +2,14 @@ import AbstractSpruceTest from '@sprucelabs/test-utils';
 import DatabaseFixture, { DatabaseFixtureOptions } from '../fixtures/DatabaseFixture';
 import { Database } from '../types/database.types';
 export default class AbstractDatabaseTest extends AbstractSpruceTest {
-    protected static db: Database;
-    protected static shouldUseInMemoryDatabase: boolean;
-    protected static DB_NAME: string;
-    protected static beforeEach(): Promise<void>;
-    protected static afterEach(): Promise<void>;
-    protected static DatabaseFixture(options?: DatabaseFixtureOptions): Promise<DatabaseFixture>;
-    protected static connectToDatabase(): Promise<Database>;
-    protected static DatabaseConnection(): Promise<{
+    protected db: Database;
+    protected shouldUseInMemoryDatabase: boolean;
+    protected DB_NAME: string;
+    protected beforeEach(): Promise<void>;
+    protected afterEach(): Promise<void>;
+    protected DatabaseFixture(options?: DatabaseFixtureOptions): Promise<DatabaseFixture>;
+    protected connectToDatabase(): Promise<Database>;
+    protected DatabaseConnection(): Promise<{
         dbFixture: DatabaseFixture;
         db: Database;
     }>;

package/build/esm/tests/AbstractDatabaseTest.js

@@ -10,8 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { SchemaRegistry } from '@sprucelabs/schema';
 import AbstractSpruceTest from '@sprucelabs/test-utils';
 import DatabaseFixture from '../fixtures/DatabaseFixture.js';
-class AbstractDatabaseTest extends AbstractSpruceTest {
-    static beforeEach() {
+export default class AbstractDatabaseTest extends AbstractSpruceTest {
+    constructor() {
+        super(...arguments);
+        this.shouldUseInMemoryDatabase = true;
+    }
+    beforeEach() {
         const _super = Object.create(null, {
             beforeEach: { get: () => super.beforeEach }
         });
@@ -20,7 +24,7 @@ class AbstractDatabaseTest extends AbstractSpruceTest {
             SchemaRegistry.getInstance().forgetAllSchemas();
         });
     }
-    static afterEach() {
+    afterEach() {
         const _super = Object.create(null, {
             afterEach: { get: () => super.afterEach }
         });
@@ -33,13 +37,13 @@ class AbstractDatabaseTest extends AbstractSpruceTest {
             this.DB_NAME = undefined;
         });
     }
-    static DatabaseFixture(options) {
+    DatabaseFixture(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const d = new DatabaseFixture(Object.assign({}, options));
             return d;
         });
     }
-    static connectToDatabase() {
+    connectToDatabase() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.db) {
                 const { dbFixture, db } = yield this.DatabaseConnection();
@@ -51,7 +55,7 @@ class AbstractDatabaseTest extends AbstractSpruceTest {
             return this.db;
         });
     }
-    static DatabaseConnection() {
+    DatabaseConnection() {
         return __awaiter(this, void 0, void 0, function* () {
             const dbFixture = yield this.DatabaseFixture();
             const db = yield dbFixture.connectToDatabase();
@@ -59,5 +63,3 @@ class AbstractDatabaseTest extends AbstractSpruceTest {
         });
     }
 }
-AbstractDatabaseTest.shouldUseInMemoryDatabase = true;
-export default AbstractDatabaseTest;

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

@@ -35,7 +35,7 @@ export type StoreOptions<Name extends StoreName> = Name extends keyof StoreOptio
 export interface DataStorePlugin {
     willCreateOne?: (values: Record<string, any>) => Promise<void | DataStorePluginWillCreateOneResponse>;
     didCreateOne?: (record: Record<string, any>) => Promise<void | DataStorePluginDidCreateOneResponse>;
-    willUpdateOne?: (query: Record<string, any>, updates: Record<string, any>) => Promise<void | DataStorePluginWillUpdateOneResponse>;
+    willUpdate?: (query: Record<string, any>, updates: Record<string, any>) => Promise<void | DataStorePluginWillUpdateResponse>;
     willDeleteOne?: (query: Record<string, any>) => Promise<void | DataStorePluginWillDeleteOneResponse>;
     didFindOne?: (query: Record<string, any>, record: Record<string, any>) => Promise<void | DataStorePluginDidFindOneResponse>;
     getName(): string;
@@ -52,7 +52,7 @@ export interface DataStorePluginWillCreateOneResponse {
     valuesToMixinBeforeCreate?: Record<string, any>;
     newValues?: Record<string, any>;
 }
-export interface DataStorePluginWillUpdateOneResponse {
+export interface DataStorePluginWillUpdateResponse {
     query?: Record<string, any>;
     shouldUpdate?: boolean;
     newUpdates?: Record<string, any>;

package/build/plugins/DatabaseFieldMapperPlugin.d.ts

@@ -1,11 +1,11 @@
 import { FullQueryOptions } from '../stores/AbstractStore';
-import { DataStorePlugin, DataStorePluginPrepareResponse, DataStorePluginWillCreateOneResponse, DataStorePluginWillFindResponse, DataStorePluginWillUpdateOneResponse } from '../types/stores.types';
+import { DataStorePlugin, DataStorePluginPrepareResponse, DataStorePluginWillCreateOneResponse, DataStorePluginWillFindResponse, DataStorePluginWillUpdateResponse } 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>;
+    willUpdate(query: Record<string, any>, updates: Record<string, any>): Promise<void | DataStorePluginWillUpdateResponse>;
     willFind(query: Record<string, any>, options?: FullQueryOptions): Promise<void | DataStorePluginWillFindResponse>;
 }

package/build/plugins/DatabaseFieldMapperPlugin.js

@@ -20,7 +20,7 @@ class DatabaseFieldMapperPlugin {
             }),
         };
     }
-    async willUpdateOne(query, updates) {
+    async willUpdate(query, updates) {
         return {
             query: this.mapper.mapTo(query),
             newUpdates: this.mapper.mapTo(updates),

package/build/stores/AbstractStore.d.ts

@@ -52,7 +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: ValuesWithPaths<UpdateRecord>, options?: PrepareOptions<IncludePrivateFields, FullSchema, F>): Promise<Response<FullSchema, CreateEntityInstances, IncludePrivateFields, PF, F>>;
     update(query: QueryBuilder<QueryRecord>, updates: ValuesWithPaths<UpdateRecord>): Promise<number>;
     private findOneAndUpdate;
-    private handleWillUpdateOnePlugins;
+    private handleWillUpdatePlugins;
     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

@@ -313,7 +313,8 @@ class AbstractStore extends AbstractMutexer_1.default {
         return this.findOneAndUpdate(query, updates, notFoundHandler, options);
     }
     async update(query, updates) {
-        return this.db.update(this.collectionName, query, updates);
+        const { updates: pUpdates, query: pQuery } = await this.handleWillUpdatePlugins(query, updates);
+        return this.db.update(this.collectionName, pQuery, pUpdates);
     }
     async findOneAndUpdate(query, updates, notFoundHandler, options = {}) {
         var _a, _b, _c;
@@ -325,9 +326,9 @@ class AbstractStore extends AbstractMutexer_1.default {
                 //@ts-ignore
                 (0, schema_1.validateSchemaValues)(this.updateSchema, initialUpdates);
             }
-            const { query: qPlugins, shouldUpdate, updates: qUpdates, } = await this.handleWillUpdateOnePlugins(q, initialUpdates);
-            q = qPlugins;
-            initialUpdates = qUpdates;
+            const { query: pQuery, shouldUpdate, updates: pUpdates, } = await this.handleWillUpdatePlugins(q, initialUpdates);
+            q = pQuery;
+            initialUpdates = pUpdates;
             let current = await this._findOne(q, Object.assign(Object.assign({}, options), { shouldIncludePrivateFields: true }), { shouldTriggerWillQuery: false });
             if (!current) {
                 current = await notFoundHandler();
@@ -371,13 +372,13 @@ class AbstractStore extends AbstractMutexer_1.default {
             throw coded[0];
         }
     }
-    async handleWillUpdateOnePlugins(query, updates) {
+    async handleWillUpdatePlugins(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));
+            const results = await ((_a = plugin.willUpdate) === null || _a === void 0 ? void 0 : _a.call(plugin, query, updates));
             if ((results === null || results === void 0 ? void 0 : results.shouldUpdate) === false) {
                 shouldUpdate = false;
             }

package/build/tests/AbstractDatabaseTest.d.ts

@@ -2,14 +2,14 @@ import AbstractSpruceTest from '@sprucelabs/test-utils';
 import DatabaseFixture, { DatabaseFixtureOptions } from '../fixtures/DatabaseFixture';
 import { Database } from '../types/database.types';
 export default class AbstractDatabaseTest extends AbstractSpruceTest {
-    protected static db: Database;
-    protected static shouldUseInMemoryDatabase: boolean;
-    protected static DB_NAME: string;
-    protected static beforeEach(): Promise<void>;
-    protected static afterEach(): Promise<void>;
-    protected static DatabaseFixture(options?: DatabaseFixtureOptions): Promise<DatabaseFixture>;
-    protected static connectToDatabase(): Promise<Database>;
-    protected static DatabaseConnection(): Promise<{
+    protected db: Database;
+    protected shouldUseInMemoryDatabase: boolean;
+    protected DB_NAME: string;
+    protected beforeEach(): Promise<void>;
+    protected afterEach(): Promise<void>;
+    protected DatabaseFixture(options?: DatabaseFixtureOptions): Promise<DatabaseFixture>;
+    protected connectToDatabase(): Promise<Database>;
+    protected DatabaseConnection(): Promise<{
         dbFixture: DatabaseFixture;
         db: Database;
     }>;

package/build/tests/AbstractDatabaseTest.js

@@ -7,11 +7,15 @@ const schema_1 = require("@sprucelabs/schema");
 const test_utils_1 = __importDefault(require("@sprucelabs/test-utils"));
 const DatabaseFixture_1 = __importDefault(require("../fixtures/DatabaseFixture"));
 class AbstractDatabaseTest extends test_utils_1.default {
-    static async beforeEach() {
+    constructor() {
+        super(...arguments);
+        this.shouldUseInMemoryDatabase = true;
+    }
+    async beforeEach() {
         await super.beforeEach();
         schema_1.SchemaRegistry.getInstance().forgetAllSchemas();
     }
-    static async afterEach() {
+    async afterEach() {
         await super.afterEach();
         await DatabaseFixture_1.default.destroy();
         //@ts-ignore
@@ -19,11 +23,11 @@ class AbstractDatabaseTest extends test_utils_1.default {
         //@ts-ignore
         this.DB_NAME = undefined;
     }
-    static async DatabaseFixture(options) {
+    async DatabaseFixture(options) {
         const d = new DatabaseFixture_1.default(Object.assign({}, options));
         return d;
     }
-    static async connectToDatabase() {
+    async connectToDatabase() {
         if (!this.db) {
             const { dbFixture, db } = await this.DatabaseConnection();
             this.DB_NAME = this.shouldUseInMemoryDatabase
@@ -33,11 +37,10 @@ class AbstractDatabaseTest extends test_utils_1.default {
         }
         return this.db;
     }
-    static async DatabaseConnection() {
+    async DatabaseConnection() {
         const dbFixture = await this.DatabaseFixture();
         const db = await dbFixture.connectToDatabase();
         return { dbFixture, db };
     }
 }
-AbstractDatabaseTest.shouldUseInMemoryDatabase = true;
 exports.default = AbstractDatabaseTest;

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

@@ -35,7 +35,7 @@ export type StoreOptions<Name extends StoreName> = Name extends keyof StoreOptio
 export interface DataStorePlugin {
     willCreateOne?: (values: Record<string, any>) => Promise<void | DataStorePluginWillCreateOneResponse>;
     didCreateOne?: (record: Record<string, any>) => Promise<void | DataStorePluginDidCreateOneResponse>;
-    willUpdateOne?: (query: Record<string, any>, updates: Record<string, any>) => Promise<void | DataStorePluginWillUpdateOneResponse>;
+    willUpdate?: (query: Record<string, any>, updates: Record<string, any>) => Promise<void | DataStorePluginWillUpdateResponse>;
     willDeleteOne?: (query: Record<string, any>) => Promise<void | DataStorePluginWillDeleteOneResponse>;
     didFindOne?: (query: Record<string, any>, record: Record<string, any>) => Promise<void | DataStorePluginDidFindOneResponse>;
     getName(): string;
@@ -52,7 +52,7 @@ export interface DataStorePluginWillCreateOneResponse {
     valuesToMixinBeforeCreate?: Record<string, any>;
     newValues?: Record<string, any>;
 }
-export interface DataStorePluginWillUpdateOneResponse {
+export interface DataStorePluginWillUpdateResponse {
     query?: Record<string, any>;
     shouldUpdate?: boolean;
     newUpdates?: Record<string, any>;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "29.0.44",
+  "version": "30.0.0",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -66,8 +66,8 @@
     "@seald-io/nedb": "^4.1.2",
     "@sprucelabs/error": "^7.0.25",
     "@sprucelabs/globby": "^2.0.506",
-    "@sprucelabs/schema": "^32.0.40",
-    "@sprucelabs/spruce-skill-utils": "^32.0.41",
+    "@sprucelabs/schema": "^32.0.41",
+    "@sprucelabs/spruce-skill-utils": "^32.0.42",
     "just-clone": "^6.2.0",
     "lodash": "^4.17.21",
     "mongodb": "^6.17.0"