Merge pull request #65 from sasjs/issue-62

feat: added forced deploy

.prettierrc

@@ -1,6 +1,6 @@
 {
   "trailingComma": "none",
   "tabWidth": 2,
-  "semi": true,
+  "semi": false,
-  "singleQuote": false
+  "singleQuote": true
 }

CONTRIBUTING.md

@@ -1,83 +1,14 @@
 # Contributing
 
-Contributions to SASjs are very welcome! When making a PR, test cases should be included. To help in unit testing, be sure to run the following when making changes:
+Contributions to SASjs are very welcome! When making a PR, test cases should be included.
 
-```
+This repository contains a suite of tests built using [@sasjs/test-framework](https://github.com/sasjs/test-framework).
-# the following creates a tarball in the build folder of SASjs
-npm run-script package:lib
 
-# now go to your app and run:
+Detailed instructions for creating and running the tests can be found [here](https://github.com/sasjs/adapter/blob/master/sasjs-tests/README.md).
-npm install ../sasjs/build/<tarball filename>
-```
 
-Tests are run using cypress. Before running tests, you need to define the following backend services:
+If you'd like to test your changes in an app that uses the adapter, you can do so as follows:
 
-# SAS 9
+1. Run `npm run package:lib` from the root folder in this repository.
-
+   This creates a tarball in the `/build` folder.
-```
+2. In your app's root folder, run `npm install <path/to/tarball>`.
-
+   This will install the changed version of the adapter in your app.
-filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
-%inc mc;
-filename ft15f001 temp;
-parmcards4;
-  %webout(OPEN)
-  %macro x();
-  %do i=1 %to &_webin_file_count; %webout(OBJ,&&_webin_name&i) %end;
-  %mend; %x()
-  %webout(CLOSE)
-;;;;
-%mm_createwebservice(path=/Public/app/common,name=sendObj)
-parmcards4;
-  %webout(OPEN)
-  %macro x();
-  %do i=1 %to &_webin_file_count; %webout(ARR,&&_webin_name&i) %end;
-  %mend; %x()
-  %webout(CLOSE)
-;;;;
-%mm_createwebservice(path=/Public/app/common,name=sendArr)
-```
-
-# Viya
-
-```
-filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
-%inc mc;
-filename ft15f001 temp;
-parmcards4;
-  %webout(FETCH)
-  %webout(OPEN)
-  %macro x();
-  %do i=1 %to %sysfunc(countw(&sasjs_tables));
-    %let table=%scan(&sasjs_tables,&i);
-    %webout(OBJ,&table)
-  %end;
-  %mend;
-  %x()
-  %webout(CLOSE)
-;;;;
-%mp_createwebservice(path=/Public/app/common,name=sendObj)
-filename ft15f001 temp;
-parmcards4;
-  %webout(FETCH)
-  %webout(OPEN)
-  %macro x();
-  %do i=1 %to %sysfunc(countw(&sasjs_tables));
-    %let table=%scan(&sasjs_tables,&i);
-    %webout(ARR,&table)
-  %end;
-  %mend;
-  %x()
-  %webout(CLOSE)
-;;;;
-%mp_createwebservice(path=/Public/app/common,name=sendArr)
-filename ft15f001 temp;
-parmcards4;
-If you can keep your head when all about you   
-    Are losing theirs and blaming it on you,   
-If you can trust yourself when all men doubt you,
-    But make allowance for their doubting too; 
-;;;;
-%mp_createwebservice(path=/Public/app/common,name=makeErr)
-```
-
-The above services will return anything you send. To run the tests simply launch `npm run cypress`.

README.md

@@ -43,6 +43,6 @@ You now have a simple web app with a backend service!
 
 # More resources
 
-For more information specific to this adapter you can check out this [user guide](https://sasjs.io/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.
+For more information and examples specific to this adapter you can check out the [user guide](https://sasjs.io/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.
 
 For more information on building web apps in general, check out these [resources](https://sasjs.io/training/resources/) or contact the [author](https://www.linkedin.com/in/allanbowe/) directly.

package-lock.json

@@ -1103,9 +1103,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
+          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -1648,9 +1648,9 @@
       }
     },
     "@types/jest": {
-      "version": "26.0.10",
+      "version": "26.0.13",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.13.tgz",
-      "integrity": "sha512-i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q==",
+      "integrity": "sha512-sCzjKow4z9LILc6DhBvn5AkIfmQzDZkgtVVKmGwVrs5tuid38ws281D4l+7x1kP487+FlKDh5kfMZ8WSPAdmdA==",
       "dev": true,
       "requires": {
         "jest-diff": "^25.2.1",
@@ -5904,9 +5904,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
+          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -12494,12 +12494,6 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
       "dev": true
     },
-    "prettier": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz",
-      "integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==",
-      "dev": true
-    },
     "pretty-format": {
       "version": "25.5.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
@@ -14421,11 +14415,12 @@
       }
     },
     "typedoc-neo-theme": {
-      "version": "1.0.9",
+      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/typedoc-neo-theme/-/typedoc-neo-theme-1.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/typedoc-neo-theme/-/typedoc-neo-theme-1.0.10.tgz",
-      "integrity": "sha512-g6ITZAkRBTVyTQnyq8LfYN3Y2fOoLnND3gG3nK7lcRthQ1kU4pTEK711KCEaceSK93qB5EgtLZkjv7NOg7qRTw==",
+      "integrity": "sha512-PmbqBFNyG8atVHIJ1Wgy8gm+7vR7Anl7cewOxI8qxo7M4Jk7vaY9pqJSnOm9Mfkk7k73Pw3mJVl3jxP4s0r/oA==",
       "dev": true,
       "requires": {
+        "lunr": "^2.3.8",
         "typedoc": "~0.17.8"
       }
     },

package.json

