chore: tidied up branch

.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
@@ -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,8 +20,7 @@ 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
       - name: Restore 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
@@ -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

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22]
+        node-version: [lts/hydrogen]
 
     steps:
       - uses: actions/checkout@v2
@@ -26,26 +26,14 @@ jobs:
         uses: actions/cache@v3
         id: npm-cache
         with:
-          path: |
+          path: ~/.npm
-            ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - name: Cache Cypress binary
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/Cypress
-          key: cypress-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            cypress-${{ runner.os }}-
-
       - name: Install Dependencies
         run: npm ci
 
-      - name: Install Cypress binary
-        run: npx cypress install
-
       - name: Install Rimraf
         run: npm i rimraf
 
@@ -91,16 +79,14 @@ jobs:
 
       - name: Deploy sasjs-tests
         run: |
-          sudo apt install jq
+          npm install -g replace-in-files-cli
           cd sasjs-tests
-          npm i --ignore-scripts
+          replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json
-          npm i ../build/sasjs-adapter-5.0.0.tgz
+          npm i
-          jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json
-          jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json
-          jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json
-          jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json
-          jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-
           cat ./public/config.json
 
           npm run update:adapter
@@ -111,13 +97,11 @@ jobs:
         shell: bash
 
       - name: Run cypress on sasjs
-        env:
-          TERM: dumb
         run: |
-          sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
+          replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.json
-          sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
+          replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json
-          sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
+          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json
-          cat ./cypress.config.js
+          cat ./cypress.json
           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,3 +0,0 @@
-ignore-scripts=true
-save-exact=true
-fund=false

README.md

