@rcsb/rcsb-search-tools 0.0.11 → 0.0.13
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.
|
@@ -40,10 +40,10 @@ export type FilterFacetType = Omit<FilterFacet, "facets"> & {
|
|
|
40
40
|
export type BucketDataType = {
|
|
41
41
|
label: string | number;
|
|
42
42
|
population: number;
|
|
43
|
+
labelPath: string[];
|
|
43
44
|
};
|
|
44
45
|
export type SearchBucketFacetType = {
|
|
45
46
|
name: string;
|
|
46
47
|
data: BucketDataType[];
|
|
47
|
-
labelPath: string[];
|
|
48
48
|
};
|
|
49
49
|
export {};
|
|
@@ -4,10 +4,14 @@ exports.getBucketsFromFacets = exports.getFacetsFromSearch = void 0;
|
|
|
4
4
|
function getFacetsFromSearch(searchResult) {
|
|
5
5
|
if (!searchResult.facets)
|
|
6
6
|
return [];
|
|
7
|
-
return
|
|
7
|
+
return mergeBucketsByName(recursiveBucketsFromFacets(searchResult.facets));
|
|
8
8
|
}
|
|
9
9
|
exports.getFacetsFromSearch = getFacetsFromSearch;
|
|
10
10
|
function getBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
|
|
11
|
+
return mergeBucketsByName(recursiveBucketsFromFacets(searchResultFacets, labelList, recursiveOut));
|
|
12
|
+
}
|
|
13
|
+
exports.getBucketsFromFacets = getBucketsFromFacets;
|
|
14
|
+
function recursiveBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
|
|
11
15
|
const out = recursiveOut !== null && recursiveOut !== void 0 ? recursiveOut : [];
|
|
12
16
|
const facets = collectFacets(searchResultFacets);
|
|
13
17
|
facets.forEach(bucketFacet => {
|
|
@@ -22,15 +26,16 @@ function getBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
|
|
|
22
26
|
else {
|
|
23
27
|
const searchBucketFacet = {
|
|
24
28
|
name: bucketFacet.name,
|
|
25
|
-
labelPath: labelList !== null && labelList !== void 0 ? labelList : [],
|
|
26
29
|
data: []
|
|
27
30
|
};
|
|
28
31
|
(_c = bucketFacet.buckets) === null || _c === void 0 ? void 0 : _c.forEach(bucket => {
|
|
29
|
-
if (bucket.label && bucket.population)
|
|
32
|
+
if (bucket.label && bucket.population) {
|
|
30
33
|
searchBucketFacet.data.push({
|
|
31
34
|
label: bucket.label,
|
|
32
|
-
population: bucket.population
|
|
35
|
+
population: bucket.population,
|
|
36
|
+
labelPath: [...(labelList !== null && labelList !== void 0 ? labelList : []), bucket.label]
|
|
33
37
|
});
|
|
38
|
+
}
|
|
34
39
|
});
|
|
35
40
|
if (searchBucketFacet.data.length > 0)
|
|
36
41
|
out.push(searchBucketFacet);
|
|
@@ -38,7 +43,6 @@ function getBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
|
|
|
38
43
|
});
|
|
39
44
|
return out;
|
|
40
45
|
}
|
|
41
|
-
exports.getBucketsFromFacets = getBucketsFromFacets;
|
|
42
46
|
function collectFacets(facets) {
|
|
43
47
|
return facets.filter(f => 'value' in f || ('buckets' in f && f.buckets.length > 0)).map(f => ('value' in f ? {
|
|
44
48
|
name: f.name,
|
|
@@ -48,3 +52,13 @@ function collectFacets(facets) {
|
|
|
48
52
|
}]
|
|
49
53
|
} : f));
|
|
50
54
|
}
|
|
55
|
+
function mergeBucketsByName(buckets) {
|
|
56
|
+
return Array.from(buckets.reduce((mapMerge, current) => {
|
|
57
|
+
var _a;
|
|
58
|
+
if (mapMerge.has(current.name))
|
|
59
|
+
(_a = mapMerge.get(current.name)) === null || _a === void 0 ? void 0 : _a.data.push(...current.data);
|
|
60
|
+
else
|
|
61
|
+
mapMerge.set(current.name, current);
|
|
62
|
+
return mapMerge;
|
|
63
|
+
}, new Map()).values());
|
|
64
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rcsb/rcsb-search-tools",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.13",
|
|
4
4
|
"description": "RCSB PDB Search API request tools",
|
|
5
5
|
"main": "build/app.js",
|
|
6
6
|
"files": [
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"jest": "^29.5.0",
|
|
32
32
|
"lodash": "^4.17.21",
|
|
33
33
|
"node-fetch": "^2.6.7",
|
|
34
|
-
"ts-jest": "^29.
|
|
34
|
+
"ts-jest": "^29.2.4",
|
|
35
35
|
"ts-loader": "^9.3.1",
|
|
36
36
|
"ts-node": "^10.9.1",
|
|
37
37
|
"typescript": "^5.0.4",
|