@xyo-network/boundwitness 2.21.23 → 2.22.0

package/dist/cjs/Builder/Builder.d.ts

@@ -1,12 +1,11 @@
 import { XyoAccount } from '@xyo-network/account';
-import { WithAdditional } from '@xyo-network/core';
 import { XyoPayload } from '@xyo-network/payload';
 import { XyoBoundWitness, XyoBoundWitnessWithMeta } from '../models';
 export interface XyoBoundWitnessBuilderConfig {
     /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */
     readonly inlinePayloads?: boolean;
 }
-export declare class XyoBoundWitnessBuilder {
+export declare class XyoBoundWitnessBuilder<TBoundWitness extends XyoBoundWitness = XyoBoundWitness, TPayload extends XyoPayload = XyoPayload> {
     readonly config: XyoBoundWitnessBuilderConfig;
     private _accounts;
     private _payload_schemas;
@@ -14,10 +13,10 @@ export declare class XyoBoundWitnessBuilder {
     constructor(config?: XyoBoundWitnessBuilderConfig);
     private get _payload_hashes();
     witness(account: XyoAccount): this;
-    payloads<T extends XyoPayload = WithAdditional<XyoPayload>>(payloads: (T | null)[]): this;
-    payload<T extends XyoPayload = WithAdditional<XyoPayload>>(payload?: T): this;
-    hashableFields(): XyoBoundWitness;
+    payloads(payloads: (TPayload | null)[]): this;
+    payload(payload?: TPayload): this;
+    hashableFields(): TBoundWitness;
     private signatures;
     private inlinePayloads;
-    build(): XyoBoundWitnessWithMeta;
+    build(): XyoBoundWitnessWithMeta<TBoundWitness, TPayload>;
 }

package/dist/cjs/Builder/Builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AACvC,2CAAyC;AAEzC,4CAAyD;AAUzD,MAAa,sBAAsB;IAKjC,YAA4B,SAAuC,EAAE,cAAc,EAAE,KAAK,EAAE;QAAhE,WAAM,GAAN,MAAM,CAA0D;QAJpF,cAAS,GAAiB,EAAE,CAAA;QAC5B,qBAAgB,GAAa,EAAE,CAAA;QAC/B,cAAS,GAAe,EAAE,CAAA;IAE6D,CAAC;IAEhG,IAAY,eAAe;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACpC,OAAO,IAAI,gBAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;QACpC,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,OAAO,CAAC,OAAmB;;QAChC,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,QAAQ,CAAC,QAA6B;QAC3C,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,OAAO,KAAK,IAAI,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,OAAO,CAAC,OAAkB;QAC/B,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAA,iBAAQ,EAAC,IAAA,iBAAU,EAAW,OAAO,CAAC,CAAC,CAAC,CAAA;SAC7D;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,cAAc;QACnB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QAC3E,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,eAAC,OAAA,MAAA,MAAA,OAAO,CAAC,YAAY,0CAAE,GAAG,mCAAI,IAAI,CAAA,EAAA,CAAC,CAAA;QAC1F,OAAO;YACL,SAAS,EAAE,IAAA,iBAAQ,EAAC,SAAS,EAAE,mBAAmB,CAAC;YACnD,cAAc,EAAE,IAAA,iBAAQ,EAAC,IAAI,CAAC,eAAe,EAAE,wBAAwB,CAAC;YACxE,eAAe,EAAE,IAAA,iBAAQ,EAAC,IAAI,CAAC,gBAAgB,EAAE,yBAAyB,CAAC;YAC3E,eAAe;YACf,MAAM,EAAE,0BAA0B;SAClB,CAAA;IACpB,CAAC;IAEO,UAAU,CAAC,KAAa;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9G,CAAC;IAEO,cAAc;QACpB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAW,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YACrD,uCACK,OAAO,KACV,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IACrC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK;QACV,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QAC5C,MAAM,KAAK,GAAG,IAAI,gBAAS,CAAC,cAAc,CAAC,CAAC,IAAI,CAAA;QAEhD,MAAM,GAAG,mCAA0D,cAAc,KAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAA;QACtK,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;YAC9B,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;SACtC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AAtED,wDAsEC"}

package/dist/cjs/isXyoPayloadOfSchemaType.d.ts

@@ -1,2 +1,2 @@
 import { XyoBoundWitness } from './models';
-export declare const isXyoBoundWitnessPayload: (x: import("@xyo-network/payload").XyoPayload<object>) => x is XyoBoundWitness<object>;
+export declare const isXyoBoundWitnessPayload: (x: import("@xyo-network/payload").XyoPayloadBase) => x is XyoBoundWitness<import("@xyo-network/core").EmptyObject>;

package/dist/cjs/models/Meta/XyoBoundWitnessMeta.d.ts

@@ -1,5 +1,5 @@
 import { XyoPayloadMeta, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
-export declare type XyoBoundWitnessMeta<P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = XyoPayloadMeta<{
+export declare type XyoBoundWitnessMetaBase<P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = XyoPayloadMeta<{
     _payloads?: P[];
     _signatures?: string[];
     _source_ip?: string;

package/dist/cjs/models/XyoBoundWitness.d.ts

@@ -1,6 +1,9 @@
+import { EmptyObject } from '@xyo-network/core';
 import { XyoPayloadWithPartialMeta } from '@xyo-network/payload';
 import { XyoBoundWitnessBase } from './Base';
-import { XyoBoundWitnessMeta } from './Meta';
-export declare type XyoBoundWitness<T extends object = object> = T & XyoBoundWitnessBase;
-export declare type XyoBoundWitnessWithMeta<T = unknown, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & XyoBoundWitnessMeta<P> & XyoBoundWitness;
-export declare type XyoBoundWitnessWithPartialMeta<T = unknown, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & Partial<XyoBoundWitnessMeta<P>> & XyoBoundWitness;
+import { XyoBoundWitnessMetaBase } from './Meta';
+export declare type XyoBoundWitness<T extends EmptyObject = EmptyObject> = T & XyoBoundWitnessBase;
+export declare type XyoBoundWitnessMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & XyoBoundWitnessMetaBase<P>;
+export declare type XyoPartialBoundWitnessMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & Partial<XyoBoundWitnessMetaBase<P>>;
+export declare type XyoBoundWitnessWithMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & XyoBoundWitnessMetaBase<P> & XyoBoundWitnessBase;
+export declare type XyoBoundWitnessWithPartialMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & Partial<XyoBoundWitnessMetaBase<P>> & XyoBoundWitnessBase;

package/dist/cjs/models/index.d.ts

@@ -1,5 +1,4 @@
 export * from './Base';
 export * from './Meta';
-export * from './WithXyoBoundWitnessMeta';
 export * from './XyoBoundWitness';
 export * from './XyoBoundWitnessSchema';

package/dist/cjs/models/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./Base"), exports);
 tslib_1.__exportStar(require("./Meta"), exports);
-tslib_1.__exportStar(require("./WithXyoBoundWitnessMeta"), exports);
 tslib_1.__exportStar(require("./XyoBoundWitness"), exports);
 tslib_1.__exportStar(require("./XyoBoundWitnessSchema"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;AAAA,iDAAsB;AACtB,iDAAsB;AACtB,oEAAyC;AACzC,4DAAiC;AACjC,kEAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;AAAA,iDAAsB;AACtB,iDAAsB;AACtB,4DAAiC;AACjC,kEAAuC"}

package/dist/esm/Builder/Builder.d.ts

@@ -1,12 +1,11 @@
 import { XyoAccount } from '@xyo-network/account';
-import { WithAdditional } from '@xyo-network/core';
 import { XyoPayload } from '@xyo-network/payload';
 import { XyoBoundWitness, XyoBoundWitnessWithMeta } from '../models';
 export interface XyoBoundWitnessBuilderConfig {
     /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */
     readonly inlinePayloads?: boolean;
 }
-export declare class XyoBoundWitnessBuilder {
+export declare class XyoBoundWitnessBuilder<TBoundWitness extends XyoBoundWitness = XyoBoundWitness, TPayload extends XyoPayload = XyoPayload> {
     readonly config: XyoBoundWitnessBuilderConfig;
     private _accounts;
     private _payload_schemas;
@@ -14,10 +13,10 @@ export declare class XyoBoundWitnessBuilder {
     constructor(config?: XyoBoundWitnessBuilderConfig);
     private get _payload_hashes();
     witness(account: XyoAccount): this;
-    payloads<T extends XyoPayload = WithAdditional<XyoPayload>>(payloads: (T | null)[]): this;
-    payload<T extends XyoPayload = WithAdditional<XyoPayload>>(payload?: T): this;
-    hashableFields(): XyoBoundWitness;
+    payloads(payloads: (TPayload | null)[]): this;
+    payload(payload?: TPayload): this;
+    hashableFields(): TBoundWitness;
     private signatures;
     private inlinePayloads;
-    build(): XyoBoundWitnessWithMeta;
+    build(): XyoBoundWitnessWithMeta<TBoundWitness, TPayload>;
 }

package/dist/esm/Builder/Builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":"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"}

package/dist/esm/isXyoPayloadOfSchemaType.d.ts

@@ -1,2 +1,2 @@
 import { XyoBoundWitness } from './models';
-export declare const isXyoBoundWitnessPayload: (x: import("@xyo-network/payload").XyoPayload<object>) => x is XyoBoundWitness<object>;
+export declare const isXyoBoundWitnessPayload: (x: import("@xyo-network/payload").XyoPayloadBase) => x is XyoBoundWitness<import("@xyo-network/core").EmptyObject>;

package/dist/esm/models/Meta/XyoBoundWitnessMeta.d.ts

@@ -1,5 +1,5 @@
 import { XyoPayloadMeta, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
-export declare type XyoBoundWitnessMeta<P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = XyoPayloadMeta<{
+export declare type XyoBoundWitnessMetaBase<P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = XyoPayloadMeta<{
     _payloads?: P[];
     _signatures?: string[];
     _source_ip?: string;

package/dist/esm/models/XyoBoundWitness.d.ts

@@ -1,6 +1,9 @@
+import { EmptyObject } from '@xyo-network/core';
 import { XyoPayloadWithPartialMeta } from '@xyo-network/payload';
 import { XyoBoundWitnessBase } from './Base';
-import { XyoBoundWitnessMeta } from './Meta';
-export declare type XyoBoundWitness<T extends object = object> = T & XyoBoundWitnessBase;
-export declare type XyoBoundWitnessWithMeta<T = unknown, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & XyoBoundWitnessMeta<P> & XyoBoundWitness;
-export declare type XyoBoundWitnessWithPartialMeta<T = unknown, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & Partial<XyoBoundWitnessMeta<P>> & XyoBoundWitness;
+import { XyoBoundWitnessMetaBase } from './Meta';
+export declare type XyoBoundWitness<T extends EmptyObject = EmptyObject> = T & XyoBoundWitnessBase;
+export declare type XyoBoundWitnessMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & XyoBoundWitnessMetaBase<P>;
+export declare type XyoPartialBoundWitnessMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & Partial<XyoBoundWitnessMetaBase<P>>;
+export declare type XyoBoundWitnessWithMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & XyoBoundWitnessMetaBase<P> & XyoBoundWitnessBase;
+export declare type XyoBoundWitnessWithPartialMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & Partial<XyoBoundWitnessMetaBase<P>> & XyoBoundWitnessBase;

package/dist/esm/models/index.d.ts

@@ -1,5 +1,4 @@
 export * from './Base';
 export * from './Meta';
-export * from './WithXyoBoundWitnessMeta';
 export * from './XyoBoundWitness';
 export * from './XyoBoundWitnessSchema';

package/dist/esm/models/index.js

@@ -1,6 +1,5 @@
 export * from './Base';
 export * from './Meta';
-export * from './WithXyoBoundWitnessMeta';
 export * from './XyoBoundWitness';
 export * from './XyoBoundWitnessSchema';
 //# sourceMappingURL=index.js.map

package/dist/esm/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,2BAA2B,CAAA;AACzC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}

package/package.json

@@ -10,11 +10,12 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
+    "@xylabs/buffer": "^2.6.2",
     "@xylabs/sdk-js": "^2.6.2",
-    "@xyo-network/account": "^2.21.23",
-    "@xyo-network/core": "^2.21.23",
-    "@xyo-network/payload": "^2.21.23",
-    "@xyo-network/typeof": "^2.21.23",
+    "@xyo-network/account": "^2.22.0",
+    "@xyo-network/core": "^2.22.0",
+    "@xyo-network/payload": "^2.22.0",
+    "@xyo-network/typeof": "^2.22.0",
     "lodash": "^4.17.21",
     "ua-parser-js": "^1.0.2"
   },
@@ -56,6 +57,6 @@
   },
   "sideEffects": true,
   "types": "dist/esm/index.d.ts",
-  "version": "2.21.23",
+  "version": "2.22.0",
   "packageManager": "yarn@3.1.1"
 }

package/src/Builder/Builder.ts

@@ -1,20 +1,20 @@
 import { Buffer } from '@xylabs/buffer'
 import { assertEx } from '@xylabs/sdk-js'
 import { XyoAccount } from '@xyo-network/account'
-import { sortFields, WithAdditional, XyoHasher } from '@xyo-network/core'
+import { sortFields, XyoHasher } from '@xyo-network/core'
 import { XyoPayload } from '@xyo-network/payload'
 
-import { WithXyoBoundWitnessMeta, XyoBoundWitness, XyoBoundWitnessWithMeta } from '../models'
+import { XyoBoundWitness, XyoBoundWitnessWithMeta } from '../models'
 
 export interface XyoBoundWitnessBuilderConfig {
   /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */
   readonly inlinePayloads?: boolean
 }
 
-export class XyoBoundWitnessBuilder {
+export class XyoBoundWitnessBuilder<TBoundWitness extends XyoBoundWitness = XyoBoundWitness, TPayload extends XyoPayload = XyoPayload> {
   private _accounts: XyoAccount[] = []
   private _payload_schemas: string[] = []
-  private _payloads: XyoPayload[] = []
+  private _payloads: TPayload[] = []
 
   constructor(public readonly config: XyoBoundWitnessBuilderConfig = { inlinePayloads: false }) {}
 
@@ -29,7 +29,7 @@ export class XyoBoundWitnessBuilder {
     return this
   }
 
-  public payloads<T extends XyoPayload = WithAdditional<XyoPayload>>(payloads: (T | null)[]) {
+  public payloads(payloads: (TPayload | null)[]) {
     payloads.forEach((payload) => {
       if (payload !== null) {
         this.payload(payload)
@@ -38,15 +38,15 @@ export class XyoBoundWitnessBuilder {
     return this
   }
 
-  public payload<T extends XyoPayload = WithAdditional<XyoPayload>>(payload?: T) {
+  public payload(payload?: TPayload) {
     if (payload) {
       this._payload_schemas.push(payload.schema)
-      this._payloads.push(assertEx(sortFields(payload)))
+      this._payloads.push(assertEx(sortFields<TPayload>(payload)))
     }
     return this
   }
 
-  public hashableFields(): XyoBoundWitness {
+  public hashableFields(): TBoundWitness {
     const addresses = this._accounts.map((account) => account.addressValue.hex)
     const previous_hashes = this._accounts.map((account) => account.previousHash?.hex ?? null)
     return {
@@ -55,7 +55,7 @@ export class XyoBoundWitnessBuilder {
       payload_schemas: assertEx(this._payload_schemas, 'Missing payload_schemas'),
       previous_hashes,
       schema: 'network.xyo.boundwitness',
-    }
+    } as TBoundWitness
   }
 
   private signatures(_hash: string) {
@@ -63,7 +63,7 @@ export class XyoBoundWitnessBuilder {
   }
 
   private inlinePayloads() {
-    return this._payloads.map<XyoPayload>((payload, index) => {
+    return this._payloads.map<TPayload>((payload, index) => {
       return {
         ...payload,
         schema: this._payload_schemas[index],
@@ -71,11 +71,11 @@ export class XyoBoundWitnessBuilder {
     })
   }
 
-  public build(): XyoBoundWitnessWithMeta {
-    const hashableFields = this.hashableFields() as unknown as Record<string, unknown>
+  public build(): XyoBoundWitnessWithMeta<TBoundWitness, TPayload> {
+    const hashableFields = this.hashableFields()
     const _hash = new XyoHasher(hashableFields).hash
 
-    const ret = { ...hashableFields, _client: 'js', _hash, _signatures: this.signatures(_hash), _timestamp: Date.now() } as WithXyoBoundWitnessMeta<XyoBoundWitness>
+    const ret: XyoBoundWitnessWithMeta<TBoundWitness, TPayload> = { ...hashableFields, _client: 'js', _hash, _signatures: this.signatures(_hash), _timestamp: Date.now() }
     if (this.config.inlinePayloads) {
       ret._payloads = this.inlinePayloads()
     }

package/src/models/Meta/XyoBoundWitnessMeta.ts

@@ -1,6 +1,6 @@
 import { XyoPayloadMeta, XyoPayloadWithPartialMeta } from '@xyo-network/payload'
 
-export type XyoBoundWitnessMeta<P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = XyoPayloadMeta<{
+export type XyoBoundWitnessMetaBase<P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = XyoPayloadMeta<{
   _payloads?: P[]
   _signatures?: string[]
   _source_ip?: string

package/src/models/XyoBoundWitness.ts

@@ -1,8 +1,17 @@
+import { EmptyObject } from '@xyo-network/core'
 import { XyoPayloadWithPartialMeta } from '@xyo-network/payload'
 
 import { XyoBoundWitnessBase } from './Base'
-import { XyoBoundWitnessMeta } from './Meta'
+import { XyoBoundWitnessMetaBase } from './Meta'
 
-export type XyoBoundWitness<T extends object = object> = T & XyoBoundWitnessBase
-export type XyoBoundWitnessWithMeta<T = unknown, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & XyoBoundWitnessMeta<P> & XyoBoundWitness
-export type XyoBoundWitnessWithPartialMeta<T = unknown, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & Partial<XyoBoundWitnessMeta<P>> & XyoBoundWitness
+export type XyoBoundWitness<T extends EmptyObject = EmptyObject> = T & XyoBoundWitnessBase
+
+export type XyoBoundWitnessMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T & XyoBoundWitnessMetaBase<P>
+export type XyoPartialBoundWitnessMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T &
+  Partial<XyoBoundWitnessMetaBase<P>>
+export type XyoBoundWitnessWithMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T &
+  XyoBoundWitnessMetaBase<P> &
+  XyoBoundWitnessBase
+export type XyoBoundWitnessWithPartialMeta<T extends EmptyObject = EmptyObject, P extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta> = T &
+  Partial<XyoBoundWitnessMetaBase<P>> &
+  XyoBoundWitnessBase

package/src/models/index.ts

@@ -1,5 +1,4 @@
 export * from './Base'
 export * from './Meta'
-export * from './WithXyoBoundWitnessMeta'
 export * from './XyoBoundWitness'
 export * from './XyoBoundWitnessSchema'

package/dist/cjs/models/WithXyoBoundWitnessMeta.d.ts

@@ -1,4 +0,0 @@
-import { XyoBoundWitnessMeta } from './Meta';
-import { XyoBoundWitness } from './XyoBoundWitness';
-declare type WithXyoBoundWitnessMeta<T extends XyoBoundWitness> = T & XyoBoundWitnessMeta;
-export type { WithXyoBoundWitnessMeta };

package/dist/cjs/models/WithXyoBoundWitnessMeta.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=WithXyoBoundWitnessMeta.js.map

package/dist/cjs/models/WithXyoBoundWitnessMeta.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"WithXyoBoundWitnessMeta.js","sourceRoot":"","sources":["../../../src/models/WithXyoBoundWitnessMeta.ts"],"names":[],"mappings":""}

package/dist/esm/models/WithXyoBoundWitnessMeta.d.ts

@@ -1,4 +0,0 @@
-import { XyoBoundWitnessMeta } from './Meta';
-import { XyoBoundWitness } from './XyoBoundWitness';
-declare type WithXyoBoundWitnessMeta<T extends XyoBoundWitness> = T & XyoBoundWitnessMeta;
-export type { WithXyoBoundWitnessMeta };

package/dist/esm/models/WithXyoBoundWitnessMeta.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=WithXyoBoundWitnessMeta.js.map

package/dist/esm/models/WithXyoBoundWitnessMeta.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"WithXyoBoundWitnessMeta.js","sourceRoot":"","sources":["../../../src/models/WithXyoBoundWitnessMeta.ts"],"names":[],"mappings":""}

package/src/models/WithXyoBoundWitnessMeta.ts

@@ -1,6 +0,0 @@
-import { XyoBoundWitnessMeta } from './Meta'
-import { XyoBoundWitness } from './XyoBoundWitness'
-
-type WithXyoBoundWitnessMeta<T extends XyoBoundWitness> = T & XyoBoundWitnessMeta
-
-export type { WithXyoBoundWitnessMeta }