@@ -288,7 +288,6 @@ Configuration on the client side involves passing an object on startup, which ca
 - `verbose` - optional, if `true` then a summary of every HTTP response is logged.
 - `loginMechanism` - either `Default` or `Redirected`. See [SAS Logon](#sas-logon) section.
 - `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used. If `false` the [JES API](#using-the-jes-api) is used. If `null` or `undefined` the [Web](#using-jes-web-app) approach is used.
-- `runAsTask` - Only relevant for serverType `SASVIYA` and useComputeApi `null`.  Will add the `_EXECUTIONTASKS=true` URL param and thus execute jobs as Compute Tasks.
 - `contextName` - Compute context on which the requests will be called. If missing or not provided, defaults to `Job Execution Compute context`.
 - `requestHistoryLimit` - Request history limit. Increasing this limit may affect browser performance, especially with debug (logs) enabled. Default is 10.
 

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: 300000
-  }
-})

cypress.json

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

cypress/integration/sasjs.tests.ts

@@ -9,64 +9,10 @@ context('sasjs-tests', function () {
   })
 
   beforeEach(() => {
-    cy.visit(sasjsTestsUrl)
+    cy.reload()
   })
 
-  function waitForTestsToFinish(timeout: number) {
-    const deadline = Date.now() + timeout
-    function check() {
-      cy.get('tests-view', { log: false }).then(($view) => {
-        const shadow = ($view[0] as HTMLElement).shadowRoot
-        const stillRunning = !!shadow?.querySelector('#run-btn:disabled')
-        if (!stillRunning) return
-        if (Date.now() >= deadline) {
-          cy.log('Timed out waiting for tests to finish; reporting status')
-          return
-        }
-        cy.wait(2000, { log: false })
-        check()
-      })
-    }
-    check()
-  }
-
-  function assertNoFailedTests() {
-    cy.get('test-card').then(($cards) => {
-      const failed: string[] = []
-      const stuck: string[] = []
-      const pending: string[] = []
-      $cards.each((_, card) => {
-        const shadow = (card as HTMLElement).shadowRoot
-        if (!shadow) return
-        const icon = shadow.querySelector('.status-icon')
-        const title =
-          shadow.querySelector('.header h3')?.textContent?.trim() ?? '(unknown)'
-        if (icon?.classList.contains('failed')) {
-          const error =
-            shadow.querySelector('.error pre')?.textContent?.trim() ?? ''
-          failed.push(error ? `- ${title}\n    ${error}` : `- ${title}`)
-        } else if (icon?.classList.contains('running')) {
-          stuck.push(`- ${title}`)
-        } else if (icon?.classList.contains('pending')) {
-          pending.push(`- ${title}`)
-        }
-      })
-      const parts: string[] = []
-      if (failed.length)
-        parts.push(`${failed.length} failed:\n${failed.join('\n')}`)
-      if (stuck.length)
-        parts.push(`${stuck.length} stuck (running):\n${stuck.join('\n')}`)
-      if (pending.length)
-        parts.push(
-          `${pending.length} did not start (pending):\n${pending.join('\n')}`
-        )
-      expect(parts, parts.join('\n\n')).to.be.empty
-    })
-  }
-
   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')
@@ -94,9 +40,14 @@ context('sasjs-tests', function () {
 
     cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
 
-    waitForTestsToFinish(testingFinishTimeout)
+    cy.get('tests-view')
+      .shadow()
+      .find('#run-btn:disabled', {
+        timeout: testingFinishTimeout
+      })
+      .should('not.exist')
 
-    assertNoFailedTests()
+    cy.get('test-card').shadow().find('.status-icon.failed').should('not.exist')
   })
 
   it('Should have all tests successful with debug on', () => {
@@ -110,8 +61,13 @@ context('sasjs-tests', function () {
 
     cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
 
-    waitForTestsToFinish(testingFinishTimeout)
+    cy.get('tests-view')
+      .shadow()
+      .find('#run-btn:disabled', {
+        timeout: testingFinishTimeout
+      })
+      .should('not.exist')
 
-    assertNoFailedTests()
+    cy.get('test-card').shadow().find('.status-icon.failed').should('not.exist')
   })
 })

package-lock.json

@@ -5,10 +5,11 @@
   "packages": {
     "": {
       "name": "@sasjs/adapter",
+      "hasInstallScript": true,
       "license": "ISC",
       "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",
@@ -25,7 +26,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",
@@ -34,7 +35,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",
@@ -1693,9 +1694,7 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.9",
+      "version": "2.88.12",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.9.tgz",
-      "integrity": "sha512-I3l7FdGRXluAS44/0NguwWlO83J18p0vlr2FYHrJkWdNYhgVoiYo61IXPqaOsL+vNxU1ZqMACzItGK3/KKDsdw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1705,16 +1704,16 @@
         "combined-stream": "~1.0.6",
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~4.0.4",
+        "form-data": "~2.3.2",
-        "http-signature": "~1.4.0",
+        "http-signature": "~1.3.6",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.14.0",
+        "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "^5.0.0",
+        "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -1722,17 +1721,17 @@
         "node": ">= 6"
       }
     },
-    "node_modules/@cypress/request/node_modules/tough-cookie": {
+    "node_modules/@cypress/request/node_modules/form-data": {
-      "version": "5.1.2",
+      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
-      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "MIT",
       "dependencies": {
-        "tldts": "^6.1.32"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">= 0.12"
       }
     },
     "node_modules/@cypress/webpack-preprocessor": {
@@ -2425,9 +2424,10 @@
       }
     },
     "node_modules/@sasjs/utils": {
-      "version": "3.5.6",
+      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.6.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.2.tgz",
-      "integrity": "sha512-jx8zWSOysDD66vTjA0BWiZ8bcFqmqh8F+56fUCgLmJhm89eDbKrGF3mDKMQx3UE7d2+gxp9xYhJCdaBWz0Dlxw==",
+      "integrity": "sha512-LBpBDx0T7G/eO15Gb+r3DR1LfBnoqagWT3HiHabojFziA4ej4ePORo8chrk0zHLIzrjI2ljAnDabyJEwC5KtIA==",
+      "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
         "@fast-csv/format": "4.3.5",
@@ -2962,9 +2962,7 @@
       }
     },
     "node_modules/@types/sinonjs__fake-timers": {
-      "version": "8.1.1",
+      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
       "dev": true,
       "license": "MIT"
     },
@@ -2980,13 +2978,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/tmp": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
-      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.2",
       "dev": true,
@@ -3425,8 +3416,6 @@
     },
     "node_modules/asn1": {
       "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3462,8 +3451,6 @@
     },
     "node_modules/assert-plus": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3511,8 +3498,6 @@
     },
     "node_modules/aws-sign2": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3521,20 +3506,18 @@
     },
     "node_modules/aws4": {
       "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
-      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.16.0",
+      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
-      "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
+      "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.16.0",
+        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.5",
+        "form-data": "^4.0.4",
-        "proxy-from-env": "^2.1.0"
+        "proxy-from-env": "^1.1.0"
       }
     },
     "node_modules/axios-cookiejar-support": {
@@ -3556,22 +3539,6 @@
         "tough-cookie": ">=4.0.0"
       }
     },
-    "node_modules/axios/node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/babel-jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
@@ -3772,8 +3739,6 @@
     },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -4220,8 +4185,6 @@
     },
     "node_modules/caseless": {
       "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true,
       "license": "Apache-2.0"
     },
@@ -4257,6 +4220,14 @@
         "node": "*"
       }
     },
+    "node_modules/check-more-types": {
+      "version": "2.24.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/chrome-trace-event": {
       "version": "1.0.4",
       "dev": true,
@@ -4444,9 +4415,7 @@
       }
     },
     "node_modules/commander": {
-      "version": "6.2.1",
+      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4839,129 +4808,58 @@
       "license": "MIT"
     },
     "node_modules/cypress": {
-      "version": "15.7.1",
+      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.7.1.tgz",
-      "integrity": "sha512-U3sYnJ+Cnpgr6IPycxsznTg//mGVXfPGeGV+om7VQCyp5XyVkhG4oPr3X3hTq1+OB0Om0O5DxusYmt7cbvwqMQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@cypress/request": "^3.0.9",
+        "@cypress/request": "^2.88.5",
         "@cypress/xvfb": "^1.2.4",
-        "@types/sinonjs__fake-timers": "8.1.1",
+        "@types/node": "^14.14.31",
+        "@types/sinonjs__fake-timers": "^6.0.2",
         "@types/sizzle": "^2.3.2",
-        "@types/tmp": "^0.2.3",
         "arch": "^2.2.0",
         "blob-util": "^2.0.2",
         "bluebird": "^3.7.2",
-        "buffer": "^5.7.1",
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
-        "ci-info": "^4.1.0",
+        "check-more-types": "^2.24.0",
         "cli-cursor": "^3.1.0",
-        "cli-table3": "0.6.1",
+        "cli-table3": "~0.6.0",
-        "commander": "^6.2.1",
+        "commander": "^5.1.0",
         "common-tags": "^1.8.0",
         "dayjs": "^1.10.4",
-        "debug": "^4.3.4",
+        "debug": "^4.3.2",
         "enquirer": "^2.3.6",
-        "eventemitter2": "6.4.7",
+        "eventemitter2": "^6.4.3",
         "execa": "4.1.0",
         "executable": "^4.1.1",
         "extract-zip": "2.0.1",
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
-        "hasha": "5.2.2",
+        "getos": "^3.2.1",
+        "is-ci": "^3.0.0",
         "is-installed-globally": "~0.4.0",
+        "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
         "lodash": "^4.17.21",
         "log-symbols": "^4.0.0",
-        "minimist": "^1.2.8",
+        "minimist": "^1.2.5",
         "ospath": "^1.2.2",
         "pretty-bytes": "^5.6.0",
-        "process": "^0.11.10",
+        "ramda": "~0.27.1",
-        "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
         "supports-color": "^8.1.1",
-        "systeminformation": "5.27.7",
+        "tmp": "~0.2.1",
-        "tmp": "~0.2.4",
-        "tree-kill": "1.2.2",
         "untildify": "^4.0.0",
+        "url": "^0.11.0",
         "yauzl": "^2.10.0"
       },
       "bin": {
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^20.1.0 || ^22.0.0 || >=24.0.0"
+        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/cypress/node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/cypress/node_modules/ci-info": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
-      "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cypress/node_modules/cli-table3": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
-      "integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": "10.* || >= 12.*"
-      },
-      "optionalDependencies": {
-        "colors": "1.4.0"
-      }
-    },
-    "node_modules/cypress/node_modules/colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.1.90"
       }
     },
     "node_modules/cypress/node_modules/fs-extra": {
@@ -4978,13 +4876,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/cypress/node_modules/proxy-from-env": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
-      "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/cypress/node_modules/supports-color": {
       "version": "8.1.1",
       "dev": true,
@@ -5001,8 +4892,6 @@
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5361,8 +5250,6 @@
     },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5731,9 +5618,7 @@
       }
     },
     "node_modules/eventemitter2": {
-      "version": "6.4.7",
+      "version": "6.4.9",
-      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
-      "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
       "dev": true,
       "license": "MIT"
     },
@@ -5887,8 +5772,6 @@
     },
     "node_modules/extend": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true,
       "license": "MIT"
     },
@@ -5913,8 +5796,6 @@
     },
     "node_modules/extsprintf": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
       "engines": [
         "node >=0.6.0"
@@ -6135,9 +6016,7 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.16.0",
+      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
-      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
       "funding": [
         {
           "type": "individual",
@@ -6170,8 +6049,6 @@
     },
     "node_modules/forever-agent": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -6282,21 +6159,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "license": "MIT",
@@ -6377,10 +6239,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/getos": {
+      "version": "3.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async": "^3.2.0"
+      }
+    },
     "node_modules/getpass": {
       "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6588,33 +6456,6 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
-    "node_modules/hasha": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-stream": "^2.0.0",
-        "type-fest": "^0.8.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/hasha/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/hasown": {
       "version": "2.0.2",
       "license": "MIT",
@@ -6754,15 +6595,13 @@
       }
     },
     "node_modules/http-signature": {
-      "version": "1.4.0",
+      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
-      "integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^2.0.2",
-        "sshpk": "^1.18.0"
+        "sshpk": "^1.14.1"
       },
       "engines": {
         "node": ">=0.10"
@@ -6996,6 +6835,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-ci": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ci-info": "^3.2.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
     "node_modules/is-core-module": {
       "version": "2.16.1",
       "dev": true,
@@ -7204,8 +7054,6 @@
     },
     "node_modules/is-typedarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true,
       "license": "MIT"
     },
@@ -7240,8 +7088,6 @@
     },
     "node_modules/isstream": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true,
       "license": "MIT"
     },
@@ -8274,8 +8120,6 @@
     },
     "node_modules/jsbn": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true,
       "license": "MIT"
     },
@@ -8348,8 +8192,6 @@
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true,
       "license": "(AFL-2.1 OR BSD-3-Clause)"
     },
@@ -8414,8 +8256,6 @@
     },
     "node_modules/jsprim": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
-      "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
       "dev": true,
       "engines": [
         "node >=0.6.0"
@@ -8447,6 +8287,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/lazy-ass": {
+      "version": "1.6.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "> 0.8"
+      }
+    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -12197,8 +12045,6 @@
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
       "dev": true,
       "license": "MIT"
     },
@@ -12321,16 +12167,14 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.2",
+      "version": "2.8.7",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.2.tgz",
-      "integrity": "sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==",
       "dev": true,
       "license": "MIT",
       "bin": {
-        "prettier": "bin/prettier.cjs"
+        "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=10.13.0"
       },
       "funding": {
         "url": "https://github.com/prettier/prettier?sponsor=1"
@@ -12417,13 +12261,10 @@
       }
     },
     "node_modules/proxy-from-env": {
-      "version": "2.1.0",
+      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT",
+      "license": "MIT"
-      "engines": {
-        "node": ">=10"
-      }
     },
     "node_modules/psl": {
       "version": "1.15.0",
@@ -12496,13 +12337,11 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.14.0",
+      "version": "6.10.4",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.1.0"
+        "side-channel": "^1.0.4"
       },
       "engines": {
         "node": ">=0.6"
@@ -12549,6 +12388,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/ramda": {
+      "version": "0.27.2",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "dev": true,
@@ -13569,8 +13413,6 @@
     },
     "node_modules/sshpk": {
       "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
-      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13808,33 +13650,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/systeminformation": {
-      "version": "5.27.7",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.27.7.tgz",
-      "integrity": "sha512-saaqOoVEEFaux4v0K8Q7caiauRwjXC4XbD2eH60dxHXbpKxQ8kH9Rf7Jh+nryKpOUSEFxtCdBlSUx0/lO6rwRg==",
-      "dev": true,
-      "license": "MIT",
-      "os": [
-        "darwin",
-        "linux",
-        "win32",
-        "freebsd",
-        "openbsd",
-        "netbsd",
-        "sunos",
-        "android"
-      ],
-      "bin": {
-        "systeminformation": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "funding": {
-        "type": "Buy me a coffee",
-        "url": "https://www.buymeacoffee.com/systeminfo"
-      }
-    },
     "node_modules/tapable": {
       "version": "2.2.1",
       "dev": true,
@@ -14035,30 +13850,8 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/tldts": {
-      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
-      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tldts-core": "^6.1.86"
-      },
-      "bin": {
-        "tldts": "bin/cli.js"
-      }
-    },
-    "node_modules/tldts-core": {
-      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
-      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tmp": {
-      "version": "0.2.5",
+      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
-      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14139,16 +13932,6 @@
       "version": "0.1.0",
       "license": "MIT"
     },
-    "node_modules/tree-kill": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "tree-kill": "cli.js"
-      }
-    },
     "node_modules/trim-newlines": {
       "version": "3.0.1",
       "dev": true,
@@ -14409,8 +14192,6 @@
     },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -14422,8 +14203,6 @@
     },
     "node_modules/tweetnacl": {
       "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true,
       "license": "Unlicense"
     },
@@ -14679,6 +14458,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/url/node_modules/qs": {
+      "version": "6.14.0",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/util": {
       "version": "0.12.5",
       "dev": true,
@@ -14706,8 +14499,6 @@
     },
     "node_modules/uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -14751,8 +14542,6 @@
     },
     "node_modules/verror": {
       "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
       "engines": [
         "node >=0.6.0"

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/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/components/TestSuite.ts

@@ -66,11 +66,10 @@ export class TestSuiteElement extends HTMLElement {
     const passed = completedTests.filter((t) => t.status === 'passed').length
     const failed = completedTests.filter((t) => t.status === 'failed').length
     const running = completedTests.filter((t) => t.status === 'running').length
-    const pending = completedTests.filter((t) => t.status === 'pending').length
 
     const statsEl = this.shadow.querySelector('.stats')
     if (statsEl) {
-      statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}`
+      statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running}`
     }
   }
 
@@ -81,12 +80,11 @@ export class TestSuiteElement extends HTMLElement {
     const passed = completedTests.filter((t) => t.status === 'passed').length
     const failed = completedTests.filter((t) => t.status === 'failed').length
     const running = completedTests.filter((t) => t.status === 'running').length
-    const pending = completedTests.filter((t) => t.status === 'pending').length
 
     this.shadow.innerHTML = `
       <div class="header">
         <h2>${name}</h2>
