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

Compare commits

...

19 Commits

Author SHA1 Message Date
Allan Bowe 3d99a9b1e4 Merge pull request #885 from sasjs/884-execution-tasks-web-support
Support for execution tasks
2026-05-15 09:06:15 +01:00
4gl 2a71e34179 chore: updating README and adding 2 attributes to .npmrc 2026-05-14 10:32:47 +01:00
mulahasanovic ea5d60352d fix(debug): send _debug=128 via URL for runAsTask debug, drop _omittextlog 2026-05-14 10:45:40 +02:00
mulahasanovic ac0dfae9a8 fix: skip formats table in generateTableUploadForm to avoid empty sasjs<N>data 2026-05-14 10:43:16 +02:00
mulahasanovic cd350e4e6d fix(debug): use _debug=128 instead of log for viya web with tasks 2026-05-13 15:17:53 +02:00
mulahasanovic 8f726c0ac9 fix(debug): add viya debug log parser - parse JSON from inline blob with webout 2026-05-13 14:26:12 +02:00
mulahasanovic 4cae9b5472 feat(debug): add viya debug log parser - parse JSON from inline blob 2026-05-13 14:09:47 +02:00
mulahasanovic a691500910 fix: use log instead of 131 if debug is enabled on viya with tasks enabled 2026-05-13 10:56:47 +02:00
mulahasanovic eb6b123dba test(viya): migrate execution-tasks tests to runAsTask config 2026-05-12 20:10:58 +02:00
mulahasanovic 3136e98477 feat(viya): add runAsTask config feature for execution tasks 2026-05-12 19:47:13 +02:00
mulahasanovic 2db1b9fc4b refactor(webjob): add dummy file only when neccessary
SAS Track CS0409737
2026-05-12 19:45:04 +02:00
mulahasanovic 8be0fd94ad fix(webjob): add dummy file when execution tasks flag is enabled
SAS Track CS0409737
2026-05-12 10:11:59 +02:00
Sead Mulahasanović 55db8f45ab fix(webjob): test coverage for _executionTasks=true requests without file upload (#883)
* test(cypress): show individual errors

* test(cypress): half the cypress integration test timeout

* test(cypress): add parallel tests, timeout and reports

* test(cypress): use allSettled instead of all

* test(runner): pre-render pending test cards
2026-05-12 09:53:11 +02:00
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
32 changed files with 887 additions and 120 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
node-version: [20, 22, 24] node-version: [22, 24]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
+3 -1
View File
@@ -1 +1,3 @@
ignore-scripts=true ignore-scripts=true
save-exact=true
fund=false
+1
View File
@@ -288,6 +288,7 @@ Configuration on the client side involves passing an object on startup, which ca
- `verbose` - optional, if `true` then a summary of every HTTP response is logged. - `verbose` - optional, if `true` then a summary of every HTTP response is logged.
- `loginMechanism` - either `Default` or `Redirected`. See [SAS Logon](#sas-logon) section. - `loginMechanism` - either `Default` or `Redirected`. See [SAS Logon](#sas-logon) section.
- `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used. If `false` the [JES API](#using-the-jes-api) is used. If `null` or `undefined` the [Web](#using-jes-web-app) approach is used. - `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used. If `false` the [JES API](#using-the-jes-api) is used. If `null` or `undefined` the [Web](#using-jes-web-app) approach is used.
- `runAsTask` - Only relevant for serverType `SASVIYA` and useComputeApi `null`. Will add the `_EXECUTIONTASKS=true` URL param and thus execute jobs as Compute Tasks.
- `contextName` - Compute context on which the requests will be called. If missing or not provided, defaults to `Job Execution Compute context`. - `contextName` - Compute context on which the requests will be called. If missing or not provided, defaults to `Job Execution Compute context`.
- `requestHistoryLimit` - Request history limit. Increasing this limit may affect browser performance, especially with debug (logs) enabled. Default is 10. - `requestHistoryLimit` - Request history limit. Increasing this limit may affect browser performance, especially with debug (logs) enabled. Default is 10.
+1 -1
View File
@@ -13,6 +13,6 @@ module.exports = defineConfig({
username: '', username: '',
password: '', password: '',
screenshotOnRunFailure: false, screenshotOnRunFailure: false,
testingFinishTimeout: 600000 testingFinishTimeout: 300000
} }
}) })
+56 -14
View File
@@ -12,6 +12,58 @@ context('sasjs-tests', function () {
cy.visit(sasjsTestsUrl) cy.visit(sasjsTestsUrl)
}) })
function waitForTestsToFinish(timeout: number) {
const deadline = Date.now() + timeout
function check() {
cy.get('tests-view', { log: false }).then(($view) => {
const shadow = ($view[0] as HTMLElement).shadowRoot
const stillRunning = !!shadow?.querySelector('#run-btn:disabled')
if (!stillRunning) return
if (Date.now() >= deadline) {
cy.log('Timed out waiting for tests to finish; reporting status')
return
}
cy.wait(2000, { log: false })
check()
})
}
check()
}
function assertNoFailedTests() {
cy.get('test-card').then(($cards) => {
const failed: string[] = []
const stuck: string[] = []
const pending: string[] = []
$cards.each((_, card) => {
const shadow = (card as HTMLElement).shadowRoot
if (!shadow) return
const icon = shadow.querySelector('.status-icon')
const title =
shadow.querySelector('.header h3')?.textContent?.trim() ?? '(unknown)'
if (icon?.classList.contains('failed')) {
const error =
shadow.querySelector('.error pre')?.textContent?.trim() ?? ''
failed.push(error ? `- ${title}\n ${error}` : `- ${title}`)
} else if (icon?.classList.contains('running')) {
stuck.push(`- ${title}`)
} else if (icon?.classList.contains('pending')) {
pending.push(`- ${title}`)
}
})
const parts: string[] = []
if (failed.length)
parts.push(`${failed.length} failed:\n${failed.join('\n')}`)
if (stuck.length)
parts.push(`${stuck.length} stuck (running):\n${stuck.join('\n')}`)
if (pending.length)
parts.push(
`${pending.length} did not start (pending):\n${pending.join('\n')}`
)
expect(parts, parts.join('\n\n')).to.be.empty
})
}
function loginIfNeeded() { function loginIfNeeded() {
cy.get('login-form, tests-view', { timeout: 30000 }).should('exist') cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
@@ -42,14 +94,9 @@ context('sasjs-tests', function () {
cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click() cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
cy.get('tests-view') waitForTestsToFinish(testingFinishTimeout)
.shadow()
.find('#run-btn:disabled', {
timeout: testingFinishTimeout
})
.should('not.exist')
cy.get('test-card').shadow().find('.status-icon.failed').should('not.exist') assertNoFailedTests()
}) })
it('Should have all tests successful with debug on', () => { it('Should have all tests successful with debug on', () => {
@@ -63,13 +110,8 @@ context('sasjs-tests', function () {
cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click() cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
cy.get('tests-view') waitForTestsToFinish(testingFinishTimeout)
.shadow()
.find('#run-btn:disabled', {
timeout: testingFinishTimeout
})
.should('not.exist')
cy.get('test-card').shadow().find('.status-icon.failed').should('not.exist') assertNoFailedTests()
}) })
}) })
+104 -23
View File
@@ -8,7 +8,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@sasjs/utils": "^3.5.6", "@sasjs/utils": "^3.5.6",
"axios": "1.15.0", "axios": "1.16.0",
"axios-cookiejar-support": "5.0.5", "axios-cookiejar-support": "5.0.5",
"form-data": "4.0.4", "form-data": "4.0.4",
"https": "1.0.0", "https": "1.0.0",
@@ -86,7 +86,6 @@
"version": "7.26.9", "version": "7.26.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@ampproject/remapping": "^2.2.0", "@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.26.2", "@babel/code-frame": "^7.26.2",
@@ -131,6 +130,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/types": "^7.25.9" "@babel/types": "^7.25.9"
}, },
@@ -157,6 +157,7 @@
"version": "7.26.9", "version": "7.26.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9", "@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-member-expression-to-functions": "^7.25.9", "@babel/helper-member-expression-to-functions": "^7.25.9",
@@ -177,6 +178,7 @@
"version": "7.26.3", "version": "7.26.3",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9", "@babel/helper-annotate-as-pure": "^7.25.9",
"regexpu-core": "^6.2.0", "regexpu-core": "^6.2.0",
@@ -193,6 +195,7 @@
"version": "0.6.3", "version": "0.6.3",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-compilation-targets": "^7.22.6", "@babel/helper-compilation-targets": "^7.22.6",
"@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5",
@@ -208,6 +211,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/traverse": "^7.25.9", "@babel/traverse": "^7.25.9",
"@babel/types": "^7.25.9" "@babel/types": "^7.25.9"
@@ -248,6 +252,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/types": "^7.25.9" "@babel/types": "^7.25.9"
}, },
@@ -267,6 +272,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9", "@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-wrap-function": "^7.25.9", "@babel/helper-wrap-function": "^7.25.9",
@@ -283,6 +289,7 @@
"version": "7.26.5", "version": "7.26.5",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-member-expression-to-functions": "^7.25.9", "@babel/helper-member-expression-to-functions": "^7.25.9",
"@babel/helper-optimise-call-expression": "^7.25.9", "@babel/helper-optimise-call-expression": "^7.25.9",
@@ -299,6 +306,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/traverse": "^7.25.9", "@babel/traverse": "^7.25.9",
"@babel/types": "^7.25.9" "@babel/types": "^7.25.9"
@@ -335,6 +343,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/template": "^7.25.9", "@babel/template": "^7.25.9",
"@babel/traverse": "^7.25.9", "@babel/traverse": "^7.25.9",
@@ -374,6 +383,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
"@babel/traverse": "^7.25.9" "@babel/traverse": "^7.25.9"
@@ -389,6 +399,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -403,6 +414,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -417,6 +429,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
@@ -433,6 +446,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
"@babel/traverse": "^7.25.9" "@babel/traverse": "^7.25.9"
@@ -448,6 +462,7 @@
"version": "7.21.0-placeholder-for-preset-env.2", "version": "7.21.0-placeholder-for-preset-env.2",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
}, },
@@ -514,6 +529,7 @@
"version": "7.26.0", "version": "7.26.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -710,6 +726,7 @@
"version": "7.18.6", "version": "7.18.6",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.18.6", "@babel/helper-create-regexp-features-plugin": "^7.18.6",
"@babel/helper-plugin-utils": "^7.18.6" "@babel/helper-plugin-utils": "^7.18.6"
@@ -725,6 +742,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -739,6 +757,7 @@
"version": "7.26.8", "version": "7.26.8",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.26.5", "@babel/helper-plugin-utils": "^7.26.5",
"@babel/helper-remap-async-to-generator": "^7.25.9", "@babel/helper-remap-async-to-generator": "^7.25.9",
@@ -755,6 +774,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-module-imports": "^7.25.9", "@babel/helper-module-imports": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
@@ -771,6 +791,7 @@
"version": "7.26.5", "version": "7.26.5",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.26.5" "@babel/helper-plugin-utils": "^7.26.5"
}, },
@@ -785,6 +806,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -799,6 +821,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9", "@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -814,6 +837,7 @@
"version": "7.26.0", "version": "7.26.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9", "@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -829,6 +853,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9", "@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-compilation-targets": "^7.25.9", "@babel/helper-compilation-targets": "^7.25.9",
@@ -848,6 +873,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
"@babel/template": "^7.25.9" "@babel/template": "^7.25.9"
@@ -863,6 +889,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -877,6 +904,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9", "@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -892,6 +920,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -906,6 +935,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9", "@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -921,6 +951,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -935,6 +966,7 @@
"version": "7.26.3", "version": "7.26.3",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -949,6 +981,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -963,6 +996,7 @@
"version": "7.26.9", "version": "7.26.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.26.5", "@babel/helper-plugin-utils": "^7.26.5",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -978,6 +1012,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-compilation-targets": "^7.25.9", "@babel/helper-compilation-targets": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
@@ -994,6 +1029,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1008,6 +1044,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1022,6 +1059,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1036,6 +1074,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1050,6 +1089,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-module-transforms": "^7.25.9", "@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1065,6 +1105,7 @@
"version": "7.26.3", "version": "7.26.3",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-module-transforms": "^7.26.0", "@babel/helper-module-transforms": "^7.26.0",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1080,6 +1121,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-module-transforms": "^7.25.9", "@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
@@ -1097,6 +1139,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-module-transforms": "^7.25.9", "@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1112,6 +1155,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9", "@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1127,6 +1171,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1141,6 +1186,7 @@
"version": "7.26.6", "version": "7.26.6",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.26.5" "@babel/helper-plugin-utils": "^7.26.5"
}, },
@@ -1155,6 +1201,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1169,6 +1216,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-compilation-targets": "^7.25.9", "@babel/helper-compilation-targets": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
@@ -1185,6 +1233,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-replace-supers": "^7.25.9" "@babel/helper-replace-supers": "^7.25.9"
@@ -1200,6 +1249,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1214,6 +1264,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -1229,6 +1280,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1243,6 +1295,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9", "@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1258,6 +1311,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9", "@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-create-class-features-plugin": "^7.25.9", "@babel/helper-create-class-features-plugin": "^7.25.9",
@@ -1274,6 +1328,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1288,6 +1343,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
"regenerator-transform": "^0.15.2" "regenerator-transform": "^0.15.2"
@@ -1303,6 +1359,7 @@
"version": "7.26.0", "version": "7.26.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9", "@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1318,6 +1375,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1332,6 +1390,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1346,6 +1405,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -1361,6 +1421,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1375,6 +1436,7 @@
"version": "7.26.8", "version": "7.26.8",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.26.5" "@babel/helper-plugin-utils": "^7.26.5"
}, },
@@ -1389,6 +1451,7 @@
"version": "7.26.7", "version": "7.26.7",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.26.5" "@babel/helper-plugin-utils": "^7.26.5"
}, },
@@ -1403,6 +1466,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
}, },
@@ -1417,6 +1481,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9", "@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1432,6 +1497,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9", "@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1447,6 +1513,7 @@
"version": "7.25.9", "version": "7.25.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9", "@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9" "@babel/helper-plugin-utils": "^7.25.9"
@@ -1545,6 +1612,7 @@
"version": "0.1.6-no-external-plugins", "version": "0.1.6-no-external-plugins",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0",
"@babel/types": "^7.4.4", "@babel/types": "^7.4.4",
@@ -1558,6 +1626,7 @@
"version": "7.26.9", "version": "7.26.9",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"regenerator-runtime": "^0.14.0" "regenerator-runtime": "^0.14.0"
}, },
@@ -2187,7 +2256,6 @@
"version": "4.2.4", "version": "4.2.4",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@octokit/auth-token": "^3.0.0", "@octokit/auth-token": "^3.0.0",
"@octokit/graphql": "^5.0.0", "@octokit/graphql": "^5.0.0",
@@ -3148,7 +3216,6 @@
"version": "8.14.0", "version": "8.14.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"bin": { "bin": {
"acorn": "bin/acorn" "acorn": "bin/acorn"
}, },
@@ -3217,7 +3284,6 @@
"version": "6.12.6", "version": "6.12.6",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0", "fast-json-stable-stringify": "^2.0.0",
@@ -3461,12 +3527,12 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.15.0", "version": "1.16.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
"integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==", "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.11", "follow-redirects": "^1.16.0",
"form-data": "^4.0.5", "form-data": "^4.0.5",
"proxy-from-env": "^2.1.0" "proxy-from-env": "^2.1.0"
} }
@@ -3601,6 +3667,7 @@
"version": "0.4.12", "version": "0.4.12",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/compat-data": "^7.22.6", "@babel/compat-data": "^7.22.6",
"@babel/helper-define-polyfill-provider": "^0.6.3", "@babel/helper-define-polyfill-provider": "^0.6.3",
@@ -3614,6 +3681,7 @@
"version": "0.11.1", "version": "0.11.1",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-define-polyfill-provider": "^0.6.3", "@babel/helper-define-polyfill-provider": "^0.6.3",
"core-js-compat": "^3.40.0" "core-js-compat": "^3.40.0"
@@ -3626,6 +3694,7 @@
"version": "0.6.3", "version": "0.6.3",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-define-polyfill-provider": "^0.6.3" "@babel/helper-define-polyfill-provider": "^0.6.3"
}, },
@@ -3720,6 +3789,7 @@
"version": "5.2.2", "version": "5.2.2",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": "*" "node": "*"
} }
@@ -3938,7 +4008,6 @@
} }
], ],
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001688", "caniuse-lite": "^1.0.30001688",
"electron-to-chromium": "^1.5.73", "electron-to-chromium": "^1.5.73",
@@ -4395,7 +4464,8 @@
"node_modules/commondir": { "node_modules/commondir": {
"version": "1.0.1", "version": "1.0.1",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/compare-func": { "node_modules/compare-func": {
"version": "2.0.0", "version": "2.0.0",
@@ -4578,6 +4648,7 @@
"version": "3.40.0", "version": "3.40.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"browserslist": "^4.24.3" "browserslist": "^4.24.3"
}, },
@@ -5366,6 +5437,7 @@
"version": "3.0.0", "version": "3.0.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">= 4" "node": ">= 4"
} }
@@ -5402,7 +5474,6 @@
"version": "2.4.1", "version": "2.4.1",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"ansi-colors": "^4.1.1", "ansi-colors": "^4.1.1",
"strip-ansi": "^6.0.1" "strip-ansi": "^6.0.1"
@@ -6016,6 +6087,7 @@
"version": "3.3.2", "version": "3.3.2",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"commondir": "^1.0.1", "commondir": "^1.0.1",
"make-dir": "^3.0.2", "make-dir": "^3.0.2",
@@ -7334,7 +7406,6 @@
"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@jest/core": "^29.7.0", "@jest/core": "^29.7.0",
"@jest/types": "^29.6.3", "@jest/types": "^29.6.3",
@@ -8471,6 +8542,7 @@
"version": "2.0.4", "version": "2.0.4",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"big.js": "^5.2.2", "big.js": "^5.2.2",
"emojis-list": "^3.0.0", "emojis-list": "^3.0.0",
@@ -8504,7 +8576,8 @@
"node_modules/lodash.debounce": { "node_modules/lodash.debounce": {
"version": "4.0.8", "version": "4.0.8",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/lodash.escaperegexp": { "node_modules/lodash.escaperegexp": {
"version": "4.1.2", "version": "4.1.2",
@@ -8634,6 +8707,7 @@
"version": "3.1.0", "version": "3.1.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"semver": "^6.0.0" "semver": "^6.0.0"
}, },
@@ -8674,7 +8748,6 @@
"version": "4.3.0", "version": "4.3.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"bin": { "bin": {
"marked": "bin/marked.js" "marked": "bin/marked.js"
}, },
@@ -12666,12 +12739,14 @@
"node_modules/regenerate": { "node_modules/regenerate": {
"version": "1.4.2", "version": "1.4.2",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/regenerate-unicode-properties": { "node_modules/regenerate-unicode-properties": {
"version": "10.2.0", "version": "10.2.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"regenerate": "^1.4.2" "regenerate": "^1.4.2"
}, },
@@ -12682,12 +12757,14 @@
"node_modules/regenerator-runtime": { "node_modules/regenerator-runtime": {
"version": "0.14.1", "version": "0.14.1",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/regenerator-transform": { "node_modules/regenerator-transform": {
"version": "0.15.2", "version": "0.15.2",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@babel/runtime": "^7.8.4" "@babel/runtime": "^7.8.4"
} }
@@ -12696,6 +12773,7 @@
"version": "6.2.0", "version": "6.2.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"regenerate": "^1.4.2", "regenerate": "^1.4.2",
"regenerate-unicode-properties": "^10.2.0", "regenerate-unicode-properties": "^10.2.0",
@@ -12722,12 +12800,14 @@
"node_modules/regjsgen": { "node_modules/regjsgen": {
"version": "0.8.0", "version": "0.8.0",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/regjsparser": { "node_modules/regjsparser": {
"version": "0.12.0", "version": "0.12.0",
"dev": true, "dev": true,
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"peer": true,
"dependencies": { "dependencies": {
"jsesc": "~3.0.2" "jsesc": "~3.0.2"
}, },
@@ -12739,6 +12819,7 @@
"version": "3.0.2", "version": "3.0.2",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"bin": { "bin": {
"jsesc": "bin/jsesc" "jsesc": "bin/jsesc"
}, },
@@ -12950,6 +13031,7 @@
"version": "2.7.1", "version": "2.7.1",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@types/json-schema": "^7.0.5", "@types/json-schema": "^7.0.5",
"ajv": "^6.12.4", "ajv": "^6.12.4",
@@ -12967,7 +13049,6 @@
"version": "19.0.3", "version": "19.0.3",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@semantic-release/commit-analyzer": "^9.0.2", "@semantic-release/commit-analyzer": "^9.0.2",
"@semantic-release/error": "^3.0.0", "@semantic-release/error": "^3.0.0",
@@ -14013,7 +14094,6 @@
"node_modules/tough-cookie": { "node_modules/tough-cookie": {
"version": "4.1.3", "version": "4.1.3",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"peer": true,
"dependencies": { "dependencies": {
"psl": "^1.1.33", "psl": "^1.1.33",
"punycode": "^2.1.1", "punycode": "^2.1.1",
@@ -14433,7 +14513,6 @@
"integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
"dev": true, "dev": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"peer": true,
"bin": { "bin": {
"tsc": "bin/tsc", "tsc": "bin/tsc",
"tsserver": "bin/tsserver" "tsserver": "bin/tsserver"
@@ -14458,6 +14537,7 @@
"version": "2.0.1", "version": "2.0.1",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=4" "node": ">=4"
} }
@@ -14466,6 +14546,7 @@
"version": "2.0.0", "version": "2.0.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"unicode-canonical-property-names-ecmascript": "^2.0.0", "unicode-canonical-property-names-ecmascript": "^2.0.0",
"unicode-property-aliases-ecmascript": "^2.0.0" "unicode-property-aliases-ecmascript": "^2.0.0"
@@ -14478,6 +14559,7 @@
"version": "2.2.0", "version": "2.2.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=4" "node": ">=4"
} }
@@ -14486,6 +14568,7 @@
"version": "2.1.0", "version": "2.1.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=4" "node": ">=4"
} }
@@ -14745,7 +14828,6 @@
"version": "5.76.2", "version": "5.76.2",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@types/eslint-scope": "^3.7.3", "@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51", "@types/estree": "^0.0.51",
@@ -14792,7 +14874,6 @@
"version": "4.9.2", "version": "4.9.2",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@discoveryjs/json-ext": "^0.5.0", "@discoveryjs/json-ext": "^0.5.0",
"@webpack-cli/configtest": "^1.1.1", "@webpack-cli/configtest": "^1.1.1",
+1 -1
View File
@@ -77,7 +77,7 @@
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"@sasjs/utils": "^3.5.6", "@sasjs/utils": "^3.5.6",
"axios": "1.15.0", "axios": "1.16.0",
"axios-cookiejar-support": "5.0.5", "axios-cookiejar-support": "5.0.5",
"form-data": "4.0.4", "form-data": "4.0.4",
"https": "1.0.0", "https": "1.0.0",
+26 -9
View File
@@ -12,6 +12,31 @@
"vite": "npm:rolldown-vite@7.2.2" "vite": "npm:rolldown-vite@7.2.2"
} }
}, },
"node_modules/@emnapi/core": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
"integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"dependencies": {
"@emnapi/wasi-threads": "1.2.1",
"tslib": "^2.4.0"
}
},
"node_modules/@emnapi/runtime": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
"integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"dependencies": {
"tslib": "^2.4.0"
}
},
"node_modules/@emnapi/wasi-threads": { "node_modules/@emnapi/wasi-threads": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
@@ -19,6 +44,7 @@
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.4.0" "tslib": "^2.4.0"
} }
@@ -642,7 +668,6 @@
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"dev": true, "dev": true,
"peer": true,
"engines": { "engines": {
"node": ">=12" "node": ">=12"
}, },
@@ -756,14 +781,6 @@
"node": ">=14.17" "node": ">=14.17"
} }
}, },
"node_modules/undici-types": {
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
"integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
"dev": true,
"license": "MIT",
"optional": true
},
"node_modules/vite": { "node_modules/vite": {
"name": "rolldown-vite", "name": "rolldown-vite",
"version": "7.2.2", "version": "7.2.2",
+2 -2
View File
@@ -4,8 +4,8 @@
"sasJsConfig": { "sasJsConfig": {
"loginMechanism": "Redirected", "loginMechanism": "Redirected",
"serverUrl": "", "serverUrl": "",
"appLoc": "/Public/app/adapter-tests/services", "appLoc": "/Public/app/adapter-tests",
"serverType": "SASVIYA", "serverType": "SASJS",
"debug": false, "debug": false,
"contextName": "SAS Job Execution compute context", "contextName": "SAS Job Execution compute context",
"useComputeApi": true "useComputeApi": true
+32 -1
View File
@@ -72,7 +72,7 @@ export class TestCard extends HTMLElement {
? ` ? `
<div class="error"> <div class="error">
<strong>Error:</strong> <strong>Error:</strong>
<pre>${(error as Error).message || String(error)}</pre> <pre>${formatError(error)}</pre>
</div> </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) customElements.define('test-card', TestCard)
+4 -2
View File
@@ -66,10 +66,11 @@ export class TestSuiteElement extends HTMLElement {
const passed = completedTests.filter((t) => t.status === 'passed').length const passed = completedTests.filter((t) => t.status === 'passed').length
const failed = completedTests.filter((t) => t.status === 'failed').length const failed = completedTests.filter((t) => t.status === 'failed').length
const running = completedTests.filter((t) => t.status === 'running').length const running = completedTests.filter((t) => t.status === 'running').length
const pending = completedTests.filter((t) => t.status === 'pending').length
const statsEl = this.shadow.querySelector('.stats') const statsEl = this.shadow.querySelector('.stats')
if (statsEl) { if (statsEl) {
statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running}` statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}`
} }
} }
@@ -80,11 +81,12 @@ export class TestSuiteElement extends HTMLElement {
const passed = completedTests.filter((t) => t.status === 'passed').length const passed = completedTests.filter((t) => t.status === 'passed').length
const failed = completedTests.filter((t) => t.status === 'failed').length const failed = completedTests.filter((t) => t.status === 'failed').length
const running = completedTests.filter((t) => t.status === 'running').length const running = completedTests.filter((t) => t.status === 'running').length
const pending = completedTests.filter((t) => t.status === 'pending').length
this.shadow.innerHTML = ` this.shadow.innerHTML = `
<div class="header"> <div class="header">
<h2>${name}</h2> <h2>${name}</h2>
<div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running}</div> <div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}</div>
</div> </div>
<div class="tests" id="tests-container"></div> <div class="tests" id="tests-container"></div>
` `
+26 -9
View File
@@ -30,12 +30,14 @@ export class TestRunner {
) => void ) => void
): Promise<CompletedTestSuite[]> { ): Promise<CompletedTestSuite[]> {
this.isRunning = true this.isRunning = true
this.completedTestSuites = [] this.completedTestSuites = this.testSuites.map((suite) => ({
name: suite.name,
completedTests: []
}))
for (let i = 0; i < this.testSuites.length; i++) { await Promise.allSettled(
const suite = this.testSuites[i] this.testSuites.map((suite, i) => this.runTestSuite(suite, i, onUpdate))
await this.runTestSuite(suite, i, onUpdate) )
}
this.isRunning = false this.isRunning = false
return this.completedTestSuites return this.completedTestSuites
@@ -49,7 +51,23 @@ export class TestRunner {
currentIndex: number currentIndex: number
) => void ) => void
): Promise<CompletedTestSuite> { ): Promise<CompletedTestSuite> {
const completedTests: CompletedTest[] = [] // Seed all tests as pending so every card renders before any run starts.
const completedTests: CompletedTest[] = suite.tests.map((test) => ({
test,
result: false,
error: null,
executionTime: 0,
status: 'pending'
}))
if (onUpdate) {
this.completedTestSuites[suiteIndex] = {
name: suite.name,
completedTests: [...completedTests]
}
onUpdate([...this.completedTestSuites], suiteIndex * 1000)
}
let context: unknown let context: unknown
// Run beforeAll if exists // Run beforeAll if exists
@@ -62,15 +80,14 @@ export class TestRunner {
const test = suite.tests[i] const test = suite.tests[i]
const currentIndex = suiteIndex * 1000 + i const currentIndex = suiteIndex * 1000 + i
// Set status to running // Flip pending → running
const runningTest: CompletedTest = { completedTests[i] = {
test, test,
result: false, result: false,
error: null, error: null,
executionTime: 0, executionTime: 0,
status: 'running' status: 'running'
} }
completedTests.push(runningTest)
// Notify update // Notify update
if (onUpdate) { if (onUpdate) {
+5 -2
View File
@@ -22,6 +22,8 @@ import { sendArrTests, sendObjTests } from './testSuites/RequestData'
import { fileUploadTests } from './testSuites/FileUpload' import { fileUploadTests } from './testSuites/FileUpload'
import { computeTests } from './testSuites/Compute' import { computeTests } from './testSuites/Compute'
import { sasjsRequestTests } from './testSuites/SasjsRequests' import { sasjsRequestTests } from './testSuites/SasjsRequests'
import { specialCaseTests } from './testSuites/SpecialCases'
import { executionTasksTests } from './testSuites/executionTasks'
async function init() { async function init() {
const appContainer = document.getElementById('app') const appContainer = document.getElementById('app')
@@ -98,13 +100,14 @@ function showTests(
// basicTests(adapter, configTyped.userName || '', configTyped.password || ''), // basicTests(adapter, configTyped.userName || '', configTyped.password || ''),
sendArrTests(adapter, appLoc), sendArrTests(adapter, appLoc),
sendObjTests(adapter), sendObjTests(adapter),
// specialCaseTests(adapter), specialCaseTests(adapter),
sasjsRequestTests(adapter), sasjsRequestTests(adapter),
fileUploadTests(adapter) fileUploadTests(adapter)
] ]
// Add compute tests for SASVIYA only // Add tests for SASVIYA only
if (adapter.getSasjsConfig().serverType === 'SASVIYA') { if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
testSuites.push(executionTasksTests(adapter))
testSuites.push(computeTests(adapter, appLoc)) testSuites.push(computeTests(adapter, appLoc))
} }
+11 -3
View File
@@ -77,7 +77,7 @@ export const basicTests = (
await adapter.logOut() await adapter.logOut()
return await adapter.request( return await adapter.request(
'common/sendArr', 'services/common/sendArr',
stringData, stringData,
undefined, undefined,
async () => { async () => {
@@ -97,7 +97,11 @@ export const basicTests = (
useComputeApi: false useComputeApi: false
} }
return await adapter.request('common/sendArr', stringData, config) return await adapter.request(
'services/common/sendArr',
stringData,
config
)
}, },
assertion: (response: any) => { assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1 return response.table1[0][0] === stringData.table1[0].col1
@@ -112,7 +116,11 @@ export const basicTests = (
debug: true debug: true
} }
return await adapter.request('common/sendArr', stringData, config) return await adapter.request(
'services/common/sendArr',
stringData,
config
)
}, },
assertion: (response: any) => { assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1 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', title: 'Compute API request',
description: 'Should run the request with compute API approach', description: 'Should run the request with compute API approach',
test: async () => { test: async () => {
return await adapter.request('common/sendArr', stringData) return await adapter.request('services/common/sendArr', stringData)
}, },
assertion: (response: any) => { assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1 return response.table1[0][0] === stringData.table1[0].col1
@@ -25,7 +25,11 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
useComputeApi: false useComputeApi: false
} }
return await adapter.request('common/sendArr', stringData, config) return await adapter.request(
'services/common/sendArr',
stringData,
config
)
}, },
assertion: (response: any) => { assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1 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', description: 'Should start a compute job and return the session',
test: () => { test: () => {
const data: any = { table1: [{ col1: 'first col value' }] } 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) => { assertion: (res: any) => {
const expectedProperties = ['id', 'applicationName', 'attributes'] const expectedProperties = ['id', 'applicationName', 'attributes']
@@ -49,7 +56,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
test: () => { test: () => {
const data: any = { table1: [{ col1: 'first col value' }] } const data: any = { table1: [{ col1: 'first col value' }] }
return adapter.startComputeJob( return adapter.startComputeJob(
`${appLoc}/common/sendArr`, `${appLoc}/services/common/sendArr`,
data, data,
{}, {},
undefined, 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) => assertion: (response: any) =>
(response.macvars as any[]).findIndex( (response.macvars as any[]).findIndex(
+29 -21
View File
@@ -53,7 +53,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Absolute paths', title: 'Absolute paths',
description: 'Should work with absolute paths to SAS jobs', description: 'Should work with absolute paths to SAS jobs',
test: () => { test: () => {
return adapter.request(`${appLoc}/common/sendArr`, stringData) return adapter.request(`${appLoc}/services/common/sendArr`, stringData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0][0] === stringData.table1[0].col1 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', title: 'Single string value',
description: 'Should send an array with a single string value', description: 'Should send an array with a single string value',
test: () => { test: () => {
return adapter.request('common/sendArr', stringData) return adapter.request('services/common/sendArr', stringData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0][0] === stringData.table1[0].col1 return res.table1[0][0] === stringData.table1[0].col1
@@ -74,7 +74,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
description: description:
'Should send an array with a long string value under 32765 characters', 'Should send an array with a long string value under 32765 characters',
test: () => { test: () => {
return adapter.request('common/sendArr', getLongStringData()) return adapter.request('services/common/sendArr', getLongStringData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const longStringData = getLongStringData() 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', 'Should error out with long string values over 32765 characters',
test: () => { test: () => {
const data = getLongStringData(32767) 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) => { assertion: (error: any) => {
return !!error && !!error.error && !!error.error.message return !!error && !!error.error && !!error.error.message
@@ -97,7 +99,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Single numeric value', title: 'Single numeric value',
description: 'Should send an array with a single numeric value', description: 'Should send an array with a single numeric value',
test: () => { test: () => {
return adapter.request('common/sendArr', numericData) return adapter.request('services/common/sendArr', numericData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0][0] === numericData.table1[0].col1 return res.table1[0][0] === numericData.table1[0].col1
@@ -107,7 +109,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple columns', title: 'Multiple columns',
description: 'Should handle data with multiple columns', description: 'Should handle data with multiple columns',
test: () => { test: () => {
return adapter.request('common/sendArr', multiColumnData) return adapter.request('services/common/sendArr', multiColumnData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -122,7 +124,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple rows with nulls', title: 'Multiple rows with nulls',
description: 'Should handle data with multiple rows with null values', description: 'Should handle data with multiple rows with null values',
test: () => { test: () => {
return adapter.request('common/sendArr', multipleRowsWithNulls) return adapter.request('services/common/sendArr', multipleRowsWithNulls)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let result = true let result = true
@@ -148,7 +150,10 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple columns with nulls', title: 'Multiple columns with nulls',
description: 'Should handle data with multiple columns with null values', description: 'Should handle data with multiple columns with null values',
test: () => { test: () => {
return adapter.request('common/sendArr', multipleColumnsWithNulls) return adapter.request(
'services/common/sendArr',
multipleColumnsWithNulls
)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let result = true let result = true
@@ -184,7 +189,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'1InvalidTable': [{ col1: 42 }] '1InvalidTable': [{ col1: 42 }]
} }
return adapter return adapter
.request('common/sendObj', invalidData) .request('services/common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -198,7 +203,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'an invalidTable': [{ col1: 42 }] 'an invalidTable': [{ col1: 42 }]
} }
return adapter return adapter
.request('common/sendObj', invalidData) .request('services/common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -212,7 +217,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'anInvalidTable#': [{ col1: 42 }] 'anInvalidTable#': [{ col1: 42 }]
} }
return adapter return adapter
.request('common/sendObj', invalidData) .request('services/common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -227,7 +232,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
} }
return adapter return adapter
.request('common/sendObj', invalidData) .request('services/common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -241,7 +246,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
inData: [[{ data: 'value' }]] inData: [[{ data: 'value' }]]
} }
return adapter return adapter
.request('common/sendObj', invalidData) .request('services/common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -251,7 +256,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Single string value', title: 'Single string value',
description: 'Should send an object with a single string value', description: 'Should send an object with a single string value',
test: () => { test: () => {
return adapter.request('common/sendObj', stringData) return adapter.request('services/common/sendObj', stringData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0].COL1 === stringData.table1[0].col1 return res.table1[0].COL1 === stringData.table1[0].col1
@@ -262,7 +267,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
description: description:
'Should send an object with a long string value under 32765 characters', 'Should send an object with a long string value under 32765 characters',
test: () => { test: () => {
return adapter.request('common/sendObj', getLongStringData()) return adapter.request('services/common/sendObj', getLongStringData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const longStringData = getLongStringData() const longStringData = getLongStringData()
@@ -275,7 +280,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'Should error out with long string values over 32765 characters', 'Should error out with long string values over 32765 characters',
test: () => { test: () => {
return adapter return adapter
.request('common/sendObj', getLongStringData(32767)) .request('services/common/sendObj', getLongStringData(32767))
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => { assertion: (error: any) => {
@@ -286,7 +291,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Single numeric value', title: 'Single numeric value',
description: 'Should send an object with a single numeric value', description: 'Should send an object with a single numeric value',
test: () => { test: () => {
return adapter.request('common/sendObj', numericData) return adapter.request('services/common/sendObj', numericData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0].COL1 === numericData.table1[0].col1 return res.table1[0].COL1 === numericData.table1[0].col1
@@ -297,7 +302,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Large data volume', title: 'Large data volume',
description: 'Should send an object with a large amount of data', description: 'Should send an object with a large amount of data',
test: () => { test: () => {
return adapter.request('common/sendObj', getLargeObjectData()) return adapter.request('services/common/sendObj', getLargeObjectData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getLargeObjectData() const data = getLargeObjectData()
@@ -308,7 +313,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple columns', title: 'Multiple columns',
description: 'Should handle data with multiple columns', description: 'Should handle data with multiple columns',
test: () => { test: () => {
return adapter.request('common/sendObj', multiColumnData) return adapter.request('services/common/sendObj', multiColumnData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -323,7 +328,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple rows with nulls', title: 'Multiple rows with nulls',
description: 'Should handle data with multiple rows with null values', description: 'Should handle data with multiple rows with null values',
test: () => { test: () => {
return adapter.request('common/sendObj', multipleRowsWithNulls) return adapter.request('services/common/sendObj', multipleRowsWithNulls)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let result = true let result = true
@@ -349,7 +354,10 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple columns with nulls', title: 'Multiple columns with nulls',
description: 'Should handle data with multiple columns with null values', description: 'Should handle data with multiple columns with null values',
test: () => { test: () => {
return adapter.request('common/sendObj', multipleColumnsWithNulls) return adapter.request(
'services/common/sendObj',
multipleColumnsWithNulls
)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let result = true let result = true
+2 -2
View File
@@ -11,7 +11,7 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
title: 'WORK tables', title: 'WORK tables',
description: 'Should get WORK tables after request', description: 'Should get WORK tables after request',
test: async () => { test: async () => {
return adapter.request('common/sendArr', data) return adapter.request('services/common/sendArr', data)
}, },
assertion: () => { assertion: () => {
const requests = adapter.getSasRequests() 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', // 'Should make an error and capture log, in the same time it is testing if debug override is working',
// test: async () => { // test: async () => {
// return adapter // return adapter
// .request('common/makeErr', data, { debug: true }) // .request('services/common/makeErr', data, { debug: true })
// .catch(() => { // .catch(() => {
// const sasRequests = adapter.getSasRequests() // const sasRequests = adapter.getSasRequests()
// const makeErrRequest: any = // const makeErrRequest: any =
+17 -14
View File
@@ -111,7 +111,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Common special characters', title: 'Common special characters',
description: 'Should handle common special characters', description: 'Should handle common special characters',
test: () => { test: () => {
return adapter.request('common/sendArr', specialCharData) return adapter.request('services/common/sendArr', specialCharData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -133,7 +133,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Other special characters', title: 'Other special characters',
description: 'Should handle other special characters', description: 'Should handle other special characters',
test: () => { test: () => {
return adapter.request('common/sendArr', moreSpecialCharData) return adapter.request('services/common/sendArr', moreSpecialCharData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
// If sas session is `latin9` or `wlatin1` we can't process the special characters, // 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', title: 'Wide table with sendArr',
description: 'Should handle data with 10000 columns', description: 'Should handle data with 10000 columns',
test: () => { test: () => {
return adapter.request('common/sendArr', getWideData()) return adapter.request('services/common/sendArr', getWideData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getWideData() const data = getWideData()
@@ -185,7 +185,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Wide table with sendObj', title: 'Wide table with sendObj',
description: 'Should handle data with 10000 columns', description: 'Should handle data with 10000 columns',
test: () => { test: () => {
return adapter.request('common/sendObj', getWideData()) return adapter.request('services/common/sendObj', getWideData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getWideData() const data = getWideData()
@@ -202,7 +202,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple tables', title: 'Multiple tables',
description: 'Should handle data with 100 tables', description: 'Should handle data with 100 tables',
test: () => { test: () => {
return adapter.request('common/sendArr', getTables()) return adapter.request('services/common/sendArr', getTables())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getTables() const data = getTables()
@@ -222,7 +222,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Large dataset with sendObj', title: 'Large dataset with sendObj',
description: 'Should handle 5mb of data', description: 'Should handle 5mb of data',
test: () => { test: () => {
return adapter.request('common/sendObj', getLargeDataset()) return adapter.request('services/common/sendObj', getLargeDataset())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getLargeDataset() const data = getLargeDataset()
@@ -237,7 +237,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Large dataset with sendArr', title: 'Large dataset with sendArr',
description: 'Should handle 5mb of data', description: 'Should handle 5mb of data',
test: () => { test: () => {
return adapter.request('common/sendArr', getLargeDataset()) return adapter.request('services/common/sendArr', getLargeDataset())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getLargeDataset() const data = getLargeDataset()
@@ -253,7 +253,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Error and _csrf tables with sendArr', title: 'Error and _csrf tables with sendArr',
description: 'Should handle error and _csrf tables', description: 'Should handle error and _csrf tables',
test: () => { test: () => {
return adapter.request('common/sendArr', errorAndCsrfData) return adapter.request('services/common/sendArr', errorAndCsrfData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -272,7 +272,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Error and _csrf tables with sendObj', title: 'Error and _csrf tables with sendObj',
description: 'Should handle error and _csrf tables', description: 'Should handle error and _csrf tables',
test: () => { test: () => {
return adapter.request('common/sendObj', errorAndCsrfData) return adapter.request('services/common/sendObj', errorAndCsrfData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -300,7 +300,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
} }
return await adapter.request( return await adapter.request(
'common/sendArr', 'services/common/sendArr',
stringData, stringData,
config, config,
undefined, undefined,
@@ -319,7 +319,10 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Special missing values', title: 'Special missing values',
description: 'Should support special missing values', description: 'Should support special missing values',
test: () => { test: () => {
return adapter.request('common/sendObj', testTableWithSpecialNumeric) return adapter.request(
'services/common/sendObj',
testTableWithSpecialNumeric
)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let assertionRes = true let assertionRes = true
@@ -365,7 +368,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when one row is send', 'Should support special missing values, when one row is send',
test: () => { test: () => {
return adapter.request( return adapter.request(
'common/sendObj', 'services/common/sendObj',
testTableWithSpecialNumericOneRow testTableWithSpecialNumericOneRow
) )
}, },
@@ -413,7 +416,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when LOWERCASE value is sent', 'Should support special missing values, when LOWERCASE value is sent',
test: () => { test: () => {
return adapter.request( return adapter.request(
'common/sendObj', 'services/common/sendObj',
testTableWithSpecialNumericLowercase 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)', 'Should support special missing values, when one row is send (On VIYA Web Approach)',
test: () => { test: () => {
return adapter.request( return adapter.request(
'common/sendObj', 'services/common/sendObj',
testTableWithSpecialNumericOneRow, testTableWithSpecialNumericOneRow,
{ useComputeApi: undefined } { useComputeApi: undefined }
) )
@@ -0,0 +1,126 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import SASjs from '@sasjs/adapter'
import type { TestSuite } from '../types'
const tableData: any = { table1: [{ col1: 'first col value' }] }
const fileData: any = { table1: [{ col1: 'value with ; semicolon' }] }
const multiTableData: any = {
table1: [{ col1: 'first col value' }],
table2: [{ col2: 'second table value' }]
}
const multiFileData: any = {
table1: [{ col1: 'value with ; semicolon' }],
table2: [{ col2: 'another; value' }]
}
const taskConfig: any = { useComputeApi: null, runAsTask: true }
const noTaskConfig: any = { useComputeApi: null, runAsTask: false }
export const executionTasksTests = (adapter: SASjs): TestSuite => ({
name: 'runAsTask behaviour',
tests: [
{
title: 'no inputs (runAsTask=false)',
description: 'no payload, runAsTask explicitly disabled',
test: () =>
adapter
.request('services/common/sendArr', null, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'no inputs (runAsTask=true)',
description: 'no payload, runAsTask=true via config',
test: () =>
adapter
.request('services/common/sendArr', null, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'one input table (runAsTask=false)',
description: 'single table payload, runAsTask explicitly disabled',
test: () =>
adapter
.request('services/common/sendArr', tableData, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'one input table (runAsTask=true)',
description: 'single table payload, runAsTask=true via config',
test: () =>
adapter
.request('services/common/sendArr', tableData, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'multiple input tables (runAsTask=false)',
description: 'multi-table payload, runAsTask explicitly disabled',
test: () =>
adapter
.request('services/common/sendArr', multiTableData, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'multiple input tables (runAsTask=true)',
description: 'multi-table payload, runAsTask=true via config',
test: () =>
adapter
.request('services/common/sendArr', multiTableData, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'semicolon payload, single table, blob path (runAsTask=false)',
description: 'semicolon payload routes through blob path, runAsTask off',
test: () =>
adapter
.request('services/common/sendArr', fileData, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'semicolon payload, single table, blob path (runAsTask=true)',
description:
'semicolon payload (single table) routes through blob path, runAsTask=true',
test: () =>
adapter
.request('services/common/sendArr', fileData, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'semicolon payload, multi-table, blob path (runAsTask=false)',
description:
'semicolon payload (multi-table) routes through blob path, runAsTask off',
test: () =>
adapter
.request('services/common/sendArr', multiFileData, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'semicolon payload, multi-table, blob path (runAsTask=true)',
description:
'semicolon payload (multi-table) routes through blob path, runAsTask=true',
test: () =>
adapter
.request('services/common/sendArr', multiFileData, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
}
]
})
+7 -1
View File
@@ -1031,11 +1031,17 @@ export class SASViyaApiClient {
jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName 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 = { const postJobRequestBody = {
name: `exec-${jobName}`, name: `exec-${jobName}`,
description: 'Powered by SASjs', description: 'Powered by SASjs',
jobDefinition, jobDefinition,
arguments: jobArguments arguments: stringifiedArguments
} }
const { result: postedJob } = await this.requestClient.post<Job>( const { result: postedJob } = await this.requestClient.post<Job>(
+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 () => { it('should throw an error when the CSV exceeds the maximum length', async () => {
const data = { foo: 'bar' } const data = { foo: 'bar' }
jest jest
+5 -1
View File
@@ -1,6 +1,6 @@
import { prefixMessage } from '@sasjs/utils/error' import { prefixMessage } from '@sasjs/utils/error'
import { RequestClient } from '../../request/RequestClient' import { RequestClient } from '../../request/RequestClient'
import { convertToCSV } from '../../utils/convertToCsv' import { convertToCSV, isFormatsTable } from '../../utils/convertToCsv'
/** /**
* Uploads tables to SAS as specially formatted CSVs. * Uploads tables to SAS as specially formatted CSVs.
@@ -18,6 +18,10 @@ export async function uploadTables(
const uploadedFiles = [] const uploadedFiles = []
for (const tableName in data) { 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) const csv = convertToCSV(data, tableName)
if (csv === 'ERROR: LARGE STRING LENGTH') { if (csv === 'ERROR: LARGE STRING LENGTH') {
throw new Error( throw new Error(
+7
View File
@@ -11,6 +11,13 @@ export const generateTableUploadForm = (
let tableCounter = 0 let tableCounter = 0
for (const tableName in data) { for (const tableName in data) {
if (
isFormatsTable(tableName) &&
Object.keys(data).includes(tableName.replace(/^\$/, ''))
) {
continue
}
tableCounter++ tableCounter++
// Formats table should not be sent as part of 'sasjs_tables' // Formats table should not be sent as part of 'sasjs_tables'
@@ -0,0 +1,71 @@
import { generateTableUploadForm } from '../generateTableUploadForm'
import { convertToCSV } from '../../utils/convertToCsv'
import NodeFormData from 'form-data'
describe('generateTableUploadForm', () => {
it('should skip formats table and emit single sasjs1data for paired data + $data', () => {
const tableName = 'jsdata'
const data: { [key: string]: any } = {
[tableName]: [
{ var1: 'string', var2: 232 },
{ var1: 'string', var2: 233 }
],
[`$${tableName}`]: { formats: { var1: '$char12.', var2: 'best.' } }
}
const expectedCsv = convertToCSV(data, tableName)
const formData = new NodeFormData()
const { requestParams } = generateTableUploadForm(formData, data)
expect(requestParams.sasjs_tables).toBe(tableName)
expect(requestParams.sasjs1data).toBe(expectedCsv)
expect(requestParams.sasjs2data).toBeUndefined()
})
it('should number sequentially across multiple tables w/ paired formats', () => {
const data: { [key: string]: any } = {
tableA: [{ a: 1 }],
$tableA: { formats: { a: 'best.' } },
tableB: [{ b: 'x' }],
$tableB: { formats: { b: '$char1.' } }
}
const expectedCsvA = convertToCSV(data, 'tableA')
const expectedCsvB = convertToCSV(data, 'tableB')
const formData = new NodeFormData()
const { requestParams } = generateTableUploadForm(formData, data)
expect(requestParams.sasjs_tables).toBe('tableA tableB')
expect(requestParams.sasjs1data).toBe(expectedCsvA)
expect(requestParams.sasjs2data).toBe(expectedCsvB)
expect(requestParams.sasjs3data).toBeUndefined()
})
it('should throw if string value exceeds 32765 chars', () => {
const formData = new NodeFormData()
const data = { testTable: [{ var1: 'z'.repeat(32766) }] }
expect(() => generateTableUploadForm(formData, data)).toThrow(
new Error(
'The max length of a string value in SASjs is 32765 characters.'
)
)
})
it('should append chunks to formData when csv exceeds 16k', () => {
const tableName = 'big'
const data = { [tableName]: [{ var1: 'z'.repeat(16001) }] }
const formData = new NodeFormData()
const appendSpy = jest.spyOn(formData, 'append')
const { requestParams } = generateTableUploadForm(formData, data)
expect(requestParams.sasjs_tables).toBe(tableName)
expect(requestParams.sasjs1data).toBeUndefined()
expect(appendSpy).toHaveBeenCalled()
expect(appendSpy.mock.calls.every(([key]) => key === 'sasjs1data')).toBe(
true
)
})
})
-1
View File
@@ -55,7 +55,6 @@ export abstract class BaseJobExecutor implements JobExecutor {
if (config.debug) { if (config.debug) {
requestParams['_omittextlog'] = 'false' requestParams['_omittextlog'] = 'false'
requestParams['_omitSessionResults'] = 'false' requestParams['_omitSessionResults'] = 'false'
requestParams['_debug'] = 131 requestParams['_debug'] = 131
} }
+78 -6
View File
@@ -16,9 +16,11 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
import { import {
isRelativePath, isRelativePath,
parseSasViyaDebugResponse, parseSasViyaDebugResponse,
parseSasViyaLogDebugResponse,
appendExtraResponseAttributes, appendExtraResponseAttributes,
parseWeboutResponse, parseWeboutResponse,
getFormData getFormData,
isNode
} from '../utils' } from '../utils'
import { BaseJobExecutor } from './JobExecutor' import { BaseJobExecutor } from './JobExecutor'
@@ -101,6 +103,10 @@ export class WebJobExecutor extends BaseJobExecutor {
apiUrl += config.contextName?.trim() apiUrl += config.contextName?.trim()
? `&_contextname=${encodeURIComponent(config.contextName)}` ? `&_contextname=${encodeURIComponent(config.contextName)}`
: '' : ''
if (config.runAsTask === true) {
apiUrl += '&_executionTasks=true'
}
} }
let requestParams = { let requestParams = {
@@ -113,6 +119,26 @@ export class WebJobExecutor extends BaseJobExecutor {
*/ */
let formData = getFormData() let formData = getFormData()
// FIXME(viya - SAS Track CS0409737): remove when Viya stops rejecting empty multipart on
// _executionTasks=true. Dummy file keeps the body non-empty
const hasExecutionTasksFlag = config.runAsTask === true
// Move debug params to URL for viya; viya seems to honor them more
// reliably in the query string than the multipart body.
if (
hasExecutionTasksFlag &&
config.debug &&
config.serverType === ServerType.SasViya
) {
const debugKeys = ['_debug', '_omitSessionResults']
debugKeys.forEach((key) => {
if (requestParams[key] !== undefined) {
apiUrl += `&${key}=${encodeURIComponent(requestParams[key])}`
delete requestParams[key]
}
})
}
if (data) { if (data) {
const stringifiedData = JSON.stringify(data) const stringifiedData = JSON.stringify(data)
if ( if (
@@ -133,10 +159,21 @@ export class WebJobExecutor extends BaseJobExecutor {
generateTableUploadForm(formData, data) generateTableUploadForm(formData, data)
formData = newFormData formData = newFormData
requestParams = { ...requestParams, ...params } requestParams = { ...requestParams, ...params }
if (
config.serverType === ServerType.SasViya &&
hasExecutionTasksFlag
) {
addDummyFile(formData)
}
} catch (e: any) { } catch (e: any) {
return Promise.reject(new ErrorResponse(e?.message, e)) return Promise.reject(new ErrorResponse(e?.message, e))
} }
} }
} else {
if (config.serverType === ServerType.SasViya && hasExecutionTasksFlag) {
addDummyFile(formData)
}
} }
for (const key in requestParams) { for (const key in requestParams) {
@@ -168,11 +205,14 @@ export class WebJobExecutor extends BaseJobExecutor {
if (config.debug) { if (config.debug) {
switch (this.serverType) { switch (this.serverType) {
case ServerType.SasViya: case ServerType.SasViya:
jsonResponse = await parseSasViyaDebugResponse( jsonResponse =
res.result, config.useComputeApi === null && config.runAsTask === true
this.requestClient, ? await parseSasViyaLogDebugResponse(res.result)
this.serverUrl : await parseSasViyaDebugResponse(
) res.result,
this.requestClient,
this.serverUrl
)
break break
case ServerType.Sas9: case ServerType.Sas9:
jsonResponse = jsonResponse =
@@ -231,6 +271,23 @@ export class WebJobExecutor extends BaseJobExecutor {
return requestPromise return requestPromise
} }
protected getRequestParams(config: any): any {
const requestParams = super.getRequestParams(config)
// FIXME(viya - possible issue with default debug flags)
// runAsTask on Viya: use _debug=128 (not 131) and omit _omittextlog
if (
config.debug &&
config.serverType === ServerType.SasViya &&
config.runAsTask === true
) {
requestParams['_debug'] = 128
delete requestParams['_omittextlog']
}
return requestParams
}
private async getJobUri(sasJob: string) { private async getJobUri(sasJob: string) {
if (!this.sasViyaApiClient) return '' if (!this.sasViyaApiClient) return ''
let uri = '' let uri = ''
@@ -263,3 +320,18 @@ export class WebJobExecutor extends BaseJobExecutor {
return uri return uri
} }
} }
function addDummyFile(formData: NodeFormData | FormData) {
if (isNode()) {
;(formData as NodeFormData).append('_sasjs_noop', '', {
filename: '_sasjs_noop.txt',
contentType: 'text/plain'
})
} else {
;(formData as FormData).append(
'_sasjs_noop',
new Blob([''], { type: 'text/plain' }),
'_sasjs_noop.txt'
)
}
}
@@ -0,0 +1,146 @@
import NodeFormData from 'form-data'
import { ServerType } from '@sasjs/utils/types'
import { WebJobExecutor } from '../WebJobExecutor'
import { RequestClient } from '../../request/RequestClient'
import { SASViyaApiClient } from '../../SASViyaApiClient'
describe('WebJobExecutor runAsTask behaviour', () => {
const serverUrl = 'https://sample.server.com'
const jobsPath = '/SASJobExecution'
const makeExecutor = (serverType: ServerType = ServerType.SasViya) => {
const requestClient = new RequestClient(serverUrl)
const sasViyaApiClient = {
getJobsInFolder: async () => []
} as unknown as SASViyaApiClient
const executor = new WebJobExecutor(
serverUrl,
serverType,
jobsPath,
requestClient,
sasViyaApiClient
)
const postSpy = jest
.spyOn(requestClient, 'post')
.mockResolvedValue({ result: { table1: [] }, etag: '' } as any)
jest.spyOn(requestClient, 'appendRequest').mockImplementation()
return { executor, postSpy }
}
const baseConfig = {
serverUrl,
serverType: ServerType.SasViya,
appLoc: '/Public/app',
useComputeApi: false,
debug: false
}
it('sends table data in body (runAsTask=false)', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'v' }] },
{ ...baseConfig, runAsTask: false }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).not.toContain('_executionTasks=true')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
})
it('uploads as file when payload has semicolons (runAsTask=false)', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'has; semicolon' }] },
{ ...baseConfig, runAsTask: false }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).not.toContain('_executionTasks=')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
})
it('appends &_executionTasks=true to URL when runAsTask=true and no data', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute('services/common/sendArr', null, {
...baseConfig,
runAsTask: true
})
const [apiUrl] = postSpy.mock.calls[0]
expect(apiUrl).toContain('&_executionTasks=true')
})
it('appends &_executionTasks=true and sends table data when runAsTask=true with one input table', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'v' }] },
{ ...baseConfig, runAsTask: true }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).toContain('&_executionTasks=true')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
const dump = (body as NodeFormData).getBuffer().toString()
expect(dump).toContain('name="sasjs_tables"')
expect(dump).toContain('name="sasjs1data"')
})
it('appends &_executionTasks=true to URL when runAsTask=true with multiple input tables', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'v' }], table2: [{ col2: 'w' }] },
{ ...baseConfig, runAsTask: true }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).toContain('&_executionTasks=true')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
const dump = (body as NodeFormData).getBuffer().toString()
expect(dump).toContain('name="sasjs_tables"')
expect(dump).toMatch(/table1\s+table2/)
})
it('uploads as file when runAsTask=true and payload has semicolons', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'has; semicolon' }] },
{ ...baseConfig, runAsTask: true }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).toContain('&_executionTasks=true')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
const dump = (body as NodeFormData).getBuffer().toString()
expect(dump).toContain('filename="table1.csv"')
expect(dump).toContain('Content-Type: application/csv')
})
it('does NOT append _executionTasks=true to URL when runAsTask=false', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'v' }] },
{ ...baseConfig, runAsTask: false }
)
const [apiUrl] = postSpy.mock.calls[0]
expect(apiUrl).not.toContain('_executionTasks=true')
})
})
+8
View File
@@ -79,6 +79,14 @@ export class SASjsConfig {
* may affect browser performance, especially with debug (logs) enabled. * may affect browser performance, especially with debug (logs) enabled.
*/ */
requestHistoryLimit?: number = 10 requestHistoryLimit?: number = 10
/**
* Optional setting. When `true`, the request runs as a Viya execution task —
* appends `_executionTasks=true` to the request URL. Only applies to the Viya
* web jobs path, i.e. when `serverType === SASVIYA` AND
* `useComputeApi` is `null`/`undefined`. Has no effect when `useComputeApi`
* is explicitly set to `true` or `false`.
*/
runAsTask?: boolean = false
} }
export enum LoginMechanism { export enum LoginMechanism {
+1
View File
@@ -15,6 +15,7 @@ export * from './parseGeneratedCode'
export * from './parseSasViyaLog' export * from './parseSasViyaLog'
export * from './parseSourceCode' export * from './parseSourceCode'
export * from './parseViyaDebugResponse' export * from './parseViyaDebugResponse'
export * from './parseViyaLogDebugResponse'
export * from './parseWeboutResponse' export * from './parseWeboutResponse'
export * from './serialize' export * from './serialize'
export * from './splitChunks' export * from './splitChunks'
+32
View File
@@ -0,0 +1,32 @@
import { getValidJson } from './getValidJson'
import { parseWeboutResponse } from './parseWeboutResponse'
/**
* When querying a Viya job using the Web approach with _DEBUG=128 (used when
* runAsTask is true), the webout JSON is inlined into the response via:
* var blob = new Blob([`{...}`], {type: 'application/json'});
* On abort/error paths the same shape is used but with text/plain and
* weboutBEGIN/END markers around the JSON:
* var blob = new Blob([`>>weboutBEGIN<<\n{...}\n>>weboutEND<<\n`], {type: 'text/plain'});
* No follow-up request is needed — extract and parse the JSON directly.
*/
export const parseSasViyaLogDebugResponse = async (response: any) => {
// If upstream already parsed the response as JSON (object), pass through.
if (typeof response !== 'string') {
return response
}
const blobMatch = response.match(
/new Blob\(\[`([\s\S]*?)`\],\s*\{type:\s*'(?:application\/json|text\/plain)'\}\)/
)
if (!blobMatch) {
throw new Error('Unable to find webout blob in debug log response.')
}
const blobContent = blobMatch[1]
const stripped = blobContent.includes('>>weboutBEGIN<<')
? parseWeboutResponse(blobContent)
: blobContent
return getValidJson(stripped)
}
@@ -0,0 +1,55 @@
import { parseSasViyaLogDebugResponse } from '../parseViyaLogDebugResponse'
describe('parseSasViyaLogDebugResponse', () => {
it('should extract and parse JSON from inline Blob', async () => {
const resultData = { message: 'success' }
const response = `<html><body><script>
var blob = new Blob([\`${JSON.stringify(resultData)}\`], {type: 'application/json'});
</script></body></html>`
const result = await parseSasViyaLogDebugResponse(response)
expect(result).toEqual(resultData)
})
it('should extract and parse multiline JSON from inline Blob', async () => {
const resultData = {
SYSDATE: '13MAY26',
SYSCC: '0',
saslibs: [{ LIBRARYREF: 'FORMATS' }]
}
const response = `<script>
var blob = new Blob([\`{"SYSDATE" : "13MAY26"
,"SYSCC" : "0"
,"saslibs": [{"LIBRARYREF":"FORMATS"}]
}
\`], {type: 'application/json'});
</script>`
const result = await parseSasViyaLogDebugResponse(response)
expect(result).toEqual(resultData)
})
it('should extract and parse JSON wrapped in weboutBEGIN/END (text/plain blob)', async () => {
const resultData = { SYSCC: '1012', SYSERRORTEXT: 'File missing.' }
const response = `<script>
var blob = new Blob([\`>>weboutBEGIN<<
${JSON.stringify(resultData)}
>>weboutEND<<
\`], {type: 'text/plain'});
</script>`
const result = await parseSasViyaLogDebugResponse(response)
expect(result).toEqual(resultData)
})
it('should throw an error if blob is not found', async () => {
const response = `<html><body>No blob here</body></html>`
await expect(parseSasViyaLogDebugResponse(response)).rejects.toThrow(
'Unable to find webout blob in debug log response.'
)
})
})