Skip to content

Commit 569babe

Browse files
committed
Fix wrong length variable
1 parent 041d75d commit 569babe

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typed-buffer-struct",
3-
"version": "0.0.5",
3+
"version": "0.0.6",
44
"description": "This is a package which helps the user to create a Struct with automatic Buffer creation.",
55
"author": {
66
"name": "Nelson Faiçal Rechdan",

src/struct/index.ts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ const structBigNumber: StructBigNumber = (builder, size, name, type) => {
3838
return createStruct(builder, size + bigNumbersSize[type]) as never;
3939
};
4040

41-
const structString: StructString = (builder, size, name, length) => {
41+
const structString: StructString = (builder, size, name, strLength) => {
4242
builder.push((obj, buffer) => {
4343
Object.defineProperty(obj, name, {
44-
get: () => readStringBuffer(buffer, size, length),
45-
set: (value: string) => writeStringBuffer(buffer, size, length, value),
44+
get: () => readStringBuffer(buffer, size, strLength),
45+
set: (value: string) => writeStringBuffer(buffer, size, strLength, value),
4646
enumerable: true,
4747
});
4848
});
49-
return createStruct(builder, size + length) as never;
49+
return createStruct(builder, size + strLength) as never;
5050
};
5151

5252
const structStruct: StructStruct = (builder, size, name, struct) => {
@@ -62,12 +62,12 @@ const structStruct: StructStruct = (builder, size, name, struct) => {
6262

6363
// ARRAY RELATED
6464

65-
const arrayNumberFunction: BuildArrayResponseNumberFunction = (length, type) => {
65+
const arrayNumberFunction: BuildArrayResponseNumberFunction = (arrLength, type) => {
6666
const numberSize = numbersSize[type];
6767
return {
68-
size: numberSize * length,
68+
size: numberSize * arrLength,
6969
builder: (arr, buffer) => {
70-
for (let i = 0; i < length; i++) {
70+
for (let i = 0; i < arrLength; i++) {
7171
Object.defineProperty(arr, i, {
7272
get: () => readNumberBuffer(buffer, numberSize * i, type),
7373
set: (value: number) => writeNumberBuffer(buffer, numberSize * i, type, value),
@@ -79,12 +79,12 @@ const arrayNumberFunction: BuildArrayResponseNumberFunction = (length, type) =>
7979
};
8080
};
8181

82-
const arrayBigNumberFunction: BuildArrayResponseBigNumberFunction = (length, type) => {
82+
const arrayBigNumberFunction: BuildArrayResponseBigNumberFunction = (arrLength, type) => {
8383
const numberSize = bigNumbersSize[type];
8484
return {
85-
size: numberSize * length,
85+
size: numberSize * arrLength,
8686
builder: (arr, buffer) => {
87-
for (let i = 0; i < length; i++) {
87+
for (let i = 0; i < arrLength; i++) {
8888
Object.defineProperty(arr, i, {
8989
get: () => readBigNumberBuffer(buffer, numberSize * i, type),
9090
set: (value: bigint) => writeBigNumberBuffer(buffer, numberSize * i, type, value),
@@ -98,12 +98,12 @@ const arrayBigNumberFunction: BuildArrayResponseBigNumberFunction = (length, typ
9898

9999
const buildArray: BuildArray = () => ({
100100
// arrays
101-
array: (length, build) => {
101+
array: (arrLength, build) => {
102102
const { size: buildSize, builder: buildBuilder } = build(buildArray());
103103
return {
104-
size: buildSize * length,
104+
size: buildSize * arrLength,
105105
builder: (arr, buffer) => {
106-
for (let i = 0; i < length; i++) {
106+
for (let i = 0; i < arrLength; i++) {
107107
const arr2 = buildBuilder([], buffer.slice(buildSize * i, buildSize * (i + 1)));
108108
Object.defineProperty(arr, i, {
109109
get: () => arr2,
@@ -115,20 +115,20 @@ const buildArray: BuildArray = () => ({
115115
};
116116
},
117117
// numbers
118-
sbyte: (length) => arrayNumberFunction(length, "sbyte"),
119-
byte: (length) => arrayNumberFunction(length, "byte"),
120-
short: (length) => arrayNumberFunction(length, "short"),
121-
ushort: (length) => arrayNumberFunction(length, "ushort"),
122-
int: (length) => arrayNumberFunction(length, "int"),
123-
uint: (length) => arrayNumberFunction(length, "uint"),
118+
sbyte: (arrLength) => arrayNumberFunction(arrLength, "sbyte"),
119+
byte: (arrLength) => arrayNumberFunction(arrLength, "byte"),
120+
short: (arrLength) => arrayNumberFunction(arrLength, "short"),
121+
ushort: (arrLength) => arrayNumberFunction(arrLength, "ushort"),
122+
int: (arrLength) => arrayNumberFunction(arrLength, "int"),
123+
uint: (arrLength) => arrayNumberFunction(arrLength, "uint"),
124124
// big numbers
125-
long: (length) => arrayBigNumberFunction(length, "long"),
126-
ulong: (length) => arrayBigNumberFunction(length, "ulong"),
125+
long: (arrLength) => arrayBigNumberFunction(arrLength, "long"),
126+
ulong: (arrLength) => arrayBigNumberFunction(arrLength, "ulong"),
127127
// extras
128128
string: (arrLength, stringLength) => ({
129129
size: arrLength * stringLength,
130130
builder: (arr, buffer) => {
131-
for (let i = 0; i < length; i++) {
131+
for (let i = 0; i < arrLength; i++) {
132132
Object.defineProperty(arr, i, {
133133
get: () => readStringBuffer(buffer, stringLength * i, stringLength),
134134
set: (value: string) => writeStringBuffer(buffer, stringLength * i, stringLength, value),
@@ -138,10 +138,10 @@ const buildArray: BuildArray = () => ({
138138
return arr;
139139
},
140140
}),
141-
struct: (length, struct) => ({
142-
size: length * struct.size,
141+
struct: (arrLength, struct) => ({
142+
size: arrLength * struct.size,
143143
builder: (arr, buffer) => {
144-
for (let i = 0; i < length; i++) {
144+
for (let i = 0; i < arrLength; i++) {
145145
const structObj = struct(buffer.slice(i * struct.size, (i + 1) * struct.size));
146146
Object.defineProperty(arr, i, {
147147
get: () => structObj,

src/struct/types.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ export type BuildArrayResponseBigNumberFunction = (length: number, type: BigNumb
4141

4242
export type BuildArrayResponse = {
4343
// numbers
44-
sbyte: (length: number) => BuildArrayResponseNumberResult;
45-
byte: (length: number) => BuildArrayResponseNumberResult;
46-
short: (length: number) => BuildArrayResponseNumberResult;
47-
ushort: (length: number) => BuildArrayResponseNumberResult;
48-
int: (length: number) => BuildArrayResponseNumberResult;
49-
uint: (length: number) => BuildArrayResponseNumberResult;
44+
sbyte: (arrLength: number) => BuildArrayResponseNumberResult;
45+
byte: (arrLength: number) => BuildArrayResponseNumberResult;
46+
short: (arrLength: number) => BuildArrayResponseNumberResult;
47+
ushort: (arrLength: number) => BuildArrayResponseNumberResult;
48+
int: (arrLength: number) => BuildArrayResponseNumberResult;
49+
uint: (arrLength: number) => BuildArrayResponseNumberResult;
5050
// big number
51-
long: (length: number) => BuildArrayResponseBigNumberResult;
52-
ulong: (length: number) => BuildArrayResponseBigNumberResult;
51+
long: (arrLength: number) => BuildArrayResponseBigNumberResult;
52+
ulong: (arrLength: number) => BuildArrayResponseBigNumberResult;
5353
// extra
54-
array: <T>(length: number, build: ArrayBuilder<T>) => ArrayBuilderResponse<T[]>;
54+
array: <T>(arrLength: number, build: ArrayBuilder<T>) => ArrayBuilderResponse<T[]>;
5555
string: (arrLength: number, stringLength: number) => ArrayBuilderResponse<string[]>;
56-
struct: <T>(length: number, struct: BuildStructResult<T>) => ArrayBuilderResponse<T[]>;
56+
struct: <T>(arrLength: number, struct: BuildStructResult<T>) => ArrayBuilderResponse<T[]>;
5757
};
5858

5959
export type BuildArray = () => BuildArrayResponse;

0 commit comments

Comments
 (0)