1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-04-15 18:33:14 +00:00

Compare commits

..

8 Commits

Author SHA1 Message Date
mulahasanovic
38d84e56d4 ci: disable fail-fast on build-unit-tests matrix 2026-04-14 10:23:46 +02:00
mulahasanovic
180e2ef425 test: tolerate node 24 tls error suffix 2026-04-14 10:23:20 +02:00
mulahasanovic
9177dce3e1 chore(deps): bump prettier to v3 2026-04-14 10:15:46 +02:00
mulahasanovic
9f4064b46e fix(deps): bump follow-redirects
resolve moderate advisory (GHSA-r4q5-vmmm-2653) via npm audit fix; formatting via npm run lint:fix
2026-04-14 09:54:51 +02:00
mulahasanovic
44c5eab638 ci: expand node matrix for unit tests, bump base workflows to node 22 2026-04-14 09:38:02 +02:00
mulahasanovic
0f9f16bef1 chore(sasjs-tests): remove adapter dependency to prevent npm audit on local-only package 2026-04-13 20:02:03 +02:00
mulahasanovic
5c61ede51a chore(sasjs-tests): use local adapter build to avoid npm audit on placeholder dependency 2026-04-13 19:47:50 +02:00
mulahasanovic
fccb3ab965 chore: bump adapter version in internal sasjs-tests 2026-04-13 08:22:27 +02:00
26 changed files with 142 additions and 1869 deletions

View File

@@ -11,8 +11,9 @@ jobs:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
node-version: [lts/iron]
node-version: [20, 22, 24]
steps:
- uses: actions/checkout@v2
@@ -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 }}

View File

@@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
node-version: [lts/iron]
node-version: [22]
steps:
- name: Checkout

View File

@@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
node-version: [lts/iron]
node-version: [22]
steps:
- uses: actions/checkout@v2

View File

@@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
node-version: [lts/iron]
node-version: [22]
steps:
- uses: actions/checkout@v2
@@ -93,8 +93,8 @@ 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

133
package-lock.json generated
View File

