@terascope/elasticsearch-api 3.21.0 → 4.0.0

package/.eslintrc.json

@@ -0,0 +1,14 @@
+{
+    "extends": "@terascope",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "rules": {
+        "@typescript-eslint/naming-convention": "off",
+        "@typescript-eslint/no-duplicate-enum-values": "warn",
+        "import/extensions": "off",
+        "import/no-import-module-exports": "off"
+    },
+    "ignorePatterns":[]
+}

package/README.md

@@ -4,7 +4,7 @@
 
 > Elasticsearch client api used across multiple services, handles retries and exponential backoff
 
-This a package within the [Teraslice](https://github.com/terascope/teraslice) monorepo. See our [documentation](https://terascope.github.io/teraslice/docs/packages/elasticsearch-api/overview) for more information or the [issues](https://github.com/terascope/teraslice/issues?q=is%3Aopen+is%3Aissue+label%3Apkg%2Felasticsearch-api) associated with this package
+This is a package within the [Teraslice](https://github.com/terascope/teraslice) monorepo. See our [documentation](https://terascope.github.io/teraslice/docs/packages/elasticsearch-api/overview) for more information or the [issues](https://github.com/terascope/teraslice/issues?q=is%3Aopen+is%3Aissue+label%3Apkg%2Felasticsearch-api) associated with this package
 
 ## Contributing
 

package/index.js

@@ -1,28 +1,26 @@
 /* eslint-disable camelcase */
 
-'use strict';
-
 // polyfill because opensearch has references to an api that won't exist
 // on the client side, should be able to remove in the future
-require('setimmediate');
-
-const Promise = require('bluebird');
-const {
+import Promise from 'bluebird';
+import {
     isTest, TSError, isFatalError,
     parseError, getBackoffDelay, isRetryableError,
     get, toNumber, isString, isSimpleObject,
     castArray, flatten, toBoolean,
     uniq, random, cloneDeep, DataEntity,
     isDeepEqual, getTypeOf, isProd
-} = require('@terascope/utils');
-const { ElasticsearchDistribution } = require('@terascope/types');
+} from '@terascope/utils';
+import { ElasticsearchDistribution } from '@terascope/types';
+
+import('setimmediate');
 
 const DOCUMENT_EXISTS = 409;
 const TOO_MANY_REQUESTS = 429;
 
 // Module to manage persistence in Elasticsearch.
 // All functions in this module return promises that must be resolved to get the final result.
-module.exports = function elasticsearchApi(client, logger, _opConfig) {
+export default function elasticsearchApi(client, logger, _opConfig) {
     const config = _opConfig || {};
     if (!client) {
         throw new Error('Elasticsearch API requires client');
@@ -1288,4 +1286,4 @@ module.exports = function elasticsearchApi(client, logger, _opConfig) {
         getESVersion,
         isErrorRetryable
     };
-};
+}

package/jest.config.js

@@ -1,3 +1,20 @@
-'use strict';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
 
-module.exports = require('../../jest.config.base')(__dirname);
+const dirPath = fileURLToPath(new URL('.', import.meta.url));
+const configModulePath = path.join(dirPath, '../../jest.config.base.js');
+
+const module = await import(configModulePath);
+
+const config = module.default(dirPath);
+
+config.extensionsToTreatAsEsm = ['.ts'];
+config.moduleNameMapper = {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+};
+config.testTimeout = 60 * 1000;
+config.transform = {};
+
+config.transform['^.+\\.(t|j)sx?$'] = '@swc/jest';
+
+export default config;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@terascope/elasticsearch-api",
     "displayName": "Elasticsearch API",
-    "version": "3.21.0",
+    "version": "4.0.0",
     "description": "Elasticsearch client api used across multiple services, handles retries and exponential backoff",
     "homepage": "https://github.com/terascope/teraslice/tree/master/packages/elasticsearch-api#readme",
     "bugs": {
@@ -10,6 +10,7 @@
     "repository": "git@github.com:terascope/teraslice.git",
     "license": "MIT",
     "author": "Terascope, LLC <info@terascope.io>",
+    "type": "module",
     "main": "index.js",
     "typings": "types/index.d.ts",
     "scripts": {
@@ -23,8 +24,8 @@
         "test:watch": "TEST_RESTRAINED_ELASTICSEARCH='true' ts-scripts test --watch . --"
     },
     "dependencies": {
-        "@terascope/types": "^0.18.0",
-        "@terascope/utils": "^0.60.0",
+        "@terascope/types": "^1.0.0",
+        "@terascope/utils": "^1.0.0",
         "bluebird": "^3.7.2",
         "setimmediate": "^1.0.5"
     },
@@ -32,7 +33,7 @@
         "@opensearch-project/opensearch": "^1.2.0",
         "@types/elasticsearch": "^5.0.43",
         "elasticsearch": "^15.4.1",
-        "elasticsearch-store": "^0.85.0",
+        "elasticsearch-store": "^1.0.0",
         "elasticsearch6": "npm:@elastic/elasticsearch@^6.7.0",
         "elasticsearch7": "npm:@elastic/elasticsearch@^7.0.0",
         "elasticsearch8": "npm:@elastic/elasticsearch@^8.0.0"

package/test/api-spec.js

@@ -1,10 +1,8 @@
-'use strict';
-
-const Promise = require('bluebird');
-const {
-    debugLogger, cloneDeep, DataEntity, isEmpty
-} = require('@terascope/utils');
-const esApi = require('..');
+import {
+    debugLogger, cloneDeep, DataEntity,
+    isEmpty, pDelay
+} from '@terascope/utils';
+import esApi from '../index.js';
 
 describe('elasticsearch-api', () => {
     let recordsReturned = [];
@@ -66,11 +64,12 @@ describe('elasticsearch-api', () => {
         };
     }
 
-    function waitFor(time, fn) {
-        return new Promise((resolve) => setTimeout(() => {
-            if (fn) fn();
-            resolve(true);
-        }, time));
+    async function waitFor(time, fn) {
+        await pDelay(time);
+        if (fn) {
+            fn();
+        }
+        return true;
     }
 
     function postedData(action, id) {

package/test/bulk-send-dlq-spec.js

@@ -1,12 +1,7 @@
-'use strict';
-
-const {
-    debugLogger,
-    cloneDeep,
-    DataEntity
-} = require('@terascope/utils');
-const { ElasticsearchTestHelpers } = require('elasticsearch-store');
-const elasticsearchAPI = require('../index');
+import { jest } from '@jest/globals';
+import { debugLogger, cloneDeep, DataEntity } from '@terascope/utils';
+import { ElasticsearchTestHelpers } from 'elasticsearch-store';
+import elasticsearchAPI from '../index.js';
 
 const {
     makeClient, cleanupIndex, EvenDateData,

package/test/bulk-send-limit-spec.js

@@ -1,12 +1,7 @@
-'use strict';
-
-const {
-    debugLogger,
-    chunk,
-    pMap
-} = require('@terascope/utils');
-const { ElasticsearchTestHelpers } = require('elasticsearch-store');
-const elasticsearchAPI = require('../index');
+import { jest } from '@jest/globals';
+import { debugLogger, chunk, pMap } from '@terascope/utils';
+import { ElasticsearchTestHelpers } from 'elasticsearch-store';
+import elasticsearchAPI from '../index.js';
 
 const {
     makeClient, cleanupIndex, waitForData,

package/test/retry-spec.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const { ElasticsearchTestHelpers } = require('elasticsearch-store');
-const { debugLogger } = require('@terascope/utils');
-const opensearch = require('@opensearch-project/opensearch');
-const API = require('../index');
+import { ElasticsearchTestHelpers } from 'elasticsearch-store';
+import { debugLogger } from '@terascope/utils';
+import opensearch from '@opensearch-project/opensearch';
+import API from '../index.js';
 
 const logger = debugLogger('retry spec');
 const port = '1111';