@wormhole-foundation/sdk-base 0.4.2-beta.2 → 0.4.3

package/dist/esm/utils/layout/serialize.js

@@ -1,57 +1,52 @@
-import { numberMaxSize, } from "./layout";
+import { isNumType, isBytesType, numberMaxSize, } from "./layout";
 import { calcLayoutSize } from "./size";
-import { checkItemSize, checkBytesTypeEqual, checkNumEquals, findIdLayoutPair, isFixedBytesConversion, isLayoutItem, isNumType, isBytesType, } from "./utils";
-const cursorWrite = (cursor, bytes) => {
-    cursor.bytes.set(bytes, cursor.offset);
-    cursor.offset += bytes.length;
-};
+import { checkUint8ArrayDeeplyEqual, checkUint8ArraySize, checkNumEquals, findIdLayoutPair } from "./utils";
 export function serializeLayout(layout, data, encoded, offset = 0) {
-    const cursor = { bytes: encoded ?? new Uint8Array(calcLayoutSize(layout, data)), offset };
-    internalSerializeLayout(layout, data, cursor);
-    if (!encoded && cursor.offset !== cursor.bytes.length)
-        throw new Error(`encoded data is shorter than expected: ${cursor.bytes.length} > ${cursor.offset}`);
-    return (encoded ? cursor.offset : cursor.bytes);
+    return (internalSerializeLayout(layout, data, encoded, offset));
 }
 //see numberMaxSize comment in layout.ts
 const maxAllowedNumberVal = 2 ** (numberMaxSize * 8);
