@xyo-network/payload 2.33.11 → 2.33.13

package/dist/esm/Huri/Huri.d.ts

@@ -25,13 +25,7 @@ export declare class Huri<T extends XyoPayload = XyoPayload> {
     static fetch<T extends XyoPayload = XyoPayload>(huri: Huri): Promise<T | undefined>;
     private static parseProtocol;
     private static parsePath;
-    static isHuri(value: unknown): Huri<{
-        schema: string;
-    } & {
-        previousHash?: string | undefined;
-        sources?: string[] | undefined;
-        timestamp?: number | undefined;
-    } & {
+    static isHuri(value: unknown): Huri<import("../models").SchemaFields & import("../models").PayloadFields & {
         schema: string;
     }> | undefined;
 }

package/dist/esm/Huri/Huri.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../../src/Huri/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,oBAAY,iBAAiB,GAAG,OAAO,GAAG,SAAS,CAAA;AAEnD,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;AAY/E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAClE,OAAO,EAAE,CAAC,CAAA;IACV,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC1C,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IAEnB,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,WAAW,GAAG,IAAI,EAAE,EAAE,YAAY,EAAE,GAAE,WAAgB;IAoBxE,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;IAerB,IAAW,IAAI,WAad;IAEM,QAAQ;IAIF,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;WAI/B,KAAK,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIzF,OAAO,CAAC,MAAM,CAAC,aAAa;IAY5B,OAAO,CAAC,MAAM,CAAC,SAAS;WAWV,MAAM,CAAC,KAAK,EAAE,OAAO;;;;;;;;;CAMpC"}
+{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../../src/Huri/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,oBAAY,iBAAiB,GAAG,OAAO,GAAG,SAAS,CAAA;AAEnD,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;AAY/E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAClE,OAAO,EAAE,CAAC,CAAA;IACV,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC1C,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IAEnB,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,WAAW,GAAG,IAAI,EAAE,EAAE,YAAY,EAAE,GAAE,WAAgB;IAoBxE,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;IAerB,IAAW,IAAI,WAad;IAEM,QAAQ;IAIF,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;WAI/B,KAAK,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIzF,OAAO,CAAC,MAAM,CAAC,aAAa;IAY5B,OAAO,CAAC,MAAM,CAAC,SAAS;WAWV,MAAM,CAAC,KAAK,EAAE,OAAO;;;CAMpC"}

package/dist/esm/Wrapper/Wrapper.d.ts

@@ -8,13 +8,7 @@ export declare class PayloadWrapper<T extends XyoPayload = XyoPayload> extends H
     get errors(): Error[];
     /** @deprecated - meta fields not supported by client anymore */
     get meta(): T;
-    static load(address: XyoDataLike | Huri): Promise<PayloadWrapper<{
-        schema: string;
-    } & {
-        previousHash?: string | undefined;
-        sources?: string[] | undefined;
-        timestamp?: number | undefined;
-    } & {
+    static load(address: XyoDataLike | Huri): Promise<PayloadWrapper<import("../models").SchemaFields & import("../models").PayloadFields & {
         schema: string;
     }> | undefined>;
 }

package/dist/esm/Wrapper/Wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../../src/Wrapper/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE3G,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAGtC,qBAAa,cAAc,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAC9E,IAAW,OAAO,MAEjB;IAED,IAAW,IAAI,MAEd;IAED,IAAI,KAAK,YAER;IAED,IAAI,MAAM,YAET;IAED,gEAAgE;IAChE,IAAW,IAAI,MAEd;WAEmB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;;;;;;;;;CAMrD;AAED,6CAA6C;AAC7C,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../../src/Wrapper/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE3G,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAGtC,qBAAa,cAAc,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAC9E,IAAW,OAAO,MAEjB;IAED,IAAW,IAAI,MAEd;IAED,IAAI,KAAK,YAER;IAED,IAAI,MAAM,YAET;IAED,gEAAgE;IAChE,IAAW,IAAI,MAEd;WAEmB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;;;CAMrD;AAED,6CAA6C;AAC7C,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;CAAG"}

package/dist/esm/isXyoPayloadOfSchemaType.d.ts

@@ -1,11 +1,5 @@
 import { XyoPayload } from './models';
-export declare const isXyoPayloadOfSchemaType: <T extends {
-    schema: string;
-} & {
-    previousHash?: string | undefined;
-    sources?: string[] | undefined;
-    timestamp?: number | undefined;
-} & {
+export declare const isXyoPayloadOfSchemaType: <T extends import("./models").SchemaFields & import("./models").PayloadFields & {
     schema: string;
 }>(schema: string) => (x: XyoPayload) => x is T;
 //# sourceMappingURL=isXyoPayloadOfSchemaType.d.ts.map

package/dist/esm/isXyoPayloadOfSchemaType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isXyoPayloadOfSchemaType.d.ts","sourceRoot":"","sources":["../../src/isXyoPayloadOfSchemaType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,eAAO,MAAM,wBAAwB;;;;;;;;WAAkC,MAAM,SAChE,UAAU,WACtB,CAAA"}
+{"version":3,"file":"isXyoPayloadOfSchemaType.d.ts","sourceRoot":"","sources":["../../src/isXyoPayloadOfSchemaType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,eAAO,MAAM,wBAAwB;;WAAkC,MAAM,SAChE,UAAU,WACtB,CAAA"}

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

@@ -4,18 +4,19 @@ export declare type WithTimestamp<T extends EmptyObject = EmptyObject> = T & {
 };
 export declare type XyoPayloadSchema = 'network.xyo.payload';
 export declare const XyoPayloadSchema: XyoPayloadSchema;
-declare type XyoPayloadBaseWithSchema<T extends EmptyObject = EmptyObject> = {
+export declare type SchemaFields = {
     schema: string;
-} & T;
-declare type XyoPayloadBase<T extends EmptyObject = EmptyObject> = XyoPayloadBaseWithSchema<{
+};
+export declare type WithSchema<T extends EmptyObject | void = void> = T extends EmptyObject ? SchemaFields & T : SchemaFields;
+export declare type PayloadFields = {
     previousHash?: string;
     sources?: string[];
     timestamp?: number;
-} & T>;
-export declare type XyoPayload<T extends void | EmptyObject | XyoPayloadBaseWithSchema = void, S extends string = T extends XyoPayloadBaseWithSchema ? T['schema'] : string> = T extends XyoPayloadBaseWithSchema ? XyoPayloadBase<T> : T extends EmptyObject ? /* Type sent is an Object */ XyoPayloadBase & T & {
+};
+export declare type WithPayload<T extends EmptyObject | void = void> = WithSchema<T extends EmptyObject ? PayloadFields & T : PayloadFields>;
+export declare type XyoPayload<T extends void | EmptyObject | WithSchema = void, S extends string = T extends WithSchema ? T['schema'] : string> = T extends WithSchema ? WithPayload<T> : T extends EmptyObject ? WithPayload<T & {
     schema: S;
-} : /* Type sent is void */ XyoPayloadBase & {
+}> : WithPayload<{
     schema: S;
-};
-export {};
+}>;
 //# sourceMappingURL=Base.d.ts.map

package/dist/esm/models/Base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Base.d.ts","sourceRoot":"","sources":["../../../src/models/Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,oBAAY,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1F,oBAAY,gBAAgB,GAAG,qBAAqB,CAAA;AACpD,eAAO,MAAM,gBAAgB,EAAE,gBAAwC,CAAA;AAEvE,aAAK,wBAAwB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI;IACnE,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,CAAC,CAAA;AAEL,aAAK,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,wBAAwB,CACjF;IACE,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,GAAG,CAAC,CACN,CAAA;AAED,oBAAY,UAAU,CACpB,CAAC,SAAS,IAAI,GAAG,WAAW,GAAG,wBAAwB,GAAG,IAAI,EAC9D,CAAC,SAAS,MAAM,GAAG,CAAC,SAAS,wBAAwB,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,IAC1E,CAAC,SAAS,wBAAwB,GAElC,cAAc,CAAC,CAAC,CAAC,GACjB,CAAC,SAAS,WAAW,GAErB,AADA,4BAA4B,CAC5B,cAAc,GAAG,CAAC,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,GAElC,AADA,uBAAuB,CACvB,cAAc,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAA"}
+{"version":3,"file":"Base.d.ts","sourceRoot":"","sources":["../../../src/models/Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,oBAAY,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1F,oBAAY,gBAAgB,GAAG,qBAAqB,CAAA;AACpD,eAAO,MAAM,gBAAgB,EAAE,gBAAwC,CAAA;AAEvE,oBAAY,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,oBAAY,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,WAAW,GAAG,YAAY,GAAG,CAAC,GAAG,YAAY,CAAA;AAErH,oBAAY,aAAa,GAAG;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,oBAAY,WAAW,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,IAAI,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,aAAa,GAAG,CAAC,GAAG,aAAa,CAAC,CAAA;AAEpI,oBAAY,UAAU,CACpB,CAAC,SAAS,IAAI,GAAG,WAAW,GAAG,UAAU,GAAG,IAAI,EAChD,CAAC,SAAS,MAAM,GAAG,CAAC,SAAS,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,IAC5D,CAAC,SAAS,UAAU,GAEpB,WAAW,CAAC,CAAC,CAAC,GACd,CAAC,SAAS,WAAW,GAErB,WAAW,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,GAE9B,WAAW,CAAC;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAA"}

package/package.json

@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.6.7",
-    "@xyo-network/account": "^2.33.11",
-    "@xyo-network/core": "^2.33.11",
+    "@xyo-network/account": "^2.33.13",
+    "@xyo-network/core": "^2.33.13",
     "axios": "^0.27.2",
     "tslib": "^2.4.0"
   },
@@ -49,5 +49,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.11"
+  "version": "2.33.13"
 }

package/src/models/Base.ts

@@ -5,26 +5,28 @@ export type WithTimestamp<T extends EmptyObject = EmptyObject> = T & { timestamp
 export type XyoPayloadSchema = 'network.xyo.payload'
 export const XyoPayloadSchema: XyoPayloadSchema = 'network.xyo.payload'
 
-type XyoPayloadBaseWithSchema<T extends EmptyObject = EmptyObject> = {
+export type SchemaFields = {
   schema: string
-} & T
+}
 
-type XyoPayloadBase<T extends EmptyObject = EmptyObject> = XyoPayloadBaseWithSchema<
-  {
-    previousHash?: string
-    sources?: string[]
-    timestamp?: number
-  } & T
->
+export type WithSchema<T extends EmptyObject | void = void> = T extends EmptyObject ? SchemaFields & T : SchemaFields
+
+export type PayloadFields = {
+  previousHash?: string
+  sources?: string[]
+  timestamp?: number
+}
+
+export type WithPayload<T extends EmptyObject | void = void> = WithSchema<T extends EmptyObject ? PayloadFields & T : PayloadFields>
 
 export type XyoPayload<
-  T extends void | EmptyObject | XyoPayloadBaseWithSchema = void,
-  S extends string = T extends XyoPayloadBaseWithSchema ? T['schema'] : string,
-> = T extends XyoPayloadBaseWithSchema
+  T extends void | EmptyObject | WithSchema = void,
+  S extends string = T extends WithSchema ? T['schema'] : string,
+> = T extends WithSchema
   ? /* Type sent is an XyoPayload */
-    XyoPayloadBase<T>
+    WithPayload<T>
   : T extends EmptyObject
   ? /* Type sent is an Object */
-    XyoPayloadBase & T & { schema: S }
+    WithPayload<T & { schema: S }>
   : /* Type sent is void */
-    XyoPayloadBase & { schema: S }
+    WithPayload<{ schema: S }>