build(deps): bump body-parser and express

Bumps [body-parser](https://github.com/expressjs/body-parser) to 1.20.4 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `body-parser` from 1.19.2 to 1.20.4
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.19.2...1.20.4)

Updates `express` from 4.17.3 to 4.22.1
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/v4.22.1/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.3...v4.22.1)

---
updated-dependencies:
- dependency-name: body-parser
  dependency-version: 1.20.4
  dependency-type: indirect
- dependency-name: express
  dependency-version: 4.22.1
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitattributes

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

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

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/hydrogen]
+        node-version: [lts/iron]
 
     steps:
       - uses: actions/checkout@v2
@@ -21,7 +21,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-       # 2. Restore npm cache manually
+        # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache

.github/workflows/generateDocs.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/hydrogen]
+        node-version: [lts/iron]
 
     steps:
       - name: Checkout
@@ -20,9 +20,10 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version:
+            ${{ matrix.node-version }}
 
-                 # 2. Restore npm cache manually
+            # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -50,4 +51,3 @@ jobs:
           publish_branch: gh-pages
           publish_dir: ./docs
           cname: adapter.sasjs.io
-

.github/workflows/npmpublish.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/hydrogen]
+        node-version: [lts/iron]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-       # 2. Restore npm cache manually
+        # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -42,6 +42,9 @@ jobs:
       - name: Build Project
         run: npm run build
 
+      - name: Clean up ready for publishing
+        run: npm run publishInit
+
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v3
         env:

.github/workflows/server-tests.yml

@@ -1,107 +1,120 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
+
-name: SASjs Build and Server Tests
+name: SASjs Build and Server Tests
-
+
-on:
+on:
-  pull_request:
+  pull_request:
-
+
-jobs:
+jobs:
-  test:
+  test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04
-
+
-    strategy:
+    strategy:
-      matrix:
+      matrix:
-        node-version: [lts/hydrogen]
+        node-version: [lts/iron]
-
+
-    steps:
+    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v2
-        with:
+        with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ matrix.node-version }}
-
+
-      # 2. Restore npm cache manually
+      # 2. Restore npm cache manually
-      - name: Restore npm cache
+      - name: Restore npm cache
-        uses: actions/cache@v3
+        uses: actions/cache@v3
-        id: npm-cache
+        id: npm-cache
-        with:
+        with:
-          path: ~/.npm
+          path: |
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+            ~/.npm
-          restore-keys: |
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-            ${{ runner.os }}-node-
+          restore-keys: |
-
+            ${{ runner.os }}-node-
-      - name: Install Dependencies
+
-        run: npm ci
+      - name: Cache Cypress binary
-
+        uses: actions/cache@v3
-      - name: Install Rimraf
+        with:
-        run: npm i rimraf
+          path: ~/.cache/Cypress
-
+          key: cypress-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
-      - name: Build Package
+          restore-keys: |
-        run: npm run package:lib
+            cypress-${{ runner.os }}-
-        env:
+
-          CI: true
+      - name: Install Dependencies
-
+        run: npm ci
-      - name: Write VPN Files
+
-        run: |
+      - name: Install Cypress binary
-          echo "$CA_CRT" > .github/vpn/ca.crt
+        run: npx cypress install
-          echo "$USER_CRT" > .github/vpn/user.crt
+
-          echo "$USER_KEY" > .github/vpn/user.key
+      - name: Install Rimraf
-          echo "$TLS_KEY" > .github/vpn/tls.key
+        run: npm i rimraf
-        shell: bash
+
-        env:
+      - name: Build Package
-          CA_CRT: ${{ secrets.CA_CRT}}
+        run: npm run package:lib
-          USER_CRT: ${{ secrets.USER_CRT }}
+        env:
-          USER_KEY: ${{ secrets.USER_KEY }}
+          CI: true
-          TLS_KEY: ${{ secrets.TLS_KEY }}
+
-
+      - name: Write VPN Files
-      - name: Chmod VPN files
+        run: |
-        run: |
+          echo "$CA_CRT" > .github/vpn/ca.crt
-          chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
+          echo "$USER_CRT" > .github/vpn/user.crt
-
+          echo "$USER_KEY" > .github/vpn/user.key
-      - name: Install Open VPN
+          echo "$TLS_KEY" > .github/vpn/tls.key
-        run: |
+        shell: bash
-          sudo apt install apt-transport-https
+        env:
-          sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
+          CA_CRT: ${{ secrets.CA_CRT}}
-          sudo apt-key add openvpn-repo-pkg-key.pub
+          USER_CRT: ${{ secrets.USER_CRT }}
-          sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
+          USER_KEY: ${{ secrets.USER_KEY }}
-          sudo apt update
+          TLS_KEY: ${{ secrets.TLS_KEY }}
-          sudo apt install openvpn3=17~betaUb22042+jammy
+
-
+      - name: Chmod VPN files
-      - name: Start Open VPN 3
+        run: |
-        run: openvpn3 session-start --config .github/vpn/config.ovpn
+          chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
-
+
-      - name: install pm2
+      - name: Install Open VPN
-        run: npm i -g pm2
+        run: |
-
+          sudo apt install apt-transport-https
-      - name: Fetch SASJS server
+          sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
-        run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
+          sudo apt-key add openvpn-repo-pkg-key.pub
-
+          sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
-      - name: Deploy sasjs-tests
+          sudo apt update
-        run: |
+          sudo apt install openvpn3=17~betaUb22042+jammy
-          npm install -g replace-in-files-cli
+
-          cd sasjs-tests
+      - name: Start Open VPN 3
-          replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json
+        run: openvpn3 session-start --config .github/vpn/config.ovpn
-          npm i
+
-          replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json
+      - name: install pm2
-          replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json
+        run: npm i -g pm2
-          replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json
+
-          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json
+      - name: Fetch SASJS server
-          cat ./public/config.json
+        run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
-
+
-          npm run update:adapter
+      - name: Deploy sasjs-tests
-          pm2 start --name sasjs-test npm -- start
+        run: |
-
+          sudo apt install jq
-      - name: Sleep for 10 seconds
+          cd sasjs-tests
-        run: sleep 10s
+          jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
-        shell: bash
+          npm i
-
+          jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-      - name: Run cypress on sasjs
+          jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-        run: |
+          jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-          replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.json
+          jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-          replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json
+
-          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json
+          cat ./public/config.json
-          cat ./cypress.json
+
-          echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
+          npm run update:adapter
-
+          pm2 start --name sasjs-test npm -- start
-          sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+
+      - name: Sleep for 10 seconds
+        run: sleep 10s
+        shell: bash
+
+      - name: Run cypress on sasjs
+        run: |
+          sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:5173'|g" ./cypress.config.js
+          sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
+          sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
+          cat ./cypress.config.js
+          echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
+
+          sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

