@xyo-network/payload-builder 2.92.7 → 2.92.8

package/dist/browser/Builder.d.cts

@@ -1,7 +1,7 @@
 import { Hash } from '@xylabs/hex';
 import { AnyObject, JsonObject } from '@xylabs/object';
 import { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model';
-import { PayloadBuilderBase } from './BuilderBase';
+import { PayloadBuilderBase, WithoutMeta, WithoutSchema } from './BuilderBase';
 import { PayloadBuilderOptions } from './Options';
 export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> extends PayloadBuilderBase<T, O> {
     static build<T extends Payload = Payload<AnyObject>>(payload: T, validate?: boolean): Promise<WithMeta<T>>;
@@ -21,7 +21,7 @@ export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O ex
      * @returns An array of payload/hash tuples
      */
     static hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]>;
-    static hashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: Omit<T, 'schema' | '$hash' | '$meta'>, $meta?: JsonObject, $hash?: Hash, timestamp?: number): Promise<WithMeta<T>>;
+    static hashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: WithoutSchema<WithoutMeta<T>>, $meta?: JsonObject, $hash?: Hash, timestamp?: number): Promise<WithMeta<T>>;
     static hashes(payloads: undefined): Promise<undefined>;
     static hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>;
     static toAllHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>>;

package/dist/browser/Builder.d.cts.map

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

package/dist/browser/Builder.d.mts

@@ -1,7 +1,7 @@
 import { Hash } from '@xylabs/hex';
 import { AnyObject, JsonObject } from '@xylabs/object';
 import { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model';
-import { PayloadBuilderBase } from './BuilderBase';
+import { PayloadBuilderBase, WithoutMeta, WithoutSchema } from './BuilderBase';
 import { PayloadBuilderOptions } from './Options';
 export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> extends PayloadBuilderBase<T, O> {
     static build<T extends Payload = Payload<AnyObject>>(payload: T, validate?: boolean): Promise<WithMeta<T>>;
@@ -21,7 +21,7 @@ export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O ex
      * @returns An array of payload/hash tuples
      */
     static hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]>;
-    static hashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: Omit<T, 'schema' | '$hash' | '$meta'>, $meta?: JsonObject, $hash?: Hash, timestamp?: number): Promise<WithMeta<T>>;
+    static hashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: WithoutSchema<WithoutMeta<T>>, $meta?: JsonObject, $hash?: Hash, timestamp?: number): Promise<WithMeta<T>>;
     static hashes(payloads: undefined): Promise<undefined>;
     static hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>;
     static toAllHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>>;

package/dist/browser/Builder.d.mts.map

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

package/dist/browser/Builder.d.ts

@@ -1,7 +1,7 @@
 import { Hash } from '@xylabs/hex';
 import { AnyObject, JsonObject } from '@xylabs/object';
 import { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model';
-import { PayloadBuilderBase } from './BuilderBase';
+import { PayloadBuilderBase, WithoutMeta, WithoutSchema } from './BuilderBase';
 import { PayloadBuilderOptions } from './Options';
 export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> extends PayloadBuilderBase<T, O> {
     static build<T extends Payload = Payload<AnyObject>>(payload: T, validate?: boolean): Promise<WithMeta<T>>;
@@ -21,7 +21,7 @@ export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O ex
      * @returns An array of payload/hash tuples
      */
     static hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]>;
-    static hashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: Omit<T, 'schema' | '$hash' | '$meta'>, $meta?: JsonObject, $hash?: Hash, timestamp?: number): Promise<WithMeta<T>>;
+    static hashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: WithoutSchema<WithoutMeta<T>>, $meta?: JsonObject, $hash?: Hash, timestamp?: number): Promise<WithMeta<T>>;
     static hashes(payloads: undefined): Promise<undefined>;
     static hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>;
     static toAllHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>>;

package/dist/browser/Builder.d.ts.map

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

package/dist/browser/BuilderBase.d.cts

@@ -1,19 +1,25 @@
 import { Hash } from '@xylabs/hex';
 import { AnyObject, JsonObject } from '@xylabs/object';
 import { Promisable } from '@xylabs/promise';
-import { Payload, Schema, WithMeta } from '@xyo-network/payload-model';
+import { Payload, Schema, WithOptionalMeta } from '@xyo-network/payload-model';
 import { PayloadBuilderOptions } from './Options';
+export type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>;
+export type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>;
+export type WithoutMeta<T extends WithOptionalMeta<Payload>> = Omit<T, '$hash' | '$meta'>;
+export declare const removeMetaAndSchema: <T extends {
+    schema: string;
+} & import("@xyo-network/payload-model").PayloadFields>(payload: WithOptionalSchema<WithOptionalMeta<T>>) => WithoutSchema<WithoutMeta<T>>;
 export declare class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
     readonly options: O;
     protected _$meta?: JsonObject;
-    protected _fields?: Omit<T, 'schema' | '$hash' | '$meta'>;
+    protected _fields?: WithoutSchema<WithoutMeta<T>>;
     protected _schema: Schema;
     constructor(options: O);
-    static dataHashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: Omit<T, 'schema' | '$hash' | '$meta'>): Promisable<Omit<T, '$hash' | '$meta'>>;
+    static dataHashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: WithoutSchema<WithoutMeta<T>>): Promisable<Omit<T, '$hash' | '$meta'>>;
     protected static metaFields(dataHash: Hash, otherMeta?: JsonObject): Promisable<JsonObject>;
     $meta(meta?: JsonObject): this;
     dataHashableFields(): Promise<Omit<T, "$hash" | "$meta">>;
-    fields(fields: Omit<WithMeta<T>, '$hash' | 'schema' | '$meta'> & Partial<Pick<WithMeta<T>, '$hash' | 'schema' | '$meta'>>): this;
+    fields(fields: WithOptionalSchema<WithOptionalMeta<T>>): this;
     schema(value: Schema): void;
     protected metaFields(dataHash: Hash): Promise<JsonObject>;
 }

package/dist/browser/BuilderBase.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,SAAS,EAAgB,UAAU,EAAU,MAAM,gBAAgB,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAKvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAJ/B,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAA;IAC7B,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,CAAA;IACzD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAO/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAC9D,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,GAC7C,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IASzC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAQ3F,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU;IAKjB,kBAAkB;IAKxB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,CAAC;IAezH,MAAM,CAAC,KAAK,EAAE,MAAM;cAIJ,UAAU,CAAC,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;CAGhE"}
+{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,SAAS,EAAgB,UAAU,EAAU,MAAM,gBAAgB,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAY,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAExF,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,OAAO,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;AAElF,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,kBAAkB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEpF,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,gBAAgB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAA;AAEzF,eAAO,MAAM,mBAAmB;;iEAAgC,mBAAmB,iBAAiB,CAAC,CAAC,CAAC,KAAG,cAAc,YAAY,CAAC,CAAC,CAMrI,CAAA;AAED,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAKvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAJ/B,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAA;IAC7B,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAO/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAC9D,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GACrC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IASzC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAQ3F,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU;IAKjB,kBAAkB;IAQxB,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAetD,MAAM,CAAC,KAAK,EAAE,MAAM;cAIJ,UAAU,CAAC,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;CAGhE"}

package/dist/browser/BuilderBase.d.mts

@@ -1,19 +1,25 @@
 import { Hash } from '@xylabs/hex';
 import { AnyObject, JsonObject } from '@xylabs/object';
 import { Promisable } from '@xylabs/promise';
-import { Payload, Schema, WithMeta } from '@xyo-network/payload-model';
+import { Payload, Schema, WithOptionalMeta } from '@xyo-network/payload-model';
 import { PayloadBuilderOptions } from './Options';
+export type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>;
+export type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>;
+export type WithoutMeta<T extends WithOptionalMeta<Payload>> = Omit<T, '$hash' | '$meta'>;
+export declare const removeMetaAndSchema: <T extends {
+    schema: string;
+} & import("@xyo-network/payload-model").PayloadFields>(payload: WithOptionalSchema<WithOptionalMeta<T>>) => WithoutSchema<WithoutMeta<T>>;
 export declare class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
     readonly options: O;
     protected _$meta?: JsonObject;
-    protected _fields?: Omit<T, 'schema' | '$hash' | '$meta'>;
+    protected _fields?: WithoutSchema<WithoutMeta<T>>;
     protected _schema: Schema;
     constructor(options: O);
-    static dataHashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: Omit<T, 'schema' | '$hash' | '$meta'>): Promisable<Omit<T, '$hash' | '$meta'>>;
+    static dataHashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: WithoutSchema<WithoutMeta<T>>): Promisable<Omit<T, '$hash' | '$meta'>>;
     protected static metaFields(dataHash: Hash, otherMeta?: JsonObject): Promisable<JsonObject>;
     $meta(meta?: JsonObject): this;
     dataHashableFields(): Promise<Omit<T, "$hash" | "$meta">>;
