@sasjs/adapter 3.8.5 → 3.9.2

package/package.json

@@ -72,12 +72,12 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "2.42.0",
+    "@sasjs/utils": "2.44.0",
     "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.8.5"
+  "version": "3.9.2"
 }

package/src/SASjs.ts

@@ -77,7 +77,7 @@ export default class SASjs {
   }
 
   /**
-   * Executes code against a SAS 9 server.  Requires a runner to be present in
+   * Executes SAS code on a SAS 9 server.  Requires a runner to be present in
    * the users home directory in metadata.
    * @param linesOfCode - lines of sas code from the file to run.
    * @param username - a string representing the username.
@@ -97,6 +97,17 @@ export default class SASjs {
     )
   }
 
+  /**
+   * Executes SAS code on a SASJS server
+   * @param code - a string of code from the file to run.
+   * @param authConfig - (optional) a valid client, secret, refresh and access tokens that are authorised to execute scripts.
+   */
+  public async executeScriptSASjs(code: string, authConfig?: AuthConfig) {
+    this.isMethodSupported('executeScriptSASJS', [ServerType.Sasjs])
+
+    return await this.sasJSApiClient?.executeScript(code, authConfig)
+  }
+
   /**
    * Executes sas code in a SAS Viya compute session.
    * @param fileName - name of the file to run. It will be converted to path to the file being submitted for execution.

package/src/SASjsApiClient.ts

@@ -60,6 +60,39 @@ export class SASjsApiClient {
     return Promise.resolve(result)
   }
 
+  /**
+   * Executes code on a SASJS server.
+   * @param code - a string of code to execute.
+   * @param authConfig - an object for authentication.
+   */
+  public async executeScript(code: string, authConfig?: AuthConfig) {
+    let access_token = (authConfig || {}).access_token
+    if (authConfig) {
+      ;({ access_token } = await getTokens(
+        this.requestClient,
+        authConfig,
+        ServerType.Sasjs
+      ))
+    }
+
+    let parsedSasjsServerLog = ''
+
+    await this.requestClient
+      .post('SASjsApi/code/execute', { code }, access_token)
+      .then((res: any) => {
+        if (res.result?.log) {
+          parsedSasjsServerLog = res.result.log
+            .map((logLine: any) => logLine.line)
+            .join('\n')
+        }
+      })
+      .catch((err) => {
+        parsedSasjsServerLog = err
+      })
+
+    return parsedSasjsServerLog
+  }
+
   /**
    * Exchanges the auth code for an access token for the given client.
    * @param clientId - the client ID to authenticate with.

package/src/utils/convertToCsv.ts

@@ -1,3 +1,5 @@
+import { isSpecialMissing } from '@sasjs/utils'
+
 /**
  * Converts the given JSON object array to a CSV string.
  * @param data - the array of JSON objects to convert.
@@ -18,7 +20,6 @@ export const convertToCSV = (
   let headers: string[] = []
   let csvTest
   let invalidString = false
-  const specialMissingValueRegExp = /^[a-z_]{1}$/i
 
   if (formats) {
     headers = Object.keys(formats).map((key) => `${key}:${formats![key]}`)
@@ -36,7 +37,7 @@ export const convertToCSV = (
           hasNullOrNumber = true
         } else if (
           typeof row[field] === 'string' &&
-          specialMissingValueRegExp.test(row[field])
+          isSpecialMissing(row[field])
         ) {
           hasSpecialMissingString = true
         }
@@ -130,10 +131,10 @@ export const convertToCSV = (
       value = currentCell === null ? '' : currentCell
 
       if (formats && formats[fieldName] === 'best.') {
-        if (value && !specialMissingValueRegExp.test(value)) {
+        if (value && !isSpecialMissing(value)) {
           console.log(`🤖[value]🤖`, value)
           throw new Error(
-            'Special missing value can only be a single character from A to Z or _'
+            `A Special missing value can only be a single character from 'A' to 'Z', '_', '.[a-z]', '._'`
           )
         }