-export function serializeNum(val, size, cursor, endianness = "big", signed = false) {
+export function serializeNum(encoded, offset, val, bytes, endianness = "big", signed = false) {
     if (!signed && val < 0)
         throw new Error(`Value ${val} is negative but unsigned`);
     if (typeof val === "number") {
         if (!Number.isInteger(val))
             throw new Error(`Value ${val} is not an integer`);
-        if (size > numberMaxSize) {
+        if (bytes > numberMaxSize) {
             if (val >= maxAllowedNumberVal)
                 throw new Error(`Value ${val} is too large to be safely converted into an integer`);
             if (signed && val <= -maxAllowedNumberVal)
                 throw new Error(`Value ${val} is too small to be safely converted into an integer`);
         }
     }
-    const bound = 2n ** BigInt(size * 8);
+    const bound = 2n ** BigInt(bytes * 8);
     if (val >= bound)
-        throw new Error(`Value ${val} is too large for ${size} bytes`);
+        throw new Error(`Value ${val} is too large for ${bytes} bytes`);
     if (signed && val < -bound)
-        throw new Error(`Value ${val} is too small for ${size} bytes`);
+        throw new Error(`Value ${val} is too small for ${bytes} bytes`);
     //correctly handles both signed and unsigned values
-    for (let i = 0; i < size; ++i)
-        cursor.bytes[cursor.offset + i] =
-            Number((BigInt(val) >> BigInt(8 * (endianness === "big" ? size - i - 1 : i)) & 0xffn));
-    cursor.offset += size;
+    for (let i = 0; i < bytes; ++i)
+        encoded[offset + i] =
+            Number((BigInt(val) >> BigInt(8 * (endianness === "big" ? bytes - i - 1 : i)) & 0xffn));
+    return offset + bytes;
 }
-function internalSerializeLayout(layout, data, cursor) {
-    if (isLayoutItem(layout))
-        serializeLayoutItem(layout, data, cursor);
-    else
-        for (const item of layout)
+function internalSerializeLayout(layout, data, encoded, offset = 0) {
+    let ret = encoded ?? new Uint8Array(calcLayoutSize(layout, data));
+    if (Array.isArray(layout))
+        for (let i = 0; i < layout.length; ++i)
             try {
-                serializeLayoutItem(item, data[item.name], cursor);
+                offset =
+                    serializeLayoutItem(layout[i], data[layout[i].name], ret, offset);
             }
             catch (e) {
-                e.message = `when serializing item '${item.name}': ${e.message}`;
+                e.message = `when serializing item '${layout[i].name}': ${e.message}`;
                 throw e;
             }
+    else
+        offset = serializeLayoutItem(layout, data, ret, offset);
+    return encoded === undefined ? ret : offset;
 }
-function serializeLayoutItem(item, data, cursor) {
+function serializeLayoutItem(item, data, encoded, offset) {
     switch (item.binary) {
         case "int":
         case "uint": {
@@ -66,78 +61,56 @@ function serializeLayoutItem(item, data, cursor) {
                     return item.custom.from;
                 return item.custom !== undefined ? item.custom.from(data) : data;
             })();
-            serializeNum(value, item.size, cursor, item.endianness, item.binary === "int");
+            offset =
+                serializeNum(encoded, offset, value, item.size, item.endianness, item.binary === "int");
             break;
         }
         case "bytes": {
-            const offset = cursor.offset;
-            if ("lengthSize" in item && item.lengthSize !== undefined)
-                cursor.offset += item.lengthSize;
-            if ("layout" in item) {
-                const { custom } = item;
-                let layoutData;
-                if (custom === undefined)
-                    layoutData = data;
-                else if (typeof custom.from !== "function")
-                    layoutData = custom.from;
-                else
-                    layoutData = custom.from(data);
-                internalSerializeLayout(item.layout, layoutData, cursor);
-            }
-            else {
-                const { custom } = item;
-                if (isBytesType(custom)) {
+            const value = (() => {
+                if (isBytesType(item.custom)) {
                     if (!("omit" in item && item.omit))
-                        checkBytesTypeEqual(custom, data);
-                    cursorWrite(cursor, custom);
+                        checkUint8ArrayDeeplyEqual(item.custom, data);
+                    return item.custom;
                 }
-                else if (isFixedBytesConversion(custom))
-                    //no proper way to deeply check equality of custom.to and data
-                    cursorWrite(cursor, custom.from);
-                else
-                    cursorWrite(cursor, custom !== undefined ? custom.from(data) : data);
-            }
-            if ("lengthSize" in item && item.lengthSize !== undefined) {
-                const itemSize = cursor.offset - offset - item.lengthSize;
-                const curOffset = cursor.offset;
-                cursor.offset = offset;
-                serializeNum(itemSize, item.lengthSize, cursor, item.lengthEndianness);
-                cursor.offset = curOffset;
-            }
-            else
-                checkItemSize(item, cursor.offset - offset);
+                if (isBytesType(item?.custom?.from))
+                    //no proper way to deeply check equality of item.custom.to and data in JS
+                    return item.custom.from;
+                item = item;
+                const ret = item.custom !== undefined ? item.custom.from(data) : data;
+                if ("size" in item && item.size !== undefined)
+                    checkUint8ArraySize(ret, item.size);
+                else if ("lengthSize" in item && item.lengthSize !== undefined)
+                    offset =
+                        serializeNum(encoded, offset, ret.length, item.lengthSize, item.lengthEndianness);
+                return ret;
+            })();
+            encoded.set(value, offset);
+            offset += value.length;
             break;
         }
         case "array": {
             if ("length" in item && item.length !== data.length)
                 throw new Error(`array length mismatch: layout length: ${item.length}, data length: ${data.length}`);
             if ("lengthSize" in item && item.lengthSize !== undefined)
-                serializeNum(data.length, item.lengthSize, cursor, item.lengthEndianness);
+                offset =
+                    serializeNum(encoded, offset, data.length, item.lengthSize, item.lengthEndianness);
             for (let i = 0; i < data.length; ++i)
-                internalSerializeLayout(item.layout, data[i], cursor);
+                offset = internalSerializeLayout(item.layout, data[i], encoded, offset);
+            break;
+        }
+        case "object": {
+            offset = internalSerializeLayout(item.layout, data, encoded, offset);
             break;
         }
         case "switch": {
             const [idOrConversionId, layout] = findIdLayoutPair(item, data);
             const idNum = (Array.isArray(idOrConversionId) ? idOrConversionId[0] : idOrConversionId);
-            serializeNum(idNum, item.idSize, cursor, item.idEndianness);
-            internalSerializeLayout(layout, data, cursor);
+            offset = serializeNum(encoded, offset, idNum, item.idSize, item.idEndianness);
+            offset = internalSerializeLayout(layout, data, encoded, offset);
             break;
         }
     }
+    return offset;
 }
 ;
-//slightly hacky, but the only way to ensure that we are actually deserializing the
-//  right data without having to re-serialize the layout every time
-export function getCachedSerializedFrom(item) {
-    const custom = item.custom;
-    if (!("cachedSerializedFrom" in custom)) {
-        custom.cachedSerializedFrom = serializeLayout(item.layout, custom.from);
-        if ("size" in item &&
-            item.size !== undefined &&
-            item.size !== custom.cachedSerializedFrom.length)
-            throw new Error(`Layout specification error: custom.from does not serialize to specified size`);
-    }
-    return custom.cachedSerializedFrom;
-}
 //# sourceMappingURL=serialize.js.map

package/dist/esm/utils/layout/serialize.js.map

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

package/dist/esm/utils/layout/size.d.ts

@@ -1,4 +1,3 @@
 import { Layout, LayoutToType } from "./layout";
-export declare function calcStaticLayoutSize(layout: Layout): number | null;
-export declare function calcLayoutSize<const L extends Layout>(layout: L, data: LayoutToType<L>): number;
+export declare function calcLayoutSize(layout: Layout, data?: LayoutToType<typeof layout>): number;
 //# sourceMappingURL=size.d.ts.map

package/dist/esm/utils/layout/size.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"size.d.ts","sourceRoot":"","sources":["../../../../src/utils/layout/size.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAEN,YAAY,EACb,MAAM,UAAU,CAAC;AA4IlB,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAElE;AAED,wBAAgB,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAQ/F"}
+{"version":3,"file":"size.d.ts","sourceRoot":"","sources":["../../../../src/utils/layout/size.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAEN,YAAY,EAGb,MAAM,UAAU,CAAC;AAiGlB,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,GACjC,MAAM,CAYR"}

package/dist/esm/utils/layout/size.js

@@ -1,122 +1,88 @@
-import { findIdLayoutPair, isBytesType, isLayoutItem, isFixedBytesConversion, checkItemSize, } from "./utils";
-function calcItemSize(item, data) {
+import { isBytesType, } from "./layout";
+import { findIdLayoutPair } from "./utils";
+function staticCalcItemSize(item) {
     switch (item.binary) {
         case "int":
-        case "uint":
+        case "uint": {
             return item.size;
+        }
         case "bytes": {
-            //items only have a size or a lengthSize, never both
-            const lengthSize = ("lengthSize" in item) ? item.lengthSize | 0 : 0;
-            if ("layout" in item) {
-                const layoutSize = internalCalcLayoutSize(item.layout, data);
-                if (layoutSize === null)
-                    return ("size" in item) ? item.size ?? null : null;
-                return lengthSize + checkItemSize(item, layoutSize);
-            }
-            const { custom } = item;
-            if (isBytesType(custom))
-                return lengthSize + custom.length; //assumed to equal item.size if it exists
-            if (isFixedBytesConversion(custom))
-                return lengthSize + custom.from.length; //assumed to equal item.size if it exists
-            if (custom === undefined)
-                return data ? lengthSize + checkItemSize(item, data.length) : null;
-            return data !== undefined ? lengthSize + checkItemSize(item, custom.from(data).length) : null;
+            if ("size" in item && item.size !== undefined)
+                return item.size;
+            if (isBytesType(item.custom))
+                return item.custom.length;
+            if (isBytesType(item?.custom?.from))
+                return item.custom.from.length;
+            throw new Error("Cannot statically determine size of dynamic bytes");
         }
-        case "array": {
-            const length = "length" in item ? item.length : undefined;
-            if (data === undefined) {
-                if (length !== undefined) {
-                    const layoutSize = internalCalcLayoutSize(item.layout);
-                    if (layoutSize === null)
-                        return null;
-                    return length * layoutSize;
-                }
-                return null;
-            }
-            let size = 0;
-            if (length !== undefined && length !== data.length)
-                throw new Error(`array length mismatch: layout length: ${length}, data length: ${data.length}`);
-            else if ("lengthSize" in item && item.lengthSize !== undefined)
-                size += item.lengthSize;
-            for (let i = 0; i < data.length; ++i) {
-                const entrySize = internalCalcLayoutSize(item.layout, data[i]);
-                if (entrySize === null)
-                    return null;
-                size += entrySize;
-            }
-            return size;
+        case "array":
+            throw new Error("Cannot statically determine size of dynamic array");
+        case "object": {
+            return calcLayoutSize(item.layout);
         }
         case "switch": {
-            if (data !== undefined) {
-                const [_, layout] = findIdLayoutPair(item, data);
-                const layoutSize = internalCalcLayoutSize(layout, data);
-                return layoutSize !== null ? item.idSize + layoutSize : null;
-            }
             let size = null;
+            if (item.layouts.length === 0)
+                throw new Error(`switch item has no layouts`);
             for (const [_, layout] of item.layouts) {
-                const layoutSize = internalCalcLayoutSize(layout);
+                const layoutSize = calcLayoutSize(layout);
                 if (size === null)
                     size = layoutSize;
                 else if (layoutSize !== size)
-                    return null;
+                    throw new Error("Cannot statically determine size of switch item with different layout sizes");
             }
             return item.idSize + size;
         }
     }
 }
-function internalCalcLayoutSize(layout, data) {
-    if (isLayoutItem(layout))
-        return calcItemSize(layout, data);
-    let size = 0;
-    for (const item of layout) {
-        let itemData;
-        if (data)
-            if (!("omit" in item) || !item.omit) {
-                if (!(item.name in data))
-                    throw new Error(`missing data for layout item: ${item.name}`);
-                itemData = data[item.name];
-            }
-        const itemSize = calcItemSize(item, itemData);
-        if (itemSize === null) {
-            if (data !== undefined)
-                throw new Error(`coding error: couldn't calculate size for layout item: ${item.name}`);
-            return null;
+function calcItemSize(item, data) {
+    switch (item.binary) {
+        case "int":
+        case "uint": {
+            return item.size;
+        }
+        case "bytes": {
+            if ("size" in item && item.size !== undefined)
+                return item.size;
+            if (isBytesType(item.custom))
+                return item.custom.length;
+            if (isBytesType(item?.custom?.from))
+                return item.custom.from.length;
+            let size = 0;
+            if (item?.lengthSize !== undefined)
+                size += item.lengthSize;
+            return size + ((item.custom !== undefined)
+                ? item.custom.from(data)
+                : data).length;
+        }
+        case "array": {
+            const narrowedData = data;
+            let size = 0;
+            if ("length" in item && item.length !== narrowedData.length)
+                throw new Error(`array length mismatch: ` +
+                    `layout length: ${item.length}, data length: ${narrowedData.length}`);
+            else if ("lengthSize" in item && item.lengthSize !== undefined)
+                size += item.lengthSize;
+            for (let i = 0; i < narrowedData.length; ++i)
+                size += calcLayoutSize(item.layout, narrowedData[i]);
+            return size;
+        }
+        case "object": {
+            return calcLayoutSize(item.layout, data);
+        }
+        case "switch": {
+            const [_, layout] = findIdLayoutPair(item, data);
+            return item.idSize + calcLayoutSize(layout, data);
         }
-        size += itemSize;
     }
-    return size;
-}
-//no way to use overloading here:
-// export function calcLayoutSize<const L extends Layout>(layout: L): number | null;
-// export function calcLayoutSize<const L extends Layout>(layout: L, data: LayoutToType<L>): number;
-// export function calcLayoutSize<const L extends Layout>(
-//   layout: L,
-//   data?: LayoutToType<L>
-// ): number | null; //impl
-//results in "instantiation too deep" error.
-//
-//Trying to pack everything into a single function definition means we either can't narrow the
-//  return type correctly:
-// export function calcLayoutSize<const L extends Layout>(
-//   layout: L,
-//   data: LayoutToType<L>,
-// ): number | null;
-//or we have to make data overly permissive via:
-// export function calcLayoutSize<
-//   L extends Layout,
-//   const D extends LayoutToType<L> | undefined,
-//  >(
-//   layout: L,
-//   data?: D, //data can now contain additional properties
-// ): undefined extends D ? number | null : number;
-//so we're stuck with having to use to separate names
-export function calcStaticLayoutSize(layout) {
-    return internalCalcLayoutSize(layout);
 }
 export function calcLayoutSize(layout, data) {
-    const size = internalCalcLayoutSize(layout, data);
-    if (size === null)
-        throw new Error(`coding error: couldn't calculate layout size for layout ${layout} with data ${data}`);
-    return size;
+    return (Array.isArray(layout))
+        ? layout.reduce((acc, item) => acc + (data !== undefined
+            ? calcItemSize(item, data[item.name])
+            : staticCalcItemSize(item)), 0)
+        : data !== undefined
+            ? calcItemSize(layout, data)
+            : staticCalcItemSize(layout);
 }
 //# sourceMappingURL=size.js.map

package/dist/esm/utils/layout/size.js.map

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

package/dist/esm/utils/layout/utils.d.ts

@@ -1,49 +1,7 @@
-import { Layout, LayoutItem, BytesLayoutItem, SwitchLayoutItem, FixedConversion, CustomConversion, NumType, BytesType, PrimitiveType } from "./layout";
-export declare const isNumType: (x: any) => x is NumType;
-export declare const isBytesType: (x: any) => x is Uint8Array;
-export declare const isPrimitiveType: (x: any) => x is PrimitiveType;
-export declare const isLayoutItem: (x: any) => x is LayoutItem;
-export declare const isLayout: (x: any) => x is Layout;
-export declare const isFixedUintConversion: (custom: any) => custom is FixedConversion<number, any> | FixedConversion<bigint, any>;
-export declare const isFixedBytesConversion: (custom: any) => custom is FixedConversion<Uint8Array, any>;
-export declare const isFixedPrimitiveConversion: (custom: any) => custom is FixedConversion<Uint8Array, any> | FixedConversion<number, any> | FixedConversion<bigint, any>;
-export type CustomizableBytes = undefined | Layout | Uint8Array | FixedConversion<Uint8Array, any> | CustomConversion<Uint8Array, any> | readonly [Layout, FixedConversion<any, any> | CustomConversion<any, any>];
-type CombineObjects<T, U> = {
-    [K in keyof T | keyof U]: K extends keyof T ? T[K] : K extends keyof U ? U[K] : never;
-};
-type BytesBase = {
-    readonly name: string;
-} & Omit<BytesLayoutItem, "binary" | "custom" | "layout">;
-type CustomizableBytesReturn<B extends BytesBase, P extends CustomizableBytes> = CombineObjects<B, P extends undefined ? {
-    readonly binary: "bytes";
-} : P extends Layout ? {
-    readonly binary: "bytes";
-    readonly layout: P;
-} : P extends Uint8Array | FixedConversion<Uint8Array, infer To> | CustomConversion<Uint8Array, infer To> ? {
-    readonly binary: "bytes";
-    readonly custom: P;
-} : P extends readonly [
-    Layout,
-    FixedConversion<infer From, infer To> | CustomConversion<infer From, infer To>
-] ? {
-    readonly binary: "bytes";
-    readonly layout: P[0];
-    readonly custom: P[1];
-} : never>;
-export declare const customizableBytes: <const B extends BytesBase, const C extends CustomizableBytes>(base: B, spec?: C | undefined) => CustomizableBytesReturn<B, C>;
-export declare const checkSize: (layoutSize: number, dataSize: number) => number;
-export declare const checkItemSize: (item: any, dataSize: number) => number;
+import { BytesLayoutItem, SwitchLayoutItem } from "./layout";
+export declare const checkUint8ArraySize: (custom: Uint8Array, size: number) => void;
 export declare const checkNumEquals: (custom: number | bigint, data: number | bigint) => void;
-export declare const checkBytesTypeEqual: (custom: BytesType, data: BytesType, opts?: {
-    customSlice?: number | readonly [
-        number,
-        number
-    ];
-    dataSlize?: number | readonly [
-        number,
-        number
-    ];
-}) => void;
+export declare const checkUint8ArrayDeeplyEqual: (custom: Uint8Array, data: Uint8Array) => void;
+export declare function getBytesItemSize(bytesItem: BytesLayoutItem): number | null;
 export declare function findIdLayoutPair(item: SwitchLayoutItem, data: any): any;
-export {};
 //# sourceMappingURL=utils.d.ts.map

package/dist/esm/utils/layout/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/layout/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/layout/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAe,MAAM,UAAU,CAAC;AAE1E,eAAO,MAAM,mBAAmB,WAAY,UAAU,QAAQ,MAAM,KAAG,IAKtE,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,MAAM,GAAG,MAAM,QAAQ,MAAM,GAAG,MAAM,KAAG,IAK/E,CAAA;AAED,eAAO,MAAM,0BAA0B,WAAY,UAAU,QAAQ,UAAU,KAAG,IAQjF,CAAA;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAW1E;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,OAKjE"}

package/dist/esm/utils/layout/utils.js

@@ -1,52 +1,27 @@
-import { binaryLiterals, } from "./layout";
-export const isNumType = (x) => typeof x === "number" || typeof x === "bigint";
-export const isBytesType = (x) => x instanceof Uint8Array;
-export const isPrimitiveType = (x) => isNumType(x) || isBytesType(x);
-export const isLayoutItem = (x) => binaryLiterals.includes(x?.binary);
-export const isLayout = (x) => isLayoutItem(x) || Array.isArray(x) && x.every(isLayoutItem);
-const isFixedNumberConversion = (custom) => typeof custom?.from === "number";
-const isFixedBigintConversion = (custom) => typeof custom?.from === "bigint";
-export const isFixedUintConversion = (custom) => isFixedNumberConversion(custom) || isFixedBigintConversion(custom);
-export const isFixedBytesConversion = (custom) => isBytesType(custom?.from);
-export const isFixedPrimitiveConversion = (custom) => isFixedUintConversion(custom) || isFixedBytesConversion(custom);
-export const customizableBytes = (base, spec) => ({
-    ...base,
-    binary: "bytes",
-    ...(() => {
-        if (spec === undefined)
-            return {};
-        if (isLayout(spec))
-            return { layout: spec };
-        if (spec instanceof Uint8Array || isFixedBytesConversion(spec) || !Array.isArray(spec))
-            return { custom: spec };
-        return { layout: spec[0], custom: spec[1] };
-    })()
-});
-export const checkSize = (layoutSize, dataSize) => {
-    if (layoutSize !== dataSize)
-        throw new Error(`size mismatch: layout size: ${layoutSize}, data size: ${dataSize}`);
-    return dataSize;
+import { isBytesType } from "./layout";
+export const checkUint8ArraySize = (custom, size) => {
+    if (custom.length !== size)
+        throw new Error(`binary size mismatch: layout size: ${custom.length}, data size: ${size}`);
 };
-export const checkItemSize = (item, dataSize) => ("size" in item && item.size !== undefined) ? checkSize(item.size, dataSize) : dataSize;
 export const checkNumEquals = (custom, data) => {
     if (custom != data)
         throw new Error(`value mismatch: (constant) layout value: ${custom}, data value: ${data}`);
 };
-export const checkBytesTypeEqual = (custom, data, opts) => {
-    const toSlice = (bytes, slice) => slice === undefined
-        ? [0, bytes.length]
-        : Array.isArray(slice)
-            ? slice
-            : [slice, bytes.length];
-    const [customStart, customEnd] = toSlice(custom, opts?.customSlice);
-    const [dataStart, dataEnd] = toSlice(data, opts?.dataSlize);
-    const length = customEnd - customStart;
-    checkSize(length, dataEnd - dataStart);
+export const checkUint8ArrayDeeplyEqual = (custom, data) => {
+    checkUint8ArraySize(custom, data.length);
     for (let i = 0; i < custom.length; ++i)
-        if (custom[i + customStart] !== data[i + dataStart])
-            throw new Error(`binary data mismatch: ` +
-                `layout value: ${custom}, offset: ${customStart}, data value: ${data}, offset: ${dataStart}`);
+        if (custom[i] !== data[i])
+            throw new Error(`binary data mismatch: layout value: ${custom}, data value: ${data}`);
 };
+export function getBytesItemSize(bytesItem) {
+    if ("size" in bytesItem && bytesItem.size !== undefined)
+        return bytesItem.size;
+    if (isBytesType(bytesItem.custom))
+        return bytesItem.custom.length;
+    if (isBytesType(bytesItem?.custom?.from))
+        return bytesItem.custom.from.length;
+    return null;
+}
 export function findIdLayoutPair(item, data) {
     const id = data[item.idTag ?? "id"];
     return item.layouts.find(([idOrConversionId]) => (Array.isArray(idOrConversionId) ? idOrConversionId[1] : idOrConversionId) == id);

package/dist/esm/utils/layout/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/layout/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/layout/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,WAAW,EAAE,MAAM,UAAU,CAAC;AAE1E,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAkB,EAAE,IAAY,EAAQ,EAAE;IAC5E,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI;QACxB,MAAM,IAAI,KAAK,CACb,sCAAsC,MAAM,CAAC,MAAM,gBAAgB,IAAI,EAAE,CAC1E,CAAC;AACN,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAuB,EAAE,IAAqB,EAAQ,EAAE;IACrF,IAAI,MAAM,IAAI,IAAI;QAChB,MAAM,IAAI,KAAK,CACb,4CAA4C,MAAM,iBAAiB,IAAI,EAAE,CAC1E,CAAC;AACN,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,MAAkB,EAAE,IAAgB,EAAQ,EAAE;IACvF,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAEzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,uCAAuC,MAAM,iBAAiB,IAAI,EAAE,CACrE,CAAC;AACR,CAAC,CAAA;AAED,MAAM,UAAU,gBAAgB,CAAC,SAA0B;IACzD,IAAI,MAAM,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS;QACrD,OAAO,SAAS,CAAC,IAAI,CAAC;IAExB,IAAI,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC;QAC/B,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;IAEjC,IAAI,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC;QACtC,OAAO,SAAU,CAAC,MAAO,CAAC,IAAI,CAAC,MAAM,CAAC;IAExC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAsB,EAAE,IAAS;IAChE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;IACpC,OAAQ,IAAI,CAAC,OAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,CACzD,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAChF,CAAC;AACL,CAAC"}