@rcsb/rcsb-search-tools 0.0.13 → 0.0.15-dev-js-seqcoord.1

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.
Files changed (5) hide show
  1. package/lib/SearchClient/SearchClient.js +1 -1
  2. package/lib/SearchParseTools/SearchFacetTools.d.ts +1 -1
  3. package/lib/SearchParseTools/SearchFacetTools.js +16 -19
  4. package/lib/SearchQueryTools/SearchQueryTools.js +8 -9
  5. package/package.json +19 -18
package/lib/SearchClient/SearchClient.js CHANGED
@@ -10,5 +10,5 @@ class SearchClient {
10
10
  this.client = client;
11
11
  }
12
12
  }
13
- SearchClient.client = new SearchRequest_1.SearchRequest();
14
13
  exports.SearchClient = SearchClient;
14
+ SearchClient.client = new SearchRequest_1.SearchRequest();
package/lib/SearchParseTools/SearchFacetTools.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { SearchBucketFacetType } from "./SearchFacetInterface";
2
2
  import { BucketFacet, QueryResult, SingleValueMetricsFacet } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchResultInterface";
3
3
  export declare function getFacetsFromSearch(searchResult: QueryResult): SearchBucketFacetType[];
4
- export declare function getBucketsFromFacets(searchResultFacets: (BucketFacet | SingleValueMetricsFacet)[], labelList?: string[], recursiveOut?: SearchBucketFacetType[]): SearchBucketFacetType[];
4
+ export declare function getBucketsFromFacets(searchResultFacets: (BucketFacet | SingleValueMetricsFacet)[]): SearchBucketFacetType[];
package/lib/SearchParseTools/SearchFacetTools.js CHANGED
@@ -1,16 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getBucketsFromFacets = exports.getFacetsFromSearch = void 0;
3
+ exports.getFacetsFromSearch = getFacetsFromSearch;
4
+ exports.getBucketsFromFacets = getBucketsFromFacets;
4
5
  function getFacetsFromSearch(searchResult) {
5
6
  if (!searchResult.facets)
6
7
  return [];
7
8
  return mergeBucketsByName(recursiveBucketsFromFacets(searchResult.facets));
8
9
  }
9
- exports.getFacetsFromSearch = getFacetsFromSearch;
10
- function getBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
11
- return mergeBucketsByName(recursiveBucketsFromFacets(searchResultFacets, labelList, recursiveOut));
10
+ function getBucketsFromFacets(searchResultFacets) {
11
+ return mergeBucketsByName(recursiveBucketsFromFacets(searchResultFacets));
12
12
  }
13
- exports.getBucketsFromFacets = getBucketsFromFacets;
14
13
  function recursiveBucketsFromFacets(searchResultFacets, labelList, recursiveOut) {
15
14
  const out = recursiveOut !== null && recursiveOut !== void 0 ? recursiveOut : [];
16
15
  const facets = collectFacets(searchResultFacets);
@@ -20,7 +19,7 @@ function recursiveBucketsFromFacets(searchResultFacets, labelList, recursiveOut)
20
19
  if (innerFacets.length > 0) {
21
20
  innerFacets.forEach(g => {
22
21
  if (g.facets)
23
- getBucketsFromFacets(g.facets, labelList ? labelList.concat(g.label) : [g.label], out);
22
+ recursiveBucketsFromFacets(g.facets, labelList ? labelList.concat(g.label) : [g.label], out);
24
23
  });
25
24
  }
26
25
  else {
@@ -29,29 +28,18 @@ function recursiveBucketsFromFacets(searchResultFacets, labelList, recursiveOut)
29
28
  data: []
30
29
  };
31
30
  (_c = bucketFacet.buckets) === null || _c === void 0 ? void 0 : _c.forEach(bucket => {
32
- if (bucket.label && bucket.population) {
31
+ if (bucket.label && bucket.population)
33
32
  searchBucketFacet.data.push({
34
33
  label: bucket.label,
35
34
  population: bucket.population,
36
35
  labelPath: [...(labelList !== null && labelList !== void 0 ? labelList : []), bucket.label]
37
36
  });
38
- }
39
37
  });
40
- if (searchBucketFacet.data.length > 0)
41
- out.push(searchBucketFacet);
38
+ out.push(searchBucketFacet);
42
39
  }
43
40
  });
44
41
  return out;
45
42
  }
