utilium 1.7.9 → 1.7.11

package/dist/struct.js

@@ -4,6 +4,25 @@ import { checkInstance, checkStruct, isCustom, isStatic, symbol_metadata } from
 import { _throw } from './misc.js';
 import { capitalize } from './string.js';
 export * as Struct from './internal/struct.js';
+/**
+ * Gets the length of an array in a struct
+ * @param length The numeric length or the name of the field which has the array length (like __counted_by)
+ * @param name The name of the array field— only used for errors
+ */
+function _memberLength(struct, length, name) {
+    if (length === undefined)
+        return -1;
+    if (typeof length != 'string')
+        return Number.isSafeInteger(length) && length >= 0
+            ? length
+            : _throw(new Error('Array lengths must be natural numbers'));
+    if (!(length in struct))
+        throw new Error(`Can not use non-existent member to count ${name}: ` + length);
+    const n = struct[length];
+    if (typeof n != 'number')
+        throw new Error(`Can not use "${name}" to count ${length}`);
+    return n;
+}
 /**
  * Gets the size in bytes of a type
  */
@@ -16,8 +35,18 @@ export function sizeof(type) {
     if (isCustom(type))
         return type[Symbol.size];
     checkStruct(type);
-    const struct = isStatic(type) ? type : type.constructor;
-    return struct[symbol_metadata(struct)].struct.staticSize;
+    const { struct } = isStatic(type)
+        ? type[symbol_metadata(type)]
+        : type.constructor[symbol_metadata(type.constructor)];
+    if (isStatic(type))
+        return struct.staticSize;
+    let size = struct.staticSize;
+    for (const [name, { type: memberType, length: key }] of struct.members) {
+        if (typeof key != 'string')
+            continue;
+        size += sizeof(memberType) * _memberLength(type, key, name);
+    }
+    return size;
 }
 /**
  * Returns the offset (in bytes) of a member in a struct.
@@ -37,36 +66,6 @@ export function offsetof(type, memberName) {
 export function align(value, alignment) {
     return Math.ceil(value / alignment) * alignment;
 }
-/**
- * Gets the length of an array in a struct
- * @param length The numeric length or the name of the field which has the array length (like __counted_by)
- * @param name The name of the array field— only used for errors
- */
-function _memberLength(struct, length, name) {
-    if (length === undefined)
-        return -1;
-    if (typeof length != 'string')
-        return Number.isSafeInteger(length) && length >= 0
-            ? length
-            : _throw(new Error('Array lengths must be natural numbers'));
-    if (!(length in struct))
-        throw new Error(`Can not use non-existent member to count ${name}: ` + length);
-    const n = struct[length];
-    if (typeof n != 'number')
-        throw new Error(`Can not use "${name}" to count ${length}`);
-    return n;
-}
-/** Compute the size of a struct including dynamically sized members */
-function _structSize() {
-    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;
-}
 /**
  * Decorates a class as a struct
  */
@@ -90,12 +89,6 @@ export function struct(options = {}) {
             staticSize = align(staticSize, options.align || 1);
         }
         context.metadata.struct = { options, members, staticSize };
-        context.addInitializer(function () {
-            Object.defineProperty(this.prototype, Symbol.size, {
-                get: _structSize.bind(this),
-                enumerable: false,
-            });
-        });
         return target;
     };
 }
