Merge pull request #66 from sasjs/create-context

feat(context): add the ability to create and delete a compute context

.github/workflows/build.yml

@@ -21,7 +21,11 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - run: npm ci
-      - run: npm run package:lib
+      - name: Install Dependencies
+        run: npm ci
+      - name: Check code style
+        run: npm run lint
+      - name: Build Package
+        run: npm run package:lib
         env:
           CI: true

.github/workflows/npmpublish.yml

@@ -6,7 +6,7 @@ name: SASjs Build and Publish
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   build:
@@ -16,6 +16,8 @@ jobs:
         uses: actions/checkout@v2
       - name: Install Dependencies
         run: npm ci
+      - name: Check code style
+        run: npm run lint
       - name: Build Project
         run: npm run build
       - name: Semantic Release

.prettierrc

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

CONTRIBUTING.md

@@ -1,82 +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.
 
-```
-# the following creates a tarball in the build folder of SASjs
-npm run-script package:lib
+This repository contains a suite of tests built using [@sasjs/test-framework](https://github.com/sasjs/test-framework).
 
-# now go to your app and run:
-npm install ../sasjs/build/<tarball filename>
-```
+Detailed instructions for creating and running the tests can be found [here](https://github.com/sasjs/adapter/blob/master/sasjs-tests/README.md).
 
-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
-
-```
-
-filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/main/mc_all.sas?_=1";
-%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/macropeople/macrocore/main/mc_all.sas";
-%inc mc;
-
-filename ft15f001 temp;
-parmcards4;
-  %webout(OPEN)
-  %global sasjs_tables;
-  %let sasjs_tables=&sasjs_tables;
-  %put &=sasjs_tables;
-  %let sasjs_tables=&sasjs_tables;
-  %macro x();
-  %global sasjs_tables;
-  %do i=1 %to %sysfunc(countw(&sasjs_tables));
-    %let table=%scan(&sasjs_tables,&i);
-    %webout(OBJ,&table)
-  %end;
-  %mend;
-  %x()
-  %webout(CLOSE)
-;;;;
-%mv_createwebservice(path=/Public/app/common,name=sendObj)
-filename ft15f001 temp;
-parmcards4;
-  %webout(OPEN)
-  %global sasjs_tables;
-  %let sasjs_tables=&sasjs_tables;
-  %put &=sasjs_tables;
-  %macro x();
-  %do i=1 %to %sysfunc(countw(&sasjs_tables));
-    %let table=%scan(&sasjs_tables,&i);
-    %webout(ARR,&table)
-  %end;
-  %mend;
-  %x()
-  %webout(CLOSE)
-;;;;
-%mv_createwebservice(path=/Public/app/common,name=sendArr)
-```
-
-The above services will return anything you send. To run the tests simply launch `npm run cypress`.
+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.

README.md

@@ -10,13 +10,13 @@ SASjs is a open-source framework for building Web Apps on SAS® platforms. You c
 
 3 - Reference directly from the CDN - in which case click [here](https://www.jsdelivr.com/package/npm/@sasjs/adapter?tab=collection) and select "SRI" to get the script tag with the integrity hash.
 
-If you are short on time and just need to build an app quickly, then check out [this video](https://vimeo.com/393161794) and the [react-seed-app](https://github.com/macropeople/react-seed-app) which provides some boilerplate.
+If you are short on time and just need to build an app quickly, then check out [this video](https://vimeo.com/393161794) and the [react-seed-app](https://github.com/sasjs/react-seed-app) which provides some boilerplate.
 
 For more information on building web apps with SAS, check out [sasjs.io](https://sasjs.io)
 
 ## None of this makes sense. How do I build an app with it?
 
-Ok ok. Deploy this [example.html](https://github.com/sasjs/adapter/blob/main/example.html) file to your web server, and update `servertype` to `SAS9` or `SASVIYA` depending on your backend.
+Ok ok. Deploy this [example.html](https://raw.githubusercontent.com/sasjs/adapter/master/example.html) file to your web server, and update `servertype` to `SAS9` or `SASVIYA` depending on your backend.
 
 The backend part can be deployed as follows:
 
@@ -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/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.

example.html

@@ -1,114 +1,109 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset='utf-8' http-equiv='X-UA-Compatible' content='IE=edge' />
-        <link rel='stylesheet' href='https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css' integrity='sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh' crossorigin='anonymous'>
-        <script src='https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1'></script>
-        <script>
-            const sasJs = new SASjs.default({
-                appLoc: '/Products/demo/readme',
-                serverType:'SAS9',
-                debug: 'false'
-            })
-
-            const initSasJs = () => {
-                $('#loading-spinner').show()
-
-                // instantiate sasJs with options such as backend app location
-                // login (it's also possible to set an auto login when making requests)
-                sasJs.logIn($('#username')[0].value, $('#password')[0].value)
-                    .then((response) => {
-                        if (response.isLoggedIn === true) {
-                            $('#loading-spinner').hide()
-                            $('.login').hide()
-                            $('#getDataBtn').show()
-                            $('#cars').show()
-                        }
-                })
+  <head>
+    <script src="https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1"></script> 
+    <script>
+      var sasJs = new SASjs.default({
+         appLoc: "/Public/app/readme"
+        ,serverType:"SAS9"
+        ,debug: false
+      });
+      function initSasJs() {
+        $('#loading-spinner').show()
+        // instantiate sasjs with options such as backend app location
+        // login (it's also possible to set an autologin when making requests)
+        sasJs.logIn(
+           $('#username')[0].value
+          ,$('#password')[0].value
+        ).then((response) => {
+          if (response.isLoggedIn === true) {
+            $('#loading-spinner').hide()
+            $('.login').hide()
+            $('#getdata').show()
+            $('#cars').show()
+          }
+        })
+      }
+      function getData(){
+        $('#loading-spinner').show()
+        $('#myChart').remove();
+        $('#chart-container').append('<canvas id="myChart" style="display: none;"></canvas>')
+        // make a request to a SAS service
+        var type = $("#cars")[0].options[$("#cars")[0].selectedIndex].value;
+        // request data from an endpoint under your appLoc
+        sasJs.request("/common/getdata", {
+            // send data as an array of objects - each object is one row
+            fromjs: [{ type: type }] 
+        }).then((response) => {
+          $('#myChart').show();
+          var labels = []
+          var data = []
+          response.areas.map((d) => {
+            labels.push(d.MAKE);
+            data.push(d.AVPRICE);
+          })
+          $('#loading-spinner').hide()
+          initGraph(labels, data, type);
+        })
+      }
+      function initGraph(labels, data, type){
+        var myCanvas = document.getElementById("myChart");
+        var ctx = myCanvas.getContext("2d");
+        var myChart = new Chart(ctx, {
+            type: 'bar',
+            data: {
+                labels: labels,
+                datasets: [{
+                    label: "Average Invoice Price in USD for " + type + " Cars by Manufacturer",
+                    data: data,
+                    backgroundColor: "rgba(255,99,132,0.2)",
+                    borderColor: "rgba(255,99,132,1)",
+                    borderWidth: 1,
+                    hoverBackgroundColor: "rgba(255,99,132,0.4)",
+                    hoverBorderColor: "rgba(255,99,132,1)",
+                }]
+            },
+            options: {
+                maintainAspectRatio: false,
+                scales: {yAxes: [{ticks: {beginAtZero: true}}]}
             }
-
-            // make a request to a SAS service
-            const getData = () => {
-                $('#loading-spinner').show()
-                $('#myChart').remove()
-                $('#chart-container').append("<canvas id='myChart' style='display: none'></canvas>")
-
-                const type = $('#cars')[0].options[$('#cars')[0].selectedIndex].value
-
-                // request data from an endpoint under your appLoc
-                // send data as an array of objects - each object is one row
-                sasJs.request('/common/getdata', {fromjs: [{ type: type }]})
-                    .then((response) => {
-                        $('#myChart').show()
-                        $('#loading-spinner').hide()
-
-                        const labels = response.areas.map(area => area.MAKE)
-                        const data = response.areas.map(area => area.AVPRICE)
-
-                        initGraph(labels, data, type)
-                    })
-            }
-
-            const initGraph = (labels, data, type) => {
-                const myCanvas = document.getElementById('myChart')
-                const ctx = myCanvas.getContext('2d')
-
-                const myChart = new Chart(ctx, {
-                    type: 'bar',
-                    data: {
-                        labels: labels,
-                        datasets: [{
-                            label: `Average Invoice Price in USD for ${type} Cars by Manufacturer`,
-                            data: data,
-                            backgroundColor: 'rgba(255,99,132,0.2)',
-                            borderColor: 'rgba(255,99,132,1)',
-                            borderWidth: 1,
-                            hoverBackgroundColor: 'rgba(255,99,132,0.4)',
-                            hoverBorderColor: 'rgba(255,99,132,1)',
-                        }]
-                    },
-                    options: {
-                        maintainAspectRatio: false,
-                        scales: {yAxes: [{ticks: {beginAtZero: true}}]}
-                    }
-                })
-            }
-        </script>
-    </head>
-    <body>
-        <div class='container-fluid' style='text-align: center; margin-top: 10px'>
-            <div class='row'>
-                <div class='col-lg-5 col-md-7 col-sm-10 mx-auto mx-auto'>
-                    <h1>Demo Seed App for <span class='code'>SASjs</span></h1>
-                    <div class='login' id='login-form'>
-                        <div class='form-group'>
-                            <input class='form-control' type='text' id='username' placeholder='Enter username' />
-                        </div>
-                        <div class='form-group'>
-                            <input class='form-control' type='password' id='password' placeholder='Enter password' />
-                        </div>
-                        <button id='login' onclick='initSasJs()' class='login btn btn-primary' style='margin-bottom: 5px'>Log In</button>
-                    </div>
-                    <select name='cars' id='cars' style='margin-bottom: 5px; display: none' class='form-control'>
-                        <option value='Hybrid'>Hybrid</option>
-                        <option value='SUV'>SUV</option>
-                        <option value='Sedan'>Sedan</option>
-                        <option value='Sports'>Sports</option>
-                        <option value='Truck'>Truck</option>
-                        <option value='Wagon'>Wagon</option>
-                    </select>
-                    <button id='getDataBtn' onclick='getData()' style='margin-bottom: 5px; display: none' class='btn btn-success'>Get Data</button>
-                    <br>
-                    <br>
-                    <div id='loading-spinner' class='spinner-border text-primary' role='status' style='display: none'>
-                        <span class='sr-only'>Loading...</span>
-                    </div>
-                    <br>
-                </div>
+        });
+      }
+    </script>
+    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=edge" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+  </head>
+  <body>
+    <div class="container-fluid" style="text-align: center; margin-top: 10px;">
+      <div class="row">
+          <div class="col-lg-5 col-md-7 col-sm-10 mx-auto mx-auto">
+          <h1>Demo Seed App for <span class="code">SASjs</span></h1>
+          <div class="login" id="login-form">
+            <div class="form-group">
+              <input class="form-control" type="text" id="username" placeholder="Enter username" />
             </div>
+            <div class="form-group">
+              <input class="form-control" type="password" id="password" placeholder="Enter password" />
+            </div>
+            <button id="login" onclick="initSasJs()" class="login btn btn-primary" style="margin-bottom: 5px;">Log In</button>
+          </div>
+          <select name="cars" id="cars" style="margin-bottom: 5px; display: none;" class="form-control">
+            <option value="Hybrid">Hybrid</option>
+            <option value="SUV">SUV</option>
+            <option value="Sedan">Sedan</option>
+            <option value="Sports">Sports</option>
+            <option value="Truck">Truck</option>
+            <option value="Wagon">Wagon</option>
+          </select>
+          <button id="getdata" onclick="getData()" style="margin-bottom: 5px; display: none;" class="btn btn-success">Get Data</button><br><br>
+          <div id="loading-spinner" class="spinner-border text-primary" role="status" style="display: none;">
+            <span class="sr-only">Loading...</span>
+          </div><br>
         </div>
-        <div id='chart-container' style='height: 65vh; width: 100%; position: relative; margin: auto'>
-            <canvas id='myChart' style='display: none'></canvas>
-        </div>
-    </body>
-</head>
+      </div>
+    </div>
+    <div id="chart-container" style="height: 65vh; width: 100%; position: relative; margin: auto;">
+      <canvas id="myChart" style="display: none;"></canvas>
+    </div>
+  </body>
+</head>

package.json

@@ -5,8 +5,8 @@
     "build": "rimraf build && webpack",
     "package:lib": "npm run build && cp ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
     "publish:lib": "npm run build && cd build && npm publish",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
+    "lint:fix": "npx prettier --write 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
+    "lint": "npx prettier --check 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
     "test": "jest",
     "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
     "postpublish": "git clean -fd",
@@ -22,9 +22,6 @@
       {
         "pkgRoot": "/build"
       }
-    ],
-    "branches": [
-      "main"
     ]
   },
   "keywords": [
@@ -40,23 +37,22 @@
   "license": "ISC",
   "devDependencies": {
     "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.4",
+    "@types/jest": "^26.0.13",
     "cp": "^0.2.0",
     "jest": "^25.5.4",
     "path": "^0.12.7",
-    "prettier": "^2.0.5",
     "rimraf": "^3.0.2",
     "semantic-release": "^17.1.1",
     "ts-jest": "^25.5.1",
-    "ts-loader": "^7.0.5",
-    "tslint": "^6.1.2",
+    "ts-loader": "^8.0.3",
+    "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.6",
+    "typescript": "^3.9.7",
     "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.43.0",
+    "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12"
   },
   "main": "index.js",

sasjs-tests/.prettierrc

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

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 />
-You will also see any lint errors in the console.
+This scripts builds a new version of the adapter and installs it in the `sasjs-tests` project.
 
-### `npm test`
+## Running tests
 
-Launches the test runner in the interactive watch mode.<br />
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+There are three prerequisites to be able to run the tests:
 
-### `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 />
-It correctly bundles React in production mode and optimizes the build for the best performance.
+### 1. Configuring the SASjs adapter
 
-The build is minified and the filenames include the hashes.<br />
-Your app is ready to be deployed!
+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.
 
-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

@@ -1,6 +1,6 @@
 {
-  "name": "sasjs-tests",
-  "version": "0.1.0",
+  "name": "@sasjs/tests",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1356,11 +1356,81 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
+    "@sasjs/adapter": {
+      "version": "1.3.13",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.3.13.tgz",
+      "integrity": "sha512-dWcDxgY3FB7Yx1I5dPpeQeyJDu4lezhIFrjn6lbdwRhV15aqOt4l9o9qZP+VbgOXqyi9gN0Y+p+vs2chBDFQqg==",
+      "requires": {
+        "es6-promise": "^4.2.8",
+        "form-data": "^3.0.0",
+        "isomorphic-fetch": "^2.2.1"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
+    "@sasjs/test-framework": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.4.0.tgz",
+      "integrity": "sha512-Pd8PUH5B5RO6q4w3OQXX7aWicvA/CJMXA/FCf2xp332ZTKBb/5uV+HphAOFKpCh58y+ykYYVSV0ZaDO/4t1h3A==",
+      "requires": {
+        "@types/react-highlight.js": "^1.0.0",
+        "immer": "^7.0.7",
+        "moment": "^2.27.0",
+        "react-highlight.js": "^1.0.7",
+        "semantic-ui-css": "^2.4.1",
+        "semantic-ui-react": "^1.0.0"
+      },
+      "dependencies": {
+        "immer": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.7.tgz",
+          "integrity": "sha512-Q8yYwVADJXrNfp1ZUAh4XDHkcoE3wpdpb4mC5abDSajs2EbW8+cGdPyAnglMyLnm7EF6ojD2xBFX7L5i4TIytw=="
+        }
+      }
+    },
+    "@semantic-ui-react/event-stack": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@semantic-ui-react/event-stack/-/event-stack-3.1.1.tgz",
+      "integrity": "sha512-SA7VOu/tY3OkooR++mm9voeQrJpYXjJaMHO1aFCcSouS2xhqMR9Gnz0LEGLOR0h9ueWPBKaQzKIrx3FTTJZmUQ==",
+      "requires": {
+        "exenv": "^1.2.2",
+        "prop-types": "^15.6.2"
+      }
+    },
     "@sheerun/mutationobserver-shim": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
       "integrity": "sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw=="
     },
+    "@stardust-ui/react-component-event-listener": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@stardust-ui/react-component-event-listener/-/react-component-event-listener-0.38.0.tgz",
+      "integrity": "sha512-sIP/e0dyOrrlb8K7KWumfMxj/gAifswTBC4o68Aa+C/GA73ccRp/6W1VlHvF/dlOR4KLsA+5SKnhjH36xzPsWg==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "prop-types": "^15.7.2"
+      }
+    },
+    "@stardust-ui/react-component-ref": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@stardust-ui/react-component-ref/-/react-component-ref-0.38.0.tgz",
+      "integrity": "sha512-xjs6WnvJVueSIXMWw0C3oWIgAPpcD03qw43oGOjUXqFktvpNkB73JoKIhS4sCrtQxBdct75qqr4ZL6JiyPcESw==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.6.3"
+      }
+    },
     "@svgr/babel-plugin-add-jsx-attribute": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
@@ -1836,6 +1906,14 @@
         "@types/react": "*"
       }
     },