-    fields(fields: Omit<WithMeta<T>, '$hash' | 'schema' | '$meta'> & Partial<Pick<WithMeta<T>, '$hash' | 'schema' | '$meta'>>): this;
+    fields(fields: WithOptionalSchema<WithOptionalMeta<T>>): this;
     schema(value: Schema): void;
     protected metaFields(dataHash: Hash): Promise<JsonObject>;
 }

package/dist/browser/BuilderBase.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,SAAS,EAAgB,UAAU,EAAU,MAAM,gBAAgB,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAKvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAJ/B,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAA;IAC7B,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,CAAA;IACzD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAO/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAC9D,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,GAC7C,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IASzC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAQ3F,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU;IAKjB,kBAAkB;IAKxB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,CAAC;IAezH,MAAM,CAAC,KAAK,EAAE,MAAM;cAIJ,UAAU,CAAC,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;CAGhE"}
+{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,SAAS,EAAgB,UAAU,EAAU,MAAM,gBAAgB,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAY,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAExF,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,OAAO,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;AAElF,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,kBAAkB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEpF,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,gBAAgB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAA;AAEzF,eAAO,MAAM,mBAAmB;;iEAAgC,mBAAmB,iBAAiB,CAAC,CAAC,CAAC,KAAG,cAAc,YAAY,CAAC,CAAC,CAMrI,CAAA;AAED,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAKvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAJ/B,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAA;IAC7B,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAO/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAC9D,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GACrC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IASzC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAQ3F,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU;IAKjB,kBAAkB;IAQxB,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAetD,MAAM,CAAC,KAAK,EAAE,MAAM;cAIJ,UAAU,CAAC,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;CAGhE"}

package/dist/browser/BuilderBase.d.ts

@@ -1,19 +1,25 @@
 import { Hash } from '@xylabs/hex';
 import { AnyObject, JsonObject } from '@xylabs/object';
 import { Promisable } from '@xylabs/promise';
-import { Payload, Schema, WithMeta } from '@xyo-network/payload-model';
+import { Payload, Schema, WithOptionalMeta } from '@xyo-network/payload-model';
 import { PayloadBuilderOptions } from './Options';
+export type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>;
+export type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>;
+export type WithoutMeta<T extends WithOptionalMeta<Payload>> = Omit<T, '$hash' | '$meta'>;
+export declare const removeMetaAndSchema: <T extends {
+    schema: string;
+} & import("@xyo-network/payload-model").PayloadFields>(payload: WithOptionalSchema<WithOptionalMeta<T>>) => WithoutSchema<WithoutMeta<T>>;
 export declare class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
     readonly options: O;
     protected _$meta?: JsonObject;
-    protected _fields?: Omit<T, 'schema' | '$hash' | '$meta'>;
+    protected _fields?: WithoutSchema<WithoutMeta<T>>;
     protected _schema: Schema;
     constructor(options: O);
-    static dataHashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: Omit<T, 'schema' | '$hash' | '$meta'>): Promisable<Omit<T, '$hash' | '$meta'>>;
+    static dataHashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: WithoutSchema<WithoutMeta<T>>): Promisable<Omit<T, '$hash' | '$meta'>>;
     protected static metaFields(dataHash: Hash, otherMeta?: JsonObject): Promisable<JsonObject>;
     $meta(meta?: JsonObject): this;
     dataHashableFields(): Promise<Omit<T, "$hash" | "$meta">>;
-    fields(fields: Omit<WithMeta<T>, '$hash' | 'schema' | '$meta'> & Partial<Pick<WithMeta<T>, '$hash' | 'schema' | '$meta'>>): this;
+    fields(fields: WithOptionalSchema<WithOptionalMeta<T>>): this;
     schema(value: Schema): void;
     protected metaFields(dataHash: Hash): Promise<JsonObject>;
 }

