rads-db 3.1.4 → 3.1.6

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { g as RadsConfig, T as TypeDefinition } from './types-7e792d1f.js';
+import { g as RadsConfig, T as TypeDefinition } from './types-1bda441b.js';
 import '_rads-db';
 
 declare function defineRadsConfig(config: RadsConfig): RadsConfig;

package/dist/index.cjs

@@ -352,7 +352,9 @@ const computedPresets = {
       throw new Error('To use "createdBy" preset, please, provide "context.getUser" to "createRads" call.');
     return ___default.pick(ctx.getUser(), "id");
   },
-  updatedBy: ({ doc, ctx }) => {
+  updatedBy: ({ doc, oldDoc, fieldName, ctx }) => {
+    if (ctx.isVerifying && oldDoc?.updatedBy)
+      return oldDoc.updatedBy;
     if (!ctx.getUser)
       throw new Error('To use "updatedBy" preset, please, provide "context.getUser" to "createRads" call.');
     return ___default.pick(ctx.getUser(), "id");
@@ -385,8 +387,8 @@ async function handlePrecomputed(context, docs, ctx) {
       if (!handler)
         throw new Error(`Computed handler for ${typeName}.${fieldName} was not found`);
     }
-    const precomputedResults = docs.map(async ({ doc, oldDoc, events }) => {
-      doc[fieldName] = await handler({ fieldName, doc, oldDoc, events, db, ctx });
+    const precomputedResults = docs.map(async ({ doc, oldDoc, events, updatedEvents }) => {
+      doc[fieldName] = await handler({ fieldName, doc, oldDoc, events, updatedEvents, db, ctx });
     });
     await Promise.all(precomputedResults);
   }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-7e792d1f.js';
-export { N as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, aj as DeepKeys, ae as DeepPartial, ac as DeepPartialWithNulls, ad as DeepPartialWithNullsItem, ak as EntityMethods, w as EnumDefinition, v as FieldDefinition, I as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, B as GenerateClientNormalizedOptions, A as GenerateClientOptions, a8 as Get, _ as GetAggArgs, $ as GetAggArgsAgg, a2 as GetAggArgsAny, a5 as GetAggResponse, Z as GetArgs, a1 as GetArgsAny, a4 as GetArgsInclude, O as GetManyArgs, a0 as GetManyArgsAny, a6 as GetManyResponse, a7 as GetResponse, a9 as GetResponseInclude, aa as GetResponseIncludeSelect, ab as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ag as InverseRelation, M as MinimalDriver, ai as Put, ah as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, L as RadsFeature, y as RadsHookDoc, K as RadsUiSlotDefinition, J as RadsUiSlotName, H as RadsVitePluginOptions, af as Relation, i as RequiredFields, l as RestDriverOptions, z as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, T as TypeDefinition, j as ValidateStringDecoratorArgs, Q as VerifyManyArgs, a3 as VerifyManyArgsAny, X as VerifyManyResponse, Y as Where, W as WhereJsonContains } from './types-7e792d1f.js';
+import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-1bda441b.js';
+export { N as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, aj as DeepKeys, ae as DeepPartial, ac as DeepPartialWithNulls, ad as DeepPartialWithNullsItem, ak as EntityMethods, w as EnumDefinition, v as FieldDefinition, I as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, B as GenerateClientNormalizedOptions, A as GenerateClientOptions, a8 as Get, _ as GetAggArgs, $ as GetAggArgsAgg, a2 as GetAggArgsAny, a5 as GetAggResponse, Z as GetArgs, a1 as GetArgsAny, a4 as GetArgsInclude, O as GetManyArgs, a0 as GetManyArgsAny, a6 as GetManyResponse, a7 as GetResponse, a9 as GetResponseInclude, aa as GetResponseIncludeSelect, ab as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ag as InverseRelation, M as MinimalDriver, ai as Put, ah as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, L as RadsFeature, y as RadsHookDoc, K as RadsUiSlotDefinition, J as RadsUiSlotName, H as RadsVitePluginOptions, af as Relation, i as RequiredFields, l as RestDriverOptions, z as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, T as TypeDefinition, j as ValidateStringDecoratorArgs, Q as VerifyManyArgs, a3 as VerifyManyArgsAny, X as VerifyManyResponse, Y as Where, W as WhereJsonContains } from './types-1bda441b.js';
 import { RadsDb } from '_rads-db';
 export { RadsDb } from '_rads-db';
 

package/dist/index.mjs

@@ -345,7 +345,9 @@ const computedPresets = {
       throw new Error('To use "createdBy" preset, please, provide "context.getUser" to "createRads" call.');
     return _.pick(ctx.getUser(), "id");
   },
-  updatedBy: ({ doc, ctx }) => {
+  updatedBy: ({ doc, oldDoc, fieldName, ctx }) => {
+    if (ctx.isVerifying && oldDoc?.updatedBy)
+      return oldDoc.updatedBy;
     if (!ctx.getUser)
       throw new Error('To use "updatedBy" preset, please, provide "context.getUser" to "createRads" call.');
     return _.pick(ctx.getUser(), "id");
@@ -378,8 +380,8 @@ async function handlePrecomputed(context, docs, ctx) {
       if (!handler)
         throw new Error(`Computed handler for ${typeName}.${fieldName} was not found`);
     }
-    const precomputedResults = docs.map(async ({ doc, oldDoc, events }) => {
-      doc[fieldName] = await handler({ fieldName, doc, oldDoc, events, db, ctx });
+    const precomputedResults = docs.map(async ({ doc, oldDoc, events, updatedEvents }) => {
+      doc[fieldName] = await handler({ fieldName, doc, oldDoc, events, updatedEvents, db, ctx });
     });
     await Promise.all(precomputedResults);
   }

package/dist/{types-7e792d1f.d.ts → types-1bda441b.d.ts}

@@ -355,7 +355,8 @@ interface RadsHookDoc {
     /** Previous version of document - i.e. one that is currently in the database (before saving) */
     oldDoc: any;
     /** If current entity is event sourcing aggregate, you can access all events in the chronological order */
-    events?: any;
+    events?: any[];
+    updatedEvents?: any[];
 }
 interface PutEffect {
     beforePut?: (computedContext: ComputedContext, docs: RadsHookDoc[], ctx: RadsRequestContext) => MaybePromise<any>;

package/features/eventSourcing.cjs

@@ -82,6 +82,7 @@ function getEffectFor(entityName, aggregateRelationField, eventEntityName, schem
         result.push({
           aggDoc,
           events,
+          updatedEvents: events.filter(ev => docsById[ev.id]),
           oldAggDoc: existingAggregatesById[aggDoc.id]
         });
       }
@@ -93,6 +94,7 @@ function getEffectFor(entityName, aggregateRelationField, eventEntityName, schem
       }, result.map(v => ({
         doc: v.aggDoc,
         events: v.events,
+        updatedEvents: v.updatedEvents,
         oldDoc: v.oldAggDoc
       })), ctx);
       return result;
@@ -102,6 +104,7 @@ function getEffectFor(entityName, aggregateRelationField, eventEntityName, schem
       const hookItems = beforePutResult.map(v => ({
         doc: v.aggDoc,
         events: v.events,
+        updatedEvents: v.updatedEvents,
         oldDoc: v.oldAggDoc
       }));
       const aggregateEffectContext = {

package/features/eventSourcing.mjs

@@ -74,19 +74,29 @@ function getEffectFor(entityName, aggregateRelationField, eventEntityName, schem
           if (!context.options.keepNulls)
             cleanUndefinedAndNull(aggDoc);
         }
-        result.push({ aggDoc, events, oldAggDoc: existingAggregatesById[aggDoc.id] });
+        result.push({
+          aggDoc,
+          events,
+          updatedEvents: events.filter((ev) => docsById[ev.id]),
+          oldAggDoc: existingAggregatesById[aggDoc.id]
+        });
       }
       await handlePrecomputed(
         // @ts-expect-error TODO wrong types
         { ...context, typeName: entityName },
-        result.map((v) => ({ doc: v.aggDoc, events: v.events, oldDoc: v.oldAggDoc })),
+        result.map((v) => ({ doc: v.aggDoc, events: v.events, updatedEvents: v.updatedEvents, oldDoc: v.oldAggDoc })),
         ctx
       );
       return result;
     },
     async afterPut(context, docs, beforePutResult, ctx) {
       const aggs = beforePutResult.map((d) => d.aggDoc);
-      const hookItems = beforePutResult.map((v) => ({ doc: v.aggDoc, events: v.events, oldDoc: v.oldAggDoc }));
+      const hookItems = beforePutResult.map((v) => ({
+        doc: v.aggDoc,
+        events: v.events,
+        updatedEvents: v.updatedEvents,
+        oldDoc: v.oldAggDoc
+      }));
       const aggregateEffectContext = { ...context, typeName: entityName, handle: schema[entityName].handle };
       await beforePut(hookItems, ctx, aggregateEffectContext);
       await context.drivers[entityName].putMany(aggs, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "packageManager": "pnpm@8.6.1",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",