@sasjs/adapter 3.10.3 → 3.10.6

package/node/utils/convertToCsv.d.ts

@@ -5,3 +5,8 @@
 export declare const convertToCSV: (data: {
     [key: string]: any;
 }, tableName: string) => string;
+/**
+ * Checks if table is table of formats (table name should start from '$' character).
+ * @param tableName - table name.
+ */
+export declare const isFormatsTable: (tableName: string) => boolean;

package/package.json

@@ -64,7 +64,7 @@
     "prettier": "2.7.1",
     "process": "0.11.10",
     "rimraf": "3.0.2",
-    "semantic-release": "18.0.0",
+    "semantic-release": "19.0.3",
     "terser-webpack-plugin": "5.3.1",
     "ts-jest": "27.1.3",
     "ts-loader": "9.2.6",
@@ -87,5 +87,5 @@
     "https": "1.0.0",
     "tough-cookie": "4.0.0"
   },
-  "version": "3.10.3"
+  "version": "3.10.6"
 }

package/src/auth/AuthManager.ts

@@ -23,7 +23,7 @@ export class AuthManager {
         ? '/SASLogon/logout?'
         : this.serverType === ServerType.SasViya
         ? '/SASLogon/logout.do?'
-        : '/SASjsApi/auth/logout'
+        : '/SASLogon/logout'
   }
 
   /**
@@ -334,19 +334,9 @@ export class AuthManager {
 
   /**
    * Logs out of the configured SAS server.
-   * @param accessToken - an optional access token is required for SASjs server type.
+   *
    */
   public async logOut() {
-    if (this.serverType === ServerType.Sasjs) {
-      return this.requestClient
-        .delete(this.logoutUrl)
-        .catch(() => true)
-        .finally(() => {
-          this.requestClient.clearLocalStorageTokens()
-          return true
-        })
-    }
-
     this.requestClient.clearCsrfTokens()
 
     return this.requestClient.get(this.logoutUrl, undefined).then(() => true)

package/src/file/generateTableUploadForm.ts

@@ -1,5 +1,5 @@
 import * as NodeFormData from 'form-data'
-import { convertToCSV } from '../utils/convertToCsv'
+import { convertToCSV, isFormatsTable } from '../utils/convertToCsv'
 import { splitChunks } from '../utils/splitChunks'
 
 export const generateTableUploadForm = (
@@ -13,7 +13,8 @@ export const generateTableUploadForm = (
   for (const tableName in data) {
     tableCounter++
 
-    sasjsTables.push(tableName)
+    // Formats table should not be sent as part of 'sasjs_tables'
+    if (!isFormatsTable(tableName)) sasjsTables.push(tableName)
 
     const csv = convertToCSV(data, tableName)
 

package/src/request/RequestClient.ts

@@ -703,7 +703,14 @@ const parseError = (data: string) => {
   } catch (_) {}
 
   try {
+    // There are some edge cases in which the SAS mp_abort macro
+    // (https://core.sasjs.io/mp__abort_8sas.html) is unable to
+    // provide a clean exit.  In this case the JSON response will
+    // be wrapped in >>weboutBEGIN<< and >>weboutEND<< strings.
+    // Therefore, if the first string exists, we won't throw an
+    // error just yet (the parser may yet throw one instead)
     const hasError =
+      !data?.match(/>>weboutBEGIN<</) &&
       !!data?.match(/Stored Process Error/i) &&
       !!data?.match(/This request completed with errors./i)
     if (hasError) {

package/src/utils/convertToCsv.ts

@@ -1,4 +1,5 @@
 import { isSpecialMissing } from '@sasjs/utils/input/validators'
+import { prefixMessage } from '@sasjs/utils/error'
 
 /**
  * Converts the given JSON object array to a CSV string.
@@ -9,7 +10,10 @@ export const convertToCSV = (
   tableName: string
 ) => {
   if (!data[tableName]) {
-    throw new Error('No table provided to be converted to CSV')
+    throw prefixMessage(
+      'No table provided to be converted to CSV.',
+      'Error while converting to CSV. '
+    )
   }
 
   const table = data[tableName]
@@ -170,6 +174,12 @@ export const convertToCSV = (
   return finalCSV
 }
 
+/**
+ * Checks if table is table of formats (table name should start from '$' character).
+ * @param tableName - table name.
+ */
+export const isFormatsTable = (tableName: string) => /^\$.*/.test(tableName)
+
 const getByteSize = (str: string) => {
   let byteSize = str.length
   for (let i = str.length - 1; i >= 0; i--) {

package/src/utils/formatDataForRequest.ts

@@ -1,4 +1,4 @@
-import { convertToCSV } from './convertToCsv'
+import { convertToCSV, isFormatsTable } from './convertToCsv'
 import { splitChunks } from './splitChunks'
 
 export const formatDataForRequest = (data: any) => {
@@ -8,7 +8,7 @@ export const formatDataForRequest = (data: any) => {
 
   for (const tableName in data) {
     if (
-      tableName.match(/^\$.*/) &&
+      isFormatsTable(tableName) &&
       Object.keys(data).includes(tableName.replace(/^\$/, ''))
     ) {
       continue
@@ -16,7 +16,8 @@ export const formatDataForRequest = (data: any) => {
 
     tableCounter++
 
-    sasjsTables.push(tableName)
+    // Formats table should not be sent as part of 'sasjs_tables'
+    if (!isFormatsTable(tableName)) sasjsTables.push(tableName)
 
     const csv = convertToCSV(data, tableName)
 

package/utils/convertToCsv.d.ts

@@ -5,3 +5,8 @@
 export declare const convertToCSV: (data: {
     [key: string]: any;
 }, tableName: string) => string;
+/**
+ * Checks if table is table of formats (table name should start from '$' character).
+ * @param tableName - table name.
+ */
+export declare const isFormatsTable: (tableName: string) => boolean;