utilium 1.7.4 → 1.7.6

package/dist/struct.js

@@ -58,9 +58,11 @@ function _memberLength(struct, length, name) {
 }
 /** Compute the size of a struct including dynamically sized members */
 function _structSize() {
-    const { staticSize, members } = this[symbol_metadata(this)].struct;
+    const { staticSize, members } = this.constructor[symbol_metadata(this.constructor)].struct;
     let size = staticSize;
     for (const [name, { type, length: key }] of members) {
+        if (typeof key != 'string')
+            continue;
         size += sizeof(type) * _memberLength(this, key, name);
     }
     return size;
@@ -117,13 +119,15 @@ export function member(type, length) {
  * Serializes a struct into a Uint8Array
  */
 export function serialize(instance) {
+    if (isCustom(instance))
+        return instance[Symbol.serialize]();
     checkInstance(instance);
     const { options, members } = instance.constructor[symbol_metadata(instance.constructor)].struct;
     const buffer = new Uint8Array(sizeof(instance));
     const view = new DataView(buffer.buffer);
     // for unions we should write members in ascending last modified order, but we don't have that info.
     for (const [name, { type, length: rawLength, offset }] of members) {
-        const length = _memberLength(instance.constructor, rawLength, name);
+        const length = _memberLength(instance, rawLength, name);
         for (let i = 0; i < (length || 1); i++) {
             const iOff = offset + sizeof(type) * i;
             let value = length > 0 ? instance[name][i] : instance[name];
@@ -174,7 +178,7 @@ export function deserialize(instance, _buffer) {
     const { options, members } = instance.constructor[symbol_metadata(instance.constructor)].struct;
     const view = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
     for (const [name, { type, offset, length: rawLength }] of members) {
-        const length = _memberLength(instance.constructor, rawLength, name);
+        const length = _memberLength(instance, rawLength, name);
         for (let i = 0; i < (length || 1); i++) {
             let object = length > 0 ? instance[name] : instance;
             const key = length > 0 ? i : name, iOff = offset + sizeof(type) * i;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "utilium",
-	"version": "1.7.4",
+	"version": "1.7.6",
 	"description": "Typescript utilities",
 	"funding": {
 		"type": "individual",

package/src/struct.ts

@@ -2,6 +2,7 @@ import { toUint8Array } from './buffer.js';
 import * as primitive from './internal/primitives.js';
 import type {
 	DecoratorContext,
+	Instance,
 	InstanceLike,
 	Member,
 	MemberContext,
@@ -66,7 +67,7 @@ export function align(value: number, alignment: number): number {
  * @param name The name of the array field— only used for errors
  */
 function _memberLength<T extends Metadata>(
-	struct: Static<T>,
+	struct: Instance<T>,
 	length: string | number | undefined,
 	name: string
 ): number {
@@ -86,12 +87,13 @@ function _memberLength<T extends Metadata>(
 }
 
 /** Compute the size of a struct including dynamically sized members */
-function _structSize<T extends Metadata>(this: Static<T>) {
-	const { staticSize, members } = this[symbol_metadata(this)].struct;
+function _structSize<T extends Metadata>(this: Instance<T>) {
+	const { staticSize, members } = this.constructor[symbol_metadata(this.constructor)].struct;
 
 	let size = staticSize;
 
 	for (const [name, { type, length: key }] of members) {
+		if (typeof key != 'string') continue;
 		size += sizeof(type) * _memberLength(this, key, name);
 	}
 
@@ -160,6 +162,8 @@ export function member(type: primitive.Valid | ClassLike, length?: number | stri
  * Serializes a struct into a Uint8Array
  */
 export function serialize(instance: unknown): Uint8Array {
+	if (isCustom(instance)) return instance[Symbol.serialize]!();
+
 	checkInstance(instance);
 	const { options, members } = instance.constructor[symbol_metadata(instance.constructor)].struct;
 
@@ -168,7 +172,7 @@ export function serialize(instance: unknown): Uint8Array {
 
 	// for unions we should write members in ascending last modified order, but we don't have that info.
 	for (const [name, { type, length: rawLength, offset }] of members) {
-		const length = _memberLength(instance.constructor, rawLength, name);
+		const length = _memberLength(instance, rawLength, name);
 		for (let i = 0; i < (length || 1); i++) {
 			const iOff = offset + sizeof(type) * i;
 
@@ -233,7 +237,7 @@ export function deserialize(instance: unknown, _buffer: ArrayBufferLike | ArrayB
 	const view = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
 
 	for (const [name, { type, offset, length: rawLength }] of members) {
-		const length = _memberLength(instance.constructor, rawLength, name);
+		const length = _memberLength(instance, rawLength, name);
 		for (let i = 0; i < (length || 1); i++) {
 			let object = length > 0 ? instance[name] : instance;
 			const key = length > 0 ? i : name,