package/dist/browser/BuilderBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,SAAS,EAAgB,UAAU,EAAU,MAAM,gBAAgB,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAKvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAJ/B,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAA;IAC7B,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,CAAA;IACzD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAO/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAC9D,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,GAC7C,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IASzC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAQ3F,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU;IAKjB,kBAAkB;IAKxB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,CAAC;IAezH,MAAM,CAAC,KAAK,EAAE,MAAM;cAIJ,UAAU,CAAC,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;CAGhE"}
+{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,SAAS,EAAgB,UAAU,EAAU,MAAM,gBAAgB,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAY,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAExF,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,OAAO,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;AAElF,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,kBAAkB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEpF,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,gBAAgB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAA;AAEzF,eAAO,MAAM,mBAAmB;;iEAAgC,mBAAmB,iBAAiB,CAAC,CAAC,CAAC,KAAG,cAAc,YAAY,CAAC,CAAC,CAMrI,CAAA;AAED,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAKvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAJ/B,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAA;IAC7B,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAO/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAC9D,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GACrC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IASzC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAQ3F,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU;IAKjB,kBAAkB;IAQxB,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAetD,MAAM,CAAC,KAAK,EAAE,MAAM;cAIJ,UAAU,CAAC,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;CAGhE"}

package/dist/browser/index.cjs

@@ -22,7 +22,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   PayloadBuilder: () => PayloadBuilder,
-  PayloadBuilderBase: () => PayloadBuilderBase
+  PayloadBuilderBase: () => PayloadBuilderBase,
+  removeMetaAndSchema: () => removeMetaAndSchema
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -35,6 +36,13 @@ var import_hash2 = require("@xyo-network/hash");
 var import_assert = require("@xylabs/assert");
 var import_object = require("@xylabs/object");
 var import_hash = require("@xyo-network/hash");
+var removeMetaAndSchema = /* @__PURE__ */ __name((payload) => {
+  const { ...result } = payload;
+  delete result.$hash;
+  delete result.$meta;
+  delete result.schema;
+  return result;
+}, "removeMetaAndSchema");
 var PayloadBuilderBase = class _PayloadBuilderBase {
   static {
     __name(this, "PayloadBuilderBase");
@@ -70,7 +78,7 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     return this;
   }
   async dataHashableFields() {
-    return await _PayloadBuilderBase.dataHashableFields((0, import_assert.assertEx)(this._schema, "Payload: Missing Schema"), this._fields);
+    return await _PayloadBuilderBase.dataHashableFields((0, import_assert.assertEx)(this._schema, () => "Payload: Missing Schema"), this._fields);
   }
   //we do not require sending in $hash since it will be generated anyway
   fields(fields) {
@@ -82,10 +90,7 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
       if (schema) {
         this.schema(schema);
       }
-      this._fields = {
-        ...this._fields,
-        ...(0, import_hash.removeEmptyFields)(fieldsOnly)
-      };
+      this._fields = removeMetaAndSchema(fields);
     }
     return this;
   }
@@ -106,7 +111,8 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
     if (Array.isArray(payload)) {
       return await Promise.all(payload.map((payload2) => this.build(payload2)));
     } else {
-      const { schema, $hash: incomingDataHash, $meta, ...fields } = payload;
+      const { schema, $hash: incomingDataHash, $meta } = payload;
+      const fields = removeMetaAndSchema(payload);
       const dataHashableFields = await _PayloadBuilder.dataHashableFields(schema, fields);
       const $hash = validate || incomingDataHash === void 0 ? await import_hash2.PayloadHasher.hash(dataHashableFields) : incomingDataHash;
       const hashableFields = {
@@ -175,7 +181,7 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
   }
   static async hashableFields(schema, fields, $meta, $hash, timestamp) {
     const dataFields = await this.dataHashableFields(schema, fields);
-    (0, import_assert2.assertEx)($meta === void 0 || (0, import_object2.isJsonObject)($meta), "$meta must be JsonObject");
+    (0, import_assert2.assertEx)($meta === void 0 || (0, import_object2.isJsonObject)($meta), () => "$meta must be JsonObject");
     return (0, import_hash2.deepOmitPrefixedFields)({
       ...dataFields,
       $hash: $hash ?? await _PayloadBuilder.dataHash(dataFields),
@@ -238,7 +244,7 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
     return hashableFields;
   }
   async hashableFields() {
-    return await _PayloadBuilder.hashableFields((0, import_assert2.assertEx)(this._schema, "Payload: Missing Schema"), this._fields, this._$meta);
+    return await _PayloadBuilder.hashableFields((0, import_assert2.assertEx)(this._schema, () => "Payload: Missing Schema"), this._fields, this._$meta);
   }
 };
 //# sourceMappingURL=index.cjs.map

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["export * from './Builder'\nexport * from './BuilderBase'\nexport * from './Options'\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { AnyObject, isJsonObject, JsonObject } from '@xylabs/object'\nimport { deepOmitPrefixedFields, PayloadHasher } from '@xyo-network/hash'\nimport { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase } from './BuilderBase'\nimport { PayloadBuilderOptions } from './Options'\n\nexport class PayloadBuilder<\n  T extends Payload = Payload<AnyObject>,\n  O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>,\n> extends PayloadBuilderBase<T, O> {\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T, validate?: boolean): Promise<WithMeta<T>>\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T[], validate?: boolean): Promise<WithMeta<T>[]>\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T | T[], validate = false) {\n    if (Array.isArray(payload)) {\n      return await Promise.all(payload.map((payload) => this.build(payload)))\n    } else {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { schema, $hash: incomingDataHash, $meta, ...fields } = payload as WithMeta<T>\n      const dataHashableFields = await PayloadBuilder.dataHashableFields(schema, fields)\n      const $hash = validate || incomingDataHash === undefined ? await PayloadHasher.hash(dataHashableFields) : incomingDataHash\n      const hashableFields = { ...dataHashableFields, $hash, $meta: { ...$meta, timestamp: $meta?.timestamp ?? Date.now() } as JsonObject }\n\n      return hashableFields as WithMeta<T>\n    }\n  }\n\n  static async dataHash<T extends Payload>(payload: T, validate = true): Promise<Hash> {\n    return (await this.build(payload, validate)).$hash\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[], validate = true): Promise<[WithMeta<T>, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const built = await PayloadBuilder.build(payload, validate)\n        return [built, built.$hash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined, validate?: boolean): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[], validate?: boolean): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[], validate = true): Promise<Hash[] | undefined> {\n    return payloads ?\n        await Promise.all(\n          payloads.map(async (payload) => {\n            const built = await PayloadBuilder.build(payload, validate)\n            return built.$hash\n          }),\n        )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await PayloadHasher.filterExcludeByHash(await this.filterExcludeByDataHash(payloads, hash), hash)\n  }\n\n  static async filterExcludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => !hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async filterIncludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async findByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash): Promise<T | undefined> {\n    return (await this.dataHashPairs(payloads)).find(([_, objHash]) => objHash === hash)?.[0]\n  }\n\n  static async hash<T extends Payload>(payload: T, validate = false): Promise<Hash> {\n    return await PayloadHasher.hash(await PayloadBuilder.build(payload, validate))\n  }\n\n  /**\n   * Creates an array of payload/hash tuples based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns An array of payload/hash tuples\n   */\n  static async hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[WithMeta<T>, Hash]>>(async (payload) => {\n        const built = await PayloadBuilder.build(payload)\n        return [built, await PayloadBuilder.hash(built)]\n      }),\n    )\n  }\n\n  static async hashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: Omit<T, 'schema' | '$hash' | '$meta'>,\n    $meta?: JsonObject,\n    $hash?: Hash,\n    timestamp?: number,\n  ): Promise<WithMeta<T>> {\n    const dataFields = await this.dataHashableFields<T>(schema, fields)\n    assertEx($meta === undefined || isJsonObject($meta), '$meta must be JsonObject')\n    return deepOmitPrefixedFields<WithMeta<T>>(\n      {\n        ...dataFields,\n        $hash: $hash ?? (await PayloadBuilder.dataHash(dataFields)),\n        $meta: { ...$meta, timestamp: timestamp ?? $meta?.timestamp ?? Date.now() } as JsonObject,\n        schema,\n      } as WithMeta<T>,\n      '_',\n    )\n  }\n\n  static async hashes(payloads: undefined): Promise<undefined>\n  static async hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async hashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return await PayloadHasher.hashes(payloads)\n  }\n\n  static async toAllHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n      result[pair[0].$hash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.dataHashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  /**\n   * Creates an object map of payload hashes to payloads based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns A map of hashes to payloads\n   */\n  static async toHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  static withoutMeta(payload: undefined): undefined\n  static withoutMeta<T extends PayloadWithMeta>(payload: T): Omit<T, '$meta'>\n  static withoutMeta<T extends PayloadWithMeta>(payloads: T[]): Omit<T, '$meta'>[]\n  static withoutMeta<T extends PayloadWithMeta>(payloads: T | T[]) {\n    if (Array.isArray(payloads)) {\n      return payloads.map((payload) => this.withoutMeta(payload))\n    } else {\n      if (payloads) {\n        // eslint-disable-next-line @typescript-eslint/no-unused-vars\n        const { $meta, ...result } = payloads\n        return result as Omit<T, '$meta'>\n      }\n    }\n  }\n\n  async build(): Promise<WithMeta<T>> {\n    const dataHashableFields = await this.dataHashableFields()\n    const $hash = await PayloadHasher.hash(dataHashableFields)\n    const $meta = await this.metaFields($hash)\n    const hashableFields: PayloadWithMeta = { ...dataHashableFields, $hash, $meta }\n\n    return hashableFields as WithMeta<T>\n  }\n\n  async hashableFields() {\n    return await PayloadBuilder.hashableFields(assertEx(this._schema, 'Payload: Missing Schema'), this._fields, this._$meta)\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { AnyObject, isJsonObject, JsonObject, toJson } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { deepOmitPrefixedFields, removeEmptyFields } from '@xyo-network/hash'\nimport { Payload, Schema, WithMeta } from '@xyo-network/payload-model'\n\nimport { PayloadBuilderOptions } from './Options'\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _$meta?: JsonObject\n  protected _fields?: Omit<T, 'schema' | '$hash' | '$meta'>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields, meta } = options\n    this._schema = schema\n    this._fields = removeEmptyFields(fields ?? {}) as Omit<T, 'schema' | '$hash' | '$meta'>\n    this._$meta = meta\n  }\n\n  static dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: Omit<T, 'schema' | '$hash' | '$meta'>,\n  ): Promisable<Omit<T, '$hash' | '$meta'>> {\n    const cleanFields = fields ? removeEmptyFields(fields) : undefined\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return deepOmitPrefixedFields(deepOmitPrefixedFields({ schema, ...cleanFields }, '$'), '_') as T\n  }\n\n  protected static metaFields(dataHash: Hash, otherMeta?: JsonObject): Promisable<JsonObject> {\n    const meta: JsonObject = { ...otherMeta }\n\n    meta.timestamp = meta.timestamp ?? Date.now()\n\n    return meta\n  }\n\n  $meta(meta?: JsonObject) {\n    this._$meta = meta ?? (this._fields as WithMeta<T>).$meta\n    return this\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(assertEx(this._schema, 'Payload: Missing Schema'), this._fields)\n  }\n\n  //we do not require sending in $hash since it will be generated anyway\n  fields(fields: Omit<WithMeta<T>, '$hash' | 'schema' | '$meta'> & Partial<Pick<WithMeta<T>, '$hash' | 'schema' | '$meta'>>) {\n    if (fields) {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { $meta, $hash, schema, ...fieldsOnly } = fields\n      if ($meta) {\n        this.$meta($meta)\n      }\n      if (schema) {\n        this.schema(schema)\n      }\n      this._fields = { ...this._fields, ...removeEmptyFields(fieldsOnly) } as T\n    }\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n\n  protected async metaFields(dataHash: Hash): Promise<JsonObject> {\n    return await PayloadBuilderBase.metaFields(dataHash, this._$meta)\n  }\n}\n"],"mappings":"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","names":["import_assert","import_object","import_hash","PayloadBuilderBase","_$meta","_fields","_schema","constructor","options","schema","fields","meta","removeEmptyFields","dataHashableFields","cleanFields","undefined","assertEx","isJsonObject","JSON","stringify","toJson","deepOmitPrefixedFields","metaFields","dataHash","otherMeta","timestamp","Date","now","$meta","$hash","fieldsOnly","value","PayloadBuilder","PayloadBuilderBase","build","payload","validate","Array","isArray","Promise","all","map","schema","$hash","incomingDataHash","$meta","fields","dataHashableFields","undefined","PayloadHasher","hash","hashableFields","timestamp","Date","now","dataHash","dataHashPairs","payloads","built","dataHashes","filterExclude","filterExcludeByHash","filterExcludeByDataHash","hashes","filter","_","objHash","includes","pair","filterIncludeByDataHash","findByDataHash","find","hashPairs","dataFields","assertEx","isJsonObject","deepOmitPrefixedFields","toAllHashMap","objs","result","toDataHashMap","toHashMap","withoutMeta","metaFields","_schema","_fields","_$meta"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["export * from './Builder'\nexport * from './BuilderBase'\nexport * from './Options'\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { AnyObject, isJsonObject, JsonObject } from '@xylabs/object'\nimport { deepOmitPrefixedFields, PayloadHasher } from '@xyo-network/hash'\nimport { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase, removeMetaAndSchema, WithoutMeta, WithoutSchema } from './BuilderBase'\nimport { PayloadBuilderOptions } from './Options'\n\nexport class PayloadBuilder<\n  T extends Payload = Payload<AnyObject>,\n  O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>,\n> extends PayloadBuilderBase<T, O> {\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T, validate?: boolean): Promise<WithMeta<T>>\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T[], validate?: boolean): Promise<WithMeta<T>[]>\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T | T[], validate = false) {\n    if (Array.isArray(payload)) {\n      return await Promise.all(payload.map((payload) => this.build(payload)))\n    } else {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { schema, $hash: incomingDataHash, $meta } = payload as WithMeta<T>\n      const fields = removeMetaAndSchema(payload)\n      const dataHashableFields = await PayloadBuilder.dataHashableFields(schema, fields)\n      const $hash = validate || incomingDataHash === undefined ? await PayloadHasher.hash(dataHashableFields) : incomingDataHash\n      const hashableFields = { ...dataHashableFields, $hash, $meta: { ...$meta, timestamp: $meta?.timestamp ?? Date.now() } as JsonObject }\n\n      return hashableFields as WithMeta<T>\n    }\n  }\n\n  static async dataHash<T extends Payload>(payload: T, validate = true): Promise<Hash> {\n    return (await this.build(payload, validate)).$hash\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[], validate = true): Promise<[WithMeta<T>, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const built = await PayloadBuilder.build(payload, validate)\n        return [built, built.$hash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined, validate?: boolean): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[], validate?: boolean): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[], validate = true): Promise<Hash[] | undefined> {\n    return payloads ?\n        await Promise.all(\n          payloads.map(async (payload) => {\n            const built = await PayloadBuilder.build(payload, validate)\n            return built.$hash\n          }),\n        )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await PayloadHasher.filterExcludeByHash(await this.filterExcludeByDataHash(payloads, hash), hash)\n  }\n\n  static async filterExcludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => !hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async filterIncludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async findByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash): Promise<T | undefined> {\n    return (await this.dataHashPairs(payloads)).find(([_, objHash]) => objHash === hash)?.[0]\n  }\n\n  static async hash<T extends Payload>(payload: T, validate = false): Promise<Hash> {\n    return await PayloadHasher.hash(await PayloadBuilder.build(payload, validate))\n  }\n\n  /**\n   * Creates an array of payload/hash tuples based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns An array of payload/hash tuples\n   */\n  static async hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[WithMeta<T>, Hash]>>(async (payload) => {\n        const built = await PayloadBuilder.build(payload)\n        return [built, await PayloadBuilder.hash(built)]\n      }),\n    )\n  }\n\n  static async hashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n    $meta?: JsonObject,\n    $hash?: Hash,\n    timestamp?: number,\n  ): Promise<WithMeta<T>> {\n    const dataFields = await this.dataHashableFields<T>(schema, fields)\n    assertEx($meta === undefined || isJsonObject($meta), () => '$meta must be JsonObject')\n    return deepOmitPrefixedFields<WithMeta<T>>(\n      {\n        ...dataFields,\n        $hash: $hash ?? (await PayloadBuilder.dataHash(dataFields)),\n        $meta: { ...$meta, timestamp: timestamp ?? $meta?.timestamp ?? Date.now() } as JsonObject,\n        schema,\n      } as WithMeta<T>,\n      '_',\n    )\n  }\n\n  static async hashes(payloads: undefined): Promise<undefined>\n  static async hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async hashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return await PayloadHasher.hashes(payloads)\n  }\n\n  static async toAllHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n      result[pair[0].$hash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.dataHashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  /**\n   * Creates an object map of payload hashes to payloads based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns A map of hashes to payloads\n   */\n  static async toHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  static withoutMeta(payload: undefined): undefined\n  static withoutMeta<T extends PayloadWithMeta>(payload: T): Omit<T, '$meta'>\n  static withoutMeta<T extends PayloadWithMeta>(payloads: T[]): Omit<T, '$meta'>[]\n  static withoutMeta<T extends PayloadWithMeta>(payloads: T | T[]) {\n    if (Array.isArray(payloads)) {\n      return payloads.map((payload) => this.withoutMeta(payload))\n    } else {\n      if (payloads) {\n        // eslint-disable-next-line @typescript-eslint/no-unused-vars\n        const { $meta, ...result } = payloads\n        return result as Omit<T, '$meta'>\n      }\n    }\n  }\n\n  async build(): Promise<WithMeta<T>> {\n    const dataHashableFields = await this.dataHashableFields()\n    const $hash = await PayloadHasher.hash(dataHashableFields)\n    const $meta = await this.metaFields($hash)\n    const hashableFields: PayloadWithMeta = { ...dataHashableFields, $hash, $meta }\n\n    return hashableFields as WithMeta<T>\n  }\n\n  async hashableFields() {\n    return await PayloadBuilder.hashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      this._fields,\n      this._$meta,\n    )\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { AnyObject, isJsonObject, JsonObject, toJson } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { deepOmitPrefixedFields, removeEmptyFields } from '@xyo-network/hash'\nimport { Payload, Schema, WithMeta, WithOptionalMeta } from '@xyo-network/payload-model'\n\nimport { PayloadBuilderOptions } from './Options'\n\nexport type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>\n\nexport type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>\n\nexport type WithoutMeta<T extends WithOptionalMeta<Payload>> = Omit<T, '$hash' | '$meta'>\n\nexport const removeMetaAndSchema = <T extends Payload>(payload: WithOptionalSchema<WithOptionalMeta<T>>): WithoutSchema<WithoutMeta<T>> => {\n  const { ...result } = payload\n  delete result.$hash\n  delete result.$meta\n  delete result.schema\n  return result as Omit<T, 'schema'>\n}\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _$meta?: JsonObject\n  protected _fields?: WithoutSchema<WithoutMeta<T>>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields, meta } = options\n    this._schema = schema\n    this._fields = removeEmptyFields(fields ?? {}) as WithoutSchema<WithoutMeta<T>>\n    this._$meta = meta\n  }\n\n  static dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promisable<Omit<T, '$hash' | '$meta'>> {\n    const cleanFields = fields ? removeEmptyFields(fields) : undefined\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return deepOmitPrefixedFields(deepOmitPrefixedFields({ schema, ...cleanFields }, '$'), '_') as T\n  }\n\n  protected static metaFields(dataHash: Hash, otherMeta?: JsonObject): Promisable<JsonObject> {\n    const meta: JsonObject = { ...otherMeta }\n\n    meta.timestamp = meta.timestamp ?? Date.now()\n\n    return meta\n  }\n\n  $meta(meta?: JsonObject) {\n    this._$meta = meta ?? (this._fields as WithMeta<T>).$meta\n    return this\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      this._fields,\n    )\n  }\n\n  //we do not require sending in $hash since it will be generated anyway\n  fields(fields: WithOptionalSchema<WithOptionalMeta<T>>) {\n    if (fields) {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { $meta, $hash, schema, ...fieldsOnly } = fields\n      if ($meta) {\n        this.$meta($meta)\n      }\n      if (schema) {\n        this.schema(schema)\n      }\n      this._fields = removeMetaAndSchema<T>(fields)\n    }\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n\n  protected async metaFields(dataHash: Hash): Promise<JsonObject> {\n    return await PayloadBuilderBase.metaFields(dataHash, this._$meta)\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;ACAA,IAAAA,iBAAyB;AAEzB,IAAAC,iBAAoD;AACpD,IAAAC,eAAsD;;;ACHtD,oBAAyB;AAEzB,oBAA4D;AAE5D,kBAA0D;AAWnD,IAAMC,sBAAsB,wBAAoBC,YAAAA;AACrD,QAAM,EAAE,GAAGC,OAAAA,IAAWD;AACtB,SAAOC,OAAOC;AACd,SAAOD,OAAOE;AACd,SAAOF,OAAOG;AACd,SAAOH;AACT,GANmC;AAQ5B,IAAMI,qBAAN,MAAMA,oBAAAA;EAvBb,OAuBaA;;;;EACDC;EACAC;EACAC;EAEVC,YAAqBC,SAAY;SAAZA,UAAAA;AACnB,UAAM,EAAEN,QAAQO,QAAQC,KAAI,IAAKF;AACjC,SAAKF,UAAUJ;AACf,SAAKG,cAAUM,+BAAkBF,UAAU,CAAC,CAAA;AAC5C,SAAKL,SAASM;EAChB;EAEA,OAAOE,mBACLV,QACAO,QACwC;AACxC,UAAMI,cAAcJ,aAASE,+BAAkBF,MAAAA,IAAUK;AACzDC,gCACEF,gBAAgBC,cAAaE,4BAAaH,WAAAA,GAC1C,MAAM,8BAA8BI,KAAKC,cAAUC,sBAAON,WAAAA,GAAc,MAAM,CAAA,CAAA,EAAI;AAEpF,eAAOO,wCAAuBA,oCAAuB;MAAElB;MAAQ,GAAGW;IAAY,GAAG,GAAA,GAAM,GAAA;EACzF;EAEA,OAAiBQ,WAAWC,UAAgBC,WAAgD;AAC1F,UAAMb,OAAmB;MAAE,GAAGa;IAAU;AAExCb,SAAKc,YAAYd,KAAKc,aAAaC,KAAKC,IAAG;AAE3C,WAAOhB;EACT;EAEAT,MAAMS,MAAmB;AACvB,SAAKN,SAASM,QAAS,KAAKL,QAAwBJ;AACpD,WAAO;EACT;EAEA,MAAMW,qBAAqB;AACzB,WAAO,MAAMT,oBAAmBS,uBAC9BG,wBAAS,KAAKT,SAAS,MAAM,yBAAA,GAC7B,KAAKD,OAAO;EAEhB;;EAGAI,OAAOA,QAAiD;AACtD,QAAIA,QAAQ;AAEV,YAAM,EAAER,OAAOD,OAAOE,QAAQ,GAAGyB,WAAAA,IAAelB;AAChD,UAAIR,OAAO;AACT,aAAKA,MAAMA,KAAAA;MACb;AACA,UAAIC,QAAQ;AACV,aAAKA,OAAOA,MAAAA;MACd;AACA,WAAKG,UAAUR,oBAAuBY,MAAAA;IACxC;AACA,WAAO;EACT;EAEAP,OAAO0B,OAAe;AACpB,SAAKtB,UAAUsB;EACjB;EAEA,MAAgBP,WAAWC,UAAqC;AAC9D,WAAO,MAAMnB,oBAAmBkB,WAAWC,UAAU,KAAKlB,MAAM;EAClE;AACF;;;ADjFO,IAAMyB,iBAAN,MAAMA,wBAGHC,mBAAAA;EAZV,OAYUA;;;EAGR,aAAaC,MAA8CC,SAAkBC,WAAW,OAAO;AAC7F,QAAIC,MAAMC,QAAQH,OAAAA,GAAU;AAC1B,aAAO,MAAMI,QAAQC,IAAIL,QAAQM,IAAI,CAACN,aAAY,KAAKD,MAAMC,QAAAA,CAAAA,CAAAA;IAC/D,OAAO;AAEL,YAAM,EAAEO,QAAQC,OAAOC,kBAAkBC,MAAK,IAAKV;AACnD,YAAMW,SAASC,oBAAoBZ,OAAAA;AACnC,YAAMa,qBAAqB,MAAMhB,gBAAegB,mBAAmBN,QAAQI,MAAAA;AAC3E,YAAMH,QAAQP,YAAYQ,qBAAqBK,SAAY,MAAMC,2BAAcC,KAAKH,kBAAAA,IAAsBJ;AAC1G,YAAMQ,iBAAiB;QAAE,GAAGJ;QAAoBL;QAAOE,OAAO;UAAE,GAAGA;UAAOQ,WAAWR,OAAOQ,aAAaC,KAAKC,IAAG;QAAG;MAAgB;AAEpI,aAAOH;IACT;EACF;EAEA,aAAaI,SAA4BrB,SAAYC,WAAW,MAAqB;AACnF,YAAQ,MAAM,KAAKF,MAAMC,SAASC,QAAAA,GAAWO;EAC/C;EAEA,aAAac,cAAiCC,UAAetB,WAAW,MAAsC;AAC5G,WAAO,MAAMG,QAAQC,IACnBkB,SAASjB,IAAI,OAAON,YAAAA;AAClB,YAAMwB,QAAQ,MAAM3B,gBAAeE,MAAMC,SAASC,QAAAA;AAClD,aAAO;QAACuB;QAAOA,MAAMhB;;IACvB,CAAA,CAAA;EAEJ;EAIA,aAAaiB,WAA8BF,UAAgBtB,WAAW,MAAmC;AACvG,WAAOsB,WACH,MAAMnB,QAAQC,IACZkB,SAASjB,IAAI,OAAON,YAAAA;AAClB,YAAMwB,QAAQ,MAAM3B,gBAAeE,MAAMC,SAASC,QAAAA;AAClD,aAAOuB,MAAMhB;IACf,CAAA,CAAA,IAEFM;EACN;EAEA,aAAaY,cAAiCH,WAAgB,CAAA,GAAIP,MAAmC;AACnG,WAAO,MAAMD,2BAAcY,oBAAoB,MAAM,KAAKC,wBAAwBL,UAAUP,IAAAA,GAAOA,IAAAA;EACrG;EAEA,aAAaY,wBAA2CL,WAAgB,CAAA,GAAIP,MAAmC;AAC7G,UAAMa,SAAS3B,MAAMC,QAAQa,IAAAA,IAAQA,OAAO;MAACA;;AAC7C,YAAQ,MAAM,KAAKM,cAAcC,QAAAA,GAAWO,OAAO,CAAC,CAACC,GAAGC,OAAAA,MAAa,CAACH,OAAOI,SAASD,OAAAA,CAAAA,GAAW1B,IAAI,CAAC4B,SAASA,KAAK,CAAA,CAAE;EACxH;EAEA,aAAaC,wBAA2CZ,WAAgB,CAAA,GAAIP,MAAmC;AAC7G,UAAMa,SAAS3B,MAAMC,QAAQa,IAAAA,IAAQA,OAAO;MAACA;;AAC7C,YAAQ,MAAM,KAAKM,cAAcC,QAAAA,GAAWO,OAAO,CAAC,CAACC,GAAGC,OAAAA,MAAaH,OAAOI,SAASD,OAAAA,CAAAA,GAAW1B,IAAI,CAAC4B,SAASA,KAAK,CAAA,CAAE;EACvH;EAEA,aAAaE,eAAkCb,WAAgB,CAAA,GAAIP,MAAoC;AACrG,YAAQ,MAAM,KAAKM,cAAcC,QAAAA,GAAWc,KAAK,CAAC,CAACN,GAAGC,OAAAA,MAAaA,YAAYhB,IAAAA,IAAQ,CAAA;EACzF;EAEA,aAAaA,KAAwBhB,SAAYC,WAAW,OAAsB;AAChF,WAAO,MAAMc,2BAAcC,KAAK,MAAMnB,gBAAeE,MAAMC,SAASC,QAAAA,CAAAA;EACtE;;;;;;EAOA,aAAaqC,UAA6Bf,UAA+C;AACvF,WAAO,MAAMnB,QAAQC,IACnBkB,SAASjB,IAAkC,OAAON,YAAAA;AAChD,YAAMwB,QAAQ,MAAM3B,gBAAeE,MAAMC,OAAAA;AACzC,aAAO;QAACwB;QAAO,MAAM3B,gBAAemB,KAAKQ,KAAAA;;IAC3C,CAAA,CAAA;EAEJ;EAEA,aAAaP,eACXV,QACAI,QACAD,OACAF,OACAU,WACsB;AACtB,UAAMqB,aAAa,MAAM,KAAK1B,mBAAsBN,QAAQI,MAAAA;AAC5D6B,iCAAS9B,UAAUI,cAAa2B,6BAAa/B,KAAAA,GAAQ,MAAM,0BAAA;AAC3D,eAAOgC,qCACL;MACE,GAAGH;MACH/B,OAAOA,SAAU,MAAMX,gBAAewB,SAASkB,UAAAA;MAC/C7B,OAAO;QAAE,GAAGA;QAAOQ,WAAWA,aAAaR,OAAOQ,aAAaC,KAAKC,IAAG;MAAG;MAC1Eb;IACF,GACA,GAAA;EAEJ;EAIA,aAAasB,OAA0BN,UAA6C;AAClF,WAAO,MAAMR,2BAAcc,OAAON,QAAAA;EACpC;EAEA,aAAaoB,aAAgCC,MAA+C;AAC1F,UAAMC,SAAoC,CAAC;AAC3C,eAAWX,QAAQ,MAAM,KAAKI,UAAUM,IAAAA,GAAO;AAC7CC,aAAOX,KAAK,CAAA,CAAE,IAAIA,KAAK,CAAA;AACvBW,aAAOX,KAAK,CAAA,EAAG1B,KAAK,IAAI0B,KAAK,CAAA;IAC/B;AACA,WAAOW;EACT;EAEA,aAAaC,cAAiCF,MAA+C;AAC3F,UAAMC,SAAoC,CAAC;AAC3C,eAAWX,QAAQ,MAAM,KAAKZ,cAAcsB,IAAAA,GAAO;AACjDC,aAAOX,KAAK,CAAA,CAAE,IAAIA,KAAK,CAAA;IACzB;AACA,WAAOW;EACT;;;;;;EAOA,aAAaE,UAA6BH,MAA+C;AACvF,UAAMC,SAAoC,CAAC;AAC3C,eAAWX,QAAQ,MAAM,KAAKI,UAAUM,IAAAA,GAAO;AAC7CC,aAAOX,KAAK,CAAA,CAAE,IAAIA,KAAK,CAAA;IACzB;AACA,WAAOW;EACT;EAKA,OAAOG,YAAuCzB,UAAmB;AAC/D,QAAIrB,MAAMC,QAAQoB,QAAAA,GAAW;AAC3B,aAAOA,SAASjB,IAAI,CAACN,YAAY,KAAKgD,YAAYhD,OAAAA,CAAAA;IACpD,OAAO;AACL,UAAIuB,UAAU;AAEZ,cAAM,EAAEb,OAAO,GAAGmC,OAAAA,IAAWtB;AAC7B,eAAOsB;MACT;IACF;EACF;EAEA,MAAM9C,QAA8B;AAClC,UAAMc,qBAAqB,MAAM,KAAKA,mBAAkB;AACxD,UAAML,QAAQ,MAAMO,2BAAcC,KAAKH,kBAAAA;AACvC,UAAMH,QAAQ,MAAM,KAAKuC,WAAWzC,KAAAA;AACpC,UAAMS,iBAAkC;MAAE,GAAGJ;MAAoBL;MAAOE;IAAM;AAE9E,WAAOO;EACT;EAEA,MAAMA,iBAAiB;AACrB,WAAO,MAAMpB,gBAAeoB,mBAC1BuB,yBAAS,KAAKU,SAAS,MAAM,yBAAA,GAC7B,KAAKC,SACL,KAAKC,MAAM;EAEf;AACF;","names":["import_assert","import_object","import_hash","removeMetaAndSchema","payload","result","$hash","$meta","schema","PayloadBuilderBase","_$meta","_fields","_schema","constructor","options","fields","meta","removeEmptyFields","dataHashableFields","cleanFields","undefined","assertEx","isJsonObject","JSON","stringify","toJson","deepOmitPrefixedFields","metaFields","dataHash","otherMeta","timestamp","Date","now","fieldsOnly","value","PayloadBuilder","PayloadBuilderBase","build","payload","validate","Array","isArray","Promise","all","map","schema","$hash","incomingDataHash","$meta","fields","removeMetaAndSchema","dataHashableFields","undefined","PayloadHasher","hash","hashableFields","timestamp","Date","now","dataHash","dataHashPairs","payloads","built","dataHashes","filterExclude","filterExcludeByHash","filterExcludeByDataHash","hashes","filter","_","objHash","includes","pair","filterIncludeByDataHash","findByDataHash","find","hashPairs","dataFields","assertEx","isJsonObject","deepOmitPrefixedFields","toAllHashMap","objs","result","toDataHashMap","toHashMap","withoutMeta","metaFields","_schema","_fields","_$meta"]}

package/dist/browser/index.js

@@ -10,6 +10,13 @@ import { deepOmitPrefixedFields as deepOmitPrefixedFields2, PayloadHasher } from
 import { assertEx } from "@xylabs/assert";
 import { isJsonObject, toJson } from "@xylabs/object";
 import { deepOmitPrefixedFields, removeEmptyFields } from "@xyo-network/hash";
+var removeMetaAndSchema = /* @__PURE__ */ __name((payload) => {
+  const { ...result } = payload;
+  delete result.$hash;
+  delete result.$meta;
+  delete result.schema;
+  return result;
+}, "removeMetaAndSchema");
 var PayloadBuilderBase = class _PayloadBuilderBase {
   static {
     __name(this, "PayloadBuilderBase");
@@ -45,7 +52,7 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     return this;
   }
   async dataHashableFields() {
-    return await _PayloadBuilderBase.dataHashableFields(assertEx(this._schema, "Payload: Missing Schema"), this._fields);
+    return await _PayloadBuilderBase.dataHashableFields(assertEx(this._schema, () => "Payload: Missing Schema"), this._fields);
   }
   //we do not require sending in $hash since it will be generated anyway
   fields(fields) {
@@ -57,10 +64,7 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
       if (schema) {
         this.schema(schema);
       }
-      this._fields = {
-        ...this._fields,
-        ...removeEmptyFields(fieldsOnly)
-      };
+      this._fields = removeMetaAndSchema(fields);
     }
     return this;
   }
@@ -81,7 +85,8 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
     if (Array.isArray(payload)) {
       return await Promise.all(payload.map((payload2) => this.build(payload2)));
     } else {
-      const { schema, $hash: incomingDataHash, $meta, ...fields } = payload;
+      const { schema, $hash: incomingDataHash, $meta } = payload;
+      const fields = removeMetaAndSchema(payload);
       const dataHashableFields = await _PayloadBuilder.dataHashableFields(schema, fields);
       const $hash = validate || incomingDataHash === void 0 ? await PayloadHasher.hash(dataHashableFields) : incomingDataHash;
       const hashableFields = {
@@ -150,7 +155,7 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
   }
   static async hashableFields(schema, fields, $meta, $hash, timestamp) {
     const dataFields = await this.dataHashableFields(schema, fields);
-    assertEx2($meta === void 0 || isJsonObject2($meta), "$meta must be JsonObject");
+    assertEx2($meta === void 0 || isJsonObject2($meta), () => "$meta must be JsonObject");
     return deepOmitPrefixedFields2({
       ...dataFields,
       $hash: $hash ?? await _PayloadBuilder.dataHash(dataFields),
@@ -213,11 +218,12 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
     return hashableFields;
   }
   async hashableFields() {
-    return await _PayloadBuilder.hashableFields(assertEx2(this._schema, "Payload: Missing Schema"), this._fields, this._$meta);
+    return await _PayloadBuilder.hashableFields(assertEx2(this._schema, () => "Payload: Missing Schema"), this._fields, this._$meta);
   }
 };
 export {
   PayloadBuilder,
-  PayloadBuilderBase
+  PayloadBuilderBase,
+  removeMetaAndSchema
 };
 //# sourceMappingURL=index.js.map

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { AnyObject, isJsonObject, JsonObject } from '@xylabs/object'\nimport { deepOmitPrefixedFields, PayloadHasher } from '@xyo-network/hash'\nimport { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase } from './BuilderBase'\nimport { PayloadBuilderOptions } from './Options'\n\nexport class PayloadBuilder<\n  T extends Payload = Payload<AnyObject>,\n  O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>,\n> extends PayloadBuilderBase<T, O> {\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T, validate?: boolean): Promise<WithMeta<T>>\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T[], validate?: boolean): Promise<WithMeta<T>[]>\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T | T[], validate = false) {\n    if (Array.isArray(payload)) {\n      return await Promise.all(payload.map((payload) => this.build(payload)))\n    } else {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { schema, $hash: incomingDataHash, $meta, ...fields } = payload as WithMeta<T>\n      const dataHashableFields = await PayloadBuilder.dataHashableFields(schema, fields)\n      const $hash = validate || incomingDataHash === undefined ? await PayloadHasher.hash(dataHashableFields) : incomingDataHash\n      const hashableFields = { ...dataHashableFields, $hash, $meta: { ...$meta, timestamp: $meta?.timestamp ?? Date.now() } as JsonObject }\n\n      return hashableFields as WithMeta<T>\n    }\n  }\n\n  static async dataHash<T extends Payload>(payload: T, validate = true): Promise<Hash> {\n    return (await this.build(payload, validate)).$hash\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[], validate = true): Promise<[WithMeta<T>, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const built = await PayloadBuilder.build(payload, validate)\n        return [built, built.$hash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined, validate?: boolean): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[], validate?: boolean): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[], validate = true): Promise<Hash[] | undefined> {\n    return payloads ?\n        await Promise.all(\n          payloads.map(async (payload) => {\n            const built = await PayloadBuilder.build(payload, validate)\n            return built.$hash\n          }),\n        )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await PayloadHasher.filterExcludeByHash(await this.filterExcludeByDataHash(payloads, hash), hash)\n  }\n\n  static async filterExcludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => !hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async filterIncludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async findByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash): Promise<T | undefined> {\n    return (await this.dataHashPairs(payloads)).find(([_, objHash]) => objHash === hash)?.[0]\n  }\n\n  static async hash<T extends Payload>(payload: T, validate = false): Promise<Hash> {\n    return await PayloadHasher.hash(await PayloadBuilder.build(payload, validate))\n  }\n\n  /**\n   * Creates an array of payload/hash tuples based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns An array of payload/hash tuples\n   */\n  static async hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[WithMeta<T>, Hash]>>(async (payload) => {\n        const built = await PayloadBuilder.build(payload)\n        return [built, await PayloadBuilder.hash(built)]\n      }),\n    )\n  }\n\n  static async hashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: Omit<T, 'schema' | '$hash' | '$meta'>,\n    $meta?: JsonObject,\n    $hash?: Hash,\n    timestamp?: number,\n  ): Promise<WithMeta<T>> {\n    const dataFields = await this.dataHashableFields<T>(schema, fields)\n    assertEx($meta === undefined || isJsonObject($meta), '$meta must be JsonObject')\n    return deepOmitPrefixedFields<WithMeta<T>>(\n      {\n        ...dataFields,\n        $hash: $hash ?? (await PayloadBuilder.dataHash(dataFields)),\n        $meta: { ...$meta, timestamp: timestamp ?? $meta?.timestamp ?? Date.now() } as JsonObject,\n        schema,\n      } as WithMeta<T>,\n      '_',\n    )\n  }\n\n  static async hashes(payloads: undefined): Promise<undefined>\n  static async hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async hashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return await PayloadHasher.hashes(payloads)\n  }\n\n  static async toAllHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n      result[pair[0].$hash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.dataHashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  /**\n   * Creates an object map of payload hashes to payloads based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns A map of hashes to payloads\n   */\n  static async toHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  static withoutMeta(payload: undefined): undefined\n  static withoutMeta<T extends PayloadWithMeta>(payload: T): Omit<T, '$meta'>\n  static withoutMeta<T extends PayloadWithMeta>(payloads: T[]): Omit<T, '$meta'>[]\n  static withoutMeta<T extends PayloadWithMeta>(payloads: T | T[]) {\n    if (Array.isArray(payloads)) {\n      return payloads.map((payload) => this.withoutMeta(payload))\n    } else {\n      if (payloads) {\n        // eslint-disable-next-line @typescript-eslint/no-unused-vars\n        const { $meta, ...result } = payloads\n        return result as Omit<T, '$meta'>\n      }\n    }\n  }\n\n  async build(): Promise<WithMeta<T>> {\n    const dataHashableFields = await this.dataHashableFields()\n    const $hash = await PayloadHasher.hash(dataHashableFields)\n    const $meta = await this.metaFields($hash)\n    const hashableFields: PayloadWithMeta = { ...dataHashableFields, $hash, $meta }\n\n    return hashableFields as WithMeta<T>\n  }\n\n  async hashableFields() {\n    return await PayloadBuilder.hashableFields(assertEx(this._schema, 'Payload: Missing Schema'), this._fields, this._$meta)\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { AnyObject, isJsonObject, JsonObject, toJson } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { deepOmitPrefixedFields, removeEmptyFields } from '@xyo-network/hash'\nimport { Payload, Schema, WithMeta } from '@xyo-network/payload-model'\n\nimport { PayloadBuilderOptions } from './Options'\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _$meta?: JsonObject\n  protected _fields?: Omit<T, 'schema' | '$hash' | '$meta'>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields, meta } = options\n    this._schema = schema\n    this._fields = removeEmptyFields(fields ?? {}) as Omit<T, 'schema' | '$hash' | '$meta'>\n    this._$meta = meta\n  }\n\n  static dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: Omit<T, 'schema' | '$hash' | '$meta'>,\n  ): Promisable<Omit<T, '$hash' | '$meta'>> {\n    const cleanFields = fields ? removeEmptyFields(fields) : undefined\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return deepOmitPrefixedFields(deepOmitPrefixedFields({ schema, ...cleanFields }, '$'), '_') as T\n  }\n\n  protected static metaFields(dataHash: Hash, otherMeta?: JsonObject): Promisable<JsonObject> {\n    const meta: JsonObject = { ...otherMeta }\n\n    meta.timestamp = meta.timestamp ?? Date.now()\n\n    return meta\n  }\n\n  $meta(meta?: JsonObject) {\n    this._$meta = meta ?? (this._fields as WithMeta<T>).$meta\n    return this\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(assertEx(this._schema, 'Payload: Missing Schema'), this._fields)\n  }\n\n  //we do not require sending in $hash since it will be generated anyway\n  fields(fields: Omit<WithMeta<T>, '$hash' | 'schema' | '$meta'> & Partial<Pick<WithMeta<T>, '$hash' | 'schema' | '$meta'>>) {\n    if (fields) {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { $meta, $hash, schema, ...fieldsOnly } = fields\n      if ($meta) {\n        this.$meta($meta)\n      }\n      if (schema) {\n        this.schema(schema)\n      }\n      this._fields = { ...this._fields, ...removeEmptyFields(fieldsOnly) } as T\n    }\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n\n  protected async metaFields(dataHash: Hash): Promise<JsonObject> {\n    return await PayloadBuilderBase.metaFields(dataHash, this._$meta)\n  }\n}\n"],"mappings":"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","names":["assertEx","isJsonObject","deepOmitPrefixedFields","PayloadHasher","assertEx","isJsonObject","toJson","deepOmitPrefixedFields","removeEmptyFields","PayloadBuilderBase","_$meta","_fields","_schema","constructor","options","schema","fields","meta","removeEmptyFields","dataHashableFields","cleanFields","undefined","assertEx","isJsonObject","JSON","stringify","toJson","deepOmitPrefixedFields","metaFields","dataHash","otherMeta","timestamp","Date","now","$meta","$hash","fieldsOnly","value","PayloadBuilder","PayloadBuilderBase","build","payload","validate","Array","isArray","Promise","all","map","schema","$hash","incomingDataHash","$meta","fields","dataHashableFields","undefined","PayloadHasher","hash","hashableFields","timestamp","Date","now","dataHash","dataHashPairs","payloads","built","dataHashes","filterExclude","filterExcludeByHash","filterExcludeByDataHash","hashes","filter","_","objHash","includes","pair","filterIncludeByDataHash","findByDataHash","find","hashPairs","dataFields","assertEx","isJsonObject","deepOmitPrefixedFields","toAllHashMap","objs","result","toDataHashMap","toHashMap","withoutMeta","metaFields","_schema","_fields","_$meta"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { AnyObject, isJsonObject, JsonObject } from '@xylabs/object'\nimport { deepOmitPrefixedFields, PayloadHasher } from '@xyo-network/hash'\nimport { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase, removeMetaAndSchema, WithoutMeta, WithoutSchema } from './BuilderBase'\nimport { PayloadBuilderOptions } from './Options'\n\nexport class PayloadBuilder<\n  T extends Payload = Payload<AnyObject>,\n  O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>,\n> extends PayloadBuilderBase<T, O> {\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T, validate?: boolean): Promise<WithMeta<T>>\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T[], validate?: boolean): Promise<WithMeta<T>[]>\n  static async build<T extends Payload = Payload<AnyObject>>(payload: T | T[], validate = false) {\n    if (Array.isArray(payload)) {\n      return await Promise.all(payload.map((payload) => this.build(payload)))\n    } else {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { schema, $hash: incomingDataHash, $meta } = payload as WithMeta<T>\n      const fields = removeMetaAndSchema(payload)\n      const dataHashableFields = await PayloadBuilder.dataHashableFields(schema, fields)\n      const $hash = validate || incomingDataHash === undefined ? await PayloadHasher.hash(dataHashableFields) : incomingDataHash\n      const hashableFields = { ...dataHashableFields, $hash, $meta: { ...$meta, timestamp: $meta?.timestamp ?? Date.now() } as JsonObject }\n\n      return hashableFields as WithMeta<T>\n    }\n  }\n\n  static async dataHash<T extends Payload>(payload: T, validate = true): Promise<Hash> {\n    return (await this.build(payload, validate)).$hash\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[], validate = true): Promise<[WithMeta<T>, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const built = await PayloadBuilder.build(payload, validate)\n        return [built, built.$hash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined, validate?: boolean): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[], validate?: boolean): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[], validate = true): Promise<Hash[] | undefined> {\n    return payloads ?\n        await Promise.all(\n          payloads.map(async (payload) => {\n            const built = await PayloadBuilder.build(payload, validate)\n            return built.$hash\n          }),\n        )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await PayloadHasher.filterExcludeByHash(await this.filterExcludeByDataHash(payloads, hash), hash)\n  }\n\n  static async filterExcludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => !hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async filterIncludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async findByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash): Promise<T | undefined> {\n    return (await this.dataHashPairs(payloads)).find(([_, objHash]) => objHash === hash)?.[0]\n  }\n\n  static async hash<T extends Payload>(payload: T, validate = false): Promise<Hash> {\n    return await PayloadHasher.hash(await PayloadBuilder.build(payload, validate))\n  }\n\n  /**\n   * Creates an array of payload/hash tuples based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns An array of payload/hash tuples\n   */\n  static async hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[WithMeta<T>, Hash]>>(async (payload) => {\n        const built = await PayloadBuilder.build(payload)\n        return [built, await PayloadBuilder.hash(built)]\n      }),\n    )\n  }\n\n  static async hashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n    $meta?: JsonObject,\n    $hash?: Hash,\n    timestamp?: number,\n  ): Promise<WithMeta<T>> {\n    const dataFields = await this.dataHashableFields<T>(schema, fields)\n    assertEx($meta === undefined || isJsonObject($meta), () => '$meta must be JsonObject')\n    return deepOmitPrefixedFields<WithMeta<T>>(\n      {\n        ...dataFields,\n        $hash: $hash ?? (await PayloadBuilder.dataHash(dataFields)),\n        $meta: { ...$meta, timestamp: timestamp ?? $meta?.timestamp ?? Date.now() } as JsonObject,\n        schema,\n      } as WithMeta<T>,\n      '_',\n    )\n  }\n\n  static async hashes(payloads: undefined): Promise<undefined>\n  static async hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async hashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return await PayloadHasher.hashes(payloads)\n  }\n\n  static async toAllHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n      result[pair[0].$hash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.dataHashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  /**\n   * Creates an object map of payload hashes to payloads based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns A map of hashes to payloads\n   */\n  static async toHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>> {\n    const result: Record<Hash, WithMeta<T>> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  static withoutMeta(payload: undefined): undefined\n  static withoutMeta<T extends PayloadWithMeta>(payload: T): Omit<T, '$meta'>\n  static withoutMeta<T extends PayloadWithMeta>(payloads: T[]): Omit<T, '$meta'>[]\n  static withoutMeta<T extends PayloadWithMeta>(payloads: T | T[]) {\n    if (Array.isArray(payloads)) {\n      return payloads.map((payload) => this.withoutMeta(payload))\n    } else {\n      if (payloads) {\n        // eslint-disable-next-line @typescript-eslint/no-unused-vars\n        const { $meta, ...result } = payloads\n        return result as Omit<T, '$meta'>\n      }\n    }\n  }\n\n  async build(): Promise<WithMeta<T>> {\n    const dataHashableFields = await this.dataHashableFields()\n    const $hash = await PayloadHasher.hash(dataHashableFields)\n    const $meta = await this.metaFields($hash)\n    const hashableFields: PayloadWithMeta = { ...dataHashableFields, $hash, $meta }\n\n    return hashableFields as WithMeta<T>\n  }\n\n  async hashableFields() {\n    return await PayloadBuilder.hashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      this._fields,\n      this._$meta,\n    )\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { AnyObject, isJsonObject, JsonObject, toJson } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { deepOmitPrefixedFields, removeEmptyFields } from '@xyo-network/hash'\nimport { Payload, Schema, WithMeta, WithOptionalMeta } from '@xyo-network/payload-model'\n\nimport { PayloadBuilderOptions } from './Options'\n\nexport type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>\n\nexport type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>\n\nexport type WithoutMeta<T extends WithOptionalMeta<Payload>> = Omit<T, '$hash' | '$meta'>\n\nexport const removeMetaAndSchema = <T extends Payload>(payload: WithOptionalSchema<WithOptionalMeta<T>>): WithoutSchema<WithoutMeta<T>> => {\n  const { ...result } = payload\n  delete result.$hash\n  delete result.$meta\n  delete result.schema\n  return result as Omit<T, 'schema'>\n}\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _$meta?: JsonObject\n  protected _fields?: WithoutSchema<WithoutMeta<T>>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields, meta } = options\n    this._schema = schema\n    this._fields = removeEmptyFields(fields ?? {}) as WithoutSchema<WithoutMeta<T>>\n    this._$meta = meta\n  }\n\n  static dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promisable<Omit<T, '$hash' | '$meta'>> {\n    const cleanFields = fields ? removeEmptyFields(fields) : undefined\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return deepOmitPrefixedFields(deepOmitPrefixedFields({ schema, ...cleanFields }, '$'), '_') as T\n  }\n\n  protected static metaFields(dataHash: Hash, otherMeta?: JsonObject): Promisable<JsonObject> {\n    const meta: JsonObject = { ...otherMeta }\n\n    meta.timestamp = meta.timestamp ?? Date.now()\n\n    return meta\n  }\n\n  $meta(meta?: JsonObject) {\n    this._$meta = meta ?? (this._fields as WithMeta<T>).$meta\n    return this\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      this._fields,\n    )\n  }\n\n  //we do not require sending in $hash since it will be generated anyway\n  fields(fields: WithOptionalSchema<WithOptionalMeta<T>>) {\n    if (fields) {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { $meta, $hash, schema, ...fieldsOnly } = fields\n      if ($meta) {\n        this.$meta($meta)\n      }\n      if (schema) {\n        this.schema(schema)\n      }\n      this._fields = removeMetaAndSchema<T>(fields)\n    }\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n\n  protected async metaFields(dataHash: Hash): Promise<JsonObject> {\n    return await PayloadBuilderBase.metaFields(dataHash, this._$meta)\n  }\n}\n"],"mappings":"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","names":["assertEx","isJsonObject","deepOmitPrefixedFields","PayloadHasher","assertEx","isJsonObject","toJson","deepOmitPrefixedFields","removeEmptyFields","removeMetaAndSchema","payload","result","$hash","$meta","schema","PayloadBuilderBase","_$meta","_fields","_schema","constructor","options","fields","meta","removeEmptyFields","dataHashableFields","cleanFields","undefined","assertEx","isJsonObject","JSON","stringify","toJson","deepOmitPrefixedFields","metaFields","dataHash","otherMeta","timestamp","Date","now","fieldsOnly","value","PayloadBuilder","PayloadBuilderBase","build","payload","validate","Array","isArray","Promise","all","map","schema","$hash","incomingDataHash","$meta","fields","removeMetaAndSchema","dataHashableFields","undefined","PayloadHasher","hash","hashableFields","timestamp","Date","now","dataHash","dataHashPairs","payloads","built","dataHashes","filterExclude","filterExcludeByHash","filterExcludeByDataHash","hashes","filter","_","objHash","includes","pair","filterIncludeByDataHash","findByDataHash","find","hashPairs","dataFields","assertEx","isJsonObject","deepOmitPrefixedFields","toAllHashMap","objs","result","toDataHashMap","toHashMap","withoutMeta","metaFields","_schema","_fields","_$meta"]}

package/dist/node/Builder.d.cts

@@ -1,7 +1,7 @@
 import { Hash } from '@xylabs/hex';
 import { AnyObject, JsonObject } from '@xylabs/object';
 import { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model';
-import { PayloadBuilderBase } from './BuilderBase';
+import { PayloadBuilderBase, WithoutMeta, WithoutSchema } from './BuilderBase';
 import { PayloadBuilderOptions } from './Options';
 export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> extends PayloadBuilderBase<T, O> {
     static build<T extends Payload = Payload<AnyObject>>(payload: T, validate?: boolean): Promise<WithMeta<T>>;
@@ -21,7 +21,7 @@ export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O ex
      * @returns An array of payload/hash tuples
      */
     static hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]>;
-    static hashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: Omit<T, 'schema' | '$hash' | '$meta'>, $meta?: JsonObject, $hash?: Hash, timestamp?: number): Promise<WithMeta<T>>;
+    static hashableFields<T extends Payload = Payload<AnyObject>>(schema: string, fields?: WithoutSchema<WithoutMeta<T>>, $meta?: JsonObject, $hash?: Hash, timestamp?: number): Promise<WithMeta<T>>;
     static hashes(payloads: undefined): Promise<undefined>;
     static hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>;
     static toAllHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, WithMeta<T>>>;

package/dist/node/Builder.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/Builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/Builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,SAAS,EAAgB,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEpE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE/E,OAAO,EAAE,kBAAkB,EAAuB,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AACnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,qBAAa,cAAc,CACzB,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EACtC,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAC7D,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;WACnB,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;WACnG,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;WAgBvG,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;WAIvE,aAAa,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,UAAO,GAAG,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;WAShG,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;WACvE,UAAU,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;WAYjF,aAAa,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,iBAAU,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;WAIvF,uBAAuB,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,iBAAU,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;WAKjG,uBAAuB,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,iBAAU,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;WAKjG,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,iBAAU,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;WAIzF,IAAI,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjF;;;;OAIG;WACU,SAAS,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;WAS3E,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAChE,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EACtC,KAAK,CAAC,EAAE,UAAU,EAClB,KAAK,CAAC,EAAE,IAAI,EACZ,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;WAcV,MAAM,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;WAC/C,MAAM,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;WAKzD,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;WAS9E,aAAa,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAQ5F;;;;OAIG;WACU,SAAS,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAQxF,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS;IACjD,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,eAAe,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;IAC3E,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,eAAe,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE;IAa1E,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAS7B,cAAc;CAOrB"}