From 624c9514ceef8657d1e81254d94c266d08505e53 Mon Sep 17 00:00:00 2001 From: Alexander O'Mara Date: Sun, 15 Dec 2024 14:51:05 -0500 Subject: [PATCH] Better names --- arr.ts | 4 ++-- bool/16.ts | 14 +++++++------- bool/32.ts | 14 +++++++------- bool/8.ts | 6 +++--- float/16.ts | 14 +++++++------- float/32.ts | 14 +++++++------- float/64.ts | 14 +++++++------- int/16.ts | 26 +++++++++++++------------- int/24.ts | 26 +++++++++++++------------- int/32.ts | 26 +++++++++++++------------- int/64.ts | 26 +++++++++++++------------- int/8.ts | 10 +++++----- member.ts | 24 ++++++++++++------------ members.ts | 36 +++++++++++++++++++----------------- ptr.ts | 4 ++-- struct.ts | 4 ++-- type.ts | 4 ++-- util.ts | 10 +++++----- 18 files changed, 139 insertions(+), 137 deletions(-) diff --git a/arr.ts b/arr.ts index 3b8cfe4..1a817ef 100644 --- a/arr.ts +++ b/arr.ts @@ -1,6 +1,6 @@ import { MeekValueMap } from '@hqtsm/meek/valuemap'; -import type { MemberInfoed, MemberInfos } from './members.ts'; +import type { MemberInfos, Members } from './members.ts'; import type { ArrayBufferReal } from './native.ts'; import { pointer, @@ -110,7 +110,7 @@ export function array( lengths.set( length, r = { - [name]: class extends Ptr implements Arr, MemberInfoed { + [name]: class extends Ptr implements Arr, Members { declare public readonly ['constructor']: ArrClass>; public get byteLength(): number { diff --git a/bool/16.ts b/bool/16.ts index 4268e9c..42fa9fe 100644 --- a/bool/16.ts +++ b/bool/16.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -12,9 +12,9 @@ import { dataView } from '../util.ts'; * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function bool16( +export function bool16( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -45,9 +45,9 @@ export function bool16( * @param byteOffset Byte offset. * @returns Byte length. */ -export function bool16BE( +export function bool16BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return bool16(Type, name, byteOffset, false); @@ -61,9 +61,9 @@ export function bool16BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function bool16LE( +export function bool16LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return bool16(Type, name, byteOffset, true); diff --git a/bool/32.ts b/bool/32.ts index 3b429f8..c601066 100644 --- a/bool/32.ts +++ b/bool/32.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -12,9 +12,9 @@ import { dataView } from '../util.ts'; * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function bool32( +export function bool32( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -45,9 +45,9 @@ export function bool32( * @param byteOffset Byte offset. * @returns Byte length. */ -export function bool32BE( +export function bool32BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return bool32(Type, name, byteOffset, false); @@ -61,9 +61,9 @@ export function bool32BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function bool32LE( +export function bool32LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return bool32(Type, name, byteOffset, true); diff --git a/bool/8.ts b/bool/8.ts index baeb7ef..54fd1a1 100644 --- a/bool/8.ts +++ b/bool/8.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -11,9 +11,9 @@ import { dataView } from '../util.ts'; * @param byteOffset Byte offset. * @returns Byte length. */ -export function bool8( +export function bool8( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return defineMember(Type, name, { diff --git a/float/16.ts b/float/16.ts index eef45e9..c527df4 100644 --- a/float/16.ts +++ b/float/16.ts @@ -1,7 +1,7 @@ import { getFloat16, setFloat16 } from '@hqtsm/dataview/float/16'; import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -19,9 +19,9 @@ type MaybeNativeFloat16 = Partial<{ * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function float16( +export function float16( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -69,9 +69,9 @@ export function float16( * @param byteOffset Byte offset. * @returns Byte length. */ -export function float16BE( +export function float16BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return float16(Type, name, byteOffset, false); @@ -85,9 +85,9 @@ export function float16BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function float16LE( +export function float16LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return float16(Type, name, byteOffset, true); diff --git a/float/32.ts b/float/32.ts index c1adb98..2a1c20f 100644 --- a/float/32.ts +++ b/float/32.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -12,9 +12,9 @@ import { dataView } from '../util.ts'; * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function float32( +export function float32( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -45,9 +45,9 @@ export function float32( * @param byteOffset Byte offset. * @returns Byte length. */ -export function float32BE( +export function float32BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return float32(Type, name, byteOffset, false); @@ -61,9 +61,9 @@ export function float32BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function float32LE( +export function float32LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return float32(Type, name, byteOffset, true); diff --git a/float/64.ts b/float/64.ts index c577ad4..a7f5372 100644 --- a/float/64.ts +++ b/float/64.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -12,9 +12,9 @@ import { dataView } from '../util.ts'; * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function float64( +export function float64( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -45,9 +45,9 @@ export function float64( * @param byteOffset Byte offset. * @returns Byte length. */ -export function float64BE( +export function float64BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return float64(Type, name, byteOffset, false); @@ -61,9 +61,9 @@ export function float64BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function float64LE( +export function float64LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return float64(Type, name, byteOffset, true); diff --git a/int/16.ts b/int/16.ts index af9b20b..3f4d700 100644 --- a/int/16.ts +++ b/int/16.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -12,9 +12,9 @@ import { dataView } from '../util.ts'; * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function int16( +export function int16( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -45,9 +45,9 @@ export function int16( * @param byteOffset Byte offset. * @returns Byte length. */ -export function int16BE( +export function int16BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return int16(Type, name, byteOffset, false); @@ -61,9 +61,9 @@ export function int16BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function int16LE( +export function int16LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return int16(Type, name, byteOffset, true); @@ -78,9 +78,9 @@ export function int16LE( * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function uint16( +export function uint16( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -111,9 +111,9 @@ export function uint16( * @param byteOffset Byte offset. * @returns Byte length. */ -export function uint16BE( +export function uint16BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return uint16(Type, name, byteOffset, false); @@ -127,9 +127,9 @@ export function uint16BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function uint16LE( +export function uint16LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return uint16(Type, name, byteOffset, true); diff --git a/int/24.ts b/int/24.ts index 52963f0..e736deb 100644 --- a/int/24.ts +++ b/int/24.ts @@ -6,7 +6,7 @@ import { } from '@hqtsm/dataview/int/24'; import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -19,9 +19,9 @@ import { dataView } from '../util.ts'; * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function int24( +export function int24( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -54,9 +54,9 @@ export function int24( * @param byteOffset Byte offset. * @returns Byte length. */ -export function int24BE( +export function int24BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return int24(Type, name, byteOffset, false); @@ -70,9 +70,9 @@ export function int24BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function int24LE( +export function int24LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return int24(Type, name, byteOffset, true); @@ -87,9 +87,9 @@ export function int24LE( * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function uint24( +export function uint24( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -122,9 +122,9 @@ export function uint24( * @param byteOffset Byte offset. * @returns Byte length. */ -export function uint24BE( +export function uint24BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return uint24(Type, name, byteOffset, false); @@ -138,9 +138,9 @@ export function uint24BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function uint24LE( +export function uint24LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return uint24(Type, name, byteOffset, true); diff --git a/int/32.ts b/int/32.ts index fb4827f..c06fae9 100644 --- a/int/32.ts +++ b/int/32.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -12,9 +12,9 @@ import { dataView } from '../util.ts'; * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function int32( +export function int32( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -45,9 +45,9 @@ export function int32( * @param byteOffset Byte offset. * @returns Byte length. */ -export function int32BE( +export function int32BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return int32(Type, name, byteOffset, false); @@ -61,9 +61,9 @@ export function int32BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function int32LE( +export function int32LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return int32(Type, name, byteOffset, true); @@ -78,9 +78,9 @@ export function int32LE( * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function uint32( +export function uint32( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -112,9 +112,9 @@ export function uint32( * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function uint32BE( +export function uint32BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return uint32(Type, name, byteOffset, false); @@ -129,9 +129,9 @@ export function uint32BE( * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function uint32LE( +export function uint32LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return uint32(Type, name, byteOffset, true); diff --git a/int/64.ts b/int/64.ts index 0b577e1..f52917f 100644 --- a/int/64.ts +++ b/int/64.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -12,9 +12,9 @@ import { dataView } from '../util.ts'; * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function int64( +export function int64( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -45,9 +45,9 @@ export function int64( * @param byteOffset Byte offset. * @returns Byte length. */ -export function int64BE( +export function int64BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return int64(Type, name, byteOffset, false); @@ -61,9 +61,9 @@ export function int64BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function int64LE( +export function int64LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return int64(Type, name, byteOffset, true); @@ -78,9 +78,9 @@ export function int64LE( * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function uint64( +export function uint64( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -111,9 +111,9 @@ export function uint64( * @param byteOffset Byte offset. * @returns Byte length. */ -export function uint64BE( +export function uint64BE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return uint64(Type, name, byteOffset, false); @@ -127,9 +127,9 @@ export function uint64BE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function uint64LE( +export function uint64LE( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return uint64(Type, name, byteOffset, true); diff --git a/int/8.ts b/int/8.ts index 4737081..6324beb 100644 --- a/int/8.ts +++ b/int/8.ts @@ -1,5 +1,5 @@ import { defineMember } from '../member.ts'; -import type { ClassMemberable, ClassMemberables } from '../members.ts'; +import type { MemberableClass, MemberableClassKeys } from '../members.ts'; import { Ptr } from '../ptr.ts'; import { dataView } from '../util.ts'; @@ -11,9 +11,9 @@ import { dataView } from '../util.ts'; * @param byteOffset Byte offset. * @returns Byte length. */ -export function int8( +export function int8( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return defineMember(Type, name, { @@ -36,9 +36,9 @@ export function int8( * @param byteOffset Byte offset. * @returns Byte length. */ -export function uint8( +export function uint8( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return defineMember(Type, name, { diff --git a/member.ts b/member.ts index 74847eb..b9234e1 100644 --- a/member.ts +++ b/member.ts @@ -1,6 +1,6 @@ import type { - ClassMemberable, - ClassMemberables, + MemberableClass, + MemberableClassKeys, MemberInfo, } from './members.ts'; import type { BufferView } from './native.ts'; @@ -36,9 +36,9 @@ export interface MemberDescriptor extends MemberInfo { * @param desc Member descriptor. * @returns Byte length. */ -export function defineMember( +export function defineMember( Type: T, - name: ClassMemberable, + name: MemberableClassKeys, desc: Readonly< MemberDescriptor<(T['prototype'] & Record), M> >, @@ -92,10 +92,10 @@ export interface MemberConstructor< * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function member( +export function member( Member: MemberConstructor, Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, littleEndian: boolean | null = null, ): number { @@ -132,10 +132,10 @@ export function member( * @param byteOffset Byte offset. * @returns Byte length. */ -export function memberBE( +export function memberBE( Member: MemberConstructor, Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return member(Member, Type, name, byteOffset, false); @@ -150,10 +150,10 @@ export function memberBE( * @param byteOffset Byte offset. * @returns Byte length. */ -export function memberLE( +export function memberLE( Member: MemberConstructor, Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return member(Member, Type, name, byteOffset, true); @@ -169,10 +169,10 @@ export function memberLE( * @param littleEndian Little endian, big endian, or default. * @returns Byte length. */ -export function pad( +export function pad( byteLength: number, Type: T, - name: ClassMemberable, + name: MemberableClassKeys, byteOffset: number, ): number { return defineMember(Type, name, { diff --git a/members.ts b/members.ts index c2bc6aa..dc33e4a 100644 --- a/members.ts +++ b/members.ts @@ -28,23 +28,23 @@ export interface MemberInfos { } /** - * Member infoed. + * Members. */ -export interface MemberInfoed { +export interface Members { /** * MemberInfoed class. */ - readonly constructor: MemberInfoedClass; + readonly constructor: MembersClass; } /** - * Member infoed class. + * Members class. */ -export interface MemberInfoedClass { +export interface MembersClass { /** * MemberInfoed prototype. */ - prototype: MemberInfoed; + prototype: Members; /** * Member infos of members. @@ -65,7 +65,7 @@ export type Membered = Arr | Ptr | Type; /** * Membered class types. */ -export type ClassMembered = +export type MemberedClass = | ArrClass> | PtrClass> | TypeClass; @@ -73,7 +73,7 @@ export type ClassMembered = /** * The possible member keys. */ -export type Members = Exclude< +export type MemberKeys = Exclude< keyof T, | (T extends Arr ? Exclude : never) | (T extends Ptr ? Exclude : never) @@ -83,32 +83,34 @@ export type Members = Exclude< /** * The possible member keys for class. */ -export type ClassMembers = Members; +export type MemberClassKeys = MemberKeys< + T['prototype'] +>; /** * Memberable types. */ -export type Memberables = Arr | Type; +export type Memberable = Arr | Type; /** * Memberable class types. */ -export type ClassMemberables = ArrClass> | TypeClass; +export type MemberableClass = ArrClass> | TypeClass; /** * The possible memberable keys, filterable by member type. */ -export type Memberable< - T extends Memberables, +export type MemberableKeys< + T extends Memberable, // deno-lint-ignore no-explicit-any M = any, -> = { [K in keyof T]: M extends T[K] ? K : never }[Members]; +> = { [K in keyof T]: M extends T[K] ? K : never }[MemberKeys]; /** * The possible memberable keys for class, filterable by member type. */ -export type ClassMemberable< - T extends ClassMemberables, +export type MemberableClassKeys< + T extends MemberableClass, // deno-lint-ignore no-explicit-any M = any, -> = Memberable; +> = MemberableKeys; diff --git a/ptr.ts b/ptr.ts index f9c1761..3b887a5 100644 --- a/ptr.ts +++ b/ptr.ts @@ -1,7 +1,7 @@ import { MeekValueMap } from '@hqtsm/meek/valuemap'; import { Endian } from './endian.ts'; -import type { MemberInfo, MemberInfoed, MemberInfos } from './members.ts'; +import type { MemberInfo, MemberInfos, Members } from './members.ts'; import type { ArrayBufferReal } from './native.ts'; import type { Type, TypeConstructor } from './type.ts'; import { assignType } from './util.ts'; @@ -51,7 +51,7 @@ let members: WeakMap; /** * Pointer to a type. */ -export class Ptr extends Endian implements MemberInfoed { +export class Ptr extends Endian implements Members { /** * Ptr class. */ diff --git a/struct.ts b/struct.ts index aa27693..e754514 100644 --- a/struct.ts +++ b/struct.ts @@ -1,5 +1,5 @@ import { Endian } from './endian.ts'; -import type { MemberInfoed, MemberInfos } from './members.ts'; +import type { MemberInfos, Members } from './members.ts'; import type { Type } from './type.ts'; let members: WeakMap; @@ -7,7 +7,7 @@ let members: WeakMap; /** * Binary structure buffer view. */ -export class Struct extends Endian implements Type, MemberInfoed { +export class Struct extends Endian implements Type, Members { /** * Struct class. */ diff --git a/type.ts b/type.ts index fb5a42f..e934025 100644 --- a/type.ts +++ b/type.ts @@ -1,5 +1,5 @@ import type { EndianAware } from './endian.ts'; -import type { MemberInfoedClass } from './members.ts'; +import type { MembersClass } from './members.ts'; import type { ArrayBufferReal, BufferView } from './native.ts'; /** @@ -15,7 +15,7 @@ export interface Type extends BufferView, EndianAware { /** * Type class. */ -export interface TypeClass extends MemberInfoedClass { +export interface TypeClass extends MembersClass { /** * Type prototype. */ diff --git a/util.ts b/util.ts index 55a24f0..40a4e8c 100644 --- a/util.ts +++ b/util.ts @@ -1,4 +1,4 @@ -import type { ClassMembered, ClassMembers } from './members.ts'; +import type { MemberClassKeys, MemberedClass } from './members.ts'; import type { BufferView } from './native.ts'; import type { Type } from './type.ts'; @@ -25,9 +25,9 @@ export function dataView(buffer: ArrayBufferLike): DataView { * @param name Member name. * @returns Byte offset. */ -export function getByteOffset( +export function getByteOffset( Type: T, - name: ClassMembers, + name: MemberClassKeys, ): number { return Type.MEMBERS[name].byteOffset; } @@ -39,9 +39,9 @@ export function getByteOffset( * @param name Member name. * @returns Byte length. */ -export function getByteLength( +export function getByteLength( Type: T, - name: ClassMembers, + name: MemberClassKeys, ): number { return Type.MEMBERS[name].byteLength; }