ci: disable fail-fast on build-unit-tests matrix

resolve moderate advisory (GHSA-r4q5-vmmm-2653) via npm audit fix; formatting via npm run lint:fix

.gitattributes

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

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

@@ -11,8 +11,9 @@ jobs:
     runs-on: ubuntu-22.04
 
     strategy:
+      fail-fast: false
       matrix:
-        node-version: [lts/hydrogen]
+        node-version: [20, 22, 24]
 
     steps:
       - uses: actions/checkout@v2
@@ -21,7 +22,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-       # 2. Restore npm cache manually
+        # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -32,7 +33,7 @@ jobs:
             ${{ runner.os }}-node-
 
       - name: Check npm audit
-        run: npm audit --production --audit-level=low
+        run: npm audit --omit=dev --audit-level=low
 
       - name: Install Dependencies
         run: npm ci
@@ -53,6 +54,7 @@ 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: [lts/hydrogen]
+        node-version: [22]
 
     steps:
       - name: Checkout
@@ -20,9 +20,10 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version:
+            ${{ matrix.node-version }}
 
-                 # 2. Restore npm cache manually
+            # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -50,4 +51,3 @@ 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: [lts/hydrogen]
+        node-version: [22]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-       # 2. Restore npm cache manually
+        # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -42,6 +42,9 @@ 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: [lts/hydrogen]
+        node-version: [22]
 
     steps:
       - uses: actions/checkout@v2
@@ -26,14 +26,26 @@ jobs:
         uses: actions/cache@v3
         id: npm-cache
         with:
-          path: ~/.npm
+          path: |
+            ~/.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
 
@@ -81,10 +93,11 @@ jobs:
         run: |
           sudo apt install jq
           cd sasjs-tests
-          jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
-          npm i
+          npm i --ignore-scripts
+          npm i ../build/sasjs-adapter-5.0.0.tgz
           jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
           jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
           jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
           jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
 
@@ -98,11 +111,13 @@ jobs:
         shell: bash
 
       - name: Run cypress on sasjs
+        env:
+          TERM: dumb
         run: |
-          jq '.env.sasjsTestsUrl |= "http://localhost:3000"' ./cypress.json > ./cypress.temp && mv ./cypress.temp ./cypress.json
-          jq '.env.username |= "${{ secrets.SASJS_USERNAME }}"' ./cypress.json > ./cypress.temp && mv ./cypress.temp ./cypress.json
-          jq '.env.password |= "${{ secrets.SASJS_PASSWORD }}"' ./cypress.json > ./cypress.temp && mv ./cypress.temp ./cypress.json
-          cat ./cypress.json
+          sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
+          sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
+          sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
+          cat ./cypress.config.js
           echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
 
           sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

.gitpod.yml

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

.npmrc

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

cypress.config.js

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

cypress.json

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

cypress/integration/sasjs.tests.ts

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

package.json

@@ -4,17 +4,14 @@
   "homepage": "https://adapter.sasjs.io",
   "scripts": {
     "nodeVersionMessage": "echo \u001b[33m make sure you are running node lts version \u001b[0m",
-    "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",
+    "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",
     "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 --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: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": "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 --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}\"",
+    "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}\"",
     "test": "jest --silent --coverage",
-    "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
-    "postpublish": "git clean -fd",
+    "publishInit": "cp -r ./build/* . && rm -rf ./build",
     "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",
@@ -54,7 +51,7 @@
     "copyfiles": "2.4.1",
     "cors": "^2.8.5",
     "cp": "0.2.0",
-    "cypress": "7.7.0",
+    "cypress": "^15.7.1",
     "dotenv": "16.0.0",
     "express": "4.17.3",
     "jest": "29.7.0",
@@ -63,7 +60,7 @@
     "node-polyfill-webpack-plugin": "1.1.4",
     "path": "0.12.7",
     "pem": "1.14.5",
-    "prettier": "2.8.7",
+    "prettier": "3.8.2",
     "process": "0.11.10",
     "semantic-release": "19.0.3",
     "terser-webpack-plugin": "5.3.6",
@@ -79,8 +76,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "3.5.2",
-    "axios": "1.12.2",
+    "@sasjs/utils": "^3.5.6",
+    "axios": "1.15.0",
     "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.
 
-You can use the provided `update:adapter` NPM script for this.
+> **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.
 
 ```bash
     npm run update:adapter
 ```
 
-This scripts builds a new version of the adapter and installs it in the `sasjs-tests` project.
+This script builds a new version of the adapter and installs it in the `sasjs-tests` project.
 
 ## Running tests
 

sasjs-tests/package.json

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

sasjs-tests/sasjs/sasjsconfig.json

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

sasjs-tests/vite.config.js

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

src/ContextManager.ts

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

src/SASViyaApiClient.ts

@@ -1026,9 +1026,8 @@ export class SASViyaApiClient {
     }
 
     files.forEach((fileInfo, index) => {
-      jobArguments[
-        `_webin_fileuri${index + 1}`
-      ] = `/files/files/${fileInfo.file.id}`
+      jobArguments[`_webin_fileuri${index + 1}`] =
+        `/files/files/${fileInfo.file.id}`
       jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName
     })
 

src/SASjs.ts

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

src/api/viya/executeOnComputeApi.ts

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

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

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

src/auth/AuthManager.ts

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

src/auth/spec/openWebPage.spec.ts

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

src/job-execution/ComputeJobExecutor.ts

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

src/job-execution/JesJobExecutor.ts

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

src/job-execution/JobExecutor.ts

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

src/job-execution/WebJobExecutor.ts

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

src/test/RequestClient.spec.ts

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

src/types/errors/AuthorizeError.ts

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

src/types/errors/ComputeJobExecutionError.ts

@@ -1,7 +1,10 @@
 import { Job } from '../Job'
 
 export class ComputeJobExecutionError extends Error {
-  constructor(public job: Job, public log: string) {
+  constructor(
+    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,5 +1,8 @@
 export class JobStatePollError extends Error {
-  constructor(id: string, public originalError: Error) {
+  constructor(
+    id: string,
+    public originalError: Error
+  ) {
     super(
       `Error while polling job state for job ${id}: ${
         originalError.message || originalError

src/utils/convertToCsv.ts

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