@xyo-network/payload-builder 2.90.2 → 2.90.3

package/src/BuilderBase.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { Hash } from '@xylabs/hex'
-import { AnyObject, JsonObject } from '@xylabs/object'
+import { AnyObject, isJsonObject, JsonObject } from '@xylabs/object'
 import { Promisable } from '@xylabs/promise'
 import { deepOmitPrefixedFields, removeEmptyFields } from '@xyo-network/hash'
 import { Payload, Schema, WithMeta } from '@xyo-network/payload-model'
@@ -24,6 +24,7 @@ export class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extend
     schema: string,
     fields?: Omit<T, 'schema' | '$hash' | '$meta'>,
   ): Promisable<Omit<T, '$hash' | '$meta'>> {
+    assertEx(fields === undefined || isJsonObject(fields), 'Fields must be JsonObject')
     return deepOmitPrefixedFields(deepOmitPrefixedFields({ schema, ...fields }, '$'), '_') as T
   }
 
@@ -35,6 +36,7 @@ export class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extend
     timestamp?: number,
   ): Promise<WithMeta<T>> {
     const dataFields = await this.dataHashableFields<T>(schema, fields)
+    assertEx($meta === undefined || isJsonObject($meta), '$meta must be JsonObject')
     return deepOmitPrefixedFields<WithMeta<T>>(
       {
         ...dataFields,
@@ -46,6 +48,14 @@ export class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extend
     )
   }
 
+  protected static metaFields(dataHash: Hash, otherMeta?: JsonObject): Promisable<JsonObject> {
+    const meta: JsonObject = { ...otherMeta }
+
+    meta.timestamp = meta.timestamp ?? Date.now()
+
+    return meta
+  }
+
   $meta(meta?: JsonObject) {
     this._$meta = meta ?? (this._fields as WithMeta<T>).$meta
     return this
@@ -78,4 +88,8 @@ export class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extend
   schema(value: Schema) {
     this._schema = value
   }
+
+  protected async metaFields(dataHash: Hash): Promise<JsonObject> {
+    return await PayloadBuilderBase.metaFields(dataHash, this._$meta)
+  }
 }