utilium 1.7.13 → 1.7.15

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';
@@ -20,9 +20,6 @@ export function sizeof(type) {
     }
     // primitive or character
     if (typeof type == 'string') {
-        // Single character inside string, since sizeof(string) -> sizeof(string[0]) -> here
-        if (type.length == 1)
-            return 1;
         primitive.checkValid(type);
         return (+primitive.normalize(type).match(primitive.regex)[2] / 8);
     }
@@ -32,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;
@@ -60,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);
 }
@@ -98,7 +97,7 @@ export function struct(options = {}) {
                 decl,
             });
             const memberSize = typeof length == 'string' ? 0 : sizeof(type) * (length || 1);
-            isDynamic ||= typeof length == 'string';
+            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);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "utilium",
-	"version": "1.7.13",
+	"version": "1.7.15",
 	"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';
@@ -46,9 +47,6 @@ export function sizeof<T extends TypeLike>(type: T | T[]): Size<T> {
 
 	// primitive or character
 	if (typeof type == 'string') {
-		// Single character inside string, since sizeof(string) -> sizeof(string[0]) -> here
-		if (type.length == 1) return 1 as Size<T>;
-
 		primitive.checkValid(type);
 
 		return (+primitive.normalize(type).match(primitive.regex)![2] / 8) as Size<T>;
@@ -62,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);
 		}
 	}
 
@@ -98,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);
@@ -149,7 +150,7 @@ export function struct(options: Partial<Options> = {}) {
 			});
 
 			const memberSize = typeof length == 'string' ? 0 : sizeof(type) * (length || 1);
-			isDynamic ||= typeof length == 'string';
+			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);