utilium 1.7.12 → 1.7.14

package/dist/struct.js

@@ -1,7 +1,7 @@
 import { toUint8Array } from './buffer.js';
 import { _debugLog } from './debugging.js';
 import * as primitive from './internal/primitives.js';
-import { _polyfill_metadata, checkInstance, checkStruct, initMetadata, isCustom, isInstance, isStatic, } from './internal/struct.js';
+import { _polyfill_metadata, checkInstance, checkStruct, initMetadata, isCustom, isInstance, isStatic, isStruct, } from './internal/struct.js';
 import { _throw } from './misc.js';
 import { capitalize } from './string.js';
 export * as Struct from './internal/struct.js';
@@ -18,7 +18,7 @@ export function sizeof(type) {
         }
         return size;
     }
-    // primitive
+    // primitive or character
     if (typeof type == 'string') {
         primitive.checkValid(type);
         return (+primitive.normalize(type).match(primitive.regex)[2] / 8);
@@ -29,14 +29,15 @@ export function sizeof(type) {
     const constructor = isStatic(type) ? type : type.constructor;
     _polyfill_metadata(constructor);
     const { struct } = constructor[Symbol.metadata];
-    if (isStatic(type))
-        return struct.staticSize;
     let size = struct.staticSize;
+    if (isStatic(type))
+        return size;
     for (const member of struct.members.values()) {
         if (typeof member.length != 'string')
             continue;
         for (let i = 0; i < type[member.length]; i++) {
-            size += sizeof(type[member.name][i]);
+            const value = type[member.name][i];
+            size += sizeof(isStruct(value) ? value : member.type);
         }
     }
     return size;
@@ -57,7 +58,8 @@ export function offsetof(type, memberName) {
     for (const member of struct.members.values()) {
         if (member.name == memberName)
             return offset;
-        offset += sizeof(type[member.name]);
+        const value = type[member.name];
+        offset += sizeof(isStruct(value) ? value : member.type);
     }
     throw new Error('Struct does not have member: ' + memberName);
 }

package/package.json

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

package/src/struct.ts

@@ -22,6 +22,7 @@ import {
 	isCustom,
 	isInstance,
 	isStatic,
+	isStruct,
 } from './internal/struct.js';
 import { _throw } from './misc.js';
 import { capitalize } from './string.js';
@@ -44,7 +45,7 @@ export function sizeof<T extends TypeLike>(type: T | T[]): Size<T> {
 		return size as Size<T>;
 	}
 
-	// primitive
+	// primitive or character
 	if (typeof type == 'string') {
 		primitive.checkValid(type);
 
@@ -59,14 +60,16 @@ export function sizeof<T extends TypeLike>(type: T | T[]): Size<T> {
 	_polyfill_metadata(constructor);
 	const { struct } = constructor[Symbol.metadata];
 
-	if (isStatic(type)) return struct.staticSize as Size<T>;
-
 	let size = struct.staticSize;
 
+	if (isStatic(type)) return size as Size<T>;
+
 	for (const member of struct.members.values()) {
 		if (typeof member.length != 'string') continue;
 		for (let i = 0; i < (type as any)[member.length]; i++) {
-			size += sizeof((type as any)[member.name][i]);
+			const value = (type as any)[member.name][i];
+
+			size += sizeof(isStruct(value) ? value : member.type);
 		}
 	}
 
@@ -95,7 +98,8 @@ export function offsetof(type: StaticLike | InstanceLike, memberName: string): n
 
 	for (const member of struct.members.values()) {
 		if (member.name == memberName) return offset;
-		offset += sizeof((type as any)[member.name]);
+		const value = (type as any)[member.name];
+		offset += sizeof(isStruct(value) ? value : member.type);
 	}
 
 	throw new Error('Struct does not have member: ' + memberName);