From dadce3d4c93de228718c57035abe2e9a2a80b89d Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Thu, 10 Jun 2021 14:22:31 +0200 Subject: [PATCH] chore: added extra attributes type from @sasjs/utils --- package-lock.json | 8 ++++---- package.json | 2 +- src/SASjs.ts | 2 +- src/job-execution/JesJobExecutor.ts | 2 +- src/job-execution/JobExecutor.ts | 2 +- src/types/ExtraResponseAttributes.ts | 6 ------ 6 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 src/types/ExtraResponseAttributes.ts diff --git a/package-lock.json b/package-lock.json index eecafd0..789b688 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1253,11 +1253,11 @@ } }, "@sasjs/utils": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.18.0.tgz", - "integrity": "sha512-6VTbRP1KU0gGi1mSIHl+XyL9Vqk8rBW7a7VQOF6vzD+AVgfgYd0t76djAUCcA7Dos8NJXAoDUuah+iNvXJY+cw==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.20.0.tgz", + "integrity": "sha512-PBJswfumyejsb8wJQpSZ96zFEEeJ+AlpxWXhz9uT9D8bNCStfCd75E1JdV71RwxdavsKiGMSSh5UcGDyehFA4w==", "requires": { - "@types/prompts": "^2.0.11", + "@types/prompts": "^2.0.13", "chalk": "^4.1.1", "cli-table": "^0.3.6", "consola": "^2.15.0", diff --git a/package.json b/package.json index c226a51..7dab86f 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ }, "main": "index.js", "dependencies": { - "@sasjs/utils": "^2.18.0", + "@sasjs/utils": "^2.20.0", "axios": "^0.21.1", "axios-cookiejar-support": "^1.0.1", "form-data": "^4.0.0", diff --git a/src/SASjs.ts b/src/SASjs.ts index 013bf7f..3a3e555 100644 --- a/src/SASjs.ts +++ b/src/SASjs.ts @@ -14,7 +14,7 @@ import { Sas9JobExecutor } from './job-execution' import { ErrorResponse } from './types/errors' -import { ExtraResponseAttributes } from './types/ExtraResponseAttributes' +import { ExtraResponseAttributes } from '@sasjs/utils/types' const defaultConfig: SASjsConfig = { serverUrl: '', diff --git a/src/job-execution/JesJobExecutor.ts b/src/job-execution/JesJobExecutor.ts index b64006c..ce82083 100644 --- a/src/job-execution/JesJobExecutor.ts +++ b/src/job-execution/JesJobExecutor.ts @@ -5,7 +5,7 @@ import { JobExecutionError, LoginRequiredError } from '../types/errors' -import { ExtraResponseAttributes } from '../types/ExtraResponseAttributes' +import { ExtraResponseAttributes } from '@sasjs/utils/types' import { BaseJobExecutor } from './JobExecutor' export class JesJobExecutor extends BaseJobExecutor { diff --git a/src/job-execution/JobExecutor.ts b/src/job-execution/JobExecutor.ts index bc91a46..48b2dd9 100644 --- a/src/job-execution/JobExecutor.ts +++ b/src/job-execution/JobExecutor.ts @@ -1,6 +1,6 @@ import { ServerType } from '@sasjs/utils/types' import { SASjsRequest } from '../types' -import { ExtraResponseAttributes } from '../types/ExtraResponseAttributes' +import { ExtraResponseAttributes } from '@sasjs/utils/types' import { asyncForEach, parseGeneratedCode, parseSourceCode } from '../utils' export type ExecuteFunction = () => Promise diff --git a/src/types/ExtraResponseAttributes.ts b/src/types/ExtraResponseAttributes.ts deleted file mode 100644 index 1d9b837..0000000 --- a/src/types/ExtraResponseAttributes.ts +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Represents a SASjs request parameter that will select which attributes are wanted in - * response object on top of default `webout` object. - * - */ -export type ExtraResponseAttributes = 'file' | 'data' | 'output' | null