@@ -37,7 +37,7 @@
   "license": "ISC",
   "devDependencies": {
     "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.10",
+    "@types/jest": "^26.0.13",
     "cp": "^0.2.0",
     "jest": "^25.5.4",
     "path": "^0.12.7",
@@ -48,7 +48,7 @@
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "typedoc": "^0.17.8",
-    "typedoc-neo-theme": "^1.0.9",
+    "typedoc-neo-theme": "^1.0.10",
     "typedoc-plugin-external-module-name": "^4.0.3",
     "typescript": "^3.9.7",
     "uglifyjs-webpack-plugin": "^2.2.0",

sasjs-tests/README.md

@@ -1,68 +1,139 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+`sasjs-tests` is a test suite for the SASjs adapter.
 
-## Available Scripts
+It is a React app bootstrapped using [Create React App](https://github.com/facebook/create-react-app) and [@sasjs/test-framework](https://github.com/sasjs/test-framework).
 
-In the project directory, you can run:
+When developing on `@sasjs/adapter`, it's good practice to run the test suite against your changed version of the adapter to ensure that existing functionality has not been impacted.
 
-### `npm start`
+You can use the provided `update:adapter` NPM script for this.
 
-Runs the app in the development mode.<br />
+```
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+    npm run update:adapter
+```
 
-The page will reload if you make edits.<br />
+This scripts builds a new version of the adapter and installs it in the `sasjs-tests` project.
-You will also see any lint errors in the console.
 
-### `npm test`
+## Running tests
 
-Launches the test runner in the interactive watch mode.<br />
+There are three prerequisites to be able to run the tests:
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
 
-### `npm run build`
+1. Correct server configuration for the SASjs adapter.
+2. `sasjs-tests` deployed to your SAS server.
+3. The required SAS services created on the same server.
 
-Builds the app for production to the `build` folder.<br />
+### 1. Configuring the SASjs adapter
-It correctly bundles React in production mode and optimizes the build for the best performance.
 
-The build is minified and the filenames include the hashes.<br />
+There is a `config.json` file in the `/public` folder which specifies the configuration for the SASjs adapter. You can set the values within the `sasjsConfig` property in this file to match your SAS server configuration.
-Your app is ready to be deployed!
 
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+### 2. Deploying to your SAS server
 
-### `npm run eject`
+There is a `deploy` NPM script provided in the `sasjs-tests` project's `package.json`.
 
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+It updates `sasjs-tests` to use the latest version of the adapter, and deploys to a specified server via SSH using the `rsync` command.
 
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+To be able to run the `deploy` script, two environment variables need to be set:
 
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+- `SSH_ACCOUNT` - your SSH account, this is of the form username@domain.com
+- `DEPLOY_PATH` - the path on the server where `sasjs-tests` will be deployed to, typically `/var/www/html/<some-subfolder>`.
 
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+So you can run the script like so:
 
-## Learn More
+```
+SSH_ACCOUNT=me@my-sas-server.com DEPLOY_PATH=/var/www/html/my-folder/sasjs-tests npm run deploy
+```
 
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+If you'd like to deploy just `sasjs-tests` without changing the adapter version, you can use the `deploy:tests` script, while also setting the same environment variables as above.
 
-To learn React, check out the [React documentation](https://reactjs.org/).
+## 3. Creating the required SAS services
 
-### Code Splitting
+The below services need to be created on your SAS server, at the location specified as the `appLoc` in the SASjs configuration.
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
+### SAS 9
 
-### Analyzing the Bundle Size
+```
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
+filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+%inc mc;
+filename ft15f001 temp;
+parmcards4;
+  %webout(OPEN)
+  %macro x();
+  %do i=1 %to &_webin_file_count; %webout(OBJ,&&_webin_name&i) %end;
+  %mend; %x()
+  %webout(CLOSE)
+;;;;
+%mm_createwebservice(path=/Public/app/common,name=sendObj)
+parmcards4;
+  %webout(OPEN)
+  %macro x();
+  %do i=1 %to &_webin_file_count; %webout(ARR,&&_webin_name&i) %end;
+  %mend; %x()
+  %webout(CLOSE)
+;;;;
+%mm_createwebservice(path=/Public/app/common,name=sendArr)
+```
 
-### Making a Progressive Web App
+### SAS Viya
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
+```
+filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+%inc mc;
+filename ft15f001 temp;
+parmcards4;
+  %webout(FETCH)
+  %webout(OPEN)
+  %macro x();
+  %do i=1 %to %sysfunc(countw(&sasjs_tables));
+    %let table=%scan(&sasjs_tables,&i);
+    %webout(OBJ,&table)
+  %end;
+  %mend;
+  %x()
+  %webout(CLOSE)
+;;;;
+%mp_createwebservice(path=/Public/app/common,name=sendObj)
+filename ft15f001 temp;
+parmcards4;
+  %webout(FETCH)
+  %webout(OPEN)
+  %macro x();
+  %do i=1 %to %sysfunc(countw(&sasjs_tables));
+    %let table=%scan(&sasjs_tables,&i);
+    %webout(ARR,&table)
+  %end;
+  %mend;
+  %x()
+  %webout(CLOSE)
+;;;;
+%mp_createwebservice(path=/Public/app/common,name=sendArr)
+filename ft15f001 temp;
+parmcards4;
+If you can keep your head when all about you
+    Are losing theirs and blaming it on you,
+If you can trust yourself when all men doubt you,
+    But make allowance for their doubting too;
+;;;;
+%mp_createwebservice(path=/Public/app/common,name=makeErr)
+```
 
-### Advanced Configuration
+You should now be able to access the tests in your browser at the deployed path on your server.
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
+## Creating new tests
 
-### Deployment
+The `src/testSuites` folder contains all the test suites currently available.
+Each suite contains a set of specs, each of which looks like this:
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
+```javascript
+    {
+        title: "Your test title",
+        description: "A slightly more detailed description",
+        test: async () => {
+        // typically makes a request using the adapter and returns a promise
+        },
+        assertion: (response: any) =>
+        // receives the response when the test promise resolves, runs an assertion and returns a boolean
+    }
+```
 
-### `npm run build` fails to minify
+A test suite is an array of such objects, along with a `name` property.
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
+You can add your test to one of the existing suites if suitable, or create a new file that specifies a new test suite.

sasjs-tests/package-lock.json

@@ -1357,9 +1357,9 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
     "@sasjs/adapter": {
-      "version": "1.3.6",
+      "version": "1.3.13",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.3.13.tgz",
-      "integrity": "sha512-d2B+cTII+vabKCU8mJy90mEz3tCWw2pEp4qIBGsDamJiTS0Rx69dgXGHuRUm8KtjLDHHrzwXATsqviU3dnU0QQ==",
+      "integrity": "sha512-dWcDxgY3FB7Yx1I5dPpeQeyJDu4lezhIFrjn6lbdwRhV15aqOt4l9o9qZP+VbgOXqyi9gN0Y+p+vs2chBDFQqg==",
       "requires": {
         "es6-promise": "^4.2.8",
         "form-data": "^3.0.0",

sasjs-tests/package.json

@@ -4,7 +4,7 @@
   "homepage": ".",
   "private": true,
   "dependencies": {
-    "@sasjs/adapter": "^1.3.6",
+    "@sasjs/adapter": "^1.3.13",
     "@sasjs/test-framework": "^1.4.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
@@ -25,7 +25,9 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "deploy": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz && npm run build && rsync -avhe ssh ./build/* --delete kriaco@sas.analytium.co.uk:/var/www/html/kriaco/sasjs-tests"
+    "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz",
+    "deploy:tests": "npm run build && rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH",
+    "deploy": "npm run update:adapter && npm run deploy:tests"
   },
   "eslintConfig": {
     "extends": "react-app"

src/FileUploader.ts

@@ -1,8 +1,8 @@
-import { isLogInRequired, needsRetry } from "./utils";
+import { isLogInRequired, needsRetry, isUrl } from './utils'
-import { CsrfToken } from "./types/CsrfToken";
+import { CsrfToken } from './types/CsrfToken'
-import { UploadFile } from "./types/UploadFile";
+import { UploadFile } from './types/UploadFile'
 
-const requestRetryLimit = 5;
+const requestRetryLimit = 5
 
 export class FileUploader {
   constructor(
@@ -11,90 +11,93 @@ export class FileUploader {
     private jobsPath: string,
     private setCsrfTokenWeb: any,
     private csrfToken: CsrfToken | null = null
-  ) {}
+  ) {
-  private retryCount = 0;
+    if (serverUrl) isUrl(serverUrl)
+  }
+
+  private retryCount = 0
 
   public uploadFile(sasJob: string, files: UploadFile[], params: any) {
-    if (files?.length < 1) throw new Error("Atleast one file must be provided");
+    if (files?.length < 1) throw new Error('Atleast one file must be provided')
 
-    let paramsString = "";
+    let paramsString = ''
 
     for (let param in params) {
       if (params.hasOwnProperty(param)) {
-        paramsString += `&${param}=${params[param]}`;
+        paramsString += `&${param}=${params[param]}`
       }
     }
 
     const program = this.appLoc
-      ? this.appLoc.replace(/\/?$/, "/") + sasJob.replace(/^\//, "")
+      ? this.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
-      : sasJob;
+      : sasJob
     const uploadUrl = `${this.serverUrl}${this.jobsPath}/?${
-      "_program=" + program
+      '_program=' + program
-    }${paramsString}`;
+    }${paramsString}`
 
     const headers = {
-      "cache-control": "no-cache"
+      'cache-control': 'no-cache'
-    };
+    }
 
     return new Promise((resolve, reject) => {
-      const formData = new FormData();
+      const formData = new FormData()
 
       for (let file of files) {
-        formData.append("file", file.file, file.fileName);
+        formData.append('file', file.file, file.fileName)
       }
 
-      if (this.csrfToken) formData.append("_csrf", this.csrfToken.value);
+      if (this.csrfToken) formData.append('_csrf', this.csrfToken.value)
 
       fetch(uploadUrl, {
-        method: "POST",
+        method: 'POST',
         body: formData,
-        referrerPolicy: "same-origin",
+        referrerPolicy: 'same-origin',
         headers
       })
         .then(async (response) => {
           if (!response.ok) {
             if (response.status === 403) {
-              const tokenHeader = response.headers.get("X-CSRF-HEADER");
+              const tokenHeader = response.headers.get('X-CSRF-HEADER')
 
               if (tokenHeader) {
-                const token = response.headers.get(tokenHeader);
+                const token = response.headers.get(tokenHeader)
                 this.csrfToken = {
                   headerName: tokenHeader,
-                  value: token || ""
+                  value: token || ''
-                };
+                }
 
-                this.setCsrfTokenWeb(this.csrfToken);
+                this.setCsrfTokenWeb(this.csrfToken)
               }
             }
           }
 
-          return response.text();
+          return response.text()
         })
         .then((responseText) => {
           if (isLogInRequired(responseText))
-            reject("You must be logged in to upload a fle");
+            reject('You must be logged in to upload a fle')
 
           if (needsRetry(responseText)) {
             if (this.retryCount < requestRetryLimit) {
-              this.retryCount++;
+              this.retryCount++
               this.uploadFile(sasJob, files, params).then(
                 (res: any) => resolve(res),
                 (err: any) => reject(err)
-              );
+              )
             } else {
-              this.retryCount = 0;
+              this.retryCount = 0
-              reject(responseText);
+              reject(responseText)
             }
           } else {
-            this.retryCount = 0;
+            this.retryCount = 0
 
             try {
-              resolve(JSON.parse(responseText));
+              resolve(JSON.parse(responseText))
             } catch (e) {
-              reject(e);
+              reject(e)
             }
           }
-        });
+        })
-    });
+    })
   }
 }

src/SAS9ApiClient.ts

@@ -1,9 +1,13 @@
+import { isUrl } from './utils'
+
 /**
  * A client for interfacing with the SAS9 REST API
  *
  */
 export class SAS9ApiClient {
-  constructor(private serverUrl: string) {}
+  constructor(private serverUrl: string) {
+    if (serverUrl) isUrl(serverUrl)
+  }
 
   /**
    * returns on object containing the server URL
@@ -11,7 +15,7 @@ export class SAS9ApiClient {
   public getConfig() {
     return {
       serverUrl: this.serverUrl
-    };
+    }
   }
 
   /**
@@ -19,7 +23,7 @@ export class SAS9ApiClient {
    * @param serverUrl - the URL of the server.
    */
   public setConfig(serverUrl: string) {
-    if (serverUrl) this.serverUrl = serverUrl;
+    if (serverUrl) this.serverUrl = serverUrl
   }
 
   /**
@@ -33,19 +37,19 @@ export class SAS9ApiClient {
     serverName: string,
     repositoryName: string
   ) {
-    const requestPayload = linesOfCode.join("\n");
+    const requestPayload = linesOfCode.join('\n')
     const executeScriptRequest = {
-      method: "PUT",
+      method: 'PUT',
       headers: {
-        Accept: "application/json"
+        Accept: 'application/json'
       },
       body: `command=${requestPayload}`
-    };
+    }
     const executeScriptResponse = await fetch(
       `${this.serverUrl}/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
       executeScriptRequest
-    ).then((res) => res.text());
+    ).then((res) => res.text())
 
-    return executeScriptResponse;
+    return executeScriptResponse
   }
 }

src/SASjs.spec.ts

@@ -1,36 +1,36 @@
-import SASjs from "./index";
+import SASjs from './index'
 
-const adapter = new SASjs();
+const adapter = new SASjs()
 
-it("should parse SAS9 source code", async (done) => {
+it('should parse SAS9 source code', async (done) => {
-  expect(sampleResponse).toBeTruthy();
+  expect(sampleResponse).toBeTruthy()
-  const parsedSourceCode = (adapter as any).parseSAS9SourceCode(sampleResponse);
+  const parsedSourceCode = (adapter as any).parseSAS9SourceCode(sampleResponse)
-  expect(parsedSourceCode).toBeTruthy();
+  expect(parsedSourceCode).toBeTruthy()
-  const sourceCodeLines = parsedSourceCode.split("\r\n");
+  const sourceCodeLines = parsedSourceCode.split('\r\n')
-  expect(sourceCodeLines.length).toEqual(5);
+  expect(sourceCodeLines.length).toEqual(5)
-  expect(sourceCodeLines[0].startsWith("6")).toBeTruthy();
+  expect(sourceCodeLines[0].startsWith('6')).toBeTruthy()
-  expect(sourceCodeLines[1].startsWith("7")).toBeTruthy();
+  expect(sourceCodeLines[1].startsWith('7')).toBeTruthy()
-  expect(sourceCodeLines[2].startsWith("8")).toBeTruthy();
+  expect(sourceCodeLines[2].startsWith('8')).toBeTruthy()
-  expect(sourceCodeLines[3].startsWith("9")).toBeTruthy();
+  expect(sourceCodeLines[3].startsWith('9')).toBeTruthy()
-  expect(sourceCodeLines[4].startsWith("10")).toBeTruthy();
+  expect(sourceCodeLines[4].startsWith('10')).toBeTruthy()
-  done();
+  done()
-});
+})
 
-it("should parse generated code", async (done) => {
+it('should parse generated code', async (done) => {
-  expect(sampleResponse).toBeTruthy();
+  expect(sampleResponse).toBeTruthy()
   const parsedGeneratedCode = (adapter as any).parseGeneratedCode(
     sampleResponse
-  );
+  )
-  expect(parsedGeneratedCode).toBeTruthy();
+  expect(parsedGeneratedCode).toBeTruthy()
-  const generatedCodeLines = parsedGeneratedCode.split("\r\n");
+  const generatedCodeLines = parsedGeneratedCode.split('\r\n')
-  expect(generatedCodeLines.length).toEqual(5);
+  expect(generatedCodeLines.length).toEqual(5)
-  expect(generatedCodeLines[0].startsWith("MPRINT(MM_WEBIN)")).toBeTruthy();
+  expect(generatedCodeLines[0].startsWith('MPRINT(MM_WEBIN)')).toBeTruthy()
-  expect(generatedCodeLines[1].startsWith("MPRINT(MM_WEBLEFT)")).toBeTruthy();
+  expect(generatedCodeLines[1].startsWith('MPRINT(MM_WEBLEFT)')).toBeTruthy()
-  expect(generatedCodeLines[2].startsWith("MPRINT(MM_WEBOUT)")).toBeTruthy();
+  expect(generatedCodeLines[2].startsWith('MPRINT(MM_WEBOUT)')).toBeTruthy()
-  expect(generatedCodeLines[3].startsWith("MPRINT(MM_WEBRIGHT)")).toBeTruthy();
+  expect(generatedCodeLines[3].startsWith('MPRINT(MM_WEBRIGHT)')).toBeTruthy()
-  expect(generatedCodeLines[4].startsWith("MPRINT(MM_WEBOUT)")).toBeTruthy();
+  expect(generatedCodeLines[4].startsWith('MPRINT(MM_WEBOUT)')).toBeTruthy()
-  done();
+  done()
-});
+})
 
 /* tslint:disable */
 const sampleResponse = `<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
@@ -44,5 +44,5 @@ MPRINT(MM_WEBLEFT):   filename _temp temp lrecl=999999;
 MPRINT(MM_WEBOUT):   data _null_;
 MPRINT(MM_WEBRIGHT):  file _temp;
 MPRINT(MM_WEBOUT):   if upcase(symget('_debug'))='LOG' then put '&gt;&gt;weboutBEGIN&lt;&lt;';
-`;
+`
 /* tslint:enable */

src/SessionManager.ts

@@ -1,111 +1,114 @@
-import { Session, Context, CsrfToken } from "./types";
+import { Session, Context, CsrfToken } from './types'
-import { asyncForEach, makeRequest } from "./utils";
+import { asyncForEach, makeRequest, isUrl } from './utils'
 
-const MAX_SESSION_COUNT = 1;
+const MAX_SESSION_COUNT = 1
 
 export class SessionManager {
   constructor(
     private serverUrl: string,
     private contextName: string,
     private setCsrfToken: (csrfToken: CsrfToken) => void
-  ) {}
+  ) {
-  private sessions: Session[] = [];
+    if (serverUrl) isUrl(serverUrl)
-  private currentContext: Context | null = null;
+  }
-  private csrfToken: CsrfToken | null = null;
+
+  private sessions: Session[] = []
+  private currentContext: Context | null = null
+  private csrfToken: CsrfToken | null = null
 
   async getSession(accessToken?: string) {
-    await this.createSessions(accessToken);
+    await this.createSessions(accessToken)
-    this.createAndWaitForSession(accessToken);
+    this.createAndWaitForSession(accessToken)
-    const session = this.sessions.pop();
+    const session = this.sessions.pop()
     const secondsSinceSessionCreation =
       (new Date().getTime() - new Date(session!.creationTimeStamp).getTime()) /
-      1000;
+      1000
     if (
       secondsSinceSessionCreation >= session!.attributes.sessionInactiveTimeout
     ) {
-      await this.createSessions(accessToken);
+      await this.createSessions(accessToken)
-      const freshSession = this.sessions.pop();
+      const freshSession = this.sessions.pop()
-      return freshSession;
+      return freshSession
     }
-    return session;
+    return session
   }
 
   async clearSession(id: string, accessToken?: string) {
     const deleteSessionRequest = {
-      method: "DELETE",
+      method: 'DELETE',
       headers: this.getHeaders(accessToken)
-    };
+    }
     return await this.request<Session>(
       `${this.serverUrl}/compute/sessions/${id}`,
       deleteSessionRequest
     ).then(() => {
-      this.sessions = this.sessions.filter((s) => s.id !== id);
+      this.sessions = this.sessions.filter((s) => s.id !== id)
-    });
+    })
   }
 
   private async createSessions(accessToken?: string) {
     if (!this.sessions.length) {
       if (!this.currentContext) {
-        await this.setCurrentContext(accessToken);
+        await this.setCurrentContext(accessToken)
       }
       await asyncForEach(new Array(MAX_SESSION_COUNT), async () => {
-        const createdSession = await this.createAndWaitForSession(accessToken);
+        const createdSession = await this.createAndWaitForSession(accessToken)
-        this.sessions.push(createdSession);
+        this.sessions.push(createdSession)
-      });
+      })
     }
   }
 
   private async createAndWaitForSession(accessToken?: string) {
     const createSessionRequest = {
-      method: "POST",
+      method: 'POST',
       headers: this.getHeaders(accessToken)
-    };
+    }
     const { result: createdSession, etag } = await this.request<Session>(
       `${this.serverUrl}/compute/contexts/${this.currentContext!.id}/sessions`,
       createSessionRequest
-    );
+    )
 
-    await this.waitForSession(createdSession, etag);
+    await this.waitForSession(createdSession, etag)
-    this.sessions.push(createdSession);
+    this.sessions.push(createdSession)
-    return createdSession;
+    return createdSession
   }
 
   private async setCurrentContext(accessToken?: string) {
     if (!this.currentContext) {
       const { result: contexts } = await this.request<{
-        items: Context[];
+        items: Context[]
       }>(`${this.serverUrl}/compute/contexts`, {
         headers: this.getHeaders(accessToken)
-      });
+      })
 
       const contextsList =
         contexts && contexts.items && contexts.items.length
           ? contexts.items
-          : [];
+          : []
 
       const currentContext = contextsList.find(
         (c: any) => c.name === this.contextName
-      );
+      )
 
       if (!currentContext) {
         throw new Error(
           `The context ${this.contextName} was not found on the server ${this.serverUrl}`
-        );
+        )
       }
 
-      this.currentContext = currentContext;
+      this.currentContext = currentContext
     }
   }
 
   private getHeaders(accessToken?: string) {
     const headers: any = {
-      "Content-Type": "application/json"
+      'Content-Type': 'application/json'
-    };
+    }
     if (accessToken) {
-      headers.Authorization = `Bearer ${accessToken}`;
+      headers.Authorization = `Bearer ${accessToken}`
     }
 
-    return headers;
+    return headers
   }
 
   private async waitForSession(
@@ -114,57 +117,57 @@ export class SessionManager {
     accessToken?: string,
     silent = false
   ) {
-    let sessionState = session.state;
+    let sessionState = session.state
     const headers: any = {
       ...this.getHeaders(accessToken),
-      "If-None-Match": etag
+      'If-None-Match': etag
-    };
+    }
-    const stateLink = session.links.find((l: any) => l.rel === "state");
+    const stateLink = session.links.find((l: any) => l.rel === 'state')
     return new Promise(async (resolve, _) => {
-      if (sessionState === "pending") {
+      if (sessionState === 'pending') {
         if (stateLink) {
           if (!silent) {
-            console.log("Polling session status... \n");
+            console.log('Polling session status... \n')
           }
           const { result: state } = await this.request<string>(
             `${this.serverUrl}${stateLink.href}?wait=30`,
             {
               headers
             },
-            "text"
+            'text'
-          );
+          )
 
-          sessionState = state.trim();
+          sessionState = state.trim()
           if (!silent) {
-            console.log(`Current state: ${sessionState}\n`);
+            console.log(`Current state: ${sessionState}\n`)
           }
-          resolve(sessionState);
+          resolve(sessionState)
         }
       } else {
-        resolve(sessionState);
+        resolve(sessionState)
       }
-    });
+    })
   }
 
   private async request<T>(
     url: string,
     options: RequestInit,
-    contentType: "text" | "json" = "json"
+    contentType: 'text' | 'json' = 'json'
   ) {
     if (this.csrfToken) {
       options.headers = {
         ...options.headers,
         [this.csrfToken.headerName]: this.csrfToken.value
-      };
+      }
     }
     return await makeRequest<T>(
       url,
       options,
       (token) => {
-        this.csrfToken = token;
+        this.csrfToken = token
-        this.setCsrfToken(token);
+        this.setCsrfToken(token)
       },
       contentType
-    );
+    )
   }
 }

src/index.ts

@@ -1,5 +1,5 @@
-import SASjs from "./SASjs";
+import SASjs from './SASjs'
-export * from "./types";
+export * from './types'
-export * from "./SASViyaApiClient";
+export * from './SASViyaApiClient'
-export * from "./SAS9ApiClient";
+export * from './SAS9ApiClient'
-export default SASjs;
+export default SASjs

src/types/Context.ts

@@ -1,6 +1,6 @@
 export interface Context {
-  name: string;
+  name: string
-  id: string;
+  id: string
-  createdBy: string;
+  createdBy: string
-  version: number;
+  version: number
 }

src/types/CsrfToken.ts

@@ -1,4 +1,4 @@
 export interface CsrfToken {
-  headerName: string;
+  headerName: string
-  value: string;
+  value: string
 }

src/types/Folder.ts

@@ -1,7 +1,7 @@
-import { Link } from "./Link";
+import { Link } from './Link'
 
 export interface Folder {
-  id: string;
+  id: string
-  uri: string;
+  uri: string
-  links: Link[];
+  links: Link[]
 }

src/types/Job.ts

@@ -1,13 +1,13 @@
-import { Link } from "./Link";
+import { Link } from './Link'
-import { JobResult } from "./JobResult";
+import { JobResult } from './JobResult'
 
 export interface Job {
-  id: string;
+  id: string
-  name: string;
+  name: string
-  uri: string;
+  uri: string
-  createdBy: string;
+  createdBy: string
-  code?: string;
+  code?: string
-  links: Link[];
+  links: Link[]
-  results: JobResult;
+  results: JobResult
-  error?: any;
+  error?: any
 }

src/types/JobDefinition.ts

@@ -1,3 +1,3 @@
 export interface JobDefinition {
-  code: string;
+  code: string
 }

src/types/JobResult.ts

@@ -1,3 +1,3 @@
 export interface JobResult {
-  "_webout.json": string;
+  '_webout.json': string
 }

src/types/Link.ts

@@ -1,7 +1,7 @@
 export interface Link {
-  method: string;
+  method: string
-  rel: string;
+  rel: string
-  href: string;
+  href: string
-  uri: string;
+  uri: string
-  type: string;
+  type: string
 }

src/types/SASjsConfig.ts

@@ -1,4 +1,4 @@
-import { ServerType } from "./ServerType";
+import { ServerType } from './ServerType'
 
 /**
  * Specifies the configuration for the SASjs instance.
@@ -10,22 +10,22 @@ export class SASjsConfig {
    * Can be omitted, eg if serving directly from the SAS Web Server or being
    * streamed.
    */
-  serverUrl: string = "";
+  serverUrl: string = ''
-  pathSAS9: string = "";
+  pathSAS9: string = ''
-  pathSASViya: string = "";
+  pathSASViya: string = ''
   /**
    * The appLoc is the parent folder under which the SAS services (STPs or Job
    * Execution Services) are stored.
    */
-  appLoc: string = "";
+  appLoc: string = ''
   /**
    * Can be SAS9 or SASVIYA
    */
-  serverType: ServerType | null = null;
+  serverType: ServerType | null = null
   /**
    * Set to `true` to enable additional debugging.
    */
-  debug: boolean = true;
+  debug: boolean = true
-  contextName: string = "";
+  contextName: string = ''
-  useComputeApi = false;
+  useComputeApi = false
 }

src/types/SASjsRequest.ts

@@ -3,10 +3,10 @@
  *
  */
 export interface SASjsRequest {
-  serviceLink: string;
+  serviceLink: string
-  timestamp: Date;
+  timestamp: Date
-  sourceCode: string;
+  sourceCode: string
-  generatedCode: string;
+  generatedCode: string
-  logFile: string;
+  logFile: string
-  SASWORK: any;
+  SASWORK: any
 }

src/types/SASjsWaitingRequest.ts

@@ -4,11 +4,11 @@
  */
 export interface SASjsWaitingRequest {
   requestPromise: {
-    promise: any;
+    promise: any
-    resolve: any;
+    resolve: any
-    reject: any;
+    reject: any
-  };
+  }
-  SASjob: string;
+  SASjob: string
-  data: any;
+  data: any
-  config?: any;
+  config?: any
 }

src/types/ServerType.ts

@@ -3,6 +3,6 @@
  *
  */
 export enum ServerType {
-  SASViya = "SASVIYA",
+  SASViya = 'SASVIYA',
-  SAS9 = "SAS9"
+  SAS9 = 'SAS9'
 }

src/types/Session.ts

@@ -1,11 +1,11 @@
-import { Link } from "./Link";
+import { Link } from './Link'
 
 export interface Session {
-  id: string;
+  id: string
-  state: string;
+  state: string
-  links: Link[];
+  links: Link[]
   attributes: {
-    sessionInactiveTimeout: number;
+    sessionInactiveTimeout: number
-  };
+  }
-  creationTimeStamp: string;
+  creationTimeStamp: string
 }

src/types/UploadFile.ts

@@ -3,6 +3,6 @@
  *
  */
 export interface UploadFile {
-  file: File;
+  file: File
-  fileName: string;
+  fileName: string
 }

src/types/index.ts

@@ -1,11 +1,11 @@
-export * from "./Context";
+export * from './Context'
-export * from "./CsrfToken";
+export * from './CsrfToken'
-export * from "./Folder";
+export * from './Folder'
-export * from "./Job";
+export * from './Job'
-export * from "./Link";
+export * from './Link'
-export * from "./SASjsConfig";
+export * from './SASjsConfig'
-export * from "./SASjsRequest";
+export * from './SASjsRequest'
-export * from "./SASjsWaitingRequest";
+export * from './SASjsWaitingRequest'
-export * from "./ServerType";
+export * from './ServerType'
-export * from "./Session";
+export * from './Session'
-export * from "./UploadFile";
+export * from './UploadFile'

src/utils/asyncForEach.ts

@@ -1,5 +1,5 @@
 export async function asyncForEach(array: any[], callback: any) {
   for (let index = 0; index < array.length; index++) {
-    await callback(array[index], index, array);
+    await callback(array[index], index, array)
   }
 }

src/utils/compareTimestamps.ts

@@ -1,9 +1,9 @@
-import { SASjsRequest } from "../types/SASjsRequest";
+import { SASjsRequest } from '../types/SASjsRequest'
 
 /**
  * Comparator for SASjs request timestamps
  *
  */
 export const compareTimestamps = (a: SASjsRequest, b: SASjsRequest) => {
-  return b.timestamp.getTime() - a.timestamp.getTime();
+  return b.timestamp.getTime() - a.timestamp.getTime()
-};
+}

src/utils/convertToCsv.ts

@@ -3,131 +3,131 @@
  * @param data - the JSON object to convert.
  */
 export const convertToCSV = (data: any) => {
-  const replacer = (key: any, value: any) => (value === null ? "" : value);
+  const replacer = (key: any, value: any) => (value === null ? '' : value)
-  const headerFields = Object.keys(data[0]);
+  const headerFields = Object.keys(data[0])
-  let csvTest;
+  let csvTest
-  let invalidString = false;
+  let invalidString = false
   const headers = headerFields.map((field) => {
-    let firstFoundType: string | null = null;
+    let firstFoundType: string | null = null
-    let hasMixedTypes: boolean = false;
+    let hasMixedTypes: boolean = false
-    let rowNumError: number = -1;
+    let rowNumError: number = -1
 
     const longestValueForField = data
       .map((row: any, index: number) => {
-        if (row[field] || row[field] === "") {
+        if (row[field] || row[field] === '') {
           if (firstFoundType) {
             let currentFieldType =
-              row[field] === "" || typeof row[field] === "string"
+              row[field] === '' || typeof row[field] === 'string'
-                ? "chars"
+                ? 'chars'
-                : "number";
+                : 'number'
 
             if (!hasMixedTypes) {
-              hasMixedTypes = currentFieldType !== firstFoundType;
+              hasMixedTypes = currentFieldType !== firstFoundType
-              rowNumError = hasMixedTypes ? index + 1 : -1;
+              rowNumError = hasMixedTypes ? index + 1 : -1
             }
           } else {
-            if (row[field] === "") {
+            if (row[field] === '') {
-              firstFoundType = "chars";
+              firstFoundType = 'chars'
             } else {
               firstFoundType =
-                typeof row[field] === "string" ? "chars" : "number";
+                typeof row[field] === 'string' ? 'chars' : 'number'
             }
           }
 
-          let byteSize;
+          let byteSize
 
-          if (typeof row[field] === "string") {
+          if (typeof row[field] === 'string') {
             let doubleQuotesFound = row[field]
-              .split("")
+              .split('')
-              .filter((char: any) => char === '"');
+              .filter((char: any) => char === '"')
 
-            byteSize = getByteSize(row[field]);
+            byteSize = getByteSize(row[field])
 
             if (doubleQuotesFound.length > 0) {
-              byteSize += doubleQuotesFound.length;
+              byteSize += doubleQuotesFound.length
             }
           }
 
-          return byteSize;
+          return byteSize
         }
       })
-      .sort((a: number, b: number) => b - a)[0];
+      .sort((a: number, b: number) => b - a)[0]
     if (longestValueForField && longestValueForField > 32765) {
-      invalidString = true;
+      invalidString = true
     }
     if (hasMixedTypes) {
       console.error(
         `Row (${rowNumError}), Column (${field}) has mixed types: ERROR`
-      );
+      )
     }
 
-    return `${field}:${firstFoundType === "chars" ? "$" : ""}${
+    return `${field}:${firstFoundType === 'chars' ? '$' : ''}${
       longestValueForField
         ? longestValueForField
-        : firstFoundType === "chars"
+        : firstFoundType === 'chars'
-        ? "1"
+        ? '1'
-        : "best"
+        : 'best'
-    }.`;
+    }.`
-  });
+  })
 
   if (invalidString) {
-    return "ERROR: LARGE STRING LENGTH";
+    return 'ERROR: LARGE STRING LENGTH'
   }
   csvTest = data.map((row: any) => {
     const fields = Object.keys(row).map((fieldName, index) => {
-      let value;
+      let value
-      let containsSpecialChar = false;
+      let containsSpecialChar = false
-      const currentCell = row[fieldName];
+      const currentCell = row[fieldName]
 
       if (JSON.stringify(currentCell).search(/(\\t|\\n|\\r)/gm) > -1) {
-        value = currentCell.toString();
+        value = currentCell.toString()
-        containsSpecialChar = true;
+        containsSpecialChar = true
       } else {
-        value = JSON.stringify(currentCell, replacer);
+        value = JSON.stringify(currentCell, replacer)
       }
 
-      value = value.replace(/\\\\/gm, "\\");
+      value = value.replace(/\\\\/gm, '\\')
 
       if (containsSpecialChar) {
-        if (value.includes(",") || value.includes('"')) {
+        if (value.includes(',') || value.includes('"')) {
-          value = '"' + value + '"';
+          value = '"' + value + '"'
         }
       } else {
         if (
-          !value.includes(",") &&
+          !value.includes(',') &&
           value.includes('"') &&
           !value.includes('\\"')
         ) {
-          value = value.substring(1, value.length - 1);
+          value = value.substring(1, value.length - 1)
         }
 
-        value = value.replace(/\\"/gm, '""');
+        value = value.replace(/\\"/gm, '""')
       }
 
-      value = value.replace(/\r\n/gm, "\n");
+      value = value.replace(/\r\n/gm, '\n')
 
-      if (value === "" && headers[index].includes("best")) {
+      if (value === '' && headers[index].includes('best')) {
-        value = ".";
+        value = '.'
       }
 
-      return value;
+      return value
-    });
+    })
-    return fields.join(",");
+    return fields.join(',')
-  });
+  })
 
   let finalCSV =
-    headers.join(",").replace(/,/g, " ") + "\r\n" + csvTest.join("\r\n");
+    headers.join(',').replace(/,/g, ' ') + '\r\n' + csvTest.join('\r\n')
 
-  return finalCSV;
+  return finalCSV
-};
+}
 
 const getByteSize = (str: string) => {
-  let byteSize = str.length;
+  let byteSize = str.length
   for (let i = str.length - 1; i >= 0; i--) {
-    const code = str.charCodeAt(i);
+    const code = str.charCodeAt(i)
-    if (code > 0x7f && code <= 0x7ff) byteSize++;
+    if (code > 0x7f && code <= 0x7ff) byteSize++
-    else if (code > 0x7ff && code <= 0xffff) byteSize += 2;
+    else if (code > 0x7ff && code <= 0xffff) byteSize += 2
-    if (code >= 0xdc00 && code <= 0xdfff) i--; //trail surrogate
+    if (code >= 0xdc00 && code <= 0xdfff) i-- //trail surrogate
   }
-  return byteSize;
+  return byteSize
-};
+}

src/utils/formatDataForRequest.ts

@@ -1,33 +1,33 @@
-import { convertToCSV } from "./convertToCsv";
+import { convertToCSV } from './convertToCsv'
-import { splitChunks } from "./splitChunks";
+import { splitChunks } from './splitChunks'
 
 export const formatDataForRequest = (data: any) => {
-  const sasjsTables = [];
+  const sasjsTables = []
-  let tableCounter = 0;
+  let tableCounter = 0
-  const result: any = {};
+  const result: any = {}
 
   for (const tableName in data) {
-    tableCounter++;
+    tableCounter++
-    sasjsTables.push(tableName);
+    sasjsTables.push(tableName)
-    const csv = convertToCSV(data[tableName]);
+    const csv = convertToCSV(data[tableName])
-    if (csv === "ERROR: LARGE STRING LENGTH") {
+    if (csv === 'ERROR: LARGE STRING LENGTH') {
       throw new Error(
-        "The max length of a string value in SASjs is 32765 characters."
+        '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);
+      const csvChunks = splitChunks(csv)
       // append chunks to form data with same key
-      result[`sasjs${tableCounter}data0`] = csvChunks.length;
+      result[`sasjs${tableCounter}data0`] = csvChunks.length
       csvChunks.forEach((chunk, index) => {
-        result[`sasjs${tableCounter}data${index + 1}`] = chunk;
+        result[`sasjs${tableCounter}data${index + 1}`] = chunk
-      });
+      })
     } else {
-      result[`sasjs${tableCounter}data`] = csv;
+      result[`sasjs${tableCounter}data`] = csv
     }
   }
-  result["sasjs_tables"] = sasjsTables.join(" ");
+  result['sasjs_tables'] = sasjsTables.join(' ')
 
-  return result;
+  return result
-};
+}

src/utils/index.ts

@@ -1,15 +1,17 @@
-export * from "./asyncForEach";
+export * from './asyncForEach'
-export * from "./compareTimestamps";
+export * from './compareTimestamps'
-export * from "./convertToCsv";
+export * from './convertToCsv'
-export * from "./isAuthorizeFormRequired";
+export * from './isAuthorizeFormRequired'
-export * from "./isLoginRequired";
+export * from './isLoginRequired'
-export * from "./isLoginSuccess";
+export * from './isLoginSuccess'
-export * from "./makeRequest";
+export * from './makeRequest'
-export * from "./needsRetry";
+export * from './needsRetry'
-export * from "./parseAndSubmitAuthorizeForm";
+export * from './parseAndSubmitAuthorizeForm'
-export * from "./parseGeneratedCode";
+export * from './parseGeneratedCode'
-export * from "./parseSourceCode";
+export * from './parseSourceCode'
-export * from "./parseSasViyaLog";
+export * from './parseSasViyaLog'
-export * from "./serialize";
+export * from './serialize'
-export * from "./splitChunks";
+export * from './splitChunks'
-export * from "./parseWeboutResponse";
+export * from './parseWeboutResponse'
+export * from './isUri'
+export * from './isUrl'

src/utils/isAuthorizeFormRequired.ts

@@ -1,3 +1,3 @@
 export const isAuthorizeFormRequired = (response: string): boolean => {
-  return /<form.+action="(.*Logon\/oauth\/authorize[^"]*).*>/gm.test(response);
+  return /<form.+action="(.*Logon\/oauth\/authorize[^"]*).*>/gm.test(response)
-};
+}

src/utils/isIeOrEdge.ts

@@ -1,34 +1,34 @@
 export function isIEorEdgeOrOldFirefox() {
-  if (typeof window === "undefined") {
+  if (typeof window === 'undefined') {
-    return false;
+    return false
   }
-  const ua = window.navigator.userAgent;
+  const ua = window.navigator.userAgent
 
-  if (ua.indexOf("Firefox") > 0) {
+  if (ua.indexOf('Firefox') > 0) {
     const version = parseInt(
-      ua.substring(ua.lastIndexOf("Firefox/") + 8, ua.length),
+      ua.substring(ua.lastIndexOf('Firefox/') + 8, ua.length),
       10
-    );
+    )
-    return version <= 60;
+    return version <= 60
   }
 
-  const msie = ua.indexOf("MSIE ");
+  const msie = ua.indexOf('MSIE ')
   if (msie > 0) {
     // IE 10 or older => return version number
-    return true;
+    return true
   }
 
-  const trident = ua.indexOf("Trident/");
+  const trident = ua.indexOf('Trident/')
   if (trident > 0) {
-    return true;
+    return true
   }
 
-  const edge = ua.indexOf("Edge/");
+  const edge = ua.indexOf('Edge/')
   if (edge > 0) {
     // Edge (IE 12+) => return version number
-    return true;
+    return true
   }
 
   // other browser
-  return false;
+  return false
 }

src/utils/isLoginRequired.ts

@@ -1,5 +1,5 @@
 export const isLogInRequired = (response: string): boolean => {
-  const pattern: RegExp = /<form.+action="(.*Logon[^"]*).*>/gm;
+  const pattern: RegExp = /<form.+action="(.*Logon[^"]*).*>/gm
-  const matches = pattern.test(response);
+  const matches = pattern.test(response)
-  return matches;
+  return matches
-};
+}

src/utils/isLoginSuccess.ts

@@ -1,2 +1,2 @@
 export const isLogInSuccess = (response: string): boolean =>
-  /You have signed in/gm.test(response);
+  /You have signed in/gm.test(response)

src/utils/isUri.ts

@@ -0,0 +1,5 @@
+/**
+ * Checks if string is in URI format
+ * @param str string to check
+ */
+export const isUri = (str: string): boolean => /^\/folders\/folders\//.test(str)

src/utils/isUrl.ts

@@ -0,0 +1,12 @@
+export const isUrl = (url: string): boolean => {
+  const pattern = new RegExp(
+    '^(http://|https://)[a-z0-9]+([-.]{1}[a-z0-9]+)*.[a-z]{2,5}(:[0-9]{1,5})?(/.*)?$',
+    'gi'
+  )
+
+  if (pattern.test(url)) return true
+  else
+    throw new Error(
+      `'${url}' is not a valid url. An example of a valid url is 'http://valid-url.com'.`
+    )
+}

src/utils/makeRequest.ts

@@ -1,107 +1,107 @@
-import { CsrfToken } from "../types";
+import { CsrfToken } from '../types'
-import { needsRetry } from "./needsRetry";
+import { needsRetry } from './needsRetry'
 
-let retryCount: number = 0;
+let retryCount: number = 0
-let retryLimit: number = 5;
+let retryLimit: number = 5
 
 export async function makeRequest<T>(
   url: string,
   request: RequestInit,
   callback: (value: CsrfToken) => any,
-  contentType: "text" | "json" = "json"
+  contentType: 'text' | 'json' = 'json'
 ): Promise<{ result: T; etag: string | null }> {
-  let retryRequest: any = null;
+  let retryRequest: any = null
 
   const responseTransform =
-    contentType === "json"
+    contentType === 'json'
       ? (res: Response) => res.json()
-      : (res: Response) => res.text();
+      : (res: Response) => res.text()
-  let etag = null;
+  let etag = null
   const result = await fetch(url, request).then(async (response) => {
-    if (response.redirected && response.url.includes("SASLogon/login")) {
+    if (response.redirected && response.url.includes('SASLogon/login')) {
-      return Promise.reject({ status: 401 });
+      return Promise.reject({ status: 401 })
     }
     if (!response.ok) {
       if (response.status === 403) {
-        const tokenHeader = response.headers.get("X-CSRF-HEADER");
+        const tokenHeader = response.headers.get('X-CSRF-HEADER')
 
         if (tokenHeader) {
-          const token = response.headers.get(tokenHeader);
+          const token = response.headers.get(tokenHeader)
           callback({
             headerName: tokenHeader,
-            value: token || ""
+            value: token || ''
-          });
+          })
 
           retryRequest = {
             ...request,
             headers: { ...request.headers, [tokenHeader]: token }
-          };
+          }
           return fetch(url, retryRequest).then((res) => {
-            etag = res.headers.get("ETag");
+            etag = res.headers.get('ETag')
-            return responseTransform(res);
+            return responseTransform(res)
-          });
+          })
         }
       } else {
-        const body = await response.text();
+        const body = await response.text()
 
         if (needsRetry(body)) {
           if (retryCount < retryLimit) {
-            retryCount++;
+            retryCount++
             let retryResponse = await makeRequest(
               url,
               retryRequest || request,
               callback,
               contentType
-            );
+            )
-            retryCount = 0;
+            retryCount = 0
 
-            etag = retryResponse.etag;
+            etag = retryResponse.etag
-            return retryResponse.result;
+            return retryResponse.result
           } else {
-            retryCount = 0;
+            retryCount = 0
 
-            throw new Error("Request retry limit exceeded");
+            throw new Error('Request retry limit exceeded')
           }
         }
 
-        return Promise.reject({ status: response.status, body });
+        return Promise.reject({ status: response.status, body })
       }
     } else {
       if (response.status === 204) {
-        return Promise.resolve();
+        return Promise.resolve()
       }
-      const responseTransformed = await responseTransform(response);
+      const responseTransformed = await responseTransform(response)
-      let responseText = "";
+      let responseText = ''
 
-      if (typeof responseTransformed === "string") {
+      if (typeof responseTransformed === 'string') {
-        responseText = responseTransformed;
+        responseText = responseTransformed
       } else {
-        responseText = JSON.stringify(responseTransformed);
+        responseText = JSON.stringify(responseTransformed)
       }
 
       if (needsRetry(responseText)) {
         if (retryCount < retryLimit) {
-          retryCount++;
+          retryCount++
           const retryResponse = await makeRequest(
             url,
             retryRequest || request,
             callback,
             contentType
-          );
+          )
-          retryCount = 0;
+          retryCount = 0
 
-          etag = retryResponse.etag;
+          etag = retryResponse.etag
-          return retryResponse.result;
+          return retryResponse.result
         } else {
-          retryCount = 0;
+          retryCount = 0
 
-          throw new Error("Request retry limit exceeded");
+          throw new Error('Request retry limit exceeded')
         }
       }
 
-      etag = response.headers.get("ETag");
+      etag = response.headers.get('ETag')
-      return responseTransformed;
+      return responseTransformed
     }
-  });
+  })
-  return { result, etag };
+  return { result, etag }
 }

src/utils/needsRetry.ts

@@ -2,13 +2,13 @@ export const needsRetry = (responseText: string): boolean => {
   return (
     !!responseText &&
     ((responseText.includes('"errorCode":403') &&
-      responseText.includes("_csrf") &&
+      responseText.includes('_csrf') &&
-      responseText.includes("X-CSRF-TOKEN")) ||
+      responseText.includes('X-CSRF-TOKEN')) ||
       (responseText.includes('"status":403') &&
         responseText.includes('"error":"Forbidden"')) ||
       (responseText.includes('"status":449') &&
         responseText.includes(
-          "Authentication success, retry original request"
+          'Authentication success, retry original request'
         )))
-  );
+  )
-};
+}

src/utils/parseAndSubmitAuthorizeForm.ts

@@ -2,48 +2,48 @@ export const parseAndSubmitAuthorizeForm = async (
   response: string,
   serverUrl: string
 ) => {
-  let authUrl: string | null = null;
+  let authUrl: string | null = null
-  const params: any = {};
+  const params: any = {}
 
-  const responseBody = response.split("<body>")[1].split("</body>")[0];
+  const responseBody = response.split('<body>')[1].split('</body>')[0]
-  const bodyElement = document.createElement("div");
+  const bodyElement = document.createElement('div')
-  bodyElement.innerHTML = responseBody;
+  bodyElement.innerHTML = responseBody
 
-  const form = bodyElement.querySelector("#application_authorization");
+  const form = bodyElement.querySelector('#application_authorization')
-  authUrl = form ? serverUrl + form.getAttribute("action") : null;
+  authUrl = form ? serverUrl + form.getAttribute('action') : null
 
-  const inputs: any = form?.querySelectorAll("input");
+  const inputs: any = form?.querySelectorAll('input')
 
   for (const input of inputs) {
-    if (input.name === "user_oauth_approval") {
+    if (input.name === 'user_oauth_approval') {
-      input.value = "true";
+      input.value = 'true'
     }
 
-    params[input.name] = input.value;
+    params[input.name] = input.value
   }
 
-  const formData = new FormData();
+  const formData = new FormData()
 
   for (const key in params) {
     if (params.hasOwnProperty(key)) {
-      formData.append(key, params[key]);
+      formData.append(key, params[key])
     }
   }
 
   return new Promise((resolve, reject) => {
     if (authUrl) {
       fetch(authUrl, {
-        method: "POST",
+        method: 'POST',
-        credentials: "include",
+        credentials: 'include',
         body: formData,
-        referrerPolicy: "same-origin"
+        referrerPolicy: 'same-origin'
       })
         .then((res) => res.text())
         .then((res) => {
-          resolve(res);
+          resolve(res)
-        });
+        })
     } else {
-      reject("Auth form url is null");
+      reject('Auth form url is null')
     }
-  });
+  })
-};
+}

src/utils/parseGeneratedCode.ts

@@ -1,7 +1,7 @@
 export const parseGeneratedCode = (log: string) => {
-  const startsWith = "MPRINT";
+  const startsWith = 'MPRINT'
   const isGeneratedCodeLine = (line: string) =>
-    line.trim().startsWith(startsWith);
+    line.trim().startsWith(startsWith)
-  const logLines = log.split("\n").filter(isGeneratedCodeLine);
+  const logLines = log.split('\n').filter(isGeneratedCodeLine)
-  return logLines.join("\r\n");
+  return logLines.join('\r\n')
-};
+}