utilium 1.7.14 → 1.7.16

package/dist/internal/struct.d.ts

@@ -41,7 +41,10 @@ export interface Metadata {
     options: Partial<Options>;
     members: Map<string, Member>;
     staticSize: number;
+    /** Whether the struct is dynamically sized */
     isDynamic: boolean;
+    /** Whether the struct is a union */
+    isUnion: boolean;
 }
 type _DecoratorMetadata<T extends Metadata = Metadata> = DecoratorMetadata & {
     struct?: T;

package/dist/struct.js

@@ -33,12 +33,24 @@ export function sizeof(type) {
     if (isStatic(type))
         return size;
     for (const member of struct.members.values()) {
+        if (isInstance(member) && member.constructor[Symbol.metadata].struct.isDynamic) {
+            if (struct.isUnion)
+                size = Math.max(size, sizeof(member));
+            else
+                size += sizeof(member);
+            continue;
+        }
         if (typeof member.length != 'string')
             continue;
+        let subSize = 0;
         for (let i = 0; i < type[member.length]; i++) {
             const value = type[member.name][i];
-            size += sizeof(isStruct(value) ? value : member.type);
+            subSize += sizeof(isStruct(value) ? value : member.type);
         }
+        if (struct.isUnion)
+            size = Math.max(size, subSize);
+        else
+            size += subSize;
     }
     return size;
 }
@@ -96,13 +108,21 @@ export function struct(options = {}) {
                 length,
                 decl,
             });
-            const memberSize = typeof length == 'string' ? 0 : sizeof(type) * (length || 1);
-            isDynamic ||= typeof length == 'string';
+            const memberSize = typeof length == 'string' || (isStatic(type) && type[Symbol.metadata].struct.isDynamic)
+                ? 0
+                : sizeof(type) * (length || 1);
+            isDynamic ||= isStatic(type) ? type[Symbol.metadata].struct.isDynamic : typeof length == 'string';
             staticSize = options.isUnion ? Math.max(staticSize, memberSize) : staticSize + memberSize;
             staticSize = align(staticSize, options.align || 1);
             _debugLog('define', target.name + '.' + name);
         }
-        context.metadata.struct = { options, members, staticSize, isDynamic };
+        context.metadata.struct = {
+            options,
+            members,
+            staticSize,
+            isDynamic,
+            isUnion: options.isUnion ?? false,
+        };
         return target;
     };
 }

package/package.json

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

package/src/internal/struct.ts

@@ -63,7 +63,12 @@ export interface Metadata {
 	options: Partial<Options>;
 	members: Map<string, Member>;
 	staticSize: number;
+
+	/** Whether the struct is dynamically sized */
 	isDynamic: boolean;
+
+	/** Whether the struct is a union */
+	isUnion: boolean;
 }
 
 type _DecoratorMetadata<T extends Metadata = Metadata> = DecoratorMetadata & {

package/src/struct.ts

@@ -65,12 +65,24 @@ export function sizeof<T extends TypeLike>(type: T | T[]): Size<T> {
 	if (isStatic(type)) return size as Size<T>;
 
 	for (const member of struct.members.values()) {
+		if (isInstance(member) && member.constructor[Symbol.metadata].struct.isDynamic) {
+			if (struct.isUnion) size = Math.max(size, sizeof(member));
+			else size += sizeof(member);
+			continue;
+		}
+
 		if (typeof member.length != 'string') continue;
+
+		let subSize = 0;
+
 		for (let i = 0; i < (type as any)[member.length]; i++) {
 			const value = (type as any)[member.name][i];
 
-			size += sizeof(isStruct(value) ? value : member.type);
+			subSize += sizeof(isStruct(value) ? value : member.type);
 		}
+
+		if (struct.isUnion) size = Math.max(size, subSize);
+		else size += subSize;
 	}
 
 	return size as Size<T>;
@@ -98,6 +110,7 @@ export function offsetof(type: StaticLike | InstanceLike, memberName: string): n
 
 	for (const member of struct.members.values()) {
 		if (member.name == memberName) return offset;
+
 		const value = (type as any)[member.name];
 		offset += sizeof(isStruct(value) ? value : member.type);
 	}
@@ -149,15 +162,25 @@ export function struct(options: Partial<Options> = {}) {
 				decl,
 			});
 
-			const memberSize = typeof length == 'string' ? 0 : sizeof(type) * (length || 1);
-			isDynamic ||= typeof length == 'string';
+			const memberSize =
+				typeof length == 'string' || (isStatic(type) && type[Symbol.metadata].struct.isDynamic)
+					? 0
+					: sizeof(type) * (length || 1);
+
+			isDynamic ||= isStatic(type) ? type[Symbol.metadata].struct.isDynamic : typeof length == 'string';
 			staticSize = options.isUnion ? Math.max(staticSize, memberSize) : staticSize + memberSize;
 			staticSize = align(staticSize, options.align || 1);
 
 			_debugLog('define', target.name + '.' + name);
 		}
 
-		context.metadata.struct = { options, members, staticSize, isDynamic } satisfies Metadata;
+		context.metadata.struct = {
+			options,
+			members,
+			staticSize,
+			isDynamic,
+			isUnion: options.isUnion ?? false,
+		} satisfies Metadata;
 
 		return target;
 	};