@sasjs/adapter 3.7.6 → 3.7.9

package/node/utils/convertToCsv.d.ts

@@ -2,8 +2,6 @@
  * Converts the given JSON object array to a CSV string.
  * @param data - the array of JSON objects to convert.
  */
-export declare const convertToCSV: (data: any[], sasFormats?: {
-    formats: {
-        [key: string]: string;
-    };
-} | undefined) => string;
+export declare const convertToCSV: (data: {
+    [key: string]: any;
+}, tableName: string) => string;

package/package.json

@@ -43,23 +43,23 @@
     "@types/axios": "0.14.0",
     "@types/express": "4.17.13",
     "@types/form-data": "2.5.0",
-    "@types/jest": "27.0.2",
+    "@types/jest": "27.4.0",
     "@types/mime": "2.0.3",
     "@types/pem": "1.9.6",
     "@types/tough-cookie": "4.0.1",
     "copyfiles": "2.4.1",
     "cp": "0.2.0",
-    "dotenv": "10.0.0",
-    "express": "4.17.1",
+    "dotenv": "16.0.0",
+    "express": "4.17.3",
     "jest": "27.4.7",
     "jest-extended": "2.0.0",
     "node-polyfill-webpack-plugin": "1.1.4",
     "path": "0.12.7",
-    "pem": "1.14.4",
+    "pem": "1.14.6",
     "process": "0.11.10",
     "rimraf": "3.0.2",
     "semantic-release": "18.0.0",
-    "terser-webpack-plugin": "5.3.0",
+    "terser-webpack-plugin": "5.3.1",
     "ts-jest": "27.1.3",
     "ts-loader": "9.2.6",
     "tslint": "6.1.3",
@@ -67,18 +67,18 @@
     "typedoc": "0.22.11",
     "typedoc-neo-theme": "1.1.1",
     "typedoc-plugin-external-module-name": "4.0.6",
-    "typescript": "4.5.4",
-    "webpack": "5.66.0",
-    "webpack-cli": "4.7.2"
+    "typescript": "4.5.5",
+    "webpack": "5.69.0",
+    "webpack-cli": "4.9.2"
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "2.35.0",
+    "@sasjs/utils": "2.36.1",
     "axios": "0.26.0",
     "axios-cookiejar-support": "1.0.1",
     "form-data": "4.0.0",
     "https": "1.0.0",
     "tough-cookie": "4.0.0"
   },
-  "version": "3.7.6"
+  "version": "3.7.9"
 }

package/src/api/viya/uploadTables.ts

