@sprucelabs/data-stores 25.11.2 → 25.13.0

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

@@ -33,7 +33,8 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     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>> & {}>;
-    private handleWillCreateForPlugins;
+    private handleWillCreatePlugins;
+    private handleDidCreateForPlugins;
     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>;
     private handleDidFindForPlugins;

package/build/esm/stores/AbstractStore.js

@@ -104,6 +104,7 @@ export default class AbstractStore extends AbstractMutexer {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                let valuesToMixinBeforeCreate = yield this.handleWillCreatePlugins(values);
                 //@ts-ignore
                 validateSchemaValues(this.createSchema, values);
                 const cleanedValues = this.willCreate
@@ -115,10 +116,10 @@ export default class AbstractStore extends AbstractMutexer {
                 const toSave = normalizeSchemaValues(this.databaseSchema, 
                 //@ts-ignore
                 databaseRecord, { shouldCreateEntityInstances: false });
-                const mixinValuesOnReturn = yield this.handleWillCreateForPlugins(toSave);
-                const record = yield this.db.createOne(this.collectionName, toSave);
+                const record = yield this.db.createOne(this.collectionName, Object.assign(Object.assign({}, toSave), valuesToMixinBeforeCreate));
                 yield ((_b = this.didCreate) === null || _b === void 0 ? void 0 : _b.call(this, record));
                 const normalized = yield this.prepareAndNormalizeRecord(record, options);
+                const mixinValuesOnReturn = yield this.handleDidCreateForPlugins(normalized);
                 return Object.assign(Object.assign({}, normalized), mixinValuesOnReturn);
             }
             catch (err) {
@@ -132,12 +133,26 @@ export default class AbstractStore extends AbstractMutexer {
             }
         });
     }
-    handleWillCreateForPlugins(toSave) {
+    handleWillCreatePlugins(values) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            let valuesToMixinBeforeCreate = {};
+            for (const plugin of this.plugins) {
+                const r = yield ((_a = plugin.willCreateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, values));
+                const { valuesToMixinBeforeCreate: v } = r !== null && r !== void 0 ? r : {};
+                if (v) {
+                    valuesToMixinBeforeCreate = Object.assign(Object.assign({}, valuesToMixinBeforeCreate), v);
+                }
+            }
+            return valuesToMixinBeforeCreate;
+        });
+    }
+    handleDidCreateForPlugins(record) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let mixinValuesOnReturn = {};
             for (const plugin of this.plugins) {
-                const r = yield ((_a = plugin.willCreateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, toSave));
+                const r = yield ((_a = plugin.didCreateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, record));
                 mixinValuesOnReturn = Object.assign(Object.assign({}, mixinValuesOnReturn), r === null || r === void 0 ? void 0 : r.valuesToMixinBeforeReturning);
             }
             return mixinValuesOnReturn;
