1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-04-21 13:11:31 +00:00

Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot] c7227556ba build(deps): bump tar and semantic-release
Removes [tar](https://github.com/isaacs/node-tar). It's no longer used after updating ancestor dependency [semantic-release](https://github.com/semantic-release/semantic-release). These dependencies need to be updated together.


Removes `tar`

Updates `semantic-release` from 19.0.3 to 25.0.3
- [Release notes](https://github.com/semantic-release/semantic-release/releases)
- [Commits](https://github.com/semantic-release/semantic-release/compare/v19.0.3...v25.0.3)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 
  dependency-type: indirect
- dependency-name: semantic-release
  dependency-version: 25.0.3
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-02-09 20:13:22 +00:00
28 changed files with 4735 additions and 2467 deletions
+2 -4
View File
@@ -11,9 +11,8 @@ jobs:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
node-version: [20, 22, 24]
node-version: [lts/iron]
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 }}
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
node-version: [22]
node-version: [lts/iron]
steps:
- name: Checkout
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
node-version: [22]
node-version: [lts/iron]
steps:
- uses: actions/checkout@v2
+4 -7
View File
@@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
node-version: [22]
node-version: [lts/iron]
steps:
- uses: actions/checkout@v2
@@ -93,11 +93,10 @@ jobs:
run: |
sudo apt install jq
cd sasjs-tests
npm i --ignore-scripts
npm i ../build/sasjs-adapter-5.0.0.tgz
jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
npm i
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
@@ -111,10 +110,8 @@ jobs:
shell: bash
- name: Run cypress on sasjs
env:
TERM: dumb
run: |
sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:5173'|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
+1 -1
View File
@@ -9,7 +9,7 @@ module.exports = defineConfig({
supportFile: 'cypress/support/index.js'
},
env: {
sasjsTestsUrl: 'http://localhost:3000',
sasjsTestsUrl: 'http://localhost:5173',
username: '',
password: '',
screenshotOnRunFailure: false,
+1 -3
View File
@@ -9,12 +9,10 @@ context('sasjs-tests', function () {
})
beforeEach(() => {
cy.visit(sasjsTestsUrl)
cy.reload()
})
function loginIfNeeded() {
cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
cy.get('body').then(($body) => {
if ($body.find('login-form').length > 0) {
cy.get('login-form')
+3036 -2336
View File
File diff suppressed because it is too large Load Diff
+6 -6
View File
@@ -7,9 +7,9 @@
"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 --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",
"semantic-release": "semantic-release",
@@ -60,9 +60,9 @@
"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",
"semantic-release": "25.0.3",
"terser-webpack-plugin": "5.3.6",
"ts-jest": "29.2.6",
"ts-loader": "9.4.0",
@@ -76,8 +76,8 @@
},
"main": "index.js",
"dependencies": {
"@sasjs/utils": "^3.5.6",
"axios": "1.15.0",
"@sasjs/utils": "3.5.6",
"axios": "^1.13.5",
"axios-cookiejar-support": "5.0.5",
"form-data": "4.0.4",
"https": "1.0.0",
+2 -2
View File
@@ -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
+1642 -46
View File
File diff suppressed because it is too large Load Diff
+3
View File
@@ -18,5 +18,8 @@
},
"overrides": {
"vite": "npm:rolldown-vite@7.2.2"
},
"dependencies": {
"@sasjs/adapter": "^4.14.0"
}
}
+1 -1
View File
@@ -7,7 +7,7 @@
"targets": [
{
"name": "4gl",
"serverUrl": "https://sas.4gl.io",
"serverUrl": "https://sas9.4gl.io",
"serverType": "SASJS",
"httpsAgentOptions": {
"allowInsecureRequests": false
-3
View File
@@ -1,8 +1,5 @@
import { defineConfig } from 'vite'
export default defineConfig({
server: {
port: 3000
},
build: {
assetsInlineLimit: 0,
assetsDir: ''
+11 -16
View File
@@ -32,18 +32,16 @@ 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. ')
})
@@ -61,9 +59,10 @@ 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. ')
})
@@ -292,9 +291,7 @@ 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
)
@@ -335,9 +332,7 @@ 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
)
+3 -2
View File
@@ -1026,8 +1026,9 @@ 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
})
+2 -2
View File
@@ -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,
+3 -2
View File
@@ -125,8 +125,9 @@ 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 {
+2 -2
View File
@@ -683,8 +683,8 @@ const mockSimplePoll = (runningCount = 2) => {
count === 0
? 'pending'
: count <= runningCount
? 'running'
: 'completed',
? 'running'
: 'completed',
etag: '',
status: 200
})
+4 -4
View File
@@ -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')
+1 -1
View File
@@ -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(() => {
+1 -4
View File
@@ -8,10 +8,7 @@ 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)
}
+1 -4
View File
@@ -10,10 +10,7 @@ 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)
}
+1 -4
View File
@@ -17,10 +17,7 @@ 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[] = []
+1 -1
View File
@@ -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 () => {
+1 -4
View File
@@ -1,8 +1,5 @@
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)
+1 -4
View File
@@ -1,10 +1,7 @@
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)
+1 -4
View File
@@ -1,8 +1,5 @@
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
+2 -2
View File
@@ -110,8 +110,8 @@ export const convertToCSV = (
longestValueForField
? longestValueForField
: firstFoundType === 'chars'
? '1'
: 'best'
? '1'
: 'best'
}.`
)
}