@rcsb/rcsb-search-tools 0.0.12 → 0.0.14

package/lib/SearchParseTools/SearchFacetTools.d.ts

@@ -1,4 +1,4 @@
 import { SearchBucketFacetType } from "./SearchFacetInterface";
 import { BucketFacet, QueryResult, SingleValueMetricsFacet } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchResultInterface";
 export declare function getFacetsFromSearch(searchResult: QueryResult): SearchBucketFacetType[];
-export declare function getBucketsFromFacets(searchResultFacets: (BucketFacet | SingleValueMetricsFacet)[], labelList?: string[], recursiveOut?: SearchBucketFacetType[]): SearchBucketFacetType[];
+export declare function getBucketsFromFacets(searchResultFacets: (BucketFacet | SingleValueMetricsFacet)[]): SearchBucketFacetType[];

package/lib/SearchParseTools/SearchFacetTools.js

@@ -4,10 +4,14 @@ exports.getBucketsFromFacets = exports.getFacetsFromSearch = void 0;
 function getFacetsFromSearch(searchResult) {
     if (!searchResult.facets)
         return [];
-    return getBucketsFromFacets(searchResult.facets);
+    return mergeBucketsByName(recursiveBucketsFromFacets(searchResult.facets));
 }
 exports.getFacetsFromSearch = getFacetsFromSearch;
-function getBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
+function getBucketsFromFacets(searchResultFacets) {
+    return mergeBucketsByName(recursiveBucketsFromFacets(searchResultFacets));
+}
+exports.getBucketsFromFacets = getBucketsFromFacets;
+function recursiveBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
     const out = recursiveOut !== null && recursiveOut !== void 0 ? recursiveOut : [];
     const facets = collectFacets(searchResultFacets);
     facets.forEach(bucketFacet => {
@@ -16,7 +20,7 @@ function getBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
         if (innerFacets.length > 0) {
             innerFacets.forEach(g => {
                 if (g.facets)
-                    getBucketsFromFacets(g.facets, labelList ? labelList.concat(g.label) : [g.label], out);
+                    recursiveBucketsFromFacets(g.facets, labelList ? labelList.concat(g.label) : [g.label], out);
             });
         }
         else {
@@ -25,21 +29,28 @@ function getBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
                 data: []
             };
             (_c = bucketFacet.buckets) === null || _c === void 0 ? void 0 : _c.forEach(bucket => {
-                if (bucket.label && bucket.population) {
+                if (bucket.label && bucket.population)
                     searchBucketFacet.data.push({
                         label: bucket.label,
                         population: bucket.population,
                         labelPath: [...(labelList !== null && labelList !== void 0 ? labelList : []), bucket.label]
                     });
-                }
             });
-            if (searchBucketFacet.data.length > 0)
-                out.push(searchBucketFacet);
+            out.push(searchBucketFacet);
         }
     });
     return out;
 }
-exports.getBucketsFromFacets = getBucketsFromFacets;
+function mergeBucketsByName(buckets) {
+    return Array.from(buckets.reduce((mapMerge, current) => {
+        var _a;
+        if (mapMerge.has(current.name))
+            (_a = mapMerge.get(current.name)) === null || _a === void 0 ? void 0 : _a.data.push(...current.data);
+        else
+            mapMerge.set(current.name, current);
+        return mapMerge;
+    }, new Map()).values());
+}
 function collectFacets(facets) {
     return facets.filter(f => 'value' in f || ('buckets' in f && f.buckets.length > 0)).map(f => ('value' in f ? {
         name: f.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcsb/rcsb-search-tools",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "RCSB PDB Search API request tools",
   "main": "build/app.js",
   "files": [