@gmod/trix 3.0.2 → 3.0.4
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/dedupe.d.ts +3 -0
- package/dist/dedupe.js +17 -0
- package/dist/dedupe.js.map +1 -0
- package/dist/index.js +5 -12
- package/dist/index.js.map +1 -1
- package/esm/dedupe.d.ts +3 -0
- package/esm/dedupe.js +14 -0
- package/esm/dedupe.js.map +1 -0
- package/esm/index.js +4 -11
- package/esm/index.js.map +1 -1
- package/package.json +7 -5
- package/src/dedupe.ts +18 -0
- package/src/index.ts +5 -12
package/dist/dedupe.d.ts
ADDED
package/dist/dedupe.js
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.dedupe = dedupe;
|
|
4
|
+
// from https://github.com/seriousManual/dedupe/blob/master/LICENSE
|
|
5
|
+
function dedupe(list, hasher = JSON.stringify) {
|
|
6
|
+
const clone = [];
|
|
7
|
+
const lookup = new Set();
|
|
8
|
+
for (const entry of list) {
|
|
9
|
+
const hashed = hasher(entry);
|
|
10
|
+
if (!lookup.has(hashed)) {
|
|
11
|
+
clone.push(entry);
|
|
12
|
+
lookup.add(hashed);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
return clone;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=dedupe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dedupe.js","sourceRoot":"","sources":["../src/dedupe.ts"],"names":[],"mappings":";;AAGA,wBAcC;AAfD,mEAAmE;AACnE,SAAgB,MAAM,CAAI,IAAS,EAAE,SAAoB,IAAI,CAAC,SAAS;IACrE,MAAM,KAAK,GAAQ,EAAE,CAAA;IACrB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAA;IAEhC,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAE5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACpB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -9,19 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const
|
|
12
|
+
const dedupe_ts_1 = require("./dedupe.js");
|
|
13
|
+
const util_ts_1 = require("./util.js");
|
|
13
14
|
const CHUNK_SIZE = 65536;
|
|
14
15
|
// this is the number of hex characters to use for the address in ixixx, see
|
|
15
16
|
// https://github.com/GMOD/ixixx-js/blob/master/src/index.ts#L182
|
|
16
17
|
const ADDRESS_SIZE = 10;
|
|
17
|
-
// https://stackoverflow.com/a/9229821/2129219
|
|
18
|
-
function uniqBy(a, key) {
|
|
19
|
-
const seen = new Set();
|
|
20
|
-
return a.filter(item => {
|
|
21
|
-
const k = key(item);
|
|
22
|
-
return seen.has(k) ? false : seen.add(k);
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
18
|
class Trix {
|
|
26
19
|
constructor(ixxFile, ixFile, maxResults = 20) {
|
|
27
20
|
this.ixxFile = ixxFile;
|
|
@@ -80,7 +73,7 @@ class Trix {
|
|
|
80
73
|
resultArr = resultArr.concat(hits);
|
|
81
74
|
break;
|
|
82
75
|
}
|
|
83
|
-
buffer = (0,
|
|
76
|
+
buffer = (0, util_ts_1.concatUint8Array)([buffer, res2]);
|
|
84
77
|
end += CHUNK_SIZE;
|
|
85
78
|
}
|
|
86
79
|
// if we have filled up the hits, or we are detected to be done via the
|
|
@@ -90,8 +83,8 @@ class Trix {
|
|
|
90
83
|
break;
|
|
91
84
|
}
|
|
92
85
|
}
|
|
93
|
-
//
|
|
94
|
-
return
|
|
86
|
+
// de-duplicate results based on the detail column (resultArr[1])
|
|
87
|
+
return (0, dedupe_ts_1.dedupe)(resultArr, elt => elt[1]).slice(0, this.maxResults);
|
|
95
88
|
});
|
|
96
89
|
}
|
|
97
90
|
getIndex(opts) {
|
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/esm/dedupe.d.ts
ADDED
package/esm/dedupe.js
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
// from https://github.com/seriousManual/dedupe/blob/master/LICENSE
|
|
2
|
+
export function dedupe(list, hasher = JSON.stringify) {
|
|
3
|
+
const clone = [];
|
|
4
|
+
const lookup = new Set();
|
|
5
|
+
for (const entry of list) {
|
|
6
|
+
const hashed = hasher(entry);
|
|
7
|
+
if (!lookup.has(hashed)) {
|
|
8
|
+
clone.push(entry);
|
|
9
|
+
lookup.add(hashed);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
return clone;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=dedupe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dedupe.js","sourceRoot":"","sources":["../src/dedupe.ts"],"names":[],"mappings":"AAEA,mEAAmE;AACnE,MAAM,UAAU,MAAM,CAAI,IAAS,EAAE,SAAoB,IAAI,CAAC,SAAS;IACrE,MAAM,KAAK,GAAQ,EAAE,CAAA;IACrB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAA;IAEhC,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAE5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACpB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}
|
package/esm/index.js
CHANGED
|
@@ -1,16 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { dedupe } from "./dedupe.js";
|
|
2
|
+
import { concatUint8Array } from "./util.js";
|
|
2
3
|
const CHUNK_SIZE = 65536;
|
|
3
4
|
// this is the number of hex characters to use for the address in ixixx, see
|
|
4
5
|
// https://github.com/GMOD/ixixx-js/blob/master/src/index.ts#L182
|
|
5
6
|
const ADDRESS_SIZE = 10;
|
|
6
|
-
// https://stackoverflow.com/a/9229821/2129219
|
|
7
|
-
function uniqBy(a, key) {
|
|
8
|
-
const seen = new Set();
|
|
9
|
-
return a.filter(item => {
|
|
10
|
-
const k = key(item);
|
|
11
|
-
return seen.has(k) ? false : seen.add(k);
|
|
12
|
-
});
|
|
13
|
-
}
|
|
14
7
|
export default class Trix {
|
|
15
8
|
ixxFile;
|
|
16
9
|
ixFile;
|
|
@@ -81,8 +74,8 @@ export default class Trix {
|
|
|
81
74
|
break;
|
|
82
75
|
}
|
|
83
76
|
}
|
|
84
|
-
//
|
|
85
|
-
return
|
|
77
|
+
// de-duplicate results based on the detail column (resultArr[1])
|
|
78
|
+
return dedupe(resultArr, elt => elt[1]).slice(0, this.maxResults);
|
|
86
79
|
}
|
|
87
80
|
async getIndex(opts) {
|
|
88
81
|
const file = await this.ixxFile.readFile({
|
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/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "3.0.
|
|
2
|
+
"version": "3.0.4",
|
|
3
3
|
"license": "Apache-2.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"module": "esm/index.js",
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
"build:es5": "tsc --target es2015 --outDir dist --module commonjs",
|
|
19
19
|
"build": "npm run build:esm && npm run build:es5",
|
|
20
20
|
"preversion": "npm run lint && npm test run && npm run build",
|
|
21
|
+
"postbuild:es5": "echo '{\"type\": \"commonjs\"}' > dist/package.json",
|
|
21
22
|
"postversion": "git push --follow-tags",
|
|
22
23
|
"test": "vitest"
|
|
23
24
|
},
|
|
@@ -25,17 +26,18 @@
|
|
|
25
26
|
"author": "Matt Morgan",
|
|
26
27
|
"repository": "GMOD/trix-js",
|
|
27
28
|
"devDependencies": {
|
|
28
|
-
"@types/node": "^
|
|
29
|
+
"@types/node": "^22.15.21",
|
|
29
30
|
"@typescript-eslint/eslint-plugin": "^8.4.0",
|
|
30
31
|
"@typescript-eslint/parser": "^8.4.0",
|
|
31
32
|
"eslint": "^9.0.0",
|
|
32
|
-
"eslint-plugin-
|
|
33
|
-
"
|
|
33
|
+
"eslint-plugin-import": "^2.31.0",
|
|
34
|
+
"eslint-plugin-unicorn": "^62.0.0",
|
|
35
|
+
"generic-filehandle2": "^2.0.5",
|
|
34
36
|
"prettier": "^3.3.3",
|
|
35
37
|
"rimraf": "^6.0.1",
|
|
36
38
|
"typescript": "^5.7.0",
|
|
37
39
|
"typescript-eslint": "^8.4.0",
|
|
38
|
-
"vitest": "^
|
|
40
|
+
"vitest": "^4.0.6"
|
|
39
41
|
},
|
|
40
42
|
"publishConfig": {
|
|
41
43
|
"access": "public"
|
package/src/dedupe.ts
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
type Hasher<T> = (input: T) => string
|
|
2
|
+
|
|
3
|
+
// from https://github.com/seriousManual/dedupe/blob/master/LICENSE
|
|
4
|
+
export function dedupe<T>(list: T[], hasher: Hasher<T> = JSON.stringify) {
|
|
5
|
+
const clone: T[] = []
|
|
6
|
+
const lookup = new Set<string>()
|
|
7
|
+
|
|
8
|
+
for (const entry of list) {
|
|
9
|
+
const hashed = hasher(entry)
|
|
10
|
+
|
|
11
|
+
if (!lookup.has(hashed)) {
|
|
12
|
+
clone.push(entry)
|
|
13
|
+
lookup.add(hashed)
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
return clone
|
|
18
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { dedupe } from './dedupe.ts'
|
|
2
|
+
import { concatUint8Array } from './util.ts'
|
|
3
|
+
|
|
1
4
|
import type { GenericFilehandle } from 'generic-filehandle2'
|
|
2
|
-
import { concatUint8Array } from './util'
|
|
3
5
|
|
|
4
6
|
const CHUNK_SIZE = 65536
|
|
5
7
|
|
|
@@ -7,15 +9,6 @@ const CHUNK_SIZE = 65536
|
|
|
7
9
|
// https://github.com/GMOD/ixixx-js/blob/master/src/index.ts#L182
|
|
8
10
|
const ADDRESS_SIZE = 10
|
|
9
11
|
|
|
10
|
-
// https://stackoverflow.com/a/9229821/2129219
|
|
11
|
-
function uniqBy<T>(a: T[], key: (elt: T) => string) {
|
|
12
|
-
const seen = new Set()
|
|
13
|
-
return a.filter(item => {
|
|
14
|
-
const k = key(item)
|
|
15
|
-
return seen.has(k) ? false : seen.add(k)
|
|
16
|
-
})
|
|
17
|
-
}
|
|
18
|
-
|
|
19
12
|
export default class Trix {
|
|
20
13
|
constructor(
|
|
21
14
|
public ixxFile: GenericFilehandle,
|
|
@@ -93,8 +86,8 @@ export default class Trix {
|
|
|
93
86
|
}
|
|
94
87
|
}
|
|
95
88
|
|
|
96
|
-
//
|
|
97
|
-
return
|
|
89
|
+
// de-duplicate results based on the detail column (resultArr[1])
|
|
90
|
+
return dedupe(resultArr, elt => elt[1]).slice(0, this.maxResults)
|
|
98
91
|
}
|
|
99
92
|
|
|
100
93
|
private async getIndex(opts?: { signal?: AbortSignal }) {
|