@gmod/trix 2.0.8 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -1
- package/dist/index.js +11 -6
- package/dist/index.js.map +1 -1
- package/dist/util.d.ts +2 -0
- package/dist/util.js +21 -0
- package/dist/util.js.map +1 -0
- package/esm/index.d.ts +1 -1
- package/esm/index.js +8 -6
- package/esm/index.js.map +1 -1
- package/esm/util.d.ts +2 -0
- package/esm/util.js +17 -0
- package/esm/util.js.map +1 -0
- package/package.json +3 -6
- package/src/index.ts +9 -13
- package/src/util.ts +16 -0
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const util_1 = require("./util");
|
|
12
13
|
const CHUNK_SIZE = 65536;
|
|
13
14
|
// this is the number of hex characters to use for the address in ixixx, see
|
|
14
15
|
// https://github.com/GMOD/ixixx-js/blob/master/src/index.ts#L182
|
|
@@ -39,10 +40,11 @@ class Trix {
|
|
|
39
40
|
}
|
|
40
41
|
let { end, buffer } = res;
|
|
41
42
|
let done = false;
|
|
43
|
+
const decoder = new TextDecoder('utf8');
|
|
44
|
+
const str = decoder.decode(buffer);
|
|
42
45
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
43
46
|
while (!done) {
|
|
44
47
|
let foundSomething = false;
|
|
45
|
-
const str = buffer.toString();
|
|
46
48
|
// slice to lastIndexOf('\n') to make sure we get complete records
|
|
47
49
|
// since the buffer fetch could get halfway into a record
|
|
48
50
|
const lines = str
|
|
@@ -72,13 +74,13 @@ class Trix {
|
|
|
72
74
|
// if we are not done, and we haven't filled up maxResults with hits yet,
|
|
73
75
|
// then refetch
|
|
74
76
|
if (resultArr.length + hits.length < this.maxResults && !done) {
|
|
75
|
-
const res2 = yield this.ixFile.read(
|
|
77
|
+
const res2 = yield this.ixFile.read(CHUNK_SIZE, end, opts);
|
|
76
78
|
// early break if empty response
|
|
77
|
-
if (
|
|
79
|
+
if (res2.length === 0) {
|
|
78
80
|
resultArr = resultArr.concat(hits);
|
|
79
81
|
break;
|
|
80
82
|
}
|
|
81
|
-
buffer =
|
|
83
|
+
buffer = (0, util_1.concatUint8Array)([buffer, res2]);
|
|
82
84
|
end += CHUNK_SIZE;
|
|
83
85
|
}
|
|
84
86
|
// if we have filled up the hits, or we are detected to be done via the
|
|
@@ -124,8 +126,11 @@ class Trix {
|
|
|
124
126
|
if (len < 0) {
|
|
125
127
|
return undefined;
|
|
126
128
|
}
|
|
127
|
-
const
|
|
128
|
-
return
|
|
129
|
+
const buffer = yield this.ixFile.read(len, start, opts);
|
|
130
|
+
return {
|
|
131
|
+
buffer,
|
|
132
|
+
end,
|
|
133
|
+
};
|
|
129
134
|
});
|
|
130
135
|
}
|
|
131
136
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/util.d.ts
ADDED
package/dist/util.js
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.sum = sum;
|
|
4
|
+
exports.concatUint8Array = concatUint8Array;
|
|
5
|
+
function sum(array) {
|
|
6
|
+
let sum = 0;
|
|
7
|
+
for (const entry of array) {
|
|
8
|
+
sum += entry.length;
|
|
9
|
+
}
|
|
10
|
+
return sum;
|
|
11
|
+
}
|
|
12
|
+
function concatUint8Array(args) {
|
|
13
|
+
const mergedArray = new Uint8Array(sum(args));
|
|
14
|
+
let offset = 0;
|
|
15
|
+
for (const entry of args) {
|
|
16
|
+
mergedArray.set(entry, offset);
|
|
17
|
+
offset += entry.length;
|
|
18
|
+
}
|
|
19
|
+
return mergedArray;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=util.js.map
|
package/dist/util.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;AAAA,kBAMC;AACD,4CAQC;AAfD,SAAgB,GAAG,CAAC,KAAmB;IACrC,IAAI,GAAG,GAAG,CAAC,CAAA;IACX,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;QAC1B,GAAG,IAAI,KAAK,CAAC,MAAM,CAAA;IACrB,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AACD,SAAgB,gBAAgB,CAAC,IAAkB;IACjD,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;IAC7C,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;QACzB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC9B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;IACxB,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC"}
|
package/esm/index.d.ts
CHANGED
package/esm/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { concatUint8Array } from './util';
|
|
1
2
|
const CHUNK_SIZE = 65536;
|
|
2
3
|
// this is the number of hex characters to use for the address in ixixx, see
|
|
3
4
|
// https://github.com/GMOD/ixixx-js/blob/master/src/index.ts#L182
|
|
@@ -30,10 +31,11 @@ export default class Trix {
|
|
|
30
31
|
}
|
|
31
32
|
let { end, buffer } = res;
|
|
32
33
|
let done = false;
|
|
34
|
+
const decoder = new TextDecoder('utf8');
|
|
35
|
+
const str = decoder.decode(buffer);
|
|
33
36
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
34
37
|
while (!done) {
|
|
35
38
|
let foundSomething = false;
|
|
36
|
-
const str = buffer.toString();
|
|
37
39
|
// slice to lastIndexOf('\n') to make sure we get complete records
|
|
38
40
|
// since the buffer fetch could get halfway into a record
|
|
39
41
|
const lines = str
|
|
@@ -63,13 +65,13 @@ export default class Trix {
|
|
|
63
65
|
// if we are not done, and we haven't filled up maxResults with hits yet,
|
|
64
66
|
// then refetch
|
|
65
67
|
if (resultArr.length + hits.length < this.maxResults && !done) {
|
|
66
|
-
const res2 = await this.ixFile.read(
|
|
68
|
+
const res2 = await this.ixFile.read(CHUNK_SIZE, end, opts);
|
|
67
69
|
// early break if empty response
|
|
68
|
-
if (
|
|
70
|
+
if (res2.length === 0) {
|
|
69
71
|
resultArr = resultArr.concat(hits);
|
|
70
72
|
break;
|
|
71
73
|
}
|
|
72
|
-
buffer =
|
|
74
|
+
buffer = concatUint8Array([buffer, res2]);
|
|
73
75
|
end += CHUNK_SIZE;
|
|
74
76
|
}
|
|
75
77
|
// if we have filled up the hits, or we are detected to be done via the
|
|
@@ -114,9 +116,9 @@ export default class Trix {
|
|
|
114
116
|
if (len < 0) {
|
|
115
117
|
return undefined;
|
|
116
118
|
}
|
|
117
|
-
const
|
|
119
|
+
const buffer = await this.ixFile.read(len, start, opts);
|
|
118
120
|
return {
|
|
119
|
-
|
|
121
|
+
buffer,
|
|
120
122
|
end,
|
|
121
123
|
};
|
|
122
124
|
}
|
package/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/esm/util.d.ts
ADDED
package/esm/util.js
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export function sum(array) {
|
|
2
|
+
let sum = 0;
|
|
3
|
+
for (const entry of array) {
|
|
4
|
+
sum += entry.length;
|
|
5
|
+
}
|
|
6
|
+
return sum;
|
|
7
|
+
}
|
|
8
|
+
export function concatUint8Array(args) {
|
|
9
|
+
const mergedArray = new Uint8Array(sum(args));
|
|
10
|
+
let offset = 0;
|
|
11
|
+
for (const entry of args) {
|
|
12
|
+
mergedArray.set(entry, offset);
|
|
13
|
+
offset += entry.length;
|
|
14
|
+
}
|
|
15
|
+
return mergedArray;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=util.js.map
|
package/esm/util.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAAG,CAAC,KAAmB;IACrC,IAAI,GAAG,GAAG,CAAC,CAAA;IACX,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;QAC1B,GAAG,IAAI,KAAK,CAAC,MAAM,CAAA;IACrB,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AACD,MAAM,UAAU,gBAAgB,CAAC,IAAkB;IACjD,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;IAC7C,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;QACzB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC9B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;IACxB,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "
|
|
2
|
+
"version": "3.0.0",
|
|
3
3
|
"license": "Apache-2.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"module": "esm/index.js",
|
|
@@ -30,16 +30,13 @@
|
|
|
30
30
|
"@typescript-eslint/parser": "^8.4.0",
|
|
31
31
|
"eslint": "^9.0.0",
|
|
32
32
|
"eslint-plugin-unicorn": "^55.0.0",
|
|
33
|
-
"generic-
|
|
33
|
+
"generic-filehandle2": "^0.0.1",
|
|
34
34
|
"prettier": "^3.3.3",
|
|
35
35
|
"rimraf": "^6.0.1",
|
|
36
|
-
"typescript": "^5.
|
|
36
|
+
"typescript": "^5.7.0",
|
|
37
37
|
"typescript-eslint": "^8.4.0",
|
|
38
38
|
"vitest": "^2.0.5"
|
|
39
39
|
},
|
|
40
|
-
"dependencies": {
|
|
41
|
-
"buffer": "^6.0.3"
|
|
42
|
-
},
|
|
43
40
|
"publishConfig": {
|
|
44
41
|
"access": "public"
|
|
45
42
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { GenericFilehandle } from 'generic-
|
|
1
|
+
import type { GenericFilehandle } from 'generic-filehandle2'
|
|
2
|
+
import { concatUint8Array } from './util'
|
|
2
3
|
|
|
3
4
|
const CHUNK_SIZE = 65536
|
|
4
5
|
|
|
@@ -35,10 +36,11 @@ export default class Trix {
|
|
|
35
36
|
|
|
36
37
|
let { end, buffer } = res
|
|
37
38
|
let done = false
|
|
39
|
+
const decoder = new TextDecoder('utf8')
|
|
40
|
+
const str = decoder.decode(buffer)
|
|
38
41
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
39
42
|
while (!done) {
|
|
40
43
|
let foundSomething = false
|
|
41
|
-
const str = buffer.toString()
|
|
42
44
|
|
|
43
45
|
// slice to lastIndexOf('\n') to make sure we get complete records
|
|
44
46
|
// since the buffer fetch could get halfway into a record
|
|
@@ -72,20 +74,14 @@ export default class Trix {
|
|
|
72
74
|
// if we are not done, and we haven't filled up maxResults with hits yet,
|
|
73
75
|
// then refetch
|
|
74
76
|
if (resultArr.length + hits.length < this.maxResults && !done) {
|
|
75
|
-
const res2 = await this.ixFile.read(
|
|
76
|
-
Buffer.alloc(CHUNK_SIZE),
|
|
77
|
-
0,
|
|
78
|
-
CHUNK_SIZE,
|
|
79
|
-
end,
|
|
80
|
-
opts,
|
|
81
|
-
)
|
|
77
|
+
const res2 = await this.ixFile.read(CHUNK_SIZE, end, opts)
|
|
82
78
|
|
|
83
79
|
// early break if empty response
|
|
84
|
-
if (
|
|
80
|
+
if (res2.length === 0) {
|
|
85
81
|
resultArr = resultArr.concat(hits)
|
|
86
82
|
break
|
|
87
83
|
}
|
|
88
|
-
buffer =
|
|
84
|
+
buffer = concatUint8Array([buffer, res2])
|
|
89
85
|
end += CHUNK_SIZE
|
|
90
86
|
}
|
|
91
87
|
|
|
@@ -138,9 +134,9 @@ export default class Trix {
|
|
|
138
134
|
if (len < 0) {
|
|
139
135
|
return undefined
|
|
140
136
|
}
|
|
141
|
-
const
|
|
137
|
+
const buffer = await this.ixFile.read(len, start, opts)
|
|
142
138
|
return {
|
|
143
|
-
|
|
139
|
+
buffer,
|
|
144
140
|
end,
|
|
145
141
|
}
|
|
146
142
|
}
|
package/src/util.ts
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export function sum(array: Uint8Array[]) {
|
|
2
|
+
let sum = 0
|
|
3
|
+
for (const entry of array) {
|
|
4
|
+
sum += entry.length
|
|
5
|
+
}
|
|
6
|
+
return sum
|
|
7
|
+
}
|
|
8
|
+
export function concatUint8Array(args: Uint8Array[]) {
|
|
9
|
+
const mergedArray = new Uint8Array(sum(args))
|
|
10
|
+
let offset = 0
|
|
11
|
+
for (const entry of args) {
|
|
12
|
+
mergedArray.set(entry, offset)
|
|
13
|
+
offset += entry.length
|
|
14
|
+
}
|
|
15
|
+
return mergedArray
|
|
16
|
+
}
|