@@ -34,7 +34,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",
@@ -86,6 +86,7 @@
"version": "7.26.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.26.2",
@@ -130,7 +131,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/types": "^7.25.9"
},
@@ -157,7 +157,6 @@
"version": "7.26.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-member-expression-to-functions": "^7.25.9",
@@ -178,7 +177,6 @@
"version": "7.26.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"regexpu-core": "^6.2.0",
@@ -195,7 +193,6 @@
"version": "0.6.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-compilation-targets": "^7.22.6",
"@babel/helper-plugin-utils": "^7.22.5",
@@ -211,7 +208,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/traverse": "^7.25.9",
"@babel/types": "^7.25.9"
@@ -252,7 +248,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/types": "^7.25.9"
},
@@ -272,7 +267,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-wrap-function": "^7.25.9",
@@ -289,7 +283,6 @@
"version": "7.26.5",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-member-expression-to-functions": "^7.25.9",
"@babel/helper-optimise-call-expression": "^7.25.9",
@@ -306,7 +299,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/traverse": "^7.25.9",
"@babel/types": "^7.25.9"
@@ -343,7 +335,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/template": "^7.25.9",
"@babel/traverse": "^7.25.9",
@@ -383,7 +374,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/traverse": "^7.25.9"
@@ -399,7 +389,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -414,7 +403,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -429,7 +417,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
@@ -446,7 +433,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/traverse": "^7.25.9"
@@ -462,7 +448,6 @@
"version": "7.21.0-placeholder-for-preset-env.2",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=6.9.0"
},
@@ -529,7 +514,6 @@
"version": "7.26.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -726,7 +710,6 @@
"version": "7.18.6",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.18.6",
"@babel/helper-plugin-utils": "^7.18.6"
@@ -742,7 +725,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -757,7 +739,6 @@
"version": "7.26.8",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5",
"@babel/helper-remap-async-to-generator": "^7.25.9",
@@ -774,7 +755,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-imports": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9",
@@ -791,7 +771,6 @@
"version": "7.26.5",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5"
},
@@ -806,7 +785,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -821,7 +799,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -837,7 +814,6 @@
"version": "7.26.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -853,7 +829,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-compilation-targets": "^7.25.9",
@@ -873,7 +848,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/template": "^7.25.9"
@@ -889,7 +863,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -904,7 +877,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -920,7 +892,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -935,7 +906,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -951,7 +921,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -966,7 +935,6 @@
"version": "7.26.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -981,7 +949,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -996,7 +963,6 @@
"version": "7.26.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -1012,7 +978,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-compilation-targets": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9",
@@ -1029,7 +994,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1044,7 +1008,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1059,7 +1022,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1074,7 +1036,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1089,7 +1050,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1105,7 +1065,6 @@
"version": "7.26.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-transforms": "^7.26.0",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1121,7 +1080,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9",
@@ -1139,7 +1097,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1155,7 +1112,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1171,7 +1127,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1186,7 +1141,6 @@
"version": "7.26.6",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5"
},
@@ -1201,7 +1155,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1216,7 +1169,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-compilation-targets": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9",
@@ -1233,7 +1185,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-replace-supers": "^7.25.9"
@@ -1249,7 +1200,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1264,7 +1214,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -1280,7 +1229,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1295,7 +1243,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1311,7 +1258,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-create-class-features-plugin": "^7.25.9",
@@ -1328,7 +1274,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1343,7 +1288,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"regenerator-transform": "^0.15.2"
@@ -1359,7 +1303,6 @@
"version": "7.26.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1375,7 +1318,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1390,7 +1332,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1405,7 +1346,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -1421,7 +1361,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1436,7 +1375,6 @@
"version": "7.26.8",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5"
},
@@ -1451,7 +1389,6 @@
"version": "7.26.7",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5"
},
@@ -1466,7 +1403,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1481,7 +1417,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1497,7 +1432,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1513,7 +1447,6 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1612,7 +1545,6 @@
"version": "0.1.6-no-external-plugins",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/types": "^7.4.4",
@@ -1626,7 +1558,6 @@
"version": "7.26.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"regenerator-runtime": "^0.14.0"
},
@@ -2256,6 +2187,7 @@
"version": "4.2.4",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@octokit/auth-token": "^3.0.0",
"@octokit/graphql": "^5.0.0",
@@ -3216,6 +3148,7 @@
"version": "8.14.0",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -3284,6 +3217,7 @@
"version": "6.12.6",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -3667,7 +3601,6 @@
"version": "0.4.12",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/compat-data": "^7.22.6",
"@babel/helper-define-polyfill-provider": "^0.6.3",
@@ -3681,7 +3614,6 @@
"version": "0.11.1",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-define-polyfill-provider": "^0.6.3",
"core-js-compat": "^3.40.0"
@@ -3694,7 +3626,6 @@
"version": "0.6.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-define-polyfill-provider": "^0.6.3"
},
@@ -3789,7 +3720,6 @@
"version": "5.2.2",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": "*"
}
@@ -4008,6 +3938,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"caniuse-lite": "^1.0.30001688",
"electron-to-chromium": "^1.5.73",
@@ -4464,8 +4395,7 @@
"node_modules/commondir": {
"version": "1.0.1",
"dev": true,
"license": "MIT",
"peer": true
"license": "MIT"
},
"node_modules/compare-func": {
"version": "2.0.0",
@@ -4648,7 +4578,6 @@
"version": "3.40.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"browserslist": "^4.24.3"
},
@@ -5437,7 +5366,6 @@
"version": "3.0.0",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">= 4"
}
@@ -5474,6 +5402,7 @@
"version": "2.4.1",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"ansi-colors": "^4.1.1",
"strip-ansi": "^6.0.1"
@@ -6087,7 +6016,6 @@
"version": "3.3.2",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"commondir": "^1.0.1",
"make-dir": "^3.0.2",
@@ -6135,9 +6063,9 @@
}
},
"node_modules/follow-redirects": {
"version": "1.15.11",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
"integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
"version": "1.16.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
"integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
"funding": [
{
"type": "individual",
@@ -7406,6 +7334,7 @@
"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@jest/core": "^29.7.0",
"@jest/types": "^29.6.3",
@@ -8542,7 +8471,6 @@
"version": "2.0.4",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@@ -8576,8 +8504,7 @@
"node_modules/lodash.debounce": {
"version": "4.0.8",
"dev": true,
"license": "MIT",
"peer": true
"license": "MIT"
},
"node_modules/lodash.escaperegexp": {
"version": "4.1.2",
@@ -8707,7 +8634,6 @@
"version": "3.1.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"semver": "^6.0.0"
},
@@ -8748,6 +8674,7 @@
"version": "4.3.0",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"marked": "bin/marked.js"
},
@@ -12321,14 +12248,16 @@
}
},
"node_modules/prettier": {
"version": "2.8.7",
"version": "3.8.2",
"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.js"
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=10.13.0"
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
@@ -12737,14 +12666,12 @@
"node_modules/regenerate": {
"version": "1.4.2",
"dev": true,
"license": "MIT",
"peer": true
"license": "MIT"
},
"node_modules/regenerate-unicode-properties": {
"version": "10.2.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"regenerate": "^1.4.2"
},
@@ -12755,14 +12682,12 @@
"node_modules/regenerator-runtime": {
"version": "0.14.1",
"dev": true,
"license": "MIT",
"peer": true
"license": "MIT"
},
"node_modules/regenerator-transform": {
"version": "0.15.2",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.8.4"
}
@@ -12771,7 +12696,6 @@
"version": "6.2.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"regenerate": "^1.4.2",
"regenerate-unicode-properties": "^10.2.0",
@@ -12798,14 +12722,12 @@
"node_modules/regjsgen": {
"version": "0.8.0",
"dev": true,
"license": "MIT",
"peer": true
"license": "MIT"
},
"node_modules/regjsparser": {
"version": "0.12.0",
"dev": true,
"license": "BSD-2-Clause",
"peer": true,
"dependencies": {
"jsesc": "~3.0.2"
},
@@ -12817,7 +12739,6 @@
"version": "3.0.2",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"jsesc": "bin/jsesc"
},
@@ -13029,7 +12950,6 @@
"version": "2.7.1",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@types/json-schema": "^7.0.5",
"ajv": "^6.12.4",
@@ -13047,6 +12967,7 @@
"version": "19.0.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@semantic-release/commit-analyzer": "^9.0.2",
"@semantic-release/error": "^3.0.0",
@@ -14092,6 +14013,7 @@
"node_modules/tough-cookie": {
"version": "4.1.3",
"license": "BSD-3-Clause",
"peer": true,
"dependencies": {
"psl": "^1.1.33",
"punycode": "^2.1.1",
@@ -14511,6 +14433,7 @@
"integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
"dev": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -14535,7 +14458,6 @@
"version": "2.0.1",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=4"
}
@@ -14544,7 +14466,6 @@
"version": "2.0.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"unicode-canonical-property-names-ecmascript": "^2.0.0",
"unicode-property-aliases-ecmascript": "^2.0.0"
@@ -14557,7 +14478,6 @@
"version": "2.2.0",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=4"
}
@@ -14566,7 +14486,6 @@
"version": "2.1.0",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=4"
}
@@ -14826,6 +14745,7 @@
"version": "5.76.2",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
@@ -14872,6 +14792,7 @@
"version": "4.9.2",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@discoveryjs/json-ext": "^0.5.0",
"@webpack-cli/configtest": "^1.1.1",

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 --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",
"publishInit": "cp -r ./build/* . && rm -rf ./build",
"semantic-release": "semantic-release",
@@ -60,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",

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -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
)

