Merge pull request #75 from sasjs/edit-context

feat(edit-context): add the ability to edit a given 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

@@ -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,75 +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/sasjs/core/main/all.sas";
-%inc mc;
-filename ft15f001 temp;
-parmcards4;
-  %webout(OPEN)
-  %macro x();
-  %do i=1 %to &_webin_file_count; %webout(OBJ,&&_webin_name&i) %end;
-  %mend; %x()
-  %webout(CLOSE)
-;;;;
-%mm_createwebservice(path=/Public/app/common,name=sendObj)
-parmcards4;
-  %webout(OPEN)
-  %macro x();
-  %do i=1 %to &_webin_file_count; %webout(ARR,&&_webin_name&i) %end;
-  %mend; %x()
-  %webout(CLOSE)
-;;;;
-%mm_createwebservice(path=/Public/app/common,name=sendArr)
-```
-
-# Viya
-
-```
-filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
-%inc mc;
-filename ft15f001 temp;
-parmcards4;
-  %webout(FETCH)
-  %webout(OPEN)
-  %macro x();
-  %do i=1 %to %sysfunc(countw(&sasjs_tables));
-    %let table=%scan(&sasjs_tables,&i);
-    %webout(OBJ,&table)
-  %end;
-  %mend;
-  %x()
-  %webout(CLOSE)
-;;;;
-%mp_createwebservice(path=/Public/app/common,name=sendObj)
-filename ft15f001 temp;
-parmcards4;
-  %webout(FETCH)
-  %webout(OPEN)
-  %macro x();
-  %do i=1 %to %sysfunc(countw(&sasjs_tables));
-    %let table=%scan(&sasjs_tables,&i);
-    %webout(ARR,&table)
-  %end;
-  %mend;
-  %x()
-  %webout(CLOSE)
-;;;;
-%mp_createwebservice(path=/Public/app/common,name=sendArr)
-```
-
-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

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

example.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1.0.6"></script> 
+    <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"
@@ -106,4 +106,4 @@
       <canvas id="myChart" style="display: none;"></canvas>
     </div>
   </body>
-</head>
+</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",
@@ -37,23 +37,22 @@
   "license": "ISC",
   "devDependencies": {
     "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.8",
+    "@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": "^8.0.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.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

@@ -1357,9 +1357,9 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
     "@sasjs/adapter": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.0.5.tgz",
-      "integrity": "sha512-54gQZD7QdNmQu77axOqr0vMS7hUVXO5hPbUtwXXocMIi3kRQDbROYjC3kuiFM9FrxqiZWbLRcyOqmFv3W/N36w==",
+      "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",
@@ -1379,15 +1379,23 @@
       }
     },
     "@sasjs/test-framework": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.3.0.tgz",
-      "integrity": "sha512-vrbRFUhNUShLlNFZO+XwVwFLXDLApQG9zOPx00xhQ8IUA0cSDFFmf2mP/KBdFCxa1REaR6GHvMctUj+xRZo9QQ==",
+      "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": {
@@ -3747,11 +3755,6 @@
         }
       }
     },
-    "classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
-    },
     "clean-css": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -3829,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",
@@ -12226,21 +12234,36 @@
       }
     },
     "semantic-ui-react": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.0.0.tgz",
-      "integrity": "sha512-85mYHYuDBNa6la1BgKwuOSD1vcIPsFQEXRxGsZ9pUtE4iHlEcylF+x46NYHIGbBjlys63SpNH3PtK6VyZj9LBw==",
+      "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.1.2",
+        "@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",
-        "classnames": "^2.2.6",
-        "keyboard-key": "^1.0.4",
-        "lodash": "^4.17.15",
+        "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.4",
+        "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": {

sasjs-tests/package.json

@@ -4,8 +4,8 @@
   "homepage": ".",
   "private": true,
   "dependencies": {
-    "@sasjs/adapter": "^1.0.5",
-    "@sasjs/test-framework": "^1.3.0",
+    "@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",
@@ -25,7 +25,9 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "deploy": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz && npm run build && rsync -avhe ssh ./build/* --delete kriaco@sas.analytium.co.uk:/var/www/html/kriaco/sasjs-tests"
+    "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz",
+    "deploy:tests": "npm run build && rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH",
+    "deploy": "npm run update:adapter && npm run deploy:tests"
   },
   "eslintConfig": {
     "extends": "react-app"

sasjs-tests/src/App.test.js

@@ -1,8 +1,8 @@
-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

@@ -17,7 +17,7 @@ const App = (): ReactElement<{}> => {
         sendArrTests(adapter),
         sendObjTests(adapter),
         specialCaseTests(adapter),
-        sasjsRequestTests(adapter),
+        sasjsRequestTests(adapter)
       ]);
     }
   }, [adapter, config]);

sasjs-tests/src/Login.tsx

@@ -12,7 +12,7 @@ const Login = (): ReactElement<{}> => {
     (e) => {
       e.preventDefault();
       appContext.adapter.logIn(username, password).then((res) => {
-        appContext.setIsLoggedIn(true);
+        appContext.setIsLoggedIn(res.isLoggedIn);
       });
     },
     [username, password, appContext]

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/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

@@ -9,7 +9,7 @@ const defaultConfig: SASjsConfig = {
   serverType: ServerType.SASViya,
   debug: true,
   contextName: "SAS Job Execution compute context",
-  useComputeApi: false,
+  useComputeApi: false
 };
 
 const customConfig = {
@@ -18,7 +18,7 @@ const customConfig = {
   pathSASViya: "viya",
   appLoc: "/Public/seedapp",
   serverType: ServerType.SAS9,
-  debug: false,
+  debug: false
 };
 
 export const basicTests = (
@@ -35,7 +35,7 @@ export const basicTests = (
         return adapter.logIn(userName, password);
       },
       assertion: (response: any) =>
-        response && response.isLoggedIn && response.userName === userName,
+        response && response.isLoggedIn && response.userName === userName
     },
     {
       title: "Default config",
@@ -54,7 +54,7 @@ export const basicTests = (
           sasjsConfig.serverType === defaultConfig.serverType &&
           sasjsConfig.debug === defaultConfig.debug
         );
-      },
+      }
     },
     {
       title: "Custom config",
@@ -72,7 +72,7 @@ export const basicTests = (
           sasjsConfig.serverType === customConfig.serverType &&
           sasjsConfig.debug === customConfig.debug
         );
-      },
+      }
     },
     {
       title: "Config overrides",
@@ -92,7 +92,7 @@ export const basicTests = (
           sasjsConfig.serverType === defaultConfig.serverType &&
           sasjsConfig.debug === false
         );
-      },
-    },
-  ],
+      }
+    }
+  ]
 });

sasjs-tests/src/testSuites/RequestData.ts

@@ -4,7 +4,7 @@ import { TestSuite } from "@sasjs/test-framework";
 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" }],
+  table1: [{ col1: 42, col2: 1.618, col3: "x", col4: "x" }]
 };
 const multipleRowsWithNulls: any = {
   table1: [
@@ -12,8 +12,8 @@ const multipleRowsWithNulls: any = {
     { 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 = {
   table1: [
@@ -21,8 +21,8 @@ const multipleColumnsWithNulls: any = {
     { 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) => {
@@ -55,7 +55,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       },
       assertion: (res: any) => {
         return res.table1[0][0] === stringData.table1[0].col1;
-      },
+      }
     },
     {
       title: "Long string value",
@@ -67,7 +67,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       assertion: (res: any) => {
         const longStringData = getLongStringData();
         return res.table1[0][0] === longStringData.table1[0].col1;
-      },
+      }
     },
     {
       title: "Overly long string value",
@@ -79,7 +79,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       },
       assertion: (error: any) => {
         return !!error && !!error.MESSAGE;
-      },
+      }
     },
     {
       title: "Single numeric value",
@@ -89,7 +89,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
       },
       assertion: (res: any) => {
         return res.table1[0][0] === numericData.table1[0].col1;
-      },
+      }
     },
     {
       title: "Multiple columns",
@@ -104,7 +104,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
           res.table1[0][2] === multiColumnData.table1[0].col3 &&
           res.table1[0][3] === multiColumnData.table1[0].col4
         );
-      },
+      }
     },
     {
       title: "Multiple rows with nulls",
@@ -129,7 +129,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
             res.table1[index][3] === multipleRowsWithNulls.table1[index].col4;
         });
         return result;
-      },
+      }
     },
     {
       title: "Multiple columns with nulls",
@@ -158,9 +158,9 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
               (multipleColumnsWithNulls.table1[index].col4 || "");
         });
         return result;
-      },
-    },
-  ],
+      }
+    }
+  ]
 });
 
 export const sendObjTests = (adapter: SASjs): TestSuite => ({
@@ -171,11 +171,11 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       description: "Should throw an error",
       test: async () => {
         const invalidData: any = {
-          "1 invalid table": [{ col1: 42 }],
+          "1 invalid table": [{ col1: 42 }]
         };
         return adapter.request("common/sendObj", invalidData).catch((e) => e);
       },
-      assertion: (error: any) => !!error && !!error.MESSAGE,
+      assertion: (error: any) => !!error && !!error.MESSAGE
     },
     {
       title: "Single string value",
@@ -185,7 +185,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       },
       assertion: (res: any) => {
         return res.table1[0].COL1 === stringData.table1[0].col1;
-      },
+      }
     },
     {
       title: "Long string value",
@@ -197,7 +197,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       assertion: (res: any) => {
         const longStringData = getLongStringData();
         return res.table1[0].COL1 === longStringData.table1[0].col1;
-      },
+      }
     },
     {
       title: "Overly long string value",
@@ -210,7 +210,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       },
       assertion: (error: any) => {
         return !!error && !!error.MESSAGE;
-      },
+      }
     },
     {
       title: "Single numeric value",
@@ -220,7 +220,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       },
       assertion: (res: any) => {
         return res.table1[0].COL1 === numericData.table1[0].col1;
-      },
+      }
     },
 
     {
@@ -232,7 +232,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       assertion: (res: any) => {
         const data = getLargeObjectData();
         return res.table1[9000].BIG === data.table1[9000].big;
-      },
+      }
     },
     {
       title: "Multiple columns",
@@ -247,7 +247,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
           res.table1[0].COL3 === multiColumnData.table1[0].col3 &&
           res.table1[0].COL4 === multiColumnData.table1[0].col4
         );
-      },
+      }
     },
     {
       title: "Multiple rows with nulls",
@@ -272,7 +272,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
             res.table1[index].COL4 === multipleRowsWithNulls.table1[index].col4;
         });
         return result;
-      },
+      }
     },
     {
       title: "Multiple columns with nulls",
@@ -301,7 +301,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
               (multipleColumnsWithNulls.table1[index].col4 || "");
         });
         return result;
-      },
-    },
-  ],
+      }
+    }
+  ]
 });

sasjs-tests/src/testSuites/SasjsRequests.ts

@@ -19,7 +19,32 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
         } 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

@@ -13,9 +13,9 @@ const specialCharData: any = {
       doubleQuote: '"',
       crlf: "\r\n",
       euro: "€euro",
-      banghash: "!#banghash",
-    },
-  ],
+      banghash: "!#banghash"
+    }
+  ]
 };
 
 const moreSpecialCharData: any = {
@@ -31,9 +31,9 @@ const moreSpecialCharData: any = {
       sigma: "Σsigma",
       at: "@at",
       serbian: "Српски",
-      dollar: "$",
-    },
-  ],
+      dollar: "$"
+    }
+  ]
 };
 
 const getWideData = () => {
@@ -43,7 +43,7 @@ const getWideData = () => {
   }
 
   const data: any = {
-    table1: [cols],
+    table1: [cols]
   };
 
   return data;
@@ -67,7 +67,7 @@ const getLargeDataset = () => {
   }
 
   const data: any = {
-    table1: rows,
+    table1: rows
   };
 
   return data;
@@ -75,7 +75,7 @@ const getLargeDataset = () => {
 
 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 => ({
@@ -100,7 +100,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
           res.table1[0][8] === specialCharData.table1[0].euro &&
           res.table1[0][9] === specialCharData.table1[0].banghash
         );
-      },
+      }
     },
     {
       title: "Other special characters",
@@ -122,7 +122,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
           res.table1[0][9] === moreSpecialCharData.table1[0].serbian &&
           res.table1[0][10] === moreSpecialCharData.table1[0].dollar
         );
-      },
+      }
     },
     {
       title: "Wide table with sendArr",
@@ -138,7 +138,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
             result && res.table1[0][i] === data.table1[0]["col" + (i + 1)];
         }
         return result;
-      },
+      }
     },
     {
       title: "Wide table with sendObj",
@@ -155,7 +155,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
             res.table1[0]["COL" + (i + 1)] === data.table1[0]["col" + (i + 1)];
         }
         return result;
-      },
+      }
     },
     {
       title: "Multiple tables",
@@ -175,7 +175,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
           res.table50[0][2] === data.table50[0].col3 &&
           res.table50[0][3] === data.table50[0].col4
         );
-      },
+      }
     },
     {
       title: "Large dataset with sendObj",
@@ -190,7 +190,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
           result = result && res.table1[i][0] === data.table1[i][0];
         }
         return result;
-      },
+      }
     },
     {
       title: "Large dataset with sendArr",
@@ -206,7 +206,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
             result && res.table1[i][0] === Object.values(data.table1[i])[0];
         }
         return result;
-      },
+      }
     },
     {
       title: "Error and _csrf tables with sendArr",
@@ -225,7 +225,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
           res._csrf[0][2] === errorAndCsrfData._csrf[0].col3 &&
           res._csrf[0][3] === errorAndCsrfData._csrf[0].col4
         );
-      },
+      }
     },
     {
       title: "Error and _csrf tables with sendObj",
@@ -244,7 +244,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
           res._csrf[0].COL3 === errorAndCsrfData._csrf[0].col3 &&
           res._csrf[0].COL4 === errorAndCsrfData._csrf[0].col4
         );
-      },
-    },
-  ],
+      }
+    }
+  ]
 });

src/FileUploader.ts

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

src/SAS9ApiClient.ts

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

src/SASjs.spec.ts

@@ -1,48 +0,0 @@
-import SASjs from "./index";
-
-const adapter = new SASjs();
-
-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();
-  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();
-});
-
-/* tslint:disable */
-const sampleResponse = `<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
-6          @file mm_webout.sas
-7          @brief Send data to/from SAS Stored Processes
-8          @details This macro should be added to the start of each Stored Process,
-9          **immediately** followed by a call to:
-10         %webout(OPEN)
-MPRINT(MM_WEBIN):  ;
-MPRINT(MM_WEBLEFT):   filename _temp temp lrecl=999999;
-MPRINT(MM_WEBOUT):   data _null_;
-MPRINT(MM_WEBRIGHT):  file _temp;
-MPRINT(MM_WEBOUT):   if upcase(symget('_debug'))='LOG' then put '&gt;&gt;weboutBEGIN&lt;&lt;';
-`;
-/* tslint:enable */

src/SessionManager.ts

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

src/index.ts

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

src/types/Context.ts

@@ -1,6 +1,17 @@
 export interface Context {
-  name: string;
-  id: string;
-  createdBy: string;
-  version: number;
+  name: string
+  id: string
+  createdBy: string
+  version: number
+  attributes?: any
+}
+
+export interface EditContextInput {
+  name?: string
+  description?: string
+  launchContext?: { name: string }
+  environment?: { options?: string[]; autoExecLines?: string[] }
+  attributes?: any
+  authorizedUsers?: string[]
+  authorizeAllAuthenticatedUsers?: boolean
 }

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,12 +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;
-  error?: any;
+  id: string
+  name: string
+  uri: string
+  createdBy: string
+  code?: string
+  links: Link[]
+  results: JobResult
+  error?: any
 }

src/types/JobDefinition.ts

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

src/types/JobResult.ts

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

src/types/Link.ts

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

src/types/SASjsConfig.ts

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

src/types/SASjsRequest.ts

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

src/types/SASjsWaitingRequest.ts

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