@xyo-network/xl1-protocol 1.13.6 → 1.13.7

package/dist/neutral/model/BlockRange/EthBlockRange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EthBlockRange.d.ts","sourceRoot":"","sources":["../../../../src/model/BlockRange/EthBlockRange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,EAAE,KAAK,KAAK,EAAa,MAAM,gBAAgB,CAAA;AACtD,OAAO,CAAC,MAAM,KAAK,CAAA;AAEnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAQ7D,MAAM,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AAC5D,MAAM,MAAM,sBAAsB,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AAErE,eAAO,MAAM,gBAAgB,oJAAkD,CAAA;AAC/E,eAAO,MAAM,yBAAyB,0qBAAoE,CAAA;AAE1G,eAAO,MAAM,eAAe;;;CAAgD,CAAA;AAC5E,eAAO,MAAM,eAAe;;;CAAyD,CAAA;AAErF,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE;IAAE,QAAQ,CAAC,kBAAkB,EAAE,IAAI,CAAA;CAAE,CAAC,CAAA;AACnF,eAAO,MAAM,mBAAmB,GAAI,OAAO,aAAa,KAAkC,gBAAgB,CAAA;AAE1G,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,GAAG,aAAa,GAAG,SAAS,CAAA;AACvF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,GAAG,aAAa,CAAA"}
+{"version":3,"file":"EthBlockRange.d.ts","sourceRoot":"","sources":["../../../../src/model/BlockRange/EthBlockRange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,EAAE,KAAK,KAAK,EAAa,MAAM,gBAAgB,CAAA;AACtD,OAAO,CAAC,MAAM,KAAK,CAAA;AAEnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAQ7D,MAAM,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AAC5D,MAAM,MAAM,sBAAsB,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AAErE,eAAO,MAAM,gBAAgB,oJAAkD,CAAA;AAC/E,eAAO,MAAM,yBAAyB,0qBAAoE,CAAA;AAE1G,eAAO,MAAM,eAAe;;;CAAiE,CAAA;AAC7F,eAAO,MAAM,eAAe;;;CAA0E,CAAA;AAEtG,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE;IAAE,QAAQ,CAAC,kBAAkB,EAAE,IAAI,CAAA;CAAE,CAAC,CAAA;AACnF,eAAO,MAAM,mBAAmB,GAAI,OAAO,aAAa,KAAkC,gBAAgB,CAAA;AAE1G,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,GAAG,aAAa,GAAG,SAAS,CAAA;AACvF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,GAAG,aAAa,CAAA"}

package/dist/neutral/model/BlockRange/Range.d.ts

@@ -4,10 +4,10 @@ export type Range = z.infer<typeof RangeZod>;
 export declare const isRange: (value: unknown) => value is [number, number];
 export declare const asRange: {
     (value: unknown): [number, number] | undefined;
-    (value: unknown, assert: import("@xylabs/hex").AssertConfig): [number, number];
+    (value: unknown, assert: import("../zod/Config.ts").ZodFactoryConfig): [number, number];
 };
 export declare const toRange: {
     (value: unknown): [number, number] | undefined;
-    (value: unknown, assert: import("@xylabs/hex").AssertConfig): [number, number];
+    (value: unknown, assert: import("../zod/Config.ts").ZodFactoryConfig): [number, number];
 };
 //# sourceMappingURL=Range.d.ts.map

package/dist/neutral/model/BlockRange/Range.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Range.d.ts","sourceRoot":"","sources":["../../../../src/model/BlockRange/Range.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AAMnB,eAAO,MAAM,QAAQ,8CAAoC,CAAA;AAEzD,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,QAAQ,CAAC,CAAA;AAE5C,eAAO,MAAM,OAAO,+CAAgC,CAAA;AACpD,eAAO,MAAM,OAAO;;;CAAgC,CAAA;AACpD,eAAO,MAAM,OAAO;;;CAAgC,CAAA"}
+{"version":3,"file":"Range.d.ts","sourceRoot":"","sources":["../../../../src/model/BlockRange/Range.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AAMnB,eAAO,MAAM,QAAQ,8CAAoC,CAAA;AAEzD,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,QAAQ,CAAC,CAAA;AAE5C,eAAO,MAAM,OAAO,+CAAgC,CAAA;AACpD,eAAO,MAAM,OAAO;;;CAAyC,CAAA;AAC7D,eAAO,MAAM,OAAO;;;CAAyC,CAAA"}

package/dist/neutral/model/BlockRange/XL1BlockRange.d.ts

@@ -8,11 +8,11 @@ export declare const XL1BlockRangeZod: z.ZodTuple<[z.ZodPipe<z.ZodNumber, z.ZodT
 export declare const NumberishXL1BlockRangeZod: z.ZodTuple<[z.ZodPipe<z.ZodPipe<z.ZodPipe<z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodString, z.ZodBigInt]>, z.ZodTransform<number, string | number | bigint>>, z.ZodNumber>, z.ZodTransform<import("../BlockNumber/BlockNumber.ts").BlockNumber, number>>, z.ZodTransform<XL1BlockNumber, import("../BlockNumber/BlockNumber.ts").BlockNumber>>, z.ZodPipe<z.ZodPipe<z.ZodPipe<z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodString, z.ZodBigInt]>, z.ZodTransform<number, string | number | bigint>>, z.ZodNumber>, z.ZodTransform<import("../BlockNumber/BlockNumber.ts").BlockNumber, number>>, z.ZodTransform<XL1BlockNumber, import("../BlockNumber/BlockNumber.ts").BlockNumber>>], null>;
 export declare const asXL1BlockRange: {
     (value: unknown): XL1BlockRange | undefined;
-    (value: unknown, assert: AssertConfig): XL1BlockRange;
+    (value: unknown, assert: import("../zod/Config.ts").ZodFactoryConfig): XL1BlockRange;
 };
 export declare const toXL1BlockRange: {
     (value: unknown): XL1BlockRange | undefined;
-    (value: unknown, assert: AssertConfig): XL1BlockRange;
+    (value: unknown, assert: import("../zod/Config.ts").ZodFactoryConfig): XL1BlockRange;
 };
 export type XL1BlockRangeKey = Brand<string, {
     readonly __xl1BlockRangeKey: true;

package/dist/neutral/model/BlockRange/XL1BlockRange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XL1BlockRange.d.ts","sourceRoot":"","sources":["../../../../src/model/BlockRange/XL1BlockRange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,EAAE,KAAK,KAAK,EAAa,MAAM,gBAAgB,CAAA;AACtD,OAAO,CAAC,MAAM,KAAK,CAAA;AAEnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAQ7D,MAAM,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AAC5D,MAAM,MAAM,sBAAsB,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AAErE,eAAO,MAAM,gBAAgB,oJAAkD,CAAA;AAC/E,eAAO,MAAM,yBAAyB,0qBAAoE,CAAA;AAE1G,eAAO,MAAM,eAAe;;;CAAgD,CAAA;AAC5E,eAAO,MAAM,eAAe;;;CAAyD,CAAA;AAErF,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE;IAAE,QAAQ,CAAC,kBAAkB,EAAE,IAAI,CAAA;CAAE,CAAC,CAAA;AACnF,eAAO,MAAM,mBAAmB,GAAI,OAAO,aAAa,KAAkC,gBAAgB,CAAA;AAE1G,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,GAAG,aAAa,GAAG,SAAS,CAAA;AACvF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,GAAG,aAAa,CAAA"}
+{"version":3,"file":"XL1BlockRange.d.ts","sourceRoot":"","sources":["../../../../src/model/BlockRange/XL1BlockRange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,EAAE,KAAK,KAAK,EAAa,MAAM,gBAAgB,CAAA;AACtD,OAAO,CAAC,MAAM,KAAK,CAAA;AAEnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAQ7D,MAAM,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AAC5D,MAAM,MAAM,sBAAsB,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AAErE,eAAO,MAAM,gBAAgB,oJAAkD,CAAA;AAC/E,eAAO,MAAM,yBAAyB,0qBAAoE,CAAA;AAE1G,eAAO,MAAM,eAAe;;;CAAiE,CAAA;AAC7F,eAAO,MAAM,eAAe;;;CAA0E,CAAA;AAEtG,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE;IAAE,QAAQ,CAAC,kBAAkB,EAAE,IAAI,CAAA;CAAE,CAAC,CAAA;AACnF,eAAO,MAAM,mBAAmB,GAAI,OAAO,aAAa,KAAkC,gBAAgB,CAAA;AAE1G,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,GAAG,aAAa,GAAG,SAAS,CAAA;AACvF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,GAAG,aAAa,CAAA"}

package/dist/neutral/model/zod/Config.d.ts

@@ -0,0 +1,6 @@
+import type { AssertConfig } from '@xylabs/hex';
+export interface ZodFactoryConfigObject {
+    name: string;
+}
+export type ZodFactoryConfig = AssertConfig | ZodFactoryConfigObject;
+//# sourceMappingURL=Config.d.ts.map

package/dist/neutral/model/zod/Config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../../src/model/zod/Config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,sBAAsB,CAAA"}

package/dist/neutral/model/zod/index.d.ts

@@ -1,3 +1,4 @@
+export * from './Config.ts';
 export * from './zodAsFactory.ts';
 export * from './zodIsFactory.ts';
 export * from './zodToFactory.ts';

package/dist/neutral/model/zod/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/model/zod/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/model/zod/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA"}

package/dist/neutral/model/zod/zodAsFactory.d.ts

@@ -1,7 +1,7 @@
-import type { AssertConfig } from '@xylabs/hex';
 import type z from 'zod';
-export declare function zodAsFactory<T>(zod: z.ZodType<T>): {
+import type { ZodFactoryConfig } from './Config.ts';
+export declare function zodAsFactory<T>(zod: z.ZodType<T>, name: string): {
     (value: unknown): T | undefined;
-    (value: unknown, assert: AssertConfig): T;
+    (value: unknown, assert: ZodFactoryConfig): T;
 };
 //# sourceMappingURL=zodAsFactory.d.ts.map

package/dist/neutral/model/zod/zodAsFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zodAsFactory.d.ts","sourceRoot":"","sources":["../../../../src/model/zod/zodAsFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACxB,OAAO,GAAG,CAAC,GAAG,SAAS;YACvB,OAAO,UAAU,YAAY,GAAG,CAAC;EAUzD"}
+{"version":3,"file":"zodAsFactory.d.ts","sourceRoot":"","sources":["../../../../src/model/zod/zodAsFactory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM;YACtC,OAAO,GAAG,CAAC,GAAG,SAAS;YACvB,OAAO,UAAU,gBAAgB,GAAG,CAAC;EAgC7D"}

package/dist/neutral/model/zod/zodToFactory.d.ts

@@ -1,6 +1,6 @@
 import type z from 'zod';
-export declare function zodToFactory<T>(zod: z.ZodType<T>): {
+export declare function zodToFactory<T>(zod: z.ZodType<T>, name: string): {
     (value: unknown): T | undefined;
-    (value: unknown, assert: import("@xylabs/hex").AssertConfig): T;
+    (value: unknown, assert: import("./Config.ts").ZodFactoryConfig): T;
 };
 //# sourceMappingURL=zodToFactory.d.ts.map

package/dist/neutral/model/zod/zodToFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zodToFactory.d.ts","sourceRoot":"","sources":["../../../../src/model/zod/zodToFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAIxB,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;;;EAEhD"}
+{"version":3,"file":"zodToFactory.d.ts","sourceRoot":"","sources":["../../../../src/model/zod/zodToFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAIxB,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM;;;EAE9D"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-protocol",
-  "version": "1.13.6",
+  "version": "1.13.7",
   "description": "XYO Layer One Protocol",
   "homepage": "https://xylabs.com",
   "bugs": {

package/src/block/AllowedBlockPayload.ts

@@ -1,10 +1,11 @@
 import { BoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import type { Schema, WithStorageMeta } from '@xyo-network/payload-model'
-import { isHashMeta, isSchema } from '@xyo-network/payload-model'
+import { isHashMeta } from '@xyo-network/payload-model'
 import type { SchemaPayload } from '@xyo-network/schema-payload-plugin'
 import { isSchemaPayload, SchemaSchema } from '@xyo-network/schema-payload-plugin'
 import z from 'zod'
 
+import { zodIsFactory } from '../model/index.ts'
 import type {
   BridgeDestinationObservation, BridgeIntent, BridgeSourceObservation, ChainStakeIntent, HashPayload, StepComplete, TimePayload, Transfer,
 } from '../payload/index.ts'
@@ -27,7 +28,7 @@ export type AllowedBlockPayload
     | TimePayload
     | TransactionBoundWitness
 
-export const AllowedBlockPayloadSchemas: Schema[] = [
+export const AllowedBlockPayloadSchemas = [
   BoundWitnessSchema,
   BridgeDestinationObservationSchema,
   BridgeIntentSchema,
@@ -38,13 +39,11 @@ export const AllowedBlockPayloadSchemas: Schema[] = [
   StepCompleteSchema,
   TimeSchema,
   TransferSchema,
-]
+] satisfies Schema[]
 
-export type AllowedBlockPayloadSchema = typeof AllowedBlockPayloadSchemas[number]
-
-export const isAllowedBlockPayloadSchema = (value: unknown): value is AllowedBlockPayloadSchema => {
-  return isSchema(value) && AllowedBlockPayloadSchemas.includes(value)
-}
+export const AllowedBlockPayloadSchemaZod = z.enum(AllowedBlockPayloadSchemas)
+export type AllowedBlockPayloadSchema = z.infer<typeof AllowedBlockPayloadSchemaZod>
+export const isAllowedBlockPayloadSchema = zodIsFactory<AllowedBlockPayloadSchema>(AllowedBlockPayloadSchemaZod)
 
 export const isAllowedBlockPayload = (value: unknown): value is AllowedBlockPayload => {
   return isTransfer(value)
@@ -61,5 +60,3 @@ export const isAllowedBlockPayload = (value: unknown): value is AllowedBlockPayl
 export const isAllowedBlockPayloadWithHashMeta = (value: unknown): value is WithStorageMeta<AllowedBlockPayload> => {
   return isAllowedBlockPayload(value) && isHashMeta(value)
 }
-
-export const AllowedBlockPayloadZod = z.object({ schema: z.enum(AllowedBlockPayloadSchemas) })

package/src/model/BlockNumber/BlockNumber.ts

@@ -9,7 +9,7 @@ export type BlockNumber = Brand<number, { readonly __blockNumber: true }>
 export const BlockNumberZod = z.number().transform(v => v as BlockNumber)
 export const NumberishBlockNumberZod = NumberishZod.transform(v => v as BlockNumber)
 
-export const asBlockNumber = zodAsFactory<BlockNumber>(BlockNumberZod)
-export const toBlockNumber = zodToFactory<BlockNumber>(NumberishBlockNumberZod)
+export const asBlockNumber = zodAsFactory<BlockNumber>(BlockNumberZod, 'asBlockNumber')
+export const toBlockNumber = zodToFactory<BlockNumber>(NumberishBlockNumberZod, 'toBlockNumber')
 
 export const BLOCK_NUMBER_ZERO = asBlockNumber(0)

package/src/model/BlockNumber/EthBlockNumber.ts

@@ -10,7 +10,7 @@ export type EthBlockNumber = Brand<BlockNumber, { readonly __ethBlockNumber: tru
 export const EthBlockNumberZod = z.number().transform(v => v as EthBlockNumber)
 export const NumberishEthBlockNumberZod = NumberishBlockNumberZod.transform(v => v as EthBlockNumber)
 
-export const asEthBlockNumber = zodAsFactory<EthBlockNumber>(EthBlockNumberZod)
-export const toEthBlockNumber = zodToFactory<EthBlockNumber>(NumberishEthBlockNumberZod)
+export const asEthBlockNumber = zodAsFactory<EthBlockNumber>(EthBlockNumberZod, 'asEthBlockNumber')
+export const toEthBlockNumber = zodToFactory<EthBlockNumber>(NumberishEthBlockNumberZod, 'toEthBlockNumber')
 
 export const ETH_BLOCK_NUMBER_ZERO = asEthBlockNumber(0)

package/src/model/BlockNumber/XL1BlockNumber.ts

@@ -10,7 +10,7 @@ export type XL1BlockNumber = Brand<BlockNumber, { readonly __xl1BlockNumber: tru
 export const XL1BlockNumberZod = z.number().transform(v => v as XL1BlockNumber)
 export const NumberishXL1BlockNumberZod = NumberishBlockNumberZod.transform(v => v as XL1BlockNumber)
 
-export const asXL1BlockNumber = zodAsFactory<XL1BlockNumber>(XL1BlockNumberZod)
-export const toXL1BlockNumber = zodToFactory<XL1BlockNumber>(NumberishXL1BlockNumberZod)
+export const asXL1BlockNumber = zodAsFactory<XL1BlockNumber>(XL1BlockNumberZod, 'asXL1BlockNumber')
+export const toXL1BlockNumber = zodToFactory<XL1BlockNumber>(NumberishXL1BlockNumberZod, 'toXL1BlockNumber')
 
 export const XL1_BLOCK_NUMBER_ZERO = asXL1BlockNumber(0)

package/src/model/BlockRange/BlockRange.ts

@@ -15,8 +15,8 @@ export type NumberishBlockRange = [BlockNumber, BlockNumber]
 export const BlockRangeZod = z.tuple([BlockNumberZod, BlockNumberZod])
 export const NumberishBlockRangeZod = z.tuple([NumberishBlockNumberZod, NumberishBlockNumberZod])
 
-export const asBlockRange = zodAsFactory<BlockRange>(BlockRangeZod)
-export const toBlockRange = zodToFactory<BlockRange>(NumberishBlockRangeZod)
+export const asBlockRange = zodAsFactory<BlockRange>(BlockRangeZod, 'BlockRange')
+export const toBlockRange = zodToFactory<BlockRange>(NumberishBlockRangeZod, 'BlockRange')
 
 export type BlockRangeKey = Brand<string, { readonly __blockRangeKey: true }>
 export const toBlockNumberKey = (range: BlockRange) => `${range[0]}|${range[1]}` as BlockRangeKey

package/src/model/BlockRange/EthBlockRange.ts

@@ -17,8 +17,8 @@ export type NumberishEthBlockRange = [EthBlockNumber, EthBlockNumber]
 export const EthBlockRangeZod = z.tuple([EthBlockNumberZod, EthBlockNumberZod])
 export const NumberishEthBlockRangeZod = z.tuple([NumberishEthBlockNumberZod, NumberishEthBlockNumberZod])
 
-export const asEthBlockRange = zodAsFactory<EthBlockRange>(EthBlockRangeZod)
-export const toEthBlockRange = zodToFactory<EthBlockRange>(NumberishEthBlockRangeZod)
+export const asEthBlockRange = zodAsFactory<EthBlockRange>(EthBlockRangeZod, 'EthBlockRange')
+export const toEthBlockRange = zodToFactory<EthBlockRange>(NumberishEthBlockRangeZod, 'EthBlockRange')
 
 export type EthBlockRangeKey = Brand<string, { readonly __ethBlockRangeKey: true }>
 export const toEthBlockNumberKey = (range: EthBlockRange) => `${range[0]}|${range[1]}` as EthBlockRangeKey

package/src/model/BlockRange/Range.ts

@@ -9,5 +9,5 @@ export const RangeZod = z.tuple([z.number(), z.number()])
 export type Range = z.infer<typeof RangeZod>
 
 export const isRange = zodIsFactory<Range>(RangeZod)
-export const asRange = zodAsFactory<Range>(RangeZod)
-export const toRange = zodToFactory<Range>(RangeZod)
+export const asRange = zodAsFactory<Range>(RangeZod, 'Range')
+export const toRange = zodToFactory<Range>(RangeZod, 'Range')

package/src/model/BlockRange/XL1BlockRange.ts

@@ -17,8 +17,8 @@ export type NumberishXL1BlockRange = [XL1BlockNumber, XL1BlockNumber]
 export const XL1BlockRangeZod = z.tuple([XL1BlockNumberZod, XL1BlockNumberZod])
 export const NumberishXL1BlockRangeZod = z.tuple([NumberishXL1BlockNumberZod, NumberishXL1BlockNumberZod])
 
-export const asXL1BlockRange = zodAsFactory<XL1BlockRange>(XL1BlockRangeZod)
-export const toXL1BlockRange = zodToFactory<XL1BlockRange>(NumberishXL1BlockRangeZod)
+export const asXL1BlockRange = zodAsFactory<XL1BlockRange>(XL1BlockRangeZod, 'XL1BlockRange')
+export const toXL1BlockRange = zodToFactory<XL1BlockRange>(NumberishXL1BlockRangeZod, 'XL1BlockRange')
 
 export type XL1BlockRangeKey = Brand<string, { readonly __xl1BlockRangeKey: true }>
 export const toXL1BlockNumberKey = (range: XL1BlockRange) => `${range[0]}|${range[1]}` as XL1BlockRangeKey

package/src/model/zod/Config.ts

@@ -0,0 +1,7 @@
+import type { AssertConfig } from '@xylabs/hex'
+
+export interface ZodFactoryConfigObject {
+  name: string
+}
+
+export type ZodFactoryConfig = AssertConfig | ZodFactoryConfigObject

package/src/model/zod/index.ts

@@ -1,3 +1,4 @@
+export * from './Config.ts'
 export * from './zodAsFactory.ts'
 export * from './zodIsFactory.ts'
 export * from './zodToFactory.ts'

package/src/model/zod/zodAsFactory.ts

@@ -2,15 +2,39 @@ import type { AssertConfig } from '@xylabs/hex'
 import { assertError } from '@xylabs/hex'
 import type z from 'zod'
 
-export function zodAsFactory<T>(zod: z.ZodType<T>) {
+import type { ZodFactoryConfig } from './Config.ts'
+
+export function zodAsFactory<T>(zod: z.ZodType<T>, name: string) {
   function asFunc(value: unknown): T | undefined
-  function asFunc(value: unknown, assert: AssertConfig): T
-  function asFunc(value: unknown, assert?: AssertConfig): T | undefined {
+  function asFunc(value: unknown, assert: ZodFactoryConfig): T
+  function asFunc(value: unknown, assert?: ZodFactoryConfig): T | undefined {
     const result = zod.safeParse(value)
     if (result.success) {
       return result.data
     }
-    return assertError(value, assert, result.error.message)
+    let assertConfig: AssertConfig
+    switch (typeof assert) {
+      case 'string': {
+        assertConfig = `[${name}][${value}] ${assert}`
+        break
+      }
+      case 'object': {
+        assertConfig = `[${name}][${assert.name}][${value}] ${result.error.message}`
+        break
+      }
+      case 'boolean': {
+        assertConfig = `[${name}][${value}] ${result.error.message}`
+        break
+      }
+      case 'function': {
+        assertConfig = assert(value, result.error.message)
+        break
+      }
+      default: {
+        assertConfig = true
+      }
+    }
+    return assertError(value, assertConfig, result.error.message)
   }
 
   return asFunc

package/src/model/zod/zodToFactory.ts

@@ -2,6 +2,6 @@ import type z from 'zod'
 
 import { zodAsFactory } from './zodAsFactory.ts'
 
-export function zodToFactory<T>(zod: z.ZodType<T>) {
-  return zodAsFactory<T>(zod)
+export function zodToFactory<T>(zod: z.ZodType<T>, name: string) {
+  return zodAsFactory<T>(zod, name)
 }