View File

@@ -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
})

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,

View File

@@ -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 {

View File

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

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')
@@ -375,7 +375,7 @@ export class AuthManager {
*
*/
public async logOut() {
this.requestClient.resetInMemoryAuthState()
this.requestClient.clearCsrfTokens()
return this.requestClient.get(this.logoutUrl, undefined).then(() => true)
}

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(() => {

View File

@@ -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)
}

View File

@@ -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)
}

View File

@@ -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[] = []

View File

@@ -37,7 +37,6 @@ export class RequestClient implements HttpClient {
protected csrfToken: CsrfToken = { headerName: '', value: '' }
protected fileUploadCsrfToken: CsrfToken | undefined
protected httpClient!: AxiosInstance
private isRecoveringFromNetworkError = false
constructor(
protected baseUrl: string,
@@ -78,16 +77,6 @@ export class RequestClient implements HttpClient {
localStorage.setItem('refreshToken', '')
}
public resetInMemoryAuthState() {
this.clearCsrfTokens()
if (typeof localStorage !== 'undefined') {
this.clearLocalStorageTokens()
}
if (typeof document !== 'undefined') {
document.cookie = 'XSRF-TOKEN=; Max-Age=0; Path=/;'
}
}
public getBaseUrl() {
return this.httpClient.defaults.baseURL || ''
}
@@ -698,24 +687,6 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
throw new CertificateError(e.message)
}
if (
e.isAxiosError &&
!response &&
e.code === 'ERR_NETWORK' &&
!this.isRecoveringFromNetworkError
) {
// Opaque ERR_NETWORK usually means the server rejected stale credentials.
// Wipe in-memory auth state so the retry either succeeds
// or surfaces a clean LoginRequiredError.
this.resetInMemoryAuthState()
this.isRecoveringFromNetworkError = true
try {
return await callback()
} finally {
this.isRecoveringFromNetworkError = false
}
}
if (e.message) throw e
else throw prefixMessage(e, 'Error while handling error. ')
}