+    "@types/react-highlight.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/react-highlight.js/-/react-highlight.js-1.0.0.tgz",
+      "integrity": "sha512-5VXEuo2O9L66y/2GDQSGFTggQkpOvDc/p2ma1KHadu7o/H720HK3Fr83epd4wtQky7B/RoCPat0SKyhlhiUo7A==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
     "@types/react-router": {
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.8.tgz",
@@ -3754,6 +3832,11 @@
         "shallow-clone": "^0.1.2"
       }
     },
+    "clsx": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
+      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
+    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -4095,6 +4178,15 @@
         "sha.js": "^2.4.8"
       }
     },
+    "create-react-context": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
+      "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
+      "requires": {
+        "gud": "^1.0.0",
+        "warning": "^4.0.3"
+      }
+    },
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -4912,11 +5004,21 @@
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
     "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "requires": {
-        "iconv-lite": "~0.4.13"
+        "iconv-lite": "^0.6.2"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
       }
     },
     "end-of-stream": {
@@ -5609,6 +5711,11 @@
         "strip-eof": "^1.0.0"
       }
     },
+    "exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+    },
     "exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -6478,6 +6585,11 @@
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
     },
+    "gud": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
+      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+    },
     "gzip-size": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
@@ -6622,6 +6734,11 @@
       "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
+    "highlight.js": {
+      "version": "9.18.3",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz",
+      "integrity": "sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ=="
+    },
     "history": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
@@ -7974,6 +8091,11 @@
         }
       }
     },
+    "jquery": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+    },
     "js-base64": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.2.tgz",
@@ -8123,6 +8245,11 @@
         "object.assign": "^4.1.0"
       }
     },
+    "keyboard-key": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keyboard-key/-/keyboard-key-1.1.0.tgz",
+      "integrity": "sha512-qkBzPTi3rlAKvX7k0/ub44sqOfXeLc/jcnGGmj5c7BJpU8eDrEVPyhCvNYAaoubbsLm9uGWwQJO1ytQK1a9/dQ=="
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -8887,6 +9014,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "moment": {
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -9880,6 +10012,11 @@
         "ts-pnp": "^1.1.6"
       }
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
+    },
     "portfinder": {
       "version": "1.0.26",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
@@ -11321,11 +11458,34 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
       "integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA=="
     },
+    "react-highlight.js": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/react-highlight.js/-/react-highlight.js-1.0.7.tgz",
+      "integrity": "sha512-OVPKnV0ZvU+V//HExwbV8M9CWy49Eo/9y9pBN2OsNWUFPN6dE4YZBLmJW/5sM2DxI5v/QQLyxOnTnSSfGCP+9Q==",
+      "requires": {
+        "highlight.js": "^9.3.0",
+        "prop-types": "^15.6.0"
+      }
+    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "react-popper": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz",
+      "integrity": "sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "create-react-context": "^0.3.0",
+        "deep-equal": "^1.1.1",
+        "popper.js": "^1.14.4",
+        "prop-types": "^15.6.1",
+        "typed-styles": "^0.0.7",
+        "warning": "^4.0.2"
+      }
+    },
     "react-router": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
@@ -11950,27 +12110,6 @@
       "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-10.0.0.tgz",
       "integrity": "sha512-vTxrZz4dX5W86M6oVWVdOVe72ZiPs41Oi7Z6Km4W5Turyz28mrXSJhhEBZoRtzJWIv3833WKVwLSDWWkEfupMg=="
     },
-    "sasjs": {
-      "version": "file:../build/sasjs-5.0.0.tgz",
-      "integrity": "sha512-8Ez2iS8BKzu2GG1Cwf/pe5PgNvdhowFodQNCTHIxMlDYgLqmg1mcpwRjJjnXF9A73gX0NkR65olYYAesp8cMMA==",
-      "requires": {
-        "es6-promise": "^4.2.8",
-        "form-data": "^3.0.0",
-        "isomorphic-fetch": "^2.2.1"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
-          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        }
-      }
-    },
     "sass-graph": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
@@ -12086,6 +12225,47 @@
         "node-forge": "0.9.0"
       }
     },
+    "semantic-ui-css": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/semantic-ui-css/-/semantic-ui-css-2.4.1.tgz",
+      "integrity": "sha512-Pkp0p9oWOxlH0kODx7qFpIRYpK1T4WJOO4lNnpNPOoWKCrYsfHqYSKgk5fHfQtnWnsAKy7nLJMW02bgDWWFZFg==",
+      "requires": {
+        "jquery": "x.*"
+      }
+    },
+    "semantic-ui-react": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.2.0.tgz",
+      "integrity": "sha512-9tNL94nEy16RdupTQNiURyemWUIxtTpQgFimCbOOHRBOe1ApsFz3FWFsrGjv9zFtE7dQMslLYov9BQOelTCVwA==",
+      "requires": {
+        "@babel/runtime": "^7.10.5",
+        "@semantic-ui-react/event-stack": "^3.1.0",
+        "@stardust-ui/react-component-event-listener": "~0.38.0",
+        "@stardust-ui/react-component-ref": "~0.38.0",
+        "clsx": "^1.1.1",
+        "keyboard-key": "^1.1.0",
+        "lodash": "^4.17.19",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.8.6",
+        "react-popper": "^1.3.7",
+        "shallowequal": "^1.1.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.11.2",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+          "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "lodash": {
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+        }
+      }
+    },
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -12275,6 +12455,11 @@
         }
       }
     },
+    "shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -13443,6 +13628,11 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-styles": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
+      "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -13744,6 +13934,14 @@
         "makeerror": "1.0.x"
       }
     },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "watchpack": {
       "version": "1.7.2",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",

sasjs-tests/package.json

@@ -1,9 +1,11 @@
 {
-  "name": "sasjs-tests",
-  "version": "0.1.0",
+  "name": "@sasjs/tests",
+  "version": "1.0.0",
   "homepage": ".",
   "private": true,
   "dependencies": {
+    "@sasjs/adapter": "^1.3.13",
+    "@sasjs/test-framework": "^1.4.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
@@ -16,7 +18,6 @@
     "react-dom": "^16.13.1",
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.1",
-    "sasjs": "file:../build/sasjs-5.0.0.tgz",
     "typescript": "^3.9.6"
   },
   "scripts": {
@@ -24,7 +25,9 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "deploy": "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"
@@ -44,4 +47,4 @@
   "devDependencies": {
     "node-sass": "^4.14.1"
   }
-}
+}

sasjs-tests/public/config.json

@@ -6,6 +6,7 @@
     "appLoc": "/Public/app",
     "serverType": "SASVIYA",
     "debug": false,
-    "contextName": null
+    "contextName": "SharedCompute",
+    "useComputeApi": true
   }
 }

