elasticsearch-store 1.7.2 → 1.8.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.
Files changed (5) hide show
  1. package/dist/src/elasticsearch-client/method-helpers/search.d.ts +2 -1
  2. package/dist/src/elasticsearch-client/method-helpers/search.d.ts.map +1 -1
  3. package/dist/src/elasticsearch-client/method-helpers/search.js +20 -4
  4. package/dist/src/elasticsearch-client/method-helpers/search.js.map +1 -1
  5. package/package.json +6 -6
package/dist/src/elasticsearch-client/method-helpers/search.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { ClientParams, ClientMetadata } from '@terascope/types';
2
2
  export declare function convertSearchParams(params: ClientParams.SearchParams, distributionMeta: ClientMetadata): {
3
+ track_total_hits?: number | boolean | undefined;
3
4
  allow_no_indices?: boolean;
4
5
  allow_partial_search_results?: boolean;
5
6
  analyzer?: string;
@@ -43,8 +44,8 @@ export declare function convertSearchParams(params: ClientParams.SearchParams, d
43
44
  terminate_after?: number;
44
45
  timeout?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").TimeSpan;
45
46
  track_scores?: boolean;
46
- track_total_hits?: boolean | number;
47
47
  typed_keys?: boolean;
48
48
  version?: boolean;
49
+ type?: string | undefined;
49
50
  };
50
51
  //# sourceMappingURL=search.d.ts.map
package/dist/src/elasticsearch-client/method-helpers/search.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,YAAY,CAAC,YAAY,EACjC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoCnC"}
1
+ {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3F,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,YAAY,CAAC,YAAY,EACjC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsDnC"}
package/dist/src/elasticsearch-client/method-helpers/search.js CHANGED
@@ -1,23 +1,39 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
+ import { isNumber, isNotNil } from '@terascope/utils';
2
3
  export function convertSearchParams(params, distributionMeta) {
3
4
  const { majorVersion, distribution, version } = distributionMeta;
4
- const { type, ...parsedParams } = params;
5
+ const { type, track_total_hits, ...parsedParams } = params;
5
6
  // includesExcludes(parsedParams);
6
7
  qDependentFieldsCheck(parsedParams);
8
+ const hasTotalConfig = isNotNil(track_total_hits);
9
+ let trackTotal = track_total_hits;
10
+ if (!hasTotalConfig) {
11
+ trackTotal = true;
12
+ }
7
13
  if (distribution === ElasticsearchDistribution.elasticsearch) {
8
14
  if (majorVersion === 8 || majorVersion === 7) {
9
- return parsedParams;
15
+ return {
16
+ ...parsedParams,
17
+ track_total_hits: trackTotal,
18
+ };
10
19
  }
11
20
  if (majorVersion === 6) {
21
+ if (hasTotalConfig && isNumber(track_total_hits)) {
22
+ trackTotal = true;
23
+ }
12
24
  return {
13
25
  ...(type !== undefined && { type }),
14
- ...parsedParams
26
+ ...parsedParams,
27
+ ...hasTotalConfig && { track_total_hits: trackTotal }
15
28
  };
16
29
  }
17
30
  }
18
31
  if (distribution === ElasticsearchDistribution.opensearch) {
19
32
  if (majorVersion === 1 || majorVersion === 2) {
20
- return parsedParams;
33
+ return {
34
+ ...parsedParams,
35
+ track_total_hits: trackTotal,
36
+ };
21
37
  }
22
38
  }
23
39
  throw new Error(`Unsupported ${distribution} version ${version}`);
package/dist/src/elasticsearch-client/method-helpers/search.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,kCAAkC;IAClC,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAEpC,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO;gBACH,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC;gBACnC,GAAG,YAAY;aAClB,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,YAAY,CAAC;QACxB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAiC;IAC5D,MAAM,SAAS,GAA2C;QACtD,UAAU;QACV,kBAAkB;QAClB,kBAAkB;QAClB,IAAI;QACJ,SAAS;KACZ,CAAC;IAEF,MAAM,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;IAE/E,IAAI,mBAAmB,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC9E,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,UAAU,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,IAAI,EACJ,gBAAgB,EAChB,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,kCAAkC;IAClC,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAClD,IAAI,UAAU,GAAG,gBAAgB,CAAC;IAElC,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,UAAU,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO;gBACH,GAAG,YAAY;gBACf,gBAAgB,EAAE,UAAU;aAC/B,CAAC;QACN,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,IAAI,cAAc,IAAI,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAC/C,UAAU,GAAG,IAAI,CAAC;YACtB,CAAC;YAED,OAAO;gBACH,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC;gBACnC,GAAG,YAAY;gBACf,GAAG,cAAc,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE;aACxD,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO;gBACH,GAAG,YAAY;gBACf,gBAAgB,EAAE,UAAU;aAC/B,CAAC;QACN,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAiC;IAC5D,MAAM,SAAS,GAA2C;QACtD,UAAU;QACV,kBAAkB;QAClB,kBAAkB;QAClB,IAAI;QACJ,SAAS;KACZ,CAAC;IAEF,MAAM,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;IAE/E,IAAI,mBAAmB,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC9E,CAAC;AACL,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "elasticsearch-store",
3
3
  "displayName": "Elasticsearch Store",
4
- "version": "1.7.2",
4
+ "version": "1.8.0",
5
5
  "description": "An API for managing an elasticsearch index, with versioning and migration support.",
6
6
  "homepage": "https://github.com/terascope/teraslice/tree/master/packages/elasticsearch-store#readme",
7
7
  "bugs": {
@@ -30,10 +30,10 @@
30
30
  "test:watch": "ts-scripts yarn workspace @terascope/scripts test --watch ../elasticsearch-store --"
31
31
  },
32
32
  "dependencies": {
33
- "@terascope/data-mate": "~1.7.2",
34
- "@terascope/data-types": "~1.7.1",
33
+ "@terascope/data-mate": "~1.7.3",
34
+ "@terascope/data-types": "~1.7.2",
35
35
  "@terascope/types": "~1.4.1",
36
- "@terascope/utils": "~1.7.1",
36
+ "@terascope/utils": "~1.7.2",
37
37
  "ajv": "~8.17.1",
38
38
  "ajv-formats": "~3.0.1",
39
39
  "elasticsearch6": "npm:@elastic/elasticsearch@~6.8.0",
@@ -42,8 +42,8 @@
42
42
  "opensearch1": "npm:@opensearch-project/opensearch@~1.2.0",
43
43
  "opensearch2": "npm:@opensearch-project/opensearch@~2.12.0",
44
44
  "setimmediate": "~1.0.5",
45
- "uuid": "~11.0.3",
46
- "xlucene-translator": "~1.7.2"
45
+ "uuid": "~11.0.5",
46
+ "xlucene-translator": "~1.7.3"
47
47
  },
48
48
  "devDependencies": {
49
49
  "@types/uuid": "~10.0.0"