@@ -18,7 +18,7 @@ export async function uploadTables(
   const uploadedFiles = []
 
   for (const tableName in data) {
-    const csv = convertToCSV(data[tableName])
+    const csv = convertToCSV(data, tableName)
     if (csv === 'ERROR: LARGE STRING LENGTH') {
       throw new Error(
         'The max length of a string value in SASjs is 32765 characters.'

package/src/auth/getAccessTokenForViya.ts

@@ -1,6 +1,5 @@
 import { SasAuthResponse } from '@sasjs/utils/types'
 import { prefixMessage } from '@sasjs/utils/error'
-import * as NodeFormData from 'form-data'
 import { RequestClient } from '../request/RequestClient'
 
 /**
@@ -24,26 +23,17 @@ export async function getAccessTokenForViya(
     token = Buffer.from(clientId + ':' + clientSecret).toString('base64')
   }
   const headers = {
-    Authorization: 'Basic ' + token
+    Authorization: 'Basic ' + token,
+    Accept: 'application/json'
   }
 
-  let formData
-  if (typeof FormData === 'undefined') {
-    formData = new NodeFormData()
-  } else {
-    formData = new FormData()
-  }
-  formData.append('grant_type', 'authorization_code')
-  formData.append('code', authCode)
+  const data = new URLSearchParams({
+    grant_type: 'authorization_code',
+    code: authCode
+  })
 
   const authResponse = await requestClient
-    .post(
-      url,
-      formData,
-      undefined,
-      'multipart/form-data; boundary=' + (formData as any)._boundary,
-      headers
-    )
+    .post(url, data, undefined, 'application/x-www-form-urlencoded', headers)
     .then((res) => res.result as SasAuthResponse)
     .catch((err) => {
       throw prefixMessage(err, 'Error while getting access token. ')

package/src/file/generateFileUploadForm.ts

@@ -18,7 +18,7 @@ export const generateFileUploadForm = (
     if (!Array.isArray(data[tableName])) continue
 
     const name = tableName
-    const csv = convertToCSV(data[tableName])
+    const csv = convertToCSV(data, tableName)
 
     if (csv === 'ERROR: LARGE STRING LENGTH') {
       throw new Error(

package/src/file/generateTableUploadForm.ts

@@ -9,18 +9,24 @@ export const generateTableUploadForm = (
   const sasjsTables = []
   const requestParams: any = {}
   let tableCounter = 0
+
   for (const tableName in data) {
     tableCounter++
+
     sasjsTables.push(tableName)
-    const csv = convertToCSV(data[tableName])
+
+    const csv = convertToCSV(data, tableName)
+
     if (csv === 'ERROR: LARGE STRING LENGTH') {
       throw new Error(
         'The max length of a string value in SASjs is 32765 characters.'
       )
     }
+
     // if csv has length more then 16k, send in chunks
     if (csv.length > 16000) {
       const csvChunks = splitChunks(csv)
+
       // append chunks to form data with same key
       csvChunks.map((chunk) => {
         formData.append(`sasjs${tableCounter}data`, chunk)
@@ -29,6 +35,7 @@ export const generateTableUploadForm = (
       requestParams[`sasjs${tableCounter}data`] = csv
     }
   }
+
   requestParams['sasjs_tables'] = sasjsTables.join(' ')
 
   return { formData, requestParams }

package/src/job-execution/Sas9JobExecutor.ts

@@ -125,7 +125,8 @@ const generateFileUploadForm = (
 ): NodeFormData => {
   for (const tableName in data) {
     const name = tableName
-    const csv = convertToCSV(data[tableName])
+    const csv = convertToCSV(data, tableName)
+
     if (csv === 'ERROR: LARGE STRING LENGTH') {
       throw new Error(
         'The max length of a string value in SASjs is 32765 characters.'

package/src/job-execution/WebJobExecutor.ts

@@ -208,7 +208,7 @@ export class WebJobExecutor extends BaseJobExecutor {
           }
 
           const responseObject = appendExtraResponseAttributes(
-            { result: jsonResponse },
+            { result: jsonResponse, log: parsedSasjsServerLog },
             extraResponseAttributes
           )
           resolve(responseObject)

package/src/utils/convertToCsv.ts

@@ -3,10 +3,18 @@
  * @param data - the array of JSON objects to convert.
  */
 export const convertToCSV = (
-  data: any[],
-  sasFormats?: { formats: { [key: string]: string } }
+  data: { [key: string]: any },
+  tableName: string
 ) => {
-  let formats = sasFormats?.formats
+  if (!data[tableName]) {
+    throw new Error('No table provided to be converted to CSV')
+  }
+
+  const table = data[tableName]
+
+  if (!Array.isArray(table)) return ''
+
+  let formats = data[`$${tableName}`]?.formats
   let headers: string[] = []
   let csvTest
   let invalidString = false
@@ -16,14 +24,14 @@ export const convertToCSV = (
     headers = Object.keys(formats).map((key) => `${key}:${formats![key]}`)
   }
 
-  const headerFields = Object.keys(data[0])
+  const headerFields = Object.keys(table[0])
 
   headerFields.forEach((field) => {
     if (!formats || !Object.keys(formats).includes(field)) {
       let hasNullOrNumber = false
       let hasSpecialMissingString = false
 
-      data.forEach((row: { [key: string]: any }) => {
+      table.forEach((row: { [key: string]: any }) => {
         if (row[field] === null || typeof row[field] === 'number') {
           hasNullOrNumber = true
         } else if (
@@ -45,7 +53,7 @@ export const convertToCSV = (
         let hasMixedTypes: boolean = false
         let rowNumError: number = -1
 
-        const longestValueForField = data
+        const longestValueForField = table
           .map((row: any, index: number) => {
             if (row[field] || row[field] === '') {
               if (firstFoundType) {
@@ -101,7 +109,7 @@ export const convertToCSV = (
     }
   })
 
-  if (sasFormats) {
+  if (formats) {
     headers = headers.sort(
       (a, b) =>
         headerFields.indexOf(a.replace(/:.*/, '')) -
@@ -111,7 +119,7 @@ export const convertToCSV = (
 
   if (invalidString) return 'ERROR: LARGE STRING LENGTH'
 
-  csvTest = data.map((row: any) => {
+  csvTest = table.map((row: any) => {
     const fields = Object.keys(row).map((fieldName, index) => {
       let value
       const currentCell = row[fieldName]

package/src/utils/formatDataForRequest.ts

@@ -15,19 +15,24 @@ export const formatDataForRequest = (data: any) => {
     }
 
     tableCounter++
+
     sasjsTables.push(tableName)
-    const csv = convertToCSV(data[tableName], data[`$${tableName}`])
+
+    const csv = convertToCSV(data, tableName)
 
     if (csv === 'ERROR: LARGE STRING LENGTH') {
       throw new Error(
         'The max length of a string value in SASjs is 32765 characters.'
       )
     }
+
     // if csv has length more then 16k, send in chunks
     if (csv.length > 16000) {
       const csvChunks = splitChunks(csv)
+
       // append chunks to form data with same key
       result[`sasjs${tableCounter}data0`] = csvChunks.length
+
       csvChunks.forEach((chunk, index) => {
         result[`sasjs${tableCounter}data${index + 1}`] = chunk
       })

package/utils/convertToCsv.d.ts

@@ -2,8 +2,6 @@
  * Converts the given JSON object array to a CSV string.
  * @param data - the array of JSON objects to convert.
  */
-export declare const convertToCSV: (data: any[], sasFormats?: {
-    formats: {
-        [key: string]: string;
-    };
-} | undefined) => string;
+export declare const convertToCSV: (data: {
+    [key: string]: any;
+}, tableName: string) => string;