sasjs-tests/src/App.scss

@@ -1,102 +0,0 @@
-.app {
-  padding: 16px;
-
-  .controls {
-    display: flex;
-    align-items: center;
-    .debug-toggle,
-    .app-loc-input,
-    .submit-button {
-      margin: 16px 0;
-    }
-
-    .row {
-      margin: 16px;
-
-      &.app-loc {
-        width: 20vw;
-      }
-    }
-
-    .submit-button {
-      padding: 16px;
-      font-size: 1.25em;
-    }
-
-    .app-loc-input {
-      width: 100%;
-    }
-  }
-
-  .debug-toggle {
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-
-    .label {
-      padding: 0 8px;
-      font-size: 1.25em;
-    }
-  }
-
-  $height: 40px;
-  $width: 70px;
-  .switch {
-    position: relative;
-    display: inline-flex;
-    width: $width;
-    height: $height;
-
-    input[type="checkbox"] {
-      display: none;
-    }
-    input:checked + .knob {
-      animation: colorChange 0.4s linear forwards;
-    }
-    input:checked + .knob:before {
-      animation: turnON 0.4s linear forwards;
-    }
-  }
-
-  @keyframes colorChange {
-    from {
-      background-color: #ccc;
-    }
-    50% {
-      background-color: #a4d9ad;
-    }
-    to {
-      background-color: #4bd663;
-    }
-  }
-  @keyframes turnON {
-    from {
-      transform: translateX(0px);
-    }
-    to {
-      transform: translateX($width - ($height * 0.99));
-      box-shadow: -10px 0px 44px 0px #434343;
-    }
-  }
-
-  .knob {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: #ccc;
-    border-radius: $height;
-  }
-
-  .knob:before {
-    position: absolute;
-    background-color: white;
-    content: "";
-    left: $height * 0.1;
-    top: $height * 0.1;
-    width: ($height * 0.8);
-    height: ($height * 0.8);
-    border-radius: 50%;
-  }
-}

sasjs-tests/src/App.test.js

@@ -1,10 +1,9 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import App from './App';
+import React from "react";
+import { render } from "@testing-library/react";
+import App from "./App";
 
