@monorise/core 3.2.0 → 4.1.0

package/dist/index.d.ts

@@ -74,8 +74,9 @@ declare class Entity$1<T extends Entity$2> extends Item$1 {
     data: Partial<EntitySchemaMap[T]>;
     private _createdAt?;
     private _updatedAt?;
+    private _expiresAt?;
     fullId: string;
-    constructor(entityType: T, entityId?: string | undefined, data?: Partial<EntitySchemaMap[T]>, _createdAt?: Date | undefined, _updatedAt?: Date | undefined);
+    constructor(entityType: T, entityId?: string | undefined, data?: Partial<EntitySchemaMap[T]>, _createdAt?: Date | undefined, _updatedAt?: Date | undefined, _expiresAt?: Date | undefined);
     static fromItem<T extends Entity$2>(item?: Record<string, AttributeValue>): Entity$1<T>;
     get pk(): string;
     get sk(): string;
@@ -83,6 +84,7 @@ declare class Entity$1<T extends Entity$2> extends Item$1 {
     get emailKeys(): Record<string, AttributeValue>;
     get createdAt(): string | undefined;
     get updatedAt(): string | undefined;
+    get expiresAt(): number | undefined;
     toItem(): Record<string, AttributeValue>;
     toJSON(): Record<string, unknown>;
 }
@@ -92,6 +94,13 @@ declare class EntityRepository extends Repository {
     private readonly dynamodbClient;
     private readonly EmailAuthEnabledEntities;
     constructor(EntityConfig: Record<Entity$2, ReturnType<typeof createEntityConfig>>, TABLE_NAME: string, dynamodbClient: DynamoDB, EmailAuthEnabledEntities: Entity$2[]);
+    /**
+     * Computes the `expiresAt` Date for an entity via its `ttl.processor` config, if any.
+     * When `mergeWithExisting` is true, the processor receives the previous entity's data
+     * merged with `incomingData` (falls back to `incomingData` alone if no previous entity
+     * exists yet, eg. an upsert-as-create).
+     */
+    private computeExpiresAt;
     listEntities<T extends Entity$2>({ entityType, limit, // if this is not set, it will return all items
     between, options, }: {
         entityType: T;
@@ -123,7 +132,7 @@ declare class EntityRepository extends Repository {
         mutualId?: string;
     }): Promise<Entity$1<T>>;
     upsertEntity<T extends Entity$2>(entityType: T, entityId: string, payload: Partial<EntitySchemaMap[T]>): Promise<Entity$1<T>>;
-    updateEntityTransactItems<T extends Entity$2>(entity: Entity$1<T>, updateParams: UpdateItemCommandInput, previousUniqueFieldValues: Record<string, string>, previousEntity: Entity$1<T>): TransactWriteItem[];
+    updateEntityTransactItems<T extends Entity$2>(entity: Entity$1<T>, updateParams: UpdateItemCommandInput, previousUniqueFieldValues: Record<string, string>, previousEntity: Entity$1<T>, expiresAt?: Date): TransactWriteItem[];
     updateEntity<T extends Entity$2>(entityType: T, entityId: string, toUpdate: {
         data: Partial<EntitySchemaMap[T]>;
         updatedAt?: string;
@@ -182,7 +191,7 @@ declare class Mutual<B extends Entity$2, T extends Entity$2, M extends Record<st
     get createdAt(): string | undefined;
     get updatedAt(): string | undefined;
     get mutualUpdatedAt(): string | undefined;
-    get expiresAt(): string | undefined;
+    get expiresAt(): number | undefined;
     toItem(): Record<string, AttributeValue>;
     toReversedItem(): Record<string, AttributeValue>;
     toJSON(): Record<string, unknown>;
@@ -393,13 +402,14 @@ var Item = class {
 
 // data/Entity.ts
 var Entity = class _Entity extends Item {
-  constructor(entityType, entityId, data = {}, _createdAt, _updatedAt) {
+  constructor(entityType, entityId, data = {}, _createdAt, _updatedAt, _expiresAt) {
     super();
     this.entityType = entityType;
     this.entityId = entityId;
     this.data = data;
     this._createdAt = _createdAt;
     this._updatedAt = _updatedAt;
+    this._expiresAt = _expiresAt;
     this.fullId = this.pk;
   }
   static fromItem(item) {
@@ -414,7 +424,9 @@ var Entity = class _Entity extends Item {
       parsedItem.entityId,
       parsedItem.data,
       parsedItem.createdAt ? new Date(parsedItem.createdAt) : void 0,
-      parsedItem.updatedAt ? new Date(parsedItem.updatedAt) : void 0
+      parsedItem.updatedAt ? new Date(parsedItem.updatedAt) : void 0,
+      // expiresAt is stored as epoch seconds (DynamoDB TTL requires type N)
+      parsedItem.expiresAt ? new Date(parsedItem.expiresAt * 1e3) : void 0
     );
   }
   get pk() {
@@ -444,6 +456,9 @@ var Entity = class _Entity extends Item {
     var _a;
     return (_a = this._updatedAt) == null ? void 0 : _a.toISOString();
   }
+  get expiresAt() {
+    return this._expiresAt ? Math.floor(this._expiresAt.getTime() / 1e3) : void 0;
+  }
   toItem() {
     return __spreadValues(__spreadValues({}, marshall(this.toJSON(), { removeUndefinedValues: true })), this.keys());
   }
@@ -453,7 +468,8 @@ var Entity = class _Entity extends Item {
       entityId: this.entityId,
       data: this.data,
       createdAt: this.createdAt,
-      updatedAt: this.updatedAt
+      updatedAt: this.updatedAt,
+      expiresAt: this.expiresAt
     };
   }
 };

package/dist/index.js

@@ -311,13 +311,14 @@ var Repository = class {
 
 // data/Entity.ts
 var Entity = class _Entity extends Item {
-  constructor(entityType, entityId, data = {}, _createdAt, _updatedAt) {
+  constructor(entityType, entityId, data = {}, _createdAt, _updatedAt, _expiresAt) {
     super();
     this.entityType = entityType;
     this.entityId = entityId;
     this.data = data;
     this._createdAt = _createdAt;
     this._updatedAt = _updatedAt;
+    this._expiresAt = _expiresAt;
     this.fullId = this.pk;
   }
   static fromItem(item) {
@@ -332,7 +333,9 @@ var Entity = class _Entity extends Item {
       parsedItem.entityId,
       parsedItem.data,
       parsedItem.createdAt ? new Date(parsedItem.createdAt) : void 0,
-      parsedItem.updatedAt ? new Date(parsedItem.updatedAt) : void 0
+      parsedItem.updatedAt ? new Date(parsedItem.updatedAt) : void 0,
+      // expiresAt is stored as epoch seconds (DynamoDB TTL requires type N)
+      parsedItem.expiresAt ? new Date(parsedItem.expiresAt * 1e3) : void 0
     );
   }
   get pk() {
@@ -362,6 +365,9 @@ var Entity = class _Entity extends Item {
     var _a;
     return (_a = this._updatedAt) == null ? void 0 : _a.toISOString();
   }
+  get expiresAt() {
+    return this._expiresAt ? Math.floor(this._expiresAt.getTime() / 1e3) : void 0;
+  }
   toItem() {
     return __spreadValues(__spreadValues({}, marshall2(this.toJSON(), { removeUndefinedValues: true })), this.keys());
   }
@@ -371,7 +377,8 @@ var Entity = class _Entity extends Item {
       entityId: this.entityId,
       data: this.data,
       createdAt: this.createdAt,
-      updatedAt: this.updatedAt
+      updatedAt: this.updatedAt,
+      expiresAt: this.expiresAt
     };
   }
 };
@@ -383,6 +390,46 @@ var EntityRepository = class extends Repository {
     this.dynamodbClient = dynamodbClient;
     this.EmailAuthEnabledEntities = EmailAuthEnabledEntities;
   }
+  /**
+   * Computes the `expiresAt` Date for an entity via its `ttl.processor` config, if any.
+   * When `mergeWithExisting` is true, the processor receives the previous entity's data
+   * merged with `incomingData` (falls back to `incomingData` alone if no previous entity
+   * exists yet, eg. an upsert-as-create).
+   */
+  computeExpiresAt(entityType, entityId, incomingData, updatedAt, opts) {
+    return __async(this, null, function* () {
+      var _a, _b;
+      const processor = (_b = (_a = this.EntityConfig[entityType]) == null ? void 0 : _a.ttl) == null ? void 0 : _b.processor;
+      if (!processor) return void 0;
+      let data = incomingData;
+      let createdAt = updatedAt;
+      if (opts.mergeWithExisting) {
+        let previous = opts.previousEntity;
+        if (!previous) {
+          try {
+            previous = yield this.getEntity(entityType, entityId);
+          } catch (err) {
+            if (!(err instanceof StandardError && err.code === StandardErrorCode.ENTITY_IS_UNDEFINED)) {
+              throw err;
+            }
+          }
+        }
+        if (previous) {
+          data = __spreadValues(__spreadValues({}, previous.data), incomingData);
+          createdAt = previous.createdAt || updatedAt;
+        }
+      }
+      const result = processor({
+        entityId,
+        entityType,
+        data,
+        createdAt,
+        updatedAt
+      });
+      if (result === void 0) return void 0;
+      return result instanceof Date ? result : new Date(result * 1e3);
+    });
+  }
   listEntities(_0) {
     return __async(this, arguments, function* ({
       entityType,
@@ -606,12 +653,21 @@ var EntityRepository = class extends Repository {
     return __async(this, null, function* () {
       var _a, _b;
       const currentDatetime = (_a = opts == null ? void 0 : opts.createAndUpdateDatetime) != null ? _a : /* @__PURE__ */ new Date();
+      const finalEntityId = entityId || ulid();
+      const expiresAt = yield this.computeExpiresAt(
+        entityType,
+        finalEntityId,
+        entityPayload,
+        currentDatetime.toISOString(),
+        { mergeWithExisting: false }
+      );
       const entity = new Entity(
         entityType,
-        entityId || ulid(),
+        finalEntityId,
         entityPayload,
         currentDatetime,
-        currentDatetime
+        currentDatetime,
+        expiresAt
       );
       const uniqueFields = this.EntityConfig[entityType].uniqueFields || [];
       const uniqueFieldValues = {};
@@ -656,26 +712,47 @@ var EntityRepository = class extends Repository {
   upsertEntity(entityType, entityId, payload) {
     return __async(this, null, function* () {
       const currentDatetime = (/* @__PURE__ */ new Date()).toISOString();
-      const toUpdateExpressions = this.toUpdate({
+      const expiresAtForUpdate = yield this.computeExpiresAt(
+        entityType,
+        entityId,
+        payload,
+        currentDatetime,
+        { mergeWithExisting: true }
+      );
+      const toUpdateExpressions = this.toUpdate(__spreadValues({
         entityType,
         entityId,
         data: payload,
         updatedAt: currentDatetime
-      });
+      }, expiresAtForUpdate && {
+        expiresAt: Math.floor(expiresAtForUpdate.getTime() / 1e3)
+      }));
       const params = {
         TableName: this.TABLE_NAME,
         ReturnValues: "ALL_NEW",
+        ConditionExpression: "attribute_exists(PK)",
         Key: new Entity(entityType, entityId).keys(),
         UpdateExpression: toUpdateExpressions.UpdateExpression,
         ExpressionAttributeNames: __spreadValues({}, toUpdateExpressions.ExpressionAttributeNames),
         ExpressionAttributeValues: __spreadValues({}, toUpdateExpressions.ExpressionAttributeValues)
       };
-      const resp = yield this.dynamodbClient.updateItem(params);
-      const updatedEntity = Entity.fromItem(resp.Attributes);
-      return updatedEntity;
+      try {
+        const resp = yield this.dynamodbClient.updateItem(params);
+        return Entity.fromItem(resp.Attributes);
+      } catch (err) {
+        if (!(err instanceof ConditionalCheckFailedException)) {
+          throw err;
+        }
+      }
+      return this.createEntity(
+        entityType,
+        payload,
+        entityId,
+        { createAndUpdateDatetime: new Date(currentDatetime) }
+      );
     });
   }
-  updateEntityTransactItems(entity, updateParams, previousUniqueFieldValues, previousEntity) {
+  updateEntityTransactItems(entity, updateParams, previousUniqueFieldValues, previousEntity, expiresAt) {
     const transactItems = [
       {
         Update: __spreadProps(__spreadValues({}, updateParams), {
@@ -698,7 +775,7 @@ var EntityRepository = class extends Repository {
           Put: {
             TableName: this.TABLE_NAME,
             ConditionExpression: "attribute_not_exists(PK)",
-            Item: __spreadProps(__spreadValues({}, entity.toItem()), {
+            Item: __spreadValues(__spreadProps(__spreadValues({}, entity.toItem()), {
               data: {
                 M: __spreadValues(__spreadValues({}, previousEntity.toItem().data.M), entity.toItem().data.M)
               },
@@ -712,6 +789,10 @@ var EntityRepository = class extends Repository {
                 S: previousEntity.createdAt || entity.createdAt || (/* @__PURE__ */ new Date()).toISOString()
               },
               updatedAt: { S: entity.updatedAt || (/* @__PURE__ */ new Date()).toISOString() }
+            }), expiresAt && {
+              expiresAt: {
+                N: String(Math.floor(expiresAt.getTime() / 1e3))
+              }
             })
           }
         }
@@ -721,11 +802,42 @@ var EntityRepository = class extends Repository {
   }
   updateEntity(entityType, entityId, toUpdate, opts) {
     return __async(this, null, function* () {
+      var _a, _b;
       try {
         const currentDatetime = (/* @__PURE__ */ new Date()).toISOString();
-        const toUpdateExpressions = this.toUpdate(__spreadValues({
+        const uniqueFields = this.EntityConfig[entityType].uniqueFields || [];
+        const hasUniqueFields = Object.keys(toUpdate.data).some(
+          (field) => uniqueFields.includes(field)
+        );
+        const hasTtlProcessor = !!((_b = (_a = this.EntityConfig[entityType]) == null ? void 0 : _a.ttl) == null ? void 0 : _b.processor);
+        let previousEntity;
+        if (hasUniqueFields || hasTtlProcessor) {
+          try {
+            previousEntity = yield this.getEntity(entityType, entityId);
+          } catch (err) {
+            if (err instanceof StandardError && err.code === StandardErrorCode.ENTITY_IS_UNDEFINED) {
+              throw new StandardError(
+                StandardErrorCode.ENTITY_NOT_FOUND,
+                "Entity not found",
+                err,
+                { entityId, toUpdate }
+              );
+            }
+            throw err;
+          }
+        }
+        const expiresAtDate = yield this.computeExpiresAt(
+          entityType,
+          entityId,
+          toUpdate.data,
+          currentDatetime,
+          { mergeWithExisting: true, previousEntity }
+        );
+        const toUpdateExpressions = this.toUpdate(__spreadValues(__spreadValues({
           updatedAt: currentDatetime
-        }, toUpdate));
+        }, toUpdate), expiresAtDate && {
+          expiresAt: Math.floor(expiresAtDate.getTime() / 1e3)
+        }));
         const params = {
           TableName: this.TABLE_NAME,
           ReturnValues: "ALL_NEW",
@@ -736,15 +848,9 @@ var EntityRepository = class extends Repository {
           ExpressionAttributeValues: __spreadValues(__spreadValues({}, toUpdateExpressions.ExpressionAttributeValues), opts == null ? void 0 : opts.ExpressionAttributeValues)
         };
         const entity = new Entity(entityType, entityId, toUpdate.data);
-        const uniqueFields = this.EntityConfig[entityType].uniqueFields || [];
-        const hasUniqueFields = Object.keys(toUpdate.data).some(
-          (field) => uniqueFields.includes(field)
-        );
         let updatedUniqueFields = [];
         let previousUniqueFieldValues = {};
-        let previousEntity;
-        if (hasUniqueFields) {
-          previousEntity = yield this.getEntity(entityType, entityId);
+        if (hasUniqueFields && previousEntity) {
           updatedUniqueFields = uniqueFields.filter(
             (field) => toUpdate.data[field] !== void 0 && toUpdate.data[field] !== previousEntity.data[field]
           );
@@ -763,11 +869,13 @@ var EntityRepository = class extends Repository {
             }
           }
           if (updatedUniqueFields.length > 0) {
+            const effectiveExpiresAtDate = expiresAtDate != null ? expiresAtDate : previousEntity.expiresAt !== void 0 ? new Date(previousEntity.expiresAt * 1e3) : void 0;
             const TransactItems = this.updateEntityTransactItems(
               entity,
               params,
               previousUniqueFieldValues,
-              previousEntity
+              previousEntity,
+              effectiveExpiresAtDate
             );
             try {
               yield this.dynamodbClient.transactWriteItems({ TransactItems });
@@ -802,7 +910,14 @@ var EntityRepository = class extends Repository {
               }
               throw err;
             }
-            return yield this.getEntity(entityType, entityId);
+            return new Entity(
+              entityType,
+              entityId,
+              __spreadValues(__spreadValues({}, previousEntity.data), toUpdate.data),
+              previousEntity.createdAt ? new Date(previousEntity.createdAt) : void 0,
+              new Date(currentDatetime),
+              effectiveExpiresAtDate
+            );
           }
         }
         const resp = yield this.dynamodbClient.updateItem(params);
@@ -967,7 +1082,8 @@ var Mutual = class _Mutual {
       parsedItem.createdAt ? new Date(parsedItem.createdAt) : void 0,
       parsedItem.updatedAt ? new Date(parsedItem.updatedAt) : void 0,
       parsedItem.mutualUpdatedAt ? new Date(parsedItem.mutualUpdatedAt) : void 0,
-      parsedItem.expiresAt ? new Date(parsedItem.expiresAt) : void 0
+      // expiresAt is stored as epoch seconds (DynamoDB TTL requires type N)
+      parsedItem.expiresAt ? new Date(parsedItem.expiresAt * 1e3) : void 0
     );
   }
   mainKeys() {
@@ -1010,8 +1126,7 @@ var Mutual = class _Mutual {
     return (_a = this._mutualUpdatedAt) == null ? void 0 : _a.toISOString();
   }
   get expiresAt() {
-    var _a;
-    return (_a = this._expiresAt) == null ? void 0 : _a.toISOString();
+    return this._expiresAt ? Math.floor(this._expiresAt.getTime() / 1e3) : void 0;
   }
   toItem() {
     return __spreadValues(__spreadValues({}, marshall3(this.toJSON(), { removeUndefinedValues: true })), this.mainKeys());