Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/main/typescript-6.0.2

* origin/main:
  chore(deps): bump actions/setup-node in /.github/actions/setup (#6754)
  chore(deps): bump bignumber.js from 11.1.4 to 11.1.5 (#6749)
  chore(deps): bump actions/checkout from 6.0.3 to 7.0.0 (#6708)
  chore(deps-dev): bump @cap-js/sqlite from 2.4.0 to 3.0.2 (#6739)
  chore(deps-dev): bump @sap/cds-dk from 9.9.2 to 10.0.3 (#6736)
  fix: destination fetch option XOR typing (#6701)

Author: davidkna-sap

.changeset/tricky-impalas-rush.md

@@ -0,0 +1,5 @@
+---
+"@sap-cloud-sdk/connectivity": patch
+---
+
+[fix] Fix `DestinationOrFetchOptions` and `HttpDestinationOrFetchOptions` so the `service` key surfaces at the type level.

.github/actions/setup/action.yml

@@ -32,18 +32,23 @@ inputs:
   persist-credentials:
     description: 'Whether to configure the token or SSH key with the local git config'
     default: 'false'
+  allow-unsafe-pr-checkout:
+    description: 'Whether to allow checkout for pull_request_target and workflow_run'
+    default: 'false'
+    
 
 runs:
   using: 'composite'
   steps:
     - name: Checkout repository
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       with:
         ref: ${{ inputs.ref }}
         token: ${{ inputs.token }}
         persist-credentials: ${{ inputs.persist-credentials }}
+        allow-unsafe-pr-checkout: ${{ inputs.allow-unsafe-pr-checkout }}
     - name: Setup pnpm
-      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+      uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
       with:
         version: ${{ inputs.pnpm-version }}
     - name: Resolve registry URL
@@ -67,7 +72,7 @@ runs:
           echo "url=https://registry.npmjs.org" >> $GITHUB_OUTPUT
         fi
     - name: Setup Node.js
-      uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
       with:
         node-version: ${{ inputs.node-version }}
         registry-url: ${{ steps.resolve-registry-url.outputs.url }}

.github/dependabot.yml

@@ -39,7 +39,16 @@ updates:
       - dependency-name: 'yargs'
         update-types: ['version-update:semver-major']
   - package-ecosystem: 'github-actions'
-    directory: '/'
+    directories:
+      - '/'
+      - '/.github/actions/check-pr'
+      - '/.github/actions/commit-and-tag'
+      - '/.github/actions/changesets-fixed-version-bump'
+      - '/.github/actions/merge-and-write-changelogs'
+      - '/.github/actions/get-changelog'
+      - '/.github/actions/setup'
+      - '/.github/actions/check-public-api'
+      - '/.github/actions/check-license'
     schedule:
       interval: 'weekly'
       time: '01:00'

.github/workflows/auto-dependabot-fix.yml

@@ -26,6 +26,7 @@ jobs:
           token: ${{ steps.app-token.outputs.token }}
           persist-credentials: true
           registry-token: ${{ secrets.NPM_TOKEN_ARTIFACTORY }}
+          allow-unsafe-pr-checkout: true
       - name: Commit Changes if needed
         env:
           BOT_EMAIL: ${{ vars.SAP_CLOUD_SDK_BOT_EMAIL }}

.github/workflows/check-pr.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           files: |
             .changeset/**
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
           sparse-checkout: |

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.

.github/workflows/fosstars-report.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - uses: SAP/fosstars-rating-core-action@daf10c3920b53405f6013ee987e7015525fdec30 # v1.14.0

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
         run: |
           pnpm changeset publish
       - name: Checkout Docs
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           repository: SAP/cloud-sdk
           token: ${{ steps.app-token.outputs.token }}

.github/workflows/zizmor.yml

@@ -18,7 +18,7 @@ jobs:
       actions: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
 

packages/connectivity/src/scp-cf/destination/destination.ts

@@ -1,5 +1,4 @@
 import { isDestinationFetchOptions } from './destination-accessor-types';
-import type { Xor } from '@sap-cloud-sdk/util';
 import type { DestinationFetchOptions } from './destination-accessor-types';
 import type { DestinationFromServiceBindingOptions } from './destination-from-vcap';
 import type {
@@ -9,6 +8,7 @@ import type {
   DestinationCertificate,
   HttpDestination
 } from './destination-service-types';
+import type { WithoutExclusive } from '@sap-cloud-sdk/util';
 
 /**
  * Takes an existing or a parsed destination and returns an SDK compatible destination object.
@@ -469,17 +469,27 @@ export function noDestinationErrorMessage(
 }
 
 /**
- * Type that is either a {@link HttpDestination} or (XOR) {@link DestinationFetchOptions & DestinationFromServiceBindingOptions}.
+ * Fetch-options side of the XOR.
+ *
+ * `DestinationFetchOptions` requires `destinationName: string`, but when looking up by
+ * `service` (via `DestinationFromServiceBindingOptions`) we don't have a name. Intersecting
+ * the two naively makes `destinationName: string & never = never`, killing the service branch.
+ * Stripping `destinationName` from `DestinationFetchOptions` and letting the inner discriminated
+ * union of `DestinationFromServiceBindingOptions` own that key fixes it.
  */
-export type DestinationOrFetchOptions = Xor<
-  Destination,
-  DestinationFetchOptions & DestinationFromServiceBindingOptions
->;
+type FetchOptionsLeaf = Omit<DestinationFetchOptions, 'destinationName'> &
+  DestinationFromServiceBindingOptions;
+
+/**
+ * Type that is either a {@link Destination} or (XOR) {@link DestinationFetchOptions} & {@link DestinationFromServiceBindingOptions}.
+ */
+export type DestinationOrFetchOptions =
+  | (WithoutExclusive<Destination, FetchOptionsLeaf> & FetchOptionsLeaf)
+  | (WithoutExclusive<FetchOptionsLeaf, Destination> & Destination);
 
 /**
- * Type that is either a {@link HttpDestination} or (XOR) {@link DestinationFetchOptions & DestinationFromServiceBindingOptions}.
+ * Type that is either an {@link HttpDestination} or (XOR) {@link DestinationFetchOptions} & {@link DestinationFromServiceBindingOptions}.
  */
-export type HttpDestinationOrFetchOptions = Xor<
-  HttpDestination,
-  DestinationFetchOptions & DestinationFromServiceBindingOptions
->;
+export type HttpDestinationOrFetchOptions =
+  | (WithoutExclusive<HttpDestination, FetchOptionsLeaf> & FetchOptionsLeaf)
+  | (WithoutExclusive<FetchOptionsLeaf, HttpDestination> & HttpDestination);