1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-06-09 18:40:22 +00:00

Compare commits

..

46 Commits

Author SHA1 Message Date
Allan Bowe eb1186b4b9 Merge pull request #881 from sasjs/fix/viya-upload-and-arguments
Viya upload and arguments
2026-05-05 15:57:59 +01:00
mulahasanovic ef1e816b09 test(sasjs): update config appLoc, enable specialCase tests 2026-05-05 16:46:23 +02:00
mulahasanovic 6552c768f9 chore: bump axios, remove node v20 support 2026-05-05 16:33:12 +02:00
mulahasanovic 31b3959e2c test(sasjs): prepend services/ to paths 2026-05-05 14:49:23 +02:00
mulahasanovic a38548d8de fix(viya): stringify JES job arguments + sasjs-tests fixes 2026-05-05 14:47:10 +02:00
mulahasanovic 7a130e129f fix(viya): skip formats keys in uploadTables 2026-05-05 14:43:49 +02:00
Allan Bowe 27a69f2959 Merge pull request #880 from sasjs/fix/bump_adapter_sasjs_tests
chore: bump adapter version in internal sasjs-tests
2026-04-29 10:29:48 +01:00
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
Trevor Moody b92487819a Merge pull request #879 from sasjs/fix/bump_axios_to_1_15_0
build(deps): bump and pin axios to v1.15.0
2026-04-10 16:40:41 +01:00
Trevor Moody 3cc37e0b5b Merge branch 'master' into fix/bump_axios_to_1_15_0 2026-04-10 16:22:05 +01:00
Trevor Moody d87b9ecc34 fix(deps): bump and pin axios to v1.15.0 2026-04-10 15:58:45 +01:00
Sead Mulahasanović 3b00ae4bef chore: merge pull request #878 from sasjs/fix/pin-axios-version
chore: pin axios version
2026-04-08 14:07:39 +02:00
mulahasanovic 87efdfff2e fix(ci): set correct loginMechanism and fix test reload 2026-04-08 12:53:15 +02:00
mulahasanovic 73556c9fdf fix(ci): use CORS-whitelisted port for sasjs-tests dev server 2026-04-06 17:02:29 +02:00
mulahasanovic 72318ced00 ci: set TERM=dumb to suppress tput warnings 2026-04-06 10:44:38 +02:00
mulahasanovic d7053ba628 test(cypress): wait for app init before checking login state 2026-04-01 21:02:46 +02:00
mulahasanovic 52371da4db chore: pin axios version 2026-04-01 19:37:45 +02:00
Allan Bowe 8e8efd22e9 Merge pull request #875 from sasjs/axiosbump
fix: bumping axios to 1.13.5
2026-02-09 20:11:49 +00:00
allan f80d0c87f9 fix: bumping axios to 1.13.5 2026-02-09 19:47:35 +00:00
Sead Mulahasanović 5bd641b843 Merge pull request #871 from sasjs/mihajlo/viyaWebContextName
fix: viya, web approach, contexname not added to the url if contains …
2026-02-06 12:37:55 +01:00
M 539fe5f4ed fix: viya, web approach, contexname not added to the url if contains spaces between the words 2026-02-06 12:05:02 +01:00
Allan Bowe 9252e7e384 Merge pull request #866 from sasjs/housekeeping_20251212
fix(build): pipeline node version upgrade and hardened security
2025-12-15 12:06:04 +00:00
mulahasanovic bbf0eed443 chore(cypress): update config 2025-12-15 11:49:53 +01:00
mulahasanovic 677c0a5046 chore(build): update search and replace command for cypress env 2025-12-15 11:29:55 +01:00
mulahasanovic ff927caf73 chore(deps): bump cypress 2025-12-15 11:20:22 +01:00
mulahasanovic e23aa4426c chore(build): update test server port 2025-12-12 17:54:00 +01:00
mulahasanovic 8064a843e8 fix(build): install cypress binary and cache only in relevant pipeline 2025-12-12 17:31:57 +01:00
M d45b528846 chore: ci fix, package-lock regen 2025-12-12 17:27:29 +01:00
mulahasanovic cd64ebc518 fix(build): add cypress binary to the cache 2025-12-12 17:11:58 +01:00
Trevor Moody 8246722ae8 fix(deps): take newly available @sasjs/utils 3.5.6 2025-12-12 14:18:04 +00:00
Trevor Moody 0f8a3f4b53 fix(build): node version unified across all pipelines 2025-12-12 13:59:06 +00:00
Trevor Moody ca9ffdbc17 fix(build): pipeline node version upgrade and hardened security 2025-12-12 13:16:32 +00:00
Allan Bowe 03b7592521 Merge pull request #865 from sasjs/viyaCreateFileAndPatch
Viya create file and patch
2025-11-25 09:02:48 +00:00
Trevor Moody ba64ed1f20 fix: defensively coded for potential empty 'name' properties in the viya types response 2025-11-25 07:39:00 +00:00
Trevor Moody 480510b980 build: (server-tests) use jq to safely modify json 2025-11-23 06:29:52 +00:00
Trevor Moody 8c7767a36d fix: (build) command syntax 2025-11-22 22:19:34 +00:00
Trevor Moody f335be344e build: adjusted search/replace regex/value to allow for json lines without trailing commas 2025-11-22 22:11:55 +00:00
Trevor Moody 680f5a4872 chore: (sasjs-tests) prevent redundant rendering of vertical scroll bar 2025-11-22 17:58:00 +00:00
Trevor Moody c42a20a8ee feat: (viya) apply properties to newly created files 2025-11-22 17:56:50 +00:00
46 changed files with 910 additions and 1996 deletions
+1
View File
@@ -0,0 +1 @@
* text=auto eol=lf
+5 -3
View File
@@ -11,8 +11,9 @@ jobs:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
node-version: [lts/hydrogen]
node-version: [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 }}
+4 -4
View File
@@ -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
+5 -2
View File
@@ -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:
+123 -107
View File
@@ -1,107 +1,123 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
name: SASjs Build and Server Tests
on:
pull_request:
jobs:
test:
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [lts/hydrogen]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
# 2. Restore npm cache manually
- name: Restore npm cache
uses: actions/cache@v3
id: npm-cache
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Install Dependencies
run: npm ci
- name: Install Rimraf
run: npm i rimraf
- name: Build Package
run: npm run package:lib
env:
CI: true
- name: Write VPN Files
run: |
echo "$CA_CRT" > .github/vpn/ca.crt
echo "$USER_CRT" > .github/vpn/user.crt
echo "$USER_KEY" > .github/vpn/user.key
echo "$TLS_KEY" > .github/vpn/tls.key
shell: bash
env:
CA_CRT: ${{ secrets.CA_CRT}}
USER_CRT: ${{ secrets.USER_CRT }}
USER_KEY: ${{ secrets.USER_KEY }}
TLS_KEY: ${{ secrets.TLS_KEY }}
- name: Chmod VPN files
run: |
chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
- name: Install Open VPN
run: |
sudo apt install apt-transport-https
sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
sudo apt-key add openvpn-repo-pkg-key.pub
sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
sudo apt update
sudo apt install openvpn3=17~betaUb22042+jammy
- name: Start Open VPN 3
run: openvpn3 session-start --config .github/vpn/config.ovpn
- name: install pm2
run: npm i -g pm2
- name: Fetch SASJS server
run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
- name: Deploy sasjs-tests
run: |
npm install -g replace-in-files-cli
cd sasjs-tests
replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json
npm i
replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json
replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json
replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json
replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json
cat ./public/config.json
npm run update:adapter
pm2 start --name sasjs-test npm -- start
- name: Sleep for 10 seconds
run: sleep 10s
shell: bash
- name: Run cypress on sasjs
run: |
replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.json
replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json
replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json
cat ./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}}
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
name: SASjs Build and Server Tests
on:
pull_request:
jobs:
test:
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [22]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
# 2. Restore npm cache manually
- name: Restore npm cache
uses: actions/cache@v3
id: npm-cache
with:
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
- name: Build Package
run: npm run package:lib
env:
CI: true
- name: Write VPN Files
run: |
echo "$CA_CRT" > .github/vpn/ca.crt
echo "$USER_CRT" > .github/vpn/user.crt
echo "$USER_KEY" > .github/vpn/user.key
echo "$TLS_KEY" > .github/vpn/tls.key
shell: bash
env:
CA_CRT: ${{ secrets.CA_CRT}}
USER_CRT: ${{ secrets.USER_CRT }}
USER_KEY: ${{ secrets.USER_KEY }}
TLS_KEY: ${{ secrets.TLS_KEY }}
- name: Chmod VPN files
run: |
chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
- name: Install Open VPN
run: |
sudo apt install apt-transport-https
sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
sudo apt-key add openvpn-repo-pkg-key.pub
sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
sudo apt update
sudo apt install openvpn3=17~betaUb22042+jammy
- name: Start Open VPN 3
run: openvpn3 session-start --config .github/vpn/config.ovpn
- name: install pm2
run: npm i -g pm2
- name: Fetch SASJS server
run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
- name: Deploy sasjs-tests
run: |
sudo apt install jq
cd sasjs-tests
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
cat ./public/config.json
npm run update:adapter
pm2 start --name sasjs-test npm -- start
- name: Sleep for 10 seconds
run: sleep 10s
shell: bash
- name: Run cypress on sasjs
env:
TERM: dumb
run: |
sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
cat ./cypress.config.js
echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
-2
View File
@@ -1,2 +0,0 @@
tasks:
- init: npm install && npm run build
+1
View File
@@ -0,0 +1 @@
ignore-scripts=true
+18
View File
@@ -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
}
})
-11
View File
@@ -1,11 +0,0 @@
{
"chromeWebSecurity": false,
"defaultCommandTimeout": 20000,
"env": {
"sasjsTestsUrl": "",
"username": "",
"password": "",
"screenshotOnRunFailure": false,
"testingFinishTimeout": 600000
}
}
+3 -1
View File
@@ -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')
+325 -114
View File
@@ -5,11 +5,10 @@
"packages": {
"": {
"name": "@sasjs/adapter",
"hasInstallScript": true,
"license": "ISC",
"dependencies": {
"@sasjs/utils": "3.5.2",
"axios": "1.12.2",
"@sasjs/utils": "^3.5.6",
"axios": "1.16.0",
"axios-cookiejar-support": "5.0.5",
"form-data": "4.0.4",
"https": "1.0.0",
@@ -26,7 +25,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",
@@ -35,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",
@@ -1694,7 +1693,9 @@
}
},
"node_modules/@cypress/request": {
"version": "2.88.12",
"version": "3.0.9",
"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": {
@@ -1704,16 +1705,16 @@
"combined-stream": "~1.0.6",
"extend": "~3.0.2",
"forever-agent": "~0.6.1",
"form-data": "~2.3.2",
"http-signature": "~1.3.6",
"form-data": "~4.0.4",
"http-signature": "~1.4.0",
"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.10.3",
"qs": "6.14.0",
"safe-buffer": "^5.1.2",
"tough-cookie": "^4.1.3",
"tough-cookie": "^5.0.0",
"tunnel-agent": "^0.6.0",
"uuid": "^8.3.2"
},
@@ -1721,17 +1722,17 @@
"node": ">= 6"
}
},
"node_modules/@cypress/request/node_modules/form-data": {
"version": "2.3.3",
"node_modules/@cypress/request/node_modules/tough-cookie": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
"integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
"dev": true,
"license": "MIT",
"license": "BSD-3-Clause",
"dependencies": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.6",
"mime-types": "^2.1.12"
"tldts": "^6.1.32"
},
"engines": {
"node": ">= 0.12"
"node": ">=16"
}
},
"node_modules/@cypress/webpack-preprocessor": {
@@ -2424,10 +2425,9 @@
}
},
"node_modules/@sasjs/utils": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.2.tgz",
"integrity": "sha512-LBpBDx0T7G/eO15Gb+r3DR1LfBnoqagWT3HiHabojFziA4ej4ePORo8chrk0zHLIzrjI2ljAnDabyJEwC5KtIA==",
"hasInstallScript": true,
"version": "3.5.6",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.6.tgz",
"integrity": "sha512-jx8zWSOysDD66vTjA0BWiZ8bcFqmqh8F+56fUCgLmJhm89eDbKrGF3mDKMQx3UE7d2+gxp9xYhJCdaBWz0Dlxw==",
"license": "ISC",
"dependencies": {
"@fast-csv/format": "4.3.5",
@@ -2962,7 +2962,9 @@
}
},
"node_modules/@types/sinonjs__fake-timers": {
"version": "6.0.4",
"version": "8.1.1",
"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"
},
@@ -2978,6 +2980,13 @@
"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,
@@ -3416,6 +3425,8 @@
},
"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": {
@@ -3451,6 +3462,8 @@
},
"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": {
@@ -3498,6 +3511,8 @@
},
"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": {
@@ -3506,18 +3521,20 @@
},
"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.12.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
"integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
"version": "1.16.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
"integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.15.6",
"form-data": "^4.0.4",
"proxy-from-env": "^1.1.0"
"follow-redirects": "^1.16.0",
"form-data": "^4.0.5",
"proxy-from-env": "^2.1.0"
}
},
"node_modules/axios-cookiejar-support": {
@@ -3539,6 +3556,22 @@
"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",
@@ -3739,6 +3772,8 @@
},
"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": {
@@ -4185,6 +4220,8 @@
},
"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"
},
@@ -4220,14 +4257,6 @@
"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,
@@ -4415,7 +4444,9 @@
}
},
"node_modules/commander": {
"version": "5.1.0",
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
"dev": true,
"license": "MIT",
"engines": {
@@ -4808,58 +4839,129 @@
"license": "MIT"
},
"node_modules/cypress": {
"version": "7.7.0",
"version": "15.7.1",
"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": "^2.88.5",
"@cypress/request": "^3.0.9",
"@cypress/xvfb": "^1.2.4",
"@types/node": "^14.14.31",
"@types/sinonjs__fake-timers": "^6.0.2",
"@types/sinonjs__fake-timers": "8.1.1",
"@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",
"check-more-types": "^2.24.0",
"ci-info": "^4.1.0",
"cli-cursor": "^3.1.0",
"cli-table3": "~0.6.0",
"commander": "^5.1.0",
"cli-table3": "0.6.1",
"commander": "^6.2.1",
"common-tags": "^1.8.0",
"dayjs": "^1.10.4",
"debug": "^4.3.2",
"debug": "^4.3.4",
"enquirer": "^2.3.6",
"eventemitter2": "^6.4.3",
"eventemitter2": "6.4.7",
"execa": "4.1.0",
"executable": "^4.1.1",
"extract-zip": "2.0.1",
"figures": "^3.2.0",
"fs-extra": "^9.1.0",
"getos": "^3.2.1",
"is-ci": "^3.0.0",
"hasha": "5.2.2",
"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.5",
"minimist": "^1.2.8",
"ospath": "^1.2.2",
"pretty-bytes": "^5.6.0",
"ramda": "~0.27.1",
"process": "^0.11.10",
"proxy-from-env": "1.0.0",
"request-progress": "^3.0.0",
"supports-color": "^8.1.1",
"tmp": "~0.2.1",
"systeminformation": "5.27.7",
"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": ">=12.0.0"
"node": "^20.1.0 || ^22.0.0 || >=24.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": {
@@ -4876,6 +4978,13 @@
"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,
@@ -4892,6 +5001,8 @@
},
"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": {
@@ -5250,6 +5361,8 @@
},
"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": {
@@ -5618,7 +5731,9 @@
}
},
"node_modules/eventemitter2": {
"version": "6.4.9",
"version": "6.4.7",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
"integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
"dev": true,
"license": "MIT"
},
@@ -5772,6 +5887,8 @@
},
"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"
},
@@ -5796,6 +5913,8 @@
},
"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"
@@ -6016,7 +6135,9 @@
}
},
"node_modules/follow-redirects": {
"version": "1.15.9",
"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",
@@ -6049,6 +6170,8 @@
},
"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": {
@@ -6159,6 +6282,21 @@
"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",
@@ -6239,16 +6377,10 @@
"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": {
@@ -6456,6 +6588,33 @@
"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",
@@ -6595,13 +6754,15 @@
}
},
"node_modules/http-signature": {
"version": "1.3.6",
"version": "1.4.0",
"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.14.1"
"sshpk": "^1.18.0"
},
"engines": {
"node": ">=0.10"
@@ -6835,17 +6996,6 @@
"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,
@@ -7054,6 +7204,8 @@
},
"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"
},
@@ -7088,6 +7240,8 @@
},
"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"
},
@@ -8120,6 +8274,8 @@
},
"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"
},
@@ -8192,6 +8348,8 @@
},
"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)"
},
@@ -8256,6 +8414,8 @@
},
"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"
@@ -8287,14 +8447,6 @@
"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",
@@ -12045,6 +12197,8 @@
},
"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"
},
@@ -12167,14 +12321,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"
@@ -12261,10 +12417,13 @@
}
},
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
"license": "MIT"
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
"integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
"license": "MIT",
"engines": {
"node": ">=10"
}
},
"node_modules/psl": {
"version": "1.15.0",
@@ -12337,11 +12496,13 @@
}
},
"node_modules/qs": {
"version": "6.10.4",
"version": "6.14.0",
"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.0.4"
"side-channel": "^1.1.0"
},
"engines": {
"node": ">=0.6"
@@ -12388,11 +12549,6 @@
"node": ">=8"
}
},
"node_modules/ramda": {
"version": "0.27.2",
"dev": true,
"license": "MIT"
},
"node_modules/randombytes": {
"version": "2.1.0",
"dev": true,
@@ -13413,6 +13569,8 @@
},
"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": {
@@ -13650,6 +13808,33 @@
"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,
@@ -13850,8 +14035,30 @@
"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.3",
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
"integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
"dev": true,
"license": "MIT",
"engines": {
@@ -13932,6 +14139,16 @@
"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,
@@ -14192,6 +14409,8 @@
},
"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": {
@@ -14203,6 +14422,8 @@
},
"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"
},
@@ -14458,20 +14679,6 @@
"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,
@@ -14499,6 +14706,8 @@
},
"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": {
@@ -14542,6 +14751,8 @@
},
"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"
+8 -11
View File
@@ -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.16.0",
"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.
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
+1 -5
View File
@@ -12,10 +12,6 @@ body {
background: #f5f5f5;
}
#app {
min-height: 100vh;
}
.app__error {
max-width: 800px;
margin: 50px auto;
@@ -40,4 +36,4 @@ body {
border-radius: 4px;
overflow-x: auto;
}
}
}
+54 -1627
View File
File diff suppressed because it is too large Load Diff
-3
View File
@@ -18,8 +18,5 @@
},
"overrides": {
"vite": "npm:rolldown-vite@7.2.2"
},
"dependencies": {
"@sasjs/adapter": "^4.14.0"
}
}
+2 -2
View File
@@ -4,8 +4,8 @@
"sasJsConfig": {
"loginMechanism": "Redirected",
"serverUrl": "",
"appLoc": "/Public/app/adapter-tests/services",
"serverType": "SASVIYA",
"appLoc": "/Public/app/adapter-tests",
"serverType": "SASJS",
"debug": false,
"contextName": "SAS Job Execution compute context",
"useComputeApi": true
+1 -1
View File
@@ -7,7 +7,7 @@
"targets": [
{
"name": "4gl",
"serverUrl": "https://sas9.4gl.io",
"serverUrl": "https://sas.4gl.io",
"serverType": "SASJS",
"httpsAgentOptions": {
"allowInsecureRequests": false
+32 -1
View File
@@ -72,7 +72,7 @@ export class TestCard extends HTMLElement {
? `
<div class="error">
<strong>Error:</strong>
<pre>${(error as Error).message || String(error)}</pre>
<pre>${formatError(error)}</pre>
</div>
`
: ''
@@ -110,4 +110,35 @@ 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)
+2 -1
View File
@@ -22,6 +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'
async function init() {
const appContainer = document.getElementById('app')
@@ -98,7 +99,7 @@ function showTests(
// basicTests(adapter, configTyped.userName || '', configTyped.password || ''),
sendArrTests(adapter, appLoc),
sendObjTests(adapter),
// specialCaseTests(adapter),
specialCaseTests(adapter),
sasjsRequestTests(adapter),
fileUploadTests(adapter)
]
+11 -3
View File
@@ -77,7 +77,7 @@ export const basicTests = (
await adapter.logOut()
return await adapter.request(
'common/sendArr',
'services/common/sendArr',
stringData,
undefined,
async () => {
@@ -97,7 +97,11 @@ export const basicTests = (
useComputeApi: false
}
return await adapter.request('common/sendArr', stringData, config)
return await adapter.request(
'services/common/sendArr',
stringData,
config
)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1
@@ -112,7 +116,11 @@ export const basicTests = (
debug: true
}
return await adapter.request('common/sendArr', stringData, config)
return await adapter.request(
'services/common/sendArr',
stringData,
config
)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1
+11 -4
View File
@@ -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('common/sendArr', stringData)
return await adapter.request('services/common/sendArr', stringData)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1
@@ -25,7 +25,11 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
useComputeApi: false
}
return await adapter.request('common/sendArr', stringData, config)
return await adapter.request(
'services/common/sendArr',
stringData,
config
)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1
@@ -36,7 +40,10 @@ 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(`${appLoc}/common/sendArr`, data)
return adapter.startComputeJob(
`${appLoc}/services/common/sendArr`,
data
)
},
assertion: (res: any) => {
const expectedProperties = ['id', 'applicationName', 'attributes']
@@ -49,7 +56,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
test: () => {
const data: any = { table1: [{ col1: 'first col value' }] }
return adapter.startComputeJob(
`${appLoc}/common/sendArr`,
`${appLoc}/services/common/sendArr`,
data,
{},
undefined,
+5 -1
View File
@@ -22,7 +22,11 @@ export const fileUploadTests = (adapter: SASjs): TestSuite => ({
}
]
return adapter.uploadFile('common/sendMacVars', filesToUpload, null)
return adapter.uploadFile(
'services/common/sendMacVars',
filesToUpload,
null
)
},
assertion: (response: any) =>
(response.macvars as any[]).findIndex(
+29 -21
View File
@@ -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}/common/sendArr`, stringData)
return adapter.request(`${appLoc}/services/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('common/sendArr', stringData)
return adapter.request('services/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('common/sendArr', getLongStringData())
return adapter.request('services/common/sendArr', getLongStringData())
},
assertion: (res: any) => {
const longStringData = getLongStringData()
@@ -87,7 +87,9 @@ 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.request('common/sendArr', data).catch((e: any) => e)
return adapter
.request('services/common/sendArr', data)
.catch((e: any) => e)
},
assertion: (error: any) => {
return !!error && !!error.error && !!error.error.message
@@ -97,7 +99,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('common/sendArr', numericData)
return adapter.request('services/common/sendArr', numericData)
},
assertion: (res: any) => {
return res.table1[0][0] === numericData.table1[0].col1
@@ -107,7 +109,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple columns',
description: 'Should handle data with multiple columns',
test: () => {
return adapter.request('common/sendArr', multiColumnData)
return adapter.request('services/common/sendArr', multiColumnData)
},
assertion: (res: any) => {
return (
@@ -122,7 +124,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('common/sendArr', multipleRowsWithNulls)
return adapter.request('services/common/sendArr', multipleRowsWithNulls)
},
assertion: (res: any) => {
let result = true
@@ -148,7 +150,10 @@ 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('common/sendArr', multipleColumnsWithNulls)
return adapter.request(
'services/common/sendArr',
multipleColumnsWithNulls
)
},
assertion: (res: any) => {
let result = true
@@ -184,7 +189,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'1InvalidTable': [{ col1: 42 }]
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -198,7 +203,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'an invalidTable': [{ col1: 42 }]
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -212,7 +217,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'anInvalidTable#': [{ col1: 42 }]
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -227,7 +232,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -241,7 +246,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
inData: [[{ data: 'value' }]]
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -251,7 +256,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('common/sendObj', stringData)
return adapter.request('services/common/sendObj', stringData)
},
assertion: (res: any) => {
return res.table1[0].COL1 === stringData.table1[0].col1
@@ -262,7 +267,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
description:
'Should send an object with a long string value under 32765 characters',
test: () => {
return adapter.request('common/sendObj', getLongStringData())
return adapter.request('services/common/sendObj', getLongStringData())
},
assertion: (res: any) => {
const longStringData = getLongStringData()
@@ -275,7 +280,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'Should error out with long string values over 32765 characters',
test: () => {
return adapter
.request('common/sendObj', getLongStringData(32767))
.request('services/common/sendObj', getLongStringData(32767))
.catch((e: any) => e)
},
assertion: (error: any) => {
@@ -286,7 +291,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('common/sendObj', numericData)
return adapter.request('services/common/sendObj', numericData)
},
assertion: (res: any) => {
return res.table1[0].COL1 === numericData.table1[0].col1
@@ -297,7 +302,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('common/sendObj', getLargeObjectData())
return adapter.request('services/common/sendObj', getLargeObjectData())
},
assertion: (res: any) => {
const data = getLargeObjectData()
@@ -308,7 +313,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple columns',
description: 'Should handle data with multiple columns',
test: () => {
return adapter.request('common/sendObj', multiColumnData)
return adapter.request('services/common/sendObj', multiColumnData)
},
assertion: (res: any) => {
return (
@@ -323,7 +328,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('common/sendObj', multipleRowsWithNulls)
return adapter.request('services/common/sendObj', multipleRowsWithNulls)
},
assertion: (res: any) => {
let result = true
@@ -349,7 +354,10 @@ 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('common/sendObj', multipleColumnsWithNulls)
return adapter.request(
'services/common/sendObj',
multipleColumnsWithNulls
)
},
assertion: (res: any) => {
let result = true
+2 -2
View File
@@ -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('common/sendArr', data)
return adapter.request('services/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('common/makeErr', data, { debug: true })
// .request('services/common/makeErr', data, { debug: true })
// .catch(() => {
// const sasRequests = adapter.getSasRequests()
// const makeErrRequest: any =
+17 -14
View File
@@ -111,7 +111,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Common special characters',
description: 'Should handle common special characters',
test: () => {
return adapter.request('common/sendArr', specialCharData)
return adapter.request('services/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('common/sendArr', moreSpecialCharData)
return adapter.request('services/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('common/sendArr', getWideData())
return adapter.request('services/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('common/sendObj', getWideData())
return adapter.request('services/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('common/sendArr', getTables())
return adapter.request('services/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('common/sendObj', getLargeDataset())
return adapter.request('services/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('common/sendArr', getLargeDataset())
return adapter.request('services/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('common/sendArr', errorAndCsrfData)
return adapter.request('services/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('common/sendObj', errorAndCsrfData)
return adapter.request('services/common/sendObj', errorAndCsrfData)
},
assertion: (res: any) => {
return (
@@ -300,7 +300,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
}
return await adapter.request(
'common/sendArr',
'services/common/sendArr',
stringData,
config,
undefined,
@@ -319,7 +319,10 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Special missing values',
description: 'Should support special missing values',
test: () => {
return adapter.request('common/sendObj', testTableWithSpecialNumeric)
return adapter.request(
'services/common/sendObj',
testTableWithSpecialNumeric
)
},
assertion: (res: any) => {
let assertionRes = true
@@ -365,7 +368,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when one row is send',
test: () => {
return adapter.request(
'common/sendObj',
'services/common/sendObj',
testTableWithSpecialNumericOneRow
)
},
@@ -413,7 +416,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when LOWERCASE value is sent',
test: () => {
return adapter.request(
'common/sendObj',
'services/common/sendObj',
testTableWithSpecialNumericLowercase
)
},
@@ -469,7 +472,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(
'common/sendObj',
'services/common/sendObj',
testTableWithSpecialNumericOneRow,
{ useComputeApi: undefined }
)
+3
View File
@@ -1,5 +1,8 @@
import { defineConfig } from 'vite'
export default defineConfig({
server: {
port: 3000
},
build: {
assetsInlineLimit: 0,
assetsDir: ''
+16 -11
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
)
+162 -13
View File
@@ -35,6 +35,60 @@ interface JobExecutionResult {
log?: string
error?: object
}
/* Viya /types/types?limit=999999 response structure */
interface IViyaTypesResponse {
accept: string
count: number
items: IViyaTypesItem[]
limit: number
links: IViyaTypesLink[]
name: string
start: number
version: number
}
/* Item element within the Viya types response */
interface IViyaTypesItem {
description?: string
extensions?: string[]
iconUri?: string
label: string
links: IViyaTypesLink[]
mappedTypes?: string[]
mediaType?: string
mediaTypes?: string[]
name?: string | undefined
pluralLabel?: string
properties?: IViyaTypesProperties
resourceUri?: string
serviceRootUri?: string
tags?: string[]
version: number
}
/**
* Generic structure for a link
* in the links array of a Viya
* types/types api response
*/
type IViyaTypesLink = Record<string, string>
/**
* Generic structure for a type's
* 'properties' object from the Viya
* types/types api response
*/
type IViyaTypesProperties = Record<string, string>
/**
* Arbitrary interface for storing
* sufficient additional detail to
* create and patch a new file.
*/
interface IViyaTypesExtensionInfo {
typeDefName: string | undefined
properties: IViyaTypesProperties | undefined
}
/**
* A client for interfacing with the SAS Viya REST API.
@@ -61,6 +115,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
// after an attempt to populate it.
/**
* A helper method used to call appendRequest method of RequestClient
@@ -434,15 +491,102 @@ export class SASViyaApiClient {
const formData = new NodeFormData()
formData.append('file', contentBuffer, fileName)
return (
await this.requestClient.post<File>(
`/files/files?parentFolderUri=${parentFolderUri}&typeDefName=file#rawUpload`,
formData,
accessToken,
'multipart/form-data; boundary=' + (formData as any)._boundary,
headers
)
).result
/** Query Viya for file metadata based on extension type. */
// typeDefName - Viya accepts this property during the file creation
let typeDefName: string | undefined = undefined
// Additional properties are supplied by a patch.
let filePatch:
| {
name: string
properties: IViyaTypesProperties | undefined
}
| undefined = undefined
// The patching process requires properties related to the file-extension
const fileExtension: string | undefined = fileName
.split('.')
.pop()
?.toLowerCase()
if (fileExtension) {
if (!this.boolExtensionMap) {
// Populate the file extension map
// 1. Get Viya's response to this api call
const typesQueryUrl = `/types/types?limit=999999`
const response = (
await this.requestClient.get(typesQueryUrl, accessToken)
).result as IViyaTypesResponse
// 2. Filter the returned items that have file extensions into a map
// using forEach as an item may relate to multiple file extensions.
response.items
.filter((e) => e.extensions)
.forEach((e) => {
e.extensions?.forEach((ext) => {
this.fileExtensionMap.set(ext, {
// `name` becomes the typeDefName value at file creation time.
// `name` is ignored here if it is not populated in the map, or
// has a blank/empty value.
typeDefName: e.name
? e.name.trim().length
? e.name.trim()
: undefined
: undefined,
properties: e.properties
})
})
})
// 3. Toggle the flag to avoid repeating this step
this.boolExtensionMap = true
}
// Query the map for the current file extension
const fileExtInfo = this.fileExtensionMap.get(fileExtension)
if (fileExtInfo) {
// If the extension was found in the map, record the typeDefName and
// create a patch if a properties object was returned.
typeDefName = fileExtInfo.typeDefName
if (fileExtInfo.properties)
filePatch = { name: fileName, properties: fileExtInfo.properties }
}
}
// Create the file
const createFileResponse = await this.requestClient.post<File>(
`/files/files?parentFolderUri=${parentFolderUri}&typeDefName=${
typeDefName ?? 'file'
}#rawUpload`,
formData,
accessToken,
'multipart/form-data; boundary=' + (formData as any)._boundary,
headers
)
// If a patch was created...
if (filePatch) {
try {
const patchHeaders = {
Accept: 'application/json',
'If-Match': '*'
}
// Get the URI of the newly created file
const fileUri = createFileResponse.result.links.filter(
(e) => e.method == 'PATCH' && e.rel == 'patch'
)[0].uri
// and apply the patch
return (
await this.requestClient.patch<File>(
`${fileUri}`,
filePatch,
accessToken,
patchHeaders
)
).result
} catch (e: any) {
throw new Error(`Error patching file ${fileName}.\n${e.message}`)
}
}
return createFileResponse.result
}
/**
@@ -882,17 +1026,22 @@ 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
})
// 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: jobArguments
arguments: stringifiedArguments
}
const { result: postedJob } = await this.requestClient.post<Job>(
+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,
+2 -3
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 {
+2 -2
View File
@@ -683,8 +683,8 @@ const mockSimplePoll = (runningCount = 2) => {
count === 0
? 'pending'
: count <= runningCount
? 'running'
: 'completed',
? 'running'
: 'completed',
etag: '',
status: 200
})
+14
View File
@@ -23,6 +23,20 @@ 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
+5 -1
View File
@@ -1,6 +1,6 @@
import { prefixMessage } from '@sasjs/utils/error'
import { RequestClient } from '../../request/RequestClient'
import { convertToCSV } from '../../utils/convertToCsv'
import { convertToCSV, isFormatsTable } from '../../utils/convertToCsv'
/**
* Uploads tables to SAS as specially formatted CSVs.
@@ -18,6 +18,10 @@ 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(
+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(() => {
+4 -1
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)
}
+4 -1
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)
}
+4 -1
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[] = []
+4 -6
View File
@@ -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 = {
+6 -2
View File
@@ -273,9 +273,13 @@ export class RequestClient implements HttpClient {
public async patch<T>(
url: string,
data: any = {},
accessToken?: string
accessToken?: string,
overrideHeaders: { [key: string]: string | number } = {}
): Promise<{ result: T; etag: string }> {
const headers = this.getHeaders(accessToken, 'application/json')
const headers = {
...this.getHeaders(accessToken, 'application/json'),
...overrideHeaders
}
return this.httpClient
.patch<T>(url, data, { headers, withXSRFToken: true })
+1 -1
View File
@@ -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 () => {
+4 -1
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)
+4 -1
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)
+4 -1
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
+2 -2
View File
@@ -110,8 +110,8 @@ export const convertToCSV = (
longestValueForField
? longestValueForField
: firstFoundType === 'chars'
? '1'
: 'best'
? '1'
: 'best'
}.`
)
}