-        <div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}</div>
+        <div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running}</div>
       </div>
       <div class="tests" id="tests-container"></div>
     `

sasjs-tests/src/core/TestRunner.ts

@@ -30,14 +30,12 @@ export class TestRunner {
     ) => void
   ): Promise<CompletedTestSuite[]> {
     this.isRunning = true
-    this.completedTestSuites = this.testSuites.map((suite) => ({
+    this.completedTestSuites = []
-      name: suite.name,
-      completedTests: []
-    }))
 
-    await Promise.allSettled(
+    for (let i = 0; i < this.testSuites.length; i++) {
-      this.testSuites.map((suite, i) => this.runTestSuite(suite, i, onUpdate))
+      const suite = this.testSuites[i]
-    )
+      await this.runTestSuite(suite, i, onUpdate)
+    }
 
     this.isRunning = false
     return this.completedTestSuites
@@ -51,23 +49,7 @@ export class TestRunner {
       currentIndex: number
     ) => void
   ): Promise<CompletedTestSuite> {
-    // Seed all tests as pending so every card renders before any run starts.
+    const completedTests: CompletedTest[] = []
-    const completedTests: CompletedTest[] = suite.tests.map((test) => ({
-      test,
-      result: false,
-      error: null,
-      executionTime: 0,
-      status: 'pending'
-    }))
-
-    if (onUpdate) {
-      this.completedTestSuites[suiteIndex] = {
-        name: suite.name,
-        completedTests: [...completedTests]
-      }
-      onUpdate([...this.completedTestSuites], suiteIndex * 1000)
-    }
-
     let context: unknown
 
     // Run beforeAll if exists
@@ -80,14 +62,15 @@ export class TestRunner {
       const test = suite.tests[i]
       const currentIndex = suiteIndex * 1000 + i
 
-      // Flip pending → running
+      // Set status to running
-      completedTests[i] = {
+      const runningTest: CompletedTest = {
         test,
         result: false,
         error: null,
         executionTime: 0,
         status: 'running'
       }
+      completedTests.push(runningTest)
 
       // Notify update
       if (onUpdate) {

sasjs-tests/src/main.ts

@@ -22,8 +22,7 @@ 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'
+import { viyaFileTests } from './testSuites/ViyaFile'
-import { executionTasksTests } from './testSuites/executionTasks'
 
 async function init() {
   const appContainer = document.getElementById('app')
@@ -100,15 +99,15 @@ function showTests(
     // basicTests(adapter, configTyped.userName || '', configTyped.password || ''),
     sendArrTests(adapter, appLoc),
     sendObjTests(adapter),
-    specialCaseTests(adapter),
+    // specialCaseTests(adapter),
     sasjsRequestTests(adapter),
     fileUploadTests(adapter)
   ]
 
-  // Add tests for SASVIYA only
+  // Add certain tests for SASVIYA only
   if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
-    testSuites.push(executionTasksTests(adapter))
     testSuites.push(computeTests(adapter, appLoc))
+    testSuites.push(viyaFileTests(adapter, appLoc))
   }
 
   container.innerHTML = ''

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/src/testSuites/ViyaFile.ts

@@ -0,0 +1,31 @@
+import SASjs from '@sasjs/adapter'
+import type { TestSuite } from '../types'
+
+export const viyaFileTests = (adapter: SASjs, appLoc: string): TestSuite => ({
+  name: 'SAS Viya File Tests',
+  tests: [
+    {
+      title: 'Create html file',
+      description: 'Should create an html file with appropriate properties',
+      test: async () => {
+        const fileContentBuffer = Buffer.from(
+          `<html>` +
+            `  <head><title>Test</title></head>` +
+            `  <body><p>This is a test</p></body>` +
+            `</html>`
+        )
+        // generate a timestamp string formatted as YYYYmmDDTHHMMSS_999
+        const timeMark = new Date()
+          .toISOString()
+          .replace(/(\/|:|\s|-|Z)/g, '')
+          .replace(/\./g, '_')
+        const filename = `viya_createFile_test_${timeMark}.html`
+        return adapter.createFile(filename, fileContentBuffer, appLoc)
+      },
+      assertion: () => {
+        //A test that returns a boolean
+        return true // dummy
+      }
+    }
+  ]
+})

sasjs-tests/src/testSuites/executionTasks.ts

@@ -1,126 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import SASjs from '@sasjs/adapter'
-import type { TestSuite } from '../types'
-
-const tableData: any = { table1: [{ col1: 'first col value' }] }
-const fileData: any = { table1: [{ col1: 'value with ; semicolon' }] }
-const multiTableData: any = {
-  table1: [{ col1: 'first col value' }],
-  table2: [{ col2: 'second table value' }]
-}
-const multiFileData: any = {
-  table1: [{ col1: 'value with ; semicolon' }],
-  table2: [{ col2: 'another; value' }]
-}
-
-const taskConfig: any = { useComputeApi: null, runAsTask: true }
-const noTaskConfig: any = { useComputeApi: null, runAsTask: false }
-
-export const executionTasksTests = (adapter: SASjs): TestSuite => ({
-  name: 'runAsTask behaviour',
-  tests: [
-    {
-      title: 'no inputs (runAsTask=false)',
-      description: 'no payload, runAsTask explicitly disabled',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', null, noTaskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'no inputs (runAsTask=true)',
-      description: 'no payload, runAsTask=true via config',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', null, taskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'one input table (runAsTask=false)',
-      description: 'single table payload, runAsTask explicitly disabled',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', tableData, noTaskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'one input table (runAsTask=true)',
-      description: 'single table payload, runAsTask=true via config',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', tableData, taskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'multiple input tables (runAsTask=false)',
-      description: 'multi-table payload, runAsTask explicitly disabled',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', multiTableData, noTaskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'multiple input tables (runAsTask=true)',
-      description: 'multi-table payload, runAsTask=true via config',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', multiTableData, taskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'semicolon payload, single table, blob path (runAsTask=false)',
-      description: 'semicolon payload routes through blob path, runAsTask off',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', fileData, noTaskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'semicolon payload, single table, blob path (runAsTask=true)',
-      description:
-        'semicolon payload (single table) routes through blob path, runAsTask=true',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', fileData, taskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'semicolon payload, multi-table, blob path (runAsTask=false)',
-      description:
-        'semicolon payload (multi-table) routes through blob path, runAsTask off',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', multiFileData, noTaskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    },
-    {
-      title: 'semicolon payload, multi-table, blob path (runAsTask=true)',
-      description:
-        'semicolon payload (multi-table) routes through blob path, runAsTask=true',
-      test: () =>
-        adapter
-          .request('services/common/sendArr', multiFileData, taskConfig)
-          .then((res: any) => ({ ok: true, res }))
-          .catch((e: any) => ({ ok: false, error: e })),
-      assertion: (res: any) => res?.ok === true
-    }
-  ]
-})

sasjs-tests/vite.config.js

@@ -1,8 +1,12 @@
 import { defineConfig } from 'vite'
+import { nodePolyfills } from 'vite-plugin-node-polyfills'
+
 export default defineConfig({
-  server: {
+  plugins: [
-    port: 3000
+    nodePolyfills({
-  },
+      include: ['buffer']
+    })
+  ],
   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,7 +35,7 @@ interface JobExecutionResult {
   log?: string
   error?: object
 }
-/* Viya /types/types?limit=999999 response structure */
+
 interface IViyaTypesResponse {
   accept: string
   count: number
@@ -47,7 +47,6 @@ interface IViyaTypesResponse {
   version: number
 }
 
-/* Item element within the Viya types response */
 interface IViyaTypesItem {
   description?: string
   extensions?: string[]
@@ -57,7 +56,7 @@ interface IViyaTypesItem {
   mappedTypes?: string[]
   mediaType?: string
   mediaTypes?: string[]
-  name?: string | undefined
+  name: string
   pluralLabel?: string
   properties?: IViyaTypesProperties
   resourceUri?: string
@@ -86,7 +85,7 @@ type IViyaTypesProperties = Record<string, string>
  * create and patch a new file.
  */
 interface IViyaTypesExtensionInfo {
-  typeDefName: string | undefined
+  typeDefName: string
   properties: IViyaTypesProperties | undefined
 }
 
@@ -115,9 +114,9 @@ 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
+  private boolExtensionMap = false // has the fileExtensionMap been populated yet?
-  // after an attempt to populate it.
 
   /**
    * A helper method used to call appendRequest method of RequestClient
@@ -482,20 +481,29 @@ export class SASViyaApiClient {
     if (!parentFolderUri && parentFolderPath) {
       parentFolderUri = await this.getFolderUri(parentFolderPath, accessToken)
     }
-
     const headers = {
       Accept: 'application/vnd.sas.file+json',
       'Content-Disposition': `filename="${fileName}";`
     }
+    const patchHeaders = {
+      Accept: 'application/json',
+      'If-Match': '*'
+    }
 
     const formData = new NodeFormData()
     formData.append('file', contentBuffer, fileName)
 
-    /** Query Viya for file metadata based on extension type. */
+    /** Query Viya for file metadata based on extension type.
+     *  Without providing certain properties, some versions of Viya will not
+     *  serve files as intended. Avoid this issue by applying the properties
+     *  that Viya has registered for a file extension.
+     */
 
-    // typeDefName - Viya accepts this property during the file creation
+    // typeDefName - Viya should automatically determine this and additional
+    // properties at runtime if not provided in the file creation request.
     let typeDefName: string | undefined = undefined
-    // Additional properties are supplied by a patch.
+    // Viya update 2025.09 resulted in a change to this automatic behaviour.
+    // We patch the new file to replicate the behaviour.
     let filePatch:
       | {
           name: string
@@ -524,14 +532,8 @@ export class SASViyaApiClient {
           .forEach((e) => {
             e.extensions?.forEach((ext) => {
               this.fileExtensionMap.set(ext, {
-                // `name` becomes the typeDefName value at file creation time.
+                // "name:" is the typeDefName value required for file creation.
-                // `name` is ignored here if it is not populated in the map, or
+                typeDefName: e.name,
-                // has a blank/empty value.
-                typeDefName: e.name
-                  ? e.name.trim().length
-                    ? e.name.trim()
-                    : undefined
-                  : undefined,
                 properties: e.properties
               })
             })
@@ -540,18 +542,14 @@ export class SASViyaApiClient {
         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'
@@ -562,13 +560,9 @@ export class SASViyaApiClient {
       headers
     )
 
+    try {
       // 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'
@@ -579,15 +573,16 @@ export class SASViyaApiClient {
             `${fileUri}`,
             filePatch,
             accessToken,
+            'application/json',
             patchHeaders
           )
         ).result
+      }
+      return createFileResponse.result
     } catch (e: any) {
       throw new Error(`Error patching file ${fileName}.\n${e.message}`)
     }
   }
-    return createFileResponse.result
-  }
 
   /**
    * Creates a folder. Path to or URI of the parent folder is required.
@@ -1026,22 +1021,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/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/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/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/file/generateTableUploadForm.ts

@@ -11,13 +11,6 @@ export const generateTableUploadForm = (
   let tableCounter = 0
 
   for (const tableName in data) {
-    if (
-      isFormatsTable(tableName) &&
-      Object.keys(data).includes(tableName.replace(/^\$/, ''))
-    ) {
-      continue
-    }
-
     tableCounter++
 
     // Formats table should not be sent as part of 'sasjs_tables'

src/file/spec/generateTableUploadForm.spec.ts

@@ -1,71 +0,0 @@
-import { generateTableUploadForm } from '../generateTableUploadForm'
-import { convertToCSV } from '../../utils/convertToCsv'
-import NodeFormData from 'form-data'
-
-describe('generateTableUploadForm', () => {
-  it('should skip formats table and emit single sasjs1data for paired data + $data', () => {
-    const tableName = 'jsdata'
-    const data: { [key: string]: any } = {
-      [tableName]: [
-        { var1: 'string', var2: 232 },
-        { var1: 'string', var2: 233 }
-      ],
-      [`$${tableName}`]: { formats: { var1: '$char12.', var2: 'best.' } }
-    }
-    const expectedCsv = convertToCSV(data, tableName)
-
-    const formData = new NodeFormData()
-    const { requestParams } = generateTableUploadForm(formData, data)
-
-    expect(requestParams.sasjs_tables).toBe(tableName)
-    expect(requestParams.sasjs1data).toBe(expectedCsv)
-    expect(requestParams.sasjs2data).toBeUndefined()
-  })
-
-  it('should number sequentially across multiple tables w/ paired formats', () => {
-    const data: { [key: string]: any } = {
-      tableA: [{ a: 1 }],
-      $tableA: { formats: { a: 'best.' } },
-      tableB: [{ b: 'x' }],
-      $tableB: { formats: { b: '$char1.' } }
-    }
-    const expectedCsvA = convertToCSV(data, 'tableA')
-    const expectedCsvB = convertToCSV(data, 'tableB')
-
-    const formData = new NodeFormData()
-    const { requestParams } = generateTableUploadForm(formData, data)
-
-    expect(requestParams.sasjs_tables).toBe('tableA tableB')
-    expect(requestParams.sasjs1data).toBe(expectedCsvA)
-    expect(requestParams.sasjs2data).toBe(expectedCsvB)
-    expect(requestParams.sasjs3data).toBeUndefined()
-  })
-
-  it('should throw if string value exceeds 32765 chars', () => {
-    const formData = new NodeFormData()
-    const data = { testTable: [{ var1: 'z'.repeat(32766) }] }
-
-    expect(() => generateTableUploadForm(formData, data)).toThrow(
-      new Error(
-        'The max length of a string value in SASjs is 32765 characters.'
-      )
-    )
-  })
-
-  it('should append chunks to formData when csv exceeds 16k', () => {
-    const tableName = 'big'
-    const data = { [tableName]: [{ var1: 'z'.repeat(16001) }] }
-
-    const formData = new NodeFormData()
-    const appendSpy = jest.spyOn(formData, 'append')
-
-    const { requestParams } = generateTableUploadForm(formData, data)
-
-    expect(requestParams.sasjs_tables).toBe(tableName)
-    expect(requestParams.sasjs1data).toBeUndefined()
-    expect(appendSpy).toHaveBeenCalled()
-    expect(appendSpy.mock.calls.every(([key]) => key === 'sasjs1data')).toBe(
-      true
-    )
-  })
-})

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[] = []
 
@@ -55,6 +52,7 @@ export abstract class BaseJobExecutor implements JobExecutor {
     if (config.debug) {
       requestParams['_omittextlog'] = 'false'
       requestParams['_omitSessionResults'] = 'false'
+
       requestParams['_debug'] = 131
     }
 

src/job-execution/WebJobExecutor.ts

@@ -16,11 +16,9 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
 import {
   isRelativePath,
   parseSasViyaDebugResponse,
-  parseSasViyaLogDebugResponse,
   appendExtraResponseAttributes,
   parseWeboutResponse,
-  getFormData,
+  getFormData
-  isNode
 } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 
@@ -99,14 +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}`
           : ''
