@sasjs/adapter 4.5.1 → 4.6.0

package/node/request/SasjsRequestClient.d.ts

@@ -1,6 +1,6 @@
 import { RequestClient } from './RequestClient';
 import { AxiosResponse } from 'axios';
-interface SasjsParsedResponse<T> {
+export interface SasjsParsedResponse<T> {
     result: T;
     log: string;
     etag: string;
@@ -15,4 +15,4 @@ export declare class SasjsRequestClient extends RequestClient {
     getHeaders: (accessToken: string | undefined, contentType: string) => any;
     protected parseResponse<T>(response: AxiosResponse<any>): SasjsParsedResponse<T>;
 }
-export {};
+export declare const SASJS_LOGS_SEPARATOR = "SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784";

package/node/utils/index.d.ts

@@ -2,7 +2,6 @@ export * from './appendExtraResponseAttributes';
 export * from './asyncForEach';
 export * from './compareTimestamps';
 export * from './convertToCsv';
-export * from './constants';
 export * from './createAxiosInstance';
 export * from './delay';
 export * from './fetchLogByChunks';

package/package.json

@@ -84,5 +84,5 @@
     "https": "1.0.0",
     "tough-cookie": "4.1.3"
   },
-  "version": "4.5.1"
+  "version": "4.6.0"
 }

package/request/SasjsRequestClient.d.ts

@@ -1,6 +1,6 @@
 import { RequestClient } from './RequestClient';
 import { AxiosResponse } from 'axios';
-interface SasjsParsedResponse<T> {
+export interface SasjsParsedResponse<T> {
     result: T;
     log: string;
     etag: string;
@@ -15,4 +15,4 @@ export declare class SasjsRequestClient extends RequestClient {
     getHeaders: (accessToken: string | undefined, contentType: string) => any;
     protected parseResponse<T>(response: AxiosResponse<any>): SasjsParsedResponse<T>;
 }
-export {};
+export declare const SASJS_LOGS_SEPARATOR = "SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784";

package/request/spec/SasjsRequestClient.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/src/job-execution/FileUploader.ts

@@ -1,8 +1,7 @@
 import {
   getValidJson,
   parseSasViyaDebugResponse,
-  parseWeboutResponse,
-  SASJS_LOGS_SEPARATOR
+  parseWeboutResponse
 } from '../utils'
 import { UploadFile } from '../types/UploadFile'
 import {

package/src/request/SasjsRequestClient.ts

@@ -1,8 +1,7 @@
 import { RequestClient } from './RequestClient'
 import { AxiosResponse } from 'axios'
-import { SASJS_LOGS_SEPARATOR } from '../utils'
 
-interface SasjsParsedResponse<T> {
+export interface SasjsParsedResponse<T> {
   result: T
   log: string
   etag: string
@@ -45,13 +44,30 @@ export class SasjsRequestClient extends RequestClient {
       }
     } catch {
       if (response.data.includes(SASJS_LOGS_SEPARATOR)) {
-        const splittedResponse = response.data.split(SASJS_LOGS_SEPARATOR)
+        const { data } = response
+        const splittedResponse: string[] = data.split(SASJS_LOGS_SEPARATOR)
 
-        webout = splittedResponse[0]
+        webout = splittedResponse.splice(0, 1)[0]
         if (webout !== undefined) parsedResponse = webout
 
-        log = splittedResponse[1]
-        printOutput = splittedResponse[2]
+        // log can contain nested logs
+        const logs = splittedResponse.splice(0, splittedResponse.length - 1)
+
+        // tests if string ends with SASJS_LOGS_SEPARATOR
+        const endingWithLogSepRegExp = new RegExp(`${SASJS_LOGS_SEPARATOR}$`)
+
+        // at this point splittedResponse can contain only one item
+        const lastChunk = splittedResponse[0]
+
+        if (lastChunk) {
+          // if the last chunk doesn't end with SASJS_LOGS_SEPARATOR, then it is a printOutput
+          // else the last chunk is part of the log and has to be joined
+          if (!endingWithLogSepRegExp.test(data)) printOutput = lastChunk
+          else if (logs.length > 1) logs.push(lastChunk)
+        }
+
+        // join logs into single log with SASJS_LOGS_SEPARATOR
+        log = logs.join(SASJS_LOGS_SEPARATOR)
       } else {
         parsedResponse = response.data
       }
@@ -59,7 +75,7 @@ export class SasjsRequestClient extends RequestClient {
 
     const returnResult: SasjsParsedResponse<T> = {
       result: parsedResponse as T,
-      log,
+      log: log || '',
       etag,
       status: response.status
     }
@@ -69,3 +85,6 @@ export class SasjsRequestClient extends RequestClient {
     return returnResult
   }
 }
+
+export const SASJS_LOGS_SEPARATOR =
+  'SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784'

package/src/utils/index.ts

@@ -2,7 +2,6 @@ export * from './appendExtraResponseAttributes'
 export * from './asyncForEach'
 export * from './compareTimestamps'
 export * from './convertToCsv'
-export * from './constants'
 export * from './createAxiosInstance'
 export * from './delay'
 export * from './fetchLogByChunks'

package/utils/index.d.ts

@@ -2,7 +2,6 @@ export * from './appendExtraResponseAttributes';
 export * from './asyncForEach';
 export * from './compareTimestamps';
 export * from './convertToCsv';
-export * from './constants';
 export * from './createAxiosInstance';
 export * from './delay';
 export * from './fetchLogByChunks';

package/node/utils/constants.d.ts

@@ -1 +0,0 @@
-export declare const SASJS_LOGS_SEPARATOR = "SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784";

package/src/utils/constants.ts

@@ -1,2 +0,0 @@
-export const SASJS_LOGS_SEPARATOR =
-  'SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784'

package/utils/constants.d.ts

@@ -1 +0,0 @@
-export declare const SASJS_LOGS_SEPARATOR = "SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784";