@bsv/wallet-toolbox 1.1.6 → 1.1.8

package/src/storage/schema/entities/TxLabel.ts

@@ -2,16 +2,15 @@
 import { MerklePath } from '@bsv/sdk'
 import {
   arraysEqual,
-  entity,
   sdk,
-  table,
+  TableTxLabel,
   verifyId,
   verifyOneOrNone
 } from '../../../index.client'
-import { EntityBase } from '.'
+import { EntityBase, EntityStorage, SyncMap } from '.'
 
-export class TxLabel extends EntityBase<table.TxLabel> {
-  constructor(api?: table.TxLabel) {
+export class EntityTxLabel extends EntityBase<TableTxLabel> {
+  constructor(api?: TableTxLabel) {
     const now = new Date()
     super(
       api || {
@@ -73,13 +72,13 @@ export class TxLabel extends EntityBase<table.TxLabel> {
     this.api.txLabelId = v
   }
   override get entityName(): string {
-    return 'entity.TxLabel'
+    return 'txLabel'
   }
   override get entityTable(): string {
     return 'tx_labels'
   }
 
-  override equals(ei: table.TxLabel, syncMap?: entity.SyncMap): boolean {
+  override equals(ei: TableTxLabel, syncMap?: SyncMap): boolean {
     const eo = this.toApi()
     if (eo.label != ei.label || eo.isDeleted != ei.isDeleted) return false
     if (!syncMap) {
@@ -89,26 +88,26 @@ export class TxLabel extends EntityBase<table.TxLabel> {
   }
 
   static async mergeFind(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    ei: table.TxLabel,
-    syncMap: entity.SyncMap,
+    ei: TableTxLabel,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
-  ): Promise<{ found: boolean; eo: entity.TxLabel; eiId: number }> {
+  ): Promise<{ found: boolean; eo: EntityTxLabel; eiId: number }> {
     const ef = verifyOneOrNone(
       await storage.findTxLabels({ partial: { label: ei.label, userId }, trx })
     )
     return {
       found: !!ef,
-      eo: new entity.TxLabel(ef || { ...ei }),
+      eo: new EntityTxLabel(ef || { ...ei }),
       eiId: verifyId(ei.txLabelId)
     }
   }
 
   override async mergeNew(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    syncMap: entity.SyncMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<void> {
     this.userId = userId
@@ -117,10 +116,10 @@ export class TxLabel extends EntityBase<table.TxLabel> {
   }
 
   override async mergeExisting(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     since: Date | undefined,
-    ei: table.TxLabel,
-    syncMap: entity.SyncMap,
+    ei: TableTxLabel,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<boolean> {
     let wasMerged = false

package/src/storage/schema/entities/TxLabelMap.ts

@@ -2,16 +2,15 @@
 import { MerklePath } from '@bsv/sdk'
 import {
   arraysEqual,
-  entity,
   sdk,
-  table,
+  TableTxLabelMap,
   verifyId,
   verifyOneOrNone
 } from '../../../index.client'
-import { EntityBase } from '.'
+import { EntityBase, EntityStorage, SyncMap } from '.'
 
-export class TxLabelMap extends EntityBase<table.TxLabelMap> {
-  constructor(api?: table.TxLabelMap) {
+export class EntityTxLabelMap extends EntityBase<TableTxLabelMap> {
+  constructor(api?: TableTxLabelMap) {
     const now = new Date()
     super(
       api || {
@@ -63,16 +62,13 @@ export class TxLabelMap extends EntityBase<table.TxLabelMap> {
     throw new sdk.WERR_INVALID_OPERATION('entity has no "id" value')
   } // entity does not have its own id.
   override get entityName(): string {
-    return 'TxLabelMap'
+    return 'txLabelMap'
   }
   override get entityTable(): string {
     return 'tx_labels_map'
   }
 
-  override equals(
-    ei: table.TxLabelMap,
-    syncMap?: entity.SyncMap | undefined
-  ): boolean {
+  override equals(ei: TableTxLabelMap, syncMap?: SyncMap | undefined): boolean {
     const eo = this.toApi()
 
     if (
@@ -92,12 +88,12 @@ export class TxLabelMap extends EntityBase<table.TxLabelMap> {
   }
 
   static async mergeFind(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    ei: table.TxLabelMap,
-    syncMap: entity.SyncMap,
+    ei: TableTxLabelMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
-  ): Promise<{ found: boolean; eo: entity.TxLabelMap; eiId: number }> {
+  ): Promise<{ found: boolean; eo: EntityTxLabelMap; eiId: number }> {
     const transactionId = syncMap.transaction.idMap[ei.transactionId]
     const txLabelId = syncMap.txLabel.idMap[ei.txLabelId]
     const ef = verifyOneOrNone(
@@ -108,15 +104,15 @@ export class TxLabelMap extends EntityBase<table.TxLabelMap> {
     )
     return {
       found: !!ef,
-      eo: new entity.TxLabelMap(ef || { ...ei }),
+      eo: new EntityTxLabelMap(ef || { ...ei }),
       eiId: -1
     }
   }
 
   override async mergeNew(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    syncMap: entity.SyncMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<void> {
     this.transactionId = syncMap.transaction.idMap[this.transactionId]
@@ -125,10 +121,10 @@ export class TxLabelMap extends EntityBase<table.TxLabelMap> {
   }
 
   override async mergeExisting(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     since: Date | undefined,
-    ei: table.TxLabelMap,
-    syncMap: entity.SyncMap,
+    ei: TableTxLabelMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<boolean> {
     let wasMerged = false

package/src/storage/schema/entities/User.ts

@@ -2,16 +2,15 @@
 import { MerklePath } from '@bsv/sdk'
 import {
   arraysEqual,
-  entity,
   sdk,
-  table,
+  TableUser,
   verifyId,
   verifyOneOrNone
 } from '../../../index.client'
-import { EntityBase } from '.'
+import { EntityBase, EntityStorage, SyncMap } from '.'
 
-export class User extends EntityBase<table.User> {
-  constructor(api?: table.User) {
+export class EntityUser extends EntityBase<TableUser> {
+  constructor(api?: TableUser) {
     const now = new Date()
     super(
       api || {
@@ -66,16 +65,13 @@ export class User extends EntityBase<table.User> {
     this.api.userId = v
   }
   override get entityName(): string {
-    return 'User'
+    return 'user'
   }
   override get entityTable(): string {
     return 'users'
   }
 
-  override equals(
-    ei: table.User,
-    syncMap?: entity.SyncMap | undefined
-  ): boolean {
+  override equals(ei: TableUser, syncMap?: SyncMap | undefined): boolean {
     const eo = this.toApi()
     if (
       eo.identityKey != ei.identityKey ||
@@ -88,11 +84,11 @@ export class User extends EntityBase<table.User> {
     return true
   }
   static async mergeFind(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    ei: table.User,
+    ei: TableUser,
     trx?: sdk.TrxToken
-  ): Promise<{ found: boolean; eo: entity.User; eiId: number }> {
+  ): Promise<{ found: boolean; eo: EntityUser; eiId: number }> {
     const ef = verifyOneOrNone(
       await storage.findUsers({ partial: { identityKey: ei.identityKey }, trx })
     )
@@ -100,14 +96,14 @@ export class User extends EntityBase<table.User> {
       throw new sdk.WERR_INTERNAL('logic error, userIds don not match.')
     return {
       found: !!ef,
-      eo: new entity.User(ef || { ...ei }),
+      eo: new EntityUser(ef || { ...ei }),
       eiId: verifyId(ei.userId)
     }
   }
   override async mergeNew(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    syncMap: entity.SyncMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<void> {
     throw new sdk.WERR_INTERNAL(
@@ -115,10 +111,10 @@ export class User extends EntityBase<table.User> {
     )
   }
   override async mergeExisting(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     since: Date | undefined,
-    ei: table.User,
-    syncMap?: entity.SyncMap,
+    ei: TableUser,
+    syncMap?: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<boolean> {
     let wasMerged = false