@bsv/wallet-toolbox 1.1.6 → 1.1.8

package/src/storage/schema/entities/__tests/TxLabelMapTests.test.ts

@@ -1,11 +1,16 @@
-import { TxLabelMap } from '../../../../../src/storage/schema/entities/TxLabelMap'
-import { table, sdk, entity } from '../../../../../src'
+import { EntityTxLabelMap } from '../../../../../src/storage/schema/entities/TxLabelMap'
+import {
+  createSyncMap,
+  sdk,
+  SyncMap,
+  TableTxLabelMap
+} from '../../../../../src'
 import {
   TestUtilsWalletStorage as _tu,
   TestWalletNoSetup
 } from '../../../../../test/utils/TestUtilsWalletStorage'
-import { Transaction } from '../../../../../src/storage/schema/entities/Transaction'
-import { TxLabel } from '../../../../../src/storage/schema/entities/TxLabel'
+import { EntityTransaction } from '../../../../../src/storage/schema/entities/Transaction'
+import { EntityTxLabel } from '../../../../../src/storage/schema/entities/TxLabel'
 
 describe('TxLabelMap Class Tests', () => {
   jest.setTimeout(99999999) // Extend timeout for database operations
@@ -37,7 +42,7 @@ describe('TxLabelMap Class Tests', () => {
 
   // Test: Constructor with default values
   test('1_creates_instance_with_default_values', () => {
-    const txLabelMap = new TxLabelMap()
+    const txLabelMap = new EntityTxLabelMap()
 
     const now = new Date()
     expect(txLabelMap.transactionId).toBe(0)
@@ -52,14 +57,14 @@ describe('TxLabelMap Class Tests', () => {
   // Test: Constructor with provided API object
   test('2_creates_instance_with_provided_api_object', () => {
     const now = new Date()
-    const apiObject: table.TxLabelMap = {
+    const apiObject: TableTxLabelMap = {
       transactionId: 123,
       txLabelId: 456,
       created_at: now,
       updated_at: now,
       isDeleted: true
     }
-    const txLabelMap = new TxLabelMap(apiObject)
+    const txLabelMap = new EntityTxLabelMap(apiObject)
 
     expect(txLabelMap.transactionId).toBe(123)
     expect(txLabelMap.txLabelId).toBe(456)
@@ -70,7 +75,7 @@ describe('TxLabelMap Class Tests', () => {
 
   // Test: Getters and setters
   test('3_getters_and_setters_work_correctly', () => {
-    const txLabelMap = new TxLabelMap()
+    const txLabelMap = new EntityTxLabelMap()
 
     const now = new Date()
     txLabelMap.transactionId = 1001
@@ -88,13 +93,13 @@ describe('TxLabelMap Class Tests', () => {
 
   // Test: `updateApi` does nothing
   test('4_updateApi_does_nothing', () => {
-    const txLabelMap = new TxLabelMap()
+    const txLabelMap = new EntityTxLabelMap()
     expect(() => txLabelMap.updateApi()).not.toThrow() // Method does nothing, so no errors should occur
   })
 
   // Test: `id` getter throws an error
   test('5_get_id_throws_error', () => {
-    const txLabelMap = new TxLabelMap()
+    const txLabelMap = new EntityTxLabelMap()
     expect(() => txLabelMap.id).toThrow(sdk.WERR_INVALID_OPERATION) // Entity has no "id"
   })
 
@@ -105,7 +110,7 @@ describe('TxLabelMap Class Tests', () => {
       txLabel: { idMap: { 456: 456 } }
     }
 
-    const txLabelMap = new TxLabelMap({
+    const txLabelMap = new EntityTxLabelMap({
       transactionId: 123,
       txLabelId: 456,
       isDeleted: false,
@@ -119,7 +124,7 @@ describe('TxLabelMap Class Tests', () => {
       isDeleted: false
     }
 
-    const result = txLabelMap.equals(other as table.TxLabelMap, syncMap)
+    const result = txLabelMap.equals(other as TableTxLabelMap, syncMap)
     expect(result).toBe(true)
   })
 
@@ -138,10 +143,10 @@ describe('TxLabelMap Class Tests', () => {
       txLabelId: 456
     }
 
-    const result = await TxLabelMap.mergeFind(
+    const result = await EntityTxLabelMap.mergeFind(
       storage,
       1,
-      ei as table.TxLabelMap,
+      ei as TableTxLabelMap,
       syncMap
     )
     expect(result.found).toBe(true)
@@ -159,7 +164,7 @@ describe('TxLabelMap Class Tests', () => {
       txLabel: { idMap: { 456: 888 } }
     }
 
-    const txLabelMap = new TxLabelMap({
+    const txLabelMap = new EntityTxLabelMap({
       transactionId: 123,
       txLabelId: 456,
       created_at: new Date(2022, 1, 1),
@@ -183,7 +188,7 @@ describe('TxLabelMap Class Tests', () => {
       updateTxLabelMap: jest.fn()
     }
 
-    const txLabelMap = new TxLabelMap({
+    const txLabelMap = new EntityTxLabelMap({
       transactionId: 123,
       txLabelId: 456,
       created_at: new Date(2022, 1, 1),
@@ -191,7 +196,7 @@ describe('TxLabelMap Class Tests', () => {
       isDeleted: false
     })
 
-    const ei: table.TxLabelMap = {
+    const ei: TableTxLabelMap = {
       transactionId: 123,
       txLabelId: 456,
       isDeleted: true,
@@ -223,13 +228,13 @@ describe('TxLabelMap Class Tests', () => {
 
   // Test: `entityName` getter
   test('10_entityName_returns_correct_value', () => {
-    const txLabelMap = new TxLabelMap()
-    expect(txLabelMap.entityName).toBe('TxLabelMap') // Ensure entityName returns the correct string
+    const txLabelMap = new EntityTxLabelMap()
+    expect(txLabelMap.entityName).toBe('txLabelMap') // Ensure entityName returns the correct string
   })
 
   // Test: `entityTable` getter
   test('11_entityTable_returns_correct_value', () => {
-    const txLabelMap = new TxLabelMap()
+    const txLabelMap = new EntityTxLabelMap()
     expect(txLabelMap.entityTable).toBe('tx_labels_map') // Ensure entityTable returns the correct table name
   })
 
@@ -238,7 +243,7 @@ describe('TxLabelMap Class Tests', () => {
     const ctx2 = ctxs2[0]
 
     // Insert necessary foreign key references into the first database
-    const tx1 = new Transaction({
+    const tx1 = new EntityTransaction({
       transactionId: 405,
       userId: 1,
       txid: 'txid1',
@@ -258,7 +263,7 @@ describe('TxLabelMap Class Tests', () => {
     await ctx1.activeStorage.insertTransaction(tx1.toApi())
 
     // Insert necessary foreign key references into the second database
-    const tx2 = new Transaction({
+    const tx2 = new EntityTransaction({
       transactionId: 406,
       userId: 1,
       txid: 'txid1',
@@ -278,7 +283,7 @@ describe('TxLabelMap Class Tests', () => {
     await ctx2.activeStorage.insertTransaction(tx2.toApi())
 
     // Insert a TxLabel into the first database
-    const txLabel1 = new TxLabel({
+    const txLabel1 = new EntityTxLabel({
       txLabelId: 306,
       userId: 1,
       label: 'Label B',
@@ -290,7 +295,7 @@ describe('TxLabelMap Class Tests', () => {
     await ctx1.activeStorage.insertTxLabel(txLabel1.toApi())
 
     // Insert a matching TxLabel into the second database
-    const txLabel2 = new TxLabel({
+    const txLabel2 = new EntityTxLabel({
       txLabelId: 307,
       userId: 1,
       label: 'Label B',
@@ -302,7 +307,7 @@ describe('TxLabelMap Class Tests', () => {
     await ctx2.activeStorage.insertTxLabel(txLabel2.toApi())
 
     // Insert a TxLabelMap into the first database
-    const txLabelMap1 = new TxLabelMap({
+    const txLabelMap1 = new EntityTxLabelMap({
       transactionId: 405,
       txLabelId: 306,
       isDeleted: false,
@@ -313,7 +318,7 @@ describe('TxLabelMap Class Tests', () => {
     await ctx1.activeStorage.insertTxLabelMap(txLabelMap1.toApi())
 
     // Insert a matching TxLabelMap into the second database
-    const txLabelMap2 = new TxLabelMap({
+    const txLabelMap2 = new EntityTxLabelMap({
       transactionId: 406, // Different transaction ID mapped in syncMap
       txLabelId: 307, // Different label ID mapped in syncMap
       isDeleted: false,
@@ -323,81 +328,11 @@ describe('TxLabelMap Class Tests', () => {
 
     await ctx2.activeStorage.insertTxLabelMap(txLabelMap2.toApi())
 
-    // Create a valid SyncMap
-    const syncMap: entity.SyncMap = {
-      transaction: {
-        idMap: { 406: 405 },
-        entityName: 'Transaction',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      txLabel: {
-        idMap: { 307: 306 },
-        entityName: 'TxLabel',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      provenTx: {
-        idMap: {},
-        entityName: 'ProvenTx',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputBasket: {
-        idMap: {},
-        entityName: 'OutputBasket',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTxReq: {
-        idMap: {},
-        entityName: 'ProvenTxReq',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabelMap: {
-        idMap: {},
-        entityName: 'TxLabelMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      output: {
-        idMap: {},
-        entityName: 'Output',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTag: {
-        idMap: {},
-        entityName: 'OutputTag',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTagMap: {
-        idMap: {},
-        entityName: 'OutputTagMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificate: {
-        idMap: {},
-        entityName: 'Certificate',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificateField: {
-        idMap: {},
-        entityName: 'CertificateField',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      commission: {
-        idMap: {},
-        entityName: 'Commission',
-        maxUpdated_at: undefined,
-        count: 0
-      }
-    }
+    const syncMap = createSyncMap()
+    syncMap.transaction.idMap = { 406: 405 }
+    syncMap.transaction.count = 1
+    syncMap.txLabel.idMap = { 307: 306 }
+    syncMap.txLabel.count = 1
 
     // Verify the entities match
     expect(txLabelMap1.equals(txLabelMap2.toApi(), syncMap)).toBe(true)
@@ -409,7 +344,7 @@ describe('TxLabelMap Class Tests', () => {
     const ctx2 = ctxs2[0]
 
     // Insert a TxLabelMap into the first database
-    const txLabelMap1 = new TxLabelMap({
+    const txLabelMap1 = new EntityTxLabelMap({
       transactionId: 103,
       txLabelId: 1,
       isDeleted: false,
@@ -420,7 +355,7 @@ describe('TxLabelMap Class Tests', () => {
     await ctx1.activeStorage.insertTxLabelMap(txLabelMap1.toApi())
 
     // Insert a non-matching TxLabelMap into the second database
-    const txLabelMap2 = new TxLabelMap({
+    const txLabelMap2 = new EntityTxLabelMap({
       transactionId: 104, // Different transaction ID not mapped in syncMap
       txLabelId: 1, // Different label ID not mapped in syncMap
       isDeleted: true, // Different isDeleted value
@@ -430,81 +365,13 @@ describe('TxLabelMap Class Tests', () => {
 
     await ctx2.activeStorage.insertTxLabelMap(txLabelMap2.toApi())
 
-    // Create a valid SyncMap
-    const syncMap: entity.SyncMap = {
-      transaction: {
-        idMap: { [txLabelMap1.transactionId]: txLabelMap2.transactionId },
-        entityName: 'Transaction',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      txLabel: {
-        idMap: { [txLabelMap1.txLabelId]: txLabelMap2.txLabelId },
-        entityName: 'TxLabel',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      provenTx: {
-        idMap: {},
-        entityName: 'ProvenTx',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputBasket: {
-        idMap: {},
-        entityName: 'OutputBasket',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTxReq: {
-        idMap: {},
-        entityName: 'ProvenTxReq',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabelMap: {
-        idMap: {},
-        entityName: 'TxLabelMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      output: {
-        idMap: {},
-        entityName: 'Output',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTag: {
-        idMap: {},
-        entityName: 'OutputTag',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTagMap: {
-        idMap: {},
-        entityName: 'OutputTagMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificate: {
-        idMap: {},
-        entityName: 'Certificate',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificateField: {
-        idMap: {},
-        entityName: 'CertificateField',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      commission: {
-        idMap: {},
-        entityName: 'Commission',
-        maxUpdated_at: undefined,
-        count: 0
-      }
+    const syncMap = createSyncMap()
+    syncMap.transaction.idMap = {
+      [txLabelMap1.transactionId]: txLabelMap2.transactionId
     }
+    syncMap.transaction.count = 1
+    syncMap.txLabel.idMap = { [txLabelMap1.txLabelId]: txLabelMap2.txLabelId }
+    syncMap.txLabel.count = 1
 
     // Verify the entities do not match
     expect(txLabelMap1.equals(txLabelMap2.toApi(), syncMap)).toBe(false)

package/src/storage/schema/entities/__tests/TxLabelTests.test.ts

@@ -1,5 +1,5 @@
-import { TxLabel } from '../../../../../src/storage/schema/entities/TxLabel'
-import { entity, table, sdk } from '../../../../../src'
+import { EntityTxLabel } from '../../../../../src/storage/schema/entities/TxLabel'
+import { createSyncMap, sdk, SyncMap, TableTxLabel } from '../../../../../src'
 import {
   TestUtilsWalletStorage as _tu,
   TestWalletNoSetup
@@ -35,7 +35,7 @@ describe('TxLabel Class Tests', () => {
 
   // Test: Default constructor behavior
   test('1_creates_txLabel_with_default_values', () => {
-    const txLabel = new TxLabel()
+    const txLabel = new EntityTxLabel()
 
     // Default values
     expect(txLabel.txLabelId).toBe(0)
@@ -50,7 +50,7 @@ describe('TxLabel Class Tests', () => {
   // Test: Constructor with provided API object
   test('2_creates_txLabel_with_provided_api_object', () => {
     const now = new Date()
-    const apiObject: table.TxLabel = {
+    const apiObject: TableTxLabel = {
       txLabelId: 42,
       label: 'Test Label',
       userId: 101,
@@ -58,7 +58,7 @@ describe('TxLabel Class Tests', () => {
       created_at: now,
       updated_at: now
     }
-    const txLabel = new TxLabel(apiObject)
+    const txLabel = new EntityTxLabel(apiObject)
 
     // Verify all properties match the API object
     expect(txLabel.txLabelId).toBe(42)
@@ -71,7 +71,7 @@ describe('TxLabel Class Tests', () => {
 
   // Test: Getters and setters behavior
   test('3_getters_and_setters_work_correctly', () => {
-    const txLabel = new TxLabel()
+    const txLabel = new EntityTxLabel()
 
     const now = new Date()
     txLabel.txLabelId = 1
@@ -83,7 +83,7 @@ describe('TxLabel Class Tests', () => {
     txLabel.id = 2
 
     expect(txLabel.id).toBe(2)
-    expect(txLabel.entityName).toBe('entity.TxLabel')
+    expect(txLabel.entityName).toBe('txLabel')
     expect(txLabel.entityTable).toBe('tx_labels')
     expect(txLabel.txLabelId).toBe(2)
     expect(txLabel.label).toBe('New Label')
@@ -96,7 +96,7 @@ describe('TxLabel Class Tests', () => {
   // Test: mergeExisting does not update TxLabel when `ei.updated_at` is older
   test('5_mergeExisting_does_not_update_txLabel_when_ei_updated_at_is_older', async () => {
     for (const { activeStorage } of ctxs) {
-      const txLabel = new TxLabel({
+      const txLabel = new EntityTxLabel({
         txLabelId: 302,
         label: 'Original Label',
         userId: 1,
@@ -107,7 +107,7 @@ describe('TxLabel Class Tests', () => {
 
       await activeStorage.insertTxLabel(txLabel.toApi())
 
-      const olderEi: table.TxLabel = {
+      const olderEi: TableTxLabel = {
         txLabelId: 302,
         label: 'Outdated Label',
         userId: 1,
@@ -137,7 +137,7 @@ describe('TxLabel Class Tests', () => {
     const ctx2 = ctxs2[0]
 
     // Insert a TxLabel into the first database
-    const txLabel1 = new TxLabel({
+    const txLabel1 = new EntityTxLabel({
       txLabelId: 303,
       userId: 1,
       label: 'Test Label',
@@ -149,7 +149,7 @@ describe('TxLabel Class Tests', () => {
     await ctx1.activeStorage.insertTxLabel(txLabel1.toApi())
 
     // Insert a matching TxLabel into the second database
-    const txLabel2 = new TxLabel({
+    const txLabel2 = new EntityTxLabel({
       txLabelId: 304,
       userId: 1, // Different userId to simulate syncMap usage
       label: 'Test Label',
@@ -160,81 +160,9 @@ describe('TxLabel Class Tests', () => {
 
     await ctx2.activeStorage.insertTxLabel(txLabel2.toApi())
 
-    // Create a valid SyncMap
-    const syncMap: entity.SyncMap = {
-      txLabel: {
-        idMap: { [txLabel2.userId]: txLabel1.userId },
-        entityName: 'TxLabel',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      transaction: {
-        idMap: {},
-        entityName: 'Transaction',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTx: {
-        idMap: {},
-        entityName: 'ProvenTx',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputBasket: {
-        idMap: {},
-        entityName: 'OutputBasket',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTxReq: {
-        idMap: {},
-        entityName: 'ProvenTxReq',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabelMap: {
-        idMap: {},
-        entityName: 'TxLabelMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      output: {
-        idMap: {},
-        entityName: 'Output',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTag: {
-        idMap: {},
-        entityName: 'OutputTag',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTagMap: {
-        idMap: {},
-        entityName: 'OutputTagMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificate: {
-        idMap: {},
-        entityName: 'Certificate',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificateField: {
-        idMap: {},
-        entityName: 'CertificateField',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      commission: {
-        idMap: {},
-        entityName: 'Commission',
-        maxUpdated_at: undefined,
-        count: 0
-      }
-    }
+    const syncMap = createSyncMap()
+    syncMap.txLabel.idMap = { [txLabel2.userId]: txLabel1.userId }
+    syncMap.txLabel.count = 1
 
     // Verify the entities match
     expect(txLabel1.equals(txLabel2.toApi(), syncMap)).toBe(true)
@@ -245,7 +173,7 @@ describe('TxLabel Class Tests', () => {
     const ctx2 = ctxs2[0]
 
     // Insert a TxLabel into the first database
-    const txLabel1 = new TxLabel({
+    const txLabel1 = new EntityTxLabel({
       txLabelId: 305,
       userId: 1,
       label: 'Label A',
@@ -257,7 +185,7 @@ describe('TxLabel Class Tests', () => {
     await ctx1.activeStorage.insertTxLabel(txLabel1.toApi())
 
     // Insert a non-matching TxLabel into the second database
-    const txLabel2 = new TxLabel({
+    const txLabel2 = new EntityTxLabel({
       txLabelId: 306, // Different txLabelId
       userId: 1, // Different userId
       label: 'Label B', // Different label
@@ -268,81 +196,9 @@ describe('TxLabel Class Tests', () => {
 
     await ctx2.activeStorage.insertTxLabel(txLabel2.toApi())
 
-    // Create a valid SyncMap
-    const syncMap: entity.SyncMap = {
-      txLabel: {
-        idMap: { [txLabel2.userId]: txLabel1.userId },
-        entityName: 'TxLabel',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      transaction: {
-        idMap: {},
-        entityName: 'Transaction',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTx: {
-        idMap: {},
-        entityName: 'ProvenTx',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputBasket: {
-        idMap: {},
-        entityName: 'OutputBasket',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTxReq: {
-        idMap: {},
-        entityName: 'ProvenTxReq',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabelMap: {
-        idMap: {},
-        entityName: 'TxLabelMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      output: {
-        idMap: {},
-        entityName: 'Output',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTag: {
-        idMap: {},
-        entityName: 'OutputTag',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTagMap: {
-        idMap: {},
-        entityName: 'OutputTagMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificate: {
-        idMap: {},
-        entityName: 'Certificate',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificateField: {
-        idMap: {},
-        entityName: 'CertificateField',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      commission: {
-        idMap: {},
-        entityName: 'Commission',
-        maxUpdated_at: undefined,
-        count: 0
-      }
-    }
+    const syncMap = createSyncMap()
+    syncMap.txLabel.idMap = { [txLabel2.userId]: txLabel1.userId }
+    syncMap.txLabel.count = 1
 
     // Verify the entities do not match
     expect(txLabel1.equals(txLabel2.toApi(), syncMap)).toBe(false)