From 8bd16ec45cc9c435264dc9003d8ece3015e25fab Mon Sep 17 00:00:00 2001 From: Alexander O'Mara Date: Thu, 14 Nov 2024 22:21:20 -0500 Subject: [PATCH] Type first --- member/i8.test.ts | 12 ++++++------ member/i8.ts | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/member/i8.test.ts b/member/i8.test.ts index 0ff8f81..b43c7b2 100644 --- a/member/i8.test.ts +++ b/member/i8.test.ts @@ -68,9 +68,9 @@ Deno.test('memberI8A', () => { declare public readonly gamma: Int8Array; public static override readonly BYTE_LENGTH: number = ((o) => { - o += memberI8A(this, o, 'alpha', 2); - o += memberI8A(this, o, 'beta', 4); - o += memberI8A(this, o, 'gamma', 0); + o += memberI8A(2, this, o, 'alpha'); + o += memberI8A(4, this, o, 'beta'); + o += memberI8A(0, this, o, 'gamma'); return o; })(super.BYTE_LENGTH); } @@ -101,9 +101,9 @@ Deno.test('memberU8A', () => { declare public readonly gamma: Uint8Array; public static override readonly BYTE_LENGTH: number = ((o) => { - o += memberU8A(this, o, 'alpha', 2); - o += memberU8A(this, o, 'beta', 4); - o += memberU8A(this, o, 'gamma', 0); + o += memberU8A(2, this, o, 'alpha'); + o += memberU8A(4, this, o, 'beta'); + o += memberU8A(0, this, o, 'gamma'); return o; })(super.BYTE_LENGTH); } diff --git a/member/i8.ts b/member/i8.ts index c28f40f..0e36691 100644 --- a/member/i8.ts +++ b/member/i8.ts @@ -52,17 +52,17 @@ export function memberU8( /** * Member int8 array. * + * @param count Array length. * @param StructT Struct constructor. * @param offset Byte offset. * @param name Member name. - * @param count Array length. * @returns Byte length. */ export function memberI8A( + count: number, StructT: T, offset: number, name: ReadonlyKeyofExtends, - count: number, ): number { Object.defineProperty(StructT.prototype, name, { get(this: T['prototype']): Int8Array { @@ -75,17 +75,17 @@ export function memberI8A( /** * Member uint8 array. * + * @param count Array length. * @param StructT Struct constructor. * @param offset Byte offset. * @param name Member name. - * @param count Array length. * @returns Byte length. */ export function memberU8A( + count: number, StructT: T, offset: number, name: ReadonlyKeyofExtends, - count: number, ): number { Object.defineProperty(StructT.prototype, name, { get(this: T['prototype']): Uint8Array {