teraslice-client-js 1.0.0 → 1.1.0

package/jest.config.js

@@ -8,37 +8,4 @@ const module = await import(configModulePath);
 
 const config = module.default(dirPath);
 
-config.extensionsToTreatAsEsm = ['.ts'];
-config.moduleNameMapper = {
-    '^(\\.{1,2}/.*)\\.js$': '$1',
-};
-config.testTimeout = 60 * 1000;
-
-// using swc for some reason throws rust file not found errors,
-// seems like a bug on their end, hope to change back later
-config.transform = {};
-config.transform['^.+\\.(t|j)sx?$'] = ['@swc/jest', {
-    jsc: {
-        loose: true,
-        parser: {
-            syntax: 'typescript',
-            tsx: false,
-            decorators: true
-        },
-        transform: {
-            legacyDecorator: true,
-            decoratorMetadata: true
-        },
-        target: 'esnext'
-    },
-    module: {
-        type: 'es6',
-        strictMode: false,
-        noInterop: false,
-        ignoreDynamic: true
-    }
-}];
-
-config.transformIgnorePatterns = [];
-config.preset = '';
 export default config;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "teraslice-client-js",
     "displayName": "Teraslice Client (JavaScript)",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "A Node.js client for teraslice jobs, assets, and cluster references.",
     "keywords": [
         "elasticsearch",
@@ -32,17 +32,17 @@
         "test:watch": "ts-scripts test --watch . --"
     },
     "dependencies": {
-        "@terascope/types": "^1.0.0",
-        "@terascope/utils": "^1.0.0",
+        "@terascope/types": "^1.1.0",
+        "@terascope/utils": "^1.1.0",
         "auto-bind": "^4.0.0",
         "got": "^11.8.3"
     },
     "devDependencies": {
-        "nock": "^13.5.1"
+        "nock": "^13.5.5"
     },
     "engines": {
-        "node": ">=14.17.0",
-        "yarn": ">=1.16.0"
+        "node": ">=18.18.0",
+        "yarn": ">=1.22.19"
     },
     "publishConfig": {
         "access": "public",

package/src/job.ts

@@ -101,6 +101,10 @@ export default class Job extends Client {
         return this.update(body);
     }
 
+    async deleteJob(): Promise<Teraslice.JobConfig> {
+        return this.delete(`/jobs/${this._jobId}`);
+    }
+
     async execution(requestOptions: RequestOptions = {}): Promise<Teraslice.ExecutionConfig> {
         return this.get(`/jobs/${this._jobId}/ex`, requestOptions);
     }

package/src/jobs.ts

@@ -1,4 +1,4 @@
-import { isString, TSError } from '@terascope/utils';
+import { TSError } from '@terascope/utils';
 import { Teraslice } from '@terascope/types';
 import autoBind from 'auto-bind';
 import Client from './client.js';
@@ -26,10 +26,9 @@ export default class Jobs extends Client {
     }
 
     async list(
-        status?: Teraslice.JobListStatusQuery,
+        query?: Teraslice.JobSearchParams,
         searchOptions: SearchOptions = {}
     ): Promise<Teraslice.JobConfig[]> {
-        const query = _parseListOptions(status);
         return this.get('/jobs', this.makeOptions(query, searchOptions));
     }
 
@@ -41,10 +40,3 @@ export default class Jobs extends Client {
         return new Job(this._config, jobId);
     }
 }
-
-function _parseListOptions(options?: Teraslice.JobListStatusQuery): Teraslice.JobSearchParams {
-    // support legacy
-    if (!options) return { status: '*' };
-    if (isString(options)) return { status: options };
-    return options;
-}

package/test/job-spec.ts

@@ -325,7 +325,7 @@ describe('Teraslice Job', () => {
                 _context: 'job',
                 job_id: 'some-job-id',
                 _created: 'hello',
-                _updated: 'hello',
+                _updated: 'hello'
             };
 
             beforeEach(() => {
@@ -360,7 +360,7 @@ describe('Teraslice Job', () => {
                 _context: 'job',
                 job_id: 'some-job-id',
                 _created: 'hello',
-                _updated: 'hello',
+                _updated: 'hello'
             };
 
             const expected = {
@@ -383,6 +383,21 @@ describe('Teraslice Job', () => {
         });
     });
 
+    describe('->deleteJob', () => {
+        describe('when called', () => {
+            beforeEach(() => {
+                scope.delete('/jobs/some-other-job-id')
+                    .reply(200, { job_id: 'some-other-job-id', _deleted: true });
+            });
+
+            it('should resolve json results from Teraslice', async () => {
+                const job = new Job({ baseUrl }, 'some-other-job-id');
+                const results = await job.deleteJob();
+                expect(results).toEqual({ job_id: 'some-other-job-id', _deleted: true });
+            });
+        });
+    });
+
     describe('->exId', () => {
         describe('when called with nothing', () => {
             beforeEach(() => {

package/test/jobs-spec.ts

@@ -170,7 +170,6 @@ describe('Teraslice Jobs', () => {
         describe('when called with nothing', () => {
             beforeEach(() => {
                 scope.get('/jobs')
-                    .query({ status: '*' })
                     .reply(200, list);
             });
 
@@ -180,22 +179,9 @@ describe('Teraslice Jobs', () => {
             });
         });
 
-        describe('when called with a string', () => {
-            beforeEach(() => {
-                scope.get('/jobs')
-                    .query({ status: Teraslice.ExecutionStatusEnum.running })
-                    .reply(200, list);
-            });
-
-            it('should resolve json result from Teraslice', async () => {
-                const results = await jobs.list(Teraslice.ExecutionStatusEnum.running);
-                expect(results).toEqual(list);
-            });
-        });
-
-        describe('when called with an object', () => {
+        describe('when called with an query and search objects', () => {
             const searchOptions = { headers: { 'Some-Header': 'yes' } };
-            const queryOptions = { status: Teraslice.ExecutionStatusEnum.running, size: 10 };
+            const queryOptions = { active: true } as const;
 
             beforeEach(() => {
                 scope.get('/jobs')

package/tsconfig.json

@@ -1,8 +1,6 @@
 {
     "extends": "../../tsconfig",
     "compilerOptions": {
-        "target": "ESNext",
-        "module": "ESNext",
         "outDir": "dist",
         "rootDir": "."
     },

package/.eslintrc.json

@@ -1,14 +0,0 @@
-{
-    "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":[]
-}