46
- function collectFacets(facets) {
47
- return facets.filter(f => 'value' in f || ('buckets' in f && f.buckets.length > 0)).map(f => ('value' in f ? {
48
- name: f.name,
49
- buckets: [{
50
- label: f.name,
51
- population: f.value
52
- }]
53
- } : f));
54
- }
55
43
  function mergeBucketsByName(buckets) {
56
44
  return Array.from(buckets.reduce((mapMerge, current) => {
57
45
  var _a;
@@ -62,3 +50,12 @@ function mergeBucketsByName(buckets) {
62
50
  return mapMerge;
63
51
  }, new Map()).values());
64
52
  }
53
+ function collectFacets(facets) {
54
+ return facets.filter(f => 'value' in f || ('buckets' in f && f.buckets.length > 0)).map(f => ('value' in f ? {
55
+ name: f.name,
56
+ buckets: [{
57
+ label: f.name,
58
+ population: f.value
59
+ }]
60
+ } : f));
61
+ }
package/lib/SearchQueryTools/SearchQueryTools.js CHANGED
@@ -1,6 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.buildMultiFacet = exports.buildAttributeQuery = exports.combineSearchQuery = exports.addAttributeToSearchQuery = exports.buildRequestFromSearchQuery = exports.buildRequestFromCombinedSearchQuery = exports.buildRequestFromAttributeAndSearchQuery = exports.buildRequestFromAttribute = void 0;
3
+ exports.buildRequestFromAttribute = buildRequestFromAttribute;
4
+ exports.buildRequestFromAttributeAndSearchQuery = buildRequestFromAttributeAndSearchQuery;
5
+ exports.buildRequestFromCombinedSearchQuery = buildRequestFromCombinedSearchQuery;
6
+ exports.buildRequestFromSearchQuery = buildRequestFromSearchQuery;
7
+ exports.addAttributeToSearchQuery = addAttributeToSearchQuery;
8
+ exports.combineSearchQuery = combineSearchQuery;
9
+ exports.buildAttributeQuery = buildAttributeQuery;
10
+ exports.buildMultiFacet = buildMultiFacet;
4
11
  const SearchEnums_1 = require("@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchEnums");
5
12
  const lodash_1 = require("lodash");
6
13
  function buildRequestFromAttribute(searchAttribute, returnType, requestOptions) {
@@ -10,7 +17,6 @@ function buildRequestFromAttribute(searchAttribute, returnType, requestOptions)
10
17
  request_options: requestOptions
11
18
  };
12
19
  }
