chore(deps-dev): bump pbkdf2 from 3.1.2 to 3.1.5

Bumps [pbkdf2](https://github.com/browserify/pbkdf2) from 3.1.2 to 3.1.5.
- [Changelog](https://github.com/browserify/pbkdf2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/browserify/pbkdf2/compare/v3.1.2...v3.1.5)

---
updated-dependencies:
- dependency-name: pbkdf2
  dependency-version: 3.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitattributes

@@ -1 +0,0 @@
-* text=auto eol=lf

.github/workflows/build-unit-tests.yml

@@ -11,9 +11,8 @@ jobs:
     runs-on: ubuntu-22.04
 
     strategy:
-      fail-fast: false
       matrix:
-        node-version: [22, 24]
+        node-version: [lts/hydrogen]
 
     steps:
       - uses: actions/checkout@v2
@@ -22,7 +21,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-        # 2. Restore npm cache manually
+       # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -33,7 +32,7 @@ jobs:
             ${{ runner.os }}-node-
 
       - name: Check npm audit
-        run: npm audit --omit=dev --audit-level=low
+        run: npm audit --production --audit-level=low
 
       - name: Install Dependencies
         run: npm ci
@@ -54,7 +53,6 @@ jobs:
 
       # For some reason if coverage report action is run before other commands, those commands can't access the directories and files on which they depend on
       - name: Generate coverage report
-        if: matrix.node-version == 22
         uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generateDocs.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22]
+        node-version: [lts/hydrogen]
 
     steps:
       - name: Checkout
@@ -20,10 +20,9 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version:
+          node-version: ${{ matrix.node-version }}
-            ${{ matrix.node-version }}
 
-            # 2. Restore npm cache manually
+                 # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -51,3 +50,4 @@ jobs:
           publish_branch: gh-pages
           publish_dir: ./docs
           cname: adapter.sasjs.io
+

.github/workflows/npmpublish.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22]
+        node-version: [lts/hydrogen]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-        # 2. Restore npm cache manually
+       # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -42,9 +42,6 @@ jobs:
       - name: Build Project
         run: npm run build
 
-      - name: Clean up ready for publishing
-        run: npm run publishInit
-
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v3
         env:

.github/workflows/server-tests.yml

@@ -1,123 +1,107 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
+
-name: SASjs Build and Server Tests
+name: SASjs Build and Server Tests
-
+
-on:
+on:
-  pull_request:
+  pull_request:
-
+
-jobs:
+jobs:
-  test:
+  test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04
-
+
-    strategy:
+    strategy:
-      matrix:
+      matrix:
-        node-version: [22]
+        node-version: [lts/hydrogen]
-
+
-    steps:
+    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v2
-        with:
+        with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ matrix.node-version }}
-
+
-      # 2. Restore npm cache manually
+      # 2. Restore npm cache manually
-      - name: Restore npm cache
+      - name: Restore npm cache
-        uses: actions/cache@v3
+        uses: actions/cache@v3
-        id: npm-cache
+        id: npm-cache
-        with:
+        with:
-          path: |
+          path: ~/.npm
-            ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
-          restore-keys: |
+            ${{ runner.os }}-node-
-            ${{ runner.os }}-node-
+
-
+      - name: Install Dependencies
-      - name: Cache Cypress binary
+        run: npm ci
-        uses: actions/cache@v3
+
-        with:
+      - name: Install Rimraf
-          path: ~/.cache/Cypress
+        run: npm i rimraf
-          key: cypress-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+
-          restore-keys: |
+      - name: Build Package
-            cypress-${{ runner.os }}-
+        run: npm run package:lib
-
+        env:
-      - name: Install Dependencies
+          CI: true
-        run: npm ci
+
-
+      - name: Write VPN Files
-      - name: Install Cypress binary
+        run: |
-        run: npx cypress install
+          echo "$CA_CRT" > .github/vpn/ca.crt
-
+          echo "$USER_CRT" > .github/vpn/user.crt
-      - name: Install Rimraf
+          echo "$USER_KEY" > .github/vpn/user.key
-        run: npm i rimraf
+          echo "$TLS_KEY" > .github/vpn/tls.key
-
+        shell: bash
-      - name: Build Package
+        env:
-        run: npm run package:lib
+          CA_CRT: ${{ secrets.CA_CRT}}
-        env:
+          USER_CRT: ${{ secrets.USER_CRT }}
-          CI: true
+          USER_KEY: ${{ secrets.USER_KEY }}
-
+          TLS_KEY: ${{ secrets.TLS_KEY }}
-      - name: Write VPN Files
+
-        run: |
+      - name: Chmod VPN files
-          echo "$CA_CRT" > .github/vpn/ca.crt
+        run: |
-          echo "$USER_CRT" > .github/vpn/user.crt
+          chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
-          echo "$USER_KEY" > .github/vpn/user.key
+
-          echo "$TLS_KEY" > .github/vpn/tls.key
+      - name: Install Open VPN
-        shell: bash
+        run: |
-        env:
+          sudo apt install apt-transport-https
-          CA_CRT: ${{ secrets.CA_CRT}}
+          sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
-          USER_CRT: ${{ secrets.USER_CRT }}
+          sudo apt-key add openvpn-repo-pkg-key.pub
-          USER_KEY: ${{ secrets.USER_KEY }}
+          sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
-          TLS_KEY: ${{ secrets.TLS_KEY }}
+          sudo apt update
-
+          sudo apt install openvpn3=17~betaUb22042+jammy
-      - name: Chmod VPN files
+
-        run: |
+      - name: Start Open VPN 3
-          chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
+        run: openvpn3 session-start --config .github/vpn/config.ovpn
-
+
-      - name: Install Open VPN
+      - name: install pm2
-        run: |
+        run: npm i -g pm2
-          sudo apt install apt-transport-https
+
-          sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
+      - name: Fetch SASJS server
-          sudo apt-key add openvpn-repo-pkg-key.pub
+        run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
-          sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
+
-          sudo apt update
+      - name: Deploy sasjs-tests
-          sudo apt install openvpn3=17~betaUb22042+jammy
+        run: |
-
+          npm install -g replace-in-files-cli
-      - name: Start Open VPN 3
+          cd sasjs-tests
-        run: openvpn3 session-start --config .github/vpn/config.ovpn
+          replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json
-
+          npm i
-      - name: install pm2
+          replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json
-        run: npm i -g pm2
+          replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json
-
+          replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json
-      - name: Fetch SASJS server
+          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json
-        run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
+          cat ./public/config.json
-
+
-      - name: Deploy sasjs-tests
+          npm run update:adapter
-        run: |
+          pm2 start --name sasjs-test npm -- start
-          sudo apt install jq
+
-          cd sasjs-tests
+      - name: Sleep for 10 seconds
-          npm i --ignore-scripts
+        run: sleep 10s
-          npm i ../build/sasjs-adapter-5.0.0.tgz
+        shell: bash
-          jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+
-          jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+      - name: Run cypress on sasjs
-          jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+        run: |
-          jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.json
-          jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json
-
+          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json
-          cat ./public/config.json
+          cat ./cypress.json
-
+          echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
-          npm run update:adapter
+
-          pm2 start --name sasjs-test npm -- start
+          sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
-
-      - name: Sleep for 10 seconds
-        run: sleep 10s
-        shell: bash
-
-      - name: Run cypress on sasjs
-        env:
-          TERM: dumb
-        run: |
-          sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
-          sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
-          sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
-          cat ./cypress.config.js
-          echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
-
-          sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

