@sprucelabs/data-stores 25.7.10 → 25.8.1

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

@@ -22,7 +22,7 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     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'>>;
     protected didCreate?(values: CreateRecord): Promise<void>;
-    protected willUpdate?(updates: UpdateRecord, values: DatabaseRecord): Promise<Partial<DatabaseRecord>>;
+    protected willUpdate?(updates: UpdateRecord, record: DatabaseRecord): Promise<Partial<DatabaseRecord>>;
     protected didUpdate?(old: DatabaseRecord, updated: DatabaseRecord): Promise<void>;
     protected willScramble?(values: Partial<DatabaseRecord> & {
         _isScrambled: true;

package/build/esm/stores/AbstractStore.js

@@ -222,9 +222,16 @@ export default class AbstractStore extends AbstractMutexer {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { ops, updates: initialUpdates } = this.pluckOperations(updates);
+            let q = query;
             try {
                 const isScrambled = this.isScrambled(initialUpdates);
-                let current = yield this.findOne(query, Object.assign(Object.assign({}, options), { shouldIncludePrivateFields: true }));
+                for (const plugin of this.plugins) {
+                    const results = yield ((_a = plugin.willUpdateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, q, initialUpdates));
+                    if (results === null || results === void 0 ? void 0 : results.query) {
+                        q = results.query;
+                    }
+                }
+                let current = yield this.findOne(q, Object.assign(Object.assign({}, options), { shouldIncludePrivateFields: true }));
                 if (!current) {
                     current = yield notFoundHandler();
                     if (current) {
@@ -241,7 +248,7 @@ export default class AbstractStore extends AbstractMutexer {
                 const cleanedUpdates = !isScrambled && this.willUpdate
                     ? yield this.willUpdate(initialUpdates, current)
                     : initialUpdates;
-                const databaseRecord = Object.assign(Object.assign({}, current), cleanedUpdates);
+                const databaseRecord = Object.assign({}, cleanedUpdates);
                 const normalizedValues = isScrambled
                     ? databaseRecord
                     : normalizeSchemaValues(this.databaseSchema, databaseRecord, {
@@ -251,10 +258,7 @@ 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);
+                const results = yield this.db.updateOne(this.collectionName, q, normalizedValues);
                 yield ((_b = this.didUpdate) === null || _b === void 0 ? void 0 : _b.call(this, current, results));
                 return this.prepareAndNormalizeRecord(results, options);
             }
@@ -319,7 +323,11 @@ export default class AbstractStore extends AbstractMutexer {
         });
     }
     deleteOne(query) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            for (const plugin of this.plugins) {
+                yield ((_a = plugin.willDeleteOne) === null || _a === void 0 ? void 0 : _a.call(plugin, query));
+            }
             return yield this.db.deleteOne(this.collectionName, query);
         });
     }

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

@@ -42,6 +42,7 @@ export type TestConnect = (connectionString?: string, dbName?: string) => Promis
 export interface DataStorePlugin {
     willCreateOne?: (values: Record<string, any>) => Promise<void | DataStorePluginHookResponse>;
     willUpdateOne?: (query: Record<string, any>, updates: Record<string, any>) => Promise<void | DataStorePluginWillUpdateOneResponse>;
+    willDeleteOne?: (query: Record<string, any>) => Promise<void>;
     getName(): string;
 }
 export interface DataStorePluginHookResponse {

package/build/stores/AbstractStore.d.ts

@@ -22,7 +22,7 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     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'>>;
     protected didCreate?(values: CreateRecord): Promise<void>;
-    protected willUpdate?(updates: UpdateRecord, values: DatabaseRecord): Promise<Partial<DatabaseRecord>>;
+    protected willUpdate?(updates: UpdateRecord, record: DatabaseRecord): Promise<Partial<DatabaseRecord>>;
     protected didUpdate?(old: DatabaseRecord, updated: DatabaseRecord): Promise<void>;
     protected willScramble?(values: Partial<DatabaseRecord> & {
         _isScrambled: true;

package/build/stores/AbstractStore.js

@@ -220,9 +220,16 @@ class AbstractStore extends AbstractMutexer_1.default {
     async findOneAndUpdate(query, updates, notFoundHandler, options = {}) {
         var _a, _b;
         const { ops, updates: initialUpdates } = this.pluckOperations(updates);
+        let q = query;
         try {
             const isScrambled = this.isScrambled(initialUpdates);
-            let current = await this.findOne(query, Object.assign(Object.assign({}, options), { shouldIncludePrivateFields: true }));
+            for (const plugin of this.plugins) {
+                const results = await ((_a = plugin.willUpdateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, q, initialUpdates));
+                if (results === null || results === void 0 ? void 0 : results.query) {
+                    q = results.query;
+                }
+            }
+            let current = await this.findOne(q, Object.assign(Object.assign({}, options), { shouldIncludePrivateFields: true }));
             if (!current) {
                 current = await notFoundHandler();
                 if (current) {
@@ -239,7 +246,7 @@ class AbstractStore extends AbstractMutexer_1.default {
             const cleanedUpdates = !isScrambled && this.willUpdate
                 ? await this.willUpdate(initialUpdates, current)
                 : initialUpdates;
-            const databaseRecord = Object.assign(Object.assign({}, current), cleanedUpdates);
+            const databaseRecord = Object.assign({}, cleanedUpdates);
             const normalizedValues = isScrambled
                 ? databaseRecord
                 : (0, schema_1.normalizeSchemaValues)(this.databaseSchema, databaseRecord, {
@@ -249,10 +256,7 @@ 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);
+            const results = await this.db.updateOne(this.collectionName, q, normalizedValues);
             await ((_b = this.didUpdate) === null || _b === void 0 ? void 0 : _b.call(this, current, results));
             return this.prepareAndNormalizeRecord(results, options);
         }
@@ -312,6 +316,10 @@ class AbstractStore extends AbstractMutexer_1.default {
         return cleanedValues;
     }
     async deleteOne(query) {
+        var _a;
+        for (const plugin of this.plugins) {
+            await ((_a = plugin.willDeleteOne) === null || _a === void 0 ? void 0 : _a.call(plugin, query));
+        }
         return await this.db.deleteOne(this.collectionName, query);
     }
     async delete(query) {

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

@@ -42,6 +42,7 @@ export type TestConnect = (connectionString?: string, dbName?: string) => Promis
 export interface DataStorePlugin {
     willCreateOne?: (values: Record<string, any>) => Promise<void | DataStorePluginHookResponse>;
     willUpdateOne?: (query: Record<string, any>, updates: Record<string, any>) => Promise<void | DataStorePluginWillUpdateOneResponse>;
+    willDeleteOne?: (query: Record<string, any>) => Promise<void>;
     getName(): string;
 }
 export interface DataStorePluginHookResponse {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "25.7.10",
+  "version": "25.8.1",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -68,26 +68,26 @@
     "upgrade.packages.test": "yarn upgrade.packages.all && yarn lint && yarn build.dev && yarn test"
   },
   "dependencies": {
-    "@sprucelabs/error": "^5.1.41",
+    "@sprucelabs/error": "^5.1.42",
     "@sprucelabs/globby": "^1.0.3",
-    "@sprucelabs/schema": "^29.0.79",
-    "@sprucelabs/spruce-skill-utils": "^30.1.13",
+    "@sprucelabs/schema": "^29.0.81",
+    "@sprucelabs/spruce-skill-utils": "^30.1.16",
     "just-clone": "^6.2.0",
     "lodash": "^4.17.21",
     "mongodb": "^6.2.0",
     "nedb": "^1.8.0"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^5.0.89",
-    "@sprucelabs/jest-json-reporter": "^7.0.116",
+    "@sprucelabs/esm-postbuild": "^5.0.90",
+    "@sprucelabs/jest-json-reporter": "^7.0.117",
     "@sprucelabs/jest-sheets-reporter": "^3.0.26",
-    "@sprucelabs/resolve-path-aliases": "^1.1.257",
+    "@sprucelabs/resolve-path-aliases": "^1.1.258",
     "@sprucelabs/semantic-release": "^4.0.8",
-    "@sprucelabs/test": "^8.0.25",
-    "@sprucelabs/test-utils": "^4.0.67",
-    "@types/lodash": "^4.14.200",
+    "@sprucelabs/test": "^8.0.26",
+    "@sprucelabs/test-utils": "^4.0.69",
+    "@types/lodash": "^4.14.201",
     "@types/nedb": "^1.8.16",
-    "@types/node": "^20.8.10",
+    "@types/node": "^20.9.0",
     "chokidar-cli": "^3.0.0",
     "concurrently": "^8.2.2",
     "dotenv": "^16.3.1",