fix exchangeId override for Quote, Order, OrderStatus, and Close

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tbd54566975/tbdex",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "type": "module",
   "description": "Library that includes type definitions for tbdex messages",
   "license": "Apache-2.0",

js/src/message-kinds/close.ts

@@ -13,13 +13,11 @@ export class Close extends Message<'close'> {
   readonly validNext = new Set<MessageKind>([])
 
   static create(opts: CreateCloseOptions) {
-    const id = Message.generateId('close')
     const metadata: MessageMetadata<'close'> = {
       ...opts.metadata,
-      kind       : 'close',
-      id         : id,
-      exchangeId : id,
-      createdAt  : new Date().toISOString()
+      kind      : 'close',
+      id        : Message.generateId('close'),
+      createdAt : new Date().toISOString()
     }
 
     const message = { metadata, data: opts.data }

js/src/message-kinds/order-status.ts

@@ -15,13 +15,11 @@ export class OrderStatus extends Message<'orderstatus'> {
   readonly validNext = new Set<MessageKind>([])
 
   static create(opts: CreateOrderStatusOptions) {
-    const id = Message.generateId('orderstatus')
     const metadata: MessageMetadata<'orderstatus'> = {
       ...opts.metadata,
-      kind       : 'orderstatus',
-      id         : id,
-      exchangeId : id,
-      createdAt  : new Date().toISOString()
+      kind      : 'orderstatus',
+      id        : Message.generateId('orderstatus'),
+      createdAt : new Date().toISOString()
     }
 
     const message = { metadata, data: opts.data }

js/src/message-kinds/order.ts

@@ -12,13 +12,11 @@ export class Order extends Message<'order'> {
   readonly validNext = new Set<MessageKind>(['orderstatus'])
 
   static create(opts: CreateOrderOptions) {
-    const id = Message.generateId('order')
     const metadata: MessageMetadata<'order'> = {
       ...opts.metadata,
-      kind       : 'order',
-      id         : id,
-      exchangeId : id,
-      createdAt  : new Date().toISOString()
+      kind      : 'order',
+      id        : Message.generateId('order'),
+      createdAt : new Date().toISOString()
     }
 
     const message = { metadata, data: {} }

js/src/message-kinds/quote.ts

@@ -15,13 +15,11 @@ export class Quote extends Message<'quote'> {
   readonly validNext = new Set<MessageKind>(['order', 'close'])
 
   static create(opts: CreateQuoteOptions) {
-    const id = Message.generateId('quote')
     const metadata: MessageMetadata<'quote'> = {
       ...opts.metadata,
-      kind       : 'quote',
-      id         : id,
-      exchangeId : id,
-      createdAt  : new Date().toISOString()
+      kind      : 'quote',
+      id        : Message.generateId('quote'),
+      createdAt : new Date().toISOString()
     }
 
     const message = { metadata, data: opts.data }

js/src/message-kinds/rfq.ts

@@ -5,7 +5,7 @@ import { PEXv2 } from '@sphereon/pex'
 
 const pex = new PEXv2()
 
-/** options passed to {@link Quote.create} */
+/** options passed to {@link Rfq.create} */
 export type CreateRfqOptions = {
   data: MessageKindModel<'rfq'>
   metadata: Omit<MessageMetadata<'rfq'>, 'id' |'kind' | 'createdAt' | 'exchangeId'>

js/tests/close.spec.ts

@@ -0,0 +1,16 @@
+import { Close, Message } from '../src/main.js'
+import { expect } from 'chai'
+
+describe('Close', () => {
+  describe('create', () => {
+    it('sets exchangeId to whatever is passed in', () => {
+      const exchangeId = Message.generateId('rfq')
+      const closeMessage = Close.create({
+        metadata : { from: 'did:ex:alice', to: 'did:ex:pfi', exchangeId },
+        data     : { reason: 'life is hard' }
+      })
+
+      expect(closeMessage.exchangeId).to.equal(exchangeId)
+    })
+  })
+})