fix: make ErrorBody interface public

So it could be used as a type in client

package-lock.json

@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
-        "@sasjs/utils": "2.42.0",
+        "@sasjs/utils": "2.36.1",
         "axios": "0.26.0",
         "axios-cookiejar-support": "1.0.1",
         "form-data": "4.0.0",
@@ -1142,9 +1142,9 @@
       }
     },
     "node_modules/@sasjs/utils": {
-      "version": "2.42.0",
+      "version": "2.36.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.42.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.36.1.tgz",
-      "integrity": "sha512-Y69l89PYNF/h9xvVH72om/39xA+cY80bhiVLzp/fJb3BlvzCf4RNswBBanUOv2I5JNa7gPpJuE7mEiXOlhD3eg==",
+      "integrity": "sha512-JkGUpLOODsvkeU+S25jb9k2WnvzyD2w6cEk7YyQ/byuqKL8xawH91PPWegrVcJlDY8WmqKE4CPcA3d1mM3B3LA==",
       "hasInstallScript": true,
       "dependencies": {
         "@types/fs-extra": "9.0.13",
@@ -13870,9 +13870,9 @@
       }
     },
     "@sasjs/utils": {
-      "version": "2.42.0",
+      "version": "2.36.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.42.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.36.1.tgz",
-      "integrity": "sha512-Y69l89PYNF/h9xvVH72om/39xA+cY80bhiVLzp/fJb3BlvzCf4RNswBBanUOv2I5JNa7gPpJuE7mEiXOlhD3eg==",
+      "integrity": "sha512-JkGUpLOODsvkeU+S25jb9k2WnvzyD2w6cEk7YyQ/byuqKL8xawH91PPWegrVcJlDY8WmqKE4CPcA3d1mM3B3LA==",
       "requires": {
         "@types/fs-extra": "9.0.13",
         "@types/prompts": "2.0.13",

package.json

@@ -72,7 +72,7 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "2.42.0",
+    "@sasjs/utils": "2.36.1",
     "axios": "0.26.0",
     "axios-cookiejar-support": "1.0.1",
     "form-data": "4.0.0",

src/SASjs.ts

@@ -5,7 +5,8 @@ import {
   EditContextInput,
   PollOptions,
   LoginMechanism,
-  ExecutionQuery
+  ExecutionQuery,
+  FileTree
 } from './types'
 import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
@@ -16,8 +17,7 @@ import {
   MacroVar,
   AuthConfig,
   ExtraResponseAttributes,
-  SasAuthResponse,
+  SasAuthResponse
-  ServicePackSASjs
 } from '@sasjs/utils/types'
 import { RequestClient } from './request/RequestClient'
 import { SasjsRequestClient } from './request/SasjsRequestClient'
@@ -134,7 +134,7 @@ export default class SASjs {
 
   /**
    * Gets compute contexts.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
    */
   public async getComputeContexts(accessToken: string) {
     this.isMethodSupported('getComputeContexts', [ServerType.SasViya])
@@ -144,7 +144,7 @@ export default class SASjs {
 
   /**
    * Gets launcher contexts.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
    */
   public async getLauncherContexts(accessToken: string) {
     this.isMethodSupported('getLauncherContexts', [ServerType.SasViya])
@@ -163,7 +163,7 @@ export default class SASjs {
 
   /**
    * Gets executable compute contexts.
-   * @param authConfig - an access token, refresh token, client and secret for an authorised user.
+   * @param authConfig - an access token, refresh token, client and secret for an authorized user.
    */
   public async getExecutableContexts(authConfig: AuthConfig) {
     this.isMethodSupported('getExecutableContexts', [ServerType.SasViya])
@@ -177,8 +177,8 @@ export default class SASjs {
    * @param launchContextName - the name of the launcher context used by the compute service.
    * @param sharedAccountId - the ID of the account to run the servers for this context as.
    * @param autoExecLines - the lines of code to execute during session initialization.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
-   * @param authorisedUsers - an optional list of authorised user IDs.
+   * @param authorizedUsers - an optional list of authorized user IDs.
    */
   public async createComputeContext(
     contextName: string,
@@ -186,7 +186,7 @@ export default class SASjs {
     sharedAccountId: string,
     autoExecLines: string[],
     accessToken: string,
-    authorisedUsers?: string[]
+    authorizedUsers?: string[]
   ) {
     this.isMethodSupported('createComputeContext', [ServerType.SasViya])
 
@@ -196,7 +196,7 @@ export default class SASjs {
       sharedAccountId,
       autoExecLines,
       accessToken,
-      authorisedUsers
+      authorizedUsers
     )
   }
 
@@ -205,7 +205,7 @@ export default class SASjs {
    * @param contextName - the name of the context to be created.
    * @param description - the description of the context to be created.
    * @param launchType - launch type of the context to be created.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
    */
   public async createLauncherContext(
     contextName: string,
@@ -227,7 +227,7 @@ export default class SASjs {
    * Updates a compute context on the given server.
    * @param contextName - the original name of the context to be deleted.
    * @param editedContext - an object with the properties to be updated.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
    */
   public async editComputeContext(
     contextName: string,
@@ -246,7 +246,7 @@ export default class SASjs {
   /**
    * Deletes a compute context on the given server.
    * @param contextName - the name of the context to be deleted.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
    */
   public async deleteComputeContext(contextName: string, accessToken?: string) {
     this.isMethodSupported('deleteComputeContext', [ServerType.SasViya])
@@ -261,7 +261,7 @@ export default class SASjs {
    * Returns a JSON representation of a compute context.
    * @example: { "createdBy": "admin", "links": [...], "id": "ID", "version": 2, "name": "context1" }
    * @param contextName - the name of the context to return.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
    */
   public async getComputeContextByName(
     contextName: string,
@@ -278,7 +278,7 @@ export default class SASjs {
   /**
    * Returns a JSON representation of a compute context.
    * @param contextId - an id of the context to return.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
    */
   public async getComputeContextById(contextId: string, accessToken?: string) {
     this.isMethodSupported('getComputeContextById', [ServerType.SasViya])
@@ -888,21 +888,20 @@ export default class SASjs {
 
   /**
    * Creates the folders and services at the given location `appLoc` on the given server `serverUrl`.
-   * @param dataJson - the JSON specifying the folders and files to be created, can also includes
+   * @param members - the JSON specifying the folders and services to be created.
-   * appLoc, streamServiceName, streamWebFolder, streamLogo
+   * @param appLoc - the base folder in which to create the new folders and
-   * @param appLoc - (optional) the base folder in which to create the new folders and
+   * services.  If not provided, is taken from SASjsConfig.
-   * services.  If not provided, is taken from SASjsConfig. Precedence will be of appLoc present in dataJson.
+   * @param authConfig - a valid client, secret, refresh and access tokens that are authorised to execute compute jobs.
-   * @param authConfig - (optional) a valid client, secret, refresh and access tokens that are authorised to execute compute jobs.
    */
   public async deployToSASjs(
-    dataJson: ServicePackSASjs,
+    members: FileTree,
     appLoc?: string,
     authConfig?: AuthConfig
   ) {
     if (!appLoc) {
       appLoc = this.sasjsConfig.appLoc
     }
-    return await this.sasJSApiClient?.deploy(dataJson, appLoc, authConfig)
+    return await this.sasJSApiClient?.deploy(members, appLoc, authConfig)
   }
 
   public async executeJobSASjs(query: ExecutionQuery) {
@@ -973,7 +972,7 @@ export default class SASjs {
   /**
    * Fetches content of the log file
    * @param logUrl - url of the log file.
-   * @param accessToken - an access token for an authorised user.
+   * @param accessToken - an access token for an authorized user.
    */
   public async fetchLogFileContent(logUrl: string, accessToken?: string) {
     return await this.requestClient!.get(logUrl, accessToken).then((res) => {
@@ -1095,8 +1094,13 @@ export default class SASjs {
     }
 
     if (this.sasjsConfig.serverType === ServerType.Sasjs) {
-      if (!this.sasJSApiClient) {
+      if (this.sasJSApiClient) {
-        this.sasJSApiClient = new SASjsApiClient(this.requestClient)
+        this.sasJSApiClient.setConfig(this.sasjsConfig.serverUrl)
+      } else {
+        this.sasJSApiClient = new SASjsApiClient(
+          this.sasjsConfig.serverUrl,
+          this.requestClient
+        )
       }
     }
 

src/SASjsApiClient.ts

@@ -1,5 +1,5 @@
-import { AuthConfig, ServerType, ServicePackSASjs } from '@sasjs/utils/types'
+import { AuthConfig, ServerType } from '@sasjs/utils/types'
-import { ExecutionQuery } from './types'
+import { FileTree, ExecutionQuery } from './types'
 import { RequestClient } from './request/RequestClient'
 import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
 import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
@@ -8,10 +8,17 @@ import { parseWeboutResponse } from './utils'
 import { getTokens } from './auth/getTokens'
 
 export class SASjsApiClient {
-  constructor(private requestClient: RequestClient) {}
+  constructor(
+    private serverUrl: string,
+    private requestClient: RequestClient
+  ) {}
+
+  public setConfig(serverUrl: string) {
+    if (serverUrl) this.serverUrl = serverUrl
+  }
 
   public async deploy(
-    dataJson: ServicePackSASjs,
+    members: FileTree,
     appLoc: string,
     authConfig?: AuthConfig
   ) {
@@ -23,17 +30,13 @@ export class SASjsApiClient {
         ServerType.Sasjs
       ))
     }
-
-    dataJson.appLoc = dataJson.appLoc || appLoc
-
     const { result } = await this.requestClient.post<{
       status: string
       message: string
-      streamServiceName?: string
       example?: {}
     }>(
       'SASjsApi/drive/deploy',
-      dataJson,
+      { fileTree: members, appLoc: appLoc },
       access_token,
       undefined,
       {},

src/file/generateFileUploadForm.ts

@@ -26,18 +26,11 @@ export const generateFileUploadForm = (
       )
     }
 
-    if (typeof FormData === 'undefined' && formData instanceof NodeFormData) {
+    const file = new Blob([csv], {
-      formData.append(name, csv, {
+      type: 'application/csv'
-        filename: `${name}.csv`,
+    })
-        contentType: 'application/csv'
-      })
-    } else {
-      const file = new Blob([csv], {
-        type: 'application/csv'
-      })
 
-      formData.append(name, file, `${name}.csv`)
+    formData.append(name, file, `${name}.csv`)
-    }
   }
 
   return formData

src/types/FileTree.ts

@@ -0,0 +1,47 @@
+export interface FileTree {
+  members: [FolderMember, ServiceMember]
+}
+
+export enum MemberType {
+  folder = 'folder',
+  service = 'service'
+}
+
+export interface FolderMember {
+  name: string
+  type: MemberType.folder
+  members: [FolderMember, ServiceMember]
+}
+
+export interface ServiceMember {
+  name: string
+  type: MemberType.service
+  code: string
+}
+
+export const isFileTree = (arg: any): arg is FileTree =>
+  arg &&
+  arg.members &&
+  Array.isArray(arg.members) &&
+  arg.members.filter(
+    (member: FolderMember | ServiceMember) =>
+      !isFolderMember(member) && !isServiceMember(member)
+  ).length === 0
+
+const isFolderMember = (arg: any): arg is FolderMember =>
+  arg &&
+  typeof arg.name === 'string' &&
+  arg.type === MemberType.folder &&
+  arg.members &&
+  Array.isArray(arg.members) &&
+  arg.members.filter(
+    (member: FolderMember | ServiceMember) =>
+      !isFolderMember(member) && !isServiceMember(member)
+  ).length === 0
+
+const isServiceMember = (arg: any): arg is ServiceMember =>
+  arg &&
+  typeof arg.name === 'string' &&
+  arg.type === MemberType.service &&
+  arg.code &&
+  typeof arg.code === 'string'

src/types/errors/ErrorResponse.ts

@@ -21,7 +21,7 @@ export class ErrorResponse {
   }
 }
 
-interface ErrorBody {
+export interface ErrorBody {
   message: string
   details: string
   raw: any

src/types/errors/index.ts

@@ -11,3 +11,4 @@ export * from './RootFolderNotFoundError'
 export * from './JsonParseArrayError'
 export * from './WeboutResponseError'
 export * from './InvalidJsonError'
+export * from './ErrorResponse'

src/types/index.ts

@@ -12,4 +12,5 @@ export * from './Session'
 export * from './UploadFile'
 export * from './PollOptions'
 export * from './WriteStream'
+export * from './FileTree'
 export * from './ExecuteScript'

src/utils/parseViyaDebugResponse.ts

@@ -16,15 +16,10 @@ export const parseSasViyaDebugResponse = async (
   requestClient: RequestClient,
   serverUrl: string
 ) => {
-  // On viya 3.5, iframe is like <iframe style="width: 99%; height: 500px" src="..."></iframe>
-  // On viya 4, iframe is like <iframe style="width: 99%; height: 500px; background-color:Canvas;" src=...></iframe>
-
   const iframeStart = response.split(
-    /<iframe style="width: 99%; height: 500px" src="|<iframe style="width: 99%; height: 500px; background-color:Canvas;" src=/
+    '<iframe style="width: 99%; height: 500px" src="'
   )[1]
-  const jsonUrl = iframeStart
+  const jsonUrl = iframeStart ? iframeStart.split('"></iframe>')[0] : null
-    ? iframeStart.split(/"><\/iframe>|><\/iframe>/)[0]
-    : null
   if (!jsonUrl) {
     throw new Error('Unable to find webout file URL.')
   }