-test('renders learn react link', () => {
+test("renders learn react link", () => {
   const { getByText } = render(<App />);
   const linkElement = getByText(/learn react/i);
-
   expect(linkElement).toBeInTheDocument();
 });

sasjs-tests/src/App.tsx

@@ -1,54 +1,30 @@
 import React, { ReactElement, useState, useContext, useEffect } from "react";
-import "./App.scss";
-import TestSuiteRunner from "./TestSuiteRunner";
-import { AppContext } from "./context/AppContext";
+import { TestSuiteRunner, TestSuite, AppContext } from "@sasjs/test-framework";
+import { basicTests } from "./testSuites/Basic";
+import { sendArrTests, sendObjTests } from "./testSuites/RequestData";
+import { specialCaseTests } from "./testSuites/SpecialCases";
+import { sasjsRequestTests } from "./testSuites/SasjsRequests";
+import "@sasjs/test-framework/dist/index.css";
 
 const App = (): ReactElement<{}> => {
-  const [appLoc, setAppLoc] = useState("");
-  const [debug, setDebug] = useState(false);
-  const { adapter } = useContext(AppContext);
+  const { adapter, config } = useContext(AppContext);
+  const [testSuites, setTestSuites] = useState<TestSuite[]>([]);
 
   useEffect(() => {
-    if (adapter) adapter.setDebugState(debug);
-  }, [debug, adapter]);
-
-  useEffect(() => {
-    if (appLoc && adapter) {
-      adapter.setSASjsConfig({ ...adapter.getSasjsConfig(), appLoc });
+    if (adapter) {
+      setTestSuites([
+        basicTests(adapter, config.userName, config.password),
+        sendArrTests(adapter),
+        sendObjTests(adapter),
+        specialCaseTests(adapter),
+        sasjsRequestTests(adapter)
+      ]);
     }
-  }, [appLoc, adapter]);
-
-  useEffect(() => {
-    setAppLoc(adapter.getSasjsConfig().appLoc);
-  }, [adapter]);
+  }, [adapter, config]);
 
   return (
     <div className="app">
-      <div className="controls">
-        <div className="row">
-          <label>Debug</label>
-          <div className="debug-toggle">
-            <label className="switch">
-              <input
-                type="checkbox"
-                onChange={(e) => setDebug(e.target.checked)} // FIXME: rename 'e' => 'event'
-              />
-              <span className="knob"></span>
-            </label>
-          </div>
-        </div>
-        <div className="row app-loc">
-          <label>App Loc</label>
-          <input
-            type="text"
-            className="app-loc-input"
-            value={appLoc}
-            onChange={(e) => setAppLoc(e.target.value)} // FIXME: rename 'e' => 'event'
-            placeholder="AppLoc"
-          />
-        </div>
-      </div>
-      {adapter && <TestSuiteRunner adapter={adapter} />}
+      {adapter && testSuites && <TestSuiteRunner testSuites={testSuites} />}
     </div>
   );
 };

sasjs-tests/src/Login.tsx

@@ -1,6 +1,6 @@
 import React, { ReactElement, useState, useCallback, useContext } from "react";
 import "./Login.scss";
-import { AppContext } from "./context/AppContext";
+import { AppContext } from "@sasjs/test-framework";
 import { Redirect } from "react-router-dom";
 
 const Login = (): ReactElement<{}> => {
@@ -9,14 +9,11 @@ const Login = (): ReactElement<{}> => {
   const appContext = useContext(AppContext);
 
   const handleSubmit = useCallback(
-    (e) => { // FIXME: rename 'e' => 'event'
+    (e) => {
       e.preventDefault();
-
-      appContext.adapter.logIn(username, password)
-        .then(() => {
-            appContext.setIsLoggedIn(true);
-        });
-        // FIXME: catch block
+      appContext.adapter.logIn(username, password).then((res) => {
+        appContext.setIsLoggedIn(res.isLoggedIn);
+      });
     },
     [username, password, appContext]
   );
@@ -41,7 +38,7 @@ const Login = (): ReactElement<{}> => {
             type="password"
             value={password}
             required
-            onChange={(e) => setPassword(e.target.value)} // FIXME: rename 'e' => 'event'
+            onChange={(e) => setPassword(e.target.value)}
           />
         </div>
         <button type="submit" className="submit-button">
@@ -54,4 +51,4 @@ const Login = (): ReactElement<{}> => {
   );
 };
 
-export default Login;
+export default Login;

sasjs-tests/src/PrivateRoute.tsx

@@ -1,6 +1,6 @@
 import React, { ReactElement, useContext, FunctionComponent } from "react";
 import { Redirect, Route } from "react-router-dom";
-import { AppContext } from "./context/AppContext";
+import { AppContext } from "@sasjs/test-framework";
 
 interface PrivateRouteProps {
   component: FunctionComponent;
@@ -8,14 +8,16 @@ interface PrivateRouteProps {
   path: string;
 }
 
-const PrivateRoute = (props: PrivateRouteProps): ReactElement<PrivateRouteProps> => {
+const PrivateRoute = (
+  props: PrivateRouteProps
+): ReactElement<PrivateRouteProps> => {
   const { component, path, exact } = props;
   const appContext = useContext(AppContext);
-
-  return appContext.isLoggedIn ?
+  return appContext.isLoggedIn ? (
     <Route component={component} path={path} exact={exact} />
-    :
+  ) : (
     <Redirect to="/login" />
+  );
 };
 
-export default PrivateRoute;
+export default PrivateRoute;

sasjs-tests/src/TestSuiteRunner.scss

@@ -1,19 +0,0 @@
-.button-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 16px;
-
-  .loading-spinner {
-    margin: 0 8px;
-  }
-
-  .submit-button {
-    padding: 10px;
-    min-height: 80px;
-    font-size: 2em;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-}

sasjs-tests/src/TestSuiteRunner.tsx

@@ -1,125 +0,0 @@
-import React, { useEffect, useState, ReactElement, useContext } from "react";
-import TestSuiteComponent from "./components/TestSuite";
-import TestSuiteCard from "./components/TestSuiteCard";
-import { TestSuite, Test } from "./types";
-import { basicTests } from "./testSuites/Basic"; // FIXME: declared but never used
-import "./TestSuiteRunner.scss";
-import SASjs from "sasjs";
-import { AppContext } from "./context/AppContext";
-import { sendArrTests, sendObjTests } from "./testSuites/RequestData"; // FIXME: declared but never used
-import { specialCaseTests } from "./testSuites/SpecialCases";
-import { sasjsRequestTests } from "./testSuites/SasjsRequests"; // FIXME: declared but never used
-
-interface TestSuiteRunnerProps {
-  adapter: SASjs;
-}
-
-const TestSuiteRunner = (props: TestSuiteRunnerProps): ReactElement<TestSuiteRunnerProps> => {
-  const { adapter } = props;
-  const { config } = useContext(AppContext); // FIXME: declared but never used
-  const [testSuites, setTestSuites] = useState<TestSuite[]>([]);
-  const [runTests, setRunTests] = useState(false);
-  const [completedTestSuites, setCompletedTestSuites] = useState< // FIXME: create interface
-    {
-      name: string;
-      completedTests: {
-        test: Test;
-        result: boolean;
-        error: Error | null;
-        executionTime: number;
-      }[];
-    }[]
-  >([]);
-  const [currentTestSuite, setCurrentTestSuite] = useState<TestSuite | null>(
-    (null as unknown) as TestSuite
-  );
-
-  useEffect(() => {
-    if (adapter) {
-      setTestSuites([
-        // basicTests(adapter, config.userName, config.password),
-        // sendArrTests(adapter),
-        // sendObjTests(adapter),
-        specialCaseTests(adapter),
-        // sasjsRequestTests(adapter),
-      ]);
-      setCompletedTestSuites([]);
-    }
-  }, [adapter]);
-
-  useEffect(() => {
-    if (testSuites.length) {
-      setCurrentTestSuite(testSuites[0]);
-    }
-  }, [testSuites]);
-
-  useEffect(() => {
-    if (runTests) {
-      setCompletedTestSuites([]);
-      setCurrentTestSuite(testSuites[0]);
-    }
-  }, [runTests, testSuites]);
-
-  return (
-    <>
-      <div className="button-container">
-        <button
-          className={runTests ? "submit-button disabled" : "submit-button"} // TODO: 'submit-button' class should be assigned by default
-          onClick={() => setRunTests(true)}
-          disabled={runTests}
-        >
-          {runTests ? (
-            <>
-            {
-                // FIXME: fragment is not needed in this case
-            }
-              <div className="loading-spinner"></div>Running tests... 
-            </>
-          ) : (
-            "Run tests!"
-          )}
-        </button>
-      </div>
-      {completedTestSuites.map((completedTestSuite, index) => { // TODO: refactor
-        return (
-          <TestSuiteCard
-            key={index}
-            tests={completedTestSuite.completedTests}
-            name={completedTestSuite.name}
-          />
-        );
-      })}
-      {currentTestSuite && runTests && (
-        <TestSuiteComponent
-          {...currentTestSuite}
-          onCompleted={(
-            name,
-            completedTests: {
-              test: Test;
-              result: boolean;
-              error: Error | null;
-              executionTime: number;
-            }[]
-          ) => {
-            const currentIndex = testSuites.indexOf(currentTestSuite);
-            const nextIndex = currentIndex < testSuites.length - 1 ? currentIndex + 1 : -1;
-
-            if (nextIndex >= 0) setCurrentTestSuite(testSuites[nextIndex]);
-            else setCurrentTestSuite(null);
-
-            const newCompletedTestSuites = [
-              ...completedTestSuites,
-              { name, completedTests },
-            ];
-
-            setCompletedTestSuites(newCompletedTestSuites);
-
-            if (newCompletedTestSuites.length === testSuites.length) setRunTests(false);
-          }}
-        />
-      )}
-    </>
-  );
-};
-
-export default TestSuiteRunner;

sasjs-tests/src/components/Test.tsx

@@ -1,87 +0,0 @@
-import React, { ReactElement, useEffect, useState } from "react";
-import TestCard from "./TestCard";
-import { start } from "repl"; // FIXME: declared but never used
-
-interface TestProps {
-  title: string;
-  description: string;
-  beforeTest?: (...args: any) => Promise<any>;
-  afterTest?: (...args: any) => Promise<any>;
-  test: (context: any) => Promise<any>;
-  assertion: (...args: any) => boolean;
-  onCompleted: (payload: {
-    result: boolean;
-    error: Error | null;
-    executionTime: number;
-  }) => void;
-  context: any;
-}
-
-const getStatus = (isRunning: boolean, isPassed: boolean): string => {
-  return isRunning ? "running" : isPassed ? "passed" : "failed";
-};
-
-const Test = (props: TestProps): ReactElement<TestProps> => {
-  const {
-    title,
-    description,
-    test,
-    beforeTest,
-    afterTest,
-    assertion,
-    onCompleted,
-    context,
-  } = props;
-  const beforeTestFunction = beforeTest ? beforeTest : () => Promise.resolve();
-  const afterTestFunction = afterTest ? afterTest : () => Promise.resolve();
-  const [isRunning, setIsRunning] = useState(false);
-  const [isPassed, setIsPassed] = useState(false);
-
-  useEffect(() => {
-    if (test && assertion) {
-      const startTime = new Date().valueOf()
-
-      setIsRunning(true);
-      setIsPassed(false);
-
-      beforeTestFunction()
-        .then(() => test(context))
-        .then((res) => {
-          setIsRunning(false);
-          setIsPassed(assertion(res, context))
-
-          return Promise.resolve(assertion(res, context));
-        })
-        .then((testResult) => {
-          afterTestFunction();
-
-          const endTime = new Date().valueOf();
-          const executionTime = (endTime - startTime) / 1000;
-
-          onCompleted({ result: testResult, error: null, executionTime });
-        })
-        .catch((e) => {
-          setIsRunning(false);
-          setIsPassed(false);
-
-          console.error(e);
-
-          const endTime = new Date().valueOf();
-          const executionTime = (endTime - startTime) / 1000;
-
-          onCompleted({ result: false, error: e, executionTime });
-        });
-    }
-  }, [test, assertion]);
-
-  return (
-    <TestCard
-      title={title}
-      description={description}
-      status={getStatus(isRunning, isPassed)}
-      error={null}
-    />
-  );
-};
-
-export default Test;

sasjs-tests/src/components/TestCard.scss

@@ -1,62 +0,0 @@
-.test {
-  display: inline-flex;
-  padding: 8px;
-  margin: 8px;
-  flex-direction: column;
-  border: 1px solid #ddd;
-  border-radius: 5px;
-  width: 20%;
-
-  .title {
-    font-weight: bold;
-    color: #eee;
-    font-size: 1em;
-  }
-
-  .description,
-  .execution-time {
-    color: #c6c0c0;
-    padding: 8px 0;
-    font-size: 0.8em;
-  }
-
-  .description {
-    min-height: 50px;
-  }
-
-  .execution-time {
-    color: #f9e804;
-  }
-
-  .icon {
-    border-radius: 50%;
-    width: 12px;
-    height: 12px;
-    margin-right: 8px;
-    display: inline-block;
-
-    &.running {
-      background-color: yellow;
-    }
-
-    &.passed {
-      background-color: green;
-    }
-
-    &.failed {
-      background-color: red;
-    }
-  }
-}
-
-@media only screen and (max-width: 900px) {
-  .test {
-    width: 90%;
-  }
-}
-
-@media only screen and (min-width: 901px) and (max-width: 1280px) {
-  .test {
-    width: 30%;
-  }
-}

sasjs-tests/src/components/TestCard.tsx

@@ -1,43 +0,0 @@
-import React, { ReactElement } from "react";
-import "./TestCard.scss";
-
-interface TestCardProps {
-  title: string;
-  description: string;
-  status: string;
-  error: Error | null;
-  executionTime?: number;
-}
-const TestCard = (props: TestCardProps): ReactElement<TestCardProps> => {
-  const { title, description, status, error, executionTime } = props;
-
-  return (
-    <div className="test">
-      <code className="title">{title}</code>
-      <span className="description">{description}</span>
-      <span className="execution-time">
-        {executionTime ? executionTime.toFixed(2) + "s" : ""}
-      </span>
-      {status === "running" && ( // FIXME: use switch statement
-        <div>
-          <span className="icon running"></span>Running...
-        </div>
-      )}
-      {status === "passed" && (
-        <div>
-          <span className="icon passed"></span>Passed
-        </div>
-      )}
-      {status === "failed" && (
-        <>
-          <div>
-            <span className="icon failed"></span>Failed
-          </div>
-          {!!error && <code>{error.message}</code>}
-        </>
-      )}
-    </div>
-  );
-};
-
-export default TestCard;

sasjs-tests/src/components/TestSuite.tsx

@@ -1,101 +0,0 @@
-import React, { ReactElement, useState, useEffect } from "react";
-import "./TestSuiteCard.scss";
-import { Test } from "../types";
-import TestComponent from "./Test";
-import TestCard from "./TestCard";
-
-interface TestSuiteProps {
-  name: string;
-  tests: Test[];
-  beforeAll?: (...args: any) => Promise<any>;
-  afterAll?: (...args: any) => Promise<any>;
-  onCompleted: (
-    name: string,
-    completedTests: {
-      test: Test;
-      result: boolean;
-      error: Error | null;
-      executionTime: number;
-    }[]
-  ) => void;
-}
-const TestSuite = (props: TestSuiteProps): ReactElement<TestSuiteProps> => {
-  const { name, tests, beforeAll, afterAll, onCompleted } = props;
-  const [context, setContext] = useState<any>(null);
-  const [completedTests, setCompletedTests] = useState< // TODO: create an interface
-    {
-      test: Test;
-      result: boolean;
-      error: Error | null;
-      executionTime: number;
-    }[]
-  >([]);
-  const [currentTest, setCurrentTest] = useState<Test | null>(
-    (null as unknown) as Test // ?
-  );
-
-  useEffect(() => {
-    if (beforeAll) beforeAll().then((data) => setContext({ data }))
-  }, [beforeAll]);
-
-  useEffect(() => {
-    if (tests.length) setCurrentTest(tests[0])
-
-    setCompletedTests([]);
-    setContext(null);
-  }, [tests]);
-
-  return (!!beforeAll && !!context) || !beforeAll ? ( // ?
-    <div className="test-suite">
-      <div className="test-suite-name running">{name}</div>
-      {currentTest && (
-        <TestComponent
-          {...currentTest}
-          context={context}
-          onCompleted={(completedTest) => {
-            const newCompleteTests = [
-              ...completedTests,
-              {
-                test: currentTest,
-                result: completedTest.result,
-                error: completedTest.error,
-                executionTime: completedTest.executionTime,
-              },
-            ]
-
-            setCompletedTests(newCompleteTests);
-
-            const currentIndex = tests.indexOf(currentTest);
-            const nextIndex = currentIndex < tests.length - 1 ? currentIndex + 1 : -1;
-
-            if (nextIndex >= 0) setCurrentTest(tests[nextIndex]);
-            else setCurrentTest(null);
-
-            if (newCompleteTests.length === tests.length) {
-              if (afterAll) afterAll().then(() => onCompleted(name, newCompleteTests))
-              else onCompleted(name, newCompleteTests)
-            }
-          }}
-        />
-      )}
-      {completedTests.map((test, index) => {
-        const { test, result, error } = test;
-        const { title, description } = test;
-
-        return (
-          <TestCard
-            key={index}
-            title={title}
-            description={description}
-            status={result === true ? "passed" : "failed"}
-            error={error}
-          />
-        );
-      })}
-    </div>
-  ) : (
-    <></> // FIXME: use {null} instead
-  );
-};
-
-export default TestSuite;

sasjs-tests/src/components/TestSuiteCard.scss

@@ -1,19 +0,0 @@
-.test-suite {
-    .test-suite-name {
-        font-size: 1.5em;
-        font-weight: bold;
-        color: #1f2027;
-
-        &.passed {
-            color: green;
-        }
-
-        &.failed {
-            color: red;
-        }
-
-        &.running {
-            color: yellow;
-        }
-    }
-}

sasjs-tests/src/components/TestSuiteCard.tsx

@@ -1,43 +0,0 @@
-import React, { ReactElement } from "react";
-import "./TestSuiteCard.scss";
-import { Test } from "../types";
-import TestCard from "./TestCard";
-
-interface TestSuiteCardProps {
-  name: string;
-  tests: {
-    test: Test;
-    result: boolean;
-    error: Error | null;
-    executionTime: number;
-  }[];
-}
-const TestSuiteCard = (props: TestSuiteCardProps): ReactElement<TestSuiteCardProps> => {
-  const { name, tests } = props;
-  const overallStatus = tests.map((t) => t.result).reduce((x, y) => x && y); // TODO: refactor variable names
-
-  return (
-    <div className="test-suite">
-      <div className={`test-suite-name ${overallStatus ? "passed" : "failed"}`}>
-        {name}
-      </div>
-      {tests.map((test, index) => {
-        const { test, result, error, executionTime } = test;
-        const { title, description } = test;
-
-        return (
-          <TestCard
-            key={index}
-            title={title}
-            description={description}
-            status={result === true ? "passed" : "failed"}
-            error={error}
-            executionTime={executionTime}
-          />
-        );
-      })}
-    </div>
-  );
-};
-
-export default TestSuiteCard;

sasjs-tests/src/context/AppContext.tsx

@@ -1,52 +0,0 @@
-import React, { createContext, useState, useEffect, ReactNode } from "react";
-import SASjs from "sasjs";
-
-export const AppContext = createContext<{ // TODO: create an interface
-  config: any; // TODO: be more specific on type declaration
-  sasJsConfig: any; // TODO: be more specific on type declaration
-  isLoggedIn: boolean;
-  setIsLoggedIn: (value: boolean) => void;
-  adapter: SASjs;
-}>({
-  config: null,
-  sasJsConfig: null,
-  isLoggedIn: false,
-  setIsLoggedIn: (null as unknown) as (value: boolean) => void,
-  adapter: (null as unknown) as SASjs,
-});
-
-export const AppProvider = (props: { children: ReactNode }) => {
-  const [config, setConfig] = useState<{ sasJsConfig: any }>({sasJsConfig: null}); // TODO: be more specific on type declaration
-  const [adapter, setAdapter] = useState<SASjs>((null as unknown) as SASjs);
-  const [isLoggedIn, setIsLoggedIn] = useState(false);
-
-  useEffect(() => {
-    fetch("config.json") // TODO: use axios instead of fetch
-      .then((res) => res.json())
-      .then((configJson: any) => { // TODO: be more specific on type declaration
-        setConfig(configJson);
-
-        const sasjs = new SASjs(configJson.sasJsConfig);
-
-        setAdapter(sasjs);
-
-        sasjs.checkSession().then((response) => {
-          setIsLoggedIn(response.isLoggedIn);
-        }); // FIXME: add catch block
-      });// FIXME: add catch block
-  }, []);
-
-  return (
-    <AppContext.Provider
-      value={{
-        config,
-        sasJsConfig: config.sasJsConfig,
-        isLoggedIn,
-        setIsLoggedIn,
-        adapter,
-      }}
-    >
-      {props.children}
-    </AppContext.Provider>
-  );
-};

sasjs-tests/src/index.scss

@@ -1,8 +1,7 @@
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
-    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-    sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans",
+    "Droid Sans", "Helvetica Neue", sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   background-color: #1f2027;
@@ -10,8 +9,7 @@ body {
 }
 
 * {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
-    monospace;
+  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
 input {

sasjs-tests/src/index.tsx

@@ -3,7 +3,7 @@ import ReactDOM from "react-dom";
 import { Route, HashRouter, Switch } from "react-router-dom";
 import "./index.scss";
 import * as serviceWorker from "./serviceWorker";
-import { AppProvider } from "./context/AppContext";
+import { AppProvider } from "@sasjs/test-framework";
 import PrivateRoute from "./PrivateRoute";
 import Login from "./Login";
 import App from "./App";

sasjs-tests/src/serviceWorker.js

@@ -11,9 +11,9 @@
 // opt-in, read https://bit.ly/CRA-PWA
 
 const isLocalhost = Boolean(
-  window.location.hostname === 'localhost' ||
+  window.location.hostname === "localhost" ||
     // [::1] is the IPv6 localhost address.
-    window.location.hostname === '[::1]' ||
+    window.location.hostname === "[::1]" ||
     // 127.0.0.0/8 are considered localhost for IPv4.
     window.location.hostname.match(
       /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
@@ -21,7 +21,7 @@ const isLocalhost = Boolean(
 );
 
 export function register(config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+  if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) {
     // The URL constructor is available in all browsers that support SW.
     const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
     if (publicUrl.origin !== window.location.origin) {
@@ -31,7 +31,7 @@ export function register(config) {
       return;
     }
 
-    window.addEventListener('load', () => {
+    window.addEventListener("load", () => {
       const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
 
       if (isLocalhost) {
@@ -42,8 +42,8 @@ export function register(config) {
         // service worker/PWA documentation.
         navigator.serviceWorker.ready.then(() => {
           console.log(
-            'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://bit.ly/CRA-PWA'
+            "This web app is being served cache-first by a service " +
+              "worker. To learn more, visit https://bit.ly/CRA-PWA"
           );
         });
       } else {
@@ -57,21 +57,21 @@ export function register(config) {
 function registerValidSW(swUrl, config) {
   navigator.serviceWorker
     .register(swUrl)
-    .then(registration => {
+    .then((registration) => {
       registration.onupdatefound = () => {
         const installingWorker = registration.installing;
         if (installingWorker == null) {
           return;
         }
         installingWorker.onstatechange = () => {
-          if (installingWorker.state === 'installed') {
+          if (installingWorker.state === "installed") {
             if (navigator.serviceWorker.controller) {
               // At this point, the updated precached content has been fetched,
               // but the previous service worker will still serve the older
               // content until all client tabs are closed.
               console.log(
-                'New content is available and will be used when all ' +
-                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+                "New content is available and will be used when all " +
+                  "tabs for this page are closed. See https://bit.ly/CRA-PWA."
               );
 
               // Execute callback
@@ -82,7 +82,7 @@ function registerValidSW(swUrl, config) {
               // At this point, everything has been precached.
               // It's the perfect time to display a
               // "Content is cached for offline use." message.
-              console.log('Content is cached for offline use.');
+              console.log("Content is cached for offline use.");
 
               // Execute callback
               if (config && config.onSuccess) {
@@ -93,25 +93,25 @@ function registerValidSW(swUrl, config) {
         };
       };
     })
-    .catch(error => {
-      console.error('Error during service worker registration:', error);
+    .catch((error) => {
+      console.error("Error during service worker registration:", error);
     });
 }
 
 function checkValidServiceWorker(swUrl, config) {
   // Check if the service worker can be found. If it can't reload the page.
   fetch(swUrl, {
-    headers: { 'Service-Worker': 'script' },
+    headers: { "Service-Worker": "script" }
   })
-    .then(response => {
+    .then((response) => {
       // Ensure service worker exists, and that we really are getting a JS file.
-      const contentType = response.headers.get('content-type');
+      const contentType = response.headers.get("content-type");
       if (
         response.status === 404 ||
-        (contentType != null && contentType.indexOf('javascript') === -1)
+        (contentType != null && contentType.indexOf("javascript") === -1)
       ) {
         // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then(registration => {
+        navigator.serviceWorker.ready.then((registration) => {
           registration.unregister().then(() => {
             window.location.reload();
           });
@@ -123,18 +123,18 @@ function checkValidServiceWorker(swUrl, config) {
     })
     .catch(() => {
       console.log(
-        'No internet connection found. App is running in offline mode.'
+        "No internet connection found. App is running in offline mode."
       );
     });
 }
 
 export function unregister() {
-  if ('serviceWorker' in navigator) {
+  if ("serviceWorker" in navigator) {
     navigator.serviceWorker.ready
-      .then(registration => {
+      .then((registration) => {
         registration.unregister();
       })
-      .catch(error => {
+      .catch((error) => {
         console.error(error.message);
       });
   }

sasjs-tests/src/setupTests.js

@@ -2,4 +2,4 @@
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';
+import "@testing-library/jest-dom/extend-expect";

sasjs-tests/src/testSuites/Basic.ts

@@ -1,5 +1,5 @@
-import SASjs, { ServerType, SASjsConfig } from "sasjs";
-import { TestSuite } from "../types";
+import SASjs, { ServerType, SASjsConfig } from "@sasjs/adapter";
+import { TestSuite } from "@sasjs/test-framework";
 
 const defaultConfig: SASjsConfig = {
   serverUrl: window.location.origin,
@@ -9,6 +9,7 @@ const defaultConfig: SASjsConfig = {
   serverType: ServerType.SASViya,
   debug: true,
   contextName: "SAS Job Execution compute context",
+  useComputeApi: false
 };
 
 const customConfig = {
@@ -17,7 +18,7 @@ const customConfig = {
   pathSASViya: "viya",
   appLoc: "/Public/seedapp",
   serverType: ServerType.SAS9,
-  debug: false,
+  debug: false
 };
 
 export const basicTests = (
@@ -33,16 +34,18 @@ export const basicTests = (
       test: async () => {
         return adapter.logIn(userName, password);
       },
-      assertion: (response: any) => // FIXME: be more specific on type declaration
-        response && response.isLoggedIn && response.userName === userName,
+      assertion: (response: any) =>
+        response && response.isLoggedIn && response.userName === userName
     },
     {
       title: "Default config",
-      description: "Should instantiate with default config when none is provided",
-      test: async () => Promise.resolve(new SASjs()),
+      description:
+        "Should instantiate with default config when none is provided",
+      test: async () => {
+        return Promise.resolve(new SASjs());
+      },
       assertion: (sasjsInstance: SASjs) => {
         const sasjsConfig = sasjsInstance.getSasjsConfig();
-        
         return (
           sasjsConfig.serverUrl === defaultConfig.serverUrl &&
           sasjsConfig.pathSAS9 === defaultConfig.pathSAS9 &&
@@ -51,7 +54,7 @@ export const basicTests = (
           sasjsConfig.serverType === defaultConfig.serverType &&
           sasjsConfig.debug === defaultConfig.debug
         );
-      },
+      }
     },
     {
       title: "Custom config",
@@ -69,7 +72,7 @@ export const basicTests = (
           sasjsConfig.serverType === customConfig.serverType &&
           sasjsConfig.debug === customConfig.debug
         );
-      },
+      }
     },
     {
       title: "Config overrides",
@@ -89,7 +92,7 @@ export const basicTests = (
           sasjsConfig.serverType === defaultConfig.serverType &&
           sasjsConfig.debug === false
         );
-      },
-    },
-  ],
+      }
+    }
+  ]
 });

sasjs-tests/src/testSuites/RequestData.ts

@@ -1,44 +1,45 @@
-import SASjs from "sasjs";
-import { TestSuite } from "../types";
+import SASjs from "@sasjs/adapter";
+import { TestSuite } from "@sasjs/test-framework";
 
-const stringData: any = { table1: [{ col1: "first col value" }] }; // TODO: be more specific on type declaration
-const numericData: any = { table1: [{ col1: 3.14159265 }] }; // TODO: be more specific on type declaration
-const multiColumnData: any = { // TODO: be more specific on type declaration
-  table1: [{ col1: 42, col2: 1.618, col3: "x", col4: "x" }],
+const stringData: any = { table1: [{ col1: "first col value" }] };
+const numericData: any = { table1: [{ col1: 3.14159265 }] };
+const multiColumnData: any = {
+  table1: [{ col1: 42, col2: 1.618, col3: "x", col4: "x" }]
 };
-const multipleRowsWithNulls: any = { // TODO: be more specific on type declaration
+const multipleRowsWithNulls: any = {
   table1: [
     { col1: 42, col2: null, col3: "x", col4: "" },
     { col1: 42, col2: null, col3: "x", col4: "" },
     { col1: 42, col2: null, col3: "x", col4: "" },
     { col1: 42, col2: 1.62, col3: "x", col4: "x" },
-    { col1: 42, col2: 1.62, col3: "x", col4: "x" },
-  ],
+    { col1: 42, col2: 1.62, col3: "x", col4: "x" }
+  ]
 };
-const multipleColumnsWithNulls: any = { // TODO: be more specific on type declaration
+const multipleColumnsWithNulls: any = {
   table1: [
     { col1: 42, col2: null, col3: "x", col4: null },
     { col1: 42, col2: null, col3: "x", col4: null },
     { col1: 42, col2: null, col3: "x", col4: null },
     { col1: 42, col2: null, col3: "x", col4: "" },
-    { col1: 42, col2: null, col3: "x", col4: "" },
-  ],
+    { col1: 42, col2: null, col3: "x", col4: "" }
+  ]
 };
 
-const getLongStringData = (length = 32764) => { // FIXME: add type declaration
+const getLongStringData = (length = 32764) => {
   let x = "X";
-
-  for (let i = 1; i <= length; i++) x += 'X'
-
-  const data: any = { table1: [{ col1: x }] }; // TODO: be more specific on type declaration
-
+  for (let i = 1; i <= length; i++) {
+    x = x + "X";
+  }
+  const data: any = { table1: [{ col1: x }] };
   return data;
 };
 
 const getLargeObjectData = () => {
   const data = { table1: [{ big: "data" }] };
 
-  for (let i = 1; i < 10000; i++) data.table1.push(data.table1[0])
+  for (let i = 1; i < 10000; i++) {
+    data.table1.push(data.table1[0]);
+  }
 
   return data;
 };
@@ -49,8 +50,12 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
     {
       title: "Single string value",
       description: "Should send an array with a single string value",
-      test: () => adapter.request("common/sendArr", stringData),
-      assertion: (res: any) => res.table1[0][0] === stringData.table1[0].col1 // TODO: be more specific on type declaration
+      test: () => {
+        return adapter.request("common/sendArr", stringData);
+      },
+      assertion: (res: any) => {
+        return res.table1[0][0] === stringData.table1[0].col1;
+      }
     },
     {
       title: "Long string value",
@@ -59,18 +64,22 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendArr", getLongStringData());
       },
-      assertion: (res: any) => res.table1[0][0] === getLongStringData().table1[0].col1 // TODO: be more specific on type declaration
+      assertion: (res: any) => {
+        const longStringData = getLongStringData();
+        return res.table1[0][0] === longStringData.table1[0].col1;
+      }
     },
     {
       title: "Overly long string value",
       description:
         "Should error out with long string values over 32765 characters",
-      test: () => adapter
-        .request("common/sendArr", getLongStringData(32767))
-        .catch((e) => e), // TODO: rename
-      assertion: (error: any) => { // TODO: be more specific on type declaration
-        return !!error && !!error.MESSAGE; // FIXME: refactor
+      test: () => {
+        const data = getLongStringData(32767);
+        return adapter.request("common/sendArr", data).catch((e) => e);
       },
+      assertion: (error: any) => {
+        return !!error && !!error.MESSAGE;
+      }
     },
     {
       title: "Single numeric value",
@@ -78,9 +87,9 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendArr", numericData);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         return res.table1[0][0] === numericData.table1[0].col1;
-      },
+      }
     },
     {
       title: "Multiple columns",
@@ -88,14 +97,14 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendArr", multiColumnData);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         return (
           res.table1[0][0] === multiColumnData.table1[0].col1 &&
           res.table1[0][1] === multiColumnData.table1[0].col2 &&
           res.table1[0][2] === multiColumnData.table1[0].col3 &&
           res.table1[0][3] === multiColumnData.table1[0].col4
         );
-      },
+      }
     },
     {
       title: "Multiple rows with nulls",
@@ -103,10 +112,9 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendArr", multipleRowsWithNulls);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         let result = true;
-        multipleRowsWithNulls.table1.forEach((_: any, index: number) => { // TODO: be more specific on type declaration
-            // FIXME: use loop
+        multipleRowsWithNulls.table1.forEach((_: any, index: number) => {
           result =
             result &&
             res.table1[index][0] === multipleRowsWithNulls.table1[index].col1;
@@ -120,9 +128,8 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
             result &&
             res.table1[index][3] === multipleRowsWithNulls.table1[index].col4;
         });
-
         return result;
-      },
+      }
     },
     {
       title: "Multiple columns with nulls",
@@ -130,9 +137,9 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendArr", multipleColumnsWithNulls);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         let result = true;
-        multipleColumnsWithNulls.table1.forEach((_: any, index: number) => { // TODO: be more specific on type declaration
+        multipleColumnsWithNulls.table1.forEach((_: any, index: number) => {
           result =
             result &&
             res.table1[index][0] ===
@@ -151,9 +158,9 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
               (multipleColumnsWithNulls.table1[index].col4 || "");
         });
         return result;
-      },
-    },
-  ],
+      }
+    }
+  ]
 });
 
 export const sendObjTests = (adapter: SASjs): TestSuite => ({
@@ -163,12 +170,12 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       title: "Invalid column name",
       description: "Should throw an error",
       test: async () => {
-        const invalidData: any = { // TODO: be more specific on type declaration
-          "1 invalid table": [{ col1: 42 }],
+        const invalidData: any = {
+          "1 invalid table": [{ col1: 42 }]
         };
         return adapter.request("common/sendObj", invalidData).catch((e) => e);
       },
-      assertion: (error: any) => !!error && !!error.MESSAGE, // TODO: be more specific on type declaration
+      assertion: (error: any) => !!error && !!error.MESSAGE
     },
     {
       title: "Single string value",
@@ -176,9 +183,9 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendObj", stringData);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         return res.table1[0].COL1 === stringData.table1[0].col1;
-      },
+      }
     },
     {
       title: "Long string value",
@@ -187,10 +194,10 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendObj", getLongStringData());
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         const longStringData = getLongStringData();
         return res.table1[0].COL1 === longStringData.table1[0].col1;
-      },
+      }
     },
     {
       title: "Overly long string value",
@@ -201,9 +208,9 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
           .request("common/sendObj", getLongStringData(32767))
           .catch((e) => e);
       },
-      assertion: (error: any) => { // TODO: be more specific on type declaration
+      assertion: (error: any) => {
         return !!error && !!error.MESSAGE;
-      },
+      }
     },
     {
       title: "Single numeric value",
@@ -211,9 +218,9 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendObj", numericData);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         return res.table1[0].COL1 === numericData.table1[0].col1;
-      },
+      }
     },
 
     {
@@ -222,10 +229,10 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendObj", getLargeObjectData());
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         const data = getLargeObjectData();
         return res.table1[9000].BIG === data.table1[9000].big;
-      },
+      }
     },
     {
       title: "Multiple columns",
@@ -233,14 +240,14 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendObj", multiColumnData);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         return (
           res.table1[0].COL1 === multiColumnData.table1[0].col1 &&
           res.table1[0].COL2 === multiColumnData.table1[0].col2 &&
           res.table1[0].COL3 === multiColumnData.table1[0].col3 &&
           res.table1[0].COL4 === multiColumnData.table1[0].col4
         );
-      },
+      }
     },
     {
       title: "Multiple rows with nulls",
@@ -248,9 +255,9 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendObj", multipleRowsWithNulls);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         let result = true;
-        multipleRowsWithNulls.table1.forEach((_: any, index: number) => { // TODO: be more specific on type declaration
+        multipleRowsWithNulls.table1.forEach((_: any, index: number) => {
           result =
             result &&
             res.table1[index].COL1 === multipleRowsWithNulls.table1[index].col1;
@@ -265,7 +272,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
             res.table1[index].COL4 === multipleRowsWithNulls.table1[index].col4;
         });
         return result;
-      },
+      }
     },
     {
       title: "Multiple columns with nulls",
@@ -273,9 +280,9 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       test: () => {
         return adapter.request("common/sendObj", multipleColumnsWithNulls);
       },
-      assertion: (res: any) => { // TODO: be more specific on type declaration
+      assertion: (res: any) => {
         let result = true;
-        multipleColumnsWithNulls.table1.forEach((_: any, index: number) => { // TODO: be more specific on type declaration
+        multipleColumnsWithNulls.table1.forEach((_: any, index: number) => {
           result =
             result &&
             res.table1[index].COL1 ===
@@ -294,7 +301,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
               (multipleColumnsWithNulls.table1[index].col4 || "");
         });
         return result;
-      },
-    },
-  ],
-});
+      }
+    }
+  ]
+});

sasjs-tests/src/testSuites/SasjsRequests.ts

@@ -1,7 +1,7 @@
-import SASjs from "sasjs";
-import { TestSuite } from "../types";
+import SASjs from "@sasjs/adapter";
+import { TestSuite } from "@sasjs/test-framework";
 
-const data: any = { table1: [{ col1: "first col value" }] }; // TODO: be more specific on type declaration
+const data: any = { table1: [{ col1: "first col value" }] };
 
 export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
   name: "SASjs Requests",
@@ -9,12 +9,42 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
     {
       title: "WORK tables",
       description: "Should get WORK tables after request",
-      test: async () => adapter.request("common/sendArr", data),
-      assertion: (res: any) => {
-        const requests = adapter.getSasRequests();
-
-        return adapter.getSasjsConfig().debug ? requests[0].SASWORK !== null : requests[0].SASWORK === null
+      test: async () => {
+        return adapter.request("common/sendArr", data);
       },
+      assertion: () => {
+        const requests = adapter.getSasRequests();
+        if (adapter.getSasjsConfig().debug) {
+          return requests[0].SASWORK !== null;
+        } else {
+          return requests[0].SASWORK === null;
+        }
+      }
     },
-  ],
+    {
+      title: "Make error and capture log",
+      description: "Should make an error and capture log",
+      test: async () => {
+        return new Promise(async (resolve, reject) => {
+          adapter
+            .request("common/makeErr", data)
+            .then((res) => {
+              //no action here, this request must throw error
+            })
+            .catch((err) => {
+              let sasRequests = adapter.getSasRequests();
+              let makeErrRequest =
+                sasRequests.find((req) =>
+                  req.serviceLink.includes("makeErr")
+                ) || null;
+
+              resolve(!!makeErrRequest);
+            });
+        });
+      },
+      assertion: (response) => {
+        return response;
+      }
+    }
+  ]
 });

sasjs-tests/src/testSuites/SpecialCases.ts

@@ -1,7 +1,7 @@
-import SASjs from "sasjs";
-import { TestSuite } from "../types";
+import SASjs from "@sasjs/adapter";
+import { TestSuite } from "@sasjs/test-framework";
 
-const specialCharData: any = { // TODO: be more specific on type definition 
+const specialCharData: any = {
   table1: [
     {
       tab: "\t",
@@ -9,16 +9,16 @@ const specialCharData: any = { // TODO: be more specific on type definition
       cr: "\r",
       semicolon: ";semi",
       percent: "%",
-      singleQuote: "'", // TODO: use ``
-      doubleQuote: '"', // TODO: use ``
+      singleQuote: "'",
+      doubleQuote: '"',
       crlf: "\r\n",
       euro: "€euro",
-      banghash: "!#banghash",
-    },
-  ],
+      banghash: "!#banghash"
+    }
+  ]
 };
 
-const moreSpecialCharData: any = { // TODO: be more specific on type definition 
+const moreSpecialCharData: any = {
   table1: [
     {
       speech0: '"speech',
@@ -31,53 +31,51 @@ const moreSpecialCharData: any = { // TODO: be more specific on type definition
       sigma: "Σsigma",
       at: "@at",
       serbian: "Српски",
-      dollar: "$",
-    },
-  ],
+      dollar: "$"
+    }
+  ]
 };
 
-const getWideData = () => { // FIXME: declared but never used
-  const cols: any = {}; // TODO: be more specific on type definition 
-  for (let i = 1; i <= 10000; i++) { // Why 10000?
+const getWideData = () => {
+  const cols: any = {};
+  for (let i = 1; i <= 10000; i++) {
     cols["col" + i] = "test" + i;
   }
 
-  const data: any = { // TODO: be more specific on type definition 
-    table1: [cols],
+  const data: any = {
+    table1: [cols]
   };
 
   return data;
 };
 
-const getTables = () => { // FIXME: declared but never used
-  const tables: any = {}; // TODO: be more specific on type definition 
+const getTables = () => {
+  const tables: any = {};
 
-  for (let i = 1; i <= 100; i++) { // why 100
+  for (let i = 1; i <= 100; i++) {
     tables["table" + i] = [{ col1: "x", col2: "x", col3: "x", col4: "x" }];
   }
-
   return tables;
 };
 
 const getLargeDataset = () => {
-  const rows: any = []; // TODO: be more specific on type definition 
-  const colData: string = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; // FIXME: no need to explicitly mention data type
-
+  const rows: any = [];
+  const colData: string =
+    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
   for (let i = 1; i <= 10000; i++) {
     rows.push({ col1: colData, col2: colData, col3: colData, col4: colData });
   }
 
-  const data: any = { // TODO: be more specific on type definition 
-    table1: rows,
+  const data: any = {
+    table1: rows
   };
 
   return data;
 };
 
-// FIXME: declared but never used
-const errorAndCsrfData: any = { // TODO: be more specific on type definition 
+const errorAndCsrfData: any = {
   error: [{ col1: "q", col2: "w", col3: "e", col4: "r" }],
-  _csrf: [{ col1: "q", col2: "w", col3: "e", col4: "r" }],
+  _csrf: [{ col1: "q", col2: "w", col3: "e", col4: "r" }]
 };
 
 export const specialCaseTests = (adapter: SASjs): TestSuite => ({
@@ -86,8 +84,10 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
     {
       title: "Common special characters",
       description: "Should handle common special characters",
-      test: () => adapter.request("common/sendArr", specialCharData),
-      assertion: (res: any) => { // TODO: be more specific on type definition 
+      test: () => {
+        return adapter.request("common/sendArr", specialCharData);
+      },
+      assertion: (res: any) => {
         return (
           res.table1[0][0] === specialCharData.table1[0].tab &&
           res.table1[0][1] === specialCharData.table1[0].lf &&
@@ -100,138 +100,151 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
           res.table1[0][8] === specialCharData.table1[0].euro &&
           res.table1[0][9] === specialCharData.table1[0].banghash
         );
-      },
+      }
     },
-    // TODO: delete commented out code
-
-    // {
-    //   title: "Other special characters",
-    //   description: "Should handle other special characters",
-    //   test: () => {
-    //     return adapter.request("common/sendArr", moreSpecialCharData);
-    //   },
-    //   assertion: (res: any) => {
-    //     return (
-    //       res.table1[0][0] === moreSpecialCharData.table1[0].speech0 &&
-    //       res.table1[0][1] === moreSpecialCharData.table1[0].pct &&
-    //       res.table1[0][2] === moreSpecialCharData.table1[0].speech &&
-    //       res.table1[0][3] === moreSpecialCharData.table1[0].slash &&
-    //       res.table1[0][4] === moreSpecialCharData.table1[0].slashWithSpecial &&
-    //       res.table1[0][5] === moreSpecialCharData.table1[0].macvar &&
-    //       res.table1[0][6] === moreSpecialCharData.table1[0].chinese &&
-    //       res.table1[0][7] === moreSpecialCharData.table1[0].sigma &&
-    //       res.table1[0][8] === moreSpecialCharData.table1[0].at &&
-    //       res.table1[0][9] === moreSpecialCharData.table1[0].serbian &&
-    //       res.table1[0][10] === moreSpecialCharData.table1[0].dollar
-    //     );
-    //   },
-    // },
-    // {
-    //   title: "Wide table with sendArr",
-    //   description: "Should handle data with 10000 columns",
-    //   test: () => {
-    //     return adapter.request("common/sendArr", getWideData());
-    //   },
-    //   assertion: (res: any) => {
-    //     const data = getWideData();
-    //     let result = true;
-    //     for (let i = 0; i <= 10; i++) {
-    //       result =
-    //         result && res.table1[0][i] === data.table1[0]["col" + (i + 1)];
-    //     }
-    //     return result;
-    //   },
-    // },
-    // {
-    //   title: "Wide table with sendObj",
-    //   description: "Should handle data with 10000 columns",
-    //   test: () => {
-    //     return adapter.request("common/sendObj", getWideData());
-    //   },
-    //   assertion: (res: any) => {
-    //     const data = getWideData();
-    //     let result = true;
-    //     for (let i = 0; i <= 10; i++) {
-    //       result =
-    //         result &&
-    //         res.table1[0]["COL" + (i + 1)] === data.table1[0]["col" + (i + 1)];
-    //     }
-    //     return result;
-    //   },
-    // },
-    // {
-    //   title: "Multiple tables",
-    //   description: "Should handle data with 100 tables",
-    //   test: () => {
-    //     return adapter.request("common/sendArr", getTables());
-    //   },
-    //   assertion: (res: any) => {
-    //     const data = getTables();
-    //     return (
-    //       res.table1[0][0] === data.table1[0].col1 &&
-    //       res.table1[0][1] === data.table1[0].col2 &&
-    //       res.table1[0][2] === data.table1[0].col3 &&
-    //       res.table1[0][3] === data.table1[0].col4 &&
-    //       res.table50[0][0] === data.table50[0].col1 &&
-    //       res.table50[0][1] === data.table50[0].col2 &&
-    //       res.table50[0][2] === data.table50[0].col3 &&
-    //       res.table50[0][3] === data.table50[0].col4
-    //     );
-    //   },
-    // },
     {
-      title: "Large dataset",
+      title: "Other special characters",
+      description: "Should handle other special characters",
+      test: () => {
+        return adapter.request("common/sendArr", moreSpecialCharData);
+      },
+      assertion: (res: any) => {
+        return (
+          res.table1[0][0] === moreSpecialCharData.table1[0].speech0 &&
+          res.table1[0][1] === moreSpecialCharData.table1[0].pct &&
+          res.table1[0][2] === moreSpecialCharData.table1[0].speech &&
+          res.table1[0][3] === moreSpecialCharData.table1[0].slash &&
+          res.table1[0][4] === moreSpecialCharData.table1[0].slashWithSpecial &&
+          res.table1[0][5] === moreSpecialCharData.table1[0].macvar &&
+          res.table1[0][6] === moreSpecialCharData.table1[0].chinese &&
+          res.table1[0][7] === moreSpecialCharData.table1[0].sigma &&
+          res.table1[0][8] === moreSpecialCharData.table1[0].at &&
+          res.table1[0][9] === moreSpecialCharData.table1[0].serbian &&
+          res.table1[0][10] === moreSpecialCharData.table1[0].dollar
+        );
+      }
+    },
+    {
+      title: "Wide table with sendArr",
+      description: "Should handle data with 10000 columns",
+      test: () => {
+        return adapter.request("common/sendArr", getWideData());
+      },
+      assertion: (res: any) => {
+        const data = getWideData();
+        let result = true;
+        for (let i = 0; i <= 10; i++) {
+          result =
+            result && res.table1[0][i] === data.table1[0]["col" + (i + 1)];
+        }
+        return result;
+      }
+    },
+    {
+      title: "Wide table with sendObj",
+      description: "Should handle data with 10000 columns",
+      test: () => {
+        return adapter.request("common/sendObj", getWideData());
+      },
+      assertion: (res: any) => {
+        const data = getWideData();
+        let result = true;
+        for (let i = 0; i <= 10; i++) {
+          result =
+            result &&
+            res.table1[0]["COL" + (i + 1)] === data.table1[0]["col" + (i + 1)];
+        }
+        return result;
+      }
+    },
+    {
+      title: "Multiple tables",
+      description: "Should handle data with 100 tables",
+      test: () => {
+        return adapter.request("common/sendArr", getTables());
+      },
+      assertion: (res: any) => {
+        const data = getTables();
+        return (
+          res.table1[0][0] === data.table1[0].col1 &&
+          res.table1[0][1] === data.table1[0].col2 &&
+          res.table1[0][2] === data.table1[0].col3 &&
+          res.table1[0][3] === data.table1[0].col4 &&
+          res.table50[0][0] === data.table50[0].col1 &&
+          res.table50[0][1] === data.table50[0].col2 &&
+          res.table50[0][2] === data.table50[0].col3 &&
+          res.table50[0][3] === data.table50[0].col4
+        );
+      }
+    },
+    {
+      title: "Large dataset with sendObj",
       description: "Should handle 5mb of data",
-      test: () => adapter.request("common/sendArr", getLargeDataset()),
-      assertion: (res: any) => { // TODO: be more specific on type definition 
+      test: () => {
+        return adapter.request("common/sendObj", getLargeDataset());
+      },
+      assertion: (res: any) => {
         const data = getLargeDataset();
-        let result = true; // TODO: rename
-
+        let result = true;
         for (let i = 0; i <= 10; i++) {
           result = result && res.table1[i][0] === data.table1[i][0];
         }
-
         return result;
-      },
+      }
     },
-
-    // {
-    //   title: "Error and _csrf tables with sendArr",
-    //   description: "Should handle error and _csrf tables",
-    //   test: () => {
-    //     return adapter.request("common/sendArr", errorAndCsrfData);
-    //   },
-    //   assertion: (res: any) => {
-    //     return (
-    //       res.error[0][0] === errorAndCsrfData.error[0].col1 &&
-    //       res.error[0][1] === errorAndCsrfData.error[0].col2 &&
-    //       res.error[0][2] === errorAndCsrfData.error[0].col3 &&
-    //       res.error[0][3] === errorAndCsrfData.error[0].col4 &&
-    //       res._csrf[0][0] === errorAndCsrfData._csrf[0].col1 &&
-    //       res._csrf[0][1] === errorAndCsrfData._csrf[0].col2 &&
-    //       res._csrf[0][2] === errorAndCsrfData._csrf[0].col3 &&
-    //       res._csrf[0][3] === errorAndCsrfData._csrf[0].col4
-    //     );
-    //   },
-    // },
-    // {
-    //   title: "Error and _csrf tables with sendObj",
-    //   description: "Should handle error and _csrf tables",
-    //   test: () => {
-    //     return adapter.request("common/sendObj", errorAndCsrfData);
-    //   },
-    //   assertion: (res: any) => {
-    //     return (
-    //       res.error[0].COL1 === errorAndCsrfData.error[0].col1 &&
-    //       res.error[0].COL2 === errorAndCsrfData.error[0].col2 &&
-    //       res.error[0].COL3 === errorAndCsrfData.error[0].col3 &&
-    //       res.error[0].COL4 === errorAndCsrfData.error[0].col4 &&
-    //       res._csrf[0].COL1 === errorAndCsrfData._csrf[0].col1 &&
-    //       res._csrf[0].COL2 === errorAndCsrfData._csrf[0].col2 &&
-    //       res._csrf[0].COL3 === errorAndCsrfData._csrf[0].col3 &&
-    //       res._csrf[0].COL4 === errorAndCsrfData._csrf[0].col4
-    //     );
-    //   },
-    // },
-  ],
-});
+    {
+      title: "Large dataset with sendArr",
+      description: "Should handle 5mb of data",
+      test: () => {
+        return adapter.request("common/sendArr", getLargeDataset());
+      },
+      assertion: (res: any) => {
+        const data = getLargeDataset();
+        let result = true;
+        for (let i = 0; i <= 10; i++) {
+          result =
+            result && res.table1[i][0] === Object.values(data.table1[i])[0];
+        }
+        return result;
+      }
+    },
+    {
+      title: "Error and _csrf tables with sendArr",
+      description: "Should handle error and _csrf tables",
+      test: () => {
+        return adapter.request("common/sendArr", errorAndCsrfData);
+      },
+      assertion: (res: any) => {
+        return (
+          res.error[0][0] === errorAndCsrfData.error[0].col1 &&
+          res.error[0][1] === errorAndCsrfData.error[0].col2 &&
+          res.error[0][2] === errorAndCsrfData.error[0].col3 &&
+          res.error[0][3] === errorAndCsrfData.error[0].col4 &&
+          res._csrf[0][0] === errorAndCsrfData._csrf[0].col1 &&
+          res._csrf[0][1] === errorAndCsrfData._csrf[0].col2 &&
+          res._csrf[0][2] === errorAndCsrfData._csrf[0].col3 &&
+          res._csrf[0][3] === errorAndCsrfData._csrf[0].col4
+        );
+      }
+    },
+    {
+      title: "Error and _csrf tables with sendObj",
+      description: "Should handle error and _csrf tables",
+      test: () => {
+        return adapter.request("common/sendObj", errorAndCsrfData);
+      },
+      assertion: (res: any) => {
+        return (
+          res.error[0].COL1 === errorAndCsrfData.error[0].col1 &&
+          res.error[0].COL2 === errorAndCsrfData.error[0].col2 &&
+          res.error[0].COL3 === errorAndCsrfData.error[0].col3 &&
+          res.error[0].COL4 === errorAndCsrfData.error[0].col4 &&
+          res._csrf[0].COL1 === errorAndCsrfData._csrf[0].col1 &&
+          res._csrf[0].COL2 === errorAndCsrfData._csrf[0].col2 &&
+          res._csrf[0].COL3 === errorAndCsrfData._csrf[0].col3 &&
+          res._csrf[0].COL4 === errorAndCsrfData._csrf[0].col4
+        );
+      }
+    }
+  ]
+});

sasjs-tests/src/types/index.ts

@@ -1,15 +0,0 @@
-export interface Test {
-  title: string;
-  description: string;
-  beforeTest?: (...args: any) => Promise<any>;
-  afterTest?: (...args: any) => Promise<any>;
-  test: (context?: any) => Promise<any>;
-  assertion: (...args: any) => boolean;
-}
-
-export interface TestSuite {
-  name: string;
-  tests: Test[];
-  beforeAll?: (...args: any) => Promise<any>;
-  afterAll?: (...args: any) => Promise<any>;
-}

sasjs-tests/src/utils/Assert.ts

@@ -3,21 +3,20 @@ export const assert = (
   message = "Assertion failed"
 ) => {
   let result;
-
   try {
-    if (typeof expression === "boolean") result = expression;
-    else result = expression();
+    if (typeof expression === "boolean") {
+      result = expression;
+    } else {
+      result = expression();
+    }
   } catch (e) {
     console.error(message);
-
     throw new Error(message);
   }
-
   if (!!result) {
     return;
   } else {
     console.error(message);
-
     throw new Error(message);
   }
 };

sasjs-tests/src/utils/UploadFile.ts

@@ -1,27 +0,0 @@
-export const uploadFile = (file: File, fileName: string, url: string) => {
-  return new Promise((resolve, reject) => {
-    const data = new FormData();
-    data.append("file", file);
-    data.append("filename", fileName);
-
-    const xhr = new XMLHttpRequest();
-    xhr.withCredentials = true;
-    xhr.addEventListener("readystatechange", function () { // TODO: use ES6
-      if (this.readyState === 4) {
-        let response: any;
-
-        try {
-          response = JSON.parse(this.responseText);
-        } catch (e) {
-          reject(e);
-        }
-
-        resolve(response);
-      }
-    });
-
-    xhr.open("POST", url);
-    xhr.setRequestHeader("cache-control", "no-cache");
-    xhr.send(data);
-  });
-};

src/FileUploader.ts

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

src/SAS9ApiClient.ts

@@ -1,51 +1,55 @@
+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 an object containing the server URL
-     */
-    public getConfig() {
-        return {
-            serverUrl: this.serverUrl,
-        }
+  /**
+   * returns on object containing the server URL
+   */
+  public getConfig() {
+    return {
+      serverUrl: this.serverUrl
     }
+  }
 
-    /**
-     * Updates serverUrl which is not null
-     * @param serverUrl - the URL of the server.
-     */
-    public setConfig(serverUrl: string) {
-        if (serverUrl) this.serverUrl = serverUrl
+  /**
+   * Updates serverurl which is not null
+   * @param serverUrl - the URL of the server.
+   */
+  public setConfig(serverUrl: string) {
+    if (serverUrl) this.serverUrl = serverUrl
+  }
+
+  /**
+   * Executes code on a SAS9 server.
+   * @param linesOfCode - an array of lines of code to execute
+   * @param serverName - the server to execute the code on
+   * @param repositoryName - the repository to execute the code on
+   */
+  public async executeScript(
+    linesOfCode: string[],
+    serverName: string,
+    repositoryName: string
+  ) {
+    const requestPayload = linesOfCode.join('\n')
+    const executeScriptRequest = {
+      method: 'PUT',
+      headers: {
+        Accept: 'application/json'
+      },
+      body: `command=${requestPayload}`
     }
+    const executeScriptResponse = await fetch(
+      `${this.serverUrl}/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
+      executeScriptRequest
+    ).then((res) => res.text())
 
-    /**
-     * Executes code on a SAS9 server.
-     * @param linesOfCode - an array of lines of code to execute
-     * @param serverName - the server to execute the code on
-     * @param repositoryName - the repository to execute the code on
-     */
-    public async executeScript(
-        linesOfCode: string[], // FIXME: rename
-        serverName: string,
-        repositoryName: string
-    ) {
-        const requestPayload = linesOfCode.join('\n')
-        const executeScriptRequest = {
-            method: 'PUT',
-            headers: {Accept: 'application/json'},
-            body: `command=${requestPayload}`,
-        }
-        // FIXME: use axios instead of fetch
-        const executeScriptResponse = await fetch( 
-            `${this.serverUrl}/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
-            executeScriptRequest
-        ).then((res) => res.text())
-        // FIXME: no catch block
-
-        return executeScriptResponse
-    }
-}
+    return executeScriptResponse
+  }
+}

src/SASjs.spec.ts

@@ -1,37 +1,36 @@
-import SASjs from "./index";
+import SASjs from './index'
 
-const adapter = new SASjs();
+const adapter = new SASjs()
 
-// FIXME: adapter doesn't have 'parseSAS9SourceCode' and 'parseGeneratedCode'
-it("should parse SAS9 source code", async done => {
-  expect(sampleResponse).toBeTruthy();
-  const parsedSourceCode = (adapter as any).parseSAS9SourceCode(sampleResponse);
-  expect(parsedSourceCode).toBeTruthy();
-  const sourceCodeLines = parsedSourceCode.split("\r\n");
-  expect(sourceCodeLines.length).toEqual(5);
-  expect(sourceCodeLines[0].startsWith("6")).toBeTruthy();
-  expect(sourceCodeLines[1].startsWith("7")).toBeTruthy();
-  expect(sourceCodeLines[2].startsWith("8")).toBeTruthy();
-  expect(sourceCodeLines[3].startsWith("9")).toBeTruthy();
-  expect(sourceCodeLines[4].startsWith("10")).toBeTruthy();
-  done();
-});
+it('should parse SAS9 source code', async (done) => {
+  expect(sampleResponse).toBeTruthy()
+  const parsedSourceCode = (adapter as any).parseSAS9SourceCode(sampleResponse)
+  expect(parsedSourceCode).toBeTruthy()
+  const sourceCodeLines = parsedSourceCode.split('\r\n')
+  expect(sourceCodeLines.length).toEqual(5)
+  expect(sourceCodeLines[0].startsWith('6')).toBeTruthy()
+  expect(sourceCodeLines[1].startsWith('7')).toBeTruthy()
+  expect(sourceCodeLines[2].startsWith('8')).toBeTruthy()
+  expect(sourceCodeLines[3].startsWith('9')).toBeTruthy()
+  expect(sourceCodeLines[4].startsWith('10')).toBeTruthy()
+  done()
+})
 
-it("should parse generated code", async done => {
-  expect(sampleResponse).toBeTruthy();
+it('should parse generated code', async (done) => {
+  expect(sampleResponse).toBeTruthy()
   const parsedGeneratedCode = (adapter as any).parseGeneratedCode(
     sampleResponse
-  );
-  expect(parsedGeneratedCode).toBeTruthy();
-  const generatedCodeLines = parsedGeneratedCode.split("\r\n");
-  expect(generatedCodeLines.length).toEqual(5);
-  expect(generatedCodeLines[0].startsWith("MPRINT(MM_WEBIN)")).toBeTruthy();
-  expect(generatedCodeLines[1].startsWith("MPRINT(MM_WEBLEFT)")).toBeTruthy();
-  expect(generatedCodeLines[2].startsWith("MPRINT(MM_WEBOUT)")).toBeTruthy();
-  expect(generatedCodeLines[3].startsWith("MPRINT(MM_WEBRIGHT)")).toBeTruthy();
-  expect(generatedCodeLines[4].startsWith("MPRINT(MM_WEBOUT)")).toBeTruthy();
-  done();
-});
+  )
+  expect(parsedGeneratedCode).toBeTruthy()
+  const generatedCodeLines = parsedGeneratedCode.split('\r\n')
+  expect(generatedCodeLines.length).toEqual(5)
+  expect(generatedCodeLines[0].startsWith('MPRINT(MM_WEBIN)')).toBeTruthy()
+  expect(generatedCodeLines[1].startsWith('MPRINT(MM_WEBLEFT)')).toBeTruthy()
+  expect(generatedCodeLines[2].startsWith('MPRINT(MM_WEBOUT)')).toBeTruthy()
+  expect(generatedCodeLines[3].startsWith('MPRINT(MM_WEBRIGHT)')).toBeTruthy()
+  expect(generatedCodeLines[4].startsWith('MPRINT(MM_WEBOUT)')).toBeTruthy()
+  done()
+})
 
 /* tslint:disable */
 const sampleResponse = `<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
@@ -45,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

@@ -0,0 +1,173 @@
+import { Session, Context, CsrfToken } from './types'
+import { asyncForEach, makeRequest, isUrl } from './utils'
+
+const MAX_SESSION_COUNT = 1
+
+export class SessionManager {
+  constructor(
+    private serverUrl: string,
+    private contextName: string,
+    private setCsrfToken: (csrfToken: CsrfToken) => void
+  ) {
+    if (serverUrl) isUrl(serverUrl)
+  }
+
+  private sessions: Session[] = []
+  private currentContext: Context | null = null
+  private csrfToken: CsrfToken | null = null
+
+  async getSession(accessToken?: string) {
+    await this.createSessions(accessToken)
+    this.createAndWaitForSession(accessToken)
+    const session = this.sessions.pop()
+    const secondsSinceSessionCreation =
+      (new Date().getTime() - new Date(session!.creationTimeStamp).getTime()) /
+      1000
+    if (
+      secondsSinceSessionCreation >= session!.attributes.sessionInactiveTimeout
+    ) {
+      await this.createSessions(accessToken)
+      const freshSession = this.sessions.pop()
+      return freshSession
+    }
+    return session
+  }
+
+  async clearSession(id: string, accessToken?: string) {
+    const deleteSessionRequest = {
+      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)
+    })
+  }
+
+  private async createSessions(accessToken?: string) {
+    if (!this.sessions.length) {
+      if (!this.currentContext) {
+        await this.setCurrentContext(accessToken)
+      }
+      await asyncForEach(new Array(MAX_SESSION_COUNT), async () => {
+        const createdSession = await this.createAndWaitForSession(accessToken)
+        this.sessions.push(createdSession)
+      })
+    }
+  }
+
+  private async createAndWaitForSession(accessToken?: string) {
+    const createSessionRequest = {
+      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)
+    this.sessions.push(createdSession)
+    return createdSession
+  }
+
+  private async setCurrentContext(accessToken?: string) {
+    if (!this.currentContext) {
+      const { result: contexts } = await this.request<{
+        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
+    }
+  }
+
+  private getHeaders(accessToken?: string) {
+    const headers: any = {
+      'Content-Type': 'application/json'
+    }
+    if (accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`
+    }
+
+    return headers
+  }
+
+  private async waitForSession(
+    session: Session,
+    etag: string | null,
+    accessToken?: string,
+    silent = false
+  ) {
+    let sessionState = session.state
+    const headers: any = {
+      ...this.getHeaders(accessToken),
+      'If-None-Match': etag
+    }
+    const stateLink = session.links.find((l: any) => l.rel === 'state')
+    return new Promise(async (resolve, _) => {
+      if (sessionState === 'pending') {
+        if (stateLink) {
+          if (!silent) {
+            console.log('Polling session status... \n')
+          }
+          const { result: state } = await this.request<string>(
+            `${this.serverUrl}${stateLink.href}?wait=30`,
+            {
+              headers
+            },
+            'text'
+          )
+
+          sessionState = state.trim()
+          if (!silent) {
+            console.log(`Current state: ${sessionState}\n`)
+          }
+          resolve(sessionState)
+        }
+      } else {
+        resolve(sessionState)
+      }
+    })
+  }
+
+  private async request<T>(
+    url: string,
+    options: RequestInit,
+    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.setCsrfToken(token)
+      },
+      contentType
+    )
+  }
+}

src/index.ts

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

src/types/Context.ts

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

src/types/CsrfToken.ts

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

src/types/Folder.ts

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

src/types/Job.ts

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