@sasjs/adapter 3.10.14 → 3.10.16

package/node/utils/createAxiosInstance.d.ts

@@ -1,2 +1,2 @@
 import * as https from 'https';
-export declare const createAxiosInstance: (baseURL: string, httpsAgent?: https.Agent | undefined) => import("axios").AxiosInstance;
+export declare const createAxiosInstance: (baseURL: string, httpsAgent?: https.Agent) => import("axios").AxiosInstance;

package/node/utils/parseWeboutResponse.d.ts

@@ -1 +1 @@
-export declare const parseWeboutResponse: (response: string, url?: string | undefined) => string;
+export declare const parseWeboutResponse: (response: string, url?: string) => string;

package/package.json

@@ -67,14 +67,12 @@
     "semantic-release": "19.0.3",
     "terser-webpack-plugin": "5.3.1",
     "ts-jest": "27.1.3",
-    "ts-loader": "9.2.6",
+    "ts-loader": "9.4.0",
     "tslint": "6.1.3",
     "tslint-config-prettier": "1.18.0",
-    "typedoc": "0.22.11",
-    "typedoc-neo-theme": "1.1.1",
-    "typedoc-plugin-external-module-name": "4.0.6",
+    "typedoc": "0.23.15",
     "typedoc-plugin-rename-defaults": "0.4.0",
-    "typescript": "4.5.5",
+    "typescript": "4.8.3",
     "webpack": "5.69.0",
     "webpack-cli": "4.9.2"
   },
@@ -87,5 +85,5 @@
     "https": "1.0.0",
     "tough-cookie": "4.0.0"
   },
-  "version": "3.10.14"
+  "version": "3.10.16"
 }

package/src/SASjs.ts

@@ -846,7 +846,11 @@ export default class SASjs {
   }
 
   public async executeJobSASjs(query: ExecutionQuery, authConfig?: AuthConfig) {
-    return await this.sasJSApiClient?.executeJob(query, authConfig)
+    return await this.sasJSApiClient?.executeJob(
+      query,
+      this.sasjsConfig.appLoc,
+      authConfig
+    )
   }
 
   /**

package/src/SASjsApiClient.ts

@@ -3,7 +3,6 @@ import { ExecutionQuery } from './types'
 import { RequestClient } from './request/RequestClient'
 import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
 import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
-import { parseWeboutResponse, SASJS_LOGS_SEPARATOR } from './utils'
 import { getTokens } from './auth/getTokens'
 
 export class SASjsApiClient {
@@ -42,23 +41,25 @@ export class SASjsApiClient {
     return Promise.resolve(result)
   }
 
-  public async executeJob(query: ExecutionQuery, authConfig?: AuthConfig) {
+  public async executeJob(
+    query: ExecutionQuery,
+    appLoc: string,
+    authConfig?: AuthConfig
+  ) {
     const access_token = authConfig ? authConfig.access_token : undefined
 
-    const { result } = await this.requestClient.post<{
-      status: string
-      message: string
-      log?: string
-      logPath?: string
-      error?: {}
-      _webout?: string
-    }>('SASjsApi/stp/execute', query, access_token)
-
-    if (Object.keys(result).includes('_webout')) {
-      result._webout = parseWeboutResponse(result._webout!)
-    }
+    let _program
+    if (query._program.startsWith('/')) {
+      _program = query._program
+    } else _program = `${appLoc}/${query._program}`
 
-    return Promise.resolve(result)
+    const response: any = await this.requestClient.post(
+      'SASjsApi/stp/execute',
+      { _debug: 131, ...query, _program },
+      access_token
+    )
+
+    return { result: response.result, log: response.log }
   }
 
   /**
@@ -88,9 +89,6 @@ export class SASjsApiClient {
       .then((res: any) => {
         if (res.log) parsedSasjsServerLog = res.log
       })
-      .catch((err) => {
-        parsedSasjsServerLog = err
-      })
 
     return parsedSasjsServerLog
   }

package/utils/createAxiosInstance.d.ts

@@ -1,2 +1,2 @@
 import * as https from 'https';
-export declare const createAxiosInstance: (baseURL: string, httpsAgent?: https.Agent | undefined) => import("axios").AxiosInstance;
+export declare const createAxiosInstance: (baseURL: string, httpsAgent?: https.Agent) => import("axios").AxiosInstance;

package/utils/parseWeboutResponse.d.ts

@@ -1 +1 @@
-export declare const parseWeboutResponse: (response: string, url?: string | undefined) => string;
+export declare const parseWeboutResponse: (response: string, url?: string) => string;