.npmrc

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

cypress.config.js

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

cypress.json

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

package.json

@@ -4,17 +4,14 @@
   "homepage": "https://adapter.sasjs.io",
   "scripts": {
     "nodeVersionMessage": "echo \u001b[33m make sure you are running node lts version \u001b[0m",
-    "preinstall": "npm run nodeVersionMessage",
+    "build": "npm run nodeVersionMessage && npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
-    "prebuild": "npm run nodeVersionMessage",
-    "build": "npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
     "package:lib": "npm run build && copyfiles ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
     "publish:lib": "npm run build && cd build && npm publish",
     "lint:fix": "npx prettier --loglevel silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "lint:silent": "npx prettier --loglevel silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "test": "jest --silent --coverage",
-    "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
+    "publishInit": "cp -r ./build/* . && rm -rf ./build",
-    "postpublish": "git clean -fd",
     "semantic-release": "semantic-release",
     "typedoc": "node createTSDocs",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks && git config core.autocrlf false || true",
@@ -54,9 +51,9 @@
     "copyfiles": "2.4.1",
     "cors": "^2.8.5",
     "cp": "0.2.0",
-    "cypress": "7.7.0",
+    "cypress": "^15.7.1",
     "dotenv": "16.0.0",
-    "express": "4.17.3",
+    "express": "4.22.1",
     "jest": "29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-extended": "4.0.2",
@@ -79,7 +76,7 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "3.5.2",
+    "@sasjs/utils": "3.5.6",
     "axios": "1.12.2",
     "axios-cookiejar-support": "5.0.5",
     "form-data": "4.0.4",

sasjs-tests/index.css

@@ -1,39 +1,39 @@
-* {
+* {
-  box-sizing: border-box;
+  box-sizing: border-box;
-  margin: 0;
+  margin: 0;
-  padding: 0;
+  padding: 0;
-}
+}
-
+
-body {
+body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
-    Ubuntu, Cantarell, sans-serif;
+    Ubuntu, Cantarell, sans-serif;
-  line-height: 1.6;
+  line-height: 1.6;
-  color: #333;
+  color: #333;
-  background: #f5f5f5;
+  background: #f5f5f5;
-}
+}
-
+
-.app__error {
+.app__error {
-  max-width: 800px;
+  max-width: 800px;
-  margin: 50px auto;
+  margin: 50px auto;
-  padding: 30px;
+  padding: 30px;
-  background: white;
+  background: white;
-  border-radius: 8px;
+  border-radius: 8px;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-
+
-  h1 {
+  h1 {
-    color: #e74c3c;
+    color: #e74c3c;
-    margin-bottom: 15px;
+    margin-bottom: 15px;
-  }
+  }
-
+
-  p {
+  p {
-    margin-bottom: 15px;
+    margin-bottom: 15px;
-  }
+  }
-
+
-  pre {
+  pre {
-    background: #2c3e50;
+    background: #2c3e50;
-    color: #ecf0f1;
+    color: #ecf0f1;
-    padding: 15px;
+    padding: 15px;
-    border-radius: 4px;
+    border-radius: 4px;
-    overflow-x: auto;
+    overflow-x: auto;
-  }
+  }
-}
+}