13
- exports.buildRequestFromAttribute = buildRequestFromAttribute;
14
20
  function buildRequestFromAttributeAndSearchQuery(searchAttribute, searchQuery, returnType, logicalOperator = SearchEnums_1.LogicalOperator.And, requestOptions) {
15
21
  return {
16
22
  query: addAttributeToSearchQuery(searchAttribute, searchQuery, logicalOperator),
@@ -18,7 +24,6 @@ function buildRequestFromAttributeAndSearchQuery(searchAttribute, searchQuery, r
18
24
  request_options: requestOptions
19
25
  };
20
26
  }
21
- exports.buildRequestFromAttributeAndSearchQuery = buildRequestFromAttributeAndSearchQuery;
22
27
  function buildRequestFromCombinedSearchQuery(additionalSearchQuery, searchQuery, returnType, logicalOperator = SearchEnums_1.LogicalOperator.And, requestOptions) {
23
28
  return {
24
29
  query: combineSearchQuery(additionalSearchQuery, searchQuery),
@@ -26,7 +31,6 @@ function buildRequestFromCombinedSearchQuery(additionalSearchQuery, searchQuery,
26
31
  request_options: requestOptions
27
32
  };
28
33
  }
29
- exports.buildRequestFromCombinedSearchQuery = buildRequestFromCombinedSearchQuery;
30
34
  function buildRequestFromSearchQuery(searchQuery, returnType, requestOptions) {
31
35
  return {
32
36
  query: searchQuery,
@@ -34,11 +38,9 @@ function buildRequestFromSearchQuery(searchQuery, returnType, requestOptions) {
34
38
  request_options: requestOptions
35
39
  };
36
40
  }
37
- exports.buildRequestFromSearchQuery = buildRequestFromSearchQuery;
38
41
  function addAttributeToSearchQuery(searchAttribute, searchQuery, logicalOperator = SearchEnums_1.LogicalOperator.And) {
39
42
  return combineSearchQuery(buildAttributeQuery(searchAttribute), searchQuery, logicalOperator);
40
43
  }
41
- exports.addAttributeToSearchQuery = addAttributeToSearchQuery;
42
44
  function combineSearchQuery(additionalSearchQuery, searchQuery, logicalOperator = SearchEnums_1.LogicalOperator.And) {
43
45
  if (searchQuery.type === SearchEnums_1.Type.Group && searchQuery.logical_operator === logicalOperator) {
44
46
  const query = (0, lodash_1.cloneDeep)(searchQuery);
@@ -54,7 +56,6 @@ function combineSearchQuery(additionalSearchQuery, searchQuery, logicalOperator
54
56
  ]
55
57
  };
56
58
  }
57
- exports.combineSearchQuery = combineSearchQuery;
58
59
  function buildAttributeQuery(searchAttribute) {
59
60
  return {
60
61
  type: SearchEnums_1.Type.Terminal,
@@ -67,7 +68,6 @@ function buildAttributeQuery(searchAttribute) {
67
68
  }
68
69
  };
69
70
  }
70
- exports.buildAttributeQuery = buildAttributeQuery;
71
71
  function buildMultiFacet(addFacet, toFacet) {
72
72
  if (Array.isArray(toFacet.facets)) {
73
73
  toFacet.facets.forEach(f => buildMultiFacet(addFacet, f));
@@ -81,4 +81,3 @@ function buildMultiFacet(addFacet, toFacet) {
81
81
  }
82
82
  }
83
83
  }
84
- exports.buildMultiFacet = buildMultiFacet;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rcsb/rcsb-search-tools",
3
- "version": "0.0.13",
3
+ "version": "0.0.15-dev-js-seqcoord.1",
4
4
  "description": "RCSB PDB Search API request tools",
5
5
  "main": "build/app.js",
6
6
  "files": [
@@ -9,8 +9,8 @@
9
9
  "scripts": {
10
10
  "runTest": "jest",
11
11
  "tsc": "tsc",
12
- "buildApp": "npm run tsc",
13
- "publishApp": "npm publish"
12
+ "buildApp": "npm run tsc && npm run runTest",
13
+ "publishApp": "npm publish --tag dev-js-seqcoord"
14
14
  },
15
15
  "repository": {
16
16
  "type": "git",
@@ -22,23 +22,24 @@
22
22
  "author": "Joan Segura Mora <joan.segura@rcsb.org>",
23
23
  "license": "MIT",
24
24
  "devDependencies": {
25
- "@babel/core": "^7.18.9",
26
- "@babel/preset-env": "^7.18.9",
27
- "@types/jest": "^29.5.1",
28
- "@types/lodash": "^4.14.194",
29
- "@types/node-fetch": "^2.6.2",
30
- "babel-loader": "^9.1.2",
31
- "jest": "^29.5.0",
25
+ "@babel/core": "^7.26.10",
26
+ "@babel/preset-env": "^7.26.9",
27
+ "@types/jest": "^29.5.14",
28
+ "@types/lodash": "^4.17.16",
29
+ "@types/node-fetch": "^2.6.12",
30
+ "babel-jest": "^29.7.0",
31
+ "babel-loader": "^10.0.0",
32
+ "jest": "^29.7.0",
32
33
  "lodash": "^4.17.21",
33
- "node-fetch": "^2.6.7",
34
- "ts-jest": "^29.2.4",
35
- "ts-loader": "^9.3.1",
36
- "ts-node": "^10.9.1",
37
- "typescript": "^5.0.4",
38
- "webpack": "^5.74.0",
39
- "webpack-cli": "^5.1.1"
34
+ "node-fetch": "^3.3.2",
35
+ "ts-jest": "^29.3.1",
36
+ "ts-loader": "^9.5.2",
37
+ "ts-node": "^10.9.2",
38
+ "typescript": "^5.8.2",
39
+ "webpack": "5.94.0",
40
+ "webpack-cli": "^6.0.1"
40
41
  },
41
42
  "dependencies": {
42
- "@rcsb/rcsb-api-tools": "^4.1.11"
43
+ "@rcsb/rcsb-api-tools": "^5.0.0-dev-js-seqcoord.4"
43
44
  }
44
45
  }