@xyo-network/api 2.20.45 → 2.21.0

package/src/Archivist/Payload/Api.ts

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/sdk-js'
-import { XyoPayload } from '@xyo-network/core'
+import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/core'
 
 import { XyoApiConfig } from '../../models'
 import { XyoApiSimple } from '../../Simple'
@@ -18,12 +18,10 @@ export interface XyoPayloadStats {
   count: number
 }
 
-export class XyoArchivistPayloadApi<T extends XyoPayload = XyoPayload, C extends WithArchive<XyoApiConfig> = WithArchive<XyoApiConfig>> extends XyoApiSimple<
-  T[],
-  T[],
-  XyoPayloadFindFilter,
-  C
-> {
+export class XyoArchivistPayloadApi<
+  T extends XyoPayloadWithPartialMeta = XyoPayloadWithPartialMeta,
+  C extends WithArchive<XyoApiConfig> = WithArchive<XyoApiConfig>
+> extends XyoApiSimple<T[], T[], XyoPayloadFindFilter, C> {
   public get schema(): XyoArchivistArchivePayloadSchemaApi {
     return new XyoArchivistArchivePayloadSchemaApi({
       ...this.config,

package/src/Archivist/Payload/Schema/Api.spec.ts

@@ -1,4 +1,4 @@
-import { XyoAccount, XyoBoundWitnessBuilder, XyoPayload } from '@xyo-network/core'
+import { XyoAccount, XyoBoundWitnessBuilder, XyoSchemaPayload } from '@xyo-network/core'
 
 import { XyoApiConfig } from '../../../models'
 import { XyoArchivistApi } from '../../Api'
@@ -8,7 +8,7 @@ const config: XyoApiConfig = {
   apiDomain: process.env.API_DOMAIN || 'http://localhost:8080',
 }
 
-const payload: XyoPayload = {
+const payload: XyoSchemaPayload = {
   definition: {
     $id: '',
     $schema: 'http://json-schema.org/draft-07/schema#',

package/src/Diviner/LocationDiviner/Witnesses/CurrentLocationWitness.ts

@@ -1,9 +1,9 @@
-import { WithXyoPayloadMeta, XyoPayloadBody } from '@xyo-network/core'
+import { XyoPayload, XyoPayloadMeta } from '@xyo-network/core'
 
 export const currentLocationWitnessPayloadSchema = 'co.coinapp.currentlocationwitness'
 export type CurrentLocationWitnessPayloadSchema = 'co.coinapp.currentlocationwitness'
 
-export interface CurrentLocationWitnessPayloadBody extends XyoPayloadBody {
+export interface CurrentLocationWitnessPayloadBody extends XyoPayload {
   altitudeMeters: number
   directionDegrees: number
   latitude: number
@@ -13,4 +13,4 @@ export interface CurrentLocationWitnessPayloadBody extends XyoPayloadBody {
   speedKph: number
 }
 
-export declare type CurrentLocationWitnessPayload = WithXyoPayloadMeta<CurrentLocationWitnessPayloadBody>
+export declare type CurrentLocationWitnessPayload = XyoPayloadMeta<CurrentLocationWitnessPayloadBody>

package/src/Diviner/LocationDiviner/Witnesses/LocationWitness.ts

@@ -1,4 +1,4 @@
-import { WithXyoPayloadMeta, XyoPayloadBody } from '@xyo-network/core'
+import { XyoPayload, XyoPayloadMeta } from '@xyo-network/core'
 
 export const locationWitnessPayloadSchema: LocationWitnessPayloadSchema = 'network.xyo.location'
 export type LocationWitnessPayloadSchema = 'network.xyo.location'
@@ -17,9 +17,9 @@ export interface CurrentLocation {
   timestamp: number
 }
 
-export interface LocationWitnessPayloadBody extends XyoPayloadBody {
+export interface LocationWitnessPayloadBody extends XyoPayload {
   currentLocation: CurrentLocation
   schema: LocationWitnessPayloadSchema
 }
 
-export type LocationWitnessPayload = WithXyoPayloadMeta<LocationWitnessPayloadBody>
+export type LocationWitnessPayload = XyoPayloadMeta<LocationWitnessPayloadBody>

package/src/Test/testBoundWitness.ts

@@ -1,6 +1,6 @@
-import { XyoBoundWitness } from '@xyo-network/core'
+import { XyoBoundWitnessWithMeta } from '@xyo-network/core'
 
-const testBoundWitness: XyoBoundWitness = {
+const testBoundWitness: XyoBoundWitnessWithMeta = {
   _archive: 'temp',
   _client: 'js',
   _hash: 'b0ffb9ebf872dc316b7be48327256c5316f7cb84d7c706861b18b86af1942dea',

package/src/Test/testPayload.ts

@@ -1,7 +1,7 @@
-import { XyoPayload } from '@xyo-network/core'
+import { StringKeyObject, XyoPayloadWithMeta } from '@xyo-network/core'
 
 const testSchema = 'network.xyo.test'
-const testPayload: XyoPayload = {
+const testPayload: XyoPayloadWithMeta<StringKeyObject> = {
   _archive: 'test',
   _hash: '20e14207f952a09f767ff614a648546c037fe524ace0bfe55db31f818aff1f1c',
   _timestamp: 1609459255555,