sasjs-tests/package-lock.json

@@ -443,6 +443,7 @@
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
       "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -1228,6 +1229,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -1395,6 +1397,7 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
       "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -1826,6 +1829,7 @@
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
       "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
+      "peer": true,
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -2251,7 +2255,8 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "postcss": {
       "version": "8.5.6",
@@ -2358,6 +2363,7 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
       "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "peer": true,
       "requires": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",

sasjs-tests/src/main.ts

@@ -22,7 +22,6 @@ import { sendArrTests, sendObjTests } from './testSuites/RequestData'
 import { fileUploadTests } from './testSuites/FileUpload'
 import { computeTests } from './testSuites/Compute'
 import { sasjsRequestTests } from './testSuites/SasjsRequests'
-import { viyaFileTests } from './testSuites/ViyaFile'
 
 async function init() {
   const appContainer = document.getElementById('app')
@@ -104,10 +103,9 @@ function showTests(
     fileUploadTests(adapter)
   ]
 
-  // Add certain tests for SASVIYA only
+  // Add compute tests for SASVIYA only
   if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
     testSuites.push(computeTests(adapter, appLoc))
-    testSuites.push(viyaFileTests(adapter, appLoc))
   }
 
   container.innerHTML = ''

sasjs-tests/src/testSuites/ViyaFile.ts

@@ -1,31 +0,0 @@
-import SASjs from '@sasjs/adapter'
-import type { TestSuite } from '../types'
-
-export const viyaFileTests = (adapter: SASjs, appLoc: string): TestSuite => ({
-  name: 'SAS Viya File Tests',
-  tests: [
-    {
-      title: 'Create html file',
-      description: 'Should create an html file with appropriate properties',
-      test: async () => {
-        const fileContentBuffer = Buffer.from(
-          `<html>` +
-            `  <head><title>Test</title></head>` +
-            `  <body><p>This is a test</p></body>` +
-            `</html>`
-        )
-        // generate a timestamp string formatted as YYYYmmDDTHHMMSS_999
-        const timeMark = new Date()
-          .toISOString()
-          .replace(/(\/|:|\s|-|Z)/g, '')
-          .replace(/\./g, '_')
-        const filename = `viya_createFile_test_${timeMark}.html`
-        return adapter.createFile(filename, fileContentBuffer, appLoc)
-      },
-      assertion: () => {
-        //A test that returns a boolean
-        return true // dummy
-      }
-    }
-  ]
-})

sasjs-tests/vite.config.js

@@ -1,12 +1,5 @@
 import { defineConfig } from 'vite'
-import { nodePolyfills } from 'vite-plugin-node-polyfills'
-
 export default defineConfig({
-  plugins: [
-    nodePolyfills({
-      include: ['buffer']
-    })
-  ],
   build: {
     assetsInlineLimit: 0,
     assetsDir: ''

src/SASViyaApiClient.ts

@@ -35,7 +35,7 @@ interface JobExecutionResult {
   log?: string
   error?: object
 }
-
+/* Viya /types/types?limit=999999 response structure */
 interface IViyaTypesResponse {
   accept: string
   count: number
@@ -47,6 +47,7 @@ interface IViyaTypesResponse {
   version: number
 }
 
+/* Item element within the Viya types response */
 interface IViyaTypesItem {
   description?: string
   extensions?: string[]
@@ -56,7 +57,7 @@ interface IViyaTypesItem {
   mappedTypes?: string[]
   mediaType?: string
   mediaTypes?: string[]
-  name: string
+  name?: string | undefined
   pluralLabel?: string
   properties?: IViyaTypesProperties
   resourceUri?: string
@@ -85,7 +86,7 @@ type IViyaTypesProperties = Record<string, string>
  * create and patch a new file.
  */
 interface IViyaTypesExtensionInfo {
-  typeDefName: string
+  typeDefName: string | undefined
   properties: IViyaTypesProperties | undefined
 }
 
@@ -114,9 +115,9 @@ export class SASViyaApiClient {
     this.requestClient
   )
   private folderMap = new Map<string, Job[]>()
-
   private fileExtensionMap = new Map<string, IViyaTypesExtensionInfo>()
-  private boolExtensionMap = false // has the fileExtensionMap been populated yet?
+  private boolExtensionMap = false // required in case the map has zero entries
+  // after an attempt to populate it.
 
   /**
    * A helper method used to call appendRequest method of RequestClient
@@ -481,29 +482,20 @@ export class SASViyaApiClient {
     if (!parentFolderUri && parentFolderPath) {
       parentFolderUri = await this.getFolderUri(parentFolderPath, accessToken)
     }
+
     const headers = {
       Accept: 'application/vnd.sas.file+json',
       'Content-Disposition': `filename="${fileName}";`
     }
-    const patchHeaders = {
-      Accept: 'application/json',
-      'If-Match': '*'
-    }
 
     const formData = new NodeFormData()
     formData.append('file', contentBuffer, fileName)
 
-    /** Query Viya for file metadata based on extension type.
+    /** Query Viya for file metadata based on extension type. */
-     *  Without providing certain properties, some versions of Viya will not
-     *  serve files as intended. Avoid this issue by applying the properties
-     *  that Viya has registered for a file extension.
-     */
 
-    // typeDefName - Viya should automatically determine this and additional
+    // typeDefName - Viya accepts this property during the file creation
-    // properties at runtime if not provided in the file creation request.
     let typeDefName: string | undefined = undefined
-    // Viya update 2025.09 resulted in a change to this automatic behaviour.
+    // Additional properties are supplied by a patch.
-    // We patch the new file to replicate the behaviour.
     let filePatch:
       | {
           name: string
@@ -532,8 +524,14 @@ export class SASViyaApiClient {
           .forEach((e) => {
             e.extensions?.forEach((ext) => {
               this.fileExtensionMap.set(ext, {
-                // "name:" is the typeDefName value required for file creation.
+                // `name` becomes the typeDefName value at file creation time.
-                typeDefName: e.name,
+                // `name` is ignored here if it is not populated in the map, or
+                // has a blank/empty value.
+                typeDefName: e.name
+                  ? e.name.trim().length
+                    ? e.name.trim()
+                    : undefined
+                  : undefined,
                 properties: e.properties
               })
             })
@@ -542,14 +540,18 @@ export class SASViyaApiClient {
         this.boolExtensionMap = true
       }
 
+      // Query the map for the current file extension
       const fileExtInfo = this.fileExtensionMap.get(fileExtension)
       if (fileExtInfo) {
+        // If the extension was found in the map, record the typeDefName and
+        // create a patch if a properties object was returned.
         typeDefName = fileExtInfo.typeDefName
         if (fileExtInfo.properties)
           filePatch = { name: fileName, properties: fileExtInfo.properties }
       }
     }
 
+    // Create the file
     const createFileResponse = await this.requestClient.post<File>(
       `/files/files?parentFolderUri=${parentFolderUri}&typeDefName=${
         typeDefName ?? 'file'
@@ -560,9 +562,13 @@ export class SASViyaApiClient {
       headers
     )
 
-    try {
+    // If a patch was created...
-      // If a patch was created...
+    if (filePatch) {
-      if (filePatch) {
+      try {
+        const patchHeaders = {
+          Accept: 'application/json',
+          'If-Match': '*'
+        }
         // Get the URI of the newly created file
         const fileUri = createFileResponse.result.links.filter(
           (e) => e.method == 'PATCH' && e.rel == 'patch'
@@ -573,15 +579,14 @@ export class SASViyaApiClient {
             `${fileUri}`,
             filePatch,
             accessToken,
-            'application/json',
             patchHeaders
           )
         ).result
+      } catch (e: any) {
+        throw new Error(`Error patching file ${fileName}.\n${e.message}`)
       }
-      return createFileResponse.result
-    } catch (e: any) {
-      throw new Error(`Error patching file ${fileName}.\n${e.message}`)
     }
+    return createFileResponse.result
   }
 
   /**

src/request/RequestClient.ts

@@ -272,13 +272,12 @@ export class RequestClient implements HttpClient {
 
   public async patch<T>(
     url: string,
-    data: any,
+    data: any = {},
-    accessToken: string | undefined,
+    accessToken?: string,
-    contentType = 'application/json',
     overrideHeaders: { [key: string]: string | number } = {}
   ): Promise<{ result: T; etag: string }> {
     const headers = {
-      ...this.getHeaders(accessToken, contentType),
+      ...this.getHeaders(accessToken, 'application/json'),
       ...overrideHeaders
     }