utilium 1.7.5 → 1.7.7

package/dist/struct.js

@@ -44,7 +44,7 @@ export function align(value, alignment) {
  */
 function _memberLength(struct, length, name) {
     if (length === undefined)
-        return 0;
+        return -1;
     if (typeof length != 'string')
         return Number.isSafeInteger(length) && length >= 0
             ? length
@@ -119,6 +119,8 @@ 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));
@@ -126,9 +128,9 @@ export function serialize(instance) {
     // 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, rawLength, name);
-        for (let i = 0; i < (length || 1); i++) {
+        for (let i = 0; i < Math.abs(length); i++) {
             const iOff = offset + sizeof(type) * i;
-            let value = length > 0 ? instance[name][i] : instance[name];
+            let value = length != -1 ? instance[name][i] : instance[name];
             if (typeof value == 'string') {
                 value = value.charCodeAt(0);
             }
@@ -177,9 +179,9 @@ export function deserialize(instance, _buffer) {
     const view = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
     for (const [name, { type, offset, length: rawLength }] of members) {
         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;
+        for (let i = 0; i < Math.abs(length); i++) {
+            let object = length != -1 ? instance[name][i] : instance[name];
+            const key = length != -1 ? i : name, iOff = offset + sizeof(type) * i;
             if (typeof instance[name] == 'string') {
                 instance[name] =
                     instance[name].slice(0, i) + String.fromCharCode(view.getUint8(iOff)) + instance[name].slice(i + 1);
@@ -192,7 +194,7 @@ export function deserialize(instance, _buffer) {
                 deserialize(object[key], new Uint8Array(buffer.subarray(iOff, iOff + sizeof(type))));
                 continue;
             }
-            if (length)
+            if (length && length != -1)
                 object ||= [];
             const fn = `get${capitalize(type)}`;
             if (fn == 'getInt64') {

package/package.json

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

package/src/struct.ts

@@ -71,7 +71,7 @@ function _memberLength<T extends Metadata>(
 	length: string | number | undefined,
 	name: string
 ): number {
-	if (length === undefined) return 0;
+	if (length === undefined) return -1;
 	if (typeof length != 'string')
 		return Number.isSafeInteger(length) && length >= 0
 			? length
@@ -162,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;
 
@@ -171,10 +173,10 @@ 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, rawLength, name);
-		for (let i = 0; i < (length || 1); i++) {
+		for (let i = 0; i < Math.abs(length); i++) {
 			const iOff = offset + sizeof(type) * i;
 
-			let value = length > 0 ? instance[name][i] : instance[name];
+			let value = length != -1 ? instance[name][i] : instance[name];
 			if (typeof value == 'string') {
 				value = value.charCodeAt(0);
 			}
@@ -236,9 +238,9 @@ export function deserialize(instance: unknown, _buffer: ArrayBufferLike | ArrayB
 
 	for (const [name, { type, offset, length: rawLength }] of members) {
 		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,
+		for (let i = 0; i < Math.abs(length); i++) {
+			let object = length != -1 ? instance[name][i] : instance[name];
+			const key = length != -1 ? i : name,
 				iOff = offset + sizeof(type) * i;
 
 			if (typeof instance[name] == 'string') {
@@ -255,7 +257,7 @@ export function deserialize(instance: unknown, _buffer: ArrayBufferLike | ArrayB
 				continue;
 			}
 
-			if (length) object ||= [];
+			if (length && length != -1) object ||= [];
 
 			const fn = `get${capitalize(type)}` as const;
 			if (fn == 'getInt64') {