-
-      if (config.runAsTask === true) {
-        apiUrl += '&_executionTasks=true'
-      }
     }
 
     let requestParams = {
@@ -119,26 +115,6 @@ export class WebJobExecutor extends BaseJobExecutor {
      */
     let formData = getFormData()
 
-    // FIXME(viya - SAS Track CS0409737): remove when Viya stops rejecting empty multipart on
-    // _executionTasks=true. Dummy file keeps the body non-empty
-    const hasExecutionTasksFlag = config.runAsTask === true
-
-    // Move debug params to URL for viya; viya seems to honor them more
-    // reliably in the query string than the multipart body.
-    if (
-      hasExecutionTasksFlag &&
-      config.debug &&
-      config.serverType === ServerType.SasViya
-    ) {
-      const debugKeys = ['_debug', '_omitSessionResults']
-      debugKeys.forEach((key) => {
-        if (requestParams[key] !== undefined) {
-          apiUrl += `&${key}=${encodeURIComponent(requestParams[key])}`
-          delete requestParams[key]
-        }
-      })
-    }
-
     if (data) {
       const stringifiedData = JSON.stringify(data)
       if (
@@ -159,21 +135,10 @@ export class WebJobExecutor extends BaseJobExecutor {
             generateTableUploadForm(formData, data)
           formData = newFormData
           requestParams = { ...requestParams, ...params }
-
-          if (
-            config.serverType === ServerType.SasViya &&
-            hasExecutionTasksFlag
-          ) {
-            addDummyFile(formData)
-          }
         } catch (e: any) {
           return Promise.reject(new ErrorResponse(e?.message, e))
         }
       }
-    } else {
-      if (config.serverType === ServerType.SasViya && hasExecutionTasksFlag) {
-        addDummyFile(formData)
-      }
     }
 
     for (const key in requestParams) {
@@ -205,10 +170,7 @@ export class WebJobExecutor extends BaseJobExecutor {
           if (config.debug) {
             switch (this.serverType) {
               case ServerType.SasViya:
-                jsonResponse =
+                jsonResponse = await parseSasViyaDebugResponse(
-                  config.useComputeApi === null && config.runAsTask === true
-                    ? await parseSasViyaLogDebugResponse(res.result)
-                    : await parseSasViyaDebugResponse(
                   res.result,
                   this.requestClient,
                   this.serverUrl
@@ -271,23 +233,6 @@ export class WebJobExecutor extends BaseJobExecutor {
     return requestPromise
   }
 
-  protected getRequestParams(config: any): any {
-    const requestParams = super.getRequestParams(config)
-
-    // FIXME(viya - possible issue with default debug flags)
-    // runAsTask on Viya: use _debug=128 (not 131) and omit _omittextlog
-    if (
-      config.debug &&
-      config.serverType === ServerType.SasViya &&
-      config.runAsTask === true
-    ) {
-      requestParams['_debug'] = 128
-      delete requestParams['_omittextlog']
-    }
-
-    return requestParams
-  }
-
   private async getJobUri(sasJob: string) {
     if (!this.sasViyaApiClient) return ''
     let uri = ''
@@ -320,18 +265,3 @@ export class WebJobExecutor extends BaseJobExecutor {
     return uri
   }
 }
-
-function addDummyFile(formData: NodeFormData | FormData) {
-  if (isNode()) {
-    ;(formData as NodeFormData).append('_sasjs_noop', '', {
-      filename: '_sasjs_noop.txt',
-      contentType: 'text/plain'
-    })
-  } else {
-    ;(formData as FormData).append(
-      '_sasjs_noop',
-      new Blob([''], { type: 'text/plain' }),
-      '_sasjs_noop.txt'
-    )
-  }
-}

src/job-execution/spec/executionTasks.spec.ts

@@ -1,146 +0,0 @@
-import NodeFormData from 'form-data'
-import { ServerType } from '@sasjs/utils/types'
-import { WebJobExecutor } from '../WebJobExecutor'
-import { RequestClient } from '../../request/RequestClient'
-import { SASViyaApiClient } from '../../SASViyaApiClient'
-
-describe('WebJobExecutor runAsTask behaviour', () => {
-  const serverUrl = 'https://sample.server.com'
-  const jobsPath = '/SASJobExecution'
-
-  const makeExecutor = (serverType: ServerType = ServerType.SasViya) => {
-    const requestClient = new RequestClient(serverUrl)
-    const sasViyaApiClient = {
-      getJobsInFolder: async () => []
-    } as unknown as SASViyaApiClient
-    const executor = new WebJobExecutor(
-      serverUrl,
-      serverType,
-      jobsPath,
-      requestClient,
-      sasViyaApiClient
-    )
-    const postSpy = jest
-      .spyOn(requestClient, 'post')
-      .mockResolvedValue({ result: { table1: [] }, etag: '' } as any)
-    jest.spyOn(requestClient, 'appendRequest').mockImplementation()
-    return { executor, postSpy }
-  }
-
-  const baseConfig = {
-    serverUrl,
-    serverType: ServerType.SasViya,
-    appLoc: '/Public/app',
-    useComputeApi: false,
-    debug: false
-  }
-
-  it('sends table data in body (runAsTask=false)', async () => {
-    const { executor, postSpy } = makeExecutor()
-
-    await executor.execute(
-      'services/common/sendArr',
-      { table1: [{ col1: 'v' }] },
-      { ...baseConfig, runAsTask: false }
-    )
-
-    const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
-    expect(apiUrl).not.toContain('_executionTasks=true')
-    expect(body).toBeInstanceOf(NodeFormData)
-    expect(contentType).toMatch(/^multipart\/form-data/)
-  })
-
-  it('uploads as file when payload has semicolons (runAsTask=false)', async () => {
-    const { executor, postSpy } = makeExecutor()
-
-    await executor.execute(
-      'services/common/sendArr',
-      { table1: [{ col1: 'has; semicolon' }] },
-      { ...baseConfig, runAsTask: false }
-    )
-
-    const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
-    expect(apiUrl).not.toContain('_executionTasks=')
-    expect(body).toBeInstanceOf(NodeFormData)
-    expect(contentType).toMatch(/^multipart\/form-data/)
-  })
-
-  it('appends &_executionTasks=true to URL when runAsTask=true and no data', async () => {
-    const { executor, postSpy } = makeExecutor()
-
-    await executor.execute('services/common/sendArr', null, {
-      ...baseConfig,
-      runAsTask: true
-    })
-
-    const [apiUrl] = postSpy.mock.calls[0]
-    expect(apiUrl).toContain('&_executionTasks=true')
-  })
-
-  it('appends &_executionTasks=true and sends table data when runAsTask=true with one input table', async () => {
-    const { executor, postSpy } = makeExecutor()
-
-    await executor.execute(
-      'services/common/sendArr',
-      { table1: [{ col1: 'v' }] },
-      { ...baseConfig, runAsTask: true }
-    )
-
-    const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
-    expect(apiUrl).toContain('&_executionTasks=true')
-    expect(body).toBeInstanceOf(NodeFormData)
-    expect(contentType).toMatch(/^multipart\/form-data/)
-    const dump = (body as NodeFormData).getBuffer().toString()
-    expect(dump).toContain('name="sasjs_tables"')
-    expect(dump).toContain('name="sasjs1data"')
-  })
-
-  it('appends &_executionTasks=true to URL when runAsTask=true with multiple input tables', async () => {
-    const { executor, postSpy } = makeExecutor()
-
-    await executor.execute(
-      'services/common/sendArr',
-      { table1: [{ col1: 'v' }], table2: [{ col2: 'w' }] },
-      { ...baseConfig, runAsTask: true }
-    )
-
-    const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
-    expect(apiUrl).toContain('&_executionTasks=true')
-    expect(body).toBeInstanceOf(NodeFormData)
-    expect(contentType).toMatch(/^multipart\/form-data/)
-    const dump = (body as NodeFormData).getBuffer().toString()
-    expect(dump).toContain('name="sasjs_tables"')
-    expect(dump).toMatch(/table1\s+table2/)
-  })
-
-  it('uploads as file when runAsTask=true and payload has semicolons', async () => {
-    const { executor, postSpy } = makeExecutor()
-
-    await executor.execute(
-      'services/common/sendArr',
-      { table1: [{ col1: 'has; semicolon' }] },
-      { ...baseConfig, runAsTask: true }
-    )
-
-    const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
-    expect(apiUrl).toContain('&_executionTasks=true')
-    expect(body).toBeInstanceOf(NodeFormData)
-    expect(contentType).toMatch(/^multipart\/form-data/)
-    const dump = (body as NodeFormData).getBuffer().toString()
-    expect(dump).toContain('filename="table1.csv"')
-    expect(dump).toContain('Content-Type: application/csv')
-  })
-
-  it('does NOT append _executionTasks=true to URL when runAsTask=false', async () => {
-    const { executor, postSpy } = makeExecutor()
-
-    await executor.execute(
-      'services/common/sendArr',
-      { table1: [{ col1: 'v' }] },
-      { ...baseConfig, runAsTask: false }
-    )
-
-    const [apiUrl] = postSpy.mock.calls[0]
-    expect(apiUrl).not.toContain('_executionTasks=true')
-  })
-})

src/request/RequestClient.ts

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

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/SASjsConfig.ts

@@ -79,14 +79,6 @@ export class SASjsConfig {
    * may affect browser performance, especially with debug (logs) enabled.
    */
   requestHistoryLimit?: number = 10
-  /**
-   * Optional setting. When `true`, the request runs as a Viya execution task —
-   * appends `_executionTasks=true` to the request URL. Only applies to the Viya
-   * web jobs path, i.e. when `serverType === SASVIYA` AND
-   * `useComputeApi` is `null`/`undefined`. Has no effect when `useComputeApi`
-   * is explicitly set to `true` or `false`.
-   */
-  runAsTask?: boolean = false
 }
 
 export enum LoginMechanism {

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/index.ts

@@ -15,7 +15,6 @@ export * from './parseGeneratedCode'
 export * from './parseSasViyaLog'
 export * from './parseSourceCode'
 export * from './parseViyaDebugResponse'
-export * from './parseViyaLogDebugResponse'
 export * from './parseWeboutResponse'
 export * from './serialize'
 export * from './splitChunks'

src/utils/parseViyaLogDebugResponse.ts

@@ -1,32 +0,0 @@
-import { getValidJson } from './getValidJson'
-import { parseWeboutResponse } from './parseWeboutResponse'
-
-/**
- * When querying a Viya job using the Web approach with _DEBUG=128 (used when
- * runAsTask is true), the webout JSON is inlined into the response via:
- *   var blob = new Blob([`{...}`], {type: 'application/json'});
- * On abort/error paths the same shape is used but with text/plain and
- * weboutBEGIN/END markers around the JSON:
- *   var blob = new Blob([`>>weboutBEGIN<<\n{...}\n>>weboutEND<<\n`], {type: 'text/plain'});
- * No follow-up request is needed — extract and parse the JSON directly.
- */
-export const parseSasViyaLogDebugResponse = async (response: any) => {
-  // If upstream already parsed the response as JSON (object), pass through.
-  if (typeof response !== 'string') {
-    return response
-  }
-
-  const blobMatch = response.match(
-    /new Blob\(\[`([\s\S]*?)`\],\s*\{type:\s*'(?:application\/json|text\/plain)'\}\)/
-  )
-  if (!blobMatch) {
-    throw new Error('Unable to find webout blob in debug log response.')
-  }
-
-  const blobContent = blobMatch[1]
-  const stripped = blobContent.includes('>>weboutBEGIN<<')
-    ? parseWeboutResponse(blobContent)
-    : blobContent
-
-  return getValidJson(stripped)
-}

src/utils/spec/parseViyaLogDebugResponse.spec.ts

@@ -1,55 +0,0 @@
-import { parseSasViyaLogDebugResponse } from '../parseViyaLogDebugResponse'
-
-describe('parseSasViyaLogDebugResponse', () => {
-  it('should extract and parse JSON from inline Blob', async () => {
-    const resultData = { message: 'success' }
-    const response = `<html><body><script>
-var blob = new Blob([\`${JSON.stringify(resultData)}\`], {type: 'application/json'});
-</script></body></html>`
-
-    const result = await parseSasViyaLogDebugResponse(response)
-
-    expect(result).toEqual(resultData)
-  })
-
-  it('should extract and parse multiline JSON from inline Blob', async () => {
-    const resultData = {
-      SYSDATE: '13MAY26',
-      SYSCC: '0',
-      saslibs: [{ LIBRARYREF: 'FORMATS' }]
-    }
-    const response = `<script>
-var blob = new Blob([\`{"SYSDATE" : "13MAY26"
-,"SYSCC" : "0"
-,"saslibs": [{"LIBRARYREF":"FORMATS"}]
-}
-\`], {type: 'application/json'});
-</script>`
-
-    const result = await parseSasViyaLogDebugResponse(response)
-
-    expect(result).toEqual(resultData)
-  })
-
-  it('should extract and parse JSON wrapped in weboutBEGIN/END (text/plain blob)', async () => {
-    const resultData = { SYSCC: '1012', SYSERRORTEXT: 'File missing.' }
-    const response = `<script>
-var blob = new Blob([\`>>weboutBEGIN<<
-${JSON.stringify(resultData)}
->>weboutEND<<
-\`], {type: 'text/plain'});
-</script>`
-
-    const result = await parseSasViyaLogDebugResponse(response)
-
-    expect(result).toEqual(resultData)
-  })
-
-  it('should throw an error if blob is not found', async () => {
-    const response = `<html><body>No blob here</body></html>`
-
-    await expect(parseSasViyaLogDebugResponse(response)).rejects.toThrow(
-      'Unable to find webout blob in debug log response.'
-    )
-  })
-})