.gitpod.yml

@@ -0,0 +1,2 @@
+tasks:
+  - init: npm install && npm run build

.npmrc

@@ -1 +0,0 @@
-ignore-scripts=true

cypress.config.js

@@ -1,18 +0,0 @@
-const { defineConfig } = require('cypress')
-
-module.exports = defineConfig({
-  e2e: {
-    includeShadowDom: true,
-    chromeWebSecurity: false,
-    defaultCommandTimeout: 20000,
-    specPattern: 'cypress/integration/**/*.ts',
-    supportFile: 'cypress/support/index.js'
-  },
-  env: {
-    sasjsTestsUrl: 'http://localhost:3000',
-    username: '',
-    password: '',
-    screenshotOnRunFailure: false,
-    testingFinishTimeout: 600000
-  }
-})

cypress.json

@@ -0,0 +1,11 @@
+{
+  "chromeWebSecurity": false,
+  "defaultCommandTimeout": 20000,
+  "env": {
+    "sasjsTestsUrl": "",
+    "username": "",
+    "password": "",
+    "screenshotOnRunFailure": false,
+    "testingFinishTimeout": 600000
+  }
+}

cypress/integration/sasjs.tests.ts

@@ -9,12 +9,10 @@ context('sasjs-tests', function () {
   })
 
   beforeEach(() => {
-    cy.visit(sasjsTestsUrl)
+    cy.reload()
   })
 
   function loginIfNeeded() {
-    cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
-
     cy.get('body').then(($body) => {
       if ($body.find('login-form').length > 0) {
         cy.get('login-form')

package.json

@@ -4,14 +4,17 @@
   "homepage": "https://adapter.sasjs.io",
   "scripts": {
     "nodeVersionMessage": "echo \u001b[33m make sure you are running node lts version \u001b[0m",
-    "build": "npm run nodeVersionMessage && npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
+    "preinstall": "npm run nodeVersionMessage",
+    "prebuild": "npm run nodeVersionMessage",
+    "build": "npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
     "package:lib": "npm run build && copyfiles ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
     "publish:lib": "npm run build && cd build && npm publish",
-    "lint:fix": "npx prettier --log-level silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --write \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
+    "lint:fix": "npx prettier --loglevel silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"cypress/**/*.{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}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
-    "lint:silent": "npx prettier --log-level silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
+    "lint:silent": "npx prettier --loglevel silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "test": "jest --silent --coverage",
-    "publishInit": "cp -r ./build/* . && rm -rf ./build",
+    "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
+    "postpublish": "git clean -fd",
     "semantic-release": "semantic-release",
     "typedoc": "node createTSDocs",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks && git config core.autocrlf false || true",
@@ -51,7 +54,7 @@
     "copyfiles": "2.4.1",
     "cors": "^2.8.5",
     "cp": "0.2.0",
-    "cypress": "^15.7.1",
+    "cypress": "7.7.0",
     "dotenv": "16.0.0",
     "express": "4.17.3",
     "jest": "29.7.0",
@@ -60,7 +63,7 @@
     "node-polyfill-webpack-plugin": "1.1.4",
     "path": "0.12.7",
     "pem": "1.14.5",
-    "prettier": "3.8.2",
+    "prettier": "2.8.7",
     "process": "0.11.10",
     "semantic-release": "19.0.3",
     "terser-webpack-plugin": "5.3.6",
@@ -76,8 +79,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "^3.5.6",
+    "@sasjs/utils": "3.5.2",
-    "axios": "1.16.0",
+    "axios": "1.12.2",
     "axios-cookiejar-support": "5.0.5",
     "form-data": "4.0.4",
     "https": "1.0.0",

sasjs-tests/README.md

@@ -6,13 +6,13 @@ Browser-based integration testing for [@sasjs/adapter](https://github.com/sasjs/
 
 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.
 
-> **Note:** `@sasjs/adapter` is not listed as a dependency in `package.json` - it is installed from a local build. After cloning or running `npm install`, you must run `update:adapter` before building.
+You can use the provided `update:adapter` NPM script for this.
 
 ```bash
     npm run update:adapter
 ```
 
-This script builds a new version of the adapter and installs it in the `sasjs-tests` project.
+This scripts builds a new version of the adapter and installs it in the `sasjs-tests` project.
 
 ## Running tests
 

sasjs-tests/index.css

@@ -12,6 +12,10 @@ body {
   background: #f5f5f5;
 }
 
+#app {
+  min-height: 100vh;
+}
+
 .app__error {
   max-width: 800px;
   margin: 50px auto;
@@ -36,4 +40,4 @@ body {
     border-radius: 4px;
     overflow-x: auto;
   }
-}
+}

sasjs-tests/package.json

@@ -18,5 +18,8 @@
   },
   "overrides": {
     "vite": "npm:rolldown-vite@7.2.2"
+  },
+  "dependencies": {
+    "@sasjs/adapter": "^4.14.0"
   }
 }

sasjs-tests/public/config.json

@@ -4,8 +4,8 @@
   "sasJsConfig": {
     "loginMechanism": "Redirected",
     "serverUrl": "",
-    "appLoc": "/Public/app/adapter-tests",
+    "appLoc": "/Public/app/adapter-tests/services",
-    "serverType": "SASJS",
+    "serverType": "SASVIYA",
     "debug": false,
     "contextName": "SAS Job Execution compute context",
     "useComputeApi": true

sasjs-tests/sasjs/sasjsconfig.json

@@ -7,7 +7,7 @@
   "targets": [
     {
       "name": "4gl",
-      "serverUrl": "https://sas.4gl.io",
+      "serverUrl": "https://sas9.4gl.io",
       "serverType": "SASJS",
       "httpsAgentOptions": {
         "allowInsecureRequests": false

sasjs-tests/src/components/TestCard.ts

@@ -72,7 +72,7 @@ export class TestCard extends HTMLElement {
           ? `
         <div class="error">
           <strong>Error:</strong>
-          <pre>${formatError(error)}</pre>
+          <pre>${(error as Error).message || String(error)}</pre>
         </div>
       `
           : ''
@@ -110,35 +110,4 @@ export class TestCard extends HTMLElement {
   }
 }
 
-const escapeHtml = (s: string) =>
-  s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
-
-const formatError = (err: unknown): string => {
-  if (err == null) return ''
-  if (typeof err === 'string') return escapeHtml(err)
-
-  const anyErr = err as any
-  // Adapter ErrorResponse: { error: { message, details, raw } }
-  const nestedMsg = anyErr?.error?.message
-  const directMsg = anyErr?.message
-  const msg = directMsg || nestedMsg
-
-  if (msg) {
-    const details = anyErr?.error?.details ?? anyErr?.details
-    const detailsStr =
-      details && typeof details === 'object'
-        ? `\n${JSON.stringify(details, null, 2)}`
-        : details
-          ? `\n${details}`
-          : ''
-    return escapeHtml(`${msg}${detailsStr}`)
-  }
-
-  try {
-    return escapeHtml(JSON.stringify(err, null, 2))
-  } catch {
-    return escapeHtml(String(err))
-  }
-}
-
 customElements.define('test-card', TestCard)

sasjs-tests/src/main.ts

@@ -22,7 +22,6 @@ import { sendArrTests, sendObjTests } from './testSuites/RequestData'
 import { fileUploadTests } from './testSuites/FileUpload'
 import { computeTests } from './testSuites/Compute'
 import { sasjsRequestTests } from './testSuites/SasjsRequests'
-import { specialCaseTests } from './testSuites/SpecialCases'
 
 async function init() {
   const appContainer = document.getElementById('app')
@@ -99,7 +98,7 @@ function showTests(
     // basicTests(adapter, configTyped.userName || '', configTyped.password || ''),
     sendArrTests(adapter, appLoc),
     sendObjTests(adapter),
-    specialCaseTests(adapter),
+    // specialCaseTests(adapter),
     sasjsRequestTests(adapter),
     fileUploadTests(adapter)
   ]

sasjs-tests/src/testSuites/Basic.ts

@@ -77,7 +77,7 @@ export const basicTests = (
         await adapter.logOut()
 
         return await adapter.request(
-          'services/common/sendArr',
+          'common/sendArr',
           stringData,
           undefined,
           async () => {
@@ -97,11 +97,7 @@ export const basicTests = (
           useComputeApi: false
         }
 
-        return await adapter.request(
+        return await adapter.request('common/sendArr', stringData, config)
-          'services/common/sendArr',
-          stringData,
-          config
-        )
       },
       assertion: (response: any) => {
         return response.table1[0][0] === stringData.table1[0].col1
@@ -116,11 +112,7 @@ export const basicTests = (
           debug: true
         }
 
-        return await adapter.request(
+        return await adapter.request('common/sendArr', stringData, config)
-          'services/common/sendArr',
-          stringData,
-          config
-        )
       },
       assertion: (response: any) => {
         return response.table1[0][0] === stringData.table1[0].col1

sasjs-tests/src/testSuites/Compute.ts

@@ -11,7 +11,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       title: 'Compute API request',
       description: 'Should run the request with compute API approach',
       test: async () => {
-        return await adapter.request('services/common/sendArr', stringData)
+        return await adapter.request('common/sendArr', stringData)
       },
       assertion: (response: any) => {
         return response.table1[0][0] === stringData.table1[0].col1
@@ -25,11 +25,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
           useComputeApi: false
         }
 
-        return await adapter.request(
+        return await adapter.request('common/sendArr', stringData, config)
-          'services/common/sendArr',
-          stringData,
-          config
-        )
       },
       assertion: (response: any) => {
         return response.table1[0][0] === stringData.table1[0].col1
@@ -40,10 +36,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       description: 'Should start a compute job and return the session',
       test: () => {
         const data: any = { table1: [{ col1: 'first col value' }] }
-        return adapter.startComputeJob(
+        return adapter.startComputeJob(`${appLoc}/common/sendArr`, data)
-          `${appLoc}/services/common/sendArr`,
-          data
-        )
       },
       assertion: (res: any) => {
         const expectedProperties = ['id', 'applicationName', 'attributes']
@@ -56,7 +49,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       test: () => {
         const data: any = { table1: [{ col1: 'first col value' }] }
         return adapter.startComputeJob(
-          `${appLoc}/services/common/sendArr`,
+          `${appLoc}/common/sendArr`,
           data,
           {},
           undefined,

sasjs-tests/src/testSuites/FileUpload.ts

@@ -22,11 +22,7 @@ export const fileUploadTests = (adapter: SASjs): TestSuite => ({
           }
         ]
 
-        return adapter.uploadFile(
+        return adapter.uploadFile('common/sendMacVars', filesToUpload, null)
-          'services/common/sendMacVars',
-          filesToUpload,
-          null
-        )
       },
       assertion: (response: any) =>
         (response.macvars as any[]).findIndex(

sasjs-tests/src/testSuites/RequestData.ts

@@ -53,7 +53,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       title: 'Absolute paths',
       description: 'Should work with absolute paths to SAS jobs',
       test: () => {
-        return adapter.request(`${appLoc}/services/common/sendArr`, stringData)
+        return adapter.request(`${appLoc}/common/sendArr`, stringData)
       },
       assertion: (res: any) => {
         return res.table1[0][0] === stringData.table1[0].col1
@@ -63,7 +63,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       title: 'Single string value',
       description: 'Should send an array with a single string value',
       test: () => {
-        return adapter.request('services/common/sendArr', stringData)
+        return adapter.request('common/sendArr', stringData)
       },
       assertion: (res: any) => {
         return res.table1[0][0] === stringData.table1[0].col1
@@ -74,7 +74,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       description:
         'Should send an array with a long string value under 32765 characters',
       test: () => {
-        return adapter.request('services/common/sendArr', getLongStringData())
+        return adapter.request('common/sendArr', getLongStringData())
       },
       assertion: (res: any) => {
         const longStringData = getLongStringData()
@@ -87,9 +87,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
         'Should error out with long string values over 32765 characters',
       test: () => {
         const data = getLongStringData(32767)
-        return adapter
+        return adapter.request('common/sendArr', data).catch((e: any) => e)
-          .request('services/common/sendArr', data)
-          .catch((e: any) => e)
       },
       assertion: (error: any) => {
         return !!error && !!error.error && !!error.error.message
@@ -99,7 +97,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       title: 'Single numeric value',
       description: 'Should send an array with a single numeric value',
       test: () => {
-        return adapter.request('services/common/sendArr', numericData)
+        return adapter.request('common/sendArr', numericData)
       },
       assertion: (res: any) => {
         return res.table1[0][0] === numericData.table1[0].col1
@@ -109,7 +107,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       title: 'Multiple columns',
       description: 'Should handle data with multiple columns',
       test: () => {
-        return adapter.request('services/common/sendArr', multiColumnData)
+        return adapter.request('common/sendArr', multiColumnData)
       },
       assertion: (res: any) => {
         return (
@@ -124,7 +122,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       title: 'Multiple rows with nulls',
       description: 'Should handle data with multiple rows with null values',
       test: () => {
-        return adapter.request('services/common/sendArr', multipleRowsWithNulls)
+        return adapter.request('common/sendArr', multipleRowsWithNulls)
       },
       assertion: (res: any) => {
         let result = true
@@ -150,10 +148,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       title: 'Multiple columns with nulls',
       description: 'Should handle data with multiple columns with null values',
       test: () => {
-        return adapter.request(
+        return adapter.request('common/sendArr', multipleColumnsWithNulls)
-          'services/common/sendArr',
-          multipleColumnsWithNulls
-        )
       },
       assertion: (res: any) => {
         let result = true
@@ -189,7 +184,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
           '1InvalidTable': [{ col1: 42 }]
         }
         return adapter
-          .request('services/common/sendObj', invalidData)
+          .request('common/sendObj', invalidData)
           .catch((e: any) => e)
       },
       assertion: (error: any) =>
@@ -203,7 +198,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
           'an invalidTable': [{ col1: 42 }]
         }
         return adapter
-          .request('services/common/sendObj', invalidData)
+          .request('common/sendObj', invalidData)
           .catch((e: any) => e)
       },
       assertion: (error: any) =>
@@ -217,7 +212,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
           'anInvalidTable#': [{ col1: 42 }]
         }
         return adapter
-          .request('services/common/sendObj', invalidData)
+          .request('common/sendObj', invalidData)
           .catch((e: any) => e)
       },
       assertion: (error: any) =>
@@ -232,7 +227,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
         }
 
         return adapter
-          .request('services/common/sendObj', invalidData)
+          .request('common/sendObj', invalidData)
           .catch((e: any) => e)
       },
       assertion: (error: any) =>
@@ -246,7 +241,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
           inData: [[{ data: 'value' }]]
         }
         return adapter
-          .request('services/common/sendObj', invalidData)
+          .request('common/sendObj', invalidData)
           .catch((e: any) => e)
       },
       assertion: (error: any) =>
@@ -256,7 +251,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       title: 'Single string value',
       description: 'Should send an object with a single string value',
       test: () => {
-        return adapter.request('services/common/sendObj', stringData)
+        return adapter.request('common/sendObj', stringData)
       },
       assertion: (res: any) => {
         return res.table1[0].COL1 === stringData.table1[0].col1
@@ -267,7 +262,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       description:
         'Should send an object with a long string value under 32765 characters',
       test: () => {
-        return adapter.request('services/common/sendObj', getLongStringData())
+        return adapter.request('common/sendObj', getLongStringData())
       },
       assertion: (res: any) => {
         const longStringData = getLongStringData()
@@ -280,7 +275,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
         'Should error out with long string values over 32765 characters',
       test: () => {
         return adapter
-          .request('services/common/sendObj', getLongStringData(32767))
+          .request('common/sendObj', getLongStringData(32767))
           .catch((e: any) => e)
       },
       assertion: (error: any) => {
@@ -291,7 +286,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       title: 'Single numeric value',
       description: 'Should send an object with a single numeric value',
       test: () => {
-        return adapter.request('services/common/sendObj', numericData)
+        return adapter.request('common/sendObj', numericData)
       },
       assertion: (res: any) => {
         return res.table1[0].COL1 === numericData.table1[0].col1
@@ -302,7 +297,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       title: 'Large data volume',
       description: 'Should send an object with a large amount of data',
       test: () => {
-        return adapter.request('services/common/sendObj', getLargeObjectData())
+        return adapter.request('common/sendObj', getLargeObjectData())
       },
       assertion: (res: any) => {
         const data = getLargeObjectData()
@@ -313,7 +308,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       title: 'Multiple columns',
       description: 'Should handle data with multiple columns',
       test: () => {
-        return adapter.request('services/common/sendObj', multiColumnData)
+        return adapter.request('common/sendObj', multiColumnData)
       },
       assertion: (res: any) => {
         return (
@@ -328,7 +323,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       title: 'Multiple rows with nulls',
       description: 'Should handle data with multiple rows with null values',
       test: () => {
-        return adapter.request('services/common/sendObj', multipleRowsWithNulls)
+        return adapter.request('common/sendObj', multipleRowsWithNulls)
       },
       assertion: (res: any) => {
         let result = true
@@ -354,10 +349,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
       title: 'Multiple columns with nulls',
       description: 'Should handle data with multiple columns with null values',
       test: () => {
-        return adapter.request(
+        return adapter.request('common/sendObj', multipleColumnsWithNulls)
-          'services/common/sendObj',
-          multipleColumnsWithNulls
-        )
       },
       assertion: (res: any) => {
         let result = true

sasjs-tests/src/testSuites/SasjsRequests.ts

@@ -11,7 +11,7 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
       title: 'WORK tables',
       description: 'Should get WORK tables after request',
       test: async () => {
-        return adapter.request('services/common/sendArr', data)
+        return adapter.request('common/sendArr', data)
       },
       assertion: () => {
         const requests = adapter.getSasRequests()
@@ -28,7 +28,7 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
     //     'Should make an error and capture log, in the same time it is testing if debug override is working',
     //   test: async () => {
     //     return adapter
-    //       .request('services/common/makeErr', data, { debug: true })
+    //       .request('common/makeErr', data, { debug: true })
     //       .catch(() => {
     //         const sasRequests = adapter.getSasRequests()
     //         const makeErrRequest: any =

sasjs-tests/src/testSuites/SpecialCases.ts

@@ -111,7 +111,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Common special characters',
       description: 'Should handle common special characters',
       test: () => {
-        return adapter.request('services/common/sendArr', specialCharData)
+        return adapter.request('common/sendArr', specialCharData)
       },
       assertion: (res: any) => {
         return (
@@ -133,7 +133,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Other special characters',
       description: 'Should handle other special characters',
       test: () => {
-        return adapter.request('services/common/sendArr', moreSpecialCharData)
+        return adapter.request('common/sendArr', moreSpecialCharData)
       },
       assertion: (res: any) => {
         // If sas session is `latin9` or `wlatin1` we can't process the special characters,
@@ -169,7 +169,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Wide table with sendArr',
       description: 'Should handle data with 10000 columns',
       test: () => {
-        return adapter.request('services/common/sendArr', getWideData())
+        return adapter.request('common/sendArr', getWideData())
       },
       assertion: (res: any) => {
         const data = getWideData()
@@ -185,7 +185,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Wide table with sendObj',
       description: 'Should handle data with 10000 columns',
       test: () => {
-        return adapter.request('services/common/sendObj', getWideData())
+        return adapter.request('common/sendObj', getWideData())
       },
       assertion: (res: any) => {
         const data = getWideData()
@@ -202,7 +202,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Multiple tables',
       description: 'Should handle data with 100 tables',
       test: () => {
-        return adapter.request('services/common/sendArr', getTables())
+        return adapter.request('common/sendArr', getTables())
       },
       assertion: (res: any) => {
         const data = getTables()
@@ -222,7 +222,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Large dataset with sendObj',
       description: 'Should handle 5mb of data',
       test: () => {
-        return adapter.request('services/common/sendObj', getLargeDataset())
+        return adapter.request('common/sendObj', getLargeDataset())
       },
       assertion: (res: any) => {
         const data = getLargeDataset()
@@ -237,7 +237,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Large dataset with sendArr',
       description: 'Should handle 5mb of data',
       test: () => {
-        return adapter.request('services/common/sendArr', getLargeDataset())
+        return adapter.request('common/sendArr', getLargeDataset())
       },
       assertion: (res: any) => {
         const data = getLargeDataset()
@@ -253,7 +253,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Error and _csrf tables with sendArr',
       description: 'Should handle error and _csrf tables',
       test: () => {
-        return adapter.request('services/common/sendArr', errorAndCsrfData)
+        return adapter.request('common/sendArr', errorAndCsrfData)
       },
       assertion: (res: any) => {
         return (
@@ -272,7 +272,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Error and _csrf tables with sendObj',
       description: 'Should handle error and _csrf tables',
       test: () => {
-        return adapter.request('services/common/sendObj', errorAndCsrfData)
+        return adapter.request('common/sendObj', errorAndCsrfData)
       },
       assertion: (res: any) => {
         return (
@@ -300,7 +300,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
         }
 
         return await adapter.request(
-          'services/common/sendArr',
+          'common/sendArr',
           stringData,
           config,
           undefined,
@@ -319,10 +319,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
       title: 'Special missing values',
       description: 'Should support special missing values',
       test: () => {
-        return adapter.request(
+        return adapter.request('common/sendObj', testTableWithSpecialNumeric)
-          'services/common/sendObj',
-          testTableWithSpecialNumeric
-        )
       },
       assertion: (res: any) => {
         let assertionRes = true
@@ -368,7 +365,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
         'Should support special missing values, when one row is send',
       test: () => {
         return adapter.request(
-          'services/common/sendObj',
+          'common/sendObj',
           testTableWithSpecialNumericOneRow
         )
       },
@@ -416,7 +413,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
         'Should support special missing values, when LOWERCASE value is sent',
       test: () => {
         return adapter.request(
-          'services/common/sendObj',
+          'common/sendObj',
           testTableWithSpecialNumericLowercase
         )
       },
@@ -472,7 +469,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
         'Should support special missing values, when one row is send (On VIYA Web Approach)',
       test: () => {
         return adapter.request(
-          'services/common/sendObj',
+          'common/sendObj',
           testTableWithSpecialNumericOneRow,
           { useComputeApi: undefined }
         )

sasjs-tests/vite.config.js

@@ -1,8 +1,5 @@
 import { defineConfig } from 'vite'
 export default defineConfig({
-  server: {
-    port: 3000
-  },
   build: {
     assetsInlineLimit: 0,
     assetsDir: ''

src/ContextManager.ts

@@ -32,18 +32,16 @@ export class ContextManager {
     return this.defaultLauncherContexts
   }
 
-  constructor(
+  constructor(private serverUrl: string, private requestClient: RequestClient) {
-    private serverUrl: string,
-    private requestClient: RequestClient
-  ) {
     if (serverUrl) isUrl(serverUrl)
   }
 
   public async getComputeContexts(accessToken?: string) {
     const { result: contexts } = await this.requestClient
-      .get<{
+      .get<{ items: Context[] }>(
-        items: Context[]
+        `${this.serverUrl}/compute/contexts?limit=10000`,
-      }>(`${this.serverUrl}/compute/contexts?limit=10000`, accessToken)
+        accessToken
+      )
       .catch((err) => {
         throw prefixMessage(err, 'Error while getting compute contexts. ')
       })
@@ -61,9 +59,10 @@ export class ContextManager {
 
   public async getLauncherContexts(accessToken?: string) {
     const { result: contexts } = await this.requestClient
-      .get<{
+      .get<{ items: Context[] }>(
-        items: Context[]
+        `${this.serverUrl}/launcher/contexts?limit=10000`,
-      }>(`${this.serverUrl}/launcher/contexts?limit=10000`, accessToken)
+        accessToken
+      )
       .catch((err) => {
         throw prefixMessage(err, 'Error while getting launcher contexts. ')
       })
@@ -292,9 +291,7 @@ export class ContextManager {
     accessToken?: string
   ): Promise<Context> {
     const { result: contexts } = await this.requestClient
-      .get<{
+      .get<{ items: Context[] }>(
-        items: Context[]
-      }>(
         `${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
         accessToken
       )
@@ -335,9 +332,7 @@ export class ContextManager {
     authConfig?: AuthConfig
   ) {
     const { result: contexts } = await this.requestClient
-      .get<{
+      .get<{ items: Context[] }>(
-        items: Context[]
-      }>(
         `${this.serverUrl}/compute/contexts?limit=10000`,
         authConfig?.access_token
       )

src/SASViyaApiClient.ts

@@ -35,60 +35,6 @@ interface JobExecutionResult {
   log?: string
   error?: object
 }
-/* Viya /types/types?limit=999999 response structure */
-interface IViyaTypesResponse {
-  accept: string
-  count: number
-  items: IViyaTypesItem[]
-  limit: number
-  links: IViyaTypesLink[]
-  name: string
-  start: number
-  version: number
-}
-
-/* Item element within the Viya types response */
-interface IViyaTypesItem {
-  description?: string
-  extensions?: string[]
-  iconUri?: string
-  label: string
-  links: IViyaTypesLink[]
-  mappedTypes?: string[]
-  mediaType?: string
-  mediaTypes?: string[]
-  name?: string | undefined
-  pluralLabel?: string
-  properties?: IViyaTypesProperties
-  resourceUri?: string
-  serviceRootUri?: string
-  tags?: string[]
-  version: number
-}
-
-/**
- * Generic structure for a link
- * in the links array of a Viya
- * types/types api response
- */
-type IViyaTypesLink = Record<string, string>
-
-/**
- * Generic structure for a type's
- * 'properties' object from the Viya
- * types/types api response
- */
-type IViyaTypesProperties = Record<string, string>
-
-/**
- * Arbitrary interface for storing
- * sufficient additional detail to
- * create and patch a new file.
- */
-interface IViyaTypesExtensionInfo {
-  typeDefName: string | undefined
-  properties: IViyaTypesProperties | undefined
-}
 
 /**
  * A client for interfacing with the SAS Viya REST API.
@@ -115,9 +61,6 @@ export class SASViyaApiClient {
     this.requestClient
   )
   private folderMap = new Map<string, Job[]>()
-  private fileExtensionMap = new Map<string, IViyaTypesExtensionInfo>()
-  private boolExtensionMap = false // required in case the map has zero entries
-  // after an attempt to populate it.
 
   /**
    * A helper method used to call appendRequest method of RequestClient
@@ -491,102 +434,15 @@ export class SASViyaApiClient {
     const formData = new NodeFormData()
     formData.append('file', contentBuffer, fileName)
 
-    /** Query Viya for file metadata based on extension type. */
+    return (
-
+      await this.requestClient.post<File>(
-    // typeDefName - Viya accepts this property during the file creation
+        `/files/files?parentFolderUri=${parentFolderUri}&typeDefName=file#rawUpload`,
-    let typeDefName: string | undefined = undefined
+        formData,
-    // Additional properties are supplied by a patch.
+        accessToken,
-    let filePatch:
+        'multipart/form-data; boundary=' + (formData as any)._boundary,
-      | {
+        headers
-          name: string
+      )
-          properties: IViyaTypesProperties | undefined
+    ).result
-        }
-      | undefined = undefined
-
-    // The patching process requires properties related to the file-extension
-    const fileExtension: string | undefined = fileName
-      .split('.')
-      .pop()
-      ?.toLowerCase()
-
-    if (fileExtension) {
-      if (!this.boolExtensionMap) {
-        // Populate the file extension map
-        // 1. Get Viya's response to this api call
-        const typesQueryUrl = `/types/types?limit=999999`
-        const response = (
-          await this.requestClient.get(typesQueryUrl, accessToken)
-        ).result as IViyaTypesResponse
-        // 2. Filter the returned items that have file extensions into a map
-        //    using forEach as an item may relate to multiple file extensions.
-        response.items
-          .filter((e) => e.extensions)
-          .forEach((e) => {
-            e.extensions?.forEach((ext) => {
-              this.fileExtensionMap.set(ext, {
-                // `name` becomes the typeDefName value at file creation time.
-                // `name` is ignored here if it is not populated in the map, or
-                // has a blank/empty value.
-                typeDefName: e.name
-                  ? e.name.trim().length
-                    ? e.name.trim()
-                    : undefined
-                  : undefined,
-                properties: e.properties
-              })
-            })
-          })
-        // 3. Toggle the flag to avoid repeating this step
-        this.boolExtensionMap = true
-      }
-
-      // Query the map for the current file extension
-      const fileExtInfo = this.fileExtensionMap.get(fileExtension)
-      if (fileExtInfo) {
-        // If the extension was found in the map, record the typeDefName and
-        // create a patch if a properties object was returned.
-        typeDefName = fileExtInfo.typeDefName
-        if (fileExtInfo.properties)
-          filePatch = { name: fileName, properties: fileExtInfo.properties }
-      }
-    }
-
-    // Create the file
-    const createFileResponse = await this.requestClient.post<File>(
-      `/files/files?parentFolderUri=${parentFolderUri}&typeDefName=${
-        typeDefName ?? 'file'
-      }#rawUpload`,
-      formData,
-      accessToken,
-      'multipart/form-data; boundary=' + (formData as any)._boundary,
-      headers
-    )
-
-    // If a patch was created...
-    if (filePatch) {
-      try {
-        const patchHeaders = {
-          Accept: 'application/json',
-          'If-Match': '*'
-        }
-        // Get the URI of the newly created file
-        const fileUri = createFileResponse.result.links.filter(
-          (e) => e.method == 'PATCH' && e.rel == 'patch'
-        )[0].uri
-        // and apply the patch
-        return (
-          await this.requestClient.patch<File>(
-            `${fileUri}`,
-            filePatch,
-            accessToken,
-            patchHeaders
-          )
-        ).result
-      } catch (e: any) {
-        throw new Error(`Error patching file ${fileName}.\n${e.message}`)
-      }
-    }
-    return createFileResponse.result
   }
 
   /**
@@ -1026,22 +882,17 @@ export class SASViyaApiClient {
     }
 
     files.forEach((fileInfo, index) => {
-      jobArguments[`_webin_fileuri${index + 1}`] =
+      jobArguments[
-        `/files/files/${fileInfo.file.id}`
+        `_webin_fileuri${index + 1}`
+      ] = `/files/files/${fileInfo.file.id}`
       jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName
     })
 
-    // Viya JES requires arguments to be Map<String,String>; coerce booleans/numbers.
-    const stringifiedArguments: { [key: string]: string } = {}
-    for (const k of Object.keys(jobArguments)) {
-      stringifiedArguments[k] = String(jobArguments[k])
-    }
-
     const postJobRequestBody = {
       name: `exec-${jobName}`,
       description: 'Powered by SASjs',
       jobDefinition,
-      arguments: stringifiedArguments
+      arguments: jobArguments
     }
 
     const { result: postedJob } = await this.requestClient.post<Job>(

src/SASjs.ts

@@ -1063,8 +1063,8 @@ export default class SASjs {
       this.sasjsConfig.serverType === ServerType.SasViya
         ? this.sasjsConfig.pathSASViya
         : this.sasjsConfig.serverType === ServerType.Sas9
-          ? this.sasjsConfig.pathSAS9
+        ? this.sasjsConfig.pathSAS9
-          : this.sasjsConfig.pathSASJS
+        : this.sasjsConfig.pathSASJS
 
     this.authManager = new AuthManager(
       this.sasjsConfig.serverUrl,

src/api/viya/executeOnComputeApi.ts

@@ -125,8 +125,9 @@ export async function executeOnComputeApi(
         jobVariables['_webin_file_count'] = files.length
 
         files.forEach((fileInfo, index) => {
-          jobVariables[`_webin_fileuri${index + 1}`] =
+          jobVariables[
-            `/files/files/${fileInfo.file.id}`
+            `_webin_fileuri${index + 1}`
+          ] = `/files/files/${fileInfo.file.id}`
           jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName
         })
       } else {

src/api/viya/spec/pollJobState.spec.ts

@@ -683,8 +683,8 @@ const mockSimplePoll = (runningCount = 2) => {
         count === 0
           ? 'pending'
           : count <= runningCount
-            ? 'running'
+          ? 'running'
-            : 'completed',
+          : 'completed',
       etag: '',
       status: 200
     })

src/api/viya/spec/uploadTables.spec.ts

@@ -23,20 +23,6 @@ describe('uploadTables', () => {
     )
   })
 
-  it('should skip $tablename formats metadata keys', async () => {
-    const data = {
-      tablewith2cols2rows: [{ col1: 'val1', specialMissingsCol: 'A' }],
-      $tablewith2cols2rows: { formats: { specialMissingsCol: 'best.' } }
-    }
-
-    const files = await uploadTables(requestClient, data, 't0k3n')
-
-    expect(files).toEqual([
-      { tableName: 'tablewith2cols2rows', file: 'test-file' }
-    ])
-    expect(requestClient.uploadFile).toHaveBeenCalledTimes(1)
-  })
-
   it('should throw an error when the CSV exceeds the maximum length', async () => {
     const data = { foo: 'bar' }
     jest

src/api/viya/uploadTables.ts

@@ -1,6 +1,6 @@
 import { prefixMessage } from '@sasjs/utils/error'
 import { RequestClient } from '../../request/RequestClient'
-import { convertToCSV, isFormatsTable } from '../../utils/convertToCsv'
+import { convertToCSV } from '../../utils/convertToCsv'
 
 /**
  * Uploads tables to SAS as specially formatted CSVs.
@@ -18,10 +18,6 @@ export async function uploadTables(
   const uploadedFiles = []
 
   for (const tableName in data) {
-    // $tablename keys carry only column-format metadata for the matching
-    // tablename payload; they must not be uploaded as separate files.
-    if (isFormatsTable(tableName)) continue
-
     const csv = convertToCSV(data, tableName)
     if (csv === 'ERROR: LARGE STRING LENGTH') {
       throw new Error(

src/auth/AuthManager.ts

@@ -27,8 +27,8 @@ export class AuthManager {
       this.serverType === ServerType.Sas9
         ? '/SASLogon/logout?'
         : this.serverType === ServerType.SasViya
-          ? '/SASLogon/logout.do?'
+        ? '/SASLogon/logout.do?'
-          : '/SASLogon/logout'
+        : '/SASLogon/logout'
 
     this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl
   }
@@ -269,8 +269,8 @@ export class AuthManager {
       this.serverType === ServerType.SasViya
         ? `${this.serverUrl}/identities/users/@currentUser`
         : this.serverType === ServerType.Sas9
-          ? `${this.serverUrl}/SASStoredProcess`
+        ? `${this.serverUrl}/SASStoredProcess`
-          : `${this.serverUrl}/SASjsApi/session`
+        : `${this.serverUrl}/SASjsApi/session`
 
     const { result: loginResponse } = await this.requestClient
       .get<string>(url, undefined, 'text/plain')

src/auth/spec/openWebPage.spec.ts

@@ -10,7 +10,7 @@ describe('openWebPage', () => {
   describe('window.open is not blocked', () => {
     const mockedOpen = jest
       .fn()
-      .mockImplementation(() => ({}) as unknown as Window)
+      .mockImplementation(() => ({} as unknown as Window))
     const originalOpen = window.open
 
     beforeAll(() => {

src/job-execution/ComputeJobExecutor.ts

@@ -8,10 +8,7 @@ import {
 import { BaseJobExecutor } from './JobExecutor'
 
 export class ComputeJobExecutor extends BaseJobExecutor {
-  constructor(
+  constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
-    serverUrl: string,
-    private sasViyaApiClient: SASViyaApiClient
-  ) {
     super(serverUrl, ServerType.SasViya)
   }
 

src/job-execution/JesJobExecutor.ts

@@ -10,10 +10,7 @@ import { BaseJobExecutor } from './JobExecutor'
 import { appendExtraResponseAttributes } from '../utils'
 
 export class JesJobExecutor extends BaseJobExecutor {
-  constructor(
+  constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
-    serverUrl: string,
-    private sasViyaApiClient: SASViyaApiClient
-  ) {
     super(serverUrl, ServerType.SasViya)
   }
 

src/job-execution/JobExecutor.ts

@@ -17,10 +17,7 @@ export interface JobExecutor {
 }
 
 export abstract class BaseJobExecutor implements JobExecutor {
-  constructor(
+  constructor(protected serverUrl: string, protected serverType: ServerType) {}
-    protected serverUrl: string,
-    protected serverType: ServerType
-  ) {}
 
   private waitingRequests: ExecuteFunction[] = []
 

src/job-execution/WebJobExecutor.ts

@@ -97,10 +97,12 @@ export class WebJobExecutor extends BaseJobExecutor {
         apiUrl = apiUrl.replace('_program=', '__program=')
       }
 
-      // Append context name to URL if provided and non-empty
+      // if context name exists and is not blank string
-      apiUrl += config.contextName?.trim()
+      // then add _contextname variable in apiUrl
-        ? `&_contextname=${encodeURIComponent(config.contextName)}`
+      apiUrl +=
-        : ''
+        config.contextName && !/\s/.test(config.contextName)
+          ? `&_contextname=${config.contextName}`
+          : ''
     }
 
     let requestParams = {

src/request/RequestClient.ts

@@ -273,13 +273,9 @@ export class RequestClient implements HttpClient {
   public async patch<T>(
     url: string,
     data: any = {},
-    accessToken?: string,
+    accessToken?: string
-    overrideHeaders: { [key: string]: string | number } = {}
   ): Promise<{ result: T; etag: string }> {
-    const headers = {
+    const headers = this.getHeaders(accessToken, 'application/json')
-      ...this.getHeaders(accessToken, 'application/json'),
-      ...overrideHeaders
-    }
 
     return this.httpClient
       .patch<T>(url, data, { headers, withXSRFToken: true })

src/test/RequestClient.spec.ts

@@ -631,7 +631,7 @@ describe('RequestClient - Self Signed Server', () => {
         getTokenRequestErrorPrefixResponse(err.message, ServerType.SasViya)
       )
 
-    expect(rejectionErrorMessage).toContain(expectedError)
+    expect(rejectionErrorMessage).toEqual(expectedError)
   })
 
   it('should response the POST method using insecure flag', async () => {

src/types/errors/AuthorizeError.ts

@@ -1,8 +1,5 @@
 export class AuthorizeError extends Error {
-  constructor(
+  constructor(public message: string, public confirmUrl: string) {
-    public message: string,
-    public confirmUrl: string
-  ) {
     super(message)
     this.name = 'AuthorizeError'
     Object.setPrototypeOf(this, AuthorizeError.prototype)

src/types/errors/ComputeJobExecutionError.ts

@@ -1,10 +1,7 @@
 import { Job } from '../Job'
 
 export class ComputeJobExecutionError extends Error {
-  constructor(
+  constructor(public job: Job, public log: string) {
-    public job: Job,
-    public log: string
-  ) {
     super('Error: Job execution failed')
     this.name = 'ComputeJobExecutionError'
     Object.setPrototypeOf(this, ComputeJobExecutionError.prototype)

src/types/errors/JobStatePollError.ts

@@ -1,8 +1,5 @@
 export class JobStatePollError extends Error {
-  constructor(
+  constructor(id: string, public originalError: Error) {
-    id: string,
-    public originalError: Error
-  ) {
     super(
       `Error while polling job state for job ${id}: ${
         originalError.message || originalError

src/utils/convertToCsv.ts

@@ -110,8 +110,8 @@ export const convertToCSV = (
             longestValueForField
               ? longestValueForField
               : firstFoundType === 'chars'
-                ? '1'
+              ? '1'
-                : 'best'
+              : 'best'
           }.`
         )
       }