@xyo-network/payload-builder 3.6.0-rc.5 → 3.6.0-rc.7

package/dist/browser/Builder.d.ts

@@ -1,6 +1,6 @@
 import type { Hash } from '@xylabs/hex';
 import type { AnyObject } from '@xylabs/object';
-import { type Payload, type WithHashMeta, type WithStorageMeta } from '@xyo-network/payload-model';
+import { type Payload, type WithHashMeta, type WithoutStorageMeta, type WithStorageMeta } from '@xyo-network/payload-model';
 import { PayloadBuilderBase } from './BuilderBase.ts';
 import type { PayloadBuilderOptions } from './Options.ts';
 export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> extends PayloadBuilderBase<T, O> {
@@ -25,7 +25,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<[T, Hash][]>;
-    static hashableFields<T extends Payload>(payload: T): T;
+    static hashableFields<T extends Payload>(payload: T): WithoutStorageMeta<T>;
     static hashes(payloads: undefined): Promise<undefined>;
     static hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>;
     static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction?: -1 | 1): WithStorageMeta<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":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,EACL,KAAK,OAAO,EAEZ,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEzD,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,WAAW,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;WACpE,WAAW,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;WAmBzE,uBAAuB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;WAS7F,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;WAC1E,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IAa5F,MAAM,CAAC,kBAAkB,CAAC,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC;WAIrE,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;WAItD,aAAa,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;WASrE,UAAU,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;WACnD,UAAU,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;WAW7D,aAAa,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,YAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;WAIvF,uBAAuB,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,YAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;WAKjG,uBAAuB,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,YAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;WAKjG,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,YAAK,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;WAIzF,IAAI,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D;;;;OAIG;WACU,SAAS,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IAQ9E,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,OAAO,EACrC,OAAO,EAAE,CAAC,GACT,kBAAkB,CAAC,CAAC,CAAC;WAIX,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;IAKtE,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,GAAE,CAAC,CAAC,GAAG,CAAK;WASpF,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;WAUxE,aAAa,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAQlF;;;;OAIG;WACU,SAAS,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAQ9E,KAAK,IAAI,CAAC;CAMX"}

package/dist/browser/BuilderBase.d.ts

@@ -1,28 +1,25 @@
-import type { AnyObject } from '@xylabs/object';
+import type { AnyObject, EmptyObject } from '@xylabs/object';
 import type { Promisable } from '@xylabs/promise';
-import type { Payload, Schema } from '@xyo-network/payload-model';
+import type { DeepOmitStartsWith, Payload, Schema, WithOptionalSchema, WithoutClientMeta, WithoutMeta, WithoutPrivateStorageMeta, WithoutSchema, WithoutStorageMeta } from '@xyo-network/payload-model';
 import type { PayloadBuilderOptions } from './Options.ts';
-export type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>;
-export type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>;
-export declare const removeMetaAndSchema: <T extends Payload>(payload: Partial<WithOptionalSchema<T>>) => WithoutSchema<T>;
+export declare const omitByPrefix: <T extends EmptyObject, P extends string>(payload: T, prefix: P, maxDepth?: number) => DeepOmitStartsWith<T, P>;
+export declare const omitSchema: <T extends WithOptionalSchema>(payload: T) => WithoutSchema<T>;
 export declare class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
     readonly options: O;
-    protected _fields?: Partial<WithoutSchema<T>>;
+    protected _fields?: WithoutMeta<WithoutSchema<T>>;
     protected _schema: Schema;
     constructor(options: O);
-    static dataHashableFields<T extends Payload>(schema: Schema, payload: WithoutSchema<T>): Promisable<Payload>;
-    static omitClientMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitClientMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitPrivateStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitPrivateStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    dataHashableFields(): Promise<{
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields>;
-    fields(fields: WithOptionalSchema<T>): this;
+    static dataHashableFields<T extends Payload>(schema: Schema, payload: WithoutSchema<T>): Promisable<WithoutMeta<T>>;
+    static omitClientMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutClientMeta<T>;
+    static omitClientMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutClientMeta<T>[];
+    static omitMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutMeta<T>;
+    static omitMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutMeta<T>[];
+    static omitPrivateStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutPrivateStorageMeta<T>;
+    static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutPrivateStorageMeta<T>[];
+    static omitStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutStorageMeta<T>;
+    static omitStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutStorageMeta<T>[];
+    dataHashableFields(): Promise<DeepOmitStartsWith<DeepOmitStartsWith<T, "_">, "$">>;
+    fields(fields: WithoutMeta<WithoutSchema<T>>): this;
     schema(value: Schema): void;
 }
 //# sourceMappingURL=BuilderBase.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAI/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEzD,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,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,OAAO,WAAW,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAG,aAAa,CAAC,CAAC,CAI/G,CAAA;AAOD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAIvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAH/B,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAM/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,EACzC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAExB,UAAU,CAAC,OAAO,CAAC;IAStB,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAC1E,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAO/E,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IACpE,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAOzE,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAClF,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAOvF,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAC3E,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAO1E,kBAAkB;;;IAQxB,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAYpC,MAAM,CAAC,KAAK,EAAE,MAAM;CAGrB"}