View File

@@ -23,13 +23,6 @@ export class Sas9RequestClient extends RequestClient {
}
}
public resetInMemoryAuthState() {
super.resetInMemoryAuthState()
if (this.httpClient.defaults.jar) {
;(this.httpClient.defaults.jar as tough.CookieJar).removeAllCookiesSync()
}
}
public async login(username: string, password: string, jobsPath: string) {
const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
if (this.httpClient.defaults.jar) {

View File

@@ -589,42 +589,6 @@ ${resHeaders[0]}: ${resHeaders[1]}${
requestClient['handleError'](error, () => {}, false)
).resolves.toEqual(undefined)
})
it('should clear CSRF and retry once on opaque ERR_NETWORK', async () => {
const networkError = {
isAxiosError: true,
code: 'ERR_NETWORK',
message: 'Network Error'
}
requestClient['csrfToken'] = { headerName: 'h', value: 'v' }
const callback = jest.fn().mockResolvedValue('ok')
await expect(
requestClient['handleError'](networkError, callback)
).resolves.toEqual('ok')
expect(callback).toHaveBeenCalledTimes(1)
expect(requestClient['csrfToken']).toEqual({ headerName: '', value: '' })
})
it('should not loop if retry also fails with ERR_NETWORK', async () => {
const networkError = {
isAxiosError: true,
code: 'ERR_NETWORK',
message: 'Network Error'
}
const innerHandle = jest.fn(() =>
requestClient['handleError'](networkError, () =>
Promise.reject(networkError)
)
)
await expect(
requestClient['handleError'](networkError, innerHandle)
).rejects.toEqual(networkError)
expect(innerHandle).toHaveBeenCalledTimes(1)
})
})
})
@@ -667,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 () => {

View File

@@ -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)

View File

@@ -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)

View File

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

View File

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