@@ -122,7 +115,7 @@ export function member(type, length) {
  * Serializes a struct into a Uint8Array
  */
 export function serialize(instance) {
-    if (isCustom(instance))
+    if (isCustom(instance) && typeof instance[Symbol.serialize] == 'function')
         return instance[Symbol.serialize]();
     checkInstance(instance);
     const { options, members } = instance.constructor[symbol_metadata(instance.constructor)].struct;
@@ -175,7 +168,7 @@ export function serialize(instance) {
  */
 export function deserialize(instance, _buffer) {
     const buffer = toUint8Array(_buffer);
-    if (isCustom(instance))
+    if (isCustom(instance) && typeof instance[Symbol.deserialize] == 'function')
         return instance[Symbol.deserialize](buffer);
     checkInstance(instance);
     const { options, members } = instance.constructor[symbol_metadata(instance.constructor)].struct;

package/package.json

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

package/src/struct.ts

@@ -20,6 +20,31 @@ import { capitalize } from './string.js';
 import type { ClassLike } from './types.js';
 export * as Struct from './internal/struct.js';
 
+/**
+ * Gets the length of an array in a struct
+ * @param length The numeric length or the name of the field which has the array length (like __counted_by)
+ * @param name The name of the array field— only used for errors
+ */
+function _memberLength<T extends Metadata>(
+	struct: Instance<T>,
+	length: string | number | undefined,
+	name: string
+): number {
+	if (length === undefined) return -1;
+	if (typeof length != 'string')
+		return Number.isSafeInteger(length) && length >= 0
+			? length
+			: _throw(new Error('Array lengths must be natural numbers'));
+
+	if (!(length in struct)) throw new Error(`Can not use non-existent member to count ${name}: ` + length);
+
+	const n = (struct as any)[length];
+
+	if (typeof n != 'number') throw new Error(`Can not use "${name}" to count ${length}`);
+
+	return n;
+}
+
 /**
  * Gets the size in bytes of a type
  */
@@ -35,9 +60,20 @@ export function sizeof<T extends TypeLike>(type: T): Size<T> {
 
 	checkStruct(type);
 
-	const struct = isStatic(type) ? type : type.constructor;
+	const { struct } = isStatic(type)
+		? type[symbol_metadata(type)]
+		: type.constructor[symbol_metadata(type.constructor)];
+
+	if (isStatic(type)) return struct.staticSize as Size<T>;
+
+	let size = struct.staticSize;
+
+	for (const [name, { type: memberType, length: key }] of struct.members) {
+		if (typeof key != 'string') continue;
+		size += sizeof(memberType) * _memberLength(type, key, name);
+	}
 
-	return struct[symbol_metadata(struct)].struct.staticSize as Size<T>;
+	return size as Size<T>;
 }
 
 /**
@@ -61,45 +97,6 @@ export function align(value: number, alignment: number): number {
 	return Math.ceil(value / alignment) * alignment;
 }
 
-/**
- * Gets the length of an array in a struct
- * @param length The numeric length or the name of the field which has the array length (like __counted_by)
- * @param name The name of the array field— only used for errors
- */
-function _memberLength<T extends Metadata>(
-	struct: Instance<T>,
-	length: string | number | undefined,
-	name: string
-): number {
-	if (length === undefined) return -1;
-	if (typeof length != 'string')
-		return Number.isSafeInteger(length) && length >= 0
-			? length
-			: _throw(new Error('Array lengths must be natural numbers'));
-
-	if (!(length in struct)) throw new Error(`Can not use non-existent member to count ${name}: ` + length);
-
-	const n = (struct as any)[length];
-
-	if (typeof n != 'number') throw new Error(`Can not use "${name}" to count ${length}`);
-
-	return n;
-}
-
-/** Compute the size of a struct including dynamically sized members */
-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);
-	}
-
-	return size;
-}
-
 /**
  * Decorates a class as a struct
  */
@@ -129,13 +126,6 @@ export function struct(options: Partial<Options> = {}) {
 
 		context.metadata.struct = { options, members, staticSize } satisfies Metadata;
 
-		context.addInitializer(function (this: any) {
-			Object.defineProperty(this.prototype, Symbol.size, {
-				get: _structSize.bind(this),
-				enumerable: false,
-			});
-		});
-
 		return target;
 	};
 }
@@ -165,7 +155,7 @@ 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]!();
+	if (isCustom(instance) && typeof instance[Symbol.serialize] == 'function') return instance[Symbol.serialize]!();
 
 	checkInstance(instance);
 	const { options, members } = instance.constructor[symbol_metadata(instance.constructor)].struct;
@@ -232,7 +222,8 @@ export function serialize(instance: unknown): Uint8Array {
 export function deserialize(instance: unknown, _buffer: ArrayBufferLike | ArrayBufferView) {
 	const buffer = toUint8Array(_buffer);
 
-	if (isCustom(instance)) return instance[Symbol.deserialize]!(buffer);
+	if (isCustom(instance) && typeof instance[Symbol.deserialize] == 'function')
+		return instance[Symbol.deserialize]!(buffer);
 
 	checkInstance(instance);
 	const { options, members } = instance.constructor[symbol_metadata(instance.constructor)].struct;