+{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EACV,kBAAkB,EAClB,OAAO,EAAE,MAAM,EACf,kBAAkB,EAClB,iBAAiB,EACjB,WAAW,EACX,yBAAyB,EACzB,aAAa,EACb,kBAAkB,EACnB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEzD,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,MAAM,WAAW,CAAC,UAAU,CAAC,wBAAmB,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAEpI,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,kBAAkB,WAAW,CAAC,KAAG,aAAa,CAAC,CAAC,CAIpF,CAAA;AAOD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EACpE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAIjD,QAAQ,CAAC,OAAO,EAAE,CAAC;IAH/B,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAQ/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,EACzC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAExB,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAS7B,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC;IACjG,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE;IAOtG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC;IACrF,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE;IAO1F,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC;IACjH,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC,EAAE;IAOtH,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC;IACnG,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE;IAOlG,kBAAkB;IAQxB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAM5C,MAAM,CAAC,KAAK,EAAE,MAAM;CAGrB"}

package/dist/browser/Options.d.ts

@@ -1,8 +1,8 @@
 import type { Logger } from '@xylabs/logger';
-import type { JsonObject } from '@xylabs/object';
-import type { Schema } from '@xyo-network/payload-model';
-export interface PayloadBuilderOptions<T> {
-    readonly fields?: Partial<T>;
+import type { EmptyObject, JsonObject } from '@xylabs/object';
+import type { Schema, WithoutMeta, WithoutSchema } from '@xyo-network/payload-model';
+export interface PayloadBuilderOptions<T extends EmptyObject = EmptyObject> {
+    readonly fields?: WithoutMeta<WithoutSchema<T>>;
     readonly logger?: Logger;
     readonly meta?: JsonObject;
     readonly schema: Schema;

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

@@ -1 +1 @@
-{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/Options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB"}
+{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/Options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,KAAK,EACV,MAAM,EAAE,WAAW,EAAE,aAAa,EACnC,MAAM,4BAA4B,CAAA;AAEnC,MAAM,WAAW,qBAAqB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW;IACxE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB"}

package/dist/browser/index.mjs

@@ -12,8 +12,11 @@ import {
   toJson
 } from "@xylabs/object";
 import { removeEmptyFields } from "@xyo-network/hash";
-var removeMetaAndSchema = (payload) => {
-  const { ...result } = PayloadBuilder.omitMeta(payload);
+var omitByPrefix = (payload, prefix, maxDepth = 100) => {
+  return omitBy(payload, omitByPrefixPredicate(prefix), maxDepth);
+};
+var omitSchema = (payload) => {
+  const result = structuredClone(payload);
   delete result.schema;
   return result;
 };
@@ -26,7 +29,9 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     this.options = options;
     const { schema, fields } = options;
     this._schema = schema;
-    this._fields = removeMetaAndSchema(removeEmptyFields(structuredClone(fields ?? {})));
+    if (fields) {
+      this.fields(fields);
+    }
   }
   _fields;
   _schema;
@@ -39,16 +44,16 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     return this.omitMeta(cleanFields);
   }
   static omitClientMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitClientMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("$"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitClientMeta(payload, maxDepth)) : omitByPrefix(payloads, "$", maxDepth);
   }
   static omitMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth) : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitMeta(payload, maxDepth)) : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth);
   }
   static omitPrivateStorageMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitPrivateStorageMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("__"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitPrivateStorageMeta(payload, maxDepth)) : omitByPrefix(payloads, "__", maxDepth);
   }
   static omitStorageMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitStorageMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("_"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitStorageMeta(payload, maxDepth)) : omitByPrefix(payloads, "_", maxDepth);
   }
   async dataHashableFields() {
     return await _PayloadBuilderBase.dataHashableFields(
@@ -58,14 +63,7 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     );
   }
   fields(fields) {
-    if (fields) {
-      const fieldsClone = structuredClone(fields);
-      const { schema } = fieldsClone;
-      if (schema) {
-        this.schema(schema);
-      }
-      this._fields = removeEmptyFields(removeMetaAndSchema(fieldsClone));
-    }
+    this._fields = omitSchema(_PayloadBuilderBase.omitMeta(removeEmptyFields(structuredClone(fields))));
     return this;
   }
   schema(value) {
@@ -206,6 +204,7 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
 export {
   PayloadBuilder,
   PayloadBuilderBase,
-  removeMetaAndSchema
+  omitByPrefix,
+  omitSchema
 };
 //# sourceMappingURL=index.mjs.map

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["import type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { ObjectHasher } from '@xyo-network/hash'\nimport {\n  type Payload,\n  SequenceParser,\n  type WithHashMeta,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase } from './BuilderBase.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 addHashMeta<T extends Payload>(payload: T): Promise<WithHashMeta<T>>\n  static async addHashMeta<T extends Payload>(payloads: T[]): Promise<WithHashMeta<T>[]>\n  static async addHashMeta<T extends Payload>(payloads: T | T[]): Promise<WithHashMeta<T>[] | WithHashMeta<T>> {\n    if (Array.isArray(payloads)) {\n      return await Promise.all(\n        payloads.map(async (payload) => {\n          return await this.addHashMeta(payload)\n        }),\n      )\n    } else {\n      const _hash = await PayloadBuilder.hash(payloads)\n      const _dataHash = await PayloadBuilder.dataHash(payloads)\n      return {\n        ...payloads,\n        _dataHash,\n        _hash,\n      }\n    }\n  }\n\n  static async addSequencedStorageMeta<T extends Payload = Payload>(payload: T): Promise<WithStorageMeta<T>> {\n    const withHashMeta = await this.addHashMeta(payload)\n    const _sequence = SequenceParser.from(Date.now(), withHashMeta._hash).localSequence\n    return {\n      ...withHashMeta,\n      _sequence,\n    }\n  }\n\n  static async addStorageMeta<T extends Payload>(payload: T): Promise<WithStorageMeta<T>>\n  static async addStorageMeta<T extends Payload>(payloads: T[]): Promise<WithStorageMeta<T>[]>\n  static async addStorageMeta<T extends Payload>(payloads: T | T[]): Promise<WithStorageMeta<T>[] | WithStorageMeta<T>> {\n    return Array.isArray(payloads)\n      ? await (async () => {\n        return await Promise.all(payloads.map(async payload => await this.addSequencedStorageMeta(\n          payload,\n        )))\n      })()\n      : this.addSequencedStorageMeta(\n          payloads,\n        )\n  }\n\n  static compareStorageMeta(a: WithStorageMeta<Payload>, b: WithStorageMeta<Payload>) {\n    return a._sequence > b._sequence ? 1 : a._sequence < b._sequence ? -1 : 0\n  }\n\n  static async dataHash<T extends Payload>(payload: T): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitMeta(payload))\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[]): Promise<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const dataHash = await this.dataHash(payload)\n        return [payload, dataHash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return payloads\n      ? await Promise.all(\n        payloads.map(async (payload) => {\n          return await PayloadBuilder.dataHash(payload)\n        }),\n      )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await ObjectHasher.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): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitStorageMeta(payload))\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<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[T, Hash]>>(async (payload) => {\n        return [payload, await PayloadBuilder.hash(payload)]\n      }),\n    )\n  }\n\n  static hashableFields<T extends Payload>(\n    payload: T,\n  ): T {\n    return this.omitStorageMeta(payload)\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 ObjectHasher.hashes(payloads)\n  }\n\n  static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction: -1 | 1 = 1) {\n    return payloads.sort((a, b) =>\n      a._sequence < b._sequence\n        ? -direction\n        : a._sequence > b._sequence\n          ? direction\n          : 0)\n  }\n\n  static async toAllHashMap<T extends Payload>(payloads: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(payloads)) {\n      const dataHash = await this.dataHash(pair[0])\n      result[pair[1]] = pair[0]\n      result[dataHash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, 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, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  build(): T {\n    return {\n      schema: this._schema,\n      ...this._fields,\n    } as T\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { AnyObject } from '@xylabs/object'\nimport {\n  isJsonObject, omitBy, toJson,\n} from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport { removeEmptyFields } from '@xyo-network/hash'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nimport { PayloadBuilder } from './Builder.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 const removeMetaAndSchema = <T extends Payload>(payload: Partial<WithOptionalSchema<T>>): WithoutSchema<T> => {\n  const { ...result } = PayloadBuilder.omitMeta(payload as T) as WithOptionalSchema<T>\n  delete result.schema\n  return result as Omit<T, 'schema'>\n}\n\nconst omitByPrefixPredicate = (prefix: string) => (_: unknown, key: string) => {\n  assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n  return key.startsWith(prefix)\n}\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _fields?: Partial<WithoutSchema<T>>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields } = options\n    this._schema = schema\n    this._fields = removeMetaAndSchema(removeEmptyFields(structuredClone(fields ?? {})))\n  }\n\n  static dataHashableFields<T extends Payload>(\n    schema: Schema,\n    payload: WithoutSchema<T>,\n\n  ): Promisable<Payload> {\n    const cleanFields = removeEmptyFields({ ...payload, schema })\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return this.omitMeta(cleanFields) as T\n  }\n\n  static omitClientMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitClientMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitClientMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitClientMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('$'), maxDepth) as T\n  }\n\n  static omitMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth)\n      : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth)\n  }\n\n  static omitPrivateStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitPrivateStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitPrivateStorageMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitPrivateStorageMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('__'), maxDepth) as T\n  }\n\n  static omitStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitStorageMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitStorageMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('_'), maxDepth) as T\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      // TDOD: Add verification that required fields are present\n      this._fields as T,\n    )\n  }\n\n  fields(fields: WithOptionalSchema<T>) {\n    if (fields) {\n      const fieldsClone = structuredClone(fields)\n      const { schema } = fieldsClone\n      if (schema) {\n        this.schema(schema)\n      }\n      this._fields = removeEmptyFields(removeMetaAndSchema<T>(fieldsClone))\n    }\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n}\n"],"mappings":";AAEA,SAAS,oBAAoB;AAC7B;AAAA,EAEE;AAAA,OAGK;;;ACRP,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EAAc;AAAA,EAAQ;AAAA,OACjB;AAEP,SAAS,yBAAyB;AAU3B,IAAM,sBAAsB,CAAoB,YAA8D;AACnH,QAAM,EAAE,GAAG,OAAO,IAAI,eAAe,SAAS,OAAY;AAC1D,SAAO,OAAO;AACd,SAAO;AACT;AAEA,IAAM,wBAAwB,CAAC,WAAmB,CAAC,GAAY,QAAgB;AAC7E,WAAS,OAAO,QAAQ,UAAU,MAAM,qBAAqB,GAAG,KAAK,OAAO,GAAG,GAAG;AAClF,SAAO,IAAI,WAAW,MAAM;AAC9B;AAEO,IAAM,qBAAN,MAAM,oBAA0H;AAAA,EAIrI,YAAqB,SAAY;AAAZ;AACnB,UAAM,EAAE,QAAQ,OAAO,IAAI;AAC3B,SAAK,UAAU;AACf,SAAK,UAAU,oBAAoB,kBAAkB,gBAAgB,UAAU,CAAC,CAAC,CAAC,CAAC;AAAA,EACrF;AAAA,EAPU;AAAA,EACA;AAAA,EAQV,OAAO,mBACL,QACA,SAEqB;AACrB,UAAM,cAAc,kBAAkB,EAAE,GAAG,SAAS,OAAO,CAAC;AAC5D;AAAA,MACE,gBAAgB,UAAa,aAAa,WAAW;AAAA,MACrD,MAAM,8BAA8B,KAAK,UAAU,OAAO,WAAW,GAAG,MAAM,CAAC,CAAC;AAAA,IAClF;AACA,WAAO,KAAK,SAAS,WAAW;AAAA,EAClC;AAAA,EAIA,OAAO,eAAkC,UAAmB,WAAW,KAAc;AACnF,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,eAAe,SAAS,QAAQ,CAAC,IAC9D,OAAO,UAAU,sBAAsB,GAAG,GAAG,QAAQ;AAAA,EAC3D;AAAA,EAIA,OAAO,SAA4B,UAAmB,WAAW,KAAc;AAC7E,WAAO,MAAM,QAAQ,QAAQ,IACzB,KAAK,gBAAgB,KAAK,eAAe,UAAU,QAAQ,GAAG,QAAQ,IACtE,KAAK,gBAAgB,KAAK,eAAe,UAAU,QAAQ,GAAG,QAAQ;AAAA,EAC5E;AAAA,EAIA,OAAO,uBAA0C,UAAmB,WAAW,KAAc;AAC3F,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,uBAAuB,SAAS,QAAQ,CAAC,IACtE,OAAO,UAAU,sBAAsB,IAAI,GAAG,QAAQ;AAAA,EAC5D;AAAA,EAIA,OAAO,gBAAmC,UAAmB,WAAW,KAAc;AACpF,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,gBAAgB,SAAS,QAAQ,CAAC,IAC/D,OAAO,UAAU,sBAAsB,GAAG,GAAG,QAAQ;AAAA,EAC3D;AAAA,EAEA,MAAM,qBAAqB;AACzB,WAAO,MAAM,oBAAmB;AAAA,MAC9B,SAAS,KAAK,SAAS,MAAM,yBAAyB;AAAA;AAAA,MAEtD,KAAK;AAAA,IACP;AAAA,EACF;AAAA,EAEA,OAAO,QAA+B;AACpC,QAAI,QAAQ;AACV,YAAM,cAAc,gBAAgB,MAAM;AAC1C,YAAM,EAAE,OAAO,IAAI;AACnB,UAAI,QAAQ;AACV,aAAK,OAAO,MAAM;AAAA,MACpB;AACA,WAAK,UAAU,kBAAkB,oBAAuB,WAAW,CAAC;AAAA,IACtE;AACA,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,OAAe;AACpB,SAAK,UAAU;AAAA,EACjB;AACF;;;AD5FO,IAAM,iBAAN,MAAM,wBAGH,mBAAyB;AAAA,EAGjC,aAAa,YAA+B,UAAiE;AAC3G,QAAI,MAAM,QAAQ,QAAQ,GAAG;AAC3B,aAAO,MAAM,QAAQ;AAAA,QACnB,SAAS,IAAI,OAAO,YAAY;AAC9B,iBAAO,MAAM,KAAK,YAAY,OAAO;AAAA,QACvC,CAAC;AAAA,MACH;AAAA,IACF,OAAO;AACL,YAAM,QAAQ,MAAM,gBAAe,KAAK,QAAQ;AAChD,YAAM,YAAY,MAAM,gBAAe,SAAS,QAAQ;AACxD,aAAO;AAAA,QACL,GAAG;AAAA,QACH;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,aAAa,wBAAqD,SAAyC;AACzG,UAAM,eAAe,MAAM,KAAK,YAAY,OAAO;AACnD,UAAM,YAAY,eAAe,KAAK,KAAK,IAAI,GAAG,aAAa,KAAK,EAAE;AACtE,WAAO;AAAA,MACL,GAAG;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAAA,EAIA,aAAa,eAAkC,UAAuE;AACpH,WAAO,MAAM,QAAQ,QAAQ,IACzB,OAAO,YAAY;AACnB,aAAO,MAAM,QAAQ,IAAI,SAAS,IAAI,OAAM,YAAW,MAAM,KAAK;AAAA,QAChE;AAAA,MACF,CAAC,CAAC;AAAA,IACJ,GAAG,IACD,KAAK;AAAA,MACH;AAAA,IACF;AAAA,EACN;AAAA,EAEA,OAAO,mBAAmB,GAA6B,GAA6B;AAClF,WAAO,EAAE,YAAY,EAAE,YAAY,IAAI,EAAE,YAAY,EAAE,YAAY,KAAK;AAAA,EAC1E;AAAA,EAEA,aAAa,SAA4B,SAA2B;AAClE,WAAO,MAAM,aAAa,KAAK,KAAK,SAAS,OAAO,CAAC;AAAA,EACvD;AAAA,EAEA,aAAa,cAAiC,UAAqC;AACjF,WAAO,MAAM,QAAQ;AAAA,MACnB,SAAS,IAAI,OAAO,YAAY;AAC9B,cAAM,WAAW,MAAM,KAAK,SAAS,OAAO;AAC5C,eAAO,CAAC,SAAS,QAAQ;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAIA,aAAa,WAA8B,UAA6C;AACtF,WAAO,WACH,MAAM,QAAQ;AAAA,MACd,SAAS,IAAI,OAAO,YAAY;AAC9B,eAAO,MAAM,gBAAe,SAAS,OAAO;AAAA,MAC9C,CAAC;AAAA,IACH,IACE;AAAA,EACN;AAAA,EAEA,aAAa,cAAiC,WAAgB,CAAC,GAAG,MAAmC;AACnG,WAAO,MAAM,aAAa,oBAAoB,MAAM,KAAK,wBAAwB,UAAU,IAAI,GAAG,IAAI;AAAA,EACxG;AAAA,EAEA,aAAa,wBAA2C,WAAgB,CAAC,GAAG,MAAmC;AAC7G,UAAM,SAAS,MAAM,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI;AACjD,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,MAAM,CAAC,OAAO,SAAS,OAAO,CAAC,GAAG,IAAI,UAAQ,KAAK,CAAC,CAAC;AAAA,EACtH;AAAA,EAEA,aAAa,wBAA2C,WAAgB,CAAC,GAAG,MAAmC;AAC7G,UAAM,SAAS,MAAM,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI;AACjD,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,MAAM,OAAO,SAAS,OAAO,CAAC,GAAG,IAAI,UAAQ,KAAK,CAAC,CAAC;AAAA,EACrH;AAAA,EAEA,aAAa,eAAkC,WAAgB,CAAC,GAAG,MAAoC;AACrG,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,OAAO,MAAM,YAAY,IAAI,IAAI,CAAC;AAAA,EAC1F;AAAA,EAEA,aAAa,KAAwB,SAA2B;AAC9D,WAAO,MAAM,aAAa,KAAK,KAAK,gBAAgB,OAAO,CAAC;AAAA,EAC9D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,aAAa,UAA6B,UAAqC;AAC7E,WAAO,MAAM,QAAQ;AAAA,MACnB,SAAS,IAAwB,OAAO,YAAY;AAClD,eAAO,CAAC,SAAS,MAAM,gBAAe,KAAK,OAAO,CAAC;AAAA,MACrD,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,OAAO,eACL,SACG;AACH,WAAO,KAAK,gBAAgB,OAAO;AAAA,EACrC;AAAA,EAIA,aAAa,OAA0B,UAA6C;AAClF,WAAO,MAAM,aAAa,OAAO,QAAQ;AAAA,EAC3C;AAAA,EAEA,OAAO,kBAAqC,UAAgC,YAAoB,GAAG;AACjG,WAAO,SAAS,KAAK,CAAC,GAAG,MACvB,EAAE,YAAY,EAAE,YACZ,CAAC,YACD,EAAE,YAAY,EAAE,YACd,YACA,CAAC;AAAA,EACX;AAAA,EAEA,aAAa,aAAgC,UAAyC;AACpF,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,UAAU,QAAQ,GAAG;AACjD,YAAM,WAAW,MAAM,KAAK,SAAS,KAAK,CAAC,CAAC;AAC5C,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AACxB,aAAO,QAAQ,IAAI,KAAK,CAAC;AAAA,IAC3B;AACA,WAAO;AAAA,EACT;AAAA,EAEA,aAAa,cAAiC,MAAqC;AACjF,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,cAAc,IAAI,GAAG;AACjD,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AAAA,IAC1B;AACA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,aAAa,UAA6B,MAAqC;AAC7E,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,UAAU,IAAI,GAAG;AAC7C,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AAAA,IAC1B;AACA,WAAO;AAAA,EACT;AAAA,EAEA,QAAW;AACT,WAAO;AAAA,MACL,QAAQ,KAAK;AAAA,MACb,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["import type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { ObjectHasher } from '@xyo-network/hash'\nimport {\n  type Payload,\n  SequenceParser,\n  type WithHashMeta,\n  type WithoutStorageMeta,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase } from './BuilderBase.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 addHashMeta<T extends Payload>(payload: T): Promise<WithHashMeta<T>>\n  static async addHashMeta<T extends Payload>(payloads: T[]): Promise<WithHashMeta<T>[]>\n  static async addHashMeta<T extends Payload>(payloads: T | T[]): Promise<WithHashMeta<T>[] | WithHashMeta<T>> {\n    if (Array.isArray(payloads)) {\n      return await Promise.all(\n        payloads.map(async (payload) => {\n          return await this.addHashMeta(payload)\n        }),\n      )\n    } else {\n      const _hash = await PayloadBuilder.hash(payloads)\n      const _dataHash = await PayloadBuilder.dataHash(payloads)\n      return {\n        ...payloads,\n        _dataHash,\n        _hash,\n      }\n    }\n  }\n\n  static async addSequencedStorageMeta<T extends Payload = Payload>(payload: T): Promise<WithStorageMeta<T>> {\n    const withHashMeta = await this.addHashMeta(payload)\n    const _sequence = SequenceParser.from(Date.now(), withHashMeta._hash).localSequence\n    return {\n      ...withHashMeta,\n      _sequence,\n    }\n  }\n\n  static async addStorageMeta<T extends Payload>(payload: T): Promise<WithStorageMeta<T>>\n  static async addStorageMeta<T extends Payload>(payloads: T[]): Promise<WithStorageMeta<T>[]>\n  static async addStorageMeta<T extends Payload>(payloads: T | T[]): Promise<WithStorageMeta<T>[] | WithStorageMeta<T>> {\n    return Array.isArray(payloads)\n      ? await (async () => {\n        return await Promise.all(payloads.map(async payload => await this.addSequencedStorageMeta(\n          payload,\n        )))\n      })()\n      : this.addSequencedStorageMeta(\n          payloads,\n        )\n  }\n\n  static compareStorageMeta(a: WithStorageMeta<Payload>, b: WithStorageMeta<Payload>) {\n    return a._sequence > b._sequence ? 1 : a._sequence < b._sequence ? -1 : 0\n  }\n\n  static async dataHash<T extends Payload>(payload: T): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitMeta(payload))\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[]): Promise<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const dataHash = await this.dataHash(payload)\n        return [payload, dataHash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return payloads\n      ? await Promise.all(\n        payloads.map(async (payload) => {\n          return await PayloadBuilder.dataHash(payload)\n        }),\n      )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await ObjectHasher.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): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitStorageMeta(payload))\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<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[T, Hash]>>(async (payload) => {\n        return [payload, await PayloadBuilder.hash(payload)]\n      }),\n    )\n  }\n\n  static hashableFields<T extends Payload>(\n    payload: T,\n  ): WithoutStorageMeta<T> {\n    return this.omitStorageMeta(payload)\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 ObjectHasher.hashes(payloads)\n  }\n\n  static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction: -1 | 1 = 1) {\n    return payloads.sort((a, b) =>\n      a._sequence < b._sequence\n        ? -direction\n        : a._sequence > b._sequence\n          ? direction\n          : 0)\n  }\n\n  static async toAllHashMap<T extends Payload>(payloads: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(payloads)) {\n      const dataHash = await this.dataHash(pair[0])\n      result[pair[1]] = pair[0]\n      result[dataHash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, 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, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  build(): T {\n    return {\n      schema: this._schema,\n      ...this._fields,\n    } as T\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { AnyObject, EmptyObject } from '@xylabs/object'\nimport {\n  isJsonObject, omitBy, toJson,\n} from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport { removeEmptyFields } from '@xyo-network/hash'\nimport type {\n  DeepOmitStartsWith,\n  Payload, Schema,\n  WithOptionalSchema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutPrivateStorageMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport type { PayloadBuilderOptions } from './Options.ts'\n\nexport const omitByPrefix = <T extends EmptyObject, P extends string>(payload: T, prefix: P, maxDepth = 100): DeepOmitStartsWith<T, P> => {\n  return omitBy(payload, omitByPrefixPredicate(prefix), maxDepth) as unknown as DeepOmitStartsWith<T, P>\n}\n\nexport const omitSchema = <T extends WithOptionalSchema>(payload: T): WithoutSchema<T> => {\n  const result = structuredClone(payload)\n  delete result.schema\n  return result\n}\n\nconst omitByPrefixPredicate = (prefix: string) => (_: unknown, key: string) => {\n  assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n  return key.startsWith(prefix)\n}\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>,\n  O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _fields?: WithoutMeta<WithoutSchema<T>>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields } = options\n    this._schema = schema\n    if (fields) {\n      this.fields(fields)\n    }\n  }\n\n  static dataHashableFields<T extends Payload>(\n    schema: Schema,\n    payload: WithoutSchema<T>,\n\n  ): Promisable<WithoutMeta<T>> {\n    const cleanFields = removeEmptyFields({ ...payload, schema })\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return this.omitMeta(cleanFields) as WithoutMeta<T>\n  }\n\n  static omitClientMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutClientMeta<T>\n  static omitClientMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutClientMeta<T>[]\n  static omitClientMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutClientMeta<T> | WithoutClientMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitClientMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '$', maxDepth)\n  }\n\n  static omitMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutMeta<T>\n  static omitMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutMeta<T>[]\n  static omitMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutMeta<T> | WithoutMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitMeta(payload, maxDepth))\n      : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth) as unknown as WithoutMeta<T>\n  }\n\n  static omitPrivateStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutPrivateStorageMeta<T>\n  static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutPrivateStorageMeta<T>[]\n  static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutPrivateStorageMeta<T> | WithoutPrivateStorageMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitPrivateStorageMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '__', maxDepth)\n  }\n\n  static omitStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutStorageMeta<T>\n  static omitStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutStorageMeta<T>[]\n  static omitStorageMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutStorageMeta<T> | WithoutStorageMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitStorageMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '_', maxDepth)\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      // TDOD: Add verification that required fields are present\n      this._fields as WithoutSchema<T>,\n    )\n  }\n\n  fields(fields: WithoutMeta<WithoutSchema<T>>) {\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields = omitSchema(PayloadBuilderBase.omitMeta(removeEmptyFields(structuredClone(fields)))) as unknown as WithoutMeta<WithoutSchema<T>>\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/neutral/Builder.d.ts

@@ -1,6 +1,6 @@
 import type { Hash } from '@xylabs/hex';
 import type { AnyObject } from '@xylabs/object';
-import { type Payload, type WithHashMeta, type WithStorageMeta } from '@xyo-network/payload-model';
+import { type Payload, type WithHashMeta, type WithoutStorageMeta, type WithStorageMeta } from '@xyo-network/payload-model';
 import { PayloadBuilderBase } from './BuilderBase.ts';
 import type { PayloadBuilderOptions } from './Options.ts';
 export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> extends PayloadBuilderBase<T, O> {
@@ -25,7 +25,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<[T, Hash][]>;
-    static hashableFields<T extends Payload>(payload: T): T;
+    static hashableFields<T extends Payload>(payload: T): WithoutStorageMeta<T>;
     static hashes(payloads: undefined): Promise<undefined>;
     static hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>;
     static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction?: -1 | 1): WithStorageMeta<T>[];

package/dist/neutral/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/neutral/BuilderBase.d.ts

@@ -1,28 +1,25 @@
-import type { AnyObject } from '@xylabs/object';
+import type { AnyObject, EmptyObject } from '@xylabs/object';
 import type { Promisable } from '@xylabs/promise';
-import type { Payload, Schema } from '@xyo-network/payload-model';
+import type { DeepOmitStartsWith, Payload, Schema, WithOptionalSchema, WithoutClientMeta, WithoutMeta, WithoutPrivateStorageMeta, WithoutSchema, WithoutStorageMeta } from '@xyo-network/payload-model';
 import type { PayloadBuilderOptions } from './Options.ts';
-export type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>;
-export type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>;
-export declare const removeMetaAndSchema: <T extends Payload>(payload: Partial<WithOptionalSchema<T>>) => WithoutSchema<T>;
+export declare const omitByPrefix: <T extends EmptyObject, P extends string>(payload: T, prefix: P, maxDepth?: number) => DeepOmitStartsWith<T, P>;
+export declare const omitSchema: <T extends WithOptionalSchema>(payload: T) => WithoutSchema<T>;
 export declare class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
     readonly options: O;
-    protected _fields?: Partial<WithoutSchema<T>>;
+    protected _fields?: WithoutMeta<WithoutSchema<T>>;
     protected _schema: Schema;
     constructor(options: O);
-    static dataHashableFields<T extends Payload>(schema: Schema, payload: WithoutSchema<T>): Promisable<Payload>;
-    static omitClientMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitClientMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitPrivateStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitPrivateStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    dataHashableFields(): Promise<{
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields>;
-    fields(fields: WithOptionalSchema<T>): this;
+    static dataHashableFields<T extends Payload>(schema: Schema, payload: WithoutSchema<T>): Promisable<WithoutMeta<T>>;
+    static omitClientMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutClientMeta<T>;
+    static omitClientMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutClientMeta<T>[];
+    static omitMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutMeta<T>;
+    static omitMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutMeta<T>[];
+    static omitPrivateStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutPrivateStorageMeta<T>;
+    static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutPrivateStorageMeta<T>[];
+    static omitStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutStorageMeta<T>;
+    static omitStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutStorageMeta<T>[];
+    dataHashableFields(): Promise<DeepOmitStartsWith<DeepOmitStartsWith<T, "_">, "$">>;
+    fields(fields: WithoutMeta<WithoutSchema<T>>): this;
     schema(value: Schema): void;
 }
 //# sourceMappingURL=BuilderBase.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAI/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEzD,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,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,OAAO,WAAW,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAG,aAAa,CAAC,CAAC,CAI/G,CAAA;AAOD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAIvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAH/B,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAM/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,EACzC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAExB,UAAU,CAAC,OAAO,CAAC;IAStB,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAC1E,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAO/E,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IACpE,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAOzE,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAClF,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAOvF,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAC3E,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAO1E,kBAAkB;;;IAQxB,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAYpC,MAAM,CAAC,KAAK,EAAE,MAAM;CAGrB"}
+{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EACV,kBAAkB,EAClB,OAAO,EAAE,MAAM,EACf,kBAAkB,EAClB,iBAAiB,EACjB,WAAW,EACX,yBAAyB,EACzB,aAAa,EACb,kBAAkB,EACnB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEzD,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,MAAM,WAAW,CAAC,UAAU,CAAC,wBAAmB,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAEpI,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,kBAAkB,WAAW,CAAC,KAAG,aAAa,CAAC,CAAC,CAIpF,CAAA;AAOD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EACpE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAIjD,QAAQ,CAAC,OAAO,EAAE,CAAC;IAH/B,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAQ/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,EACzC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAExB,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAS7B,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC;IACjG,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE;IAOtG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC;IACrF,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE;IAO1F,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC;IACjH,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC,EAAE;IAOtH,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC;IACnG,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE;IAOlG,kBAAkB;IAQxB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAM5C,MAAM,CAAC,KAAK,EAAE,MAAM;CAGrB"}

package/dist/neutral/Options.d.ts

@@ -1,8 +1,8 @@
 import type { Logger } from '@xylabs/logger';
-import type { JsonObject } from '@xylabs/object';
-import type { Schema } from '@xyo-network/payload-model';
-export interface PayloadBuilderOptions<T> {
-    readonly fields?: Partial<T>;
+import type { EmptyObject, JsonObject } from '@xylabs/object';
+import type { Schema, WithoutMeta, WithoutSchema } from '@xyo-network/payload-model';
+export interface PayloadBuilderOptions<T extends EmptyObject = EmptyObject> {
+    readonly fields?: WithoutMeta<WithoutSchema<T>>;
     readonly logger?: Logger;
     readonly meta?: JsonObject;
     readonly schema: Schema;

package/dist/neutral/Options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/Options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB"}
+{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/Options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,KAAK,EACV,MAAM,EAAE,WAAW,EAAE,aAAa,EACnC,MAAM,4BAA4B,CAAA;AAEnC,MAAM,WAAW,qBAAqB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW;IACxE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB"}

package/dist/neutral/index.mjs

@@ -12,8 +12,11 @@ import {
   toJson
 } from "@xylabs/object";
 import { removeEmptyFields } from "@xyo-network/hash";
-var removeMetaAndSchema = (payload) => {
-  const { ...result } = PayloadBuilder.omitMeta(payload);
+var omitByPrefix = (payload, prefix, maxDepth = 100) => {
+  return omitBy(payload, omitByPrefixPredicate(prefix), maxDepth);
+};
+var omitSchema = (payload) => {
+  const result = structuredClone(payload);
   delete result.schema;
   return result;
 };
@@ -26,7 +29,9 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     this.options = options;
     const { schema, fields } = options;
     this._schema = schema;
-    this._fields = removeMetaAndSchema(removeEmptyFields(structuredClone(fields ?? {})));
+    if (fields) {
+      this.fields(fields);
+    }
   }
   _fields;
   _schema;
@@ -39,16 +44,16 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     return this.omitMeta(cleanFields);
   }
   static omitClientMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitClientMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("$"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitClientMeta(payload, maxDepth)) : omitByPrefix(payloads, "$", maxDepth);
   }
   static omitMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth) : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitMeta(payload, maxDepth)) : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth);
   }
   static omitPrivateStorageMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitPrivateStorageMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("__"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitPrivateStorageMeta(payload, maxDepth)) : omitByPrefix(payloads, "__", maxDepth);
   }
   static omitStorageMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitStorageMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("_"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitStorageMeta(payload, maxDepth)) : omitByPrefix(payloads, "_", maxDepth);
   }
   async dataHashableFields() {
     return await _PayloadBuilderBase.dataHashableFields(
@@ -58,14 +63,7 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     );
   }
   fields(fields) {
-    if (fields) {
-      const fieldsClone = structuredClone(fields);
-      const { schema } = fieldsClone;
-      if (schema) {
-        this.schema(schema);
-      }
-      this._fields = removeEmptyFields(removeMetaAndSchema(fieldsClone));
-    }
+    this._fields = omitSchema(_PayloadBuilderBase.omitMeta(removeEmptyFields(structuredClone(fields))));
     return this;
   }
   schema(value) {
@@ -206,6 +204,7 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
 export {
   PayloadBuilder,
   PayloadBuilderBase,
-  removeMetaAndSchema
+  omitByPrefix,
+  omitSchema
 };
 //# sourceMappingURL=index.mjs.map

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["import type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { ObjectHasher } from '@xyo-network/hash'\nimport {\n  type Payload,\n  SequenceParser,\n  type WithHashMeta,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase } from './BuilderBase.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 addHashMeta<T extends Payload>(payload: T): Promise<WithHashMeta<T>>\n  static async addHashMeta<T extends Payload>(payloads: T[]): Promise<WithHashMeta<T>[]>\n  static async addHashMeta<T extends Payload>(payloads: T | T[]): Promise<WithHashMeta<T>[] | WithHashMeta<T>> {\n    if (Array.isArray(payloads)) {\n      return await Promise.all(\n        payloads.map(async (payload) => {\n          return await this.addHashMeta(payload)\n        }),\n      )\n    } else {\n      const _hash = await PayloadBuilder.hash(payloads)\n      const _dataHash = await PayloadBuilder.dataHash(payloads)\n      return {\n        ...payloads,\n        _dataHash,\n        _hash,\n      }\n    }\n  }\n\n  static async addSequencedStorageMeta<T extends Payload = Payload>(payload: T): Promise<WithStorageMeta<T>> {\n    const withHashMeta = await this.addHashMeta(payload)\n    const _sequence = SequenceParser.from(Date.now(), withHashMeta._hash).localSequence\n    return {\n      ...withHashMeta,\n      _sequence,\n    }\n  }\n\n  static async addStorageMeta<T extends Payload>(payload: T): Promise<WithStorageMeta<T>>\n  static async addStorageMeta<T extends Payload>(payloads: T[]): Promise<WithStorageMeta<T>[]>\n  static async addStorageMeta<T extends Payload>(payloads: T | T[]): Promise<WithStorageMeta<T>[] | WithStorageMeta<T>> {\n    return Array.isArray(payloads)\n      ? await (async () => {\n        return await Promise.all(payloads.map(async payload => await this.addSequencedStorageMeta(\n          payload,\n        )))\n      })()\n      : this.addSequencedStorageMeta(\n          payloads,\n        )\n  }\n\n  static compareStorageMeta(a: WithStorageMeta<Payload>, b: WithStorageMeta<Payload>) {\n    return a._sequence > b._sequence ? 1 : a._sequence < b._sequence ? -1 : 0\n  }\n\n  static async dataHash<T extends Payload>(payload: T): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitMeta(payload))\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[]): Promise<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const dataHash = await this.dataHash(payload)\n        return [payload, dataHash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return payloads\n      ? await Promise.all(\n        payloads.map(async (payload) => {\n          return await PayloadBuilder.dataHash(payload)\n        }),\n      )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await ObjectHasher.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): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitStorageMeta(payload))\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<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[T, Hash]>>(async (payload) => {\n        return [payload, await PayloadBuilder.hash(payload)]\n      }),\n    )\n  }\n\n  static hashableFields<T extends Payload>(\n    payload: T,\n  ): T {\n    return this.omitStorageMeta(payload)\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 ObjectHasher.hashes(payloads)\n  }\n\n  static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction: -1 | 1 = 1) {\n    return payloads.sort((a, b) =>\n      a._sequence < b._sequence\n        ? -direction\n        : a._sequence > b._sequence\n          ? direction\n          : 0)\n  }\n\n  static async toAllHashMap<T extends Payload>(payloads: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(payloads)) {\n      const dataHash = await this.dataHash(pair[0])\n      result[pair[1]] = pair[0]\n      result[dataHash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, 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, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  build(): T {\n    return {\n      schema: this._schema,\n      ...this._fields,\n    } as T\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { AnyObject } from '@xylabs/object'\nimport {\n  isJsonObject, omitBy, toJson,\n} from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport { removeEmptyFields } from '@xyo-network/hash'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nimport { PayloadBuilder } from './Builder.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 const removeMetaAndSchema = <T extends Payload>(payload: Partial<WithOptionalSchema<T>>): WithoutSchema<T> => {\n  const { ...result } = PayloadBuilder.omitMeta(payload as T) as WithOptionalSchema<T>\n  delete result.schema\n  return result as Omit<T, 'schema'>\n}\n\nconst omitByPrefixPredicate = (prefix: string) => (_: unknown, key: string) => {\n  assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n  return key.startsWith(prefix)\n}\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _fields?: Partial<WithoutSchema<T>>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields } = options\n    this._schema = schema\n    this._fields = removeMetaAndSchema(removeEmptyFields(structuredClone(fields ?? {})))\n  }\n\n  static dataHashableFields<T extends Payload>(\n    schema: Schema,\n    payload: WithoutSchema<T>,\n\n  ): Promisable<Payload> {\n    const cleanFields = removeEmptyFields({ ...payload, schema })\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return this.omitMeta(cleanFields) as T\n  }\n\n  static omitClientMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitClientMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitClientMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitClientMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('$'), maxDepth) as T\n  }\n\n  static omitMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth)\n      : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth)\n  }\n\n  static omitPrivateStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitPrivateStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitPrivateStorageMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitPrivateStorageMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('__'), maxDepth) as T\n  }\n\n  static omitStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitStorageMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitStorageMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('_'), maxDepth) as T\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      // TDOD: Add verification that required fields are present\n      this._fields as T,\n    )\n  }\n\n  fields(fields: WithOptionalSchema<T>) {\n    if (fields) {\n      const fieldsClone = structuredClone(fields)\n      const { schema } = fieldsClone\n      if (schema) {\n        this.schema(schema)\n      }\n      this._fields = removeEmptyFields(removeMetaAndSchema<T>(fieldsClone))\n    }\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n}\n"],"mappings":";AAEA,SAAS,oBAAoB;AAC7B;AAAA,EAEE;AAAA,OAGK;;;ACRP,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EAAc;AAAA,EAAQ;AAAA,OACjB;AAEP,SAAS,yBAAyB;AAU3B,IAAM,sBAAsB,CAAoB,YAA8D;AACnH,QAAM,EAAE,GAAG,OAAO,IAAI,eAAe,SAAS,OAAY;AAC1D,SAAO,OAAO;AACd,SAAO;AACT;AAEA,IAAM,wBAAwB,CAAC,WAAmB,CAAC,GAAY,QAAgB;AAC7E,WAAS,OAAO,QAAQ,UAAU,MAAM,qBAAqB,GAAG,KAAK,OAAO,GAAG,GAAG;AAClF,SAAO,IAAI,WAAW,MAAM;AAC9B;AAEO,IAAM,qBAAN,MAAM,oBAA0H;AAAA,EAIrI,YAAqB,SAAY;AAAZ;AACnB,UAAM,EAAE,QAAQ,OAAO,IAAI;AAC3B,SAAK,UAAU;AACf,SAAK,UAAU,oBAAoB,kBAAkB,gBAAgB,UAAU,CAAC,CAAC,CAAC,CAAC;AAAA,EACrF;AAAA,EAPU;AAAA,EACA;AAAA,EAQV,OAAO,mBACL,QACA,SAEqB;AACrB,UAAM,cAAc,kBAAkB,EAAE,GAAG,SAAS,OAAO,CAAC;AAC5D;AAAA,MACE,gBAAgB,UAAa,aAAa,WAAW;AAAA,MACrD,MAAM,8BAA8B,KAAK,UAAU,OAAO,WAAW,GAAG,MAAM,CAAC,CAAC;AAAA,IAClF;AACA,WAAO,KAAK,SAAS,WAAW;AAAA,EAClC;AAAA,EAIA,OAAO,eAAkC,UAAmB,WAAW,KAAc;AACnF,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,eAAe,SAAS,QAAQ,CAAC,IAC9D,OAAO,UAAU,sBAAsB,GAAG,GAAG,QAAQ;AAAA,EAC3D;AAAA,EAIA,OAAO,SAA4B,UAAmB,WAAW,KAAc;AAC7E,WAAO,MAAM,QAAQ,QAAQ,IACzB,KAAK,gBAAgB,KAAK,eAAe,UAAU,QAAQ,GAAG,QAAQ,IACtE,KAAK,gBAAgB,KAAK,eAAe,UAAU,QAAQ,GAAG,QAAQ;AAAA,EAC5E;AAAA,EAIA,OAAO,uBAA0C,UAAmB,WAAW,KAAc;AAC3F,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,uBAAuB,SAAS,QAAQ,CAAC,IACtE,OAAO,UAAU,sBAAsB,IAAI,GAAG,QAAQ;AAAA,EAC5D;AAAA,EAIA,OAAO,gBAAmC,UAAmB,WAAW,KAAc;AACpF,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,gBAAgB,SAAS,QAAQ,CAAC,IAC/D,OAAO,UAAU,sBAAsB,GAAG,GAAG,QAAQ;AAAA,EAC3D;AAAA,EAEA,MAAM,qBAAqB;AACzB,WAAO,MAAM,oBAAmB;AAAA,MAC9B,SAAS,KAAK,SAAS,MAAM,yBAAyB;AAAA;AAAA,MAEtD,KAAK;AAAA,IACP;AAAA,EACF;AAAA,EAEA,OAAO,QAA+B;AACpC,QAAI,QAAQ;AACV,YAAM,cAAc,gBAAgB,MAAM;AAC1C,YAAM,EAAE,OAAO,IAAI;AACnB,UAAI,QAAQ;AACV,aAAK,OAAO,MAAM;AAAA,MACpB;AACA,WAAK,UAAU,kBAAkB,oBAAuB,WAAW,CAAC;AAAA,IACtE;AACA,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,OAAe;AACpB,SAAK,UAAU;AAAA,EACjB;AACF;;;AD5FO,IAAM,iBAAN,MAAM,wBAGH,mBAAyB;AAAA,EAGjC,aAAa,YAA+B,UAAiE;AAC3G,QAAI,MAAM,QAAQ,QAAQ,GAAG;AAC3B,aAAO,MAAM,QAAQ;AAAA,QACnB,SAAS,IAAI,OAAO,YAAY;AAC9B,iBAAO,MAAM,KAAK,YAAY,OAAO;AAAA,QACvC,CAAC;AAAA,MACH;AAAA,IACF,OAAO;AACL,YAAM,QAAQ,MAAM,gBAAe,KAAK,QAAQ;AAChD,YAAM,YAAY,MAAM,gBAAe,SAAS,QAAQ;AACxD,aAAO;AAAA,QACL,GAAG;AAAA,QACH;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,aAAa,wBAAqD,SAAyC;AACzG,UAAM,eAAe,MAAM,KAAK,YAAY,OAAO;AACnD,UAAM,YAAY,eAAe,KAAK,KAAK,IAAI,GAAG,aAAa,KAAK,EAAE;AACtE,WAAO;AAAA,MACL,GAAG;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAAA,EAIA,aAAa,eAAkC,UAAuE;AACpH,WAAO,MAAM,QAAQ,QAAQ,IACzB,OAAO,YAAY;AACnB,aAAO,MAAM,QAAQ,IAAI,SAAS,IAAI,OAAM,YAAW,MAAM,KAAK;AAAA,QAChE;AAAA,MACF,CAAC,CAAC;AAAA,IACJ,GAAG,IACD,KAAK;AAAA,MACH;AAAA,IACF;AAAA,EACN;AAAA,EAEA,OAAO,mBAAmB,GAA6B,GAA6B;AAClF,WAAO,EAAE,YAAY,EAAE,YAAY,IAAI,EAAE,YAAY,EAAE,YAAY,KAAK;AAAA,EAC1E;AAAA,EAEA,aAAa,SAA4B,SAA2B;AAClE,WAAO,MAAM,aAAa,KAAK,KAAK,SAAS,OAAO,CAAC;AAAA,EACvD;AAAA,EAEA,aAAa,cAAiC,UAAqC;AACjF,WAAO,MAAM,QAAQ;AAAA,MACnB,SAAS,IAAI,OAAO,YAAY;AAC9B,cAAM,WAAW,MAAM,KAAK,SAAS,OAAO;AAC5C,eAAO,CAAC,SAAS,QAAQ;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAIA,aAAa,WAA8B,UAA6C;AACtF,WAAO,WACH,MAAM,QAAQ;AAAA,MACd,SAAS,IAAI,OAAO,YAAY;AAC9B,eAAO,MAAM,gBAAe,SAAS,OAAO;AAAA,MAC9C,CAAC;AAAA,IACH,IACE;AAAA,EACN;AAAA,EAEA,aAAa,cAAiC,WAAgB,CAAC,GAAG,MAAmC;AACnG,WAAO,MAAM,aAAa,oBAAoB,MAAM,KAAK,wBAAwB,UAAU,IAAI,GAAG,IAAI;AAAA,EACxG;AAAA,EAEA,aAAa,wBAA2C,WAAgB,CAAC,GAAG,MAAmC;AAC7G,UAAM,SAAS,MAAM,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI;AACjD,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,MAAM,CAAC,OAAO,SAAS,OAAO,CAAC,GAAG,IAAI,UAAQ,KAAK,CAAC,CAAC;AAAA,EACtH;AAAA,EAEA,aAAa,wBAA2C,WAAgB,CAAC,GAAG,MAAmC;AAC7G,UAAM,SAAS,MAAM,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI;AACjD,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,MAAM,OAAO,SAAS,OAAO,CAAC,GAAG,IAAI,UAAQ,KAAK,CAAC,CAAC;AAAA,EACrH;AAAA,EAEA,aAAa,eAAkC,WAAgB,CAAC,GAAG,MAAoC;AACrG,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,OAAO,MAAM,YAAY,IAAI,IAAI,CAAC;AAAA,EAC1F;AAAA,EAEA,aAAa,KAAwB,SAA2B;AAC9D,WAAO,MAAM,aAAa,KAAK,KAAK,gBAAgB,OAAO,CAAC;AAAA,EAC9D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,aAAa,UAA6B,UAAqC;AAC7E,WAAO,MAAM,QAAQ;AAAA,MACnB,SAAS,IAAwB,OAAO,YAAY;AAClD,eAAO,CAAC,SAAS,MAAM,gBAAe,KAAK,OAAO,CAAC;AAAA,MACrD,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,OAAO,eACL,SACG;AACH,WAAO,KAAK,gBAAgB,OAAO;AAAA,EACrC;AAAA,EAIA,aAAa,OAA0B,UAA6C;AAClF,WAAO,MAAM,aAAa,OAAO,QAAQ;AAAA,EAC3C;AAAA,EAEA,OAAO,kBAAqC,UAAgC,YAAoB,GAAG;AACjG,WAAO,SAAS,KAAK,CAAC,GAAG,MACvB,EAAE,YAAY,EAAE,YACZ,CAAC,YACD,EAAE,YAAY,EAAE,YACd,YACA,CAAC;AAAA,EACX;AAAA,EAEA,aAAa,aAAgC,UAAyC;AACpF,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,UAAU,QAAQ,GAAG;AACjD,YAAM,WAAW,MAAM,KAAK,SAAS,KAAK,CAAC,CAAC;AAC5C,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AACxB,aAAO,QAAQ,IAAI,KAAK,CAAC;AAAA,IAC3B;AACA,WAAO;AAAA,EACT;AAAA,EAEA,aAAa,cAAiC,MAAqC;AACjF,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,cAAc,IAAI,GAAG;AACjD,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AAAA,IAC1B;AACA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,aAAa,UAA6B,MAAqC;AAC7E,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,UAAU,IAAI,GAAG;AAC7C,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AAAA,IAC1B;AACA,WAAO;AAAA,EACT;AAAA,EAEA,QAAW;AACT,WAAO;AAAA,MACL,QAAQ,KAAK;AAAA,MACb,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["import type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { ObjectHasher } from '@xyo-network/hash'\nimport {\n  type Payload,\n  SequenceParser,\n  type WithHashMeta,\n  type WithoutStorageMeta,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase } from './BuilderBase.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 addHashMeta<T extends Payload>(payload: T): Promise<WithHashMeta<T>>\n  static async addHashMeta<T extends Payload>(payloads: T[]): Promise<WithHashMeta<T>[]>\n  static async addHashMeta<T extends Payload>(payloads: T | T[]): Promise<WithHashMeta<T>[] | WithHashMeta<T>> {\n    if (Array.isArray(payloads)) {\n      return await Promise.all(\n        payloads.map(async (payload) => {\n          return await this.addHashMeta(payload)\n        }),\n      )\n    } else {\n      const _hash = await PayloadBuilder.hash(payloads)\n      const _dataHash = await PayloadBuilder.dataHash(payloads)\n      return {\n        ...payloads,\n        _dataHash,\n        _hash,\n      }\n    }\n  }\n\n  static async addSequencedStorageMeta<T extends Payload = Payload>(payload: T): Promise<WithStorageMeta<T>> {\n    const withHashMeta = await this.addHashMeta(payload)\n    const _sequence = SequenceParser.from(Date.now(), withHashMeta._hash).localSequence\n    return {\n      ...withHashMeta,\n      _sequence,\n    }\n  }\n\n  static async addStorageMeta<T extends Payload>(payload: T): Promise<WithStorageMeta<T>>\n  static async addStorageMeta<T extends Payload>(payloads: T[]): Promise<WithStorageMeta<T>[]>\n  static async addStorageMeta<T extends Payload>(payloads: T | T[]): Promise<WithStorageMeta<T>[] | WithStorageMeta<T>> {\n    return Array.isArray(payloads)\n      ? await (async () => {\n        return await Promise.all(payloads.map(async payload => await this.addSequencedStorageMeta(\n          payload,\n        )))\n      })()\n      : this.addSequencedStorageMeta(\n          payloads,\n        )\n  }\n\n  static compareStorageMeta(a: WithStorageMeta<Payload>, b: WithStorageMeta<Payload>) {\n    return a._sequence > b._sequence ? 1 : a._sequence < b._sequence ? -1 : 0\n  }\n\n  static async dataHash<T extends Payload>(payload: T): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitMeta(payload))\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[]): Promise<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const dataHash = await this.dataHash(payload)\n        return [payload, dataHash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return payloads\n      ? await Promise.all(\n        payloads.map(async (payload) => {\n          return await PayloadBuilder.dataHash(payload)\n        }),\n      )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await ObjectHasher.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): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitStorageMeta(payload))\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<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[T, Hash]>>(async (payload) => {\n        return [payload, await PayloadBuilder.hash(payload)]\n      }),\n    )\n  }\n\n  static hashableFields<T extends Payload>(\n    payload: T,\n  ): WithoutStorageMeta<T> {\n    return this.omitStorageMeta(payload)\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 ObjectHasher.hashes(payloads)\n  }\n\n  static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction: -1 | 1 = 1) {\n    return payloads.sort((a, b) =>\n      a._sequence < b._sequence\n        ? -direction\n        : a._sequence > b._sequence\n          ? direction\n          : 0)\n  }\n\n  static async toAllHashMap<T extends Payload>(payloads: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(payloads)) {\n      const dataHash = await this.dataHash(pair[0])\n      result[pair[1]] = pair[0]\n      result[dataHash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, 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, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  build(): T {\n    return {\n      schema: this._schema,\n      ...this._fields,\n    } as T\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { AnyObject, EmptyObject } from '@xylabs/object'\nimport {\n  isJsonObject, omitBy, toJson,\n} from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport { removeEmptyFields } from '@xyo-network/hash'\nimport type {\n  DeepOmitStartsWith,\n  Payload, Schema,\n  WithOptionalSchema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutPrivateStorageMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport type { PayloadBuilderOptions } from './Options.ts'\n\nexport const omitByPrefix = <T extends EmptyObject, P extends string>(payload: T, prefix: P, maxDepth = 100): DeepOmitStartsWith<T, P> => {\n  return omitBy(payload, omitByPrefixPredicate(prefix), maxDepth) as unknown as DeepOmitStartsWith<T, P>\n}\n\nexport const omitSchema = <T extends WithOptionalSchema>(payload: T): WithoutSchema<T> => {\n  const result = structuredClone(payload)\n  delete result.schema\n  return result\n}\n\nconst omitByPrefixPredicate = (prefix: string) => (_: unknown, key: string) => {\n  assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n  return key.startsWith(prefix)\n}\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>,\n  O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _fields?: WithoutMeta<WithoutSchema<T>>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields } = options\n    this._schema = schema\n    if (fields) {\n      this.fields(fields)\n    }\n  }\n\n  static dataHashableFields<T extends Payload>(\n    schema: Schema,\n    payload: WithoutSchema<T>,\n\n  ): Promisable<WithoutMeta<T>> {\n    const cleanFields = removeEmptyFields({ ...payload, schema })\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return this.omitMeta(cleanFields) as WithoutMeta<T>\n  }\n\n  static omitClientMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutClientMeta<T>\n  static omitClientMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutClientMeta<T>[]\n  static omitClientMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutClientMeta<T> | WithoutClientMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitClientMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '$', maxDepth)\n  }\n\n  static omitMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutMeta<T>\n  static omitMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutMeta<T>[]\n  static omitMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutMeta<T> | WithoutMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitMeta(payload, maxDepth))\n      : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth) as unknown as WithoutMeta<T>\n  }\n\n  static omitPrivateStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutPrivateStorageMeta<T>\n  static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutPrivateStorageMeta<T>[]\n  static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutPrivateStorageMeta<T> | WithoutPrivateStorageMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitPrivateStorageMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '__', maxDepth)\n  }\n\n  static omitStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutStorageMeta<T>\n  static omitStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutStorageMeta<T>[]\n  static omitStorageMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutStorageMeta<T> | WithoutStorageMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitStorageMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '_', maxDepth)\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      // TDOD: Add verification that required fields are present\n      this._fields as WithoutSchema<T>,\n    )\n  }\n\n  fields(fields: WithoutMeta<WithoutSchema<T>>) {\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields = omitSchema(PayloadBuilderBase.omitMeta(removeEmptyFields(structuredClone(fields)))) as unknown as WithoutMeta<WithoutSchema<T>>\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/node/Builder.d.ts

@@ -1,6 +1,6 @@
 import type { Hash } from '@xylabs/hex';
 import type { AnyObject } from '@xylabs/object';
-import { type Payload, type WithHashMeta, type WithStorageMeta } from '@xyo-network/payload-model';
+import { type Payload, type WithHashMeta, type WithoutStorageMeta, type WithStorageMeta } from '@xyo-network/payload-model';
 import { PayloadBuilderBase } from './BuilderBase.ts';
 import type { PayloadBuilderOptions } from './Options.ts';
 export declare class PayloadBuilder<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> extends PayloadBuilderBase<T, O> {
@@ -25,7 +25,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<[T, Hash][]>;
-    static hashableFields<T extends Payload>(payload: T): T;
+    static hashableFields<T extends Payload>(payload: T): WithoutStorageMeta<T>;
     static hashes(payloads: undefined): Promise<undefined>;
     static hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>;
     static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction?: -1 | 1): WithStorageMeta<T>[];

package/dist/node/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/node/BuilderBase.d.ts

@@ -1,28 +1,25 @@
-import type { AnyObject } from '@xylabs/object';
+import type { AnyObject, EmptyObject } from '@xylabs/object';
 import type { Promisable } from '@xylabs/promise';
-import type { Payload, Schema } from '@xyo-network/payload-model';
+import type { DeepOmitStartsWith, Payload, Schema, WithOptionalSchema, WithoutClientMeta, WithoutMeta, WithoutPrivateStorageMeta, WithoutSchema, WithoutStorageMeta } from '@xyo-network/payload-model';
 import type { PayloadBuilderOptions } from './Options.ts';
-export type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>;
-export type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>;
-export declare const removeMetaAndSchema: <T extends Payload>(payload: Partial<WithOptionalSchema<T>>) => WithoutSchema<T>;
+export declare const omitByPrefix: <T extends EmptyObject, P extends string>(payload: T, prefix: P, maxDepth?: number) => DeepOmitStartsWith<T, P>;
+export declare const omitSchema: <T extends WithOptionalSchema>(payload: T) => WithoutSchema<T>;
 export declare class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
     readonly options: O;
-    protected _fields?: Partial<WithoutSchema<T>>;
+    protected _fields?: WithoutMeta<WithoutSchema<T>>;
     protected _schema: Schema;
     constructor(options: O);
-    static dataHashableFields<T extends Payload>(schema: Schema, payload: WithoutSchema<T>): Promisable<Payload>;
-    static omitClientMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitClientMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitPrivateStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitPrivateStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    static omitStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T;
-    static omitStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[];
-    dataHashableFields(): Promise<{
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields>;
-    fields(fields: WithOptionalSchema<T>): this;
+    static dataHashableFields<T extends Payload>(schema: Schema, payload: WithoutSchema<T>): Promisable<WithoutMeta<T>>;
+    static omitClientMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutClientMeta<T>;
+    static omitClientMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutClientMeta<T>[];
+    static omitMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutMeta<T>;
+    static omitMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutMeta<T>[];
+    static omitPrivateStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutPrivateStorageMeta<T>;
+    static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutPrivateStorageMeta<T>[];
+    static omitStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutStorageMeta<T>;
+    static omitStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutStorageMeta<T>[];
+    dataHashableFields(): Promise<DeepOmitStartsWith<DeepOmitStartsWith<T, "_">, "$">>;
+    fields(fields: WithoutMeta<WithoutSchema<T>>): this;
     schema(value: Schema): void;
 }
 //# sourceMappingURL=BuilderBase.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAI/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEzD,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,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,OAAO,WAAW,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAG,aAAa,CAAC,CAAC,CAI/G,CAAA;AAOD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAIvH,QAAQ,CAAC,OAAO,EAAE,CAAC;IAH/B,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAM/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,EACzC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAExB,UAAU,CAAC,OAAO,CAAC;IAStB,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAC1E,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAO/E,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IACpE,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAOzE,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAClF,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAOvF,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;IAC3E,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE;IAO1E,kBAAkB;;;IAQxB,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAYpC,MAAM,CAAC,KAAK,EAAE,MAAM;CAGrB"}
+{"version":3,"file":"BuilderBase.d.ts","sourceRoot":"","sources":["../../src/BuilderBase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EACV,kBAAkB,EAClB,OAAO,EAAE,MAAM,EACf,kBAAkB,EAClB,iBAAiB,EACjB,WAAW,EACX,yBAAyB,EACzB,aAAa,EACb,kBAAkB,EACnB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEzD,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,MAAM,WAAW,CAAC,UAAU,CAAC,wBAAmB,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAEpI,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,kBAAkB,WAAW,CAAC,KAAG,aAAa,CAAC,CAAC,CAIpF,CAAA;AAOD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EACpE,CAAC,SAAS,qBAAqB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAIjD,QAAQ,CAAC,OAAO,EAAE,CAAC;IAH/B,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,CAAC;IAQ/B,MAAM,CAAC,kBAAkB,CAAC,CAAC,SAAS,OAAO,EACzC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAExB,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAS7B,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC;IACjG,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE;IAOtG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC;IACrF,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE;IAO1F,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC;IACjH,MAAM,CAAC,sBAAsB,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC,EAAE;IAOtH,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC;IACnG,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE;IAOlG,kBAAkB;IAQxB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAM5C,MAAM,CAAC,KAAK,EAAE,MAAM;CAGrB"}

package/dist/node/Options.d.ts

@@ -1,8 +1,8 @@
 import type { Logger } from '@xylabs/logger';
-import type { JsonObject } from '@xylabs/object';
-import type { Schema } from '@xyo-network/payload-model';
-export interface PayloadBuilderOptions<T> {
-    readonly fields?: Partial<T>;
+import type { EmptyObject, JsonObject } from '@xylabs/object';
+import type { Schema, WithoutMeta, WithoutSchema } from '@xyo-network/payload-model';
+export interface PayloadBuilderOptions<T extends EmptyObject = EmptyObject> {
+    readonly fields?: WithoutMeta<WithoutSchema<T>>;
     readonly logger?: Logger;
     readonly meta?: JsonObject;
     readonly schema: Schema;

package/dist/node/Options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/Options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB"}
+{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/Options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,KAAK,EACV,MAAM,EAAE,WAAW,EAAE,aAAa,EACnC,MAAM,4BAA4B,CAAA;AAEnC,MAAM,WAAW,qBAAqB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW;IACxE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB"}

package/dist/node/index.mjs

@@ -12,8 +12,11 @@ import {
   toJson
 } from "@xylabs/object";
 import { removeEmptyFields } from "@xyo-network/hash";
-var removeMetaAndSchema = (payload) => {
-  const { ...result } = PayloadBuilder.omitMeta(payload);
+var omitByPrefix = (payload, prefix, maxDepth = 100) => {
+  return omitBy(payload, omitByPrefixPredicate(prefix), maxDepth);
+};
+var omitSchema = (payload) => {
+  const result = structuredClone(payload);
   delete result.schema;
   return result;
 };
@@ -26,7 +29,9 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     this.options = options;
     const { schema, fields } = options;
     this._schema = schema;
-    this._fields = removeMetaAndSchema(removeEmptyFields(structuredClone(fields ?? {})));
+    if (fields) {
+      this.fields(fields);
+    }
   }
   _fields;
   _schema;
@@ -39,16 +44,16 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     return this.omitMeta(cleanFields);
   }
   static omitClientMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitClientMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("$"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitClientMeta(payload, maxDepth)) : omitByPrefix(payloads, "$", maxDepth);
   }
   static omitMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth) : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitMeta(payload, maxDepth)) : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth);
   }
   static omitPrivateStorageMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitPrivateStorageMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("__"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitPrivateStorageMeta(payload, maxDepth)) : omitByPrefix(payloads, "__", maxDepth);
   }
   static omitStorageMeta(payloads, maxDepth = 100) {
-    return Array.isArray(payloads) ? payloads.map((payload) => this.omitStorageMeta(payload, maxDepth)) : omitBy(payloads, omitByPrefixPredicate("_"), maxDepth);
+    return Array.isArray(payloads) ? payloads.map((payload) => this.omitStorageMeta(payload, maxDepth)) : omitByPrefix(payloads, "_", maxDepth);
   }
   async dataHashableFields() {
     return await _PayloadBuilderBase.dataHashableFields(
@@ -58,14 +63,7 @@ var PayloadBuilderBase = class _PayloadBuilderBase {
     );
   }
   fields(fields) {
-    if (fields) {
-      const fieldsClone = structuredClone(fields);
-      const { schema } = fieldsClone;
-      if (schema) {
-        this.schema(schema);
-      }
-      this._fields = removeEmptyFields(removeMetaAndSchema(fieldsClone));
-    }
+    this._fields = omitSchema(_PayloadBuilderBase.omitMeta(removeEmptyFields(structuredClone(fields))));
     return this;
   }
   schema(value) {
@@ -206,6 +204,7 @@ var PayloadBuilder = class _PayloadBuilder extends PayloadBuilderBase {
 export {
   PayloadBuilder,
   PayloadBuilderBase,
-  removeMetaAndSchema
+  omitByPrefix,
+  omitSchema
 };
 //# sourceMappingURL=index.mjs.map

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["import type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { ObjectHasher } from '@xyo-network/hash'\nimport {\n  type Payload,\n  SequenceParser,\n  type WithHashMeta,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase } from './BuilderBase.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 addHashMeta<T extends Payload>(payload: T): Promise<WithHashMeta<T>>\n  static async addHashMeta<T extends Payload>(payloads: T[]): Promise<WithHashMeta<T>[]>\n  static async addHashMeta<T extends Payload>(payloads: T | T[]): Promise<WithHashMeta<T>[] | WithHashMeta<T>> {\n    if (Array.isArray(payloads)) {\n      return await Promise.all(\n        payloads.map(async (payload) => {\n          return await this.addHashMeta(payload)\n        }),\n      )\n    } else {\n      const _hash = await PayloadBuilder.hash(payloads)\n      const _dataHash = await PayloadBuilder.dataHash(payloads)\n      return {\n        ...payloads,\n        _dataHash,\n        _hash,\n      }\n    }\n  }\n\n  static async addSequencedStorageMeta<T extends Payload = Payload>(payload: T): Promise<WithStorageMeta<T>> {\n    const withHashMeta = await this.addHashMeta(payload)\n    const _sequence = SequenceParser.from(Date.now(), withHashMeta._hash).localSequence\n    return {\n      ...withHashMeta,\n      _sequence,\n    }\n  }\n\n  static async addStorageMeta<T extends Payload>(payload: T): Promise<WithStorageMeta<T>>\n  static async addStorageMeta<T extends Payload>(payloads: T[]): Promise<WithStorageMeta<T>[]>\n  static async addStorageMeta<T extends Payload>(payloads: T | T[]): Promise<WithStorageMeta<T>[] | WithStorageMeta<T>> {\n    return Array.isArray(payloads)\n      ? await (async () => {\n        return await Promise.all(payloads.map(async payload => await this.addSequencedStorageMeta(\n          payload,\n        )))\n      })()\n      : this.addSequencedStorageMeta(\n          payloads,\n        )\n  }\n\n  static compareStorageMeta(a: WithStorageMeta<Payload>, b: WithStorageMeta<Payload>) {\n    return a._sequence > b._sequence ? 1 : a._sequence < b._sequence ? -1 : 0\n  }\n\n  static async dataHash<T extends Payload>(payload: T): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitMeta(payload))\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[]): Promise<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const dataHash = await this.dataHash(payload)\n        return [payload, dataHash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return payloads\n      ? await Promise.all(\n        payloads.map(async (payload) => {\n          return await PayloadBuilder.dataHash(payload)\n        }),\n      )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await ObjectHasher.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): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitStorageMeta(payload))\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<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[T, Hash]>>(async (payload) => {\n        return [payload, await PayloadBuilder.hash(payload)]\n      }),\n    )\n  }\n\n  static hashableFields<T extends Payload>(\n    payload: T,\n  ): T {\n    return this.omitStorageMeta(payload)\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 ObjectHasher.hashes(payloads)\n  }\n\n  static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction: -1 | 1 = 1) {\n    return payloads.sort((a, b) =>\n      a._sequence < b._sequence\n        ? -direction\n        : a._sequence > b._sequence\n          ? direction\n          : 0)\n  }\n\n  static async toAllHashMap<T extends Payload>(payloads: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(payloads)) {\n      const dataHash = await this.dataHash(pair[0])\n      result[pair[1]] = pair[0]\n      result[dataHash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, 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, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  build(): T {\n    return {\n      schema: this._schema,\n      ...this._fields,\n    } as T\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { AnyObject } from '@xylabs/object'\nimport {\n  isJsonObject, omitBy, toJson,\n} from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport { removeEmptyFields } from '@xyo-network/hash'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nimport { PayloadBuilder } from './Builder.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 const removeMetaAndSchema = <T extends Payload>(payload: Partial<WithOptionalSchema<T>>): WithoutSchema<T> => {\n  const { ...result } = PayloadBuilder.omitMeta(payload as T) as WithOptionalSchema<T>\n  delete result.schema\n  return result as Omit<T, 'schema'>\n}\n\nconst omitByPrefixPredicate = (prefix: string) => (_: unknown, key: string) => {\n  assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n  return key.startsWith(prefix)\n}\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _fields?: Partial<WithoutSchema<T>>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields } = options\n    this._schema = schema\n    this._fields = removeMetaAndSchema(removeEmptyFields(structuredClone(fields ?? {})))\n  }\n\n  static dataHashableFields<T extends Payload>(\n    schema: Schema,\n    payload: WithoutSchema<T>,\n\n  ): Promisable<Payload> {\n    const cleanFields = removeEmptyFields({ ...payload, schema })\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return this.omitMeta(cleanFields) as T\n  }\n\n  static omitClientMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitClientMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitClientMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitClientMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('$'), maxDepth) as T\n  }\n\n  static omitMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth)\n      : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth)\n  }\n\n  static omitPrivateStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitPrivateStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitPrivateStorageMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitPrivateStorageMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('__'), maxDepth) as T\n  }\n\n  static omitStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T\n  static omitStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]\n  static omitStorageMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitStorageMeta(payload, maxDepth)) as T[]\n      : omitBy(payloads, omitByPrefixPredicate('_'), maxDepth) as T\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      // TDOD: Add verification that required fields are present\n      this._fields as T,\n    )\n  }\n\n  fields(fields: WithOptionalSchema<T>) {\n    if (fields) {\n      const fieldsClone = structuredClone(fields)\n      const { schema } = fieldsClone\n      if (schema) {\n        this.schema(schema)\n      }\n      this._fields = removeEmptyFields(removeMetaAndSchema<T>(fieldsClone))\n    }\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/BuilderBase.ts"],"sourcesContent":["import type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { ObjectHasher } from '@xyo-network/hash'\nimport {\n  type Payload,\n  SequenceParser,\n  type WithHashMeta,\n  type WithoutStorageMeta,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport { PayloadBuilderBase } from './BuilderBase.ts'\nimport type { PayloadBuilderOptions } from './Options.ts'\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 addHashMeta<T extends Payload>(payload: T): Promise<WithHashMeta<T>>\n  static async addHashMeta<T extends Payload>(payloads: T[]): Promise<WithHashMeta<T>[]>\n  static async addHashMeta<T extends Payload>(payloads: T | T[]): Promise<WithHashMeta<T>[] | WithHashMeta<T>> {\n    if (Array.isArray(payloads)) {\n      return await Promise.all(\n        payloads.map(async (payload) => {\n          return await this.addHashMeta(payload)\n        }),\n      )\n    } else {\n      const _hash = await PayloadBuilder.hash(payloads)\n      const _dataHash = await PayloadBuilder.dataHash(payloads)\n      return {\n        ...payloads,\n        _dataHash,\n        _hash,\n      }\n    }\n  }\n\n  static async addSequencedStorageMeta<T extends Payload = Payload>(payload: T): Promise<WithStorageMeta<T>> {\n    const withHashMeta = await this.addHashMeta(payload)\n    const _sequence = SequenceParser.from(Date.now(), withHashMeta._hash).localSequence\n    return {\n      ...withHashMeta,\n      _sequence,\n    }\n  }\n\n  static async addStorageMeta<T extends Payload>(payload: T): Promise<WithStorageMeta<T>>\n  static async addStorageMeta<T extends Payload>(payloads: T[]): Promise<WithStorageMeta<T>[]>\n  static async addStorageMeta<T extends Payload>(payloads: T | T[]): Promise<WithStorageMeta<T>[] | WithStorageMeta<T>> {\n    return Array.isArray(payloads)\n      ? await (async () => {\n        return await Promise.all(payloads.map(async payload => await this.addSequencedStorageMeta(\n          payload,\n        )))\n      })()\n      : this.addSequencedStorageMeta(\n          payloads,\n        )\n  }\n\n  static compareStorageMeta(a: WithStorageMeta<Payload>, b: WithStorageMeta<Payload>) {\n    return a._sequence > b._sequence ? 1 : a._sequence < b._sequence ? -1 : 0\n  }\n\n  static async dataHash<T extends Payload>(payload: T): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitMeta(payload))\n  }\n\n  static async dataHashPairs<T extends Payload>(payloads: T[]): Promise<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map(async (payload) => {\n        const dataHash = await this.dataHash(payload)\n        return [payload, dataHash]\n      }),\n    )\n  }\n\n  static async dataHashes(payloads: undefined): Promise<undefined>\n  static async dataHashes<T extends Payload>(payloads: T[]): Promise<Hash[]>\n  static async dataHashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {\n    return payloads\n      ? await Promise.all(\n        payloads.map(async (payload) => {\n          return await PayloadBuilder.dataHash(payload)\n        }),\n      )\n      : undefined\n  }\n\n  static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    return await ObjectHasher.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): Promise<Hash> {\n    return await ObjectHasher.hash(this.omitStorageMeta(payload))\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<[T, Hash][]> {\n    return await Promise.all(\n      payloads.map<Promise<[T, Hash]>>(async (payload) => {\n        return [payload, await PayloadBuilder.hash(payload)]\n      }),\n    )\n  }\n\n  static hashableFields<T extends Payload>(\n    payload: T,\n  ): WithoutStorageMeta<T> {\n    return this.omitStorageMeta(payload)\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 ObjectHasher.hashes(payloads)\n  }\n\n  static sortByStorageMeta<T extends Payload>(payloads: WithStorageMeta<T>[], direction: -1 | 1 = 1) {\n    return payloads.sort((a, b) =>\n      a._sequence < b._sequence\n        ? -direction\n        : a._sequence > b._sequence\n          ? direction\n          : 0)\n  }\n\n  static async toAllHashMap<T extends Payload>(payloads: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(payloads)) {\n      const dataHash = await this.dataHash(pair[0])\n      result[pair[1]] = pair[0]\n      result[dataHash] = pair[0]\n    }\n    return result\n  }\n\n  static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, T>> {\n    const result: Record<Hash, 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, T>> {\n    const result: Record<Hash, T> = {}\n    for (const pair of await this.hashPairs(objs)) {\n      result[pair[1]] = pair[0]\n    }\n    return result\n  }\n\n  build(): T {\n    return {\n      schema: this._schema,\n      ...this._fields,\n    } as T\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { AnyObject, EmptyObject } from '@xylabs/object'\nimport {\n  isJsonObject, omitBy, toJson,\n} from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport { removeEmptyFields } from '@xyo-network/hash'\nimport type {\n  DeepOmitStartsWith,\n  Payload, Schema,\n  WithOptionalSchema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutPrivateStorageMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\n\nimport type { PayloadBuilderOptions } from './Options.ts'\n\nexport const omitByPrefix = <T extends EmptyObject, P extends string>(payload: T, prefix: P, maxDepth = 100): DeepOmitStartsWith<T, P> => {\n  return omitBy(payload, omitByPrefixPredicate(prefix), maxDepth) as unknown as DeepOmitStartsWith<T, P>\n}\n\nexport const omitSchema = <T extends WithOptionalSchema>(payload: T): WithoutSchema<T> => {\n  const result = structuredClone(payload)\n  delete result.schema\n  return result\n}\n\nconst omitByPrefixPredicate = (prefix: string) => (_: unknown, key: string) => {\n  assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n  return key.startsWith(prefix)\n}\n\nexport class PayloadBuilderBase<T extends Payload = Payload<AnyObject>,\n  O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {\n  protected _fields?: WithoutMeta<WithoutSchema<T>>\n  protected _schema: Schema\n\n  constructor(readonly options: O) {\n    const { schema, fields } = options\n    this._schema = schema\n    if (fields) {\n      this.fields(fields)\n    }\n  }\n\n  static dataHashableFields<T extends Payload>(\n    schema: Schema,\n    payload: WithoutSchema<T>,\n\n  ): Promisable<WithoutMeta<T>> {\n    const cleanFields = removeEmptyFields({ ...payload, schema })\n    assertEx(\n      cleanFields === undefined || isJsonObject(cleanFields),\n      () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,\n    )\n    return this.omitMeta(cleanFields) as WithoutMeta<T>\n  }\n\n  static omitClientMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutClientMeta<T>\n  static omitClientMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutClientMeta<T>[]\n  static omitClientMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutClientMeta<T> | WithoutClientMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitClientMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '$', maxDepth)\n  }\n\n  static omitMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutMeta<T>\n  static omitMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutMeta<T>[]\n  static omitMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutMeta<T> | WithoutMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitMeta(payload, maxDepth))\n      : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth) as unknown as WithoutMeta<T>\n  }\n\n  static omitPrivateStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutPrivateStorageMeta<T>\n  static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutPrivateStorageMeta<T>[]\n  static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutPrivateStorageMeta<T> | WithoutPrivateStorageMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitPrivateStorageMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '__', maxDepth)\n  }\n\n  static omitStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutStorageMeta<T>\n  static omitStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutStorageMeta<T>[]\n  static omitStorageMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutStorageMeta<T> | WithoutStorageMeta<T>[] {\n    return Array.isArray(payloads)\n      ? payloads.map(payload => this.omitStorageMeta(payload, maxDepth))\n      : omitByPrefix(payloads, '_', maxDepth)\n  }\n\n  async dataHashableFields() {\n    return await PayloadBuilderBase.dataHashableFields(\n      assertEx(this._schema, () => 'Payload: Missing Schema'),\n      // TDOD: Add verification that required fields are present\n      this._fields as WithoutSchema<T>,\n    )\n  }\n\n  fields(fields: WithoutMeta<WithoutSchema<T>>) {\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields = omitSchema(PayloadBuilderBase.omitMeta(removeEmptyFields(structuredClone(fields)))) as unknown as WithoutMeta<WithoutSchema<T>>\n    return this\n  }\n\n  schema(value: Schema) {\n    this._schema = value\n  }\n}\n"],"mappings":";AAEA,SAAS,oBAAoB;AAC7B;AAAA,EAEE;AAAA,OAIK;;;ACTP,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EAAc;AAAA,EAAQ;AAAA,OACjB;AAEP,SAAS,yBAAyB;AAc3B,IAAM,eAAe,CAA0C,SAAY,QAAW,WAAW,QAAkC;AACxI,SAAO,OAAO,SAAS,sBAAsB,MAAM,GAAG,QAAQ;AAChE;AAEO,IAAM,aAAa,CAA+B,YAAiC;AACxF,QAAM,SAAS,gBAAgB,OAAO;AACtC,SAAO,OAAO;AACd,SAAO;AACT;AAEA,IAAM,wBAAwB,CAAC,WAAmB,CAAC,GAAY,QAAgB;AAC7E,WAAS,OAAO,QAAQ,UAAU,MAAM,qBAAqB,GAAG,KAAK,OAAO,GAAG,GAAG;AAClF,SAAO,IAAI,WAAW,MAAM;AAC9B;AAEO,IAAM,qBAAN,MAAM,oBACoD;AAAA,EAI/D,YAAqB,SAAY;AAAZ;AACnB,UAAM,EAAE,QAAQ,OAAO,IAAI;AAC3B,SAAK,UAAU;AACf,QAAI,QAAQ;AACV,WAAK,OAAO,MAAM;AAAA,IACpB;AAAA,EACF;AAAA,EATU;AAAA,EACA;AAAA,EAUV,OAAO,mBACL,QACA,SAE4B;AAC5B,UAAM,cAAc,kBAAkB,EAAE,GAAG,SAAS,OAAO,CAAC;AAC5D;AAAA,MACE,gBAAgB,UAAa,aAAa,WAAW;AAAA,MACrD,MAAM,8BAA8B,KAAK,UAAU,OAAO,WAAW,GAAG,MAAM,CAAC,CAAC;AAAA,IAClF;AACA,WAAO,KAAK,SAAS,WAAW;AAAA,EAClC;AAAA,EAIA,OAAO,eAAsC,UAAmB,WAAW,KAAoD;AAC7H,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,eAAe,SAAS,QAAQ,CAAC,IAC9D,aAAa,UAAU,KAAK,QAAQ;AAAA,EAC1C;AAAA,EAIA,OAAO,SAAgC,UAAmB,WAAW,KAAwC;AAC3G,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,SAAS,SAAS,QAAQ,CAAC,IACxD,KAAK,gBAAgB,KAAK,eAAe,UAAU,QAAQ,GAAG,QAAQ;AAAA,EAC5E;AAAA,EAIA,OAAO,uBAA8C,UAAmB,WAAW,KAAoE;AACrJ,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,uBAAuB,SAAS,QAAQ,CAAC,IACtE,aAAa,UAAU,MAAM,QAAQ;AAAA,EAC3C;AAAA,EAIA,OAAO,gBAAuC,UAAmB,WAAW,KAAsD;AAChI,WAAO,MAAM,QAAQ,QAAQ,IACzB,SAAS,IAAI,aAAW,KAAK,gBAAgB,SAAS,QAAQ,CAAC,IAC/D,aAAa,UAAU,KAAK,QAAQ;AAAA,EAC1C;AAAA,EAEA,MAAM,qBAAqB;AACzB,WAAO,MAAM,oBAAmB;AAAA,MAC9B,SAAS,KAAK,SAAS,MAAM,yBAAyB;AAAA;AAAA,MAEtD,KAAK;AAAA,IACP;AAAA,EACF;AAAA,EAEA,OAAO,QAAuC;AAE5C,SAAK,UAAU,WAAW,oBAAmB,SAAS,kBAAkB,gBAAgB,MAAM,CAAC,CAAC,CAAC;AACjG,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,OAAe;AACpB,SAAK,UAAU;AAAA,EACjB;AACF;;;ADhGO,IAAM,iBAAN,MAAM,wBAGH,mBAAyB;AAAA,EAGjC,aAAa,YAA+B,UAAiE;AAC3G,QAAI,MAAM,QAAQ,QAAQ,GAAG;AAC3B,aAAO,MAAM,QAAQ;AAAA,QACnB,SAAS,IAAI,OAAO,YAAY;AAC9B,iBAAO,MAAM,KAAK,YAAY,OAAO;AAAA,QACvC,CAAC;AAAA,MACH;AAAA,IACF,OAAO;AACL,YAAM,QAAQ,MAAM,gBAAe,KAAK,QAAQ;AAChD,YAAM,YAAY,MAAM,gBAAe,SAAS,QAAQ;AACxD,aAAO;AAAA,QACL,GAAG;AAAA,QACH;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,aAAa,wBAAqD,SAAyC;AACzG,UAAM,eAAe,MAAM,KAAK,YAAY,OAAO;AACnD,UAAM,YAAY,eAAe,KAAK,KAAK,IAAI,GAAG,aAAa,KAAK,EAAE;AACtE,WAAO;AAAA,MACL,GAAG;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAAA,EAIA,aAAa,eAAkC,UAAuE;AACpH,WAAO,MAAM,QAAQ,QAAQ,IACzB,OAAO,YAAY;AACnB,aAAO,MAAM,QAAQ,IAAI,SAAS,IAAI,OAAM,YAAW,MAAM,KAAK;AAAA,QAChE;AAAA,MACF,CAAC,CAAC;AAAA,IACJ,GAAG,IACD,KAAK;AAAA,MACH;AAAA,IACF;AAAA,EACN;AAAA,EAEA,OAAO,mBAAmB,GAA6B,GAA6B;AAClF,WAAO,EAAE,YAAY,EAAE,YAAY,IAAI,EAAE,YAAY,EAAE,YAAY,KAAK;AAAA,EAC1E;AAAA,EAEA,aAAa,SAA4B,SAA2B;AAClE,WAAO,MAAM,aAAa,KAAK,KAAK,SAAS,OAAO,CAAC;AAAA,EACvD;AAAA,EAEA,aAAa,cAAiC,UAAqC;AACjF,WAAO,MAAM,QAAQ;AAAA,MACnB,SAAS,IAAI,OAAO,YAAY;AAC9B,cAAM,WAAW,MAAM,KAAK,SAAS,OAAO;AAC5C,eAAO,CAAC,SAAS,QAAQ;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAIA,aAAa,WAA8B,UAA6C;AACtF,WAAO,WACH,MAAM,QAAQ;AAAA,MACd,SAAS,IAAI,OAAO,YAAY;AAC9B,eAAO,MAAM,gBAAe,SAAS,OAAO;AAAA,MAC9C,CAAC;AAAA,IACH,IACE;AAAA,EACN;AAAA,EAEA,aAAa,cAAiC,WAAgB,CAAC,GAAG,MAAmC;AACnG,WAAO,MAAM,aAAa,oBAAoB,MAAM,KAAK,wBAAwB,UAAU,IAAI,GAAG,IAAI;AAAA,EACxG;AAAA,EAEA,aAAa,wBAA2C,WAAgB,CAAC,GAAG,MAAmC;AAC7G,UAAM,SAAS,MAAM,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI;AACjD,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,MAAM,CAAC,OAAO,SAAS,OAAO,CAAC,GAAG,IAAI,UAAQ,KAAK,CAAC,CAAC;AAAA,EACtH;AAAA,EAEA,aAAa,wBAA2C,WAAgB,CAAC,GAAG,MAAmC;AAC7G,UAAM,SAAS,MAAM,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI;AACjD,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,MAAM,OAAO,SAAS,OAAO,CAAC,GAAG,IAAI,UAAQ,KAAK,CAAC,CAAC;AAAA,EACrH;AAAA,EAEA,aAAa,eAAkC,WAAgB,CAAC,GAAG,MAAoC;AACrG,YAAQ,MAAM,KAAK,cAAc,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,OAAO,MAAM,YAAY,IAAI,IAAI,CAAC;AAAA,EAC1F;AAAA,EAEA,aAAa,KAAwB,SAA2B;AAC9D,WAAO,MAAM,aAAa,KAAK,KAAK,gBAAgB,OAAO,CAAC;AAAA,EAC9D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,aAAa,UAA6B,UAAqC;AAC7E,WAAO,MAAM,QAAQ;AAAA,MACnB,SAAS,IAAwB,OAAO,YAAY;AAClD,eAAO,CAAC,SAAS,MAAM,gBAAe,KAAK,OAAO,CAAC;AAAA,MACrD,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,OAAO,eACL,SACuB;AACvB,WAAO,KAAK,gBAAgB,OAAO;AAAA,EACrC;AAAA,EAIA,aAAa,OAA0B,UAA6C;AAClF,WAAO,MAAM,aAAa,OAAO,QAAQ;AAAA,EAC3C;AAAA,EAEA,OAAO,kBAAqC,UAAgC,YAAoB,GAAG;AACjG,WAAO,SAAS,KAAK,CAAC,GAAG,MACvB,EAAE,YAAY,EAAE,YACZ,CAAC,YACD,EAAE,YAAY,EAAE,YACd,YACA,CAAC;AAAA,EACX;AAAA,EAEA,aAAa,aAAgC,UAAyC;AACpF,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,UAAU,QAAQ,GAAG;AACjD,YAAM,WAAW,MAAM,KAAK,SAAS,KAAK,CAAC,CAAC;AAC5C,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AACxB,aAAO,QAAQ,IAAI,KAAK,CAAC;AAAA,IAC3B;AACA,WAAO;AAAA,EACT;AAAA,EAEA,aAAa,cAAiC,MAAqC;AACjF,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,cAAc,IAAI,GAAG;AACjD,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AAAA,IAC1B;AACA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,aAAa,UAA6B,MAAqC;AAC7E,UAAM,SAA0B,CAAC;AACjC,eAAW,QAAQ,MAAM,KAAK,UAAU,IAAI,GAAG;AAC7C,aAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;AAAA,IAC1B;AACA,WAAO;AAAA,EACT;AAAA,EAEA,QAAW;AACT,WAAO;AAAA,MACL,QAAQ,KAAK;AAAA,MACb,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/payload-builder",
-  "version": "3.6.0-rc.5",
+  "version": "3.6.0-rc.7",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,18 +29,18 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
   "dependencies": {
-    "@xylabs/assert": "^4.4.14",
-    "@xylabs/hex": "^4.4.14",
-    "@xylabs/logger": "^4.4.14",
-    "@xylabs/object": "^4.4.14",
-    "@xylabs/promise": "^4.4.14",
-    "@xyo-network/hash": "^3.6.0-rc.5",
-    "@xyo-network/payload-model": "^3.6.0-rc.5"
+    "@xylabs/assert": "^4.4.15",
+    "@xylabs/hex": "^4.4.15",
+    "@xylabs/logger": "^4.4.15",
+    "@xylabs/object": "^4.4.15",
+    "@xylabs/promise": "^4.4.15",
+    "@xyo-network/hash": "^3.6.0-rc.7",
+    "@xyo-network/payload-model": "^3.6.0-rc.7"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^4.2.4",
     "@xylabs/tsconfig": "^4.2.4",
-    "@xylabs/vitest-extended": "^4.4.14",
+    "@xylabs/vitest-extended": "^4.4.15",
     "typescript": "^5.7.2",
     "vitest": "^2.1.8"
   },

package/src/Builder.ts

@@ -5,6 +5,7 @@ import {
   type Payload,
   SequenceParser,
   type WithHashMeta,
+  type WithoutStorageMeta,
   type WithStorageMeta,
 } from '@xyo-network/payload-model'
 
@@ -124,7 +125,7 @@ export class PayloadBuilder<
 
   static hashableFields<T extends Payload>(
     payload: T,
-  ): T {
+  ): WithoutStorageMeta<T> {
     return this.omitStorageMeta(payload)
   }
 

package/src/BuilderBase.ts

@@ -1,23 +1,31 @@
 import { assertEx } from '@xylabs/assert'
-import type { AnyObject } from '@xylabs/object'
+import type { AnyObject, EmptyObject } from '@xylabs/object'
 import {
   isJsonObject, omitBy, toJson,
 } from '@xylabs/object'
 import type { Promisable } from '@xylabs/promise'
 import { removeEmptyFields } from '@xyo-network/hash'
-import type { Payload, Schema } from '@xyo-network/payload-model'
+import type {
+  DeepOmitStartsWith,
+  Payload, Schema,
+  WithOptionalSchema,
+  WithoutClientMeta,
+  WithoutMeta,
+  WithoutPrivateStorageMeta,
+  WithoutSchema,
+  WithoutStorageMeta,
+} from '@xyo-network/payload-model'
 
-import { PayloadBuilder } from './Builder.ts'
 import type { PayloadBuilderOptions } from './Options.ts'
 
-export type WithOptionalSchema<T extends Payload> = Omit<T, 'schema'> & Partial<T>
-
-export type WithoutSchema<T extends WithOptionalSchema<Payload>> = Omit<T, 'schema'>
+export const omitByPrefix = <T extends EmptyObject, P extends string>(payload: T, prefix: P, maxDepth = 100): DeepOmitStartsWith<T, P> => {
+  return omitBy(payload, omitByPrefixPredicate(prefix), maxDepth) as unknown as DeepOmitStartsWith<T, P>
+}
 
-export const removeMetaAndSchema = <T extends Payload>(payload: Partial<WithOptionalSchema<T>>): WithoutSchema<T> => {
-  const { ...result } = PayloadBuilder.omitMeta(payload as T) as WithOptionalSchema<T>
+export const omitSchema = <T extends WithOptionalSchema>(payload: T): WithoutSchema<T> => {
+  const result = structuredClone(payload)
   delete result.schema
-  return result as Omit<T, 'schema'>
+  return result
 }
 
 const omitByPrefixPredicate = (prefix: string) => (_: unknown, key: string) => {
@@ -25,78 +33,75 @@ const omitByPrefixPredicate = (prefix: string) => (_: unknown, key: string) => {
   return key.startsWith(prefix)
 }
 
-export class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
-  protected _fields?: Partial<WithoutSchema<T>>
+export class PayloadBuilderBase<T extends Payload = Payload<AnyObject>,
+  O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
+  protected _fields?: WithoutMeta<WithoutSchema<T>>
   protected _schema: Schema
 
   constructor(readonly options: O) {
     const { schema, fields } = options
     this._schema = schema
-    this._fields = removeMetaAndSchema(removeEmptyFields(structuredClone(fields ?? {})))
+    if (fields) {
+      this.fields(fields)
+    }
   }
 
   static dataHashableFields<T extends Payload>(
     schema: Schema,
     payload: WithoutSchema<T>,
 
-  ): Promisable<Payload> {
+  ): Promisable<WithoutMeta<T>> {
     const cleanFields = removeEmptyFields({ ...payload, schema })
     assertEx(
       cleanFields === undefined || isJsonObject(cleanFields),
       () => `Fields must be JsonObject: ${JSON.stringify(toJson(cleanFields), null, 2)}`,
     )
-    return this.omitMeta(cleanFields) as T
+    return this.omitMeta(cleanFields) as WithoutMeta<T>
   }
 
-  static omitClientMeta<T extends Payload>(payload: T, maxDepth?: number): T
-  static omitClientMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]
-  static omitClientMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {
+  static omitClientMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutClientMeta<T>
+  static omitClientMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutClientMeta<T>[]
+  static omitClientMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutClientMeta<T> | WithoutClientMeta<T>[] {
     return Array.isArray(payloads)
-      ? payloads.map(payload => this.omitClientMeta(payload, maxDepth)) as T[]
-      : omitBy(payloads, omitByPrefixPredicate('$'), maxDepth) as T
+      ? payloads.map(payload => this.omitClientMeta(payload, maxDepth))
+      : omitByPrefix(payloads, '$', maxDepth)
   }
 
-  static omitMeta<T extends Payload>(payload: T, maxDepth?: number): T
-  static omitMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]
-  static omitMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {
+  static omitMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutMeta<T>
+  static omitMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutMeta<T>[]
+  static omitMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutMeta<T> | WithoutMeta<T>[] {
     return Array.isArray(payloads)
-      ? this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth)
-      : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth)
+      ? payloads.map(payload => this.omitMeta(payload, maxDepth))
+      : this.omitStorageMeta(this.omitClientMeta(payloads, maxDepth), maxDepth) as unknown as WithoutMeta<T>
   }
 
-  static omitPrivateStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T
-  static omitPrivateStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]
-  static omitPrivateStorageMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {
+  static omitPrivateStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutPrivateStorageMeta<T>
+  static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutPrivateStorageMeta<T>[]
+  static omitPrivateStorageMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutPrivateStorageMeta<T> | WithoutPrivateStorageMeta<T>[] {
     return Array.isArray(payloads)
-      ? payloads.map(payload => this.omitPrivateStorageMeta(payload, maxDepth)) as T[]
-      : omitBy(payloads, omitByPrefixPredicate('__'), maxDepth) as T
+      ? payloads.map(payload => this.omitPrivateStorageMeta(payload, maxDepth))
+      : omitByPrefix(payloads, '__', maxDepth)
   }
 
-  static omitStorageMeta<T extends Payload>(payload: T, maxDepth?: number): T
-  static omitStorageMeta<T extends Payload>(payloads: T[], maxDepth?: number): T[]
-  static omitStorageMeta<T extends Payload>(payloads: T | T[], maxDepth = 100): T | T[] {
+  static omitStorageMeta<T extends EmptyObject>(payload: T, maxDepth?: number): WithoutStorageMeta<T>
+  static omitStorageMeta<T extends EmptyObject>(payloads: T[], maxDepth?: number): WithoutStorageMeta<T>[]
+  static omitStorageMeta<T extends EmptyObject>(payloads: T | T[], maxDepth = 100): WithoutStorageMeta<T> | WithoutStorageMeta<T>[] {
     return Array.isArray(payloads)
-      ? payloads.map(payload => this.omitStorageMeta(payload, maxDepth)) as T[]
-      : omitBy(payloads, omitByPrefixPredicate('_'), maxDepth) as T
+      ? payloads.map(payload => this.omitStorageMeta(payload, maxDepth))
+      : omitByPrefix(payloads, '_', maxDepth)
   }
 
   async dataHashableFields() {
     return await PayloadBuilderBase.dataHashableFields(
       assertEx(this._schema, () => 'Payload: Missing Schema'),
       // TDOD: Add verification that required fields are present
-      this._fields as T,
+      this._fields as WithoutSchema<T>,
     )
   }
 
-  fields(fields: WithOptionalSchema<T>) {
-    if (fields) {
-      const fieldsClone = structuredClone(fields)
-      const { schema } = fieldsClone
-      if (schema) {
-        this.schema(schema)
-      }
-      this._fields = removeEmptyFields(removeMetaAndSchema<T>(fieldsClone))
-    }
+  fields(fields: WithoutMeta<WithoutSchema<T>>) {
+    // we need to do the cast here since ts seems to not like nested, yet same, generics
+    this._fields = omitSchema(PayloadBuilderBase.omitMeta(removeEmptyFields(structuredClone(fields)))) as unknown as WithoutMeta<WithoutSchema<T>>
     return this
   }
 

package/src/Options.ts

@@ -1,9 +1,11 @@
 import type { Logger } from '@xylabs/logger'
-import type { JsonObject } from '@xylabs/object'
-import type { Schema } from '@xyo-network/payload-model'
+import type { EmptyObject, JsonObject } from '@xylabs/object'
+import type {
+  Schema, WithoutMeta, WithoutSchema,
+} from '@xyo-network/payload-model'
 
-export interface PayloadBuilderOptions<T> {
-  readonly fields?: Partial<T>
+export interface PayloadBuilderOptions<T extends EmptyObject = EmptyObject> {
+  readonly fields?: WithoutMeta<WithoutSchema<T>>
   readonly logger?: Logger
   readonly meta?: JsonObject
   readonly schema: Schema