npm - @terascope/opensearch-client - Versions diffs - 2.0.0-dev.4 → 2.0.0-dev.5 - Mend

@terascope/opensearch-client 2.0.0-dev.4 → 2.0.0-dev.5

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 (149) hide show

package/dist/src/client/method-helpers/reindex.d.ts CHANGED Viewed

@@ -1,13 +1,5 @@
 import { ClientParams, ClientMetadata } from '@terascope/types';
-export declare function convertReIndexParams(params: ClientParams.ReindexParams, distributionMeta: ClientMetadata): {
-    refresh?: boolean;
-    timeout?: string;
-    wait_for_active_shards?: "all" | number;
-    wait_for_completion?: boolean;
-    requests_per_second?: number;
-    slices?: number | string;
-    body: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").ReindexBody;
-} | {
+export declare function convertReIndexParams(params: ClientParams.ReindexParams, distributionMeta: ClientMetadata): ClientParams.ReindexParams | {
     refresh?: boolean;
     timeout?: string;
     wait_for_active_shards?: "all" | number;

package/dist/src/client/method-helpers/reindex.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"reindex.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/reindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;~~AAG3F~~,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,YAAY,CAAC,aAAa,EAClC,gBAAgB,EAAE,cAAc~~;;;;;;;;;;;;;;;;;;;;;;;cAoDwosD~~,CAAC;eAAyB,CAAC;;;;;;;;;;~~EADtssD~~"}
1	+ {"version":3,"file":"reindex.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/reindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,YAAY,CAAC,aAAa,EAClC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;cAmC4mtD,CAAC;eAAyB,CAAC;;;;;;;;;;EAD1qtD"}

package/dist/src/client/method-helpers/reindex.js CHANGED Viewed

@@ -1,11 +1,9 @@
 import { ElasticsearchDistribution } from '@terascope/types';
-import { has } from '@terascope/utils';
 export function convertReIndexParams(params, distributionMeta) {
     const { majorVersion, distribution, version } = distributionMeta;
     if (distribution === ElasticsearchDistribution.elasticsearch) {
         if (majorVersion === 8) {
             const { body, ...parsedParams } = params;
-            delete body?.dest?.type;
             return {
                 source: body?.source,
                 dest: body?.dest,
@@ -15,18 +13,9 @@ export function convertReIndexParams(params, distributionMeta) {
         if (majorVersion === 7) {
             return params;
         }
-        if (majorVersion === 6) {
-            const { scroll, max_docs, ...parsedParams } = params;
-            if (parsedParams.body.dest.type == null)
-                parsedParams.body.dest.type = '_doc';
-            return parsedParams;
-        }
     }
     if (distribution === ElasticsearchDistribution.opensearch) {
         if ([1, 2, 3].includes(majorVersion)) {
-            if (has(params, 'body.dest.type')) {
-                delete params.body.dest.type;
-            }
             return params;
         }
     }

package/dist/src/client/method-helpers/reindex.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"reindex.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/reindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;~~AAC3F~~,~~OAAO,EAAE,GAAG,EAAE,~~MAAM,~~kBAAkB,CAAC;AAEvC,MAAM,~~UAAU,oBAAoB,CAChC,MAAkC,EAClC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO~~,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC~~;~~YAExB,OAAO;~~gBACH,MAAM,EAAE,IAAI,EAAE,MAAM;gBACpB,IAAI,EAAE,IAAI,EAAE,IAAI;gBAChB,GAAG,YAAY;aAClB,CAAC;QACN,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,MAAM,EACN,QAAQ,EACR,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI;gBAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;YAE9E,OAAO,YAAY,CAAC;QACxB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,~~IAAI,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,CAAC;gBAChC,~~OAAO,MAAM,CAAC~~,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC~~;~~YACjC,CAAC;YACD,OAAO,MAAM,CAAC;~~QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
1	+ {"version":3,"file":"reindex.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/reindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,oBAAoB,CAChC,MAAkC,EAClC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,MAAM,EAAE,IAAI,EAAE,MAAM;gBACpB,IAAI,EAAE,IAAI,EAAE,IAAI;gBAChB,GAAG,YAAY;aAClB,CAAC;QACN,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}

package/dist/src/client/method-helpers/search.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ClientParams, ClientMetadata } from '@terascope/types';
 export declare function convertSearchParams(params: ClientParams.SearchParams, distributionMeta: ClientMetadata): {
-    track_total_hits?: number | boolean | undefined;
+    track_total_hits: number | boolean | undefined;
     allow_no_indices?: boolean;
     allow_partial_search_results?: boolean;
     analyzer?: string;
@@ -46,6 +46,5 @@ export declare function convertSearchParams(params: ClientParams.SearchParams, d
     track_scores?: boolean;
     typed_keys?: boolean;
     version?: boolean;
-    type?: string | undefined;
 };
 //# sourceMappingURL=search.d.ts.map

package/dist/src/client/method-helpers/search.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/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~~"}
1	+ {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwCnC"}

package/dist/src/client/method-helpers/search.js CHANGED Viewed

@@ -1,9 +1,8 @@
 import { ElasticsearchDistribution } from '@terascope/types';
-import { isNumber, isNotNil } from '@terascope/utils';
+import { isNotNil } from '@terascope/utils';
 export function convertSearchParams(params, distributionMeta) {
     const { majorVersion, distribution, version } = distributionMeta;
-    const { type, track_total_hits, ...parsedParams } = params;
-    // includesExcludes(parsedParams);
+    const { track_total_hits, ...parsedParams } = params;
     qDependentFieldsCheck(parsedParams);
     const hasTotalConfig = isNotNil(track_total_hits);
     let trackTotal = track_total_hits;
@@ -17,16 +16,6 @@ export function convertSearchParams(params, distributionMeta) {
                 track_total_hits: trackTotal,
             };
         }
-        if (majorVersion === 6) {
-            if (hasTotalConfig && isNumber(track_total_hits)) {
-                trackTotal = true;
-            }
-            return {
-                ...(type !== undefined && { type }),
-                ...parsedParams,
-                ...hasTotalConfig && { track_total_hits: trackTotal }
-            };
-        }
     }
     if (distribution === ElasticsearchDistribution.opensearch) {
         if ([1, 2, 3].includes(majorVersion)) {

package/dist/src/client/method-helpers/search.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/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,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,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"}
1	+ {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,MAAM,UAAU,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,gBAAgB,EAChB,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,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;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,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/dist/src/client/method-helpers/tasksCancel.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { ElasticsearchDistribution } from '@terascope/types';
 export function convertTasksCancelParams(params, distributionMeta) {
     const { majorVersion, distribution, version } = distributionMeta;
     if (distribution === ElasticsearchDistribution.elasticsearch) {
-        if ([6, 7, 8].includes(majorVersion)) {
+        if ([7, 8].includes(majorVersion)) {
             return params;
         }
     }

package/dist/src/client/method-helpers/tasksCancel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tasksCancel.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksCancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,wBAAwB,CACpC,MAAsC,EACtC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,~~EAAE,~~CAAC,CAAC,~~CAAC,~~QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;~~YACnC~~,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
1	+ {"version":3,"file":"tasksCancel.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksCancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,wBAAwB,CACpC,MAAsC,EACtC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}

package/dist/src/client/method-helpers/tasksGet.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { ElasticsearchDistribution } from '@terascope/types';
 export function convertTasksGetParams(params, distributionMeta) {
     const { majorVersion, distribution, version } = distributionMeta;
     if (distribution === ElasticsearchDistribution.elasticsearch) {
-        if ([6, 7, 8].includes(majorVersion)) {
+        if ([7, 8].includes(majorVersion)) {
             return params;
         }
     }

package/dist/src/client/method-helpers/tasksGet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tasksGet.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,qBAAqB,CACjC,MAAmC,EACnC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,~~EAAE,~~CAAC,CAAC,~~CAAC,~~QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;~~YACnC~~,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
1	+ {"version":3,"file":"tasksGet.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,qBAAqB,CACjC,MAAmC,EACnC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}

package/dist/src/client/method-helpers/tasksList.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { ElasticsearchDistribution } from '@terascope/types';
 export function convertTasksListParams(params, distributionMeta) {
     const { majorVersion, distribution, version } = distributionMeta;
     if (distribution === ElasticsearchDistribution.elasticsearch) {
-        if ([6, 7, 8].includes(majorVersion)) {
+        if ([7, 8].includes(majorVersion)) {
             return params;
         }
     }

package/dist/src/client/method-helpers/tasksList.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tasksList.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,sBAAsB,CAClC,MAAoC,EACpC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,~~EAAE,~~CAAC,CAAC,~~CAAC,~~QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;~~YACnC~~,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
1	+ {"version":3,"file":"tasksList.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,sBAAsB,CAClC,MAAoC,EACpC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}

package/dist/src/client/method-helpers/update.d.ts CHANGED Viewed

@@ -1,31 +1,5 @@
 import { ClientParams, ClientMetadata } from '@terascope/types';
-export declare function convertUpdateParams(params: ClientParams.UpdateParams, distributionMeta: ClientMetadata): {
-    id: string;
-    index: string;
-    lang?: string;
-    refresh?: boolean;
-    require_alias?: boolean;
-    retry_on_conflict?: number;
-    routing?: string;
-    source_enabled?: boolean;
-    timeout?: string | number;
-    wait_for_active_shards?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").WaitForActiveShards;
-    _source?: boolean | string | string[];
-    _source_excludes?: string | string[];
-    _source_includes?: string | string[];
-    if_seq_no?: number;
-    if_primary_term?: number;
-    version?: number;
-    body?: {
-        detect_noop?: boolean;
-        doc?: unknown;
-        doc_as_upsert?: boolean;
-        script?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").Script;
-        scripted_upsert?: boolean;
-        _source?: boolean | import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").SearchSourceFilter;
-        upsert?: unknown;
-    } | undefined;
-} | {
+export declare function convertUpdateParams(params: ClientParams.UpdateParams, distributionMeta: ClientMetadata): ClientParams.UpdateParams<unknown, unknown> | {
     id: string;
     index: string;
     lang?: string;
@@ -48,32 +22,5 @@ export declare function convertUpdateParams(params: ClientParams.UpdateParams, d
     script?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").Script;
     scripted_upsert?: boolean;
     upsert?: unknown;
-} | {
-    id: string;
-    index: string;
-    lang?: string;
-    refresh?: boolean;
-    require_alias?: boolean;
-    retry_on_conflict?: number;
-    routing?: string;
-    source_enabled?: boolean;
-    timeout?: string | number;
-    wait_for_active_shards?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").WaitForActiveShards;
-    _source?: boolean | string | string[];
-    _source_excludes?: string | string[];
-    _source_includes?: string | string[];
-    if_seq_no?: number;
-    if_primary_term?: number;
-    version?: number;
-    body?: {
-        detect_noop?: boolean;
-        doc?: unknown;
-        doc_as_upsert?: boolean;
-        script?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").Script;
-        scripted_upsert?: boolean;
-        _source?: boolean | import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").SearchSourceFilter;
-        upsert?: unknown;
-    } | undefined;
-    type: string;
 };
 //# sourceMappingURL=update.d.ts.map

package/dist/src/client/method-helpers/update.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/update.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~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmDnC~~"}
1	+ {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/update.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;;;;;;;;;;;;;;;;;;;;;;;EAgCnC"}

package/dist/src/client/method-helpers/update.js CHANGED Viewed

@@ -3,28 +3,19 @@ export function convertUpdateParams(params, distributionMeta) {
     const { majorVersion, distribution, version } = distributionMeta;
     if (distribution === ElasticsearchDistribution.elasticsearch) {
         if (majorVersion === 8) {
-            const { type, body, ...parsedParams } = params;
+            const { body, ...parsedParams } = params;
             return {
                 ...body,
                 ...parsedParams
             };
         }
         if (majorVersion === 7) {
-            const { type, ...parsedParams } = params;
-            return parsedParams;
-        }
-        if (majorVersion === 6) {
-            const { type = '_doc', ...parsedParams } = params;
-            return {
-                type,
-                ...parsedParams
-            };
+            return params;
         }
     }
     if (distribution === ElasticsearchDistribution.opensearch) {
         if ([1, 2, 3].includes(majorVersion)) {
-            const { type, ...parsedParams } = params;
-            return parsedParams;
+            return params;
         }
     }
     throw new Error(`Unsupported ${distribution} version ${version}`);

package/dist/src/client/method-helpers/update.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/update.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,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,IAAI,EAAE,~~IAAI,EAAE,~~GAAG,YAAY,~~EAC9B~~,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,GAAG,IAAI;gBACP,GAAG,YAAY;aAClB,CAAC;QACN,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,~~MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,~~OAAO,~~YAAY,CAAC;QACxB,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,~~MAAM,~~EACF,IAAI,GAAG,MAAM,EAAE,GAAG,YAAY,EACjC,GAAG,MAAM,~~CAAC;~~YAEX~~,~~OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,~~CAAC;~~QACN,CAAC;~~IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,~~MAAM~~,~~EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,~~MAAM,CAAC;~~YAEX~~,~~OAAO,YAAY,~~CAAC;~~QACxB,CAAC;~~IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
1	+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/update.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,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,GAAG,IAAI;gBACP,GAAG,YAAY;aAClB,CAAC;QACN,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}

package/dist/src/test-helpers/config.js CHANGED Viewed

@@ -1,3 +1,3 @@
-const { TEST_INDEX_PREFIX = 'teratest_', ELASTICSEARCH_HOST = 'http://localhost:9200', ELASTICSEARCH_VERSION = '6.8.6', OPENSEARCH_PORT = '49210', OPENSEARCH_HOSTNAME = `http://localhost:${OPENSEARCH_PORT}`, OPENSEARCH_USER = 'admin', OPENSEARCH_PASSWORD = 'admin', OPENSEARCH_VERSION = '1.3.0', OPENSEARCH_HOST = `http://${OPENSEARCH_USER}:${OPENSEARCH_PASSWORD}@${OPENSEARCH_HOSTNAME}`, OPENSEARCH_SSL_HOST = `https://${OPENSEARCH_HOSTNAME}:${OPENSEARCH_PORT}`, RESTRAINED_OPENSEARCH_PORT = process.env.RESTRAINED_OPENSEARCH_PORT || '49206', RESTRAINED_OPENSEARCH_HOST = `http://${OPENSEARCH_USER}:${OPENSEARCH_PASSWORD}@localhost:${RESTRAINED_OPENSEARCH_PORT}`, } = process.env;
+const { TEST_INDEX_PREFIX = 'teratest_', ELASTICSEARCH_HOST = 'http://localhost:9200', ELASTICSEARCH_VERSION = '7.9.3', OPENSEARCH_PORT = '49210', OPENSEARCH_HOSTNAME = `http://localhost:${OPENSEARCH_PORT}`, OPENSEARCH_USER = 'admin', OPENSEARCH_PASSWORD = 'admin', OPENSEARCH_VERSION = '2.15.0', OPENSEARCH_HOST = `http://${OPENSEARCH_USER}:${OPENSEARCH_PASSWORD}@${OPENSEARCH_HOSTNAME}`, OPENSEARCH_SSL_HOST = `https://${OPENSEARCH_HOSTNAME}:${OPENSEARCH_PORT}`, RESTRAINED_OPENSEARCH_PORT = process.env.RESTRAINED_OPENSEARCH_PORT || '49206', RESTRAINED_OPENSEARCH_HOST = `http://${OPENSEARCH_USER}:${OPENSEARCH_PASSWORD}@localhost:${RESTRAINED_OPENSEARCH_PORT}`, } = process.env;
 export { TEST_INDEX_PREFIX, ELASTICSEARCH_HOST, ELASTICSEARCH_VERSION, OPENSEARCH_HOST, OPENSEARCH_SSL_HOST, OPENSEARCH_VERSION, RESTRAINED_OPENSEARCH_HOST, OPENSEARCH_USER, OPENSEARCH_PASSWORD };
 //# sourceMappingURL=config.js.map

package/dist/src/test-helpers/config.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/test-helpers/config.ts"],"names":[],"mappings":"AAAA,MAAM,EACF,iBAAiB,GAAG,WAAW,EAC/B,kBAAkB,GAAG,uBAAuB,EAC5C,qBAAqB,GAAG,OAAO,EAC/B,eAAe,GAAG,OAAO,EACzB,mBAAmB,GAAG,oBAAoB,eAAe,EAAE,EAC3D,eAAe,GAAG,OAAO,EACzB,mBAAmB,GAAG,OAAO,EAC7B,kBAAkB,GAAG,~~OAAO~~,~~EAC5B~~,eAAe,GAAG,UAAU,eAAe,IAAI,mBAAmB,IAAI,mBAAmB,EAAE,EAC3F,mBAAmB,GAAG,WAAW,mBAAmB,IAAI,eAAe,EAAE,EACzE,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,OAAO,EAC9E,0BAA0B,GAAG,UAAU,eAAe,IAAI,mBAAmB,cAAc,0BAA0B,EAAE,GAC1H,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,OAAO,EACH,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,0BAA0B,EAC1B,eAAe,EACf,mBAAmB,EACtB,CAAC"}
1	+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/test-helpers/config.ts"],"names":[],"mappings":"AAAA,MAAM,EACF,iBAAiB,GAAG,WAAW,EAC/B,kBAAkB,GAAG,uBAAuB,EAC5C,qBAAqB,GAAG,OAAO,EAC/B,eAAe,GAAG,OAAO,EACzB,mBAAmB,GAAG,oBAAoB,eAAe,EAAE,EAC3D,eAAe,GAAG,OAAO,EACzB,mBAAmB,GAAG,OAAO,EAC7B,kBAAkB,GAAG,QAAQ,EAC7B,eAAe,GAAG,UAAU,eAAe,IAAI,mBAAmB,IAAI,mBAAmB,EAAE,EAC3F,mBAAmB,GAAG,WAAW,mBAAmB,IAAI,eAAe,EAAE,EACzE,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,OAAO,EAC9E,0BAA0B,GAAG,UAAU,eAAe,IAAI,mBAAmB,cAAc,0BAA0B,EAAE,GAC1H,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,OAAO,EACH,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,0BAA0B,EAC1B,eAAe,EACf,mBAAmB,EACtB,CAAC"}

package/dist/src/test-helpers/elasticsearch.d.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 import { DataType } from '@terascope/data-types';
 import { ClientMetadata } from '@terascope/types';
 import { Client } from '../client/index.js';
-export declare const removeTypeTest: boolean;
 export declare function makeClient(rootCaPath?: string): Promise<Client>;
 export declare function cleanupIndex(client: any, index: string, template?: string): Promise<void>;
 /**
@@ -10,8 +9,8 @@ export declare function cleanupIndex(client: any, index: string, template?: stri
  * mechanisms use populateIndex. ( uses the bulk method under the hood )
  */
 export declare function upload(client: any, queryBody: any, data: any[]): Promise<Record<string, any>>;
-export declare function createMappingFromDatatype(client: Client, dataType: DataType, type?: string, overrides?: {}): any;
-export declare function populateIndex(client: Client, index: string, dataType: DataType, records: any[], type?: string): Promise<void>;
+export declare function createMappingFromDatatype(client: Client, dataType: DataType, overrides?: {}): any;
+export declare function populateIndex(client: Client, index: string, dataType: DataType, records: any[]): Promise<void>;
 /**
  * Formats data for use with the upload function.
  *

package/dist/src/test-helpers/elasticsearch.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"elasticsearch.d.ts","sourceRoot":"","sources":["../../../src/test-helpers/elasticsearch.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAA6B,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAgB,MAAM,EAAwB,MAAM,oBAAoB,CAAC;~~AAUhF~~,~~eAAO,MAAM,cAAc,SAAwC,CAAC;AAEpE,~~wBAAsB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoCrE;AAED,wBAAsB,YAAY,CAC9B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAC9C,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;GAIG;AACH,wBAAsB,MAAM,CACxB,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GACzC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAS9B;AAED,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,~~IAAI,~~SAAS,~~EACb,SAAS,~~KAAK,OAMjB;AAED,wBAAsB,aAAa,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,GAAG,EAAE,~~EACd~~,~~IAAI,SAAS,GACd,~~OAAO,CAAC,IAAI,CAAC,~~CAmCf~~;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC5B,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,gBAAgB,UAAQ,GACrD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,~~CAuBvB~~;AAED,yDAAyD;AACzD,wBAAsB,WAAW,CAC7B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,SAAO,GAC1D,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACrD,IAAI,EAAE,MAAM,CAAC;CAChB;AAYD,wBAAgB,oBAAoB,IAAI,iBAAiB,CAoCxD;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;;;EAMnF"}
1	+ {"version":3,"file":"elasticsearch.d.ts","sourceRoot":"","sources":["../../../src/test-helpers/elasticsearch.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAA6B,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAgB,MAAM,EAAwB,MAAM,oBAAoB,CAAC;AAQhF,wBAAsB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoCrE;AAED,wBAAsB,YAAY,CAC9B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAC9C,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;GAIG;AACH,wBAAsB,MAAM,CACxB,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GACzC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAS9B;AAED,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,KAAK,OAMjB;AAED,wBAAsB,aAAa,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,GAAG,EAAE,GACf,OAAO,CAAC,IAAI,CAAC,CAkCf;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC5B,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,gBAAgB,UAAQ,GACrD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAmBvB;AAED,yDAAyD;AACzD,wBAAsB,WAAW,CAC7B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,SAAO,GAC1D,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACrD,IAAI,EAAE,MAAM,CAAC;CAChB;AAYD,wBAAgB,oBAAoB,IAAI,iBAAiB,CAoCxD;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;;;EAMnF"}

package/dist/src/test-helpers/elasticsearch.js CHANGED Viewed

@@ -4,9 +4,6 @@ import { ElasticsearchDistribution } from '@terascope/types';
 import { createClient } from '../client/index.js';
 import { getClientMetadata, fixMappingRequest } from '../utils/index.js';
 import { ELASTICSEARCH_HOST, ELASTICSEARCH_VERSION, OPENSEARCH_HOST, OPENSEARCH_VERSION, RESTRAINED_OPENSEARCH_HOST, OPENSEARCH_SSL_HOST, OPENSEARCH_PASSWORD, OPENSEARCH_USER } from './config.js';
-const semver = ELASTICSEARCH_VERSION.split('.').map(toNumber);
-const isOpensearchTest = process.env.TEST_OPENSEARCH != null;
-export const removeTypeTest = isOpensearchTest || (semver[0] === 8);
 export async function makeClient(rootCaPath) {
     let host;
     let esConfig = {};
@@ -77,19 +74,19 @@ export async function upload(client, queryBody, data) {
     const query = Object.assign({ refresh: 'wait_for', body }, safeQueryBody);
     return client.bulk(query);
 }
-export function createMappingFromDatatype(client, dataType, type = '_doc', overrides = {}) {
+export function createMappingFromDatatype(client, dataType, overrides = {}) {
     const metaData = getClientMetadata(client);
-    const mapping = dataType.toESMapping({ typeName: type, overrides, ...metaData });
+    const mapping = dataType.toESMapping({ overrides, ...metaData });
     return fixMappingRequest(client, { body: mapping }, false);
 }
-export async function populateIndex(client, index, dataType, records, type = '_doc') {
+export async function populateIndex(client, index, dataType, records) {
     const overrides = {
         settings: {
             'index.number_of_shards': 1,
             'index.number_of_replicas': 0,
         },
     };
-    const mapping = createMappingFromDatatype(client, dataType, type, overrides);
+    const mapping = createMappingFromDatatype(client, dataType, overrides);
     await client.indices.create({
         index,
         wait_for_active_shards: 'all',
@@ -98,7 +95,6 @@ export async function populateIndex(client, index, dataType, records, type = '_d
     const body = formatUploadData(index, records);
     const results = await client.bulk({
         index,
-        type,
         body,
         refresh: true
     });
@@ -127,9 +123,6 @@ export function formatUploadData(index, data, apiCompatibility = false) {
     const results = [];
     data.forEach((record) => {
         const meta = { _index: index };
-        if (!removeTypeTest) {
-            meta._type = '_doc';
-        }
         if (DataEntity.isDataEntity(record) && record.getKey()) {
             meta._id = record.getKey();
         }

package/dist/src/test-helpers/elasticsearch.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"elasticsearch.js","sourceRoot":"","sources":["../../../src/test-helpers/elasticsearch.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EACjC,IAAI,EAAE,OAAO,EAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAkB,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAgC,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACH,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,EAC1D,kBAAkB,EAAE,0BAA0B,EAAE,mBAAmB,EACnE,mBAAmB,EAAE,eAAe,EACvC,MAAM,aAAa,CAAC;AAErB,MAAM,~~MAAM,GAAG,qBAAqB,~~CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC9D,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI,CAAC;AAC7D,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AAEpE,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,UAAmB;IAChD,IAAI,IAAY,CAAC;IACjB,IAAI,QAAQ,GAAiB,EAAE,CAAC;IAEhC,4BAA4B;IAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC;QACzC,IAAI,GAAG,0BAA0B,CAAC;IACtC,CAAC;SAAM,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QACrC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,eAAe,CAAC;IAClF,CAAC;SAAM,CAAC;QACJ,IAAI,GAAG,kBAAkB,CAAC;IAC9B,CAAC;IAED,4CAA4C;IAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;QAChE,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YAChD,MAAM,IAAI,OAAO,CAAC,4DAA4D,CAAC,CAAC;QACpF,CAAC;QAED,IAAI,CAAC;YACD,QAAQ,GAAG;gBACP,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,eAAe;gBACzB,QAAQ,EAAE,mBAAmB;gBAC7B,aAAa,EAAE,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC;aAClD,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,OAAO,CAAC,wDAAwD,EAAE,GAAG,CAAC,CAAC;QACrF,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,QAAQ,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEhD,OAAO,MAA2B,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,MAAW,EAAE,KAAa,EAAE,QAAiB;IAE7C,MAAM,MAAM,CAAC,OAAO;SACf,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;SACjB,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;QAChB,oCAAoC;QACpC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAC1C,IAAI,OAAO,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;YAC7B,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC,CAAC,CAAC;IAEP,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,MAAM,CAAC,OAAO;aACf,cAAc,CAAC;YACZ,IAAI,EAAE,QAAQ;SACjB,CAAC;aACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;YAChB,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;YAC1C,IAAI,OAAO,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;gBAC7B,MAAM,GAAG,CAAC;YACd,CAAC;QACL,CAAC,CAAC,CAAC;IACX,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CACxB,MAAW,EAAE,SAAc,EAAE,IAAW;IAExC,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,EAAE,GAAG,SAAS,CAAC;IAC7C,MAAM,IAAI,GAAG,gBAAgB,CACzB,aAAa,CAAC,KAAe,EAAE,IAAI,CACtC,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;IAE1E,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,yBAAyB,CACrC,MAAc,EACd,QAAkB,EAClB,~~IAAI,GAAG,MAAM,EACb,~~SAAS,GAAG,EAAE;IAEd,MAAM,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,EAAE,~~QAAQ,EAAE,IAAI,EAAE,~~SAAS,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;~~IAEjF~~,OAAO,iBAAiB,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAC/B,MAAc,EACd,KAAa,EACb,QAAkB,EAClB,OAAc~~,EACd,IAAI,GAAG,MAAM~~;~~IAEb~~,MAAM,SAAS,GAAG;QACd,QAAQ,EAAE;YACN,wBAAwB,EAAE,CAAC;YAC3B,0BAA0B,EAAE,CAAC;SAChC;KACJ,CAAC;IAEF,MAAM,OAAO,GAAG,yBAAyB,CACrC,MAAM,EAAE,QAAQ,EAAE,~~IAAI,EAAE,~~SAAS,~~CACpC~~,CAAC;IAEF,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACxB,KAAK;QACL,sBAAsB,EAAE,KAAK;QAC7B,GAAG,OAAO;KACb,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAE9C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC;QAC9B,KAAK;QACL,IAAI;QACJ,~~IAAI;QACJ,~~OAAO,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACnC,IAAI,QAAQ,EAAE,KAAK,EAAE,KAAK;gBAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,+CAA+C,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC;AACL,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,gBAAgB,CAC5B,KAAa,EAAE,IAAW,EAAE,gBAAgB,GAAG,KAAK;IAEpD,MAAM,OAAO,GAAU,EAAE,CAAC;IAE1B,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACpB,MAAM,IAAI,GAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAEpC,IAAI,~~CAAC,cAAc,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;QACxB,CAAC;QAED,IAAI,~~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"}
1	+ {"version":3,"file":"elasticsearch.js","sourceRoot":"","sources":["../../../src/test-helpers/elasticsearch.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/elasticsearch.d.ts CHANGED Viewed

@@ -2,7 +2,6 @@ import { ESFieldType, ESTypeMapping, ClientMetadata, ESMapping } from '@terascop
 import type { Client } from '../client/index.js';
 export declare function getClientVersion(client: Client): number;
 export declare function getClientMetadata(client: Client): ClientMetadata;
-export declare function isElasticsearch6(client: Client): boolean;
 export declare function isElasticsearch8(client: Client): boolean;
 export declare function isOpensearch(client: Client): boolean;
 export declare function isOpensearch1(client: Client): boolean;

package/dist/src/utils/elasticsearch.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"elasticsearch.d.ts","sourceRoot":"","sources":["../../../src/utils/elasticsearch.ts"],"names":[],"mappings":"AACA,OAAO,EACH,WAAW,EAAE,aAAa,EAAE,cAAc,EACf,SAAS,EACvC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAahE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,wBAAgB,~~gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,wBAAgB,~~YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGpD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AACD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAGD,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,UAAU,EAAE,OAAO,GACjG,GAAG,CAqDL;AAED;;EAEE;AACF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAEpF;;;EAGE;AACF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,CA6BlF"}
1	+ {"version":3,"file":"elasticsearch.d.ts","sourceRoot":"","sources":["../../../src/utils/elasticsearch.ts"],"names":[],"mappings":"AACA,OAAO,EACH,WAAW,EAAE,aAAa,EAAE,cAAc,EACf,SAAS,EACvC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAahE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGpD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AACD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAGD,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,UAAU,EAAE,OAAO,GACjG,GAAG,CAqDL;AAED;;EAEE;AACF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAEpF;;;EAGE;AACF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,CA6BlF"}

package/dist/src/utils/elasticsearch.js CHANGED Viewed

@@ -22,11 +22,6 @@ export function getClientMetadata(client) {
         minorVersion
     };
 }
-export function isElasticsearch6(client) {
-    const { distribution, version: esVersion } = getClientMetadata(client);
-    const parsedVersion = ts.toNumber(esVersion.split('.', 1)[0]);
-    return distribution === ElasticsearchDistribution.elasticsearch && parsedVersion === 6;
-}
 export function isElasticsearch8(client) {
     const { distribution, version: esVersion } = getClientMetadata(client);
     const parsedVersion = ts.toNumber(esVersion.split('.', 1)[0]);

package/dist/src/utils/elasticsearch.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"elasticsearch.js","sourceRoot":"","sources":["../../../src/utils/elasticsearch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAEH,yBAAyB,EAC5B,MAAM,kBAAkB,CAAC;AAG1B,MAAM,UAAU,gBAAgB,CAAC,MAAc;IAC3C,MAAM,gBAAgB,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,gBAAgB,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,EAAE,KAAK,CAAC,CAAC;IAE1F,IAAI,OAAO,IAAI,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC7C,OAAO,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC5C,MAAM,gBAAgB,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,gBAAgB,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,EAAE,KAAK,CAAC,CAAC;IAC1F,MAAM,YAAY,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,aAAa,CAAC,CAAC;IACpG,uCAAuC;IACvC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAEjF,OAAO;QACH,YAAY;QACZ,OAAO;QACP,YAAY;QACZ,YAAY;KACf,CAAC;AACN,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAc;IAC3C,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,OAAO,YAAY,KAAK,yBAAyB,CAAC,aAAa,IAAI,aAAa,KAAK,CAAC,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,~~gBAAgB,CAAC,MAAc;IAC3C,MAAM,EAAE,~~YAAY,~~EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,iBAAiB,~~CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,OAAO,YAAY,KAAK,yBAAyB,CAAC,aAAa,IAAI,aAAa,KAAK,CAAC,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAc;IACvC,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACnD,OAAO,YAAY,KAAK,yBAAyB,CAAC,UAAU,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAc;IACxC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,OAAO,YAAY,KAAK,yBAAyB,CAAC,UAAU,IAAI,aAAa,KAAK,CAAC,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAc;IACxC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,OAAO,YAAY,KAAK,yBAAyB,CAAC,UAAU,IAAI,aAAa,KAAK,CAAC,CAAC;AACxF,CAAC;AACD,MAAM,UAAU,aAAa,CAAC,MAAc;IACxC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,OAAO,YAAY,KAAK,yBAAyB,CAAC,UAAU,IAAI,aAAa,KAAK,CAAC,CAAC;AACxF,CAAC;AAED,yCAAyC;AACzC,MAAM,UAAU,iBAAiB,CAC7B,MAAc,EAAE,OAA2D,EAAE,UAAmB;IAEhG,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,aAAa,GAAQ,EAAE,CAAC;IAE9B,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAEzC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;QAC/B,IAAI,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC;YACnD,MAAM,CAAC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;QAC5E,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,+BAA+B;IAC/B,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QAChB,MAAM,QAAQ,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC;QAC9C,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxC,sFAAsF;YACtF,oFAAoF;YACpF,wFAAwF;YACxF,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAEvC,IAAI,CAAC,OAAO,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,iBAAiB,EAAE,CAAC;gBACtE,mCAAmC;gBACnC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBACrI,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACzB,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;wBACd,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC3D,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACvB,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAED,wFAAwF;QACxF,IAAI,OAAO,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YACjC,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBAC7B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBAC5C,IAAI,WAAW,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;wBAClC,OAAO,WAAW,CAAC,IAAI,CAAC;oBAC5B,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;iBAAM,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACvB,+DAA+D;gBAC/D,OAAO,QAAQ,CAAC,IAAI,CAAC;YACzB,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAOD;;;EAGE;AACF,MAAM,UAAU,yBAAyB,CAAC,MAAqB;IAC3D,MAAM,MAAM,GAAsB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QAC7C,MAAM,EACF,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,KAAK,EACpC,GAAG,MAAM,CAAC,KAA4B,CAAiB,CAAC;QAEzD,sEAAsE;QACtE,8DAA8D;QAC9D,MAAM,IAAI,GAAgB,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;QAE3D,MAAM,WAAW,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvD,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC;YACnC,CAAC,CAAC,CAAC,IAAI,CAAC;YACR,CAAC,CAAC;gBACE,IAAI;gBACJ,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;aAC9B,CAAC;QAEN,kCAAkC;QAClC,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,YAAY,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;YAC3D,KAAK,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrE,MAAM,CAAC,GAAG,KAAK,IAAI,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC;YACrD,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
1	+ {"version":3,"file":"elasticsearch.js","sourceRoot":"","sources":["../../../src/utils/elasticsearch.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@terascope/opensearch-client",
   "displayName": "Opensearch Client",
-  "version": "2.0.0-dev.4",
+  "version": "2.0.0-dev.5",
   "description": "A Node.js facade client for opensearch & elasticsearch.",
   "homepage": "https://github.com/terascope/teraslice/tree/master/packages/opensearch-client#readme",
   "bugs": {
@@ -22,19 +22,17 @@
     "build:watch": "yarn build --watch",
     "test": "TEST_ELASTICSEARCH='true' node ../scripts/bin/ts-scripts test ../opensearch-client --",
     "test:debug": "TEST_ELASTICSEARCH='true' node ../scripts/bin/ts-scripts test --debug ../opensearch-client --",
-    "test:elasticsearch6": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='6.8.6' node ../scripts/bin/ts-scripts test ../opensearch-client --",
     "test:elasticsearch7": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' node ../scripts/bin/ts-scripts test ../opensearch-client --",
     "test:elasticsearch8": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='8.1.2' node ../scripts/bin/ts-scripts test ../opensearch-client --",
-    "test:opensearch1": "TEST_OPENSEARCH='true' node ../scripts/bin/ts-scripts test ../opensearch-client --",
+    "test:opensearch1": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION='1.3.11' node ../scripts/bin/ts-scripts test ../opensearch-client --",
     "test:opensearch2": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION='2.15.0' node ../scripts/bin/ts-scripts test ../opensearch-client --",
     "test:opensearch3": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION='3.1.0' node ../scripts/bin/ts-scripts test ../opensearch-client --",
     "test:watch": "ts-scripts yarn workspace @terascope/scripts test --watch ../opensearch-client --"
   },
   "dependencies": {
-    "@terascope/data-types": "~2.0.0-dev.4",
-    "@terascope/types": "~2.0.0-dev.4",
-    "@terascope/utils": "~2.0.0-dev.4",
-    "elasticsearch6": "npm:@elastic/elasticsearch@~6.8.0",
+    "@terascope/data-types": "~2.0.0-dev.5",
+    "@terascope/types": "~2.0.0-dev.5",
+    "@terascope/utils": "~2.0.0-dev.5",
     "elasticsearch7": "npm:@elastic/elasticsearch@~7.17.0",
     "elasticsearch8": "npm:@elastic/elasticsearch@~8.15.0",
     "opensearch1": "npm:@opensearch-project/opensearch@~1.2.0",