@@ -244,10 +259,14 @@ export default class AbstractStore extends AbstractMutexer {
         return __awaiter(this, void 0, void 0, function* () {
             const { ops, updates: initialUpdates } = this.pluckOperations(updates);
             let q = query;
+            let shouldUpdate = true;
             try {
                 const isScrambled = this.isScrambled(initialUpdates);
                 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.shouldUpdate) === false) {
+                        shouldUpdate = false;
+                    }
                     if (results === null || results === void 0 ? void 0 : results.query) {
                         q = results.query;
                     }
@@ -266,6 +285,9 @@ export default class AbstractStore extends AbstractMutexer {
                     //@ts-ignore
                     validateSchemaValues(this.updateSchema, initialUpdates);
                 }
+                if (!shouldUpdate) {
+                    return current;
+                }
                 const cleanedUpdates = !isScrambled && this.willUpdate
                     ? yield this.willUpdate(initialUpdates, current)
                     : initialUpdates;

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

@@ -40,17 +40,22 @@ export type TestConnect = (connectionString?: string, dbName?: string) => Promis
     badDatabaseName: string;
 }>;
 export interface DataStorePlugin {
-    willCreateOne?: (values: Record<string, any>) => Promise<void | DataStorePluginHookResponse>;
+    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>;
     willDeleteOne?: (query: Record<string, any>) => Promise<void | DataStorePluginWillDeleteOneResponse>;
     didFindOne?: (query: Record<string, any>, record: Record<string, any>) => Promise<void | DataStorePluginDidFindOneResponse>;
     getName(): string;
 }
-export interface DataStorePluginHookResponse {
+export interface DataStorePluginDidCreateOneResponse {
     valuesToMixinBeforeReturning?: Record<string, any>;
 }
+export interface DataStorePluginWillCreateOneResponse {
+    valuesToMixinBeforeCreate?: Record<string, any>;
+}
 export interface DataStorePluginWillUpdateOneResponse {
     query?: Record<string, any>;
+    shouldUpdate?: boolean;
 }
 export interface DataStorePluginWillDeleteOneResponse {
     query?: Record<string, any>;

package/build/stores/AbstractStore.d.ts

@@ -33,7 +33,8 @@ export default abstract class AbstractStore<FullSchema extends Schema, CreateSch
     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>> & {}>;
-    private handleWillCreateForPlugins;
+    private handleWillCreatePlugins;
+    private handleDidCreateForPlugins;
     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>;
     private handleDidFindForPlugins;

package/build/stores/AbstractStore.js

@@ -118,6 +118,7 @@ class AbstractStore extends AbstractMutexer_1.default {
     async createOne(values, options) {
         var _a, _b;
         try {
+            let valuesToMixinBeforeCreate = await this.handleWillCreatePlugins(values);
             //@ts-ignore
             (0, schema_1.validateSchemaValues)(this.createSchema, values);
             const cleanedValues = this.willCreate
@@ -129,10 +130,10 @@ class AbstractStore extends AbstractMutexer_1.default {
             const toSave = (0, schema_1.normalizeSchemaValues)(this.databaseSchema, 
             //@ts-ignore
             databaseRecord, { shouldCreateEntityInstances: false });
-            const mixinValuesOnReturn = await this.handleWillCreateForPlugins(toSave);
-            const record = await this.db.createOne(this.collectionName, toSave);
+            const record = await this.db.createOne(this.collectionName, Object.assign(Object.assign({}, toSave), valuesToMixinBeforeCreate));
             await ((_b = this.didCreate) === null || _b === void 0 ? void 0 : _b.call(this, record));
             const normalized = await this.prepareAndNormalizeRecord(record, options);
+            const mixinValuesOnReturn = await this.handleDidCreateForPlugins(normalized);
             return Object.assign(Object.assign({}, normalized), mixinValuesOnReturn);
         }
         catch (err) {
@@ -145,11 +146,23 @@ class AbstractStore extends AbstractMutexer_1.default {
             throw coded[0];
         }
     }
-    async handleWillCreateForPlugins(toSave) {
+    async handleWillCreatePlugins(values) {
+        var _a;
+        let valuesToMixinBeforeCreate = {};
+        for (const plugin of this.plugins) {
+            const r = await ((_a = plugin.willCreateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, values));
+            const { valuesToMixinBeforeCreate: v } = r !== null && r !== void 0 ? r : {};
+            if (v) {
+                valuesToMixinBeforeCreate = Object.assign(Object.assign({}, valuesToMixinBeforeCreate), v);
+            }
+        }
+        return valuesToMixinBeforeCreate;
+    }
+    async handleDidCreateForPlugins(record) {
         var _a;
         let mixinValuesOnReturn = {};
         for (const plugin of this.plugins) {
-            const r = await ((_a = plugin.willCreateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, toSave));
+            const r = await ((_a = plugin.didCreateOne) === null || _a === void 0 ? void 0 : _a.call(plugin, record));
             mixinValuesOnReturn = Object.assign(Object.assign({}, mixinValuesOnReturn), r === null || r === void 0 ? void 0 : r.valuesToMixinBeforeReturning);
         }
         return mixinValuesOnReturn;
@@ -238,10 +251,14 @@ class AbstractStore extends AbstractMutexer_1.default {
         var _a, _b;
         const { ops, updates: initialUpdates } = this.pluckOperations(updates);
         let q = query;
+        let shouldUpdate = true;
         try {
             const isScrambled = this.isScrambled(initialUpdates);
             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.shouldUpdate) === false) {
+                    shouldUpdate = false;
+                }
                 if (results === null || results === void 0 ? void 0 : results.query) {
                     q = results.query;
                 }
@@ -260,6 +277,9 @@ class AbstractStore extends AbstractMutexer_1.default {
                 //@ts-ignore
                 (0, schema_1.validateSchemaValues)(this.updateSchema, initialUpdates);
             }
+            if (!shouldUpdate) {
+                return current;
+            }
             const cleanedUpdates = !isScrambled && this.willUpdate
                 ? await this.willUpdate(initialUpdates, current)
                 : initialUpdates;

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

@@ -40,17 +40,22 @@ export type TestConnect = (connectionString?: string, dbName?: string) => Promis
     badDatabaseName: string;
 }>;
 export interface DataStorePlugin {
-    willCreateOne?: (values: Record<string, any>) => Promise<void | DataStorePluginHookResponse>;
+    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>;
     willDeleteOne?: (query: Record<string, any>) => Promise<void | DataStorePluginWillDeleteOneResponse>;
     didFindOne?: (query: Record<string, any>, record: Record<string, any>) => Promise<void | DataStorePluginDidFindOneResponse>;
     getName(): string;
 }
-export interface DataStorePluginHookResponse {
+export interface DataStorePluginDidCreateOneResponse {
     valuesToMixinBeforeReturning?: Record<string, any>;
 }
+export interface DataStorePluginWillCreateOneResponse {
+    valuesToMixinBeforeCreate?: Record<string, any>;
+}
 export interface DataStorePluginWillUpdateOneResponse {
     query?: Record<string, any>;
+    shouldUpdate?: boolean;
 }
 export interface DataStorePluginWillDeleteOneResponse {
     query?: Record<string, any>;

package/package.json

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