diff --git a/.github/workflows/build-and-test-v3.yml b/.github/workflows/build-and-test-v3.yml
index 4f3812624..54a0a280c 100644
--- a/.github/workflows/build-and-test-v3.yml
+++ b/.github/workflows/build-and-test-v3.yml
@@ -26,50 +26,6 @@ jobs:
             echo "approved=false" >> $GITHUB_OUTPUT
           fi
 
-  check_build_artifacts:
-    name: Check runtime build artifact changes
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: 'true'
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v45
-        with:
-          files: |
-            v3/internal/runtime/desktop/@wailsio/runtime/dist/**
-            v3/internal/runtime/desktop/@wailsio/runtime/types/**
-
-      - name: Get merge base
-        id: merge-base
-        if: steps.changed-files.outputs.any_changed == 'true'
-        env:
-          BASE_SHA: ${{github.event.pull_request.base.sha}}
-          HEAD_SHA: ${{github.event.pull_request.head.sha}}
-        run: |
-          echo "sha=$(git merge-base "$BASE_SHA" "$HEAD_SHA")" >> $GITHUB_OUTPUT
-
-      - name: This PR includes changes to runtime build artifacts
-        uses: actions/github-script@v7
-        if: steps.changed-files.outputs.any_changed == 'true'
-        env:
-          MERGE_BASE_SHA: ${{steps.merge-base.outputs.sha}}
-        with:
-          script: |
-            process.exitCode = 1
-            core.error(
-              'The CI pipeline will rebuild and publish the runtime automatically.\n' +
-              'Please run the following command (or equivalent) in your local wails repo\n' +
-              'to revert all build artifact changes; then update the PR:\n\n' +
-              '    cd v3/internal/runtime/desktop/@wailsio/runtime &&\n' +
-              `    git restore -s ${process.env.MERGE_BASE_SHA} -W -S -- dist types &&\n` +
-              '    git commit -m "Revert build artifact changes"\n',
-              { title: 'This PR includes changes to runtime build artifacts' }
-            );
-
   test_js:
     name: Run JS Tests
     needs: check_approval
diff --git a/.github/workflows/publish-npm.yml b/.github/workflows/publish-npm.yml
index cdf794a2b..eb7275f30 100644
--- a/.github/workflows/publish-npm.yml
+++ b/.github/workflows/publish-npm.yml
@@ -3,11 +3,55 @@ on:
     branches: ['v3-alpha']
   workflow_dispatch:
 
+concurrency:
+  group: publish-npm-v3
+  cancel-in-progress: true
+
 jobs:
-  publish:
+  detect:
+    name: Detect committed changes
+    if: github.event_name != 'workflow_dispatch'
+    outputs:
+      changed: ${{ steps.package-json-changes.outputs.any_modified == 'true' || steps.source-changes.outputs.any_modified == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
+          persist-credentials: 'true'
+
+      - name: Detect committed package.json changes
+        id: package-json-changes
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            v3/internal/runtime/desktop/@wailsio/runtime/package.json
+
+      - name: Detect committed source changes
+        if: >-
+          steps.package-json-changes.outputs.any_modified != 'true'
+        id: source-changes
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            v3/internal/runtime/Taskfile.yaml
+            v3/internal/runtime/desktop/@wailsio/compiled/main.js
+            v3/internal/runtime/desktop/@wailsio/runtime/tsconfig.json
+            v3/internal/runtime/desktop/@wailsio/runtime/src/**
+            v3/pkg/events/events.txt
+            v3/tasks/events/**
+
+  rebuild_and_publish:
+    name: Rebuild and publish
+    needs: [detect]
+    if: >-
+      !failure() && !cancelled()
+      && (github.event_name == 'workflow_dispatch' || needs.detect.outputs.changed == 'true')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: 'v3-alpha'
@@ -49,48 +93,22 @@ jobs:
           npm test
           npm run build
 
-      - name: Detect npm package changes
-        uses: tj-actions/verify-changed-files@v20
-        id: package-changes
-        with:
-          files: |
-            v3/internal/runtime/desktop/@wailsio/runtime/dist/**
-            v3/internal/runtime/desktop/@wailsio/runtime/types/**
-
       - name: Bump version
-        if: github.event_name == 'workflow_dispatch' || steps.package-changes.outputs.files_changed == 'true'
         id: bump-version
         working-directory: v3/internal/runtime/desktop/@wailsio/runtime
         run: |
-          echo "version=$(npm version prerelease)" >> $GITHUB_OUTPUT
+          echo "version=$(npm --no-git-tag-version --force version prerelease)" >> "$GITHUB_OUTPUT"
 
       - name: Commit changes
-        if: github.event_name == 'workflow_dispatch' || steps.package-changes.outputs.files_changed == 'true'
         run: |
           git add .
           git commit -m "[skip ci] Publish @wailsio/runtime ${{ steps.bump-version.outputs.version }}"
           git push
+          fi
 
       - name: Publish npm package
         uses: JS-DevTools/npm-publish@v3
-        if: github.event_name == 'workflow_dispatch' || steps.package-changes.outputs.files_changed == 'true'
         with:
           package: v3/internal/runtime/desktop/@wailsio/runtime
           access: public
           token: ${{ secrets.NPM_TOKEN }}
-
-      - name: Detect docs and bundled runtime changes
-        if: github.event_name != 'workflow_dispatch' && steps.package-changes.outputs.files_changed != 'true'
-        uses: tj-actions/verify-changed-files@v20
-        id: docs-bundle-changes
-        with:
-          files: |
-            v3/internal/assetserver/bundledassets/**
-            v3/internal/runtime/desktop/@wailsio/runtime/docs/**
-
-      - name: Commit docs and bundled runtime changes
-        if: github.event_name != 'workflow_dispatch' && steps.package-changes.outputs.files_changed != 'true' && steps.docs-bundle-changes.outputs.files_changed == 'true'
-        run: |
-          git add .
-          git commit -m "[skip ci] Update runtime docs and bundle"
-          git push
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/encoding/json/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/encoding/json/models.js
index b7e840816..96abf0ef1 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/encoding/json/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/encoding/json/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Marshaler is the interface implemented by types that
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/encoding/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/encoding/models.js
index bbabe728a..59cfef5bd 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/encoding/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/encoding/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * TextMarshaler is the interface implemented by an object that can
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
index 50edc1ec1..fcbd41a3a 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -22,81 +22,63 @@ import * as $models from "./models.js";
 /**
  * Get someone.
  * @param {$models.Alias} aliasValue
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function Get(aliasValue) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1928502664, aliasValue));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1928502664, aliasValue).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType0($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * Apparently, aliases are all the rage right now.
  * @param {$models.AliasedPerson} p
- * @returns {Promise<$models.StrangelyAliasedPerson> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.StrangelyAliasedPerson>}
  */
 export function GetButAliased(p) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1896499664, p));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1896499664, p).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType0($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * Get someone quite different.
- * @returns {Promise<$models.GenericPerson<boolean>> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.GenericPerson<boolean>>}
  */
 export function GetButDifferent() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2240931744));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(2240931744).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
- * @returns {Promise<nobindingshere$0.PrivatePerson> & { cancel(): void }}
+ * @returns {$CancellablePromise<nobindingshere$0.PrivatePerson>}
  */
 export function GetButForeignPrivateAlias() {
-    let $resultPromise = /** @type {any} */($Call.ByID(643456960));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(643456960).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
- * @returns {Promise<$models.AliasGroup> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.AliasGroup>}
  */
 export function GetButGenericAliases() {
-    let $resultPromise = /** @type {any} */($Call.ByID(914093800));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(914093800).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType3($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * Greet a lot of unusual things.
  * @param {$models.EmptyAliasStruct} $0
  * @param {$models.EmptyStruct} $1
- * @returns {Promise<$models.AliasStruct> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.AliasStruct>}
  */
 export function Greet($0, $1) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, $0, $1));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1411160069, $0, $1).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType7($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js
index 977ad4722..3de57786d 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * A nice type Alias.
@@ -203,7 +203,7 @@ export class GenericPerson {
      * Given creation functions for each type parameter,
      * returns a creation function for a concrete instance
      * of the generic class GenericPerson.
-     * @template T
+     * @template [T=any]
      * @param {(source: any) => T} $$createParamT
      * @returns {($$source?: any) => GenericPerson<T>}
      */
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
index b4d6bd47d..42219054f 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function TestMethod() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2241101727));
-    return $resultPromise;
+    return $Call.ByID(2241101727);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
index 389469d63..5e27fbc9e 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function TestMethod2() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1556848345));
-    return $resultPromise;
+    return $Call.ByID(1556848345);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
index 91b7651a8..fa634943d 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,9 +19,8 @@ import * as $models from "./models.js";
  * Greet does XYZ
  * @param {$models.Person} person
  * @param {$models.Embedded1} emb
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(person, emb) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, person, emb));
-    return $resultPromise;
+    return $Call.ByID(1411160069, person, emb);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.js
index d6da8c762..7a0edf1c7 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Embedded1 {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
index 6298ac99b..35fac10f2 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -25,17 +25,14 @@ import * as $models from "./models.js";
  * @param {{ [_: `${number}`]: boolean | null }} assoc
  * @param {(number | null)[]} $4
  * @param {string[]} other
- * @returns {Promise<[$models.Person, any, number[]]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Person, any, number[]]>}
  */
 export function Greet(str, people, $2, assoc, $4, ...other) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, str, people, $2, assoc, $4, other));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1411160069, str, people, $2, assoc, $4, other).then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[2] = $$createType1($result[2]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.js
index 70a01e64c..82af81baf 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Person represents a person
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
index 3ad458498..29255dd9c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,17 +17,14 @@ import * as $models from "./models.js";
 
 /**
  * Make a cycle.
- * @returns {Promise<[$models.StructA, $models.StructC]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.StructA, $models.StructC]>}
  */
 export function MakeCycles() {
-    let $resultPromise = /** @type {any} */($Call.ByID(440020721));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(440020721).then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.js
index d101a661f..f24f5a2c9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class StructA {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
index 428da2dbd..faf090884 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,17 +17,14 @@ import * as $models from "./models.js";
 
 /**
  * Make a cycle.
- * @returns {Promise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]>}
  */
 export function MakeCycles() {
-    let $resultPromise = /** @type {any} */($Call.ByID(440020721));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(440020721).then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType9($result[1]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.js
index f4a68bd4b..47d41f572 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * @typedef {Cyclic | null} Alias
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
index b1523d411..fce17fb1d 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * @param {$models.InternalModel} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(538079117, $0));
-    return $resultPromise;
+    return $Call.ByID(538079117, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.js
index fad4870ca..291a3cecf 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * An exported but internal model.
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.js
index b38ff6238..274f4eed4 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Dummy {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
index 8a2f4b65b..cc7ed89d3 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -12,20 +12,18 @@ import * as otherpackage$0 from "./otherpackage/models.js";
 
 /**
  * @param {string} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 function InternalMethod($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3518775569, $0));
-    return $resultPromise;
+    return $Call.ByID(3518775569, $0);
 }
 
 /**
  * @param {otherpackage$0.Dummy} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function VisibleMethod($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(474018228, $0));
-    return $resultPromise;
+    return $Call.ByID(474018228, $0);
 }
 
 /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
index 325ddfe88..d3f53be87 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * @param {$models.unexportedModel} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(37626172, $0));
-    return $resultPromise;
+    return $Call.ByID(37626172, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
index 4648c8d37..a178744b9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
@@ -9,50 +9,45 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Comment 1.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method1() {
-    let $resultPromise = /** @type {any} */($Call.ByID(841558284));
-    return $resultPromise;
+    return $Call.ByID(841558284);
 }
 
 /**
  * Comment 2.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method2() {
-    let $resultPromise = /** @type {any} */($Call.ByID(891891141));
-    return $resultPromise;
+    return $Call.ByID(891891141);
 }
 
 /**
  * Comment 3a.
  * Comment 3b.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method3() {
-    let $resultPromise = /** @type {any} */($Call.ByID(875113522));
-    return $resultPromise;
+    return $Call.ByID(875113522);
 }
 
 /**
  * Comment 4.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method4() {
-    let $resultPromise = /** @type {any} */($Call.ByID(791225427));
-    return $resultPromise;
+    return $Call.ByID(791225427);
 }
 
 /**
  * Comment 5.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method5() {
-    let $resultPromise = /** @type {any} */($Call.ByID(774447808));
-    return $resultPromise;
+    return $Call.ByID(774447808);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
index 61730be16..ed402a8b2 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,25 +19,21 @@ import * as $models from "./models.js";
  * Greet does XYZ
  * @param {string} name
  * @param {$models.Title} title
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name, title) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name, title));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name, title);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1661412647, name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.js
index cad356265..2c5df9ee7 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Age is an integer with some predefined values
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
index 0de466bab..fbc2294e9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,9 +19,8 @@ import * as services$0 from "./services/models.js";
  * Greet does XYZ
  * @param {string} name
  * @param {services$0.Title} title
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name, title) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name, title));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name, title);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.js
index 0e7acabe2..65ebfa2f7 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * @readonly
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
index 5f8cf55b5..50737a34b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,25 +18,21 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1661412647, name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.js
index 860939563..0ab295133 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.js
index fb1176dee..24a5de807 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
index 447b0a588..1866aca09 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,15 +18,12 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2007737399));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(2007737399).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
index 5f8cf55b5..50737a34b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,25 +18,21 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1661412647, name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.js
index 5b28ee2f6..29a95e11e 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.js
index fb1176dee..24a5de807 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
index 4bece70b6..293a2f0bb 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,15 +18,12 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2447353446));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(2447353446).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
index 0c282e914..e50a4a6ab 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
index d20ce5791..9dfe48511 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
index 4e54dc0c8..1bc7cb45b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
@@ -9,24 +9,22 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function GreetWithContext(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1310150960, name));
-    return $resultPromise;
+    return $Call.ByID(1310150960, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
index d20ce5791..9dfe48511 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js
index 960844103..1dc5bfc38 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * @template S
@@ -1227,7 +1227,15 @@ export class Maps {
      * Given creation functions for each type parameter,
      * returns a creation function for a concrete instance
      * of the generic class Maps.
-     * @template R,S,T,U,V,W,X,Y,Z
+     * @template [R=any]
+     * @template [S=any]
+     * @template [T=any]
+     * @template [U=any]
+     * @template [V=any]
+     * @template [W=any]
+     * @template [X=any]
+     * @template [Y=any]
+     * @template [Z=any]
      * @param {(source: any) => R} $$createParamR
      * @param {(source: any) => S} $$createParamS
      * @param {(source: any) => T} $$createParamT
@@ -1926,24 +1934,24 @@ const $$createType55 = $Create.Map($Create.Any, $Create.Any);
 const $$createType56 = $Create.Map($Create.Any, $Create.Any);
 const $$createType57 = $Create.Map($Create.Any, $Create.Any);
 const $$createType58 = $Create.Map($Create.Any, $Create.Any);
-const $$createType59 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType60 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType61 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType62 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType63 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType64 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType65 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType66 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType67 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType68 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType69 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType70 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType71 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType72 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType73 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType74 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType75 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType76 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
+const $$createType59 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType60 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType61 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType62 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType63 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType64 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType65 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType66 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType67 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType68 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType69 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType70 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType71 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType72 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType73 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType74 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType75 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType76 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
 const $$createType77 = $Create.Map($Create.Any, $Create.Any);
 const $$createType78 = $Create.Map($Create.Any, $Create.Any);
 const $$createType79 = $Create.Map($Create.Any, $Create.Any);
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
index bca8b3182..870b2804b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
@@ -4,22 +4,19 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
 /**
- * @returns {Promise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>>}
  */
 export function Method() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4021345184));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(4021345184).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType0($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.js
index 1871e9492..77fe552ea 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
index 8e10d60e3..5b415f83e 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
@@ -4,22 +4,19 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
 /**
- * @returns {Promise<$models.Data> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Data>}
  */
 export function Method() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4021345184));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(4021345184).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType0($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js
index f88aa955a..b42e223fa 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -45,7 +45,7 @@ export class HowDifferent {
      * Given creation functions for each type parameter,
      * returns a creation function for a concrete instance
      * of the generic class HowDifferent.
-     * @template How
+     * @template [How=any]
      * @param {(source: any) => How} $$createParamHow
      * @returns {($$source?: any) => HowDifferent<How>}
      */
@@ -175,7 +175,7 @@ export const PrivatePerson = personImpl;
  */
 
 // Private type creation functions
-const $$createType0 = ($$createParamHow) => $Create.Map($Create.Any, $$createParamHow);
-const $$createType1 = ($$createParamHow) => $Create.Array($$createType0($$createParamHow));
+const $$createType0 = /** @type {(...args: any[]) => any} */(($$createParamHow) => $Create.Map($Create.Any, $$createParamHow));
+const $$createType1 = /** @type {(...args: any[]) => any} */(($$createParamHow) => $Create.Array($$createType0($$createParamHow)));
 const $$createType2 = other$0.OtherPerson.createFrom($Create.Any);
 const $$createType3 = $Create.Array($$createType2);
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.js
index c10d33908..89992cacf 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * OtherPerson is like a person, but different.
@@ -40,7 +40,7 @@ export class OtherPerson {
      * Given creation functions for each type parameter,
      * returns a creation function for a concrete instance
      * of the generic class OtherPerson.
-     * @template T
+     * @template [T=any]
      * @param {(source: any) => T} $$createParamT
      * @returns {($$source?: any) => OtherPerson<T>}
      */
@@ -57,4 +57,4 @@ export class OtherPerson {
 }
 
 // Private type creation functions
-const $$createType0 = ($$createParamT) => $Create.Array($$createParamT);
+const $$createType0 = /** @type {(...args: any[]) => any} */(($$createParamT) => $Create.Array($$createParamT));
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
index 9971a1759..36b25c183 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
@@ -9,13 +9,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(3606939272));
-    return $resultPromise;
+    return $Call.ByID(3606939272);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
index 9613f1c61..a87ccf6c4 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,27 +17,23 @@ import * as $models from "./models.js";
 
 /**
  * LikeThisOne is an example method that does nothing.
- * @returns {Promise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]>}
  */
 export function LikeThisOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2124352079));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(2124352079).then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         $result[2] = $$createType2($result[2]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4281222271));
-    return $resultPromise;
+    return $Call.ByID(4281222271);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
index 6b333bbd2..5fb44fbc6 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
@@ -9,13 +9,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(3566862802));
-    return $resultPromise;
+    return $Call.ByID(3566862802);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
index bac3669ab..5ec6c820e 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,27 +17,23 @@ import * as nobindingshere$0 from "../no_bindings_here/models.js";
 
 /**
  * LikeThisOne is an example method that does nothing.
- * @returns {Promise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]>}
  */
 export function LikeThisOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2590614085));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(2590614085).then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         $result[2] = $$createType2($result[2]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(773650321));
-    return $resultPromise;
+    return $Call.ByID(773650321);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
index 70596fc61..8afbd8b3a 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Greet($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, $0));
-    return $resultPromise;
+    return $Call.ByID(1411160069, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
index 0c282e914..e50a4a6ab 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
index da27da53b..f017774d8 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Hello() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4249972365));
-    return $resultPromise;
+    return $Call.ByID(4249972365);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
index 0c282e914..e50a4a6ab 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
index da27da53b..f017774d8 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Hello() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4249972365));
-    return $resultPromise;
+    return $Call.ByID(4249972365);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
index 5f8cf55b5..50737a34b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,25 +18,21 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1661412647, name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.js
index e187cce22..04771d2ca 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.js
index fb1176dee..24a5de807 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
index d61e9e689..24dc0334e 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,15 +18,12 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByID(3568225479));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(3568225479).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
index cb53251ed..855602e98 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,413 +17,358 @@ import * as $models from "./models.js";
 
 /**
  * @param {number[]} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function ArrayInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3862002418, $in));
-    return $resultPromise;
+    return $Call.ByID(3862002418, $in);
 }
 
 /**
  * @param {boolean} $in
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function BoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2424639793, $in));
-    return $resultPromise;
+    return $Call.ByID(2424639793, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3132595881, $in));
-    return $resultPromise;
+    return $Call.ByID(3132595881, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2182412247, $in));
-    return $resultPromise;
+    return $Call.ByID(2182412247, $in);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int16InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3306292566, $in));
-    return $resultPromise;
+    return $Call.ByID(3306292566, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1754277916, $in));
-    return $resultPromise;
+    return $Call.ByID(1754277916, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int32InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1909469092, $in));
-    return $resultPromise;
+    return $Call.ByID(1909469092, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(4251088558, $in));
-    return $resultPromise;
+    return $Call.ByID(4251088558, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int64InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1343888303, $in));
-    return $resultPromise;
+    return $Call.ByID(1343888303, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2205561041, $in));
-    return $resultPromise;
+    return $Call.ByID(2205561041, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int8InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(572240879, $in));
-    return $resultPromise;
+    return $Call.ByID(572240879, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2189402897, $in));
-    return $resultPromise;
+    return $Call.ByID(2189402897, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function IntInIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(642881729, $in));
-    return $resultPromise;
+    return $Call.ByID(642881729, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1066151743, $in));
-    return $resultPromise;
+    return $Call.ByID(1066151743, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2718999663, $in));
-    return $resultPromise;
+    return $Call.ByID(2718999663, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2386486356, $in));
-    return $resultPromise;
+    return $Call.ByID(2386486356, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number | null }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntIntPointer($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2163571325, $in));
-    return $resultPromise;
+    return $Call.ByID(2163571325, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntSliceInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2900172572, $in));
-    return $resultPromise;
+    return $Call.ByID(2900172572, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] }} $in
- * @returns {Promise<{ [_: `${number}`]: number[] }> & { cancel(): void }}
+ * @returns {$CancellablePromise<{ [_: `${number}`]: number[] }>}
  */
 export function MapIntSliceIntInMapIntSliceIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(881980169, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(881980169, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function NoInputsStringOut() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1075577233));
-    return $resultPromise;
+    return $Call.ByID(1075577233);
 }
 
 /**
  * @param {boolean | null} $in
- * @returns {Promise<boolean | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean | null>}
  */
 export function PointerBoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3589606958, $in));
-    return $resultPromise;
+    return $Call.ByID(3589606958, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(224675106, $in));
-    return $resultPromise;
+    return $Call.ByID(224675106, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2124953624, $in));
-    return $resultPromise;
+    return $Call.ByID(2124953624, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function PointerMapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3516977899, $in));
-    return $resultPromise;
+    return $Call.ByID(3516977899, $in);
 }
 
 /**
  * @param {string | null} $in
- * @returns {Promise<string | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string | null>}
  */
 export function PointerStringInStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(229603958, $in));
-    return $resultPromise;
+    return $Call.ByID(229603958, $in);
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputNamedOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3678582682, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(3678582682, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(319259595, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(319259595, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputStringArrayOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(383995060, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(383995060, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function StringArrayInputStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1091960237, $in));
-    return $resultPromise;
+    return $Call.ByID(1091960237, $in);
 }
 
 /**
  * @param {$models.Person} $in
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function StructInputStructOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3835643147, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(3835643147, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType3($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function StructPointerInputErrorOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2447692557, $in));
-    return $resultPromise;
+    return $Call.ByID(2447692557, $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function StructPointerInputStructPointerOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2943477349, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(2943477349, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType4($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt16InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3401034892, $in));
-    return $resultPromise;
+    return $Call.ByID(3401034892, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1236957573, $in));
-    return $resultPromise;
+    return $Call.ByID(1236957573, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt32InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1160383782, $in));
-    return $resultPromise;
+    return $Call.ByID(1160383782, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1739300671, $in));
-    return $resultPromise;
+    return $Call.ByID(1739300671, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt64InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(793803239, $in));
-    return $resultPromise;
+    return $Call.ByID(793803239, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1403757716, $in));
-    return $resultPromise;
+    return $Call.ByID(1403757716, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt8InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2988345717, $in));
-    return $resultPromise;
+    return $Call.ByID(2988345717, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(518250834, $in));
-    return $resultPromise;
+    return $Call.ByID(518250834, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UIntInUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2836661285, $in));
-    return $resultPromise;
+    return $Call.ByID(2836661285, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UIntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1367187362, $in));
-    return $resultPromise;
+    return $Call.ByID(1367187362, $in);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.js
index 660f38b29..69c96370a 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Person {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
index cb53251ed..855602e98 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,413 +17,358 @@ import * as $models from "./models.js";
 
 /**
  * @param {number[]} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function ArrayInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3862002418, $in));
-    return $resultPromise;
+    return $Call.ByID(3862002418, $in);
 }
 
 /**
  * @param {boolean} $in
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function BoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2424639793, $in));
-    return $resultPromise;
+    return $Call.ByID(2424639793, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3132595881, $in));
-    return $resultPromise;
+    return $Call.ByID(3132595881, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2182412247, $in));
-    return $resultPromise;
+    return $Call.ByID(2182412247, $in);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int16InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3306292566, $in));
-    return $resultPromise;
+    return $Call.ByID(3306292566, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1754277916, $in));
-    return $resultPromise;
+    return $Call.ByID(1754277916, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int32InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1909469092, $in));
-    return $resultPromise;
+    return $Call.ByID(1909469092, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(4251088558, $in));
-    return $resultPromise;
+    return $Call.ByID(4251088558, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int64InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1343888303, $in));
-    return $resultPromise;
+    return $Call.ByID(1343888303, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2205561041, $in));
-    return $resultPromise;
+    return $Call.ByID(2205561041, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int8InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(572240879, $in));
-    return $resultPromise;
+    return $Call.ByID(572240879, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2189402897, $in));
-    return $resultPromise;
+    return $Call.ByID(2189402897, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function IntInIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(642881729, $in));
-    return $resultPromise;
+    return $Call.ByID(642881729, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1066151743, $in));
-    return $resultPromise;
+    return $Call.ByID(1066151743, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2718999663, $in));
-    return $resultPromise;
+    return $Call.ByID(2718999663, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2386486356, $in));
-    return $resultPromise;
+    return $Call.ByID(2386486356, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number | null }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntIntPointer($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2163571325, $in));
-    return $resultPromise;
+    return $Call.ByID(2163571325, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntSliceInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2900172572, $in));
-    return $resultPromise;
+    return $Call.ByID(2900172572, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] }} $in
- * @returns {Promise<{ [_: `${number}`]: number[] }> & { cancel(): void }}
+ * @returns {$CancellablePromise<{ [_: `${number}`]: number[] }>}
  */
 export function MapIntSliceIntInMapIntSliceIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(881980169, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(881980169, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function NoInputsStringOut() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1075577233));
-    return $resultPromise;
+    return $Call.ByID(1075577233);
 }
 
 /**
  * @param {boolean | null} $in
- * @returns {Promise<boolean | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean | null>}
  */
 export function PointerBoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3589606958, $in));
-    return $resultPromise;
+    return $Call.ByID(3589606958, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(224675106, $in));
-    return $resultPromise;
+    return $Call.ByID(224675106, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2124953624, $in));
-    return $resultPromise;
+    return $Call.ByID(2124953624, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function PointerMapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3516977899, $in));
-    return $resultPromise;
+    return $Call.ByID(3516977899, $in);
 }
 
 /**
  * @param {string | null} $in
- * @returns {Promise<string | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string | null>}
  */
 export function PointerStringInStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(229603958, $in));
-    return $resultPromise;
+    return $Call.ByID(229603958, $in);
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputNamedOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3678582682, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(3678582682, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(319259595, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(319259595, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputStringArrayOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(383995060, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(383995060, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function StringArrayInputStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1091960237, $in));
-    return $resultPromise;
+    return $Call.ByID(1091960237, $in);
 }
 
 /**
  * @param {$models.Person} $in
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function StructInputStructOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3835643147, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(3835643147, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType3($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function StructPointerInputErrorOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2447692557, $in));
-    return $resultPromise;
+    return $Call.ByID(2447692557, $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function StructPointerInputStructPointerOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2943477349, $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(2943477349, $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType4($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt16InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3401034892, $in));
-    return $resultPromise;
+    return $Call.ByID(3401034892, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1236957573, $in));
-    return $resultPromise;
+    return $Call.ByID(1236957573, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt32InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1160383782, $in));
-    return $resultPromise;
+    return $Call.ByID(1160383782, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1739300671, $in));
-    return $resultPromise;
+    return $Call.ByID(1739300671, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt64InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(793803239, $in));
-    return $resultPromise;
+    return $Call.ByID(793803239, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1403757716, $in));
-    return $resultPromise;
+    return $Call.ByID(1403757716, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt8InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2988345717, $in));
-    return $resultPromise;
+    return $Call.ByID(2988345717, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(518250834, $in));
-    return $resultPromise;
+    return $Call.ByID(518250834, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UIntInUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2836661285, $in));
-    return $resultPromise;
+    return $Call.ByID(2836661285, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UIntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1367187362, $in));
-    return $resultPromise;
+    return $Call.ByID(1367187362, $in);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.js
index 660f38b29..69c96370a 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Person {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
index d20ce5791..9dfe48511 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
index d20ce5791..9dfe48511 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
index 5f8cf55b5..50737a34b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,25 +18,21 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1661412647, name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.js
index 0daca427b..d7bfe75cf 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.js
index fb1176dee..24a5de807 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
index 63319bf06..de3c9d51d 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,15 +18,12 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1491748400));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByID(1491748400).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/encoding/json/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/encoding/json/models.js
index b7e840816..96abf0ef1 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/encoding/json/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/encoding/json/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Marshaler is the interface implemented by types that
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/encoding/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/encoding/models.js
index bbabe728a..59cfef5bd 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/encoding/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/encoding/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * TextMarshaler is the interface implemented by an object that can
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
index 05944bc02..2352f40bc 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -22,81 +22,63 @@ import * as $models from "./models.js";
 /**
  * Get someone.
  * @param {$models.Alias} aliasValue
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function Get(aliasValue) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Get", aliasValue));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.Get", aliasValue).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType0($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * Apparently, aliases are all the rage right now.
  * @param {$models.AliasedPerson} p
- * @returns {Promise<$models.StrangelyAliasedPerson> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.StrangelyAliasedPerson>}
  */
 export function GetButAliased(p) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GetButAliased", p));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.GetButAliased", p).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType0($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * Get someone quite different.
- * @returns {Promise<$models.GenericPerson<boolean>> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.GenericPerson<boolean>>}
  */
 export function GetButDifferent() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GetButDifferent"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.GetButDifferent").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
- * @returns {Promise<nobindingshere$0.PrivatePerson> & { cancel(): void }}
+ * @returns {$CancellablePromise<nobindingshere$0.PrivatePerson>}
  */
 export function GetButForeignPrivateAlias() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GetButForeignPrivateAlias"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.GetButForeignPrivateAlias").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
- * @returns {Promise<$models.AliasGroup> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.AliasGroup>}
  */
 export function GetButGenericAliases() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GetButGenericAliases"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.GetButGenericAliases").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType3($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * Greet a lot of unusual things.
  * @param {$models.EmptyAliasStruct} $0
  * @param {$models.EmptyStruct} $1
- * @returns {Promise<$models.AliasStruct> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.AliasStruct>}
  */
 export function Greet($0, $1) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", $0, $1));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.Greet", $0, $1).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType7($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js
index 977ad4722..3de57786d 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * A nice type Alias.
@@ -203,7 +203,7 @@ export class GenericPerson {
      * Given creation functions for each type parameter,
      * returns a creation function for a concrete instance
      * of the generic class GenericPerson.
-     * @template T
+     * @template [T=any]
      * @param {(source: any) => T} $$createParamT
      * @returns {($$source?: any) => GenericPerson<T>}
      */
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
index f038563f2..54e794649 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function TestMethod() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service7.TestMethod"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service7.TestMethod");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
index 9a316a10d..f6e8901a9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function TestMethod2() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service9.TestMethod2"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service9.TestMethod2");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
index 7d3bc5c01..b5c320f3d 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,9 +19,8 @@ import * as $models from "./models.js";
  * Greet does XYZ
  * @param {$models.Person} person
  * @param {$models.Embedded1} emb
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(person, emb) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", person, emb));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", person, emb);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.js
index d6da8c762..7a0edf1c7 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Embedded1 {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
index 1ea653b33..fae9496c1 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -25,17 +25,14 @@ import * as $models from "./models.js";
  * @param {{ [_: `${number}`]: boolean | null }} assoc
  * @param {(number | null)[]} $4
  * @param {string[]} other
- * @returns {Promise<[$models.Person, any, number[]]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Person, any, number[]]>}
  */
 export function Greet(str, people, $2, assoc, $4, ...other) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", str, people, $2, assoc, $4, other));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.Greet", str, people, $2, assoc, $4, other).then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[2] = $$createType1($result[2]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.js
index 70a01e64c..82af81baf 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Person represents a person
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
index bee868a52..651fd2d97 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,17 +17,14 @@ import * as $models from "./models.js";
 
 /**
  * Make a cycle.
- * @returns {Promise<[$models.StructA, $models.StructC]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.StructA, $models.StructC]>}
  */
 export function MakeCycles() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MakeCycles"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.MakeCycles").then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.js
index d101a661f..f24f5a2c9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class StructA {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
index 1880b7b23..b4cbaa216 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,17 +17,14 @@ import * as $models from "./models.js";
 
 /**
  * Make a cycle.
- * @returns {Promise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]>}
  */
 export function MakeCycles() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MakeCycles"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.MakeCycles").then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType9($result[1]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.js
index f4a68bd4b..47d41f572 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * @typedef {Cyclic | null} Alias
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
index c2d455ec3..51a9c6be9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * @param {$models.InternalModel} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.InternalService.Method", $0));
-    return $resultPromise;
+    return $Call.ByName("main.InternalService.Method", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.js
index fad4870ca..291a3cecf 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * An exported but internal model.
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.js
index b38ff6238..274f4eed4 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Dummy {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
index 44c3fdf12..c59f8e184 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -12,20 +12,18 @@ import * as otherpackage$0 from "./otherpackage/models.js";
 
 /**
  * @param {string} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 function InternalMethod($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.Service.InternalMethod", $0));
-    return $resultPromise;
+    return $Call.ByName("main.Service.InternalMethod", $0);
 }
 
 /**
  * @param {otherpackage$0.Dummy} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function VisibleMethod($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.Service.VisibleMethod", $0));
-    return $resultPromise;
+    return $Call.ByName("main.Service.VisibleMethod", $0);
 }
 
 /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
index a12a0137d..8a93f316f 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * @param {$models.unexportedModel} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.unexportedService.Method", $0));
-    return $resultPromise;
+    return $Call.ByName("main.unexportedService.Method", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
index d2e4ab159..494240982 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
@@ -9,50 +9,45 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Comment 1.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method1() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method1"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method1");
 }
 
 /**
  * Comment 2.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method2() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method2"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method2");
 }
 
 /**
  * Comment 3a.
  * Comment 3b.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method3() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method3"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method3");
 }
 
 /**
  * Comment 4.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method4() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method4"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method4");
 }
 
 /**
  * Comment 5.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method5() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method5"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method5");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
index 47ca987a9..fd18bf8a3 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,25 +19,21 @@ import * as $models from "./models.js";
  * Greet does XYZ
  * @param {string} name
  * @param {$models.Title} title
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name, title) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name, title));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name, title);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.js
index cad356265..2c5df9ee7 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Age is an integer with some predefined values
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
index f01cfc84f..125c76d13 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,9 +19,8 @@ import * as services$0 from "./services/models.js";
  * Greet does XYZ
  * @param {string} name
  * @param {services$0.Title} title
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name, title) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name, title));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name, title);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.js
index 0e7acabe2..65ebfa2f7 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * @readonly
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
index 0ed0e3660..16a94df37 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,25 +18,21 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.js
index 860939563..0ab295133 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.js
index fb1176dee..24a5de807 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
index 7426508f7..ba2c614cd 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,15 +18,12 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services.OtherService.Yay"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services.OtherService.Yay").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
index 0ed0e3660..16a94df37 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,25 +18,21 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.js
index 5b28ee2f6..29a95e11e 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.js
index fb1176dee..24a5de807 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
index d01fa13f6..f6269f0b5 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,15 +18,12 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other.OtherService.Yay"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other.OtherService.Yay").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
index 1cb3ece11..e6a0e3a74 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
index 83b635bea..6364fa8f6 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
index 541cf1c9c..e91d18592 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
@@ -9,24 +9,22 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function GreetWithContext(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GreetWithContext", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.GreetWithContext", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
index 83b635bea..6364fa8f6 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js
index 960844103..1dc5bfc38 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * @template S
@@ -1227,7 +1227,15 @@ export class Maps {
      * Given creation functions for each type parameter,
      * returns a creation function for a concrete instance
      * of the generic class Maps.
-     * @template R,S,T,U,V,W,X,Y,Z
+     * @template [R=any]
+     * @template [S=any]
+     * @template [T=any]
+     * @template [U=any]
+     * @template [V=any]
+     * @template [W=any]
+     * @template [X=any]
+     * @template [Y=any]
+     * @template [Z=any]
      * @param {(source: any) => R} $$createParamR
      * @param {(source: any) => S} $$createParamS
      * @param {(source: any) => T} $$createParamT
@@ -1926,24 +1934,24 @@ const $$createType55 = $Create.Map($Create.Any, $Create.Any);
 const $$createType56 = $Create.Map($Create.Any, $Create.Any);
 const $$createType57 = $Create.Map($Create.Any, $Create.Any);
 const $$createType58 = $Create.Map($Create.Any, $Create.Any);
-const $$createType59 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType60 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType61 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType62 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType63 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType64 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType65 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType66 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType67 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType68 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType69 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType70 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType71 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType72 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType73 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType74 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType75 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType76 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
+const $$createType59 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType60 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType61 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType62 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType63 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType64 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType65 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType66 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType67 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType68 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType69 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType70 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType71 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType72 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType73 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType74 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType75 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
+const $$createType76 = /** @type {(...args: any[]) => any} */(($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any));
 const $$createType77 = $Create.Map($Create.Any, $Create.Any);
 const $$createType78 = $Create.Map($Create.Any, $Create.Any);
 const $$createType79 = $Create.Map($Create.Any, $Create.Any);
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
index b7af4dba5..cc98f3a89 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
@@ -4,22 +4,19 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
 /**
- * @returns {Promise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>>}
  */
 export function Method() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.Service.Method"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.Service.Method").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType0($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.js
index 1871e9492..77fe552ea 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
index 52950fdbd..e6c23e4f0 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
@@ -4,22 +4,19 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
 /**
- * @returns {Promise<$models.Data> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Data>}
  */
 export function Method() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.Service.Method"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.Service.Method").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType0($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js
index f88aa955a..b42e223fa 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -45,7 +45,7 @@ export class HowDifferent {
      * Given creation functions for each type parameter,
      * returns a creation function for a concrete instance
      * of the generic class HowDifferent.
-     * @template How
+     * @template [How=any]
      * @param {(source: any) => How} $$createParamHow
      * @returns {($$source?: any) => HowDifferent<How>}
      */
@@ -175,7 +175,7 @@ export const PrivatePerson = personImpl;
  */
 
 // Private type creation functions
-const $$createType0 = ($$createParamHow) => $Create.Map($Create.Any, $$createParamHow);
-const $$createType1 = ($$createParamHow) => $Create.Array($$createType0($$createParamHow));
+const $$createType0 = /** @type {(...args: any[]) => any} */(($$createParamHow) => $Create.Map($Create.Any, $$createParamHow));
+const $$createType1 = /** @type {(...args: any[]) => any} */(($$createParamHow) => $Create.Array($$createType0($$createParamHow)));
 const $$createType2 = other$0.OtherPerson.createFrom($Create.Any);
 const $$createType3 = $Create.Array($$createType2);
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.js
index c10d33908..89992cacf 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * OtherPerson is like a person, but different.
@@ -40,7 +40,7 @@ export class OtherPerson {
      * Given creation functions for each type parameter,
      * returns a creation function for a concrete instance
      * of the generic class OtherPerson.
-     * @template T
+     * @template [T=any]
      * @param {(source: any) => T} $$createParamT
      * @returns {($$source?: any) => OtherPerson<T>}
      */
@@ -57,4 +57,4 @@ export class OtherPerson {
 }
 
 // Private type creation functions
-const $$createType0 = ($$createParamT) => $Create.Array($$createParamT);
+const $$createType0 = /** @type {(...args: any[]) => any} */(($$createParamT) => $Create.Array($$createParamT));
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
index bdea648c1..d2819bc4b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
@@ -9,13 +9,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other.OtherMethods.LikeThisOtherOne"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other.OtherMethods.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
index 300f5807b..35bc3579d 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,27 +17,23 @@ import * as $models from "./models.js";
 
 /**
  * LikeThisOne is an example method that does nothing.
- * @returns {Promise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]>}
  */
 export function LikeThisOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOne"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOne").then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         $result[2] = $$createType2($result[2]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOtherOne"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOtherOne");
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
index 593ea0136..0497b16bc 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
@@ -9,13 +9,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.EmbedOther.LikeThisOtherOne"));
-    return $resultPromise;
+    return $Call.ByName("main.EmbedOther.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
index 458575bd1..903e4153f 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,27 +17,23 @@ import * as nobindingshere$0 from "../no_bindings_here/models.js";
 
 /**
  * LikeThisOne is an example method that does nothing.
- * @returns {Promise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]>}
  */
 export function LikeThisOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.EmbedService.LikeThisOne"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.EmbedService.LikeThisOne").then(/** @type {($result: any) => any} */(($result) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         $result[2] = $$createType2($result[2]);
         return $result;
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.EmbedService.LikeThisOtherOne"));
-    return $resultPromise;
+    return $Call.ByName("main.EmbedService.LikeThisOtherOne");
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
index dfc42065c..fe683f548 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Greet($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", $0));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
index 1cb3ece11..e6a0e3a74 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
index 05f7be7f8..69652f626 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Hello() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.OtherService.Hello"));
-    return $resultPromise;
+    return $Call.ByName("main.OtherService.Hello");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
index 1cb3ece11..e6a0e3a74 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
index 05f7be7f8..69652f626 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Hello() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.OtherService.Hello"));
-    return $resultPromise;
+    return $Call.ByName("main.OtherService.Hello");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
index 0ed0e3660..16a94df37 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,25 +18,21 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.js
index e187cce22..04771d2ca 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.js
index fb1176dee..24a5de807 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
index 105fc3ea8..327b15c9c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,15 +18,12 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services.OtherService.Yay"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services.OtherService.Yay").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
index eb69383fb..d811d97ce 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,413 +17,358 @@ import * as $models from "./models.js";
 
 /**
  * @param {number[]} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function ArrayInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.ArrayInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.ArrayInt", $in);
 }
 
 /**
  * @param {boolean} $in
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function BoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.BoolInBoolOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.BoolInBoolOut", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Float32InFloat32Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Float32InFloat32Out", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Float64InFloat64Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Float64InFloat64Out", $in);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int16InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int16InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int16InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int16PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int32InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int32InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int32InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int32PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int64InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int64InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int64InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int64PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int8InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int8InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int8InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int8PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function IntInIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntInIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntInIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntPointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntPointerInAndOutput", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntInt", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number | null }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntIntPointer($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntIntPointer", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntIntPointer", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntSliceInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntSliceInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntSliceInt", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] }} $in
- * @returns {Promise<{ [_: `${number}`]: number[] }> & { cancel(): void }}
+ * @returns {$CancellablePromise<{ [_: `${number}`]: number[] }>}
  */
 export function MapIntSliceIntInMapIntSliceIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function NoInputsStringOut() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NoInputsStringOut"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
 /**
  * @param {boolean | null} $in
- * @returns {Promise<boolean | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean | null>}
  */
 export function PointerBoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerBoolInBoolOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function PointerMapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerMapIntInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerMapIntInt", $in);
 }
 
 /**
  * @param {string | null} $in
- * @returns {Promise<string | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string | null>}
  */
 export function PointerStringInStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerStringInStringOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerStringInStringOut", $in);
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputNamedOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputStringArrayOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function StringArrayInputStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputStringOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputStringOut", $in);
 }
 
 /**
  * @param {$models.Person} $in
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function StructInputStructOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructInputStructOutput", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StructInputStructOutput", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType3($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function StructPointerInputErrorOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function StructPointerInputStructPointerOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType4($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt16InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt16InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt16InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt32InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt32InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt32InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt64InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt64InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt64InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt8InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt8InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt8InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UIntInUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UIntInUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UIntInUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UIntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UIntPointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.js
index 660f38b29..69c96370a 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Person {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
index eb69383fb..d811d97ce 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,413 +17,358 @@ import * as $models from "./models.js";
 
 /**
  * @param {number[]} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function ArrayInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.ArrayInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.ArrayInt", $in);
 }
 
 /**
  * @param {boolean} $in
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function BoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.BoolInBoolOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.BoolInBoolOut", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Float32InFloat32Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Float32InFloat32Out", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Float64InFloat64Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Float64InFloat64Out", $in);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int16InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int16InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int16InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int16PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int32InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int32InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int32InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int32PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int64InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int64InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int64InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int64PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int8InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int8InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int8InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int8PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function IntInIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntInIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntInIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntPointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntPointerInAndOutput", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntInt", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number | null }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntIntPointer($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntIntPointer", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntIntPointer", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] }} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntSliceInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntSliceInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntSliceInt", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] }} $in
- * @returns {Promise<{ [_: `${number}`]: number[] }> & { cancel(): void }}
+ * @returns {$CancellablePromise<{ [_: `${number}`]: number[] }>}
  */
 export function MapIntSliceIntInMapIntSliceIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function NoInputsStringOut() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NoInputsStringOut"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
 /**
  * @param {boolean | null} $in
- * @returns {Promise<boolean | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean | null>}
  */
 export function PointerBoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerBoolInBoolOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function PointerMapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerMapIntInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerMapIntInt", $in);
 }
 
 /**
  * @param {string | null} $in
- * @returns {Promise<string | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string | null>}
  */
 export function PointerStringInStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerStringInStringOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerStringInStringOut", $in);
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputNamedOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string[]> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[]>}
  */
 export function StringArrayInputStringArrayOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType2($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {string[]} $in
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function StringArrayInputStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputStringOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputStringOut", $in);
 }
 
 /**
  * @param {$models.Person} $in
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function StructInputStructOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructInputStructOutput", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StructInputStructOutput", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType3($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function StructPointerInputErrorOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function StructPointerInputStructPointerOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType4($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt16InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt16InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt16InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt32InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt32InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt32InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt64InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt64InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt64InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt8InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt8InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt8InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UIntInUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UIntInUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UIntInUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UIntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UIntPointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.js
index 660f38b29..69c96370a 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Person {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
index 83b635bea..6364fa8f6 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
index 83b635bea..6364fa8f6 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
index 0ed0e3660..16a94df37 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,25 +18,21 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.js
index 0daca427b..d7bfe75cf 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.js
index fb1176dee..24a5de807 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
index 47ce5c70a..d413366d6 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,15 +18,12 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services.OtherService.Yay"));
-    let $typingPromise = /** @type {any} */($resultPromise.then(($result) => {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services.OtherService.Yay").then(/** @type {($result: any) => any} */(($result) => {
         return $$createType1($result);
     }));
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
index ef8919860..16b76f94c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -22,55 +22,49 @@ import * as $models from "./models.js";
 /**
  * Get someone.
  * @param {$models.Alias} aliasValue
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function Get(aliasValue) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1928502664, aliasValue));
-    return $resultPromise;
+    return $Call.ByID(1928502664, aliasValue);
 }
 
 /**
  * Apparently, aliases are all the rage right now.
  * @param {$models.AliasedPerson} p
- * @returns {Promise<$models.StrangelyAliasedPerson> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.StrangelyAliasedPerson>}
  */
 export function GetButAliased(p) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1896499664, p));
-    return $resultPromise;
+    return $Call.ByID(1896499664, p);
 }
 
 /**
  * Get someone quite different.
- * @returns {Promise<$models.GenericPerson<boolean>> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.GenericPerson<boolean>>}
  */
 export function GetButDifferent() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2240931744));
-    return $resultPromise;
+    return $Call.ByID(2240931744);
 }
 
 /**
- * @returns {Promise<nobindingshere$0.PrivatePerson> & { cancel(): void }}
+ * @returns {$CancellablePromise<nobindingshere$0.PrivatePerson>}
  */
 export function GetButForeignPrivateAlias() {
-    let $resultPromise = /** @type {any} */($Call.ByID(643456960));
-    return $resultPromise;
+    return $Call.ByID(643456960);
 }
 
 /**
- * @returns {Promise<$models.AliasGroup> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.AliasGroup>}
  */
 export function GetButGenericAliases() {
-    let $resultPromise = /** @type {any} */($Call.ByID(914093800));
-    return $resultPromise;
+    return $Call.ByID(914093800);
 }
 
 /**
  * Greet a lot of unusual things.
  * @param {$models.EmptyAliasStruct} $0
  * @param {$models.EmptyStruct} $1
- * @returns {Promise<$models.AliasStruct> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.AliasStruct>}
  */
 export function Greet($0, $1) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, $0, $1));
-    return $resultPromise;
+    return $Call.ByID(1411160069, $0, $1);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
index a12e0e871..2a4188bce 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function TestMethod() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2241101727));
-    return $resultPromise;
+    return $Call.ByID(2241101727);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
index 97ffbf7be..ead6f5da4 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function TestMethod2() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1556848345));
-    return $resultPromise;
+    return $Call.ByID(1556848345);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
index c8cf7d8a4..995d46c13 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,9 +19,8 @@ import * as $models from "./models.js";
  * Greet does XYZ
  * @param {$models.Person} person
  * @param {$models.Embedded1} emb
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(person, emb) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, person, emb));
-    return $resultPromise;
+    return $Call.ByID(1411160069, person, emb);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
index dd0ac2d2c..0285f6ca4 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -25,9 +25,8 @@ import * as $models from "./models.js";
  * @param {{ [_: `${number}`]: boolean | null } | null} assoc
  * @param {(number | null)[] | null} $4
  * @param {string[]} other
- * @returns {Promise<[$models.Person, any, number[] | null]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Person, any, number[] | null]>}
  */
 export function Greet(str, people, $2, assoc, $4, ...other) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, str, people, $2, assoc, $4, other));
-    return $resultPromise;
+    return $Call.ByID(1411160069, str, people, $2, assoc, $4, other);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
index 7bb0caa65..53027124b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * Make a cycle.
- * @returns {Promise<[$models.StructA, $models.StructC]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.StructA, $models.StructC]>}
  */
 export function MakeCycles() {
-    let $resultPromise = /** @type {any} */($Call.ByID(440020721));
-    return $resultPromise;
+    return $Call.ByID(440020721);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
index dede5e3da..382e6bac3 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * Make a cycle.
- * @returns {Promise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]>}
  */
 export function MakeCycles() {
-    let $resultPromise = /** @type {any} */($Call.ByID(440020721));
-    return $resultPromise;
+    return $Call.ByID(440020721);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
index 1f5b27968..f96a46e77 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * @param {$models.InternalModel} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(538079117, $0));
-    return $resultPromise;
+    return $Call.ByID(538079117, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
index c6fa4555b..0d869be84 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -12,20 +12,18 @@ import * as otherpackage$0 from "./otherpackage/models.js";
 
 /**
  * @param {string} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 function InternalMethod($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3518775569, $0));
-    return $resultPromise;
+    return $Call.ByID(3518775569, $0);
 }
 
 /**
  * @param {otherpackage$0.Dummy} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function VisibleMethod($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(474018228, $0));
-    return $resultPromise;
+    return $Call.ByID(474018228, $0);
 }
 
 /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
index b29fdb615..573852d5a 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * @param {$models.unexportedModel} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(37626172, $0));
-    return $resultPromise;
+    return $Call.ByID(37626172, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
index 79d37c9ae..d364009d6 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
@@ -9,50 +9,45 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Comment 1.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method1() {
-    let $resultPromise = /** @type {any} */($Call.ByID(841558284));
-    return $resultPromise;
+    return $Call.ByID(841558284);
 }
 
 /**
  * Comment 2.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method2() {
-    let $resultPromise = /** @type {any} */($Call.ByID(891891141));
-    return $resultPromise;
+    return $Call.ByID(891891141);
 }
 
 /**
  * Comment 3a.
  * Comment 3b.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method3() {
-    let $resultPromise = /** @type {any} */($Call.ByID(875113522));
-    return $resultPromise;
+    return $Call.ByID(875113522);
 }
 
 /**
  * Comment 4.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method4() {
-    let $resultPromise = /** @type {any} */($Call.ByID(791225427));
-    return $resultPromise;
+    return $Call.ByID(791225427);
 }
 
 /**
  * Comment 5.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method5() {
-    let $resultPromise = /** @type {any} */($Call.ByID(774447808));
-    return $resultPromise;
+    return $Call.ByID(774447808);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
index 8596b37d8..f14b3b6b2 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,19 +19,17 @@ import * as $models from "./models.js";
  * Greet does XYZ
  * @param {string} name
  * @param {$models.Title} title
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name, title) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name, title));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name, title);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    return $resultPromise;
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
index 0620037d8..508c12b72 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,9 +19,8 @@ import * as services$0 from "./services/models.js";
  * Greet does XYZ
  * @param {string} name
  * @param {services$0.Title} title
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name, title) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name, title));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name, title);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
index 4e1a41312..40d2245b9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,19 +18,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    return $resultPromise;
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
index 96dc85e8f..dff4e0d5f 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,9 +18,8 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2007737399));
-    return $resultPromise;
+    return $Call.ByID(2007737399);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
index 4e1a41312..40d2245b9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,19 +18,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    return $resultPromise;
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
index acc6a59de..182a9e091 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,9 +18,8 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2447353446));
-    return $resultPromise;
+    return $Call.ByID(2447353446);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
index cf528985b..9343d5531 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
index a46cb2e4f..6c1448d81 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
index 20aaad58f..be0cf5ce8 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
@@ -9,24 +9,22 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function GreetWithContext(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1310150960, name));
-    return $resultPromise;
+    return $Call.ByID(1310150960, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
index a46cb2e4f..6c1448d81 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
index 3e9005230..810db1875 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
@@ -4,16 +4,15 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
 /**
- * @returns {Promise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>>}
  */
 export function Method() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4021345184));
-    return $resultPromise;
+    return $Call.ByID(4021345184);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
index a376469fb..5ba9fe470 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
@@ -4,16 +4,15 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
 /**
- * @returns {Promise<$models.Data> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Data>}
  */
 export function Method() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4021345184));
-    return $resultPromise;
+    return $Call.ByID(4021345184);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
index 0fa21bec4..d647deeb4 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
@@ -9,13 +9,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(3606939272));
-    return $resultPromise;
+    return $Call.ByID(3606939272);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
index fb7703b90..dca6f4e6c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,18 +17,16 @@ import * as $models from "./models.js";
 
 /**
  * LikeThisOne is an example method that does nothing.
- * @returns {Promise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]>}
  */
 export function LikeThisOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2124352079));
-    return $resultPromise;
+    return $Call.ByID(2124352079);
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4281222271));
-    return $resultPromise;
+    return $Call.ByID(4281222271);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
index de602db49..19bdcac29 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
@@ -9,13 +9,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(3566862802));
-    return $resultPromise;
+    return $Call.ByID(3566862802);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
index 48bff3e1b..f50558b8c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,18 +17,16 @@ import * as nobindingshere$0 from "../no_bindings_here/models.js";
 
 /**
  * LikeThisOne is an example method that does nothing.
- * @returns {Promise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]>}
  */
 export function LikeThisOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2590614085));
-    return $resultPromise;
+    return $Call.ByID(2590614085);
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByID(773650321));
-    return $resultPromise;
+    return $Call.ByID(773650321);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
index 5c4ed0a89..3597b6460 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Greet($0) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, $0));
-    return $resultPromise;
+    return $Call.ByID(1411160069, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
index cf528985b..9343d5531 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
index 09356e523..b4f3f039c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Hello() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4249972365));
-    return $resultPromise;
+    return $Call.ByID(4249972365);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
index cf528985b..9343d5531 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
index 09356e523..b4f3f039c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Hello() {
-    let $resultPromise = /** @type {any} */($Call.ByID(4249972365));
-    return $resultPromise;
+    return $Call.ByID(4249972365);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
index 4e1a41312..40d2245b9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,19 +18,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    return $resultPromise;
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
index 5f91bf18c..7a4789f75 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,9 +18,8 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByID(3568225479));
-    return $resultPromise;
+    return $Call.ByID(3568225479);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
index a8b648ed1..ddd5e8916 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,387 +17,344 @@ import * as $models from "./models.js";
 
 /**
  * @param {number[]} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function ArrayInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3862002418, $in));
-    return $resultPromise;
+    return $Call.ByID(3862002418, $in);
 }
 
 /**
  * @param {boolean} $in
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function BoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2424639793, $in));
-    return $resultPromise;
+    return $Call.ByID(2424639793, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3132595881, $in));
-    return $resultPromise;
+    return $Call.ByID(3132595881, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2182412247, $in));
-    return $resultPromise;
+    return $Call.ByID(2182412247, $in);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int16InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3306292566, $in));
-    return $resultPromise;
+    return $Call.ByID(3306292566, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1754277916, $in));
-    return $resultPromise;
+    return $Call.ByID(1754277916, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int32InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1909469092, $in));
-    return $resultPromise;
+    return $Call.ByID(1909469092, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(4251088558, $in));
-    return $resultPromise;
+    return $Call.ByID(4251088558, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int64InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1343888303, $in));
-    return $resultPromise;
+    return $Call.ByID(1343888303, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2205561041, $in));
-    return $resultPromise;
+    return $Call.ByID(2205561041, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int8InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(572240879, $in));
-    return $resultPromise;
+    return $Call.ByID(572240879, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2189402897, $in));
-    return $resultPromise;
+    return $Call.ByID(2189402897, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function IntInIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(642881729, $in));
-    return $resultPromise;
+    return $Call.ByID(642881729, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1066151743, $in));
-    return $resultPromise;
+    return $Call.ByID(1066151743, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2718999663, $in));
-    return $resultPromise;
+    return $Call.ByID(2718999663, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2386486356, $in));
-    return $resultPromise;
+    return $Call.ByID(2386486356, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number | null } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntIntPointer($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2163571325, $in));
-    return $resultPromise;
+    return $Call.ByID(2163571325, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] | null } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntSliceInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2900172572, $in));
-    return $resultPromise;
+    return $Call.ByID(2900172572, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] | null } | null} $in
- * @returns {Promise<{ [_: `${number}`]: number[] | null } | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<{ [_: `${number}`]: number[] | null } | null>}
  */
 export function MapIntSliceIntInMapIntSliceIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(881980169, $in));
-    return $resultPromise;
+    return $Call.ByID(881980169, $in);
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function NoInputsStringOut() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1075577233));
-    return $resultPromise;
+    return $Call.ByID(1075577233);
 }
 
 /**
  * @param {boolean | null} $in
- * @returns {Promise<boolean | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean | null>}
  */
 export function PointerBoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3589606958, $in));
-    return $resultPromise;
+    return $Call.ByID(3589606958, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(224675106, $in));
-    return $resultPromise;
+    return $Call.ByID(224675106, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2124953624, $in));
-    return $resultPromise;
+    return $Call.ByID(2124953624, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function PointerMapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3516977899, $in));
-    return $resultPromise;
+    return $Call.ByID(3516977899, $in);
 }
 
 /**
  * @param {string | null} $in
- * @returns {Promise<string | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string | null>}
  */
 export function PointerStringInStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(229603958, $in));
-    return $resultPromise;
+    return $Call.ByID(229603958, $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputNamedOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3678582682, $in));
-    return $resultPromise;
+    return $Call.ByID(3678582682, $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(319259595, $in));
-    return $resultPromise;
+    return $Call.ByID(319259595, $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputStringArrayOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(383995060, $in));
-    return $resultPromise;
+    return $Call.ByID(383995060, $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function StringArrayInputStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1091960237, $in));
-    return $resultPromise;
+    return $Call.ByID(1091960237, $in);
 }
 
 /**
  * @param {$models.Person} $in
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function StructInputStructOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3835643147, $in));
-    return $resultPromise;
+    return $Call.ByID(3835643147, $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function StructPointerInputErrorOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2447692557, $in));
-    return $resultPromise;
+    return $Call.ByID(2447692557, $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function StructPointerInputStructPointerOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2943477349, $in));
-    return $resultPromise;
+    return $Call.ByID(2943477349, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt16InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3401034892, $in));
-    return $resultPromise;
+    return $Call.ByID(3401034892, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1236957573, $in));
-    return $resultPromise;
+    return $Call.ByID(1236957573, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt32InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1160383782, $in));
-    return $resultPromise;
+    return $Call.ByID(1160383782, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1739300671, $in));
-    return $resultPromise;
+    return $Call.ByID(1739300671, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt64InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(793803239, $in));
-    return $resultPromise;
+    return $Call.ByID(793803239, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1403757716, $in));
-    return $resultPromise;
+    return $Call.ByID(1403757716, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt8InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2988345717, $in));
-    return $resultPromise;
+    return $Call.ByID(2988345717, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(518250834, $in));
-    return $resultPromise;
+    return $Call.ByID(518250834, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UIntInUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2836661285, $in));
-    return $resultPromise;
+    return $Call.ByID(2836661285, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UIntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1367187362, $in));
-    return $resultPromise;
+    return $Call.ByID(1367187362, $in);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
index a8b648ed1..ddd5e8916 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,387 +17,344 @@ import * as $models from "./models.js";
 
 /**
  * @param {number[]} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function ArrayInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3862002418, $in));
-    return $resultPromise;
+    return $Call.ByID(3862002418, $in);
 }
 
 /**
  * @param {boolean} $in
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function BoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2424639793, $in));
-    return $resultPromise;
+    return $Call.ByID(2424639793, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3132595881, $in));
-    return $resultPromise;
+    return $Call.ByID(3132595881, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2182412247, $in));
-    return $resultPromise;
+    return $Call.ByID(2182412247, $in);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int16InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3306292566, $in));
-    return $resultPromise;
+    return $Call.ByID(3306292566, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1754277916, $in));
-    return $resultPromise;
+    return $Call.ByID(1754277916, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int32InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1909469092, $in));
-    return $resultPromise;
+    return $Call.ByID(1909469092, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(4251088558, $in));
-    return $resultPromise;
+    return $Call.ByID(4251088558, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int64InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1343888303, $in));
-    return $resultPromise;
+    return $Call.ByID(1343888303, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2205561041, $in));
-    return $resultPromise;
+    return $Call.ByID(2205561041, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int8InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(572240879, $in));
-    return $resultPromise;
+    return $Call.ByID(572240879, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2189402897, $in));
-    return $resultPromise;
+    return $Call.ByID(2189402897, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function IntInIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(642881729, $in));
-    return $resultPromise;
+    return $Call.ByID(642881729, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1066151743, $in));
-    return $resultPromise;
+    return $Call.ByID(1066151743, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2718999663, $in));
-    return $resultPromise;
+    return $Call.ByID(2718999663, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2386486356, $in));
-    return $resultPromise;
+    return $Call.ByID(2386486356, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number | null } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntIntPointer($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2163571325, $in));
-    return $resultPromise;
+    return $Call.ByID(2163571325, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] | null } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntSliceInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2900172572, $in));
-    return $resultPromise;
+    return $Call.ByID(2900172572, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] | null } | null} $in
- * @returns {Promise<{ [_: `${number}`]: number[] | null } | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<{ [_: `${number}`]: number[] | null } | null>}
  */
 export function MapIntSliceIntInMapIntSliceIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(881980169, $in));
-    return $resultPromise;
+    return $Call.ByID(881980169, $in);
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function NoInputsStringOut() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1075577233));
-    return $resultPromise;
+    return $Call.ByID(1075577233);
 }
 
 /**
  * @param {boolean | null} $in
- * @returns {Promise<boolean | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean | null>}
  */
 export function PointerBoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3589606958, $in));
-    return $resultPromise;
+    return $Call.ByID(3589606958, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(224675106, $in));
-    return $resultPromise;
+    return $Call.ByID(224675106, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2124953624, $in));
-    return $resultPromise;
+    return $Call.ByID(2124953624, $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function PointerMapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3516977899, $in));
-    return $resultPromise;
+    return $Call.ByID(3516977899, $in);
 }
 
 /**
  * @param {string | null} $in
- * @returns {Promise<string | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string | null>}
  */
 export function PointerStringInStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(229603958, $in));
-    return $resultPromise;
+    return $Call.ByID(229603958, $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputNamedOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3678582682, $in));
-    return $resultPromise;
+    return $Call.ByID(3678582682, $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(319259595, $in));
-    return $resultPromise;
+    return $Call.ByID(319259595, $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputStringArrayOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(383995060, $in));
-    return $resultPromise;
+    return $Call.ByID(383995060, $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function StringArrayInputStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1091960237, $in));
-    return $resultPromise;
+    return $Call.ByID(1091960237, $in);
 }
 
 /**
  * @param {$models.Person} $in
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function StructInputStructOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3835643147, $in));
-    return $resultPromise;
+    return $Call.ByID(3835643147, $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function StructPointerInputErrorOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2447692557, $in));
-    return $resultPromise;
+    return $Call.ByID(2447692557, $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function StructPointerInputStructPointerOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2943477349, $in));
-    return $resultPromise;
+    return $Call.ByID(2943477349, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt16InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3401034892, $in));
-    return $resultPromise;
+    return $Call.ByID(3401034892, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1236957573, $in));
-    return $resultPromise;
+    return $Call.ByID(1236957573, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt32InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1160383782, $in));
-    return $resultPromise;
+    return $Call.ByID(1160383782, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1739300671, $in));
-    return $resultPromise;
+    return $Call.ByID(1739300671, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt64InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(793803239, $in));
-    return $resultPromise;
+    return $Call.ByID(793803239, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1403757716, $in));
-    return $resultPromise;
+    return $Call.ByID(1403757716, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt8InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2988345717, $in));
-    return $resultPromise;
+    return $Call.ByID(2988345717, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(518250834, $in));
-    return $resultPromise;
+    return $Call.ByID(518250834, $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UIntInUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2836661285, $in));
-    return $resultPromise;
+    return $Call.ByID(2836661285, $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UIntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1367187362, $in));
-    return $resultPromise;
+    return $Call.ByID(1367187362, $in);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
index a46cb2e4f..6c1448d81 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
index a46cb2e4f..6c1448d81 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
index 4e1a41312..40d2245b9 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,19 +18,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1411160069, name));
-    return $resultPromise;
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1661412647, name));
-    return $resultPromise;
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
index fba063a2b..3c9c56546 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,9 +18,8 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1491748400));
-    return $resultPromise;
+    return $Call.ByID(1491748400);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
index b006e17a5..cc81267aa 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -22,55 +22,49 @@ import * as $models from "./models.js";
 /**
  * Get someone.
  * @param {$models.Alias} aliasValue
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function Get(aliasValue) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Get", aliasValue));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Get", aliasValue);
 }
 
 /**
  * Apparently, aliases are all the rage right now.
  * @param {$models.AliasedPerson} p
- * @returns {Promise<$models.StrangelyAliasedPerson> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.StrangelyAliasedPerson>}
  */
 export function GetButAliased(p) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GetButAliased", p));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.GetButAliased", p);
 }
 
 /**
  * Get someone quite different.
- * @returns {Promise<$models.GenericPerson<boolean>> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.GenericPerson<boolean>>}
  */
 export function GetButDifferent() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GetButDifferent"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.GetButDifferent");
 }
 
 /**
- * @returns {Promise<nobindingshere$0.PrivatePerson> & { cancel(): void }}
+ * @returns {$CancellablePromise<nobindingshere$0.PrivatePerson>}
  */
 export function GetButForeignPrivateAlias() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GetButForeignPrivateAlias"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.GetButForeignPrivateAlias");
 }
 
 /**
- * @returns {Promise<$models.AliasGroup> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.AliasGroup>}
  */
 export function GetButGenericAliases() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GetButGenericAliases"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.GetButGenericAliases");
 }
 
 /**
  * Greet a lot of unusual things.
  * @param {$models.EmptyAliasStruct} $0
  * @param {$models.EmptyStruct} $1
- * @returns {Promise<$models.AliasStruct> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.AliasStruct>}
  */
 export function Greet($0, $1) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", $0, $1));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", $0, $1);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
index 2643e60ec..f62552e8a 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function TestMethod() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service7.TestMethod"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service7.TestMethod");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
index 84fb14e96..244e74afe 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function TestMethod2() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service9.TestMethod2"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service9.TestMethod2");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
index dad26c793..e146c3669 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,9 +19,8 @@ import * as $models from "./models.js";
  * Greet does XYZ
  * @param {$models.Person} person
  * @param {$models.Embedded1} emb
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(person, emb) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", person, emb));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", person, emb);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
index 0569e8802..03ef1f90f 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -25,9 +25,8 @@ import * as $models from "./models.js";
  * @param {{ [_: `${number}`]: boolean | null } | null} assoc
  * @param {(number | null)[] | null} $4
  * @param {string[]} other
- * @returns {Promise<[$models.Person, any, number[] | null]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Person, any, number[] | null]>}
  */
 export function Greet(str, people, $2, assoc, $4, ...other) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", str, people, $2, assoc, $4, other));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", str, people, $2, assoc, $4, other);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
index 78783fcd6..8203e4168 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * Make a cycle.
- * @returns {Promise<[$models.StructA, $models.StructC]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.StructA, $models.StructC]>}
  */
 export function MakeCycles() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MakeCycles"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MakeCycles");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
index 5ae511419..623e88035 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * Make a cycle.
- * @returns {Promise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]>}
  */
 export function MakeCycles() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MakeCycles"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MakeCycles");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
index 4f75ec8b3..374d13203 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * @param {$models.InternalModel} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.InternalService.Method", $0));
-    return $resultPromise;
+    return $Call.ByName("main.InternalService.Method", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
index ffc0d244c..8332051eb 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -12,20 +12,18 @@ import * as otherpackage$0 from "./otherpackage/models.js";
 
 /**
  * @param {string} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 function InternalMethod($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.Service.InternalMethod", $0));
-    return $resultPromise;
+    return $Call.ByName("main.Service.InternalMethod", $0);
 }
 
 /**
  * @param {otherpackage$0.Dummy} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function VisibleMethod($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.Service.VisibleMethod", $0));
-    return $resultPromise;
+    return $Call.ByName("main.Service.VisibleMethod", $0);
 }
 
 /**
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
index 52f0a8c34..1fe8a0f69 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,9 +17,8 @@ import * as $models from "./models.js";
 
 /**
  * @param {$models.unexportedModel} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.unexportedService.Method", $0));
-    return $resultPromise;
+    return $Call.ByName("main.unexportedService.Method", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
index 4d53b4d23..3d245f10c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.js
@@ -9,50 +9,45 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Comment 1.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method1() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method1"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method1");
 }
 
 /**
  * Comment 2.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method2() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method2"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method2");
 }
 
 /**
  * Comment 3a.
  * Comment 3b.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method3() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method3"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method3");
 }
 
 /**
  * Comment 4.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method4() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method4"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method4");
 }
 
 /**
  * Comment 5.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Method5() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Method5"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Method5");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
index 6d764269c..fa5b9a262 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,19 +19,17 @@ import * as $models from "./models.js";
  * Greet does XYZ
  * @param {string} name
  * @param {$models.Title} title
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name, title) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name, title));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name, title);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
index c287b7631..2f953de7c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,9 +19,8 @@ import * as services$0 from "./services/models.js";
  * Greet does XYZ
  * @param {string} name
  * @param {services$0.Title} title
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name, title) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name, title));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name, title);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
index 0896a296d..8ab5f3462 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,19 +18,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
index 61a94621e..a27b0fea8 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,9 +18,8 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services.OtherService.Yay"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services.OtherService.Yay");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
index 0896a296d..8ab5f3462 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,19 +18,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
index abc8c9adc..98097e64f 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,9 +18,8 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other.OtherService.Yay"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other.OtherService.Yay");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
index 3c8c10bac..e2ba84581 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
index f89c81e83..bba7ea7ea 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
index 630c0dee3..f89bfc417 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.js
@@ -9,24 +9,22 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function GreetWithContext(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.GreetWithContext", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.GreetWithContext", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
index f89c81e83..bba7ea7ea 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
index ec0d3c0b2..e207d968c 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.js
@@ -4,16 +4,15 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
 /**
- * @returns {Promise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>>}
  */
 export function Method() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.Service.Method"));
-    return $resultPromise;
+    return $Call.ByName("main.Service.Method");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
index 45837d506..9ad0c6d96 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.js
@@ -4,16 +4,15 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
 /**
- * @returns {Promise<$models.Data> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Data>}
  */
 export function Method() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.Service.Method"));
-    return $resultPromise;
+    return $Call.ByName("main.Service.Method");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
index d93f2bf6f..c3f8ff04b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.js
@@ -9,13 +9,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other.OtherMethods.LikeThisOtherOne"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other.OtherMethods.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
index 9d18e16da..92435f679 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,18 +17,16 @@ import * as $models from "./models.js";
 
 /**
  * LikeThisOne is an example method that does nothing.
- * @returns {Promise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]>}
  */
 export function LikeThisOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOne"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOne");
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOtherOne"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
index 3842a37d7..490c12c08 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.js
@@ -9,13 +9,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.EmbedOther.LikeThisOtherOne"));
-    return $resultPromise;
+    return $Call.ByName("main.EmbedOther.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
index b35360d80..5f940b2c7 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,18 +17,16 @@ import * as nobindingshere$0 from "../no_bindings_here/models.js";
 
 /**
  * LikeThisOne is an example method that does nothing.
- * @returns {Promise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]>}
  */
 export function LikeThisOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.EmbedService.LikeThisOne"));
-    return $resultPromise;
+    return $Call.ByName("main.EmbedService.LikeThisOne");
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function LikeThisOtherOne() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.EmbedService.LikeThisOtherOne"));
-    return $resultPromise;
+    return $Call.ByName("main.EmbedService.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
index 5924c91ad..f8c6b19b2 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} $0
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Greet($0) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", $0));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
index 3c8c10bac..e2ba84581 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
index d12d49d80..2fdca31cc 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Hello() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.OtherService.Hello"));
-    return $resultPromise;
+    return $Call.ByName("main.OtherService.Hello");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
index 3c8c10bac..e2ba84581 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.js
@@ -4,13 +4,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
index d12d49d80..2fdca31cc 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.js
@@ -4,12 +4,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function Hello() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.OtherService.Hello"));
-    return $resultPromise;
+    return $Call.ByName("main.OtherService.Hello");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
index 0896a296d..8ab5f3462 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,19 +18,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
index 6cec0768c..911d42560 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,9 +18,8 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services.OtherService.Yay"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services.OtherService.Yay");
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
index dae4fb2e5..eca08a018 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,387 +17,344 @@ import * as $models from "./models.js";
 
 /**
  * @param {number[]} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function ArrayInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.ArrayInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.ArrayInt", $in);
 }
 
 /**
  * @param {boolean} $in
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function BoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.BoolInBoolOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.BoolInBoolOut", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Float32InFloat32Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Float32InFloat32Out", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Float64InFloat64Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Float64InFloat64Out", $in);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int16InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int16InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int16InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int16PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int32InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int32InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int32InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int32PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int64InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int64InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int64InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int64PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int8InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int8InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int8InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int8PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function IntInIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntInIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntInIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntPointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntPointerInAndOutput", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntInt", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number | null } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntIntPointer($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntIntPointer", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntIntPointer", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] | null } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntSliceInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntSliceInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntSliceInt", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] | null } | null} $in
- * @returns {Promise<{ [_: `${number}`]: number[] | null } | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<{ [_: `${number}`]: number[] | null } | null>}
  */
 export function MapIntSliceIntInMapIntSliceIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in);
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function NoInputsStringOut() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NoInputsStringOut"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
 /**
  * @param {boolean | null} $in
- * @returns {Promise<boolean | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean | null>}
  */
 export function PointerBoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerBoolInBoolOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function PointerMapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerMapIntInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerMapIntInt", $in);
 }
 
 /**
  * @param {string | null} $in
- * @returns {Promise<string | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string | null>}
  */
 export function PointerStringInStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerStringInStringOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerStringInStringOut", $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputNamedOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputStringArrayOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function StringArrayInputStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputStringOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputStringOut", $in);
 }
 
 /**
  * @param {$models.Person} $in
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function StructInputStructOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructInputStructOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StructInputStructOutput", $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function StructPointerInputErrorOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function StructPointerInputStructPointerOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt16InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt16InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt16InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt32InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt32InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt32InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt64InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt64InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt64InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt8InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt8InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt8InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UIntInUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UIntInUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UIntInUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UIntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UIntPointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
index dae4fb2e5..eca08a018 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,387 +17,344 @@ import * as $models from "./models.js";
 
 /**
  * @param {number[]} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function ArrayInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.ArrayInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.ArrayInt", $in);
 }
 
 /**
  * @param {boolean} $in
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function BoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.BoolInBoolOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.BoolInBoolOut", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Float32InFloat32Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Float32InFloat32Out", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Float64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Float64InFloat64Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Float64InFloat64Out", $in);
 }
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int16InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int16InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int16InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int16PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int32InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int32InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int32InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int32PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int64InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int64InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int64InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int64PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function Int8InIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int8InIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int8InIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function Int8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Int8PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function IntInIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntInIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntInIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntPointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntPointerInAndOutput", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function IntPointerInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntInt", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number | null } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntIntPointer($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntIntPointer", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntIntPointer", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] | null } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function MapIntSliceInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntSliceInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntSliceInt", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number[] | null } | null} $in
- * @returns {Promise<{ [_: `${number}`]: number[] | null } | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<{ [_: `${number}`]: number[] | null } | null>}
  */
 export function MapIntSliceIntInMapIntSliceIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in);
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function NoInputsStringOut() {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NoInputsStringOut"));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
 /**
  * @param {boolean | null} $in
- * @returns {Promise<boolean | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean | null>}
  */
 export function PointerBoolInBoolOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerBoolInBoolOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat32InFloat32Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function PointerFloat64InFloat64Out($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in);
 }
 
 /**
  * @param {{ [_: `${number}`]: number } | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function PointerMapIntInt($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerMapIntInt", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerMapIntInt", $in);
 }
 
 /**
  * @param {string | null} $in
- * @returns {Promise<string | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string | null>}
  */
 export function PointerStringInStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.PointerStringInStringOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.PointerStringInStringOut", $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputNamedOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputNamedOutputs($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string[] | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<string[] | null>}
  */
 export function StringArrayInputStringArrayOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in);
 }
 
 /**
  * @param {string[] | null} $in
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function StringArrayInputStringOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StringArrayInputStringOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StringArrayInputStringOut", $in);
 }
 
 /**
  * @param {$models.Person} $in
- * @returns {Promise<$models.Person> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person>}
  */
 export function StructInputStructOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructInputStructOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StructInputStructOutput", $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function StructPointerInputErrorOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in);
 }
 
 /**
  * @param {$models.Person | null} $in
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function StructPointerInputStructPointerOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt16InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt16InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt16InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt16PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt32InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt32InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt32InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt32PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt64InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt64InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt64InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt64PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UInt8InUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt8InUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt8InUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UInt8PointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in);
 }
 
 /**
  * @param {number} $in
- * @returns {Promise<number> & { cancel(): void }}
+ * @returns {$CancellablePromise<number>}
  */
 export function UIntInUIntOut($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UIntInUIntOut", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UIntInUIntOut", $in);
 }
 
 /**
  * @param {number | null} $in
- * @returns {Promise<number | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<number | null>}
  */
 export function UIntPointerInAndOutput($in) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.UIntPointerInAndOutput", $in));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
index f89c81e83..bba7ea7ea 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
index f89c81e83..bba7ea7ea 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.js
@@ -9,14 +9,13 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
index 0896a296d..8ab5f3462 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.js
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,19 +18,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  * @param {string} name
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function Greet(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.Greet", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  * @param {string} name
- * @returns {Promise<$models.Person | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Person | null>}
  */
 export function NewPerson(name) {
-    let $resultPromise = /** @type {any} */($Call.ByName("main.GreetService.NewPerson", name));
-    return $resultPromise;
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
index 6b15c3e22..6594edc5b 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.js
@@ -10,7 +10,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,9 +18,8 @@ import * as $models from "./models.js";
 
 /**
  * Yay does this and that
- * @returns {Promise<$models.Address | null> & { cancel(): void }}
+ * @returns {$CancellablePromise<$models.Address | null>}
  */
 export function Yay() {
-    let $resultPromise = /** @type {any} */($Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services.OtherService.Yay"));
-    return $resultPromise;
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services.OtherService.Yay");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/encoding/json/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/encoding/json/models.ts
index 41353d635..8cd1a164f 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/encoding/json/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/encoding/json/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Marshaler is the interface implemented by types that
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/encoding/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/encoding/models.ts
index 1ff6fc7ec..235dfce3e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/encoding/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/encoding/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * TextMarshaler is the interface implemented by an object that can
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
index 14b0f1878..3c6865881 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -21,67 +21,49 @@ import * as $models from "./models.js";
 /**
  * Get someone.
  */
-export function Get(aliasValue: $models.Alias): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1928502664, aliasValue) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Get(aliasValue: $models.Alias): $CancellablePromise<$models.Person> {
+    return $Call.ByID(1928502664, aliasValue).then(($result: any) => {
         return $$createType0($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * Apparently, aliases are all the rage right now.
  */
-export function GetButAliased(p: $models.AliasedPerson): Promise<$models.StrangelyAliasedPerson> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1896499664, p) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function GetButAliased(p: $models.AliasedPerson): $CancellablePromise<$models.StrangelyAliasedPerson> {
+    return $Call.ByID(1896499664, p).then(($result: any) => {
         return $$createType0($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * Get someone quite different.
  */
-export function GetButDifferent(): Promise<$models.GenericPerson<boolean>> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2240931744) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function GetButDifferent(): $CancellablePromise<$models.GenericPerson<boolean>> {
+    return $Call.ByID(2240931744).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function GetButForeignPrivateAlias(): Promise<nobindingshere$0.PrivatePerson> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(643456960) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function GetButForeignPrivateAlias(): $CancellablePromise<nobindingshere$0.PrivatePerson> {
+    return $Call.ByID(643456960).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function GetButGenericAliases(): Promise<$models.AliasGroup> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(914093800) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function GetButGenericAliases(): $CancellablePromise<$models.AliasGroup> {
+    return $Call.ByID(914093800).then(($result: any) => {
         return $$createType3($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * Greet a lot of unusual things.
  */
-export function Greet($0: $models.EmptyAliasStruct, $1: $models.EmptyStruct): Promise<$models.AliasStruct> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, $0, $1) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Greet($0: $models.EmptyAliasStruct, $1: $models.EmptyStruct): $CancellablePromise<$models.AliasStruct> {
+    return $Call.ByID(1411160069, $0, $1).then(($result: any) => {
         return $$createType7($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.ts
index 1f048ba57..63ca43914 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * A nice type Alias.
@@ -169,7 +169,7 @@ export class GenericPerson<T> {
      * returns a creation function for a concrete instance
      * of the generic class GenericPerson.
      */
-    static createFrom<T>($$createParamT: (source: any) => T): ($$source?: any) => GenericPerson<T> {
+    static createFrom<T = any>($$createParamT: (source: any) => T): ($$source?: any) => GenericPerson<T> {
         const $$createField0_0 = $$createParamT;
         return ($$source: any = {}) => {
             let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
index af462b1e4..8fe0035ed 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function TestMethod(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2241101727) as any;
-    return $resultPromise;
+export function TestMethod(): $CancellablePromise<void> {
+    return $Call.ByID(2241101727);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
index 760e03c4a..8260ce500 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function TestMethod2(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1556848345) as any;
-    return $resultPromise;
+export function TestMethod2(): $CancellablePromise<void> {
+    return $Call.ByID(1556848345);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
index 3816bcdee..69c89433a 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(person: $models.Person, emb: $models.Embedded1): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, person, emb) as any;
-    return $resultPromise;
+export function Greet(person: $models.Person, emb: $models.Embedded1): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, person, emb);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.ts
index 2ff5d6635..50f23b52d 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Embedded1 {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
index fb057998c..cc1e88ad7 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,15 +19,12 @@ import * as $models from "./models.js";
  * It has a multiline doc comment
  * The comment has even some * / traps!!
  */
-export function Greet(str: string, people: $models.Person[], $2: {"AnotherCount": number, "AnotherOne": $models.Person | null}, assoc: { [_: `${number}`]: boolean | null }, $4: (number | null)[], ...other: string[]): Promise<[$models.Person, any, number[]]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, str, people, $2, assoc, $4, other) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Greet(str: string, people: $models.Person[], $2: {"AnotherCount": number, "AnotherOne": $models.Person | null}, assoc: { [_: `${number}`]: boolean | null }, $4: (number | null)[], ...other: string[]): $CancellablePromise<[$models.Person, any, number[]]> {
+    return $Call.ByID(1411160069, str, people, $2, assoc, $4, other).then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[2] = $$createType1($result[2]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.ts
index 66dc14092..2417aff4c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Person represents a person
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
index 22900e8d1..c1c70be69 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,12 @@ import * as $models from "./models.js";
 /**
  * Make a cycle.
  */
-export function MakeCycles(): Promise<[$models.StructA, $models.StructC]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(440020721) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function MakeCycles(): $CancellablePromise<[$models.StructA, $models.StructC]> {
+    return $Call.ByID(440020721).then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.ts
index a79d42f32..9e86cd674 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class StructA {
     "B": structB | null;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
index 26782f46b..cbddfb346 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,19 +17,16 @@ import * as $models from "./models.js";
 /**
  * Make a cycle.
  */
-export function MakeCycles(): Promise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(440020721) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function MakeCycles(): $CancellablePromise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> {
+    return $Call.ByID(440020721).then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType9($result[1]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
-var $$createType0 = (function $$initCreateType0(...args): any {
+var $$createType0 = (function $$initCreateType0(...args: any[]): any {
     if ($$createType0 === $$initCreateType0) {
         $$createType0 = $$createType3;
     }
@@ -38,7 +35,7 @@ var $$createType0 = (function $$initCreateType0(...args): any {
 const $$createType1 = $Create.Nullable($$createType0);
 const $$createType2 = $Create.Map($Create.Any, $$createType1);
 const $$createType3 = $Create.Array($$createType2);
-var $$createType4 = (function $$initCreateType4(...args): any {
+var $$createType4 = (function $$initCreateType4(...args: any[]): any {
     if ($$createType4 === $$initCreateType4) {
         $$createType4 = $$createType8;
     }
@@ -51,7 +48,7 @@ const $$createType7 = $Create.Struct({
     "Y": $$createType6,
 });
 const $$createType8 = $Create.Array($$createType7);
-var $$createType9 = (function $$initCreateType9(...args): any {
+var $$createType9 = (function $$initCreateType9(...args: any[]): any {
     if ($$createType9 === $$initCreateType9) {
         $$createType9 = $$createType13;
     }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.ts
index ed98e9791..93d1ef5c6 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export type Alias = Cyclic | null;
 
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
index 58842ad2d..b968330db 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
@@ -8,13 +8,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method($0: $models.InternalModel): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(538079117, $0) as any;
-    return $resultPromise;
+export function Method($0: $models.InternalModel): $CancellablePromise<void> {
+    return $Call.ByID(538079117, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.ts
index 489296e23..4d242fc2c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * An exported but internal model.
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.ts
index 209ade5da..b927155d5 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Dummy {
 
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
index 266a81058..338c7fbd1 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
@@ -3,20 +3,18 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as otherpackage$0 from "./otherpackage/models.js";
 
-function InternalMethod($0: string): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3518775569, $0) as any;
-    return $resultPromise;
+function InternalMethod($0: string): $CancellablePromise<void> {
+    return $Call.ByID(3518775569, $0);
 }
 
-export function VisibleMethod($0: otherpackage$0.Dummy): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(474018228, $0) as any;
-    return $resultPromise;
+export function VisibleMethod($0: otherpackage$0.Dummy): $CancellablePromise<void> {
+    return $Call.ByID(474018228, $0);
 }
 
 export async function CustomMethod(arg: string): Promise<void> {
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
index 3c52fd31e..a819daffd 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
@@ -8,13 +8,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method($0: $models.unexportedModel): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(37626172, $0) as any;
-    return $resultPromise;
+export function Method($0: $models.unexportedModel): $CancellablePromise<void> {
+    return $Call.ByID(37626172, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
index 5174c8ec7..b5d189f76 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
@@ -8,45 +8,40 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Comment 1.
  */
-export function Method1(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(841558284) as any;
-    return $resultPromise;
+export function Method1(): $CancellablePromise<void> {
+    return $Call.ByID(841558284);
 }
 
 /**
  * Comment 2.
  */
-export function Method2(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(891891141) as any;
-    return $resultPromise;
+export function Method2(): $CancellablePromise<void> {
+    return $Call.ByID(891891141);
 }
 
 /**
  * Comment 3a.
  * Comment 3b.
  */
-export function Method3(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(875113522) as any;
-    return $resultPromise;
+export function Method3(): $CancellablePromise<void> {
+    return $Call.ByID(875113522);
 }
 
 /**
  * Comment 4.
  */
-export function Method4(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(791225427) as any;
-    return $resultPromise;
+export function Method4(): $CancellablePromise<void> {
+    return $Call.ByID(791225427);
 }
 
 /**
  * Comment 5.
  */
-export function Method5(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(774447808) as any;
-    return $resultPromise;
+export function Method5(): $CancellablePromise<void> {
+    return $Call.ByID(774447808);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
index da5d96205..10de8838c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string, title: $models.Title): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name, title) as any;
-    return $resultPromise;
+export function Greet(name: string, title: $models.Title): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name, title);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.ts
index 7b8cbf2fc..a50282a38 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Age is an integer with some predefined values
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
index 3b632d9d1..3bce7b000 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as services$0 from "./services/models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string, title: services$0.Title): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name, title) as any;
-    return $resultPromise;
+export function Greet(name: string, title: services$0.Title): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name, title);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.ts
index 335543dbb..661222bdf 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export enum Title {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
index 07b718c99..88cafa9d1 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.ts
index 02707e2ca..f1ff262a1 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.ts
index eb9c1b6bf..a4be6e904 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     "Street": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
index 13a82546a..8dc381545 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,13 +18,10 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2007737399) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByID(2007737399).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
index 07b718c99..88cafa9d1 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.ts
index c4a6d39ee..88b2c78db 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.ts
index eb9c1b6bf..a4be6e904 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     "Street": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
index f3c4c0c43..fe69a1da0 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,13 +18,10 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2447353446) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByID(2447353446).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
index 71b020797..62283209b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
index b14533c7b..6e6ac2007 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
index 1e307faef..386913d65 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
@@ -8,20 +8,18 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * Greet someone
  */
-export function GreetWithContext(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1310150960, name) as any;
-    return $resultPromise;
+export function GreetWithContext(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1310150960, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
index b14533c7b..6e6ac2007 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.ts
index 81b54bc2e..0d26a6b0b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export type BasicCstrAlias<S> = S;
 
@@ -1197,7 +1197,7 @@ export class Maps<R, S, T, U, V, W, X, Y, Z> {
      * returns a creation function for a concrete instance
      * of the generic class Maps.
      */
-    static createFrom<R, S, T, U, V, W, X, Y, Z>($$createParamR: (source: any) => R, $$createParamS: (source: any) => S, $$createParamT: (source: any) => T, $$createParamU: (source: any) => U, $$createParamV: (source: any) => V, $$createParamW: (source: any) => W, $$createParamX: (source: any) => X, $$createParamY: (source: any) => Y, $$createParamZ: (source: any) => Z): ($$source?: any) => Maps<R, S, T, U, V, W, X, Y, Z> {
+    static createFrom<R = any, S = any, T = any, U = any, V = any, W = any, X = any, Y = any, Z = any>($$createParamR: (source: any) => R, $$createParamS: (source: any) => S, $$createParamT: (source: any) => T, $$createParamU: (source: any) => U, $$createParamV: (source: any) => V, $$createParamW: (source: any) => W, $$createParamX: (source: any) => X, $$createParamY: (source: any) => Y, $$createParamZ: (source: any) => Z): ($$source?: any) => Maps<R, S, T, U, V, W, X, Y, Z> {
         const $$createField0_0 = $$createType0;
         const $$createField1_0 = $$createType1;
         const $$createField2_0 = $$createType2;
@@ -1863,24 +1863,24 @@ const $$createType55 = $Create.Map($Create.Any, $Create.Any);
 const $$createType56 = $Create.Map($Create.Any, $Create.Any);
 const $$createType57 = $Create.Map($Create.Any, $Create.Any);
 const $$createType58 = $Create.Map($Create.Any, $Create.Any);
-const $$createType59 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType60 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType61 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType62 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType63 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType64 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType65 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType66 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType67 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType68 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType69 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType70 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType71 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType72 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType73 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType74 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType75 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType76 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
+const $$createType59 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType60 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType61 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType62 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType63 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType64 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType65 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType66 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType67 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType68 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType69 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType70 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType71 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType72 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType73 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType74 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType75 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType76 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
 const $$createType77 = $Create.Map($Create.Any, $Create.Any);
 const $$createType78 = $Create.Map($Create.Any, $Create.Any);
 const $$createType79 = $Create.Map($Create.Any, $Create.Any);
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
index c8f860953..bd5e88c7b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
@@ -3,19 +3,16 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method(): Promise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4021345184) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Method(): $CancellablePromise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> {
+    return $Call.ByID(4021345184).then(($result: any) => {
         return $$createType0($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.ts
index 32cfd9f37..d8db23862 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
index 988af4c84..342fcf3c4 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
@@ -3,19 +3,16 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method(): Promise<$models.Data> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4021345184) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Method(): $CancellablePromise<$models.Data> {
+    return $Call.ByID(4021345184).then(($result: any) => {
         return $$createType0($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.ts
index 6e31400f2..4cb328e1e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -41,7 +41,7 @@ export class HowDifferent<How> {
      * returns a creation function for a concrete instance
      * of the generic class HowDifferent.
      */
-    static createFrom<How>($$createParamHow: (source: any) => How): ($$source?: any) => HowDifferent<How> {
+    static createFrom<How = any>($$createParamHow: (source: any) => How): ($$source?: any) => HowDifferent<How> {
         const $$createField1_0 = $$createType1($$createParamHow);
         return ($$source: any = {}) => {
             let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
@@ -157,7 +157,7 @@ export const PrivatePerson = personImpl;
 export type PrivatePerson = personImpl;
 
 // Private type creation functions
-const $$createType0 = ($$createParamHow) => $Create.Map($Create.Any, $$createParamHow);
-const $$createType1 = ($$createParamHow) => $Create.Array($$createType0($$createParamHow));
+const $$createType0 = ($$createParamHow: any) => $Create.Map($Create.Any, $$createParamHow);
+const $$createType1 = ($$createParamHow: any) => $Create.Array($$createType0($$createParamHow));
 const $$createType2 = other$0.OtherPerson.createFrom($Create.Any);
 const $$createType3 = $Create.Array($$createType2);
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.ts
index e41f6e1d3..711735a2b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * OtherPerson is like a person, but different.
@@ -36,7 +36,7 @@ export class OtherPerson<T> {
      * returns a creation function for a concrete instance
      * of the generic class OtherPerson.
      */
-    static createFrom<T>($$createParamT: (source: any) => T): ($$source?: any) => OtherPerson<T> {
+    static createFrom<T = any>($$createParamT: (source: any) => T): ($$source?: any) => OtherPerson<T> {
         const $$createField1_0 = $$createType0($$createParamT);
         return ($$source: any = {}) => {
             let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
@@ -49,4 +49,4 @@ export class OtherPerson<T> {
 }
 
 // Private type creation functions
-const $$createType0 = ($$createParamT) => $Create.Array($$createParamT);
+const $$createType0 = ($$createParamT: any) => $Create.Array($$createParamT);
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
index 108d8c37d..da11f7f2f 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3606939272) as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByID(3606939272);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
index 303b8b7db..9ef257343 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,24 +17,20 @@ import * as $models from "./models.js";
 /**
  * LikeThisOne is an example method that does nothing.
  */
-export function LikeThisOne(): Promise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2124352079) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function LikeThisOne(): $CancellablePromise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> {
+    return $Call.ByID(2124352079).then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         $result[2] = $$createType2($result[2]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4281222271) as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByID(4281222271);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
index e14439f7b..a5fe5368f 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3566862802) as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByID(3566862802);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
index 7e93dcdb7..615eae691 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,24 +17,20 @@ import * as nobindingshere$0 from "../no_bindings_here/models.js";
 /**
  * LikeThisOne is an example method that does nothing.
  */
-export function LikeThisOne(): Promise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2590614085) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function LikeThisOne(): $CancellablePromise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> {
+    return $Call.ByID(2590614085).then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         $result[2] = $$createType2($result[2]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(773650321) as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByID(773650321);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
index e82932486..83ca81acc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet($0: string): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, $0) as any;
-    return $resultPromise;
+export function Greet($0: string): $CancellablePromise<void> {
+    return $Call.ByID(1411160069, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
index 71b020797..62283209b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
index cae4507da..6c902629c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Hello(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4249972365) as any;
-    return $resultPromise;
+export function Hello(): $CancellablePromise<void> {
+    return $Call.ByID(4249972365);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
index 71b020797..62283209b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
index cae4507da..6c902629c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Hello(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4249972365) as any;
-    return $resultPromise;
+export function Hello(): $CancellablePromise<void> {
+    return $Call.ByID(4249972365);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
index 07b718c99..88cafa9d1 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.ts
index 474248f2e..d76f68d9d 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.ts
index eb9c1b6bf..a4be6e904 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     "Street": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
index 7b37ce5d6..b8c293ad7 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,13 +18,10 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3568225479) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByID(3568225479).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
index 7fa3dd502..c8ff6e4db 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
@@ -8,252 +8,197 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function ArrayInt($in: number[]): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3862002418, $in) as any;
-    return $resultPromise;
+export function ArrayInt($in: number[]): $CancellablePromise<void> {
+    return $Call.ByID(3862002418, $in);
 }
 
-export function BoolInBoolOut($in: boolean): Promise<boolean> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2424639793, $in) as any;
-    return $resultPromise;
+export function BoolInBoolOut($in: boolean): $CancellablePromise<boolean> {
+    return $Call.ByID(2424639793, $in);
 }
 
-export function Float32InFloat32Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3132595881, $in) as any;
-    return $resultPromise;
+export function Float32InFloat32Out($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3132595881, $in);
 }
 
-export function Float64InFloat64Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2182412247, $in) as any;
-    return $resultPromise;
+export function Float64InFloat64Out($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2182412247, $in);
 }
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
-export function Int16InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3306292566, $in) as any;
-    return $resultPromise;
+export function Int16InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3306292566, $in);
 }
 
-export function Int16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1754277916, $in) as any;
-    return $resultPromise;
+export function Int16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1754277916, $in);
 }
 
-export function Int32InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1909469092, $in) as any;
-    return $resultPromise;
+export function Int32InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1909469092, $in);
 }
 
-export function Int32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4251088558, $in) as any;
-    return $resultPromise;
+export function Int32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(4251088558, $in);
 }
 
-export function Int64InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1343888303, $in) as any;
-    return $resultPromise;
+export function Int64InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1343888303, $in);
 }
 
-export function Int64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2205561041, $in) as any;
-    return $resultPromise;
+export function Int64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2205561041, $in);
 }
 
-export function Int8InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(572240879, $in) as any;
-    return $resultPromise;
+export function Int8InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(572240879, $in);
 }
 
-export function Int8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2189402897, $in) as any;
-    return $resultPromise;
+export function Int8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2189402897, $in);
 }
 
-export function IntInIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(642881729, $in) as any;
-    return $resultPromise;
+export function IntInIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(642881729, $in);
 }
 
-export function IntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1066151743, $in) as any;
-    return $resultPromise;
+export function IntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1066151743, $in);
 }
 
-export function IntPointerInputNamedOutputs($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2718999663, $in) as any;
-    return $resultPromise;
+export function IntPointerInputNamedOutputs($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2718999663, $in);
 }
 
-export function MapIntInt($in: { [_: `${number}`]: number }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2386486356, $in) as any;
-    return $resultPromise;
+export function MapIntInt($in: { [_: `${number}`]: number }): $CancellablePromise<void> {
+    return $Call.ByID(2386486356, $in);
 }
 
-export function MapIntIntPointer($in: { [_: `${number}`]: number | null }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2163571325, $in) as any;
-    return $resultPromise;
+export function MapIntIntPointer($in: { [_: `${number}`]: number | null }): $CancellablePromise<void> {
+    return $Call.ByID(2163571325, $in);
 }
 
-export function MapIntSliceInt($in: { [_: `${number}`]: number[] }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2900172572, $in) as any;
-    return $resultPromise;
+export function MapIntSliceInt($in: { [_: `${number}`]: number[] }): $CancellablePromise<void> {
+    return $Call.ByID(2900172572, $in);
 }
 
-export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] }): Promise<{ [_: `${number}`]: number[] }> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(881980169, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] }): $CancellablePromise<{ [_: `${number}`]: number[] }> {
+    return $Call.ByID(881980169, $in).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function NoInputsStringOut(): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1075577233) as any;
-    return $resultPromise;
+export function NoInputsStringOut(): $CancellablePromise<string> {
+    return $Call.ByID(1075577233);
 }
 
-export function PointerBoolInBoolOut($in: boolean | null): Promise<boolean | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3589606958, $in) as any;
-    return $resultPromise;
+export function PointerBoolInBoolOut($in: boolean | null): $CancellablePromise<boolean | null> {
+    return $Call.ByID(3589606958, $in);
 }
 
-export function PointerFloat32InFloat32Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(224675106, $in) as any;
-    return $resultPromise;
+export function PointerFloat32InFloat32Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(224675106, $in);
 }
 
-export function PointerFloat64InFloat64Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2124953624, $in) as any;
-    return $resultPromise;
+export function PointerFloat64InFloat64Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2124953624, $in);
 }
 
-export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3516977899, $in) as any;
-    return $resultPromise;
+export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByID(3516977899, $in);
 }
 
-export function PointerStringInStringOut($in: string | null): Promise<string | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(229603958, $in) as any;
-    return $resultPromise;
+export function PointerStringInStringOut($in: string | null): $CancellablePromise<string | null> {
+    return $Call.ByID(229603958, $in);
 }
 
-export function StringArrayInputNamedOutput($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3678582682, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputNamedOutput($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByID(3678582682, $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputNamedOutputs($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(319259595, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputNamedOutputs($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByID(319259595, $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputStringArrayOut($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(383995060, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputStringArrayOut($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByID(383995060, $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputStringOut($in: string[]): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1091960237, $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringOut($in: string[]): $CancellablePromise<string> {
+    return $Call.ByID(1091960237, $in);
 }
 
-export function StructInputStructOutput($in: $models.Person): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3835643147, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StructInputStructOutput($in: $models.Person): $CancellablePromise<$models.Person> {
+    return $Call.ByID(3835643147, $in).then(($result: any) => {
         return $$createType3($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StructPointerInputErrorOutput($in: $models.Person | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2447692557, $in) as any;
-    return $resultPromise;
+export function StructPointerInputErrorOutput($in: $models.Person | null): $CancellablePromise<void> {
+    return $Call.ByID(2447692557, $in);
 }
 
-export function StructPointerInputStructPointerOutput($in: $models.Person | null): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2943477349, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StructPointerInputStructPointerOutput($in: $models.Person | null): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(2943477349, $in).then(($result: any) => {
         return $$createType4($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function UInt16InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3401034892, $in) as any;
-    return $resultPromise;
+export function UInt16InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3401034892, $in);
 }
 
-export function UInt16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1236957573, $in) as any;
-    return $resultPromise;
+export function UInt16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1236957573, $in);
 }
 
-export function UInt32InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1160383782, $in) as any;
-    return $resultPromise;
+export function UInt32InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1160383782, $in);
 }
 
-export function UInt32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1739300671, $in) as any;
-    return $resultPromise;
+export function UInt32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1739300671, $in);
 }
 
-export function UInt64InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(793803239, $in) as any;
-    return $resultPromise;
+export function UInt64InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(793803239, $in);
 }
 
-export function UInt64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1403757716, $in) as any;
-    return $resultPromise;
+export function UInt64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1403757716, $in);
 }
 
-export function UInt8InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2988345717, $in) as any;
-    return $resultPromise;
+export function UInt8InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2988345717, $in);
 }
 
-export function UInt8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(518250834, $in) as any;
-    return $resultPromise;
+export function UInt8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(518250834, $in);
 }
 
-export function UIntInUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2836661285, $in) as any;
-    return $resultPromise;
+export function UIntInUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2836661285, $in);
 }
 
-export function UIntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1367187362, $in) as any;
-    return $resultPromise;
+export function UIntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1367187362, $in);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.ts
index 3dd1908e1..cd282c90c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Person {
     "Name": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
index 7fa3dd502..c8ff6e4db 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
@@ -8,252 +8,197 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function ArrayInt($in: number[]): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3862002418, $in) as any;
-    return $resultPromise;
+export function ArrayInt($in: number[]): $CancellablePromise<void> {
+    return $Call.ByID(3862002418, $in);
 }
 
-export function BoolInBoolOut($in: boolean): Promise<boolean> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2424639793, $in) as any;
-    return $resultPromise;
+export function BoolInBoolOut($in: boolean): $CancellablePromise<boolean> {
+    return $Call.ByID(2424639793, $in);
 }
 
-export function Float32InFloat32Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3132595881, $in) as any;
-    return $resultPromise;
+export function Float32InFloat32Out($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3132595881, $in);
 }
 
-export function Float64InFloat64Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2182412247, $in) as any;
-    return $resultPromise;
+export function Float64InFloat64Out($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2182412247, $in);
 }
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
-export function Int16InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3306292566, $in) as any;
-    return $resultPromise;
+export function Int16InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3306292566, $in);
 }
 
-export function Int16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1754277916, $in) as any;
-    return $resultPromise;
+export function Int16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1754277916, $in);
 }
 
-export function Int32InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1909469092, $in) as any;
-    return $resultPromise;
+export function Int32InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1909469092, $in);
 }
 
-export function Int32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4251088558, $in) as any;
-    return $resultPromise;
+export function Int32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(4251088558, $in);
 }
 
-export function Int64InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1343888303, $in) as any;
-    return $resultPromise;
+export function Int64InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1343888303, $in);
 }
 
-export function Int64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2205561041, $in) as any;
-    return $resultPromise;
+export function Int64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2205561041, $in);
 }
 
-export function Int8InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(572240879, $in) as any;
-    return $resultPromise;
+export function Int8InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(572240879, $in);
 }
 
-export function Int8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2189402897, $in) as any;
-    return $resultPromise;
+export function Int8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2189402897, $in);
 }
 
-export function IntInIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(642881729, $in) as any;
-    return $resultPromise;
+export function IntInIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(642881729, $in);
 }
 
-export function IntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1066151743, $in) as any;
-    return $resultPromise;
+export function IntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1066151743, $in);
 }
 
-export function IntPointerInputNamedOutputs($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2718999663, $in) as any;
-    return $resultPromise;
+export function IntPointerInputNamedOutputs($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2718999663, $in);
 }
 
-export function MapIntInt($in: { [_: `${number}`]: number }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2386486356, $in) as any;
-    return $resultPromise;
+export function MapIntInt($in: { [_: `${number}`]: number }): $CancellablePromise<void> {
+    return $Call.ByID(2386486356, $in);
 }
 
-export function MapIntIntPointer($in: { [_: `${number}`]: number | null }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2163571325, $in) as any;
-    return $resultPromise;
+export function MapIntIntPointer($in: { [_: `${number}`]: number | null }): $CancellablePromise<void> {
+    return $Call.ByID(2163571325, $in);
 }
 
-export function MapIntSliceInt($in: { [_: `${number}`]: number[] }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2900172572, $in) as any;
-    return $resultPromise;
+export function MapIntSliceInt($in: { [_: `${number}`]: number[] }): $CancellablePromise<void> {
+    return $Call.ByID(2900172572, $in);
 }
 
-export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] }): Promise<{ [_: `${number}`]: number[] }> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(881980169, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] }): $CancellablePromise<{ [_: `${number}`]: number[] }> {
+    return $Call.ByID(881980169, $in).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function NoInputsStringOut(): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1075577233) as any;
-    return $resultPromise;
+export function NoInputsStringOut(): $CancellablePromise<string> {
+    return $Call.ByID(1075577233);
 }
 
-export function PointerBoolInBoolOut($in: boolean | null): Promise<boolean | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3589606958, $in) as any;
-    return $resultPromise;
+export function PointerBoolInBoolOut($in: boolean | null): $CancellablePromise<boolean | null> {
+    return $Call.ByID(3589606958, $in);
 }
 
-export function PointerFloat32InFloat32Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(224675106, $in) as any;
-    return $resultPromise;
+export function PointerFloat32InFloat32Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(224675106, $in);
 }
 
-export function PointerFloat64InFloat64Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2124953624, $in) as any;
-    return $resultPromise;
+export function PointerFloat64InFloat64Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2124953624, $in);
 }
 
-export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3516977899, $in) as any;
-    return $resultPromise;
+export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByID(3516977899, $in);
 }
 
-export function PointerStringInStringOut($in: string | null): Promise<string | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(229603958, $in) as any;
-    return $resultPromise;
+export function PointerStringInStringOut($in: string | null): $CancellablePromise<string | null> {
+    return $Call.ByID(229603958, $in);
 }
 
-export function StringArrayInputNamedOutput($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3678582682, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputNamedOutput($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByID(3678582682, $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputNamedOutputs($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(319259595, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputNamedOutputs($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByID(319259595, $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputStringArrayOut($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(383995060, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputStringArrayOut($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByID(383995060, $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputStringOut($in: string[]): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1091960237, $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringOut($in: string[]): $CancellablePromise<string> {
+    return $Call.ByID(1091960237, $in);
 }
 
-export function StructInputStructOutput($in: $models.Person): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3835643147, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StructInputStructOutput($in: $models.Person): $CancellablePromise<$models.Person> {
+    return $Call.ByID(3835643147, $in).then(($result: any) => {
         return $$createType3($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StructPointerInputErrorOutput($in: $models.Person | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2447692557, $in) as any;
-    return $resultPromise;
+export function StructPointerInputErrorOutput($in: $models.Person | null): $CancellablePromise<void> {
+    return $Call.ByID(2447692557, $in);
 }
 
-export function StructPointerInputStructPointerOutput($in: $models.Person | null): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2943477349, $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StructPointerInputStructPointerOutput($in: $models.Person | null): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(2943477349, $in).then(($result: any) => {
         return $$createType4($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function UInt16InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3401034892, $in) as any;
-    return $resultPromise;
+export function UInt16InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3401034892, $in);
 }
 
-export function UInt16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1236957573, $in) as any;
-    return $resultPromise;
+export function UInt16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1236957573, $in);
 }
 
-export function UInt32InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1160383782, $in) as any;
-    return $resultPromise;
+export function UInt32InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1160383782, $in);
 }
 
-export function UInt32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1739300671, $in) as any;
-    return $resultPromise;
+export function UInt32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1739300671, $in);
 }
 
-export function UInt64InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(793803239, $in) as any;
-    return $resultPromise;
+export function UInt64InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(793803239, $in);
 }
 
-export function UInt64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1403757716, $in) as any;
-    return $resultPromise;
+export function UInt64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1403757716, $in);
 }
 
-export function UInt8InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2988345717, $in) as any;
-    return $resultPromise;
+export function UInt8InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2988345717, $in);
 }
 
-export function UInt8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(518250834, $in) as any;
-    return $resultPromise;
+export function UInt8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(518250834, $in);
 }
 
-export function UIntInUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2836661285, $in) as any;
-    return $resultPromise;
+export function UIntInUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2836661285, $in);
 }
 
-export function UIntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1367187362, $in) as any;
-    return $resultPromise;
+export function UIntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1367187362, $in);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.ts
index 3dd1908e1..cd282c90c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Person {
     "Name": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
index b14533c7b..6e6ac2007 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
index b14533c7b..6e6ac2007 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
index 07b718c99..88cafa9d1 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.ts
index 4442874d2..f6eee9de8 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.ts
index eb9c1b6bf..a4be6e904 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     "Street": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
index 04f8b68ea..ec098d45a 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,13 +18,10 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1491748400) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByID(1491748400).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/encoding/json/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/encoding/json/models.ts
index 41353d635..8cd1a164f 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/encoding/json/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/encoding/json/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Marshaler is the interface implemented by types that
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/encoding/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/encoding/models.ts
index 1ff6fc7ec..235dfce3e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/encoding/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/encoding/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * TextMarshaler is the interface implemented by an object that can
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
index 32630459f..b33d68383 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -21,67 +21,49 @@ import * as $models from "./models.js";
 /**
  * Get someone.
  */
-export function Get(aliasValue: $models.Alias): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Get", aliasValue) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Get(aliasValue: $models.Alias): $CancellablePromise<$models.Person> {
+    return $Call.ByName("main.GreetService.Get", aliasValue).then(($result: any) => {
         return $$createType0($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * Apparently, aliases are all the rage right now.
  */
-export function GetButAliased(p: $models.AliasedPerson): Promise<$models.StrangelyAliasedPerson> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GetButAliased", p) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function GetButAliased(p: $models.AliasedPerson): $CancellablePromise<$models.StrangelyAliasedPerson> {
+    return $Call.ByName("main.GreetService.GetButAliased", p).then(($result: any) => {
         return $$createType0($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * Get someone quite different.
  */
-export function GetButDifferent(): Promise<$models.GenericPerson<boolean>> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GetButDifferent") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function GetButDifferent(): $CancellablePromise<$models.GenericPerson<boolean>> {
+    return $Call.ByName("main.GreetService.GetButDifferent").then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function GetButForeignPrivateAlias(): Promise<nobindingshere$0.PrivatePerson> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GetButForeignPrivateAlias") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function GetButForeignPrivateAlias(): $CancellablePromise<nobindingshere$0.PrivatePerson> {
+    return $Call.ByName("main.GreetService.GetButForeignPrivateAlias").then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function GetButGenericAliases(): Promise<$models.AliasGroup> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GetButGenericAliases") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function GetButGenericAliases(): $CancellablePromise<$models.AliasGroup> {
+    return $Call.ByName("main.GreetService.GetButGenericAliases").then(($result: any) => {
         return $$createType3($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * Greet a lot of unusual things.
  */
-export function Greet($0: $models.EmptyAliasStruct, $1: $models.EmptyStruct): Promise<$models.AliasStruct> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", $0, $1) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Greet($0: $models.EmptyAliasStruct, $1: $models.EmptyStruct): $CancellablePromise<$models.AliasStruct> {
+    return $Call.ByName("main.GreetService.Greet", $0, $1).then(($result: any) => {
         return $$createType7($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.ts
index 1f048ba57..63ca43914 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * A nice type Alias.
@@ -169,7 +169,7 @@ export class GenericPerson<T> {
      * returns a creation function for a concrete instance
      * of the generic class GenericPerson.
      */
-    static createFrom<T>($$createParamT: (source: any) => T): ($$source?: any) => GenericPerson<T> {
+    static createFrom<T = any>($$createParamT: (source: any) => T): ($$source?: any) => GenericPerson<T> {
         const $$createField0_0 = $$createParamT;
         return ($$source: any = {}) => {
             let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
index b7ca5f4cd..0780a0de3 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function TestMethod(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service7.TestMethod") as any;
-    return $resultPromise;
+export function TestMethod(): $CancellablePromise<void> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service7.TestMethod");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
index 7ab11ba96..a2222265f 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function TestMethod2(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service9.TestMethod2") as any;
-    return $resultPromise;
+export function TestMethod2(): $CancellablePromise<void> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service9.TestMethod2");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
index 004971239..f2106e7f4 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(person: $models.Person, emb: $models.Embedded1): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", person, emb) as any;
-    return $resultPromise;
+export function Greet(person: $models.Person, emb: $models.Embedded1): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", person, emb);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.ts
index 2ff5d6635..50f23b52d 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Embedded1 {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
index 45311c10c..4471270ed 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,15 +19,12 @@ import * as $models from "./models.js";
  * It has a multiline doc comment
  * The comment has even some * / traps!!
  */
-export function Greet(str: string, people: $models.Person[], $2: {"AnotherCount": number, "AnotherOne": $models.Person | null}, assoc: { [_: `${number}`]: boolean | null }, $4: (number | null)[], ...other: string[]): Promise<[$models.Person, any, number[]]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", str, people, $2, assoc, $4, other) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Greet(str: string, people: $models.Person[], $2: {"AnotherCount": number, "AnotherOne": $models.Person | null}, assoc: { [_: `${number}`]: boolean | null }, $4: (number | null)[], ...other: string[]): $CancellablePromise<[$models.Person, any, number[]]> {
+    return $Call.ByName("main.GreetService.Greet", str, people, $2, assoc, $4, other).then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[2] = $$createType1($result[2]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.ts
index 66dc14092..2417aff4c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Person represents a person
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
index d6525e21b..2f0e45aff 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,12 @@ import * as $models from "./models.js";
 /**
  * Make a cycle.
  */
-export function MakeCycles(): Promise<[$models.StructA, $models.StructC]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MakeCycles") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function MakeCycles(): $CancellablePromise<[$models.StructA, $models.StructC]> {
+    return $Call.ByName("main.GreetService.MakeCycles").then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.ts
index a79d42f32..9e86cd674 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class StructA {
     "B": structB | null;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
index 3af14c1c5..dba844168 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,19 +17,16 @@ import * as $models from "./models.js";
 /**
  * Make a cycle.
  */
-export function MakeCycles(): Promise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MakeCycles") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function MakeCycles(): $CancellablePromise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> {
+    return $Call.ByName("main.GreetService.MakeCycles").then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType9($result[1]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
-var $$createType0 = (function $$initCreateType0(...args): any {
+var $$createType0 = (function $$initCreateType0(...args: any[]): any {
     if ($$createType0 === $$initCreateType0) {
         $$createType0 = $$createType3;
     }
@@ -38,7 +35,7 @@ var $$createType0 = (function $$initCreateType0(...args): any {
 const $$createType1 = $Create.Nullable($$createType0);
 const $$createType2 = $Create.Map($Create.Any, $$createType1);
 const $$createType3 = $Create.Array($$createType2);
-var $$createType4 = (function $$initCreateType4(...args): any {
+var $$createType4 = (function $$initCreateType4(...args: any[]): any {
     if ($$createType4 === $$initCreateType4) {
         $$createType4 = $$createType8;
     }
@@ -51,7 +48,7 @@ const $$createType7 = $Create.Struct({
     "Y": $$createType6,
 });
 const $$createType8 = $Create.Array($$createType7);
-var $$createType9 = (function $$initCreateType9(...args): any {
+var $$createType9 = (function $$initCreateType9(...args: any[]): any {
     if ($$createType9 === $$initCreateType9) {
         $$createType9 = $$createType13;
     }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.ts
index ed98e9791..93d1ef5c6 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export type Alias = Cyclic | null;
 
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
index e464032ee..9271273bc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
@@ -8,13 +8,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method($0: $models.InternalModel): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.InternalService.Method", $0) as any;
-    return $resultPromise;
+export function Method($0: $models.InternalModel): $CancellablePromise<void> {
+    return $Call.ByName("main.InternalService.Method", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.ts
index 489296e23..4d242fc2c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * An exported but internal model.
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.ts
index 209ade5da..b927155d5 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/otherpackage/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Dummy {
 
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
index 9b4d0265f..0687bd8ac 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
@@ -3,20 +3,18 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as otherpackage$0 from "./otherpackage/models.js";
 
-function InternalMethod($0: string): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.Service.InternalMethod", $0) as any;
-    return $resultPromise;
+function InternalMethod($0: string): $CancellablePromise<void> {
+    return $Call.ByName("main.Service.InternalMethod", $0);
 }
 
-export function VisibleMethod($0: otherpackage$0.Dummy): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.Service.VisibleMethod", $0) as any;
-    return $resultPromise;
+export function VisibleMethod($0: otherpackage$0.Dummy): $CancellablePromise<void> {
+    return $Call.ByName("main.Service.VisibleMethod", $0);
 }
 
 export async function CustomMethod(arg: string): Promise<void> {
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
index 97c0acf11..34b23e24d 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
@@ -8,13 +8,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method($0: $models.unexportedModel): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.unexportedService.Method", $0) as any;
-    return $resultPromise;
+export function Method($0: $models.unexportedModel): $CancellablePromise<void> {
+    return $Call.ByName("main.unexportedService.Method", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
index 64845db23..c5b06be75 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
@@ -8,45 +8,40 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Comment 1.
  */
-export function Method1(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method1") as any;
-    return $resultPromise;
+export function Method1(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method1");
 }
 
 /**
  * Comment 2.
  */
-export function Method2(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method2") as any;
-    return $resultPromise;
+export function Method2(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method2");
 }
 
 /**
  * Comment 3a.
  * Comment 3b.
  */
-export function Method3(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method3") as any;
-    return $resultPromise;
+export function Method3(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method3");
 }
 
 /**
  * Comment 4.
  */
-export function Method4(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method4") as any;
-    return $resultPromise;
+export function Method4(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method4");
 }
 
 /**
  * Comment 5.
  */
-export function Method5(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method5") as any;
-    return $resultPromise;
+export function Method5(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method5");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
index 3fdf09b81..45abc153e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string, title: $models.Title): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name, title) as any;
-    return $resultPromise;
+export function Greet(name: string, title: $models.Title): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name, title);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.ts
index 7b8cbf2fc..a50282a38 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * Age is an integer with some predefined values
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
index 130e45193..c4afd85da 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as services$0 from "./services/models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string, title: services$0.Title): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name, title) as any;
-    return $resultPromise;
+export function Greet(name: string, title: services$0.Title): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name, title);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.ts
index 335543dbb..661222bdf 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/services/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export enum Title {
     /**
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
index 49c20faa3..1a2ffb266 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.ts
index 02707e2ca..f1ff262a1 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.ts
index eb9c1b6bf..a4be6e904 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     "Street": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
index 7423db695..f44f172e7 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,13 +18,10 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services.OtherService.Yay") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services.OtherService.Yay").then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
index 49c20faa3..1a2ffb266 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.ts
index c4a6d39ee..88b2c78db 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.ts
index eb9c1b6bf..a4be6e904 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     "Street": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
index 27084cac3..fa9a93fc8 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,13 +18,10 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other.OtherService.Yay") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other.OtherService.Yay").then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
index 56c688c31..460b2b374 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
index e6dca1f04..6a6a881dc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
index 36a0a5296..aec011527 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
@@ -8,20 +8,18 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * Greet someone
  */
-export function GreetWithContext(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GreetWithContext", name) as any;
-    return $resultPromise;
+export function GreetWithContext(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.GreetWithContext", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
index e6dca1f04..6a6a881dc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.ts
index 81b54bc2e..0d26a6b0b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export type BasicCstrAlias<S> = S;
 
@@ -1197,7 +1197,7 @@ export class Maps<R, S, T, U, V, W, X, Y, Z> {
      * returns a creation function for a concrete instance
      * of the generic class Maps.
      */
-    static createFrom<R, S, T, U, V, W, X, Y, Z>($$createParamR: (source: any) => R, $$createParamS: (source: any) => S, $$createParamT: (source: any) => T, $$createParamU: (source: any) => U, $$createParamV: (source: any) => V, $$createParamW: (source: any) => W, $$createParamX: (source: any) => X, $$createParamY: (source: any) => Y, $$createParamZ: (source: any) => Z): ($$source?: any) => Maps<R, S, T, U, V, W, X, Y, Z> {
+    static createFrom<R = any, S = any, T = any, U = any, V = any, W = any, X = any, Y = any, Z = any>($$createParamR: (source: any) => R, $$createParamS: (source: any) => S, $$createParamT: (source: any) => T, $$createParamU: (source: any) => U, $$createParamV: (source: any) => V, $$createParamW: (source: any) => W, $$createParamX: (source: any) => X, $$createParamY: (source: any) => Y, $$createParamZ: (source: any) => Z): ($$source?: any) => Maps<R, S, T, U, V, W, X, Y, Z> {
         const $$createField0_0 = $$createType0;
         const $$createField1_0 = $$createType1;
         const $$createField2_0 = $$createType2;
@@ -1863,24 +1863,24 @@ const $$createType55 = $Create.Map($Create.Any, $Create.Any);
 const $$createType56 = $Create.Map($Create.Any, $Create.Any);
 const $$createType57 = $Create.Map($Create.Any, $Create.Any);
 const $$createType58 = $Create.Map($Create.Any, $Create.Any);
-const $$createType59 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType60 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType61 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType62 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType63 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType64 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType65 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType66 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType67 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType68 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType69 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType70 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType71 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType72 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType73 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType74 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType75 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
-const $$createType76 = ($$createParamR, $$createParamS, $$createParamT, $$createParamU, $$createParamV, $$createParamW, $$createParamX, $$createParamY, $$createParamZ) => $Create.Map($Create.Any, $Create.Any);
+const $$createType59 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType60 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType61 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType62 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType63 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType64 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType65 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType66 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType67 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType68 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType69 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType70 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType71 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType72 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType73 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType74 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType75 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
+const $$createType76 = ($$createParamR: any, $$createParamS: any, $$createParamT: any, $$createParamU: any, $$createParamV: any, $$createParamW: any, $$createParamX: any, $$createParamY: any, $$createParamZ: any) => $Create.Map($Create.Any, $Create.Any);
 const $$createType77 = $Create.Map($Create.Any, $Create.Any);
 const $$createType78 = $Create.Map($Create.Any, $Create.Any);
 const $$createType79 = $Create.Map($Create.Any, $Create.Any);
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
index d68598901..d62acda96 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
@@ -3,19 +3,16 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method(): Promise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.Service.Method") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Method(): $CancellablePromise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> {
+    return $Call.ByName("main.Service.Method").then(($result: any) => {
         return $$createType0($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.ts
index 32cfd9f37..d8db23862 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
index 90ddd2521..8e2af391b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
@@ -3,19 +3,16 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method(): Promise<$models.Data> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.Service.Method") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Method(): $CancellablePromise<$models.Data> {
+    return $Call.ByName("main.Service.Method").then(($result: any) => {
         return $$createType0($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.ts
index 6e31400f2..4cb328e1e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -41,7 +41,7 @@ export class HowDifferent<How> {
      * returns a creation function for a concrete instance
      * of the generic class HowDifferent.
      */
-    static createFrom<How>($$createParamHow: (source: any) => How): ($$source?: any) => HowDifferent<How> {
+    static createFrom<How = any>($$createParamHow: (source: any) => How): ($$source?: any) => HowDifferent<How> {
         const $$createField1_0 = $$createType1($$createParamHow);
         return ($$source: any = {}) => {
             let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
@@ -157,7 +157,7 @@ export const PrivatePerson = personImpl;
 export type PrivatePerson = personImpl;
 
 // Private type creation functions
-const $$createType0 = ($$createParamHow) => $Create.Map($Create.Any, $$createParamHow);
-const $$createType1 = ($$createParamHow) => $Create.Array($$createType0($$createParamHow));
+const $$createType0 = ($$createParamHow: any) => $Create.Map($Create.Any, $$createParamHow);
+const $$createType1 = ($$createParamHow: any) => $Create.Array($$createType0($$createParamHow));
 const $$createType2 = other$0.OtherPerson.createFrom($Create.Any);
 const $$createType3 = $Create.Array($$createType2);
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.ts
index e41f6e1d3..711735a2b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 /**
  * OtherPerson is like a person, but different.
@@ -36,7 +36,7 @@ export class OtherPerson<T> {
      * returns a creation function for a concrete instance
      * of the generic class OtherPerson.
      */
-    static createFrom<T>($$createParamT: (source: any) => T): ($$source?: any) => OtherPerson<T> {
+    static createFrom<T = any>($$createParamT: (source: any) => T): ($$source?: any) => OtherPerson<T> {
         const $$createField1_0 = $$createType0($$createParamT);
         return ($$source: any = {}) => {
             let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
@@ -49,4 +49,4 @@ export class OtherPerson<T> {
 }
 
 // Private type creation functions
-const $$createType0 = ($$createParamT) => $Create.Array($$createParamT);
+const $$createType0 = ($$createParamT: any) => $Create.Array($$createParamT);
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
index 2964ba9be..2e4c173df 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other.OtherMethods.LikeThisOtherOne") as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other.OtherMethods.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
index ef08b89ed..fb5f5ce21 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,24 +17,20 @@ import * as $models from "./models.js";
 /**
  * LikeThisOne is an example method that does nothing.
  */
-export function LikeThisOne(): Promise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOne") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function LikeThisOne(): $CancellablePromise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOne").then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         $result[2] = $$createType2($result[2]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOtherOne") as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOtherOne");
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
index c5cadc32b..c82f44866 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.EmbedOther.LikeThisOtherOne") as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByName("main.EmbedOther.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
index 5716d2933..e3b2fe679 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,24 +17,20 @@ import * as nobindingshere$0 from "../no_bindings_here/models.js";
 /**
  * LikeThisOne is an example method that does nothing.
  */
-export function LikeThisOne(): Promise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.EmbedService.LikeThisOne") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function LikeThisOne(): $CancellablePromise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> {
+    return $Call.ByName("main.EmbedService.LikeThisOne").then(($result: any) => {
         $result[0] = $$createType0($result[0]);
         $result[1] = $$createType1($result[1]);
         $result[2] = $$createType2($result[2]);
         return $result;
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.EmbedService.LikeThisOtherOne") as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByName("main.EmbedService.LikeThisOtherOne");
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
index 09f388a60..192340e8e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet($0: string): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", $0) as any;
-    return $resultPromise;
+export function Greet($0: string): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Greet", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
index 56c688c31..460b2b374 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
index 7625ce92e..e437314f4 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Hello(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.OtherService.Hello") as any;
-    return $resultPromise;
+export function Hello(): $CancellablePromise<void> {
+    return $Call.ByName("main.OtherService.Hello");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
index 56c688c31..460b2b374 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
index 7625ce92e..e437314f4 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
-export function Hello(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.OtherService.Hello") as any;
-    return $resultPromise;
+export function Hello(): $CancellablePromise<void> {
+    return $Call.ByName("main.OtherService.Hello");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
index 49c20faa3..1a2ffb266 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.ts
index 474248f2e..d76f68d9d 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.ts
index eb9c1b6bf..a4be6e904 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     "Street": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
index 3c2901c2c..fc2efb6c1 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,13 +18,10 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services.OtherService.Yay") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services.OtherService.Yay").then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
index eda8ff455..ea2dcf8a6 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
@@ -8,252 +8,197 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function ArrayInt($in: number[]): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.ArrayInt", $in) as any;
-    return $resultPromise;
+export function ArrayInt($in: number[]): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.ArrayInt", $in);
 }
 
-export function BoolInBoolOut($in: boolean): Promise<boolean> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.BoolInBoolOut", $in) as any;
-    return $resultPromise;
+export function BoolInBoolOut($in: boolean): $CancellablePromise<boolean> {
+    return $Call.ByName("main.GreetService.BoolInBoolOut", $in);
 }
 
-export function Float32InFloat32Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Float32InFloat32Out", $in) as any;
-    return $resultPromise;
+export function Float32InFloat32Out($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Float32InFloat32Out", $in);
 }
 
-export function Float64InFloat64Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Float64InFloat64Out", $in) as any;
-    return $resultPromise;
+export function Float64InFloat64Out($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Float64InFloat64Out", $in);
 }
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
-export function Int16InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int16InIntOut", $in) as any;
-    return $resultPromise;
+export function Int16InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int16InIntOut", $in);
 }
 
-export function Int16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in);
 }
 
-export function Int32InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int32InIntOut", $in) as any;
-    return $resultPromise;
+export function Int32InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int32InIntOut", $in);
 }
 
-export function Int32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in);
 }
 
-export function Int64InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int64InIntOut", $in) as any;
-    return $resultPromise;
+export function Int64InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int64InIntOut", $in);
 }
 
-export function Int64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in);
 }
 
-export function Int8InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int8InIntOut", $in) as any;
-    return $resultPromise;
+export function Int8InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int8InIntOut", $in);
 }
 
-export function Int8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in);
 }
 
-export function IntInIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntInIntOut", $in) as any;
-    return $resultPromise;
+export function IntInIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.IntInIntOut", $in);
 }
 
-export function IntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntPointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function IntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.IntPointerInAndOutput", $in);
 }
 
-export function IntPointerInputNamedOutputs($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in) as any;
-    return $resultPromise;
+export function IntPointerInputNamedOutputs($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in);
 }
 
-export function MapIntInt($in: { [_: `${number}`]: number }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntInt", $in) as any;
-    return $resultPromise;
+export function MapIntInt($in: { [_: `${number}`]: number }): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntInt", $in);
 }
 
-export function MapIntIntPointer($in: { [_: `${number}`]: number | null }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntIntPointer", $in) as any;
-    return $resultPromise;
+export function MapIntIntPointer($in: { [_: `${number}`]: number | null }): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntIntPointer", $in);
 }
 
-export function MapIntSliceInt($in: { [_: `${number}`]: number[] }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntSliceInt", $in) as any;
-    return $resultPromise;
+export function MapIntSliceInt($in: { [_: `${number}`]: number[] }): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntSliceInt", $in);
 }
 
-export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] }): Promise<{ [_: `${number}`]: number[] }> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] }): $CancellablePromise<{ [_: `${number}`]: number[] }> {
+    return $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function NoInputsStringOut(): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NoInputsStringOut") as any;
-    return $resultPromise;
+export function NoInputsStringOut(): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
-export function PointerBoolInBoolOut($in: boolean | null): Promise<boolean | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in) as any;
-    return $resultPromise;
+export function PointerBoolInBoolOut($in: boolean | null): $CancellablePromise<boolean | null> {
+    return $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in);
 }
 
-export function PointerFloat32InFloat32Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in) as any;
-    return $resultPromise;
+export function PointerFloat32InFloat32Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in);
 }
 
-export function PointerFloat64InFloat64Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in) as any;
-    return $resultPromise;
+export function PointerFloat64InFloat64Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in);
 }
 
-export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerMapIntInt", $in) as any;
-    return $resultPromise;
+export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.PointerMapIntInt", $in);
 }
 
-export function PointerStringInStringOut($in: string | null): Promise<string | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerStringInStringOut", $in) as any;
-    return $resultPromise;
+export function PointerStringInStringOut($in: string | null): $CancellablePromise<string | null> {
+    return $Call.ByName("main.GreetService.PointerStringInStringOut", $in);
 }
 
-export function StringArrayInputNamedOutput($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputNamedOutput($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputNamedOutputs($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputNamedOutputs($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputStringArrayOut($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputStringArrayOut($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputStringOut($in: string[]): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputStringOut", $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringOut($in: string[]): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.StringArrayInputStringOut", $in);
 }
 
-export function StructInputStructOutput($in: $models.Person): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructInputStructOutput", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StructInputStructOutput($in: $models.Person): $CancellablePromise<$models.Person> {
+    return $Call.ByName("main.GreetService.StructInputStructOutput", $in).then(($result: any) => {
         return $$createType3($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StructPointerInputErrorOutput($in: $models.Person | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in) as any;
-    return $resultPromise;
+export function StructPointerInputErrorOutput($in: $models.Person | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in);
 }
 
-export function StructPointerInputStructPointerOutput($in: $models.Person | null): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StructPointerInputStructPointerOutput($in: $models.Person | null): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in).then(($result: any) => {
         return $$createType4($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function UInt16InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt16InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt16InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt16InUIntOut", $in);
 }
 
-export function UInt16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in);
 }
 
-export function UInt32InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt32InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt32InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt32InUIntOut", $in);
 }
 
-export function UInt32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in);
 }
 
-export function UInt64InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt64InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt64InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt64InUIntOut", $in);
 }
 
-export function UInt64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in);
 }
 
-export function UInt8InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt8InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt8InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt8InUIntOut", $in);
 }
 
-export function UInt8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in);
 }
 
-export function UIntInUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UIntInUIntOut", $in) as any;
-    return $resultPromise;
+export function UIntInUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UIntInUIntOut", $in);
 }
 
-export function UIntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UIntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.ts
index 3dd1908e1..cd282c90c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Person {
     "Name": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
index eda8ff455..ea2dcf8a6 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
@@ -8,252 +8,197 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function ArrayInt($in: number[]): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.ArrayInt", $in) as any;
-    return $resultPromise;
+export function ArrayInt($in: number[]): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.ArrayInt", $in);
 }
 
-export function BoolInBoolOut($in: boolean): Promise<boolean> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.BoolInBoolOut", $in) as any;
-    return $resultPromise;
+export function BoolInBoolOut($in: boolean): $CancellablePromise<boolean> {
+    return $Call.ByName("main.GreetService.BoolInBoolOut", $in);
 }
 
-export function Float32InFloat32Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Float32InFloat32Out", $in) as any;
-    return $resultPromise;
+export function Float32InFloat32Out($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Float32InFloat32Out", $in);
 }
 
-export function Float64InFloat64Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Float64InFloat64Out", $in) as any;
-    return $resultPromise;
+export function Float64InFloat64Out($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Float64InFloat64Out", $in);
 }
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
-export function Int16InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int16InIntOut", $in) as any;
-    return $resultPromise;
+export function Int16InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int16InIntOut", $in);
 }
 
-export function Int16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in);
 }
 
-export function Int32InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int32InIntOut", $in) as any;
-    return $resultPromise;
+export function Int32InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int32InIntOut", $in);
 }
 
-export function Int32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in);
 }
 
-export function Int64InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int64InIntOut", $in) as any;
-    return $resultPromise;
+export function Int64InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int64InIntOut", $in);
 }
 
-export function Int64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in);
 }
 
-export function Int8InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int8InIntOut", $in) as any;
-    return $resultPromise;
+export function Int8InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int8InIntOut", $in);
 }
 
-export function Int8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in);
 }
 
-export function IntInIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntInIntOut", $in) as any;
-    return $resultPromise;
+export function IntInIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.IntInIntOut", $in);
 }
 
-export function IntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntPointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function IntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.IntPointerInAndOutput", $in);
 }
 
-export function IntPointerInputNamedOutputs($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in) as any;
-    return $resultPromise;
+export function IntPointerInputNamedOutputs($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in);
 }
 
-export function MapIntInt($in: { [_: `${number}`]: number }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntInt", $in) as any;
-    return $resultPromise;
+export function MapIntInt($in: { [_: `${number}`]: number }): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntInt", $in);
 }
 
-export function MapIntIntPointer($in: { [_: `${number}`]: number | null }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntIntPointer", $in) as any;
-    return $resultPromise;
+export function MapIntIntPointer($in: { [_: `${number}`]: number | null }): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntIntPointer", $in);
 }
 
-export function MapIntSliceInt($in: { [_: `${number}`]: number[] }): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntSliceInt", $in) as any;
-    return $resultPromise;
+export function MapIntSliceInt($in: { [_: `${number}`]: number[] }): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntSliceInt", $in);
 }
 
-export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] }): Promise<{ [_: `${number}`]: number[] }> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] }): $CancellablePromise<{ [_: `${number}`]: number[] }> {
+    return $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function NoInputsStringOut(): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NoInputsStringOut") as any;
-    return $resultPromise;
+export function NoInputsStringOut(): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
-export function PointerBoolInBoolOut($in: boolean | null): Promise<boolean | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in) as any;
-    return $resultPromise;
+export function PointerBoolInBoolOut($in: boolean | null): $CancellablePromise<boolean | null> {
+    return $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in);
 }
 
-export function PointerFloat32InFloat32Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in) as any;
-    return $resultPromise;
+export function PointerFloat32InFloat32Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in);
 }
 
-export function PointerFloat64InFloat64Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in) as any;
-    return $resultPromise;
+export function PointerFloat64InFloat64Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in);
 }
 
-export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerMapIntInt", $in) as any;
-    return $resultPromise;
+export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.PointerMapIntInt", $in);
 }
 
-export function PointerStringInStringOut($in: string | null): Promise<string | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerStringInStringOut", $in) as any;
-    return $resultPromise;
+export function PointerStringInStringOut($in: string | null): $CancellablePromise<string | null> {
+    return $Call.ByName("main.GreetService.PointerStringInStringOut", $in);
 }
 
-export function StringArrayInputNamedOutput($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputNamedOutput($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputNamedOutputs($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputNamedOutputs($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputStringArrayOut($in: string[]): Promise<string[]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StringArrayInputStringArrayOut($in: string[]): $CancellablePromise<string[]> {
+    return $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in).then(($result: any) => {
         return $$createType2($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StringArrayInputStringOut($in: string[]): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputStringOut", $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringOut($in: string[]): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.StringArrayInputStringOut", $in);
 }
 
-export function StructInputStructOutput($in: $models.Person): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructInputStructOutput", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StructInputStructOutput($in: $models.Person): $CancellablePromise<$models.Person> {
+    return $Call.ByName("main.GreetService.StructInputStructOutput", $in).then(($result: any) => {
         return $$createType3($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function StructPointerInputErrorOutput($in: $models.Person | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in) as any;
-    return $resultPromise;
+export function StructPointerInputErrorOutput($in: $models.Person | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in);
 }
 
-export function StructPointerInputStructPointerOutput($in: $models.Person | null): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function StructPointerInputStructPointerOutput($in: $models.Person | null): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in).then(($result: any) => {
         return $$createType4($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
-export function UInt16InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt16InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt16InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt16InUIntOut", $in);
 }
 
-export function UInt16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in);
 }
 
-export function UInt32InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt32InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt32InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt32InUIntOut", $in);
 }
 
-export function UInt32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in);
 }
 
-export function UInt64InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt64InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt64InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt64InUIntOut", $in);
 }
 
-export function UInt64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in);
 }
 
-export function UInt8InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt8InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt8InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt8InUIntOut", $in);
 }
 
-export function UInt8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in);
 }
 
-export function UIntInUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UIntInUIntOut", $in) as any;
-    return $resultPromise;
+export function UIntInUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UIntInUIntOut", $in);
 }
 
-export function UIntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UIntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in);
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.ts
index 3dd1908e1..cd282c90c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Person {
     "Name": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
index e6dca1f04..6a6a881dc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
index e6dca1f04..6a6a881dc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
index 49c20faa3..1a2ffb266 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,21 +17,17 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name).then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.ts
index 4442874d2..f6eee9de8 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.ts
index eb9c1b6bf..a4be6e904 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/models.ts
@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Create as $Create} from "/wails/runtime.js";
+import { Create as $Create } from "/wails/runtime.js";
 
 export class Address {
     "Street": string;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
index 641595e74..554897ea4 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,13 +18,10 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services.OtherService.Yay") as any;
-    let $typingPromise = $resultPromise.then(($result: any) => {
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services.OtherService.Yay").then(($result: any) => {
         return $$createType1($result);
-    }) as any;
-    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
-    return $typingPromise;
+    });
 }
 
 // Private type creation functions
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
index 8f77379d9..c371520b0 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -21,41 +21,35 @@ import * as $models from "./models.js";
 /**
  * Get someone.
  */
-export function Get(aliasValue: $models.Alias): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1928502664, aliasValue) as any;
-    return $resultPromise;
+export function Get(aliasValue: $models.Alias): $CancellablePromise<$models.Person> {
+    return $Call.ByID(1928502664, aliasValue);
 }
 
 /**
  * Apparently, aliases are all the rage right now.
  */
-export function GetButAliased(p: $models.AliasedPerson): Promise<$models.StrangelyAliasedPerson> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1896499664, p) as any;
-    return $resultPromise;
+export function GetButAliased(p: $models.AliasedPerson): $CancellablePromise<$models.StrangelyAliasedPerson> {
+    return $Call.ByID(1896499664, p);
 }
 
 /**
  * Get someone quite different.
  */
-export function GetButDifferent(): Promise<$models.GenericPerson<boolean>> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2240931744) as any;
-    return $resultPromise;
+export function GetButDifferent(): $CancellablePromise<$models.GenericPerson<boolean>> {
+    return $Call.ByID(2240931744);
 }
 
-export function GetButForeignPrivateAlias(): Promise<nobindingshere$0.PrivatePerson> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(643456960) as any;
-    return $resultPromise;
+export function GetButForeignPrivateAlias(): $CancellablePromise<nobindingshere$0.PrivatePerson> {
+    return $Call.ByID(643456960);
 }
 
-export function GetButGenericAliases(): Promise<$models.AliasGroup> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(914093800) as any;
-    return $resultPromise;
+export function GetButGenericAliases(): $CancellablePromise<$models.AliasGroup> {
+    return $Call.ByID(914093800);
 }
 
 /**
  * Greet a lot of unusual things.
  */
-export function Greet($0: $models.EmptyAliasStruct, $1: $models.EmptyStruct): Promise<$models.AliasStruct> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, $0, $1) as any;
-    return $resultPromise;
+export function Greet($0: $models.EmptyAliasStruct, $1: $models.EmptyStruct): $CancellablePromise<$models.AliasStruct> {
+    return $Call.ByID(1411160069, $0, $1);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
index d08868a1f..5cba569c9 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function TestMethod(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2241101727) as any;
-    return $resultPromise;
+export function TestMethod(): $CancellablePromise<void> {
+    return $Call.ByID(2241101727);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
index 0b877e248..dc425cfd5 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function TestMethod2(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1556848345) as any;
-    return $resultPromise;
+export function TestMethod2(): $CancellablePromise<void> {
+    return $Call.ByID(1556848345);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
index 32b85fccb..a5334fce3 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(person: $models.Person, emb: $models.Embedded1): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, person, emb) as any;
-    return $resultPromise;
+export function Greet(person: $models.Person, emb: $models.Embedded1): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, person, emb);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
index 05fa84c0c..99ffd566f 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,7 +19,6 @@ import * as $models from "./models.js";
  * It has a multiline doc comment
  * The comment has even some * / traps!!
  */
-export function Greet(str: string, people: $models.Person[] | null, $2: {"AnotherCount": number, "AnotherOne": $models.Person | null}, assoc: { [_: `${number}`]: boolean | null } | null, $4: (number | null)[] | null, ...other: string[]): Promise<[$models.Person, any, number[] | null]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, str, people, $2, assoc, $4, other) as any;
-    return $resultPromise;
+export function Greet(str: string, people: $models.Person[] | null, $2: {"AnotherCount": number, "AnotherOne": $models.Person | null}, assoc: { [_: `${number}`]: boolean | null } | null, $4: (number | null)[] | null, ...other: string[]): $CancellablePromise<[$models.Person, any, number[] | null]> {
+    return $Call.ByID(1411160069, str, people, $2, assoc, $4, other);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
index 3f91922f1..e6a04adf3 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as $models from "./models.js";
 /**
  * Make a cycle.
  */
-export function MakeCycles(): Promise<[$models.StructA, $models.StructC]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(440020721) as any;
-    return $resultPromise;
+export function MakeCycles(): $CancellablePromise<[$models.StructA, $models.StructC]> {
+    return $Call.ByID(440020721);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
index 435914299..965a057ca 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as $models from "./models.js";
 /**
  * Make a cycle.
  */
-export function MakeCycles(): Promise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(440020721) as any;
-    return $resultPromise;
+export function MakeCycles(): $CancellablePromise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> {
+    return $Call.ByID(440020721);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
index e9ce7b0da..9d2a673d6 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
@@ -8,13 +8,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method($0: $models.InternalModel): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(538079117, $0) as any;
-    return $resultPromise;
+export function Method($0: $models.InternalModel): $CancellablePromise<void> {
+    return $Call.ByID(538079117, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
index 6f1ab3204..e60cbea0c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
@@ -3,20 +3,18 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as otherpackage$0 from "./otherpackage/models.js";
 
-function InternalMethod($0: string): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3518775569, $0) as any;
-    return $resultPromise;
+function InternalMethod($0: string): $CancellablePromise<void> {
+    return $Call.ByID(3518775569, $0);
 }
 
-export function VisibleMethod($0: otherpackage$0.Dummy): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(474018228, $0) as any;
-    return $resultPromise;
+export function VisibleMethod($0: otherpackage$0.Dummy): $CancellablePromise<void> {
+    return $Call.ByID(474018228, $0);
 }
 
 export async function CustomMethod(arg: string): Promise<void> {
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
index fa074e92c..57d7f73be 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
@@ -8,13 +8,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method($0: $models.unexportedModel): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(37626172, $0) as any;
-    return $resultPromise;
+export function Method($0: $models.unexportedModel): $CancellablePromise<void> {
+    return $Call.ByID(37626172, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
index 6189c0359..5a3127774 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
@@ -8,45 +8,40 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Comment 1.
  */
-export function Method1(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(841558284) as any;
-    return $resultPromise;
+export function Method1(): $CancellablePromise<void> {
+    return $Call.ByID(841558284);
 }
 
 /**
  * Comment 2.
  */
-export function Method2(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(891891141) as any;
-    return $resultPromise;
+export function Method2(): $CancellablePromise<void> {
+    return $Call.ByID(891891141);
 }
 
 /**
  * Comment 3a.
  * Comment 3b.
  */
-export function Method3(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(875113522) as any;
-    return $resultPromise;
+export function Method3(): $CancellablePromise<void> {
+    return $Call.ByID(875113522);
 }
 
 /**
  * Comment 4.
  */
-export function Method4(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(791225427) as any;
-    return $resultPromise;
+export function Method4(): $CancellablePromise<void> {
+    return $Call.ByID(791225427);
 }
 
 /**
  * Comment 5.
  */
-export function Method5(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(774447808) as any;
-    return $resultPromise;
+export function Method5(): $CancellablePromise<void> {
+    return $Call.ByID(774447808);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
index 561d0b5c4..eda1dd8d0 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string, title: $models.Title): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name, title) as any;
-    return $resultPromise;
+export function Greet(name: string, title: $models.Title): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name, title);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
index 66ea965d5..ade2383a0 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as services$0 from "./services/models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string, title: services$0.Title): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name, title) as any;
-    return $resultPromise;
+export function Greet(name: string, title: services$0.Title): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name, title);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
index c649bfb82..8519667d5 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
index 5fb794ba2..4cb206cc6 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,7 +18,6 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2007737399) as any;
-    return $resultPromise;
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByID(2007737399);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
index c649bfb82..8519667d5 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
index 23b854905..8879fcfa2 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,7 +18,6 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2447353446) as any;
-    return $resultPromise;
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByID(2447353446);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
index 0d68fbe86..34c4d151a 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
index dc0a1a1b8..8a2cb7a70 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
index 70b209eeb..f9b8d87e2 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
@@ -8,20 +8,18 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * Greet someone
  */
-export function GreetWithContext(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1310150960, name) as any;
-    return $resultPromise;
+export function GreetWithContext(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1310150960, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
index dc0a1a1b8..8a2cb7a70 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
index 8669b92be..50d2f6d72 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
@@ -3,13 +3,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method(): Promise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4021345184) as any;
-    return $resultPromise;
+export function Method(): $CancellablePromise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> {
+    return $Call.ByID(4021345184);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
index 105e077e3..b175ebe96 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
@@ -3,13 +3,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method(): Promise<$models.Data> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4021345184) as any;
-    return $resultPromise;
+export function Method(): $CancellablePromise<$models.Data> {
+    return $Call.ByID(4021345184);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
index a02cf4a98..c2fb7bc6a 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3606939272) as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByID(3606939272);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
index 81f2b2430..4f623616d 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * LikeThisOne is an example method that does nothing.
  */
-export function LikeThisOne(): Promise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2124352079) as any;
-    return $resultPromise;
+export function LikeThisOne(): $CancellablePromise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> {
+    return $Call.ByID(2124352079);
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4281222271) as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByID(4281222271);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
index 5ee6ff07e..d155adc30 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3566862802) as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByID(3566862802);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
index f757ceeae..65098990f 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as nobindingshere$0 from "../no_bindings_here/models.js";
 /**
  * LikeThisOne is an example method that does nothing.
  */
-export function LikeThisOne(): Promise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2590614085) as any;
-    return $resultPromise;
+export function LikeThisOne(): $CancellablePromise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> {
+    return $Call.ByID(2590614085);
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(773650321) as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByID(773650321);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
index 2f297e449..76375250e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet($0: string): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, $0) as any;
-    return $resultPromise;
+export function Greet($0: string): $CancellablePromise<void> {
+    return $Call.ByID(1411160069, $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
index 0d68fbe86..34c4d151a 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
index 5cc4ea0ff..d27e71304 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Hello(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4249972365) as any;
-    return $resultPromise;
+export function Hello(): $CancellablePromise<void> {
+    return $Call.ByID(4249972365);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
index 0d68fbe86..34c4d151a 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
index 5cc4ea0ff..d27e71304 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Hello(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4249972365) as any;
-    return $resultPromise;
+export function Hello(): $CancellablePromise<void> {
+    return $Call.ByID(4249972365);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
index c649bfb82..8519667d5 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
index d8ddc9193..50e62daa4 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,7 +18,6 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3568225479) as any;
-    return $resultPromise;
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByID(3568225479);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
index 59d1e0f13..ef5015467 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
@@ -8,226 +8,183 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function ArrayInt($in: number[]): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3862002418, $in) as any;
-    return $resultPromise;
+export function ArrayInt($in: number[]): $CancellablePromise<void> {
+    return $Call.ByID(3862002418, $in);
 }
 
-export function BoolInBoolOut($in: boolean): Promise<boolean> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2424639793, $in) as any;
-    return $resultPromise;
+export function BoolInBoolOut($in: boolean): $CancellablePromise<boolean> {
+    return $Call.ByID(2424639793, $in);
 }
 
-export function Float32InFloat32Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3132595881, $in) as any;
-    return $resultPromise;
+export function Float32InFloat32Out($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3132595881, $in);
 }
 
-export function Float64InFloat64Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2182412247, $in) as any;
-    return $resultPromise;
+export function Float64InFloat64Out($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2182412247, $in);
 }
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
-export function Int16InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3306292566, $in) as any;
-    return $resultPromise;
+export function Int16InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3306292566, $in);
 }
 
-export function Int16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1754277916, $in) as any;
-    return $resultPromise;
+export function Int16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1754277916, $in);
 }
 
-export function Int32InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1909469092, $in) as any;
-    return $resultPromise;
+export function Int32InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1909469092, $in);
 }
 
-export function Int32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4251088558, $in) as any;
-    return $resultPromise;
+export function Int32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(4251088558, $in);
 }
 
-export function Int64InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1343888303, $in) as any;
-    return $resultPromise;
+export function Int64InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1343888303, $in);
 }
 
-export function Int64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2205561041, $in) as any;
-    return $resultPromise;
+export function Int64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2205561041, $in);
 }
 
-export function Int8InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(572240879, $in) as any;
-    return $resultPromise;
+export function Int8InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(572240879, $in);
 }
 
-export function Int8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2189402897, $in) as any;
-    return $resultPromise;
+export function Int8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2189402897, $in);
 }
 
-export function IntInIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(642881729, $in) as any;
-    return $resultPromise;
+export function IntInIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(642881729, $in);
 }
 
-export function IntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1066151743, $in) as any;
-    return $resultPromise;
+export function IntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1066151743, $in);
 }
 
-export function IntPointerInputNamedOutputs($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2718999663, $in) as any;
-    return $resultPromise;
+export function IntPointerInputNamedOutputs($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2718999663, $in);
 }
 
-export function MapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2386486356, $in) as any;
-    return $resultPromise;
+export function MapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByID(2386486356, $in);
 }
 
-export function MapIntIntPointer($in: { [_: `${number}`]: number | null } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2163571325, $in) as any;
-    return $resultPromise;
+export function MapIntIntPointer($in: { [_: `${number}`]: number | null } | null): $CancellablePromise<void> {
+    return $Call.ByID(2163571325, $in);
 }
 
-export function MapIntSliceInt($in: { [_: `${number}`]: number[] | null } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2900172572, $in) as any;
-    return $resultPromise;
+export function MapIntSliceInt($in: { [_: `${number}`]: number[] | null } | null): $CancellablePromise<void> {
+    return $Call.ByID(2900172572, $in);
 }
 
-export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] | null } | null): Promise<{ [_: `${number}`]: number[] | null } | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(881980169, $in) as any;
-    return $resultPromise;
+export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] | null } | null): $CancellablePromise<{ [_: `${number}`]: number[] | null } | null> {
+    return $Call.ByID(881980169, $in);
 }
 
-export function NoInputsStringOut(): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1075577233) as any;
-    return $resultPromise;
+export function NoInputsStringOut(): $CancellablePromise<string> {
+    return $Call.ByID(1075577233);
 }
 
-export function PointerBoolInBoolOut($in: boolean | null): Promise<boolean | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3589606958, $in) as any;
-    return $resultPromise;
+export function PointerBoolInBoolOut($in: boolean | null): $CancellablePromise<boolean | null> {
+    return $Call.ByID(3589606958, $in);
 }
 
-export function PointerFloat32InFloat32Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(224675106, $in) as any;
-    return $resultPromise;
+export function PointerFloat32InFloat32Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(224675106, $in);
 }
 
-export function PointerFloat64InFloat64Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2124953624, $in) as any;
-    return $resultPromise;
+export function PointerFloat64InFloat64Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2124953624, $in);
 }
 
-export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3516977899, $in) as any;
-    return $resultPromise;
+export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByID(3516977899, $in);
 }
 
-export function PointerStringInStringOut($in: string | null): Promise<string | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(229603958, $in) as any;
-    return $resultPromise;
+export function PointerStringInStringOut($in: string | null): $CancellablePromise<string | null> {
+    return $Call.ByID(229603958, $in);
 }
 
-export function StringArrayInputNamedOutput($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3678582682, $in) as any;
-    return $resultPromise;
+export function StringArrayInputNamedOutput($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByID(3678582682, $in);
 }
 
-export function StringArrayInputNamedOutputs($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(319259595, $in) as any;
-    return $resultPromise;
+export function StringArrayInputNamedOutputs($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByID(319259595, $in);
 }
 
-export function StringArrayInputStringArrayOut($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(383995060, $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringArrayOut($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByID(383995060, $in);
 }
 
-export function StringArrayInputStringOut($in: string[] | null): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1091960237, $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringOut($in: string[] | null): $CancellablePromise<string> {
+    return $Call.ByID(1091960237, $in);
 }
 
-export function StructInputStructOutput($in: $models.Person): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3835643147, $in) as any;
-    return $resultPromise;
+export function StructInputStructOutput($in: $models.Person): $CancellablePromise<$models.Person> {
+    return $Call.ByID(3835643147, $in);
 }
 
-export function StructPointerInputErrorOutput($in: $models.Person | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2447692557, $in) as any;
-    return $resultPromise;
+export function StructPointerInputErrorOutput($in: $models.Person | null): $CancellablePromise<void> {
+    return $Call.ByID(2447692557, $in);
 }
 
-export function StructPointerInputStructPointerOutput($in: $models.Person | null): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2943477349, $in) as any;
-    return $resultPromise;
+export function StructPointerInputStructPointerOutput($in: $models.Person | null): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(2943477349, $in);
 }
 
-export function UInt16InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3401034892, $in) as any;
-    return $resultPromise;
+export function UInt16InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3401034892, $in);
 }
 
-export function UInt16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1236957573, $in) as any;
-    return $resultPromise;
+export function UInt16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1236957573, $in);
 }
 
-export function UInt32InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1160383782, $in) as any;
-    return $resultPromise;
+export function UInt32InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1160383782, $in);
 }
 
-export function UInt32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1739300671, $in) as any;
-    return $resultPromise;
+export function UInt32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1739300671, $in);
 }
 
-export function UInt64InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(793803239, $in) as any;
-    return $resultPromise;
+export function UInt64InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(793803239, $in);
 }
 
-export function UInt64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1403757716, $in) as any;
-    return $resultPromise;
+export function UInt64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1403757716, $in);
 }
 
-export function UInt8InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2988345717, $in) as any;
-    return $resultPromise;
+export function UInt8InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2988345717, $in);
 }
 
-export function UInt8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(518250834, $in) as any;
-    return $resultPromise;
+export function UInt8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(518250834, $in);
 }
 
-export function UIntInUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2836661285, $in) as any;
-    return $resultPromise;
+export function UIntInUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2836661285, $in);
 }
 
-export function UIntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1367187362, $in) as any;
-    return $resultPromise;
+export function UIntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1367187362, $in);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
index 59d1e0f13..ef5015467 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
@@ -8,226 +8,183 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function ArrayInt($in: number[]): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3862002418, $in) as any;
-    return $resultPromise;
+export function ArrayInt($in: number[]): $CancellablePromise<void> {
+    return $Call.ByID(3862002418, $in);
 }
 
-export function BoolInBoolOut($in: boolean): Promise<boolean> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2424639793, $in) as any;
-    return $resultPromise;
+export function BoolInBoolOut($in: boolean): $CancellablePromise<boolean> {
+    return $Call.ByID(2424639793, $in);
 }
 
-export function Float32InFloat32Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3132595881, $in) as any;
-    return $resultPromise;
+export function Float32InFloat32Out($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3132595881, $in);
 }
 
-export function Float64InFloat64Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2182412247, $in) as any;
-    return $resultPromise;
+export function Float64InFloat64Out($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2182412247, $in);
 }
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
-export function Int16InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3306292566, $in) as any;
-    return $resultPromise;
+export function Int16InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3306292566, $in);
 }
 
-export function Int16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1754277916, $in) as any;
-    return $resultPromise;
+export function Int16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1754277916, $in);
 }
 
-export function Int32InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1909469092, $in) as any;
-    return $resultPromise;
+export function Int32InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1909469092, $in);
 }
 
-export function Int32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(4251088558, $in) as any;
-    return $resultPromise;
+export function Int32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(4251088558, $in);
 }
 
-export function Int64InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1343888303, $in) as any;
-    return $resultPromise;
+export function Int64InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1343888303, $in);
 }
 
-export function Int64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2205561041, $in) as any;
-    return $resultPromise;
+export function Int64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2205561041, $in);
 }
 
-export function Int8InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(572240879, $in) as any;
-    return $resultPromise;
+export function Int8InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(572240879, $in);
 }
 
-export function Int8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2189402897, $in) as any;
-    return $resultPromise;
+export function Int8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2189402897, $in);
 }
 
-export function IntInIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(642881729, $in) as any;
-    return $resultPromise;
+export function IntInIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(642881729, $in);
 }
 
-export function IntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1066151743, $in) as any;
-    return $resultPromise;
+export function IntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1066151743, $in);
 }
 
-export function IntPointerInputNamedOutputs($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2718999663, $in) as any;
-    return $resultPromise;
+export function IntPointerInputNamedOutputs($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2718999663, $in);
 }
 
-export function MapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2386486356, $in) as any;
-    return $resultPromise;
+export function MapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByID(2386486356, $in);
 }
 
-export function MapIntIntPointer($in: { [_: `${number}`]: number | null } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2163571325, $in) as any;
-    return $resultPromise;
+export function MapIntIntPointer($in: { [_: `${number}`]: number | null } | null): $CancellablePromise<void> {
+    return $Call.ByID(2163571325, $in);
 }
 
-export function MapIntSliceInt($in: { [_: `${number}`]: number[] | null } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2900172572, $in) as any;
-    return $resultPromise;
+export function MapIntSliceInt($in: { [_: `${number}`]: number[] | null } | null): $CancellablePromise<void> {
+    return $Call.ByID(2900172572, $in);
 }
 
-export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] | null } | null): Promise<{ [_: `${number}`]: number[] | null } | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(881980169, $in) as any;
-    return $resultPromise;
+export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] | null } | null): $CancellablePromise<{ [_: `${number}`]: number[] | null } | null> {
+    return $Call.ByID(881980169, $in);
 }
 
-export function NoInputsStringOut(): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1075577233) as any;
-    return $resultPromise;
+export function NoInputsStringOut(): $CancellablePromise<string> {
+    return $Call.ByID(1075577233);
 }
 
-export function PointerBoolInBoolOut($in: boolean | null): Promise<boolean | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3589606958, $in) as any;
-    return $resultPromise;
+export function PointerBoolInBoolOut($in: boolean | null): $CancellablePromise<boolean | null> {
+    return $Call.ByID(3589606958, $in);
 }
 
-export function PointerFloat32InFloat32Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(224675106, $in) as any;
-    return $resultPromise;
+export function PointerFloat32InFloat32Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(224675106, $in);
 }
 
-export function PointerFloat64InFloat64Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2124953624, $in) as any;
-    return $resultPromise;
+export function PointerFloat64InFloat64Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(2124953624, $in);
 }
 
-export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3516977899, $in) as any;
-    return $resultPromise;
+export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByID(3516977899, $in);
 }
 
-export function PointerStringInStringOut($in: string | null): Promise<string | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(229603958, $in) as any;
-    return $resultPromise;
+export function PointerStringInStringOut($in: string | null): $CancellablePromise<string | null> {
+    return $Call.ByID(229603958, $in);
 }
 
-export function StringArrayInputNamedOutput($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3678582682, $in) as any;
-    return $resultPromise;
+export function StringArrayInputNamedOutput($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByID(3678582682, $in);
 }
 
-export function StringArrayInputNamedOutputs($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(319259595, $in) as any;
-    return $resultPromise;
+export function StringArrayInputNamedOutputs($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByID(319259595, $in);
 }
 
-export function StringArrayInputStringArrayOut($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(383995060, $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringArrayOut($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByID(383995060, $in);
 }
 
-export function StringArrayInputStringOut($in: string[] | null): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1091960237, $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringOut($in: string[] | null): $CancellablePromise<string> {
+    return $Call.ByID(1091960237, $in);
 }
 
-export function StructInputStructOutput($in: $models.Person): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3835643147, $in) as any;
-    return $resultPromise;
+export function StructInputStructOutput($in: $models.Person): $CancellablePromise<$models.Person> {
+    return $Call.ByID(3835643147, $in);
 }
 
-export function StructPointerInputErrorOutput($in: $models.Person | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2447692557, $in) as any;
-    return $resultPromise;
+export function StructPointerInputErrorOutput($in: $models.Person | null): $CancellablePromise<void> {
+    return $Call.ByID(2447692557, $in);
 }
 
-export function StructPointerInputStructPointerOutput($in: $models.Person | null): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2943477349, $in) as any;
-    return $resultPromise;
+export function StructPointerInputStructPointerOutput($in: $models.Person | null): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(2943477349, $in);
 }
 
-export function UInt16InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3401034892, $in) as any;
-    return $resultPromise;
+export function UInt16InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(3401034892, $in);
 }
 
-export function UInt16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1236957573, $in) as any;
-    return $resultPromise;
+export function UInt16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1236957573, $in);
 }
 
-export function UInt32InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1160383782, $in) as any;
-    return $resultPromise;
+export function UInt32InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(1160383782, $in);
 }
 
-export function UInt32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1739300671, $in) as any;
-    return $resultPromise;
+export function UInt32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1739300671, $in);
 }
 
-export function UInt64InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(793803239, $in) as any;
-    return $resultPromise;
+export function UInt64InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(793803239, $in);
 }
 
-export function UInt64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1403757716, $in) as any;
-    return $resultPromise;
+export function UInt64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1403757716, $in);
 }
 
-export function UInt8InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2988345717, $in) as any;
-    return $resultPromise;
+export function UInt8InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2988345717, $in);
 }
 
-export function UInt8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(518250834, $in) as any;
-    return $resultPromise;
+export function UInt8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(518250834, $in);
 }
 
-export function UIntInUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(2836661285, $in) as any;
-    return $resultPromise;
+export function UIntInUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByID(2836661285, $in);
 }
 
-export function UIntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1367187362, $in) as any;
-    return $resultPromise;
+export function UIntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByID(1367187362, $in);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
index dc0a1a1b8..8a2cb7a70 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
index dc0a1a1b8..8a2cb7a70 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
index c649bfb82..8519667d5 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1411160069, name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByID(1411160069, name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1661412647, name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByID(1661412647, name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
index 0fdb6e4c6..79c8907f9 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,7 +18,6 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(1491748400) as any;
-    return $resultPromise;
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByID(1491748400);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
index 0b074ac0b..d19c65d22 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -21,41 +21,35 @@ import * as $models from "./models.js";
 /**
  * Get someone.
  */
-export function Get(aliasValue: $models.Alias): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Get", aliasValue) as any;
-    return $resultPromise;
+export function Get(aliasValue: $models.Alias): $CancellablePromise<$models.Person> {
+    return $Call.ByName("main.GreetService.Get", aliasValue);
 }
 
 /**
  * Apparently, aliases are all the rage right now.
  */
-export function GetButAliased(p: $models.AliasedPerson): Promise<$models.StrangelyAliasedPerson> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GetButAliased", p) as any;
-    return $resultPromise;
+export function GetButAliased(p: $models.AliasedPerson): $CancellablePromise<$models.StrangelyAliasedPerson> {
+    return $Call.ByName("main.GreetService.GetButAliased", p);
 }
 
 /**
  * Get someone quite different.
  */
-export function GetButDifferent(): Promise<$models.GenericPerson<boolean>> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GetButDifferent") as any;
-    return $resultPromise;
+export function GetButDifferent(): $CancellablePromise<$models.GenericPerson<boolean>> {
+    return $Call.ByName("main.GreetService.GetButDifferent");
 }
 
-export function GetButForeignPrivateAlias(): Promise<nobindingshere$0.PrivatePerson> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GetButForeignPrivateAlias") as any;
-    return $resultPromise;
+export function GetButForeignPrivateAlias(): $CancellablePromise<nobindingshere$0.PrivatePerson> {
+    return $Call.ByName("main.GreetService.GetButForeignPrivateAlias");
 }
 
-export function GetButGenericAliases(): Promise<$models.AliasGroup> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GetButGenericAliases") as any;
-    return $resultPromise;
+export function GetButGenericAliases(): $CancellablePromise<$models.AliasGroup> {
+    return $Call.ByName("main.GreetService.GetButGenericAliases");
 }
 
 /**
  * Greet a lot of unusual things.
  */
-export function Greet($0: $models.EmptyAliasStruct, $1: $models.EmptyStruct): Promise<$models.AliasStruct> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", $0, $1) as any;
-    return $resultPromise;
+export function Greet($0: $models.EmptyAliasStruct, $1: $models.EmptyStruct): $CancellablePromise<$models.AliasStruct> {
+    return $Call.ByName("main.GreetService.Greet", $0, $1);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
index 4c65d97ea..e4281d925 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service7.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function TestMethod(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service7.TestMethod") as any;
-    return $resultPromise;
+export function TestMethod(): $CancellablePromise<void> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service7.TestMethod");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
index a968e9b64..1c0154b5e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config/service9.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function TestMethod2(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service9.TestMethod2") as any;
-    return $resultPromise;
+export function TestMethod2(): $CancellablePromise<void> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/complex_expressions/config.Service9.TestMethod2");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
index dde723eae..9eff81e94 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_json/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(person: $models.Person, emb: $models.Embedded1): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", person, emb) as any;
-    return $resultPromise;
+export function Greet(person: $models.Person, emb: $models.Embedded1): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", person, emb);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
index c4b9cd802..0c3ef75cb 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/complex_method/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -19,7 +19,6 @@ import * as $models from "./models.js";
  * It has a multiline doc comment
  * The comment has even some * / traps!!
  */
-export function Greet(str: string, people: $models.Person[] | null, $2: {"AnotherCount": number, "AnotherOne": $models.Person | null}, assoc: { [_: `${number}`]: boolean | null } | null, $4: (number | null)[] | null, ...other: string[]): Promise<[$models.Person, any, number[] | null]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", str, people, $2, assoc, $4, other) as any;
-    return $resultPromise;
+export function Greet(str: string, people: $models.Person[] | null, $2: {"AnotherCount": number, "AnotherOne": $models.Person | null}, assoc: { [_: `${number}`]: boolean | null } | null, $4: (number | null)[] | null, ...other: string[]): $CancellablePromise<[$models.Person, any, number[] | null]> {
+    return $Call.ByName("main.GreetService.Greet", str, people, $2, assoc, $4, other);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
index e322a90c2..52f87997c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_imports/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as $models from "./models.js";
 /**
  * Make a cycle.
  */
-export function MakeCycles(): Promise<[$models.StructA, $models.StructC]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MakeCycles") as any;
-    return $resultPromise;
+export function MakeCycles(): $CancellablePromise<[$models.StructA, $models.StructC]> {
+    return $Call.ByName("main.GreetService.MakeCycles");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
index 8585c78d7..b7ef0ae3e 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/cyclic_types/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as $models from "./models.js";
 /**
  * Make a cycle.
  */
-export function MakeCycles(): Promise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MakeCycles") as any;
-    return $resultPromise;
+export function MakeCycles(): $CancellablePromise<[$models.Cyclic, $models.GenericCyclic<$models.GenericCyclic<number>>]> {
+    return $Call.ByName("main.GreetService.MakeCycles");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
index cdb60560b..faca61bc2 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/internalservice.ts
@@ -8,13 +8,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method($0: $models.InternalModel): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.InternalService.Method", $0) as any;
-    return $resultPromise;
+export function Method($0: $models.InternalModel): $CancellablePromise<void> {
+    return $Call.ByName("main.InternalService.Method", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
index feddd7b11..84ac0538c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/service.ts
@@ -3,20 +3,18 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as otherpackage$0 from "./otherpackage/models.js";
 
-function InternalMethod($0: string): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.Service.InternalMethod", $0) as any;
-    return $resultPromise;
+function InternalMethod($0: string): $CancellablePromise<void> {
+    return $Call.ByName("main.Service.InternalMethod", $0);
 }
 
-export function VisibleMethod($0: otherpackage$0.Dummy): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.Service.VisibleMethod", $0) as any;
-    return $resultPromise;
+export function VisibleMethod($0: otherpackage$0.Dummy): $CancellablePromise<void> {
+    return $Call.ByName("main.Service.VisibleMethod", $0);
 }
 
 export async function CustomMethod(arg: string): Promise<void> {
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
index 97059f1fa..b49239ada 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/directives/unexportedservice.ts
@@ -8,13 +8,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method($0: $models.unexportedModel): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.unexportedService.Method", $0) as any;
-    return $resultPromise;
+export function Method($0: $models.unexportedModel): $CancellablePromise<void> {
+    return $Call.ByName("main.unexportedService.Method", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
index 8888fd9f0..4951af01d 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/embedded_interface/greetservice.ts
@@ -8,45 +8,40 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Comment 1.
  */
-export function Method1(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method1") as any;
-    return $resultPromise;
+export function Method1(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method1");
 }
 
 /**
  * Comment 2.
  */
-export function Method2(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method2") as any;
-    return $resultPromise;
+export function Method2(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method2");
 }
 
 /**
  * Comment 3a.
  * Comment 3b.
  */
-export function Method3(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method3") as any;
-    return $resultPromise;
+export function Method3(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method3");
 }
 
 /**
  * Comment 4.
  */
-export function Method4(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method4") as any;
-    return $resultPromise;
+export function Method4(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method4");
 }
 
 /**
  * Comment 5.
  */
-export function Method5(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Method5") as any;
-    return $resultPromise;
+export function Method5(): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Method5");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
index 4294d1e30..d857aa9e7 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string, title: $models.Title): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name, title) as any;
-    return $resultPromise;
+export function Greet(name: string, title: $models.Title): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name, title);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
index 3d7d982f4..73469c39d 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/enum_from_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,7 +17,6 @@ import * as services$0 from "./services/models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string, title: services$0.Title): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name, title) as any;
-    return $resultPromise;
+export function Greet(name: string, title: services$0.Title): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name, title);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
index 4602f3a69..5a8e9adc3 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
index 0ea61fe3a..c6db3803b 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,7 +18,6 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services.OtherService.Yay") as any;
-    return $resultPromise;
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_imported_package/services.OtherService.Yay");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
index 4602f3a69..5a8e9adc3 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
index 1bf854765..b83ce5234 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,7 +18,6 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other.OtherService.Yay") as any;
-    return $resultPromise;
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/function_from_nested_imported_package/services/other.OtherService.Yay");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
index f68e20023..41664b850 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_multiple_files/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
index f817be3c7..80bebe425 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
index 0945346b5..63a65248c 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_context/greetservice.ts
@@ -8,20 +8,18 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * Greet someone
  */
-export function GreetWithContext(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.GreetWithContext", name) as any;
-    return $resultPromise;
+export function GreetWithContext(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.GreetWithContext", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
index f817be3c7..80bebe425 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/function_single_internal/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
index 8ebd680ee..7b59b53ed 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/service.ts
@@ -3,13 +3,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method(): Promise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.Service.Method") as any;
-    return $resultPromise;
+export function Method(): $CancellablePromise<$models.Maps<$models.PointerTextMarshaler, number, number, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null, $models.ValueTextMarshaler, $models.StringType, $models.ValueTextMarshaler, $models.PointerTextMarshaler | null>> {
+    return $Call.ByName("main.Service.Method");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
index f1801dbe9..0de2fecd5 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/marshalers/service.ts
@@ -3,13 +3,12 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function Method(): Promise<$models.Data> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.Service.Method") as any;
-    return $resultPromise;
+export function Method(): $CancellablePromise<$models.Data> {
+    return $Call.ByName("main.Service.Method");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
index 8aa4349f6..e6638332a 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other/othermethods.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other.OtherMethods.LikeThisOtherOne") as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/other.OtherMethods.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
index 60f7459e2..e37a596df 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/somemethods.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * LikeThisOne is an example method that does nothing.
  */
-export function LikeThisOne(): Promise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOne") as any;
-    return $resultPromise;
+export function LikeThisOne(): $CancellablePromise<[$models.Person, $models.HowDifferent<boolean>, $models.PrivatePerson]> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOne");
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOtherOne") as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here.SomeMethods.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
index 43cc4ace8..ec7619bfc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedother.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.EmbedOther.LikeThisOtherOne") as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByName("main.EmbedOther.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
index 3674555d3..680b028b4 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/embedservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as nobindingshere$0 from "../no_bindings_here/models.js";
 /**
  * LikeThisOne is an example method that does nothing.
  */
-export function LikeThisOne(): Promise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.EmbedService.LikeThisOne") as any;
-    return $resultPromise;
+export function LikeThisOne(): $CancellablePromise<[nobindingshere$0.Person, nobindingshere$0.HowDifferent<boolean>, nobindingshere$0.PrivatePerson]> {
+    return $Call.ByName("main.EmbedService.LikeThisOne");
 }
 
 /**
  * LikeThisOtherOne does nothing as well, but is different.
  */
-export function LikeThisOtherOne(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.EmbedService.LikeThisOtherOne") as any;
-    return $resultPromise;
+export function LikeThisOtherOne(): $CancellablePromise<void> {
+    return $Call.ByName("main.EmbedService.LikeThisOtherOne");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
index a1c5e3028..4166b32f7 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/out_of_tree/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet($0: string): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", $0) as any;
-    return $resultPromise;
+export function Greet($0: string): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.Greet", $0);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
index f68e20023..41664b850 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
index bf655567e..5a733e6c9 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple/otherservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Hello(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.OtherService.Hello") as any;
-    return $resultPromise;
+export function Hello(): $CancellablePromise<void> {
+    return $Call.ByName("main.OtherService.Hello");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
index f68e20023..41664b850 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/greetservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
index bf655567e..5a733e6c9 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_files/otherservice.ts
@@ -3,9 +3,8 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
-export function Hello(): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.OtherService.Hello") as any;
-    return $resultPromise;
+export function Hello(): $CancellablePromise<void> {
+    return $Call.ByName("main.OtherService.Hello");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
index 4602f3a69..5a8e9adc3 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
index 6e0546e29..018d8df30 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,7 +18,6 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services.OtherService.Yay") as any;
-    return $resultPromise;
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_multiple_other/services.OtherService.Yay");
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
index e05f6102b..b8abcb9a6 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_non_pointer_single/greetservice.ts
@@ -8,226 +8,183 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function ArrayInt($in: number[]): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.ArrayInt", $in) as any;
-    return $resultPromise;
+export function ArrayInt($in: number[]): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.ArrayInt", $in);
 }
 
-export function BoolInBoolOut($in: boolean): Promise<boolean> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.BoolInBoolOut", $in) as any;
-    return $resultPromise;
+export function BoolInBoolOut($in: boolean): $CancellablePromise<boolean> {
+    return $Call.ByName("main.GreetService.BoolInBoolOut", $in);
 }
 
-export function Float32InFloat32Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Float32InFloat32Out", $in) as any;
-    return $resultPromise;
+export function Float32InFloat32Out($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Float32InFloat32Out", $in);
 }
 
-export function Float64InFloat64Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Float64InFloat64Out", $in) as any;
-    return $resultPromise;
+export function Float64InFloat64Out($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Float64InFloat64Out", $in);
 }
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
-export function Int16InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int16InIntOut", $in) as any;
-    return $resultPromise;
+export function Int16InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int16InIntOut", $in);
 }
 
-export function Int16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in);
 }
 
-export function Int32InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int32InIntOut", $in) as any;
-    return $resultPromise;
+export function Int32InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int32InIntOut", $in);
 }
 
-export function Int32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in);
 }
 
-export function Int64InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int64InIntOut", $in) as any;
-    return $resultPromise;
+export function Int64InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int64InIntOut", $in);
 }
 
-export function Int64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in);
 }
 
-export function Int8InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int8InIntOut", $in) as any;
-    return $resultPromise;
+export function Int8InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int8InIntOut", $in);
 }
 
-export function Int8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in);
 }
 
-export function IntInIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntInIntOut", $in) as any;
-    return $resultPromise;
+export function IntInIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.IntInIntOut", $in);
 }
 
-export function IntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntPointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function IntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.IntPointerInAndOutput", $in);
 }
 
-export function IntPointerInputNamedOutputs($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in) as any;
-    return $resultPromise;
+export function IntPointerInputNamedOutputs($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in);
 }
 
-export function MapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntInt", $in) as any;
-    return $resultPromise;
+export function MapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntInt", $in);
 }
 
-export function MapIntIntPointer($in: { [_: `${number}`]: number | null } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntIntPointer", $in) as any;
-    return $resultPromise;
+export function MapIntIntPointer($in: { [_: `${number}`]: number | null } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntIntPointer", $in);
 }
 
-export function MapIntSliceInt($in: { [_: `${number}`]: number[] | null } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntSliceInt", $in) as any;
-    return $resultPromise;
+export function MapIntSliceInt($in: { [_: `${number}`]: number[] | null } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntSliceInt", $in);
 }
 
-export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] | null } | null): Promise<{ [_: `${number}`]: number[] | null } | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in) as any;
-    return $resultPromise;
+export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] | null } | null): $CancellablePromise<{ [_: `${number}`]: number[] | null } | null> {
+    return $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in);
 }
 
-export function NoInputsStringOut(): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NoInputsStringOut") as any;
-    return $resultPromise;
+export function NoInputsStringOut(): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
-export function PointerBoolInBoolOut($in: boolean | null): Promise<boolean | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in) as any;
-    return $resultPromise;
+export function PointerBoolInBoolOut($in: boolean | null): $CancellablePromise<boolean | null> {
+    return $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in);
 }
 
-export function PointerFloat32InFloat32Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in) as any;
-    return $resultPromise;
+export function PointerFloat32InFloat32Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in);
 }
 
-export function PointerFloat64InFloat64Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in) as any;
-    return $resultPromise;
+export function PointerFloat64InFloat64Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in);
 }
 
-export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerMapIntInt", $in) as any;
-    return $resultPromise;
+export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.PointerMapIntInt", $in);
 }
 
-export function PointerStringInStringOut($in: string | null): Promise<string | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerStringInStringOut", $in) as any;
-    return $resultPromise;
+export function PointerStringInStringOut($in: string | null): $CancellablePromise<string | null> {
+    return $Call.ByName("main.GreetService.PointerStringInStringOut", $in);
 }
 
-export function StringArrayInputNamedOutput($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in) as any;
-    return $resultPromise;
+export function StringArrayInputNamedOutput($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in);
 }
 
-export function StringArrayInputNamedOutputs($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in) as any;
-    return $resultPromise;
+export function StringArrayInputNamedOutputs($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in);
 }
 
-export function StringArrayInputStringArrayOut($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringArrayOut($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in);
 }
 
-export function StringArrayInputStringOut($in: string[] | null): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputStringOut", $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringOut($in: string[] | null): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.StringArrayInputStringOut", $in);
 }
 
-export function StructInputStructOutput($in: $models.Person): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructInputStructOutput", $in) as any;
-    return $resultPromise;
+export function StructInputStructOutput($in: $models.Person): $CancellablePromise<$models.Person> {
+    return $Call.ByName("main.GreetService.StructInputStructOutput", $in);
 }
 
-export function StructPointerInputErrorOutput($in: $models.Person | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in) as any;
-    return $resultPromise;
+export function StructPointerInputErrorOutput($in: $models.Person | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in);
 }
 
-export function StructPointerInputStructPointerOutput($in: $models.Person | null): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in) as any;
-    return $resultPromise;
+export function StructPointerInputStructPointerOutput($in: $models.Person | null): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in);
 }
 
-export function UInt16InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt16InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt16InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt16InUIntOut", $in);
 }
 
-export function UInt16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in);
 }
 
-export function UInt32InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt32InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt32InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt32InUIntOut", $in);
 }
 
-export function UInt32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in);
 }
 
-export function UInt64InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt64InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt64InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt64InUIntOut", $in);
 }
 
-export function UInt64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in);
 }
 
-export function UInt8InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt8InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt8InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt8InUIntOut", $in);
 }
 
-export function UInt8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in);
 }
 
-export function UIntInUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UIntInUIntOut", $in) as any;
-    return $resultPromise;
+export function UIntInUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UIntInUIntOut", $in);
 }
 
-export function UIntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UIntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
index e05f6102b..b8abcb9a6 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/struct_literal_single/greetservice.ts
@@ -8,226 +8,183 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as $models from "./models.js";
 
-export function ArrayInt($in: number[]): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.ArrayInt", $in) as any;
-    return $resultPromise;
+export function ArrayInt($in: number[]): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.ArrayInt", $in);
 }
 
-export function BoolInBoolOut($in: boolean): Promise<boolean> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.BoolInBoolOut", $in) as any;
-    return $resultPromise;
+export function BoolInBoolOut($in: boolean): $CancellablePromise<boolean> {
+    return $Call.ByName("main.GreetService.BoolInBoolOut", $in);
 }
 
-export function Float32InFloat32Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Float32InFloat32Out", $in) as any;
-    return $resultPromise;
+export function Float32InFloat32Out($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Float32InFloat32Out", $in);
 }
 
-export function Float64InFloat64Out($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Float64InFloat64Out", $in) as any;
-    return $resultPromise;
+export function Float64InFloat64Out($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Float64InFloat64Out", $in);
 }
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
-export function Int16InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int16InIntOut", $in) as any;
-    return $resultPromise;
+export function Int16InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int16InIntOut", $in);
 }
 
-export function Int16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int16PointerInAndOutput", $in);
 }
 
-export function Int32InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int32InIntOut", $in) as any;
-    return $resultPromise;
+export function Int32InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int32InIntOut", $in);
 }
 
-export function Int32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int32PointerInAndOutput", $in);
 }
 
-export function Int64InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int64InIntOut", $in) as any;
-    return $resultPromise;
+export function Int64InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int64InIntOut", $in);
 }
 
-export function Int64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int64PointerInAndOutput", $in);
 }
 
-export function Int8InIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int8InIntOut", $in) as any;
-    return $resultPromise;
+export function Int8InIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.Int8InIntOut", $in);
 }
 
-export function Int8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function Int8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.Int8PointerInAndOutput", $in);
 }
 
-export function IntInIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntInIntOut", $in) as any;
-    return $resultPromise;
+export function IntInIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.IntInIntOut", $in);
 }
 
-export function IntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntPointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function IntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.IntPointerInAndOutput", $in);
 }
 
-export function IntPointerInputNamedOutputs($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in) as any;
-    return $resultPromise;
+export function IntPointerInputNamedOutputs($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.IntPointerInputNamedOutputs", $in);
 }
 
-export function MapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntInt", $in) as any;
-    return $resultPromise;
+export function MapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntInt", $in);
 }
 
-export function MapIntIntPointer($in: { [_: `${number}`]: number | null } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntIntPointer", $in) as any;
-    return $resultPromise;
+export function MapIntIntPointer($in: { [_: `${number}`]: number | null } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntIntPointer", $in);
 }
 
-export function MapIntSliceInt($in: { [_: `${number}`]: number[] | null } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntSliceInt", $in) as any;
-    return $resultPromise;
+export function MapIntSliceInt($in: { [_: `${number}`]: number[] | null } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.MapIntSliceInt", $in);
 }
 
-export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] | null } | null): Promise<{ [_: `${number}`]: number[] | null } | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in) as any;
-    return $resultPromise;
+export function MapIntSliceIntInMapIntSliceIntOut($in: { [_: `${number}`]: number[] | null } | null): $CancellablePromise<{ [_: `${number}`]: number[] | null } | null> {
+    return $Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", $in);
 }
 
-export function NoInputsStringOut(): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NoInputsStringOut") as any;
-    return $resultPromise;
+export function NoInputsStringOut(): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
-export function PointerBoolInBoolOut($in: boolean | null): Promise<boolean | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in) as any;
-    return $resultPromise;
+export function PointerBoolInBoolOut($in: boolean | null): $CancellablePromise<boolean | null> {
+    return $Call.ByName("main.GreetService.PointerBoolInBoolOut", $in);
 }
 
-export function PointerFloat32InFloat32Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in) as any;
-    return $resultPromise;
+export function PointerFloat32InFloat32Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.PointerFloat32InFloat32Out", $in);
 }
 
-export function PointerFloat64InFloat64Out($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in) as any;
-    return $resultPromise;
+export function PointerFloat64InFloat64Out($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.PointerFloat64InFloat64Out", $in);
 }
 
-export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerMapIntInt", $in) as any;
-    return $resultPromise;
+export function PointerMapIntInt($in: { [_: `${number}`]: number } | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.PointerMapIntInt", $in);
 }
 
-export function PointerStringInStringOut($in: string | null): Promise<string | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.PointerStringInStringOut", $in) as any;
-    return $resultPromise;
+export function PointerStringInStringOut($in: string | null): $CancellablePromise<string | null> {
+    return $Call.ByName("main.GreetService.PointerStringInStringOut", $in);
 }
 
-export function StringArrayInputNamedOutput($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in) as any;
-    return $resultPromise;
+export function StringArrayInputNamedOutput($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutput", $in);
 }
 
-export function StringArrayInputNamedOutputs($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in) as any;
-    return $resultPromise;
+export function StringArrayInputNamedOutputs($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByName("main.GreetService.StringArrayInputNamedOutputs", $in);
 }
 
-export function StringArrayInputStringArrayOut($in: string[] | null): Promise<string[] | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringArrayOut($in: string[] | null): $CancellablePromise<string[] | null> {
+    return $Call.ByName("main.GreetService.StringArrayInputStringArrayOut", $in);
 }
 
-export function StringArrayInputStringOut($in: string[] | null): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StringArrayInputStringOut", $in) as any;
-    return $resultPromise;
+export function StringArrayInputStringOut($in: string[] | null): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.StringArrayInputStringOut", $in);
 }
 
-export function StructInputStructOutput($in: $models.Person): Promise<$models.Person> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructInputStructOutput", $in) as any;
-    return $resultPromise;
+export function StructInputStructOutput($in: $models.Person): $CancellablePromise<$models.Person> {
+    return $Call.ByName("main.GreetService.StructInputStructOutput", $in);
 }
 
-export function StructPointerInputErrorOutput($in: $models.Person | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in) as any;
-    return $resultPromise;
+export function StructPointerInputErrorOutput($in: $models.Person | null): $CancellablePromise<void> {
+    return $Call.ByName("main.GreetService.StructPointerInputErrorOutput", $in);
 }
 
-export function StructPointerInputStructPointerOutput($in: $models.Person | null): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in) as any;
-    return $resultPromise;
+export function StructPointerInputStructPointerOutput($in: $models.Person | null): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", $in);
 }
 
-export function UInt16InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt16InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt16InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt16InUIntOut", $in);
 }
 
-export function UInt16PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt16PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt16PointerInAndOutput", $in);
 }
 
-export function UInt32InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt32InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt32InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt32InUIntOut", $in);
 }
 
-export function UInt32PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt32PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt32PointerInAndOutput", $in);
 }
 
-export function UInt64InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt64InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt64InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt64InUIntOut", $in);
 }
 
-export function UInt64PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt64PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt64PointerInAndOutput", $in);
 }
 
-export function UInt8InUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt8InUIntOut", $in) as any;
-    return $resultPromise;
+export function UInt8InUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UInt8InUIntOut", $in);
 }
 
-export function UInt8PointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UInt8PointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UInt8PointerInAndOutput", $in);
 }
 
-export function UIntInUIntOut($in: number): Promise<number> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UIntInUIntOut", $in) as any;
-    return $resultPromise;
+export function UIntInUIntOut($in: number): $CancellablePromise<number> {
+    return $Call.ByName("main.GreetService.UIntInUIntOut", $in);
 }
 
-export function UIntPointerInAndOutput($in: number | null): Promise<number | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in) as any;
-    return $resultPromise;
+export function UIntPointerInAndOutput($in: number | null): $CancellablePromise<number | null> {
+    return $Call.ByName("main.GreetService.UIntPointerInAndOutput", $in);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
index f817be3c7..80bebe425 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
index f817be3c7..80bebe425 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_function/greetservice.ts
@@ -8,12 +8,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 /**
  * Greet someone
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
index 4602f3a69..5a8e9adc3 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/greetservice.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -17,15 +17,13 @@ import * as $models from "./models.js";
 /**
  * Greet does XYZ
  */
-export function Greet(name: string): Promise<string> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.Greet", name) as any;
-    return $resultPromise;
+export function Greet(name: string): $CancellablePromise<string> {
+    return $Call.ByName("main.GreetService.Greet", name);
 }
 
 /**
  * NewPerson creates a new person
  */
-export function NewPerson(name: string): Promise<$models.Person | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("main.GreetService.NewPerson", name) as any;
-    return $resultPromise;
+export function NewPerson(name: string): $CancellablePromise<$models.Person | null> {
+    return $Call.ByName("main.GreetService.NewPerson", name);
 }
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
index 6af5a977a..c93f85314 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services/otherservice.ts
@@ -9,7 +9,7 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call} from "/wails/runtime.js";
+import { Call as $Call, CancellablePromise as $CancellablePromise } from "/wails/runtime.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
@@ -18,7 +18,6 @@ import * as $models from "./models.js";
 /**
  * Yay does this and that
  */
-export function Yay(): Promise<$models.Address | null> & { cancel(): void } {
-    let $resultPromise = $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services.OtherService.Yay") as any;
-    return $resultPromise;
+export function Yay(): $CancellablePromise<$models.Address | null> {
+    return $Call.ByName("github.com/wailsapp/wails/v3/internal/generator/testcases/variable_single_from_other_function/services.OtherService.Yay");
 }
diff --git a/v3/internal/runtime/.gitignore b/v3/internal/runtime/.gitignore
index b91601cbd..059d2134d 100644
--- a/v3/internal/runtime/.gitignore
+++ b/v3/internal/runtime/.gitignore
@@ -1,3 +1,5 @@
 node_modules
 .task
 *.tsbuildinfo
+desktop/@wailsio/runtime/dist/
+desktop/@wailsio/runtime/types/
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/application.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/application.js
deleted file mode 100644
index a017d4aa4..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/application.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-const call = newRuntimeCaller(objectNames.Application);
-const HideMethod = 0;
-const ShowMethod = 1;
-const QuitMethod = 2;
-/**
- * Hides a certain method by calling the HideMethod function.
- */
-export function Hide() {
-    return call(HideMethod);
-}
-/**
- * Calls the ShowMethod and returns the result.
- */
-export function Show() {
-    return call(ShowMethod);
-}
-/**
- * Calls the QuitMethod to terminate the program.
- */
-export function Quit() {
-    return call(QuitMethod);
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/browser.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/browser.js
deleted file mode 100644
index 633989016..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/browser.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-const call = newRuntimeCaller(objectNames.Browser);
-const BrowserOpenURL = 0;
-/**
- * Open a browser window to the given URL.
- *
- * @param url - The URL to open
- */
-export function OpenURL(url) {
-    return call(BrowserOpenURL, { url: url.toString() });
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/callable.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/callable.js
deleted file mode 100644
index c38273532..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/callable.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// Source: https://github.com/inspect-js/is-callable
-// The MIT License (MIT)
-//
-// Copyright (c) 2015 Jordan Harband
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-var fnToStr = Function.prototype.toString;
-var reflectApply = typeof Reflect === 'object' && Reflect !== null && Reflect.apply;
-var badArrayLike;
-var isCallableMarker;
-if (typeof reflectApply === 'function' && typeof Object.defineProperty === 'function') {
-    try {
-        badArrayLike = Object.defineProperty({}, 'length', {
-            get: function () {
-                throw isCallableMarker;
-            }
-        });
-        isCallableMarker = {};
-        // eslint-disable-next-line no-throw-literal
-        reflectApply(function () { throw 42; }, null, badArrayLike);
-    }
-    catch (_) {
-        if (_ !== isCallableMarker) {
-            reflectApply = null;
-        }
-    }
-}
-else {
-    reflectApply = null;
-}
-var constructorRegex = /^\s*class\b/;
-var isES6ClassFn = function isES6ClassFunction(value) {
-    try {
-        var fnStr = fnToStr.call(value);
-        return constructorRegex.test(fnStr);
-    }
-    catch (e) {
-        return false; // not a function
-    }
-};
-var tryFunctionObject = function tryFunctionToStr(value) {
-    try {
-        if (isES6ClassFn(value)) {
-            return false;
-        }
-        fnToStr.call(value);
-        return true;
-    }
-    catch (e) {
-        return false;
-    }
-};
-var toStr = Object.prototype.toString;
-var objectClass = '[object Object]';
-var fnClass = '[object Function]';
-var genClass = '[object GeneratorFunction]';
-var ddaClass = '[object HTMLAllCollection]'; // IE 11
-var ddaClass2 = '[object HTML document.all class]';
-var ddaClass3 = '[object HTMLCollection]'; // IE 9-10
-var hasToStringTag = typeof Symbol === 'function' && !!Symbol.toStringTag; // better: use `has-tostringtag`
-var isIE68 = !(0 in [,]); // eslint-disable-line no-sparse-arrays, comma-spacing
-var isDDA = function isDocumentDotAll() { return false; };
-if (typeof document === 'object') {
-    // Firefox 3 canonicalizes DDA to undefined when it's not accessed directly
-    var all = document.all;
-    if (toStr.call(all) === toStr.call(document.all)) {
-        isDDA = function isDocumentDotAll(value) {
-            /* globals document: false */
-            // in IE 6-8, typeof document.all is "object" and it's truthy
-            if ((isIE68 || !value) && (typeof value === 'undefined' || typeof value === 'object')) {
-                try {
-                    var str = toStr.call(value);
-                    return (str === ddaClass
-                        || str === ddaClass2
-                        || str === ddaClass3 // opera 12.16
-                        || str === objectClass // IE 6-8
-                    ) && value('') == null; // eslint-disable-line eqeqeq
-                }
-                catch (e) { /**/ }
-            }
-            return false;
-        };
-    }
-}
-function isCallableRefApply(value) {
-    if (isDDA(value)) {
-        return true;
-    }
-    if (!value) {
-        return false;
-    }
-    if (typeof value !== 'function' && typeof value !== 'object') {
-        return false;
-    }
-    try {
-        reflectApply(value, null, badArrayLike);
-    }
-    catch (e) {
-        if (e !== isCallableMarker) {
-            return false;
-        }
-    }
-    return !isES6ClassFn(value) && tryFunctionObject(value);
-}
-function isCallableNoRefApply(value) {
-    if (isDDA(value)) {
-        return true;
-    }
-    if (!value) {
-        return false;
-    }
-    if (typeof value !== 'function' && typeof value !== 'object') {
-        return false;
-    }
-    if (hasToStringTag) {
-        return tryFunctionObject(value);
-    }
-    if (isES6ClassFn(value)) {
-        return false;
-    }
-    var strClass = toStr.call(value);
-    if (strClass !== fnClass && strClass !== genClass && !(/^\[object HTML/).test(strClass)) {
-        return false;
-    }
-    return tryFunctionObject(value);
-}
-;
-export default reflectApply ? isCallableRefApply : isCallableNoRefApply;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/calls.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/calls.js
deleted file mode 100644
index a6777fa42..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/calls.js
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { CancellablePromise } from "./cancellable.js";
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-import { nanoid } from "./nanoid.js";
-// Setup
-window._wails = window._wails || {};
-window._wails.callResultHandler = resultHandler;
-window._wails.callErrorHandler = errorHandler;
-const call = newRuntimeCaller(objectNames.Call);
-const cancelCall = newRuntimeCaller(objectNames.CancelCall);
-const callResponses = new Map();
-const CallBinding = 0;
-const CancelMethod = 0;
-/**
- * Exception class that will be thrown in case the bound method returns an error.
- * The value of the {@link RuntimeError#name} property is "RuntimeError".
- */
-export class RuntimeError extends Error {
-    /**
-     * Constructs a new RuntimeError instance.
-     * @param message - The error message.
-     * @param options - Options to be forwarded to the Error constructor.
-     */
-    constructor(message, options) {
-        super(message, options);
-        this.name = "RuntimeError";
-    }
-}
-/**
- * Handles the result of a call request.
- *
- * @param id - The id of the request to handle the result for.
- * @param data - The result data of the request.
- * @param isJSON - Indicates whether the data is JSON or not.
- */
-function resultHandler(id, data, isJSON) {
-    const resolvers = getAndDeleteResponse(id);
-    if (!resolvers) {
-        return;
-    }
-    if (!data) {
-        resolvers.resolve(undefined);
-    }
-    else if (!isJSON) {
-        resolvers.resolve(data);
-    }
-    else {
-        try {
-            resolvers.resolve(JSON.parse(data));
-        }
-        catch (err) {
-            resolvers.reject(new TypeError("could not parse result: " + err.message, { cause: err }));
-        }
-    }
-}
-/**
- * Handles the error from a call request.
- *
- * @param id - The id of the promise handler.
- * @param data - The error data to reject the promise handler with.
- * @param isJSON - Indicates whether the data is JSON or not.
- */
-function errorHandler(id, data, isJSON) {
-    const resolvers = getAndDeleteResponse(id);
-    if (!resolvers) {
-        return;
-    }
-    if (!isJSON) {
-        resolvers.reject(new Error(data));
-    }
-    else {
-        let error;
-        try {
-            error = JSON.parse(data);
-        }
-        catch (err) {
-            resolvers.reject(new TypeError("could not parse error: " + err.message, { cause: err }));
-            return;
-        }
-        let options = {};
-        if (error.cause) {
-            options.cause = error.cause;
-        }
-        let exception;
-        switch (error.kind) {
-            case "ReferenceError":
-                exception = new ReferenceError(error.message, options);
-                break;
-            case "TypeError":
-                exception = new TypeError(error.message, options);
-                break;
-            case "RuntimeError":
-                exception = new RuntimeError(error.message, options);
-                break;
-            default:
-                exception = new Error(error.message, options);
-                break;
-        }
-        resolvers.reject(exception);
-    }
-}
-/**
- * Retrieves and removes the response associated with the given ID from the callResponses map.
- *
- * @param id - The ID of the response to be retrieved and removed.
- * @returns The response object associated with the given ID, if any.
- */
-function getAndDeleteResponse(id) {
-    const response = callResponses.get(id);
-    callResponses.delete(id);
-    return response;
-}
-/**
- * Generates a unique ID using the nanoid library.
- *
- * @returns A unique ID that does not exist in the callResponses set.
- */
-function generateID() {
-    let result;
-    do {
-        result = nanoid();
-    } while (callResponses.has(result));
-    return result;
-}
-/**
- * Call a bound method according to the given call options.
- *
- * In case of failure, the returned promise will reject with an exception
- * among ReferenceError (unknown method), TypeError (wrong argument count or type),
- * {@link RuntimeError} (method returned an error), or other (network or internal errors).
- * The exception might have a "cause" field with the value returned
- * by the application- or service-level error marshaling functions.
- *
- * @param options - A method call descriptor.
- * @returns The result of the call.
- */
-export function Call(options) {
-    const id = generateID();
-    const result = CancellablePromise.withResolvers();
-    callResponses.set(id, { resolve: result.resolve, reject: result.reject });
-    const request = call(CallBinding, Object.assign({ "call-id": id }, options));
-    let running = false;
-    request.then(() => {
-        running = true;
-    }, (err) => {
-        callResponses.delete(id);
-        result.reject(err);
-    });
-    const cancel = () => {
-        callResponses.delete(id);
-        return cancelCall(CancelMethod, { "call-id": id }).catch((err) => {
-            console.error("Error while requesting binding call cancellation:", err);
-        });
-    };
-    result.oncancelled = () => {
-        if (running) {
-            return cancel();
-        }
-        else {
-            return request.then(cancel);
-        }
-    };
-    return result.promise;
-}
-/**
- * Calls a bound method by name with the specified arguments.
- * See {@link Call} for details.
- *
- * @param methodName - The name of the method in the format 'package.struct.method'.
- * @param args - The arguments to pass to the method.
- * @returns The result of the method call.
- */
-export function ByName(methodName, ...args) {
-    return Call({ methodName, args });
-}
-/**
- * Calls a method by its numeric ID with the specified arguments.
- * See {@link Call} for details.
- *
- * @param methodID - The ID of the method to call.
- * @param args - The arguments to pass to the method.
- * @return The result of the method call.
- */
-export function ByID(methodID, ...args) {
-    return Call({ methodID, args });
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/cancellable.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/cancellable.js
deleted file mode 100644
index 834cb9412..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/cancellable.js
+++ /dev/null
@@ -1,792 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-var _a;
-import isCallable from "./callable.js";
-/**
- * Exception class that will be used as rejection reason
- * in case a {@link CancellablePromise} is cancelled successfully.
- *
- * The value of the {@link name} property is the string `"CancelError"`.
- * The value of the {@link cause} property is the cause passed to the cancel method, if any.
- */
-export class CancelError extends Error {
-    /**
-     * Constructs a new `CancelError` instance.
-     * @param message - The error message.
-     * @param options - Options to be forwarded to the Error constructor.
-     */
-    constructor(message, options) {
-        super(message, options);
-        this.name = "CancelError";
-    }
-}
-/**
- * Exception class that will be reported as an unhandled rejection
- * in case a {@link CancellablePromise} rejects after being cancelled,
- * or when the `oncancelled` callback throws or rejects.
- *
- * The value of the {@link name} property is the string `"CancelledRejectionError"`.
- * The value of the {@link cause} property is the reason the promise rejected with.
- *
- * Because the original promise was cancelled,
- * a wrapper promise will be passed to the unhandled rejection listener instead.
- * The {@link promise} property holds a reference to the original promise.
- */
-export class CancelledRejectionError extends Error {
-    /**
-     * Constructs a new `CancelledRejectionError` instance.
-     * @param promise - The promise that caused the error originally.
-     * @param reason - The rejection reason.
-     * @param info - An optional informative message specifying the circumstances in which the error was thrown.
-     *               Defaults to the string `"Unhandled rejection in cancelled promise."`.
-     */
-    constructor(promise, reason, info) {
-        super((info !== null && info !== void 0 ? info : "Unhandled rejection in cancelled promise.") + " Reason: " + errorMessage(reason), { cause: reason });
-        this.promise = promise;
-        this.name = "CancelledRejectionError";
-    }
-}
-// Private field names.
-const barrierSym = Symbol("barrier");
-const cancelImplSym = Symbol("cancelImpl");
-const species = (_a = Symbol.species) !== null && _a !== void 0 ? _a : Symbol("speciesPolyfill");
-/**
- * A promise with an attached method for cancelling long-running operations (see {@link CancellablePromise#cancel}).
- * Cancellation can optionally be bound to an {@link AbortSignal}
- * for better composability (see {@link CancellablePromise#cancelOn}).
- *
- * Cancelling a pending promise will result in an immediate rejection
- * with an instance of {@link CancelError} as reason,
- * but whoever started the promise will be responsible
- * for actually aborting the underlying operation.
- * To this purpose, the constructor and all chaining methods
- * accept optional cancellation callbacks.
- *
- * If a `CancellablePromise` still resolves after having been cancelled,
- * the result will be discarded. If it rejects, the reason
- * will be reported as an unhandled rejection,
- * wrapped in a {@link CancelledRejectionError} instance.
- * To facilitate the handling of cancellation requests,
- * cancelled `CancellablePromise`s will _not_ report unhandled `CancelError`s
- * whose `cause` field is the same as the one with which the current promise was cancelled.
- *
- * All usual promise methods are defined and return a `CancellablePromise`
- * whose cancel method will cancel the parent operation as well, propagating the cancellation reason
- * upwards through promise chains.
- * Conversely, cancelling a promise will not automatically cancel dependent promises downstream:
- * ```ts
- * let root = new CancellablePromise((resolve, reject) => { ... });
- * let child1 = root.then(() => { ... });
- * let child2 = child1.then(() => { ... });
- * let child3 = root.catch(() => { ... });
- * child1.cancel(); // Cancels child1 and root, but not child2 or child3
- * ```
- * Cancelling a promise that has already settled is safe and has no consequence.
- *
- * The `cancel` method returns a promise that _always fulfills_
- * after the whole chain has processed the cancel request
- * and all attached callbacks up to that moment have run.
- *
- * All ES2024 promise methods (static and instance) are defined on CancellablePromise,
- * but actual availability may vary with OS/webview version.
- *
- * In line with the proposal at https://github.com/tc39/proposal-rm-builtin-subclassing,
- * `CancellablePromise` does not support transparent subclassing.
- * Extenders should take care to provide their own method implementations.
- * This might be reconsidered in case the proposal is retired.
- *
- * CancellablePromise is a wrapper around the DOM Promise object
- * and is compliant with the [Promises/A+ specification](https://promisesaplus.com/)
- * (it passes the [compliance suite](https://github.com/promises-aplus/promises-tests))
- * if so is the underlying implementation.
- */
-export class CancellablePromise extends Promise {
-    /**
-     * Creates a new `CancellablePromise`.
-     *
-     * @param executor - A callback used to initialize the promise. This callback is passed two arguments:
-     *                   a `resolve` callback used to resolve the promise with a value
-     *                   or the result of another promise (possibly cancellable),
-     *                   and a `reject` callback used to reject the promise with a provided reason or error.
-     *                   If the value provided to the `resolve` callback is a thenable _and_ cancellable object
-     *                   (it has a `then` _and_ a `cancel` method),
-     *                   cancellation requests will be forwarded to that object and the oncancelled will not be invoked anymore.
-     *                   If any one of the two callbacks is called _after_ the promise has been cancelled,
-     *                   the provided values will be cancelled and resolved as usual,
-     *                   but their results will be discarded.
-     *                   However, if the resolution process ultimately ends up in a rejection
-     *                   that is not due to cancellation, the rejection reason
-     *                   will be wrapped in a {@link CancelledRejectionError}
-     *                   and bubbled up as an unhandled rejection.
-     * @param oncancelled - It is the caller's responsibility to ensure that any operation
-     *                      started by the executor is properly halted upon cancellation.
-     *                      This optional callback can be used to that purpose.
-     *                      It will be called _synchronously_ with a cancellation cause
-     *                      when cancellation is requested, _after_ the promise has already rejected
-     *                      with a {@link CancelError}, but _before_
-     *                      any {@link then}/{@link catch}/{@link finally} callback runs.
-     *                      If the callback returns a thenable, the promise returned from {@link cancel}
-     *                      will only fulfill after the former has settled.
-     *                      Unhandled exceptions or rejections from the callback will be wrapped
-     *                      in a {@link CancelledRejectionError} and bubbled up as unhandled rejections.
-     *                      If the `resolve` callback is called before cancellation with a cancellable promise,
-     *                      cancellation requests on this promise will be diverted to that promise,
-     *                      and the original `oncancelled` callback will be discarded.
-     */
-    constructor(executor, oncancelled) {
-        let resolve;
-        let reject;
-        super((res, rej) => { resolve = res; reject = rej; });
-        if (this.constructor[species] !== Promise) {
-            throw new TypeError("CancellablePromise does not support transparent subclassing. Please refrain from overriding the [Symbol.species] static property.");
-        }
-        let promise = {
-            promise: this,
-            resolve,
-            reject,
-            get oncancelled() { return oncancelled !== null && oncancelled !== void 0 ? oncancelled : null; },
-            set oncancelled(cb) { oncancelled = cb !== null && cb !== void 0 ? cb : undefined; }
-        };
-        const state = {
-            get root() { return state; },
-            resolving: false,
-            settled: false
-        };
-        // Setup cancellation system.
-        void Object.defineProperties(this, {
-            [barrierSym]: {
-                configurable: false,
-                enumerable: false,
-                writable: true,
-                value: null
-            },
-            [cancelImplSym]: {
-                configurable: false,
-                enumerable: false,
-                writable: false,
-                value: cancellerFor(promise, state)
-            }
-        });
-        // Run the actual executor.
-        const rejector = rejectorFor(promise, state);
-        try {
-            executor(resolverFor(promise, state), rejector);
-        }
-        catch (err) {
-            if (state.resolving) {
-                console.log("Unhandled exception in CancellablePromise executor.", err);
-            }
-            else {
-                rejector(err);
-            }
-        }
-    }
-    /**
-     * Cancels immediately the execution of the operation associated with this promise.
-     * The promise rejects with a {@link CancelError} instance as reason,
-     * with the {@link CancelError#cause} property set to the given argument, if any.
-     *
-     * Has no effect if called after the promise has already settled;
-     * repeated calls in particular are safe, but only the first one
-     * will set the cancellation cause.
-     *
-     * The `CancelError` exception _need not_ be handled explicitly _on the promises that are being cancelled:_
-     * cancelling a promise with no attached rejection handler does not trigger an unhandled rejection event.
-     * Therefore, the following idioms are all equally correct:
-     * ```ts
-     * new CancellablePromise((resolve, reject) => { ... }).cancel();
-     * new CancellablePromise((resolve, reject) => { ... }).then(...).cancel();
-     * new CancellablePromise((resolve, reject) => { ... }).then(...).catch(...).cancel();
-     * ```
-     * Whenever some cancelled promise in a chain rejects with a `CancelError`
-     * with the same cancellation cause as itself, the error will be discarded silently.
-     * However, the `CancelError` _will still be delivered_ to all attached rejection handlers
-     * added by {@link then} and related methods:
-     * ```ts
-     * let cancellable = new CancellablePromise((resolve, reject) => { ... });
-     * cancellable.then(() => { ... }).catch(console.log);
-     * cancellable.cancel(); // A CancelError is printed to the console.
-     * ```
-     * If the `CancelError` is not handled downstream by the time it reaches
-     * a _non-cancelled_ promise, it _will_ trigger an unhandled rejection event,
-     * just like normal rejections would:
-     * ```ts
-     * let cancellable = new CancellablePromise((resolve, reject) => { ... });
-     * let chained = cancellable.then(() => { ... }).then(() => { ... }); // No catch...
-     * cancellable.cancel(); // Unhandled rejection event on chained!
-     * ```
-     * Therefore, it is important to either cancel whole promise chains from their tail,
-     * as shown in the correct idioms above, or take care of handling errors everywhere.
-     *
-     * @returns A cancellable promise that _fulfills_ after the cancel callback (if any)
-     * and all handlers attached up to the call to cancel have run.
-     * If the cancel callback returns a thenable, the promise returned by `cancel`
-     * will also wait for that thenable to settle.
-     * This enables callers to wait for the cancelled operation to terminate
-     * without being forced to handle potential errors at the call site.
-     * ```ts
-     * cancellable.cancel().then(() => {
-     *     // Cleanup finished, it's safe to do something else.
-     * }, (err) => {
-     *     // Unreachable: the promise returned from cancel will never reject.
-     * });
-     * ```
-     * Note that the returned promise will _not_ handle implicitly any rejection
-     * that might have occurred already in the cancelled chain.
-     * It will just track whether registered handlers have been executed or not.
-     * Therefore, unhandled rejections will never be silently handled by calling cancel.
-     */
-    cancel(cause) {
-        return new CancellablePromise((resolve) => {
-            // INVARIANT: the result of this[cancelImplSym] and the barrier do not ever reject.
-            // Unfortunately macOS High Sierra does not support Promise.allSettled.
-            Promise.all([
-                this[cancelImplSym](new CancelError("Promise cancelled.", { cause })),
-                currentBarrier(this)
-            ]).then(() => resolve(), () => resolve());
-        });
-    }
-    /**
-     * Binds promise cancellation to the abort event of the given {@link AbortSignal}.
-     * If the signal has already aborted, the promise will be cancelled immediately.
-     * When either condition is verified, the cancellation cause will be set
-     * to the signal's abort reason (see {@link AbortSignal#reason}).
-     *
-     * Has no effect if called (or if the signal aborts) _after_ the promise has already settled.
-     * Only the first signal to abort will set the cancellation cause.
-     *
-     * For more details about the cancellation process,
-     * see {@link cancel} and the `CancellablePromise` constructor.
-     *
-     * This method enables `await`ing cancellable promises without having
-     * to store them for future cancellation, e.g.:
-     * ```ts
-     * await longRunningOperation().cancelOn(signal);
-     * ```
-     * instead of:
-     * ```ts
-     * let promiseToBeCancelled = longRunningOperation();
-     * await promiseToBeCancelled;
-     * ```
-     *
-     * @returns This promise, for method chaining.
-     */
-    cancelOn(signal) {
-        if (signal.aborted) {
-            void this.cancel(signal.reason);
-        }
-        else {
-            signal.addEventListener('abort', () => void this.cancel(signal.reason), { capture: true });
-        }
-        return this;
-    }
-    /**
-     * Attaches callbacks for the resolution and/or rejection of the `CancellablePromise`.
-     *
-     * The optional `oncancelled` argument will be invoked when the returned promise is cancelled,
-     * with the same semantics as the `oncancelled` argument of the constructor.
-     * When the parent promise rejects or is cancelled, the `onrejected` callback will run,
-     * _even after the returned promise has been cancelled:_
-     * in that case, should it reject or throw, the reason will be wrapped
-     * in a {@link CancelledRejectionError} and bubbled up as an unhandled rejection.
-     *
-     * @param onfulfilled The callback to execute when the Promise is resolved.
-     * @param onrejected The callback to execute when the Promise is rejected.
-     * @returns A `CancellablePromise` for the completion of whichever callback is executed.
-     * The returned promise is hooked up to propagate cancellation requests up the chain, but not down:
-     *
-     *   - if the parent promise is cancelled, the `onrejected` handler will be invoked with a `CancelError`
-     *     and the returned promise _will resolve regularly_ with its result;
-     *   - conversely, if the returned promise is cancelled, _the parent promise is cancelled too;_
-     *     the `onrejected` handler will still be invoked with the parent's `CancelError`,
-     *     but its result will be discarded
-     *     and the returned promise will reject with a `CancelError` as well.
-     *
-     * The promise returned from {@link cancel} will fulfill only after all attached handlers
-     * up the entire promise chain have been run.
-     *
-     * If either callback returns a cancellable promise,
-     * cancellation requests will be diverted to it,
-     * and the specified `oncancelled` callback will be discarded.
-     */
-    then(onfulfilled, onrejected, oncancelled) {
-        if (!(this instanceof CancellablePromise)) {
-            throw new TypeError("CancellablePromise.prototype.then called on an invalid object.");
-        }
-        // NOTE: TypeScript's built-in type for then is broken,
-        // as it allows specifying an arbitrary TResult1 != T even when onfulfilled is not a function.
-        // We cannot fix it if we want to CancellablePromise to implement PromiseLike<T>.
-        if (!isCallable(onfulfilled)) {
-            onfulfilled = identity;
-        }
-        if (!isCallable(onrejected)) {
-            onrejected = thrower;
-        }
-        if (onfulfilled === identity && onrejected == thrower) {
-            // Shortcut for trivial arguments.
-            return new CancellablePromise((resolve) => resolve(this));
-        }
-        const barrier = {};
-        this[barrierSym] = barrier;
-        return new CancellablePromise((resolve, reject) => {
-            void super.then((value) => {
-                var _a;
-                if (this[barrierSym] === barrier) {
-                    this[barrierSym] = null;
-                }
-                (_a = barrier.resolve) === null || _a === void 0 ? void 0 : _a.call(barrier);
-                try {
-                    resolve(onfulfilled(value));
-                }
-                catch (err) {
-                    reject(err);
-                }
-            }, (reason) => {
-                var _a;
-                if (this[barrierSym] === barrier) {
-                    this[barrierSym] = null;
-                }
-                (_a = barrier.resolve) === null || _a === void 0 ? void 0 : _a.call(barrier);
-                try {
-                    resolve(onrejected(reason));
-                }
-                catch (err) {
-                    reject(err);
-                }
-            });
-        }, async (cause) => {
-            //cancelled = true;
-            try {
-                return oncancelled === null || oncancelled === void 0 ? void 0 : oncancelled(cause);
-            }
-            finally {
-                await this.cancel(cause);
-            }
-        });
-    }
-    /**
-     * Attaches a callback for only the rejection of the Promise.
-     *
-     * The optional `oncancelled` argument will be invoked when the returned promise is cancelled,
-     * with the same semantics as the `oncancelled` argument of the constructor.
-     * When the parent promise rejects or is cancelled, the `onrejected` callback will run,
-     * _even after the returned promise has been cancelled:_
-     * in that case, should it reject or throw, the reason will be wrapped
-     * in a {@link CancelledRejectionError} and bubbled up as an unhandled rejection.
-     *
-     * It is equivalent to
-     * ```ts
-     * cancellablePromise.then(undefined, onrejected, oncancelled);
-     * ```
-     * and the same caveats apply.
-     *
-     * @returns A Promise for the completion of the callback.
-     * Cancellation requests on the returned promise
-     * will propagate up the chain to the parent promise,
-     * but not in the other direction.
-     *
-     * The promise returned from {@link cancel} will fulfill only after all attached handlers
-     * up the entire promise chain have been run.
-     *
-     * If `onrejected` returns a cancellable promise,
-     * cancellation requests will be diverted to it,
-     * and the specified `oncancelled` callback will be discarded.
-     * See {@link then} for more details.
-     */
-    catch(onrejected, oncancelled) {
-        return this.then(undefined, onrejected, oncancelled);
-    }
-    /**
-     * Attaches a callback that is invoked when the CancellablePromise is settled (fulfilled or rejected). The
-     * resolved value cannot be accessed or modified from the callback.
-     * The returned promise will settle in the same state as the original one
-     * after the provided callback has completed execution,
-     * unless the callback throws or returns a rejecting promise,
-     * in which case the returned promise will reject as well.
-     *
-     * The optional `oncancelled` argument will be invoked when the returned promise is cancelled,
-     * with the same semantics as the `oncancelled` argument of the constructor.
-     * Once the parent promise settles, the `onfinally` callback will run,
-     * _even after the returned promise has been cancelled:_
-     * in that case, should it reject or throw, the reason will be wrapped
-     * in a {@link CancelledRejectionError} and bubbled up as an unhandled rejection.
-     *
-     * This method is implemented in terms of {@link then} and the same caveats apply.
-     * It is polyfilled, hence available in every OS/webview version.
-     *
-     * @returns A Promise for the completion of the callback.
-     * Cancellation requests on the returned promise
-     * will propagate up the chain to the parent promise,
-     * but not in the other direction.
-     *
-     * The promise returned from {@link cancel} will fulfill only after all attached handlers
-     * up the entire promise chain have been run.
-     *
-     * If `onfinally` returns a cancellable promise,
-     * cancellation requests will be diverted to it,
-     * and the specified `oncancelled` callback will be discarded.
-     * See {@link then} for more details.
-     */
-    finally(onfinally, oncancelled) {
-        if (!(this instanceof CancellablePromise)) {
-            throw new TypeError("CancellablePromise.prototype.finally called on an invalid object.");
-        }
-        if (!isCallable(onfinally)) {
-            return this.then(onfinally, onfinally, oncancelled);
-        }
-        return this.then((value) => CancellablePromise.resolve(onfinally()).then(() => value), (reason) => CancellablePromise.resolve(onfinally()).then(() => { throw reason; }), oncancelled);
-    }
-    /**
-     * We use the `[Symbol.species]` static property, if available,
-     * to disable the built-in automatic subclassing features from {@link Promise}.
-     * It is critical for performance reasons that extenders do not override this.
-     * Once the proposal at https://github.com/tc39/proposal-rm-builtin-subclassing
-     * is either accepted or retired, this implementation will have to be revised accordingly.
-     *
-     * @ignore
-     * @internal
-     */
-    static get [species]() {
-        return Promise;
-    }
-    static all(values) {
-        let collected = Array.from(values);
-        const promise = collected.length === 0
-            ? CancellablePromise.resolve(collected)
-            : new CancellablePromise((resolve, reject) => {
-                void Promise.all(collected).then(resolve, reject);
-            }, (cause) => cancelAll(promise, collected, cause));
-        return promise;
-    }
-    static allSettled(values) {
-        let collected = Array.from(values);
-        const promise = collected.length === 0
-            ? CancellablePromise.resolve(collected)
-            : new CancellablePromise((resolve, reject) => {
-                void Promise.allSettled(collected).then(resolve, reject);
-            }, (cause) => cancelAll(promise, collected, cause));
-        return promise;
-    }
-    static any(values) {
-        let collected = Array.from(values);
-        const promise = collected.length === 0
-            ? CancellablePromise.resolve(collected)
-            : new CancellablePromise((resolve, reject) => {
-                void Promise.any(collected).then(resolve, reject);
-            }, (cause) => cancelAll(promise, collected, cause));
-        return promise;
-    }
-    static race(values) {
-        let collected = Array.from(values);
-        const promise = new CancellablePromise((resolve, reject) => {
-            void Promise.race(collected).then(resolve, reject);
-        }, (cause) => cancelAll(promise, collected, cause));
-        return promise;
-    }
-    /**
-     * Creates a new cancelled CancellablePromise for the provided cause.
-     *
-     * @group Static Methods
-     */
-    static cancel(cause) {
-        const p = new CancellablePromise(() => { });
-        p.cancel(cause);
-        return p;
-    }
-    /**
-     * Creates a new CancellablePromise that cancels
-     * after the specified timeout, with the provided cause.
-     *
-     * If the {@link AbortSignal.timeout} factory method is available,
-     * it is used to base the timeout on _active_ time rather than _elapsed_ time.
-     * Otherwise, `timeout` falls back to {@link setTimeout}.
-     *
-     * @group Static Methods
-     */
-    static timeout(milliseconds, cause) {
-        const promise = new CancellablePromise(() => { });
-        if (AbortSignal && typeof AbortSignal === 'function' && AbortSignal.timeout && typeof AbortSignal.timeout === 'function') {
-            AbortSignal.timeout(milliseconds).addEventListener('abort', () => void promise.cancel(cause));
-        }
-        else {
-            setTimeout(() => void promise.cancel(cause), milliseconds);
-        }
-        return promise;
-    }
-    static sleep(milliseconds, value) {
-        return new CancellablePromise((resolve) => {
-            setTimeout(() => resolve(value), milliseconds);
-        });
-    }
-    /**
-     * Creates a new rejected CancellablePromise for the provided reason.
-     *
-     * @group Static Methods
-     */
-    static reject(reason) {
-        return new CancellablePromise((_, reject) => reject(reason));
-    }
-    static resolve(value) {
-        if (value instanceof CancellablePromise) {
-            // Optimise for cancellable promises.
-            return value;
-        }
-        return new CancellablePromise((resolve) => resolve(value));
-    }
-    /**
-     * Creates a new CancellablePromise and returns it in an object, along with its resolve and reject functions
-     * and a getter/setter for the cancellation callback.
-     *
-     * This method is polyfilled, hence available in every OS/webview version.
-     *
-     * @group Static Methods
-     */
-    static withResolvers() {
-        let result = { oncancelled: null };
-        result.promise = new CancellablePromise((resolve, reject) => {
-            result.resolve = resolve;
-            result.reject = reject;
-        }, (cause) => { var _a; (_a = result.oncancelled) === null || _a === void 0 ? void 0 : _a.call(result, cause); });
-        return result;
-    }
-}
-/**
- * Returns a callback that implements the cancellation algorithm for the given cancellable promise.
- * The promise returned from the resulting function does not reject.
- */
-function cancellerFor(promise, state) {
-    let cancellationPromise = undefined;
-    return (reason) => {
-        if (!state.settled) {
-            state.settled = true;
-            state.reason = reason;
-            promise.reject(reason);
-            // Attach an error handler that ignores this specific rejection reason and nothing else.
-            // In theory, a sane underlying implementation at this point
-            // should always reject with our cancellation reason,
-            // hence the handler will never throw.
-            void Promise.prototype.then.call(promise.promise, undefined, (err) => {
-                if (err !== reason) {
-                    throw err;
-                }
-            });
-        }
-        // If reason is not set, the promise resolved regularly, hence we must not call oncancelled.
-        // If oncancelled is unset, no need to go any further.
-        if (!state.reason || !promise.oncancelled) {
-            return;
-        }
-        cancellationPromise = new Promise((resolve) => {
-            try {
-                resolve(promise.oncancelled(state.reason.cause));
-            }
-            catch (err) {
-                Promise.reject(new CancelledRejectionError(promise.promise, err, "Unhandled exception in oncancelled callback."));
-            }
-        }).catch((reason) => {
-            Promise.reject(new CancelledRejectionError(promise.promise, reason, "Unhandled rejection in oncancelled callback."));
-        });
-        // Unset oncancelled to prevent repeated calls.
-        promise.oncancelled = null;
-        return cancellationPromise;
-    };
-}
-/**
- * Returns a callback that implements the resolution algorithm for the given cancellable promise.
- */
-function resolverFor(promise, state) {
-    return (value) => {
-        if (state.resolving) {
-            return;
-        }
-        state.resolving = true;
-        if (value === promise.promise) {
-            if (state.settled) {
-                return;
-            }
-            state.settled = true;
-            promise.reject(new TypeError("A promise cannot be resolved with itself."));
-            return;
-        }
-        if (value != null && (typeof value === 'object' || typeof value === 'function')) {
-            let then;
-            try {
-                then = value.then;
-            }
-            catch (err) {
-                state.settled = true;
-                promise.reject(err);
-                return;
-            }
-            if (isCallable(then)) {
-                try {
-                    let cancel = value.cancel;
-                    if (isCallable(cancel)) {
-                        const oncancelled = (cause) => {
-                            Reflect.apply(cancel, value, [cause]);
-                        };
-                        if (state.reason) {
-                            // If already cancelled, propagate cancellation.
-                            // The promise returned from the canceller algorithm does not reject
-                            // so it can be discarded safely.
-                            void cancellerFor(Object.assign(Object.assign({}, promise), { oncancelled }), state)(state.reason);
-                        }
-                        else {
-                            promise.oncancelled = oncancelled;
-                        }
-                    }
-                }
-                catch (_a) { }
-                const newState = {
-                    root: state.root,
-                    resolving: false,
-                    get settled() { return this.root.settled; },
-                    set settled(value) { this.root.settled = value; },
-                    get reason() { return this.root.reason; }
-                };
-                const rejector = rejectorFor(promise, newState);
-                try {
-                    Reflect.apply(then, value, [resolverFor(promise, newState), rejector]);
-                }
-                catch (err) {
-                    rejector(err);
-                }
-                return; // IMPORTANT!
-            }
-        }
-        if (state.settled) {
-            return;
-        }
-        state.settled = true;
-        promise.resolve(value);
-    };
-}
-/**
- * Returns a callback that implements the rejection algorithm for the given cancellable promise.
- */
-function rejectorFor(promise, state) {
-    return (reason) => {
-        if (state.resolving) {
-            return;
-        }
-        state.resolving = true;
-        if (state.settled) {
-            try {
-                if (reason instanceof CancelError && state.reason instanceof CancelError && Object.is(reason.cause, state.reason.cause)) {
-                    // Swallow late rejections that are CancelErrors whose cancellation cause is the same as ours.
-                    return;
-                }
-            }
-            catch (_a) { }
-            void Promise.reject(new CancelledRejectionError(promise.promise, reason));
-        }
-        else {
-            state.settled = true;
-            promise.reject(reason);
-        }
-    };
-}
-/**
- * Cancels all values in an array that look like cancellable thenables.
- * Returns a promise that fulfills once all cancellation procedures for the given values have settled.
- */
-function cancelAll(parent, values, cause) {
-    const results = [];
-    for (const value of values) {
-        let cancel;
-        try {
-            if (!isCallable(value.then)) {
-                continue;
-            }
-            cancel = value.cancel;
-            if (!isCallable(cancel)) {
-                continue;
-            }
-        }
-        catch (_a) {
-            continue;
-        }
-        let result;
-        try {
-            result = Reflect.apply(cancel, value, [cause]);
-        }
-        catch (err) {
-            Promise.reject(new CancelledRejectionError(parent, err, "Unhandled exception in cancel method."));
-            continue;
-        }
-        if (!result) {
-            continue;
-        }
-        results.push((result instanceof Promise ? result : Promise.resolve(result)).catch((reason) => {
-            Promise.reject(new CancelledRejectionError(parent, reason, "Unhandled rejection in cancel method."));
-        }));
-    }
-    return Promise.all(results);
-}
-/**
- * Returns its argument.
- */
-function identity(x) {
-    return x;
-}
-/**
- * Throws its argument.
- */
-function thrower(reason) {
-    throw reason;
-}
-/**
- * Attempts various strategies to convert an error to a string.
- */
-function errorMessage(err) {
-    try {
-        if (err instanceof Error || typeof err !== 'object' || err.toString !== Object.prototype.toString) {
-            return "" + err;
-        }
-    }
-    catch (_a) { }
-    try {
-        return JSON.stringify(err);
-    }
-    catch (_b) { }
-    try {
-        return Object.prototype.toString.call(err);
-    }
-    catch (_c) { }
-    return "<could not convert error to string>";
-}
-/**
- * Gets the current barrier promise for the given cancellable promise. If necessary, initialises the barrier.
- */
-function currentBarrier(promise) {
-    var _a;
-    let pwr = (_a = promise[barrierSym]) !== null && _a !== void 0 ? _a : {};
-    if (!('promise' in pwr)) {
-        Object.assign(pwr, promiseWithResolvers());
-    }
-    if (promise[barrierSym] == null) {
-        pwr.resolve();
-        promise[barrierSym] = pwr;
-    }
-    return pwr.promise;
-}
-// Polyfill Promise.withResolvers.
-let promiseWithResolvers = Promise.withResolvers;
-if (promiseWithResolvers && typeof promiseWithResolvers === 'function') {
-    promiseWithResolvers = promiseWithResolvers.bind(Promise);
-}
-else {
-    promiseWithResolvers = function () {
-        let resolve;
-        let reject;
-        const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
-        return { promise, resolve, reject };
-    };
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/clipboard.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/clipboard.js
deleted file mode 100644
index d579d4bb3..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/clipboard.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-const call = newRuntimeCaller(objectNames.Clipboard);
-const ClipboardSetText = 0;
-const ClipboardText = 1;
-/**
- * Sets the text to the Clipboard.
- *
- * @param text - The text to be set to the Clipboard.
- * @return A Promise that resolves when the operation is successful.
- */
-export function SetText(text) {
-    return call(ClipboardSetText, { text });
-}
-/**
- * Get the Clipboard text
- *
- * @returns A promise that resolves with the text from the Clipboard.
- */
-export function Text() {
-    return call(ClipboardText);
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/contextmenu.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/contextmenu.js
deleted file mode 100644
index 1485c3aea..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/contextmenu.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-import { IsDebug } from "./system.js";
-import { eventTarget } from "./utils";
-// setup
-window.addEventListener('contextmenu', contextMenuHandler);
-const call = newRuntimeCaller(objectNames.ContextMenu);
-const ContextMenuOpen = 0;
-function openContextMenu(id, x, y, data) {
-    void call(ContextMenuOpen, { id, x, y, data });
-}
-function contextMenuHandler(event) {
-    const target = eventTarget(event);
-    // Check for custom context menu
-    const customContextMenu = window.getComputedStyle(target).getPropertyValue("--custom-contextmenu").trim();
-    if (customContextMenu) {
-        event.preventDefault();
-        const data = window.getComputedStyle(target).getPropertyValue("--custom-contextmenu-data");
-        openContextMenu(customContextMenu, event.clientX, event.clientY, data);
-    }
-    else {
-        processDefaultContextMenu(event, target);
-    }
-}
-/*
---default-contextmenu: auto; (default) will show the default context menu if contentEditable is true OR text has been selected OR element is input or textarea
---default-contextmenu: show; will always show the default context menu
---default-contextmenu: hide; will always hide the default context menu
-
-This rule is inherited like normal CSS rules, so nesting works as expected
-*/
-function processDefaultContextMenu(event, target) {
-    // Debug builds always show the menu
-    if (IsDebug()) {
-        return;
-    }
-    // Process default context menu
-    switch (window.getComputedStyle(target).getPropertyValue("--default-contextmenu").trim()) {
-        case 'show':
-            return;
-        case 'hide':
-            event.preventDefault();
-            return;
-    }
-    // Check if contentEditable is true
-    if (target.isContentEditable) {
-        return;
-    }
-    // Check if text has been selected
-    const selection = window.getSelection();
-    const hasSelection = selection && selection.toString().length > 0;
-    if (hasSelection) {
-        for (let i = 0; i < selection.rangeCount; i++) {
-            const range = selection.getRangeAt(i);
-            const rects = range.getClientRects();
-            for (let j = 0; j < rects.length; j++) {
-                const rect = rects[j];
-                if (document.elementFromPoint(rect.left, rect.top) === target) {
-                    return;
-                }
-            }
-        }
-    }
-    // Check if tag is input or textarea.
-    if (target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement) {
-        if (hasSelection || (!target.readOnly && !target.disabled)) {
-            return;
-        }
-    }
-    // hide default context menu
-    event.preventDefault();
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/create.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/create.js
deleted file mode 100644
index 610362500..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/create.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-/**
- * Any is a dummy creation function for simple or unknown types.
- */
-export function Any(source) {
-    return source;
-}
-/**
- * ByteSlice is a creation function that replaces
- * null strings with empty strings.
- */
-export function ByteSlice(source) {
-    return ((source == null) ? "" : source);
-}
-/**
- * Array takes a creation function for an arbitrary type
- * and returns an in-place creation function for an array
- * whose elements are of that type.
- */
-export function Array(element) {
-    if (element === Any) {
-        return (source) => (source === null ? [] : source);
-    }
-    return (source) => {
-        if (source === null) {
-            return [];
-        }
-        for (let i = 0; i < source.length; i++) {
-            source[i] = element(source[i]);
-        }
-        return source;
-    };
-}
-/**
- * Map takes creation functions for two arbitrary types
- * and returns an in-place creation function for an object
- * whose keys and values are of those types.
- */
-export function Map(key, value) {
-    if (value === Any) {
-        return (source) => (source === null ? {} : source);
-    }
-    return (source) => {
-        if (source === null) {
-            return {};
-        }
-        for (const key in source) {
-            source[key] = value(source[key]);
-        }
-        return source;
-    };
-}
-/**
- * Nullable takes a creation function for an arbitrary type
- * and returns a creation function for a nullable value of that type.
- */
-export function Nullable(element) {
-    if (element === Any) {
-        return Any;
-    }
-    return (source) => (source === null ? null : element(source));
-}
-/**
- * Struct takes an object mapping field names to creation functions
- * and returns an in-place creation function for a struct.
- */
-export function Struct(createField) {
-    let allAny = true;
-    for (const name in createField) {
-        if (createField[name] !== Any) {
-            allAny = false;
-            break;
-        }
-    }
-    if (allAny) {
-        return Any;
-    }
-    return (source) => {
-        for (const name in createField) {
-            if (name in source) {
-                source[name] = createField[name](source[name]);
-            }
-        }
-        return source;
-    };
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/dialogs.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/dialogs.js
deleted file mode 100644
index 2cfa4751d..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/dialogs.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-import { nanoid } from './nanoid.js';
-// setup
-window._wails = window._wails || {};
-window._wails.dialogErrorCallback = dialogErrorCallback;
-window._wails.dialogResultCallback = dialogResultCallback;
-const call = newRuntimeCaller(objectNames.Dialog);
-const dialogResponses = new Map();
-// Define constants from the `methods` object in Title Case
-const DialogInfo = 0;
-const DialogWarning = 1;
-const DialogError = 2;
-const DialogQuestion = 3;
-const DialogOpenFile = 4;
-const DialogSaveFile = 5;
-/**
- * Handles the result of a dialog request.
- *
- * @param id - The id of the request to handle the result for.
- * @param data - The result data of the request.
- * @param isJSON - Indicates whether the data is JSON or not.
- */
-function dialogResultCallback(id, data, isJSON) {
-    let resolvers = getAndDeleteResponse(id);
-    if (!resolvers) {
-        return;
-    }
-    if (isJSON) {
-        try {
-            resolvers.resolve(JSON.parse(data));
-        }
-        catch (err) {
-            resolvers.reject(new TypeError("could not parse result: " + err.message, { cause: err }));
-        }
-    }
-    else {
-        resolvers.resolve(data);
-    }
-}
-/**
- * Handles the error from a dialog request.
- *
- * @param id - The id of the promise handler.
- * @param message - An error message.
- */
-function dialogErrorCallback(id, message) {
-    var _a;
-    (_a = getAndDeleteResponse(id)) === null || _a === void 0 ? void 0 : _a.reject(new window.Error(message));
-}
-/**
- * Retrieves and removes the response associated with the given ID from the dialogResponses map.
- *
- * @param id - The ID of the response to be retrieved and removed.
- * @returns The response object associated with the given ID, if any.
- */
-function getAndDeleteResponse(id) {
-    const response = dialogResponses.get(id);
-    dialogResponses.delete(id);
-    return response;
-}
-/**
- * Generates a unique ID using the nanoid library.
- *
- * @returns A unique ID that does not exist in the dialogResponses set.
- */
-function generateID() {
-    let result;
-    do {
-        result = nanoid();
-    } while (dialogResponses.has(result));
-    return result;
-}
-/**
- * Presents a dialog of specified type with the given options.
- *
- * @param type - Dialog type.
- * @param options - Options for the dialog.
- * @returns A promise that resolves with result of dialog.
- */
-function dialog(type, options = {}) {
-    const id = generateID();
-    return new Promise((resolve, reject) => {
-        dialogResponses.set(id, { resolve, reject });
-        call(type, Object.assign({ "dialog-id": id }, options)).catch((err) => {
-            dialogResponses.delete(id);
-            reject(err);
-        });
-    });
-}
-/**
- * Presents an info dialog.
- *
- * @param options - Dialog options
- * @returns A promise that resolves with the label of the chosen button.
- */
-export function Info(options) { return dialog(DialogInfo, options); }
-/**
- * Presents a warning dialog.
- *
- * @param options - Dialog options.
- * @returns A promise that resolves with the label of the chosen button.
- */
-export function Warning(options) { return dialog(DialogWarning, options); }
-/**
- * Presents an error dialog.
- *
- * @param options - Dialog options.
- * @returns A promise that resolves with the label of the chosen button.
- */
-export function Error(options) { return dialog(DialogError, options); }
-/**
- * Presents a question dialog.
- *
- * @param options - Dialog options.
- * @returns A promise that resolves with the label of the chosen button.
- */
-export function Question(options) { return dialog(DialogQuestion, options); }
-export function OpenFile(options) { var _a; return (_a = dialog(DialogOpenFile, options)) !== null && _a !== void 0 ? _a : []; }
-/**
- * Presents a file selection dialog to pick a file to save.
- *
- * @param options - Dialog options.
- * @returns Selected file, or a blank string if no file has been selected.
- */
-export function SaveFile(options) { return dialog(DialogSaveFile, options); }
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/drag.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/drag.js
deleted file mode 100644
index ae4ecc364..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/drag.js
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { invoke, IsWindows } from "./system.js";
-import { GetFlag } from "./flags.js";
-import { canTrackButtons, eventTarget } from "./utils.js";
-// Setup
-let canDrag = false;
-let dragging = false;
-let resizable = false;
-let canResize = false;
-let resizing = false;
-let resizeEdge = "";
-let defaultCursor = "auto";
-let buttons = 0;
-const buttonsTracked = canTrackButtons();
-window._wails = window._wails || {};
-window._wails.setResizable = (value) => {
-    resizable = value;
-    if (!resizable) {
-        // Stop resizing if in progress.
-        canResize = resizing = false;
-        setResize();
-    }
-};
-window.addEventListener('mousedown', update, { capture: true });
-window.addEventListener('mousemove', update, { capture: true });
-window.addEventListener('mouseup', update, { capture: true });
-for (const ev of ['click', 'contextmenu', 'dblclick']) {
-    window.addEventListener(ev, suppressEvent, { capture: true });
-}
-function suppressEvent(event) {
-    // Suppress click events while resizing or dragging.
-    if (dragging || resizing) {
-        event.stopImmediatePropagation();
-        event.stopPropagation();
-        event.preventDefault();
-    }
-}
-// Use constants to avoid comparing strings multiple times.
-const MouseDown = 0;
-const MouseUp = 1;
-const MouseMove = 2;
-function update(event) {
-    // Windows suppresses mouse events at the end of dragging or resizing,
-    // so we need to be smart and synthesize button events.
-    let eventType, eventButtons = event.buttons;
-    switch (event.type) {
-        case 'mousedown':
-            eventType = MouseDown;
-            if (!buttonsTracked) {
-                eventButtons = buttons | (1 << event.button);
-            }
-            break;
-        case 'mouseup':
-            eventType = MouseUp;
-            if (!buttonsTracked) {
-                eventButtons = buttons & ~(1 << event.button);
-            }
-            break;
-        default:
-            eventType = MouseMove;
-            if (!buttonsTracked) {
-                eventButtons = buttons;
-            }
-            break;
-    }
-    let released = buttons & ~eventButtons;
-    let pressed = eventButtons & ~buttons;
-    buttons = eventButtons;
-    // Synthesize a release-press sequence if we detect a press of an already pressed button.
-    if (eventType === MouseDown && !(pressed & event.button)) {
-        released |= (1 << event.button);
-        pressed |= (1 << event.button);
-    }
-    // Suppress all button events during dragging and resizing,
-    // unless this is a mouseup event that is ending a drag action.
-    if (eventType !== MouseMove // Fast path for mousemove
-        && resizing
-        || (dragging
-            && (eventType === MouseDown
-                || event.button !== 0))) {
-        event.stopImmediatePropagation();
-        event.stopPropagation();
-        event.preventDefault();
-    }
-    // Handle releases
-    if (released & 1) {
-        primaryUp(event);
-    }
-    // Handle presses
-    if (pressed & 1) {
-        primaryDown(event);
-    }
-    // Handle mousemove
-    if (eventType === MouseMove) {
-        onMouseMove(event);
-    }
-    ;
-}
-function primaryDown(event) {
-    // Reset readiness state.
-    canDrag = false;
-    canResize = false;
-    // Ignore repeated clicks on macOS and Linux.
-    if (!IsWindows()) {
-        if (event.type === 'mousedown' && event.button === 0 && event.detail !== 1) {
-            return;
-        }
-    }
-    if (resizeEdge) {
-        // Ready to resize if the primary button was pressed for the first time.
-        canResize = true;
-        // Do not start drag operations when on resize edges.
-        return;
-    }
-    // Retrieve target element
-    const target = eventTarget(event);
-    // Ready to drag if the primary button was pressed for the first time on a draggable element.
-    // Ignore clicks on the scrollbar.
-    const style = window.getComputedStyle(target);
-    canDrag = (style.getPropertyValue("--wails-draggable").trim() === "drag"
-        && (event.offsetX - parseFloat(style.paddingLeft) < target.clientWidth
-            && event.offsetY - parseFloat(style.paddingTop) < target.clientHeight));
-}
-function primaryUp(event) {
-    // Stop dragging and resizing.
-    canDrag = false;
-    dragging = false;
-    canResize = false;
-    resizing = false;
-}
-const cursorForEdge = Object.freeze({
-    "se-resize": "nwse-resize",
-    "sw-resize": "nesw-resize",
-    "nw-resize": "nwse-resize",
-    "ne-resize": "nesw-resize",
-    "w-resize": "ew-resize",
-    "n-resize": "ns-resize",
-    "s-resize": "ns-resize",
-    "e-resize": "ew-resize",
-});
-function setResize(edge) {
-    if (edge) {
-        if (!resizeEdge) {
-            defaultCursor = document.body.style.cursor;
-        }
-        document.body.style.cursor = cursorForEdge[edge];
-    }
-    else if (!edge && resizeEdge) {
-        document.body.style.cursor = defaultCursor;
-    }
-    resizeEdge = edge || "";
-}
-function onMouseMove(event) {
-    if (canResize && resizeEdge) {
-        // Start resizing.
-        resizing = true;
-        invoke("wails:resize:" + resizeEdge);
-    }
-    else if (canDrag) {
-        // Start dragging.
-        dragging = true;
-        invoke("wails:drag");
-    }
-    if (dragging || resizing) {
-        // Either drag or resize is ongoing,
-        // reset readiness and stop processing.
-        canDrag = canResize = false;
-        return;
-    }
-    if (!resizable || !IsWindows()) {
-        if (resizeEdge) {
-            setResize();
-        }
-        return;
-    }
-    const resizeHandleHeight = GetFlag("system.resizeHandleHeight") || 5;
-    const resizeHandleWidth = GetFlag("system.resizeHandleWidth") || 5;
-    // Extra pixels for the corner areas.
-    const cornerExtra = GetFlag("resizeCornerExtra") || 10;
-    const rightBorder = (window.outerWidth - event.clientX) < resizeHandleWidth;
-    const leftBorder = event.clientX < resizeHandleWidth;
-    const topBorder = event.clientY < resizeHandleHeight;
-    const bottomBorder = (window.outerHeight - event.clientY) < resizeHandleHeight;
-    // Adjust for corner areas.
-    const rightCorner = (window.outerWidth - event.clientX) < (resizeHandleWidth + cornerExtra);
-    const leftCorner = event.clientX < (resizeHandleWidth + cornerExtra);
-    const topCorner = event.clientY < (resizeHandleHeight + cornerExtra);
-    const bottomCorner = (window.outerHeight - event.clientY) < (resizeHandleHeight + cornerExtra);
-    if (!leftCorner && !topCorner && !bottomCorner && !rightCorner) {
-        // Optimisation: out of all corner areas implies out of borders.
-        setResize();
-    }
-    // Detect corners.
-    else if (rightCorner && bottomCorner)
-        setResize("se-resize");
-    else if (leftCorner && bottomCorner)
-        setResize("sw-resize");
-    else if (leftCorner && topCorner)
-        setResize("nw-resize");
-    else if (topCorner && rightCorner)
-        setResize("ne-resize");
-    // Detect borders.
-    else if (leftBorder)
-        setResize("w-resize");
-    else if (topBorder)
-        setResize("n-resize");
-    else if (bottomBorder)
-        setResize("s-resize");
-    else if (rightBorder)
-        setResize("e-resize");
-    // Out of border area.
-    else
-        setResize();
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/event_types.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/event_types.js
deleted file mode 100644
index 6cf95d629..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/event_types.js
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-export const Types = Object.freeze({
-    Windows: Object.freeze({
-        APMPowerSettingChange: "windows:APMPowerSettingChange",
-        APMPowerStatusChange: "windows:APMPowerStatusChange",
-        APMResumeAutomatic: "windows:APMResumeAutomatic",
-        APMResumeSuspend: "windows:APMResumeSuspend",
-        APMSuspend: "windows:APMSuspend",
-        ApplicationStarted: "windows:ApplicationStarted",
-        SystemThemeChanged: "windows:SystemThemeChanged",
-        WebViewNavigationCompleted: "windows:WebViewNavigationCompleted",
-        WindowActive: "windows:WindowActive",
-        WindowBackgroundErase: "windows:WindowBackgroundErase",
-        WindowClickActive: "windows:WindowClickActive",
-        WindowClosing: "windows:WindowClosing",
-        WindowDidMove: "windows:WindowDidMove",
-        WindowDidResize: "windows:WindowDidResize",
-        WindowDPIChanged: "windows:WindowDPIChanged",
-        WindowDragDrop: "windows:WindowDragDrop",
-        WindowDragEnter: "windows:WindowDragEnter",
-        WindowDragLeave: "windows:WindowDragLeave",
-        WindowDragOver: "windows:WindowDragOver",
-        WindowEndMove: "windows:WindowEndMove",
-        WindowEndResize: "windows:WindowEndResize",
-        WindowFullscreen: "windows:WindowFullscreen",
-        WindowHide: "windows:WindowHide",
-        WindowInactive: "windows:WindowInactive",
-        WindowKeyDown: "windows:WindowKeyDown",
-        WindowKeyUp: "windows:WindowKeyUp",
-        WindowKillFocus: "windows:WindowKillFocus",
-        WindowNonClientHit: "windows:WindowNonClientHit",
-        WindowNonClientMouseDown: "windows:WindowNonClientMouseDown",
-        WindowNonClientMouseLeave: "windows:WindowNonClientMouseLeave",
-        WindowNonClientMouseMove: "windows:WindowNonClientMouseMove",
-        WindowNonClientMouseUp: "windows:WindowNonClientMouseUp",
-        WindowPaint: "windows:WindowPaint",
-        WindowRestore: "windows:WindowRestore",
-        WindowSetFocus: "windows:WindowSetFocus",
-        WindowShow: "windows:WindowShow",
-        WindowStartMove: "windows:WindowStartMove",
-        WindowStartResize: "windows:WindowStartResize",
-        WindowUnFullscreen: "windows:WindowUnFullscreen",
-        WindowZOrderChanged: "windows:WindowZOrderChanged",
-        WindowMinimise: "windows:WindowMinimise",
-        WindowUnMinimise: "windows:WindowUnMinimise",
-        WindowMaximise: "windows:WindowMaximise",
-        WindowUnMaximise: "windows:WindowUnMaximise",
-    }),
-    Mac: Object.freeze({
-        ApplicationDidBecomeActive: "mac:ApplicationDidBecomeActive",
-        ApplicationDidChangeBackingProperties: "mac:ApplicationDidChangeBackingProperties",
-        ApplicationDidChangeEffectiveAppearance: "mac:ApplicationDidChangeEffectiveAppearance",
-        ApplicationDidChangeIcon: "mac:ApplicationDidChangeIcon",
-        ApplicationDidChangeOcclusionState: "mac:ApplicationDidChangeOcclusionState",
-        ApplicationDidChangeScreenParameters: "mac:ApplicationDidChangeScreenParameters",
-        ApplicationDidChangeStatusBarFrame: "mac:ApplicationDidChangeStatusBarFrame",
-        ApplicationDidChangeStatusBarOrientation: "mac:ApplicationDidChangeStatusBarOrientation",
-        ApplicationDidChangeTheme: "mac:ApplicationDidChangeTheme",
-        ApplicationDidFinishLaunching: "mac:ApplicationDidFinishLaunching",
-        ApplicationDidHide: "mac:ApplicationDidHide",
-        ApplicationDidResignActive: "mac:ApplicationDidResignActive",
-        ApplicationDidUnhide: "mac:ApplicationDidUnhide",
-        ApplicationDidUpdate: "mac:ApplicationDidUpdate",
-        ApplicationShouldHandleReopen: "mac:ApplicationShouldHandleReopen",
-        ApplicationWillBecomeActive: "mac:ApplicationWillBecomeActive",
-        ApplicationWillFinishLaunching: "mac:ApplicationWillFinishLaunching",
-        ApplicationWillHide: "mac:ApplicationWillHide",
-        ApplicationWillResignActive: "mac:ApplicationWillResignActive",
-        ApplicationWillTerminate: "mac:ApplicationWillTerminate",
-        ApplicationWillUnhide: "mac:ApplicationWillUnhide",
-        ApplicationWillUpdate: "mac:ApplicationWillUpdate",
-        MenuDidAddItem: "mac:MenuDidAddItem",
-        MenuDidBeginTracking: "mac:MenuDidBeginTracking",
-        MenuDidClose: "mac:MenuDidClose",
-        MenuDidDisplayItem: "mac:MenuDidDisplayItem",
-        MenuDidEndTracking: "mac:MenuDidEndTracking",
-        MenuDidHighlightItem: "mac:MenuDidHighlightItem",
-        MenuDidOpen: "mac:MenuDidOpen",
-        MenuDidPopUp: "mac:MenuDidPopUp",
-        MenuDidRemoveItem: "mac:MenuDidRemoveItem",
-        MenuDidSendAction: "mac:MenuDidSendAction",
-        MenuDidSendActionToItem: "mac:MenuDidSendActionToItem",
-        MenuDidUpdate: "mac:MenuDidUpdate",
-        MenuWillAddItem: "mac:MenuWillAddItem",
-        MenuWillBeginTracking: "mac:MenuWillBeginTracking",
-        MenuWillDisplayItem: "mac:MenuWillDisplayItem",
-        MenuWillEndTracking: "mac:MenuWillEndTracking",
-        MenuWillHighlightItem: "mac:MenuWillHighlightItem",
-        MenuWillOpen: "mac:MenuWillOpen",
-        MenuWillPopUp: "mac:MenuWillPopUp",
-        MenuWillRemoveItem: "mac:MenuWillRemoveItem",
-        MenuWillSendAction: "mac:MenuWillSendAction",
-        MenuWillSendActionToItem: "mac:MenuWillSendActionToItem",
-        MenuWillUpdate: "mac:MenuWillUpdate",
-        WebViewDidCommitNavigation: "mac:WebViewDidCommitNavigation",
-        WebViewDidFinishNavigation: "mac:WebViewDidFinishNavigation",
-        WebViewDidReceiveServerRedirectForProvisionalNavigation: "mac:WebViewDidReceiveServerRedirectForProvisionalNavigation",
-        WebViewDidStartProvisionalNavigation: "mac:WebViewDidStartProvisionalNavigation",
-        WindowDidBecomeKey: "mac:WindowDidBecomeKey",
-        WindowDidBecomeMain: "mac:WindowDidBecomeMain",
-        WindowDidBeginSheet: "mac:WindowDidBeginSheet",
-        WindowDidChangeAlpha: "mac:WindowDidChangeAlpha",
-        WindowDidChangeBackingLocation: "mac:WindowDidChangeBackingLocation",
-        WindowDidChangeBackingProperties: "mac:WindowDidChangeBackingProperties",
-        WindowDidChangeCollectionBehavior: "mac:WindowDidChangeCollectionBehavior",
-        WindowDidChangeEffectiveAppearance: "mac:WindowDidChangeEffectiveAppearance",
-        WindowDidChangeOcclusionState: "mac:WindowDidChangeOcclusionState",
-        WindowDidChangeOrderingMode: "mac:WindowDidChangeOrderingMode",
-        WindowDidChangeScreen: "mac:WindowDidChangeScreen",
-        WindowDidChangeScreenParameters: "mac:WindowDidChangeScreenParameters",
-        WindowDidChangeScreenProfile: "mac:WindowDidChangeScreenProfile",
-        WindowDidChangeScreenSpace: "mac:WindowDidChangeScreenSpace",
-        WindowDidChangeScreenSpaceProperties: "mac:WindowDidChangeScreenSpaceProperties",
-        WindowDidChangeSharingType: "mac:WindowDidChangeSharingType",
-        WindowDidChangeSpace: "mac:WindowDidChangeSpace",
-        WindowDidChangeSpaceOrderingMode: "mac:WindowDidChangeSpaceOrderingMode",
-        WindowDidChangeTitle: "mac:WindowDidChangeTitle",
-        WindowDidChangeToolbar: "mac:WindowDidChangeToolbar",
-        WindowDidDeminiaturize: "mac:WindowDidDeminiaturize",
-        WindowDidEndSheet: "mac:WindowDidEndSheet",
-        WindowDidEnterFullScreen: "mac:WindowDidEnterFullScreen",
-        WindowDidEnterVersionBrowser: "mac:WindowDidEnterVersionBrowser",
-        WindowDidExitFullScreen: "mac:WindowDidExitFullScreen",
-        WindowDidExitVersionBrowser: "mac:WindowDidExitVersionBrowser",
-        WindowDidExpose: "mac:WindowDidExpose",
-        WindowDidFocus: "mac:WindowDidFocus",
-        WindowDidMiniaturize: "mac:WindowDidMiniaturize",
-        WindowDidMove: "mac:WindowDidMove",
-        WindowDidOrderOffScreen: "mac:WindowDidOrderOffScreen",
-        WindowDidOrderOnScreen: "mac:WindowDidOrderOnScreen",
-        WindowDidResignKey: "mac:WindowDidResignKey",
-        WindowDidResignMain: "mac:WindowDidResignMain",
-        WindowDidResize: "mac:WindowDidResize",
-        WindowDidUpdate: "mac:WindowDidUpdate",
-        WindowDidUpdateAlpha: "mac:WindowDidUpdateAlpha",
-        WindowDidUpdateCollectionBehavior: "mac:WindowDidUpdateCollectionBehavior",
-        WindowDidUpdateCollectionProperties: "mac:WindowDidUpdateCollectionProperties",
-        WindowDidUpdateShadow: "mac:WindowDidUpdateShadow",
-        WindowDidUpdateTitle: "mac:WindowDidUpdateTitle",
-        WindowDidUpdateToolbar: "mac:WindowDidUpdateToolbar",
-        WindowDidZoom: "mac:WindowDidZoom",
-        WindowFileDraggingEntered: "mac:WindowFileDraggingEntered",
-        WindowFileDraggingExited: "mac:WindowFileDraggingExited",
-        WindowFileDraggingPerformed: "mac:WindowFileDraggingPerformed",
-        WindowHide: "mac:WindowHide",
-        WindowMaximise: "mac:WindowMaximise",
-        WindowUnMaximise: "mac:WindowUnMaximise",
-        WindowMinimise: "mac:WindowMinimise",
-        WindowUnMinimise: "mac:WindowUnMinimise",
-        WindowShouldClose: "mac:WindowShouldClose",
-        WindowShow: "mac:WindowShow",
-        WindowWillBecomeKey: "mac:WindowWillBecomeKey",
-        WindowWillBecomeMain: "mac:WindowWillBecomeMain",
-        WindowWillBeginSheet: "mac:WindowWillBeginSheet",
-        WindowWillChangeOrderingMode: "mac:WindowWillChangeOrderingMode",
-        WindowWillClose: "mac:WindowWillClose",
-        WindowWillDeminiaturize: "mac:WindowWillDeminiaturize",
-        WindowWillEnterFullScreen: "mac:WindowWillEnterFullScreen",
-        WindowWillEnterVersionBrowser: "mac:WindowWillEnterVersionBrowser",
-        WindowWillExitFullScreen: "mac:WindowWillExitFullScreen",
-        WindowWillExitVersionBrowser: "mac:WindowWillExitVersionBrowser",
-        WindowWillFocus: "mac:WindowWillFocus",
-        WindowWillMiniaturize: "mac:WindowWillMiniaturize",
-        WindowWillMove: "mac:WindowWillMove",
-        WindowWillOrderOffScreen: "mac:WindowWillOrderOffScreen",
-        WindowWillOrderOnScreen: "mac:WindowWillOrderOnScreen",
-        WindowWillResignMain: "mac:WindowWillResignMain",
-        WindowWillResize: "mac:WindowWillResize",
-        WindowWillUnfocus: "mac:WindowWillUnfocus",
-        WindowWillUpdate: "mac:WindowWillUpdate",
-        WindowWillUpdateAlpha: "mac:WindowWillUpdateAlpha",
-        WindowWillUpdateCollectionBehavior: "mac:WindowWillUpdateCollectionBehavior",
-        WindowWillUpdateCollectionProperties: "mac:WindowWillUpdateCollectionProperties",
-        WindowWillUpdateShadow: "mac:WindowWillUpdateShadow",
-        WindowWillUpdateTitle: "mac:WindowWillUpdateTitle",
-        WindowWillUpdateToolbar: "mac:WindowWillUpdateToolbar",
-        WindowWillUpdateVisibility: "mac:WindowWillUpdateVisibility",
-        WindowWillUseStandardFrame: "mac:WindowWillUseStandardFrame",
-        WindowZoomIn: "mac:WindowZoomIn",
-        WindowZoomOut: "mac:WindowZoomOut",
-        WindowZoomReset: "mac:WindowZoomReset",
-    }),
-    Linux: Object.freeze({
-        ApplicationStartup: "linux:ApplicationStartup",
-        SystemThemeChanged: "linux:SystemThemeChanged",
-        WindowDeleteEvent: "linux:WindowDeleteEvent",
-        WindowDidMove: "linux:WindowDidMove",
-        WindowDidResize: "linux:WindowDidResize",
-        WindowFocusIn: "linux:WindowFocusIn",
-        WindowFocusOut: "linux:WindowFocusOut",
-        WindowLoadChanged: "linux:WindowLoadChanged",
-    }),
-    Common: Object.freeze({
-        ApplicationOpenedWithFile: "common:ApplicationOpenedWithFile",
-        ApplicationStarted: "common:ApplicationStarted",
-        ThemeChanged: "common:ThemeChanged",
-        WindowClosing: "common:WindowClosing",
-        WindowDidMove: "common:WindowDidMove",
-        WindowDidResize: "common:WindowDidResize",
-        WindowDPIChanged: "common:WindowDPIChanged",
-        WindowFilesDropped: "common:WindowFilesDropped",
-        WindowFocus: "common:WindowFocus",
-        WindowFullscreen: "common:WindowFullscreen",
-        WindowHide: "common:WindowHide",
-        WindowLostFocus: "common:WindowLostFocus",
-        WindowMaximise: "common:WindowMaximise",
-        WindowMinimise: "common:WindowMinimise",
-        WindowRestore: "common:WindowRestore",
-        WindowRuntimeReady: "common:WindowRuntimeReady",
-        WindowShow: "common:WindowShow",
-        WindowUnFullscreen: "common:WindowUnFullscreen",
-        WindowUnMaximise: "common:WindowUnMaximise",
-        WindowUnMinimise: "common:WindowUnMinimise",
-        WindowZoom: "common:WindowZoom",
-        WindowZoomIn: "common:WindowZoomIn",
-        WindowZoomOut: "common:WindowZoomOut",
-        WindowZoomReset: "common:WindowZoomReset",
-    }),
-});
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/events.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/events.js
deleted file mode 100644
index ba8b2d36c..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/events.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-import { eventListeners, Listener, listenerOff } from "./listener.js";
-// Setup
-window._wails = window._wails || {};
-window._wails.dispatchWailsEvent = dispatchWailsEvent;
-const call = newRuntimeCaller(objectNames.Events);
-const EmitMethod = 0;
-export { Types } from "./event_types.js";
-/**
- * Represents a system event or a custom event emitted through wails-provided facilities.
- */
-export class WailsEvent {
-    constructor(name, data = null) {
-        this.name = name;
-        this.data = data;
-    }
-}
-function dispatchWailsEvent(event) {
-    let listeners = eventListeners.get(event.name);
-    if (!listeners) {
-        return;
-    }
-    let wailsEvent = new WailsEvent(event.name, event.data);
-    if ('sender' in event) {
-        wailsEvent.sender = event.sender;
-    }
-    listeners = listeners.filter(listener => !listener.dispatch(wailsEvent));
-    if (listeners.length === 0) {
-        eventListeners.delete(event.name);
-    }
-    else {
-        eventListeners.set(event.name, listeners);
-    }
-}
-/**
- * Register a callback function to be called multiple times for a specific event.
- *
- * @param eventName - The name of the event to register the callback for.
- * @param callback - The callback function to be called when the event is triggered.
- * @param maxCallbacks - The maximum number of times the callback can be called for the event. Once the maximum number is reached, the callback will no longer be called.
- * @returns A function that, when called, will unregister the callback from the event.
- */
-export function OnMultiple(eventName, callback, maxCallbacks) {
-    let listeners = eventListeners.get(eventName) || [];
-    const thisListener = new Listener(eventName, callback, maxCallbacks);
-    listeners.push(thisListener);
-    eventListeners.set(eventName, listeners);
-    return () => listenerOff(thisListener);
-}
-/**
- * Registers a callback function to be executed when the specified event occurs.
- *
- * @param eventName - The name of the event to register the callback for.
- * @param callback - The callback function to be called when the event is triggered.
- * @returns A function that, when called, will unregister the callback from the event.
- */
-export function On(eventName, callback) {
-    return OnMultiple(eventName, callback, -1);
-}
-/**
- * Registers a callback function to be executed only once for the specified event.
- *
- * @param eventName - The name of the event to register the callback for.
- * @param callback - The callback function to be called when the event is triggered.
- * @returns A function that, when called, will unregister the callback from the event.
- */
-export function Once(eventName, callback) {
-    return OnMultiple(eventName, callback, 1);
-}
-/**
- * Removes event listeners for the specified event names.
- *
- * @param eventNames - The name of the events to remove listeners for.
- */
-export function Off(...eventNames) {
-    eventNames.forEach(eventName => eventListeners.delete(eventName));
-}
-/**
- * Removes all event listeners.
- */
-export function OffAll() {
-    eventListeners.clear();
-}
-/**
- * Emits the given event.
- *
- * @param event - The name of the event to emit.
- * @returns A promise that will be fulfilled once the event has been emitted.
- */
-export function Emit(event) {
-    return call(EmitMethod, event);
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/flags.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/flags.js
deleted file mode 100644
index 31071c28d..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/flags.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-/**
- * Retrieves the value associated with the specified key from the flag map.
- *
- * @param key - The key to retrieve the value for.
- * @return The value associated with the specified key.
- */
-export function GetFlag(key) {
-    try {
-        return window._wails.flags[key];
-    }
-    catch (e) {
-        throw new Error("Unable to retrieve flag '" + key + "': " + e, { cause: e });
-    }
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/index.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/index.js
deleted file mode 100644
index 34f741b89..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-// Setup
-window._wails = window._wails || {};
-import "./contextmenu.js";
-import "./drag.js";
-// Re-export public API
-import * as Application from "./application.js";
-import * as Browser from "./browser.js";
-import * as Call from "./calls.js";
-import * as Clipboard from "./clipboard.js";
-import * as Create from "./create.js";
-import * as Dialogs from "./dialogs.js";
-import * as Events from "./events.js";
-import * as Flags from "./flags.js";
-import * as Screens from "./screens.js";
-import * as System from "./system.js";
-import Window from "./window.js";
-import * as WML from "./wml.js";
-export { Application, Browser, Call, Clipboard, Dialogs, Events, Flags, Screens, System, Window, WML };
-/**
- * An internal utility consumed by the binding generator.
- *
- * @ignore
- * @internal
- */
-export { Create };
-export * from "./cancellable.js";
-// Notify backend
-window._wails.invoke = System.invoke;
-System.invoke("wails:runtime:ready");
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/listener.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/listener.js
deleted file mode 100644
index 960408867..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/listener.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-// The following utilities have been factored out of ./events.ts
-// for testing purposes.
-export const eventListeners = new Map();
-export class Listener {
-    constructor(eventName, callback, maxCallbacks) {
-        this.eventName = eventName;
-        this.callback = callback;
-        this.maxCallbacks = maxCallbacks || -1;
-    }
-    dispatch(data) {
-        try {
-            this.callback(data);
-        }
-        catch (err) {
-            console.error(err);
-        }
-        if (this.maxCallbacks === -1)
-            return false;
-        this.maxCallbacks -= 1;
-        return this.maxCallbacks === 0;
-    }
-}
-export function listenerOff(listener) {
-    let listeners = eventListeners.get(listener.eventName);
-    if (!listeners) {
-        return;
-    }
-    listeners = listeners.filter(l => l !== listener);
-    if (listeners.length === 0) {
-        eventListeners.delete(listener.eventName);
-    }
-    else {
-        eventListeners.set(listener.eventName, listeners);
-    }
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/nanoid.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/nanoid.js
deleted file mode 100644
index c0d5e2411..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/nanoid.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Source: https://github.com/ai/nanoid
-// The MIT License (MIT)
-//
-// Copyright 2017 Andrey Sitnik <andrey@sitnik.ru>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-// the Software, and to permit persons to whom the Software is furnished to do so,
-//     subject to the following conditions:
-//
-//     The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// This alphabet uses `A-Za-z0-9_-` symbols.
-// The order of characters is optimized for better gzip and brotli compression.
-// References to the same file (works both for gzip and brotli):
-// `'use`, `andom`, and `rict'`
-// References to the brotli default dictionary:
-// `-26T`, `1983`, `40px`, `75px`, `bush`, `jack`, `mind`, `very`, and `wolf`
-const urlAlphabet = 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
-export function nanoid(size = 21) {
-    let id = '';
-    // A compact alternative for `for (var i = 0; i < step; i++)`.
-    let i = size | 0;
-    while (i--) {
-        // `| 0` is more compact and faster than `Math.floor()`.
-        id += urlAlphabet[(Math.random() * 64) | 0];
-    }
-    return id;
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/runtime.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/runtime.js
deleted file mode 100644
index f11df1c2e..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/runtime.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- _     __     _ __
-| |  / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { nanoid } from './nanoid.js';
-const runtimeURL = window.location.origin + "/wails/runtime";
-// Object Names
-export const objectNames = Object.freeze({
-    Call: 0,
-    Clipboard: 1,
-    Application: 2,
-    Events: 3,
-    ContextMenu: 4,
-    Dialog: 5,
-    Window: 6,
-    Screens: 7,
-    System: 8,
-    Browser: 9,
-    CancelCall: 10,
-});
-export let clientId = nanoid();
-/**
- * Creates a new runtime caller with specified ID.
- *
- * @param object - The object to invoke the method on.
- * @param windowName - The name of the window.
- * @return The new runtime caller function.
- */
-export function newRuntimeCaller(object, windowName = '') {
-    return function (method, args = null) {
-        return runtimeCallWithID(object, method, windowName, args);
-    };
-}
-async function runtimeCallWithID(objectID, method, windowName, args) {
-    var _a, _b;
-    let url = new URL(runtimeURL);
-    url.searchParams.append("object", objectID.toString());
-    url.searchParams.append("method", method.toString());
-    if (args) {
-        url.searchParams.append("args", JSON.stringify(args));
-    }
-    let headers = {
-        ["x-wails-client-id"]: clientId
-    };
-    if (windowName) {
-        headers["x-wails-window-name"] = windowName;
-    }
-    let response = await fetch(url, { headers });
-    if (!response.ok) {
-        throw new Error(await response.text());
-    }
-    if (((_b = (_a = response.headers.get("Content-Type")) === null || _a === void 0 ? void 0 : _a.indexOf("application/json")) !== null && _b !== void 0 ? _b : -1) !== -1) {
-        return response.json();
-    }
-    else {
-        return response.text();
-    }
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/screens.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/screens.js
deleted file mode 100644
index b09dc581d..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/screens.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-const call = newRuntimeCaller(objectNames.Screens);
-const getAll = 0;
-const getPrimary = 1;
-const getCurrent = 2;
-/**
- * Gets all screens.
- *
- * @returns A promise that resolves to an array of Screen objects.
- */
-export function GetAll() {
-    return call(getAll);
-}
-/**
- * Gets the primary screen.
- *
- * @returns A promise that resolves to the primary screen.
- */
-export function GetPrimary() {
-    return call(getPrimary);
-}
-/**
- * Gets the current active screen.
- *
- * @returns A promise that resolves with the current active screen.
- */
-export function GetCurrent() {
-    return call(getCurrent);
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/system.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/system.js
deleted file mode 100644
index 4d51cf8a4..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/system.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-const call = newRuntimeCaller(objectNames.System);
-const SystemIsDarkMode = 0;
-const SystemEnvironment = 1;
-const _invoke = (function () {
-    var _a, _b, _c, _d, _e;
-    try {
-        if ((_b = (_a = window.chrome) === null || _a === void 0 ? void 0 : _a.webview) === null || _b === void 0 ? void 0 : _b.postMessage) {
-            return window.chrome.webview.postMessage.bind(window.chrome.webview);
-        }
-        else if ((_e = (_d = (_c = window.webkit) === null || _c === void 0 ? void 0 : _c.messageHandlers) === null || _d === void 0 ? void 0 : _d['external']) === null || _e === void 0 ? void 0 : _e.postMessage) {
-            return window.webkit.messageHandlers['external'].postMessage.bind(window.webkit.messageHandlers['external']);
-        }
-    }
-    catch (e) { }
-    console.warn('\n%c⚠️ Browser Environment Detected %c\n\n%cOnly UI previews are available in the browser. For full functionality, please run the application in desktop mode.\nMore information at: https://v3.wails.io/learn/build/#using-a-browser-for-development\n', 'background: #ffffff; color: #000000; font-weight: bold; padding: 4px 8px; border-radius: 4px; border: 2px solid #000000;', 'background: transparent;', 'color: #ffffff; font-style: italic; font-weight: bold;');
-    return null;
-})();
-export function invoke(msg) {
-    _invoke === null || _invoke === void 0 ? void 0 : _invoke(msg);
-}
-/**
- * Retrieves the system dark mode status.
- *
- * @returns A promise that resolves to a boolean value indicating if the system is in dark mode.
- */
-export function IsDarkMode() {
-    return call(SystemIsDarkMode);
-}
-/**
- * Fetches the capabilities of the application from the server.
- *
- * @returns A promise that resolves to an object containing the capabilities.
- */
-export async function Capabilities() {
-    let response = await fetch("/wails/capabilities");
-    if (response.ok) {
-        return response.json();
-    }
-    else {
-        throw new Error("could not fetch capabilities: " + response.statusText);
-    }
-}
-/**
- * Retrieves environment details.
- *
- * @returns A promise that resolves to an object containing OS and system architecture.
- */
-export function Environment() {
-    return call(SystemEnvironment);
-}
-/**
- * Checks if the current operating system is Windows.
- *
- * @return True if the operating system is Windows, otherwise false.
- */
-export function IsWindows() {
-    return window._wails.environment.OS === "windows";
-}
-/**
- * Checks if the current operating system is Linux.
- *
- * @returns Returns true if the current operating system is Linux, false otherwise.
- */
-export function IsLinux() {
-    return window._wails.environment.OS === "linux";
-}
-/**
- * Checks if the current environment is a macOS operating system.
- *
- * @returns True if the environment is macOS, false otherwise.
- */
-export function IsMac() {
-    return window._wails.environment.OS === "darwin";
-}
-/**
- * Checks if the current environment architecture is AMD64.
- *
- * @returns True if the current environment architecture is AMD64, false otherwise.
- */
-export function IsAMD64() {
-    return window._wails.environment.Arch === "amd64";
-}
-/**
- * Checks if the current architecture is ARM.
- *
- * @returns True if the current architecture is ARM, false otherwise.
- */
-export function IsARM() {
-    return window._wails.environment.Arch === "arm";
-}
-/**
- * Checks if the current environment is ARM64 architecture.
- *
- * @returns Returns true if the environment is ARM64 architecture, otherwise returns false.
- */
-export function IsARM64() {
-    return window._wails.environment.Arch === "arm64";
-}
-/**
- * Reports whether the app is being run in debug mode.
- *
- * @returns True if the app is being run in debug mode.
- */
-export function IsDebug() {
-    return Boolean(window._wails.environment.Debug);
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/utils.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/utils.js
deleted file mode 100644
index 4752828c8..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/utils.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- _     __     _ __
-| |  / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-/**
- * Logs a message to the console with custom formatting.
- *
- * @param message - The message to be logged.
- */
-export function debugLog(message) {
-    // eslint-disable-next-line
-    console.log('%c wails3 %c ' + message + ' ', 'background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem', 'background: #009900; color: #fff; border-radius: 0px 3px 3px 0px; padding: 1px; font-size: 0.7rem');
-}
-/**
- * Checks whether the webview supports the {@link MouseEvent#buttons} property.
- * Looking at you macOS High Sierra!
- */
-export function canTrackButtons() {
-    return (new MouseEvent('mousedown')).buttons === 0;
-}
-/**
- * Checks whether the browser supports removing listeners by triggering an AbortSignal
- * (see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#signal).
- */
-export function canAbortListeners() {
-    if (!EventTarget || !AbortSignal || !AbortController)
-        return false;
-    let result = true;
-    const target = new EventTarget();
-    const controller = new AbortController();
-    target.addEventListener('test', () => { result = false; }, { signal: controller.signal });
-    controller.abort();
-    target.dispatchEvent(new CustomEvent('test'));
-    return result;
-}
-/**
- * Resolves the closest HTMLElement ancestor of an event's target.
- */
-export function eventTarget(event) {
-    var _a;
-    if (event.target instanceof HTMLElement) {
-        return event.target;
-    }
-    else if (!(event.target instanceof HTMLElement) && event.target instanceof Node) {
-        return (_a = event.target.parentElement) !== null && _a !== void 0 ? _a : document.body;
-    }
-    else {
-        return document.body;
-    }
-}
-/***
- This technique for proper load detection is taken from HTMX:
-
- BSD 2-Clause License
-
- Copyright (c) 2020, Big Sky Software
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ***/
-let isReady = false;
-document.addEventListener('DOMContentLoaded', () => { isReady = true; });
-export function whenReady(callback) {
-    if (isReady || document.readyState === 'complete') {
-        callback();
-    }
-    else {
-        document.addEventListener('DOMContentLoaded', callback);
-    }
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/window.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/window.js
deleted file mode 100644
index c44d1ee71..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/window.js
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { newRuntimeCaller, objectNames } from "./runtime.js";
-const PositionMethod = 0;
-const CenterMethod = 1;
-const CloseMethod = 2;
-const DisableSizeConstraintsMethod = 3;
-const EnableSizeConstraintsMethod = 4;
-const FocusMethod = 5;
-const ForceReloadMethod = 6;
-const FullscreenMethod = 7;
-const GetScreenMethod = 8;
-const GetZoomMethod = 9;
-const HeightMethod = 10;
-const HideMethod = 11;
-const IsFocusedMethod = 12;
-const IsFullscreenMethod = 13;
-const IsMaximisedMethod = 14;
-const IsMinimisedMethod = 15;
-const MaximiseMethod = 16;
-const MinimiseMethod = 17;
-const NameMethod = 18;
-const OpenDevToolsMethod = 19;
-const RelativePositionMethod = 20;
-const ReloadMethod = 21;
-const ResizableMethod = 22;
-const RestoreMethod = 23;
-const SetPositionMethod = 24;
-const SetAlwaysOnTopMethod = 25;
-const SetBackgroundColourMethod = 26;
-const SetFramelessMethod = 27;
-const SetFullscreenButtonEnabledMethod = 28;
-const SetMaxSizeMethod = 29;
-const SetMinSizeMethod = 30;
-const SetRelativePositionMethod = 31;
-const SetResizableMethod = 32;
-const SetSizeMethod = 33;
-const SetTitleMethod = 34;
-const SetZoomMethod = 35;
-const ShowMethod = 36;
-const SizeMethod = 37;
-const ToggleFullscreenMethod = 38;
-const ToggleMaximiseMethod = 39;
-const UnFullscreenMethod = 40;
-const UnMaximiseMethod = 41;
-const UnMinimiseMethod = 42;
-const WidthMethod = 43;
-const ZoomMethod = 44;
-const ZoomInMethod = 45;
-const ZoomOutMethod = 46;
-const ZoomResetMethod = 47;
-// Private field names.
-const callerSym = Symbol("caller");
-class Window {
-    /**
-     * Initialises a window object with the specified name.
-     *
-     * @private
-     * @param name - The name of the target window.
-     */
-    constructor(name = '') {
-        this[callerSym] = newRuntimeCaller(objectNames.Window, name);
-        // bind instance method to make them easily usable in event handlers
-        for (const method of Object.getOwnPropertyNames(Window.prototype)) {
-            if (method !== "constructor"
-                && typeof this[method] === "function") {
-                this[method] = this[method].bind(this);
-            }
-        }
-    }
-    /**
-     * Gets the specified window.
-     *
-     * @param name - The name of the window to get.
-     * @returns The corresponding window object.
-     */
-    Get(name) {
-        return new Window(name);
-    }
-    /**
-     * Returns the absolute position of the window.
-     *
-     * @returns The current absolute position of the window.
-     */
-    Position() {
-        return this[callerSym](PositionMethod);
-    }
-    /**
-     * Centers the window on the screen.
-     */
-    Center() {
-        return this[callerSym](CenterMethod);
-    }
-    /**
-     * Closes the window.
-     */
-    Close() {
-        return this[callerSym](CloseMethod);
-    }
-    /**
-     * Disables min/max size constraints.
-     */
-    DisableSizeConstraints() {
-        return this[callerSym](DisableSizeConstraintsMethod);
-    }
-    /**
-     * Enables min/max size constraints.
-     */
-    EnableSizeConstraints() {
-        return this[callerSym](EnableSizeConstraintsMethod);
-    }
-    /**
-     * Focuses the window.
-     */
-    Focus() {
-        return this[callerSym](FocusMethod);
-    }
-    /**
-     * Forces the window to reload the page assets.
-     */
-    ForceReload() {
-        return this[callerSym](ForceReloadMethod);
-    }
-    /**
-     * Switches the window to fullscreen mode.
-     */
-    Fullscreen() {
-        return this[callerSym](FullscreenMethod);
-    }
-    /**
-     * Returns the screen that the window is on.
-     *
-     * @returns The screen the window is currently on.
-     */
-    GetScreen() {
-        return this[callerSym](GetScreenMethod);
-    }
-    /**
-     * Returns the current zoom level of the window.
-     *
-     * @returns The current zoom level.
-     */
-    GetZoom() {
-        return this[callerSym](GetZoomMethod);
-    }
-    /**
-     * Returns the height of the window.
-     *
-     * @returns The current height of the window.
-     */
-    Height() {
-        return this[callerSym](HeightMethod);
-    }
-    /**
-     * Hides the window.
-     */
-    Hide() {
-        return this[callerSym](HideMethod);
-    }
-    /**
-     * Returns true if the window is focused.
-     *
-     * @returns Whether the window is currently focused.
-     */
-    IsFocused() {
-        return this[callerSym](IsFocusedMethod);
-    }
-    /**
-     * Returns true if the window is fullscreen.
-     *
-     * @returns Whether the window is currently fullscreen.
-     */
-    IsFullscreen() {
-        return this[callerSym](IsFullscreenMethod);
-    }
-    /**
-     * Returns true if the window is maximised.
-     *
-     * @returns Whether the window is currently maximised.
-     */
-    IsMaximised() {
-        return this[callerSym](IsMaximisedMethod);
-    }
-    /**
-     * Returns true if the window is minimised.
-     *
-     * @returns Whether the window is currently minimised.
-     */
-    IsMinimised() {
-        return this[callerSym](IsMinimisedMethod);
-    }
-    /**
-     * Maximises the window.
-     */
-    Maximise() {
-        return this[callerSym](MaximiseMethod);
-    }
-    /**
-     * Minimises the window.
-     */
-    Minimise() {
-        return this[callerSym](MinimiseMethod);
-    }
-    /**
-     * Returns the name of the window.
-     *
-     * @returns The name of the window.
-     */
-    Name() {
-        return this[callerSym](NameMethod);
-    }
-    /**
-     * Opens the development tools pane.
-     */
-    OpenDevTools() {
-        return this[callerSym](OpenDevToolsMethod);
-    }
-    /**
-     * Returns the relative position of the window to the screen.
-     *
-     * @returns The current relative position of the window.
-     */
-    RelativePosition() {
-        return this[callerSym](RelativePositionMethod);
-    }
-    /**
-     * Reloads the page assets.
-     */
-    Reload() {
-        return this[callerSym](ReloadMethod);
-    }
-    /**
-     * Returns true if the window is resizable.
-     *
-     * @returns Whether the window is currently resizable.
-     */
-    Resizable() {
-        return this[callerSym](ResizableMethod);
-    }
-    /**
-     * Restores the window to its previous state if it was previously minimised, maximised or fullscreen.
-     */
-    Restore() {
-        return this[callerSym](RestoreMethod);
-    }
-    /**
-     * Sets the absolute position of the window.
-     *
-     * @param x - The desired horizontal absolute position of the window.
-     * @param y - The desired vertical absolute position of the window.
-     */
-    SetPosition(x, y) {
-        return this[callerSym](SetPositionMethod, { x, y });
-    }
-    /**
-     * Sets the window to be always on top.
-     *
-     * @param alwaysOnTop - Whether the window should stay on top.
-     */
-    SetAlwaysOnTop(alwaysOnTop) {
-        return this[callerSym](SetAlwaysOnTopMethod, { alwaysOnTop });
-    }
-    /**
-     * Sets the background colour of the window.
-     *
-     * @param r - The desired red component of the window background.
-     * @param g - The desired green component of the window background.
-     * @param b - The desired blue component of the window background.
-     * @param a - The desired alpha component of the window background.
-     */
-    SetBackgroundColour(r, g, b, a) {
-        return this[callerSym](SetBackgroundColourMethod, { r, g, b, a });
-    }
-    /**
-     * Removes the window frame and title bar.
-     *
-     * @param frameless - Whether the window should be frameless.
-     */
-    SetFrameless(frameless) {
-        return this[callerSym](SetFramelessMethod, { frameless });
-    }
-    /**
-     * Disables the system fullscreen button.
-     *
-     * @param enabled - Whether the fullscreen button should be enabled.
-     */
-    SetFullscreenButtonEnabled(enabled) {
-        return this[callerSym](SetFullscreenButtonEnabledMethod, { enabled });
-    }
-    /**
-     * Sets the maximum size of the window.
-     *
-     * @param width - The desired maximum width of the window.
-     * @param height - The desired maximum height of the window.
-     */
-    SetMaxSize(width, height) {
-        return this[callerSym](SetMaxSizeMethod, { width, height });
-    }
-    /**
-     * Sets the minimum size of the window.
-     *
-     * @param width - The desired minimum width of the window.
-     * @param height - The desired minimum height of the window.
-     */
-    SetMinSize(width, height) {
-        return this[callerSym](SetMinSizeMethod, { width, height });
-    }
-    /**
-     * Sets the relative position of the window to the screen.
-     *
-     * @param x - The desired horizontal relative position of the window.
-     * @param y - The desired vertical relative position of the window.
-     */
-    SetRelativePosition(x, y) {
-        return this[callerSym](SetRelativePositionMethod, { x, y });
-    }
-    /**
-     * Sets whether the window is resizable.
-     *
-     * @param resizable - Whether the window should be resizable.
-     */
-    SetResizable(resizable) {
-        return this[callerSym](SetResizableMethod, { resizable });
-    }
-    /**
-     * Sets the size of the window.
-     *
-     * @param width - The desired width of the window.
-     * @param height - The desired height of the window.
-     */
-    SetSize(width, height) {
-        return this[callerSym](SetSizeMethod, { width, height });
-    }
-    /**
-     * Sets the title of the window.
-     *
-     * @param title - The desired title of the window.
-     */
-    SetTitle(title) {
-        return this[callerSym](SetTitleMethod, { title });
-    }
-    /**
-     * Sets the zoom level of the window.
-     *
-     * @param zoom - The desired zoom level.
-     */
-    SetZoom(zoom) {
-        return this[callerSym](SetZoomMethod, { zoom });
-    }
-    /**
-     * Shows the window.
-     */
-    Show() {
-        return this[callerSym](ShowMethod);
-    }
-    /**
-     * Returns the size of the window.
-     *
-     * @returns The current size of the window.
-     */
-    Size() {
-        return this[callerSym](SizeMethod);
-    }
-    /**
-     * Toggles the window between fullscreen and normal.
-     */
-    ToggleFullscreen() {
-        return this[callerSym](ToggleFullscreenMethod);
-    }
-    /**
-     * Toggles the window between maximised and normal.
-     */
-    ToggleMaximise() {
-        return this[callerSym](ToggleMaximiseMethod);
-    }
-    /**
-     * Un-fullscreens the window.
-     */
-    UnFullscreen() {
-        return this[callerSym](UnFullscreenMethod);
-    }
-    /**
-     * Un-maximises the window.
-     */
-    UnMaximise() {
-        return this[callerSym](UnMaximiseMethod);
-    }
-    /**
-     * Un-minimises the window.
-     */
-    UnMinimise() {
-        return this[callerSym](UnMinimiseMethod);
-    }
-    /**
-     * Returns the width of the window.
-     *
-     * @returns The current width of the window.
-     */
-    Width() {
-        return this[callerSym](WidthMethod);
-    }
-    /**
-     * Zooms the window.
-     */
-    Zoom() {
-        return this[callerSym](ZoomMethod);
-    }
-    /**
-     * Increases the zoom level of the webview content.
-     */
-    ZoomIn() {
-        return this[callerSym](ZoomInMethod);
-    }
-    /**
-     * Decreases the zoom level of the webview content.
-     */
-    ZoomOut() {
-        return this[callerSym](ZoomOutMethod);
-    }
-    /**
-     * Resets the zoom level of the webview content.
-     */
-    ZoomReset() {
-        return this[callerSym](ZoomResetMethod);
-    }
-}
-/**
- * The window within which the script is running.
- */
-const thisWindow = new Window('');
-export default thisWindow;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/dist/wml.js b/v3/internal/runtime/desktop/@wailsio/runtime/dist/wml.js
deleted file mode 100644
index 993928237..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/dist/wml.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- _     __     _ __
-| |  / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-import { OpenURL } from "./browser.js";
-import { Question } from "./dialogs.js";
-import { Emit, WailsEvent } from "./events.js";
-import { canAbortListeners, whenReady } from "./utils.js";
-import Window from "./window.js";
-/**
- * Sends an event with the given name and optional data.
- *
- * @param eventName - - The name of the event to send.
- * @param [data=null] - - Optional data to send along with the event.
- */
-function sendEvent(eventName, data = null) {
-    Emit(new WailsEvent(eventName, data));
-}
-/**
- * Calls a method on a specified window.
- *
- * @param windowName - The name of the window to call the method on.
- * @param methodName - The name of the method to call.
- */
-function callWindowMethod(windowName, methodName) {
-    const targetWindow = Window.Get(windowName);
-    const method = targetWindow[methodName];
-    if (typeof method !== "function") {
-        console.error(`Window method '${methodName}' not found`);
-        return;
-    }
-    try {
-        method.call(targetWindow);
-    }
-    catch (e) {
-        console.error(`Error calling window method '${methodName}': `, e);
-    }
-}
-/**
- * Responds to a triggering event by running appropriate WML actions for the current target.
- */
-function onWMLTriggered(ev) {
-    const element = ev.currentTarget;
-    function runEffect(choice = "Yes") {
-        if (choice !== "Yes")
-            return;
-        const eventType = element.getAttribute('wml-event') || element.getAttribute('data-wml-event');
-        const targetWindow = element.getAttribute('wml-target-window') || element.getAttribute('data-wml-target-window') || "";
-        const windowMethod = element.getAttribute('wml-window') || element.getAttribute('data-wml-window');
-        const url = element.getAttribute('wml-openurl') || element.getAttribute('data-wml-openurl');
-        if (eventType !== null)
-            sendEvent(eventType);
-        if (windowMethod !== null)
-            callWindowMethod(targetWindow, windowMethod);
-        if (url !== null)
-            void OpenURL(url);
-    }
-    const confirm = element.getAttribute('wml-confirm') || element.getAttribute('data-wml-confirm');
-    if (confirm) {
-        Question({
-            Title: "Confirm",
-            Message: confirm,
-            Detached: false,
-            Buttons: [
-                { Label: "Yes" },
-                { Label: "No", IsDefault: true }
-            ]
-        }).then(runEffect);
-    }
-    else {
-        runEffect();
-    }
-}
-// Private field names.
-const controllerSym = Symbol("controller");
-const triggerMapSym = Symbol("triggerMap");
-const elementCountSym = Symbol("elementCount");
-/**
- * AbortControllerRegistry does not actually remember active event listeners: instead
- * it ties them to an AbortSignal and uses an AbortController to remove them all at once.
- */
-class AbortControllerRegistry {
-    constructor() {
-        this[controllerSym] = new AbortController();
-    }
-    /**
-     * Returns an options object for addEventListener that ties the listener
-     * to the AbortSignal from the current AbortController.
-     *
-     * @param element - An HTML element
-     * @param triggers - The list of active WML trigger events for the specified elements
-     */
-    set(element, triggers) {
-        return { signal: this[controllerSym].signal };
-    }
-    /**
-     * Removes all registered event listeners and resets the registry.
-     */
-    reset() {
-        this[controllerSym].abort();
-        this[controllerSym] = new AbortController();
-    }
-}
-/**
- * WeakMapRegistry maps active trigger events to each DOM element through a WeakMap.
- * This ensures that the mapping remains private to this module, while still allowing garbage
- * collection of the involved elements.
- */
-class WeakMapRegistry {
-    constructor() {
-        this[triggerMapSym] = new WeakMap();
-        this[elementCountSym] = 0;
-    }
-    /**
-     * Sets active triggers for the specified element.
-     *
-     * @param element - An HTML element
-     * @param triggers - The list of active WML trigger events for the specified element
-     */
-    set(element, triggers) {
-        if (!this[triggerMapSym].has(element)) {
-            this[elementCountSym]++;
-        }
-        this[triggerMapSym].set(element, triggers);
-        return {};
-    }
-    /**
-     * Removes all registered event listeners.
-     */
-    reset() {
-        if (this[elementCountSym] <= 0)
-            return;
-        for (const element of document.body.querySelectorAll('*')) {
-            if (this[elementCountSym] <= 0)
-                break;
-            const triggers = this[triggerMapSym].get(element);
-            if (triggers != null) {
-                this[elementCountSym]--;
-            }
-            for (const trigger of triggers || [])
-                element.removeEventListener(trigger, onWMLTriggered);
-        }
-        this[triggerMapSym] = new WeakMap();
-        this[elementCountSym] = 0;
-    }
-}
-const triggerRegistry = canAbortListeners() ? new AbortControllerRegistry() : new WeakMapRegistry();
-/**
- * Adds event listeners to the specified element.
- */
-function addWMLListeners(element) {
-    const triggerRegExp = /\S+/g;
-    const triggerAttr = (element.getAttribute('wml-trigger') || element.getAttribute('data-wml-trigger') || "click");
-    const triggers = [];
-    let match;
-    while ((match = triggerRegExp.exec(triggerAttr)) !== null)
-        triggers.push(match[0]);
-    const options = triggerRegistry.set(element, triggers);
-    for (const trigger of triggers)
-        element.addEventListener(trigger, onWMLTriggered, options);
-}
-/**
- * Schedules an automatic reload of WML to be performed as soon as the document is fully loaded.
- */
-export function Enable() {
-    whenReady(Reload);
-}
-/**
- * Reloads the WML page by adding necessary event listeners and browser listeners.
- */
-export function Reload() {
-    triggerRegistry.reset();
-    document.body.querySelectorAll('[wml-event], [wml-window], [wml-openurl], [data-wml-event], [data-wml-window], [data-wml-openurl]').forEach(addWMLListeners);
-}
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/package.json b/v3/internal/runtime/desktop/@wailsio/runtime/package.json
index 495abe27b..09d9f8d96 100644
--- a/v3/internal/runtime/desktop/@wailsio/runtime/package.json
+++ b/v3/internal/runtime/desktop/@wailsio/runtime/package.json
@@ -36,8 +36,8 @@
     "generate": "npm run generate:events",
     "prebuild": "npm run clean && npm run generate",
     "build:code": "npx tsc",
-    "build:docs": "npx typedoc --plugin typedoc-plugin-mdn-links --plugin typedoc-plugin-missing-exports ./src/index.ts",
-    "build:docs:md": "npx typedoc --plugin typedoc-plugin-markdown --plugin typedoc-plugin-mdn-links --plugin typedoc-plugin-missing-exports ./src/index.ts",
+    "build:docs": "npx typedoc --gitRevision v3-alpha --plugin typedoc-plugin-mdn-links --plugin typedoc-plugin-missing-exports ./src/index.ts",
+    "build:docs:md": "npx typedoc --gitRevision v3-alpha --plugin typedoc-plugin-markdown --plugin typedoc-plugin-mdn-links --plugin typedoc-plugin-missing-exports ./src/index.ts",
     "build": "npm run build:code & npm run build:docs & wait",
     "prepack": "npm run build"
   },
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/application.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/application.d.ts
deleted file mode 100644
index bfab64a85..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/application.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Hides a certain method by calling the HideMethod function.
- */
-export declare function Hide(): Promise<void>;
-/**
- * Calls the ShowMethod and returns the result.
- */
-export declare function Show(): Promise<void>;
-/**
- * Calls the QuitMethod to terminate the program.
- */
-export declare function Quit(): Promise<void>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/browser.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/browser.d.ts
deleted file mode 100644
index 799a457fb..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/browser.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Open a browser window to the given URL.
- *
- * @param url - The URL to open
- */
-export declare function OpenURL(url: string | URL): Promise<void>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/callable.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/callable.d.ts
deleted file mode 100644
index 54a1c6cf4..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/callable.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare function isCallableRefApply<T>(value: T | unknown): value is (...args: any[]) => any;
-declare const _default: typeof isCallableRefApply;
-export default _default;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/calls.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/calls.d.ts
deleted file mode 100644
index a96fa8013..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/calls.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { CancellablePromise } from "./cancellable.js";
-/**
- * Holds all required information for a binding call.
- * May provide either a method ID or a method name, but not both.
- */
-export type CallOptions = {
-    /** The numeric ID of the bound method to call. */
-    methodID: number;
-    /** The fully qualified name of the bound method to call. */
-    methodName?: never;
-    /** Arguments to be passed into the bound method. */
-    args: any[];
-} | {
-    /** The numeric ID of the bound method to call. */
-    methodID?: never;
-    /** The fully qualified name of the bound method to call. */
-    methodName: string;
-    /** Arguments to be passed into the bound method. */
-    args: any[];
-};
-/**
- * Exception class that will be thrown in case the bound method returns an error.
- * The value of the {@link RuntimeError#name} property is "RuntimeError".
- */
-export declare class RuntimeError extends Error {
-    /**
-     * Constructs a new RuntimeError instance.
-     * @param message - The error message.
-     * @param options - Options to be forwarded to the Error constructor.
-     */
-    constructor(message?: string, options?: ErrorOptions);
-}
-/**
- * Call a bound method according to the given call options.
- *
- * In case of failure, the returned promise will reject with an exception
- * among ReferenceError (unknown method), TypeError (wrong argument count or type),
- * {@link RuntimeError} (method returned an error), or other (network or internal errors).
- * The exception might have a "cause" field with the value returned
- * by the application- or service-level error marshaling functions.
- *
- * @param options - A method call descriptor.
- * @returns The result of the call.
- */
-export declare function Call(options: CallOptions): CancellablePromise<any>;
-/**
- * Calls a bound method by name with the specified arguments.
- * See {@link Call} for details.
- *
- * @param methodName - The name of the method in the format 'package.struct.method'.
- * @param args - The arguments to pass to the method.
- * @returns The result of the method call.
- */
-export declare function ByName(methodName: string, ...args: any[]): CancellablePromise<any>;
-/**
- * Calls a method by its numeric ID with the specified arguments.
- * See {@link Call} for details.
- *
- * @param methodID - The ID of the method to call.
- * @param args - The arguments to pass to the method.
- * @return The result of the method call.
- */
-export declare function ByID(methodID: number, ...args: any[]): CancellablePromise<any>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/cancellable.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/cancellable.d.ts
deleted file mode 100644
index a65a2ba7e..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/cancellable.d.ts
+++ /dev/null
@@ -1,434 +0,0 @@
-/**
- * Exception class that will be used as rejection reason
- * in case a {@link CancellablePromise} is cancelled successfully.
- *
- * The value of the {@link name} property is the string `"CancelError"`.
- * The value of the {@link cause} property is the cause passed to the cancel method, if any.
- */
-export declare class CancelError extends Error {
-    /**
-     * Constructs a new `CancelError` instance.
-     * @param message - The error message.
-     * @param options - Options to be forwarded to the Error constructor.
-     */
-    constructor(message?: string, options?: ErrorOptions);
-}
-/**
- * Exception class that will be reported as an unhandled rejection
- * in case a {@link CancellablePromise} rejects after being cancelled,
- * or when the `oncancelled` callback throws or rejects.
- *
- * The value of the {@link name} property is the string `"CancelledRejectionError"`.
- * The value of the {@link cause} property is the reason the promise rejected with.
- *
- * Because the original promise was cancelled,
- * a wrapper promise will be passed to the unhandled rejection listener instead.
- * The {@link promise} property holds a reference to the original promise.
- */
-export declare class CancelledRejectionError extends Error {
-    /**
-     * Holds a reference to the promise that was cancelled and then rejected.
-     */
-    promise: CancellablePromise<unknown>;
-    /**
-     * Constructs a new `CancelledRejectionError` instance.
-     * @param promise - The promise that caused the error originally.
-     * @param reason - The rejection reason.
-     * @param info - An optional informative message specifying the circumstances in which the error was thrown.
-     *               Defaults to the string `"Unhandled rejection in cancelled promise."`.
-     */
-    constructor(promise: CancellablePromise<unknown>, reason?: any, info?: string);
-}
-type CancellablePromiseResolver<T> = (value: T | PromiseLike<T> | CancellablePromiseLike<T>) => void;
-type CancellablePromiseRejector = (reason?: any) => void;
-type CancellablePromiseCanceller = (cause?: any) => void | PromiseLike<void>;
-type CancellablePromiseExecutor<T> = (resolve: CancellablePromiseResolver<T>, reject: CancellablePromiseRejector) => void;
-export interface CancellablePromiseLike<T> {
-    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1> | CancellablePromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2> | CancellablePromiseLike<TResult2>) | undefined | null): CancellablePromiseLike<TResult1 | TResult2>;
-    cancel(cause?: any): void | PromiseLike<void>;
-}
-/**
- * Wraps a cancellable promise along with its resolution methods.
- * The `oncancelled` field will be null initially but may be set to provide a custom cancellation function.
- */
-export interface CancellablePromiseWithResolvers<T> {
-    promise: CancellablePromise<T>;
-    resolve: CancellablePromiseResolver<T>;
-    reject: CancellablePromiseRejector;
-    oncancelled: CancellablePromiseCanceller | null;
-}
-/**
- * A promise with an attached method for cancelling long-running operations (see {@link CancellablePromise#cancel}).
- * Cancellation can optionally be bound to an {@link AbortSignal}
- * for better composability (see {@link CancellablePromise#cancelOn}).
- *
- * Cancelling a pending promise will result in an immediate rejection
- * with an instance of {@link CancelError} as reason,
- * but whoever started the promise will be responsible
- * for actually aborting the underlying operation.
- * To this purpose, the constructor and all chaining methods
- * accept optional cancellation callbacks.
- *
- * If a `CancellablePromise` still resolves after having been cancelled,
- * the result will be discarded. If it rejects, the reason
- * will be reported as an unhandled rejection,
- * wrapped in a {@link CancelledRejectionError} instance.
- * To facilitate the handling of cancellation requests,
- * cancelled `CancellablePromise`s will _not_ report unhandled `CancelError`s
- * whose `cause` field is the same as the one with which the current promise was cancelled.
- *
- * All usual promise methods are defined and return a `CancellablePromise`
- * whose cancel method will cancel the parent operation as well, propagating the cancellation reason
- * upwards through promise chains.
- * Conversely, cancelling a promise will not automatically cancel dependent promises downstream:
- * ```ts
- * let root = new CancellablePromise((resolve, reject) => { ... });
- * let child1 = root.then(() => { ... });
- * let child2 = child1.then(() => { ... });
- * let child3 = root.catch(() => { ... });
- * child1.cancel(); // Cancels child1 and root, but not child2 or child3
- * ```
- * Cancelling a promise that has already settled is safe and has no consequence.
- *
- * The `cancel` method returns a promise that _always fulfills_
- * after the whole chain has processed the cancel request
- * and all attached callbacks up to that moment have run.
- *
- * All ES2024 promise methods (static and instance) are defined on CancellablePromise,
- * but actual availability may vary with OS/webview version.
- *
- * In line with the proposal at https://github.com/tc39/proposal-rm-builtin-subclassing,
- * `CancellablePromise` does not support transparent subclassing.
- * Extenders should take care to provide their own method implementations.
- * This might be reconsidered in case the proposal is retired.
- *
- * CancellablePromise is a wrapper around the DOM Promise object
- * and is compliant with the [Promises/A+ specification](https://promisesaplus.com/)
- * (it passes the [compliance suite](https://github.com/promises-aplus/promises-tests))
- * if so is the underlying implementation.
- */
-export declare class CancellablePromise<T> extends Promise<T> implements PromiseLike<T>, CancellablePromiseLike<T> {
-    static [x: symbol]: PromiseConstructor;
-    /**
-     * Creates a new `CancellablePromise`.
-     *
-     * @param executor - A callback used to initialize the promise. This callback is passed two arguments:
-     *                   a `resolve` callback used to resolve the promise with a value
-     *                   or the result of another promise (possibly cancellable),
-     *                   and a `reject` callback used to reject the promise with a provided reason or error.
-     *                   If the value provided to the `resolve` callback is a thenable _and_ cancellable object
-     *                   (it has a `then` _and_ a `cancel` method),
-     *                   cancellation requests will be forwarded to that object and the oncancelled will not be invoked anymore.
-     *                   If any one of the two callbacks is called _after_ the promise has been cancelled,
-     *                   the provided values will be cancelled and resolved as usual,
-     *                   but their results will be discarded.
-     *                   However, if the resolution process ultimately ends up in a rejection
-     *                   that is not due to cancellation, the rejection reason
-     *                   will be wrapped in a {@link CancelledRejectionError}
-     *                   and bubbled up as an unhandled rejection.
-     * @param oncancelled - It is the caller's responsibility to ensure that any operation
-     *                      started by the executor is properly halted upon cancellation.
-     *                      This optional callback can be used to that purpose.
-     *                      It will be called _synchronously_ with a cancellation cause
-     *                      when cancellation is requested, _after_ the promise has already rejected
-     *                      with a {@link CancelError}, but _before_
-     *                      any {@link then}/{@link catch}/{@link finally} callback runs.
-     *                      If the callback returns a thenable, the promise returned from {@link cancel}
-     *                      will only fulfill after the former has settled.
-     *                      Unhandled exceptions or rejections from the callback will be wrapped
-     *                      in a {@link CancelledRejectionError} and bubbled up as unhandled rejections.
-     *                      If the `resolve` callback is called before cancellation with a cancellable promise,
-     *                      cancellation requests on this promise will be diverted to that promise,
-     *                      and the original `oncancelled` callback will be discarded.
-     */
-    constructor(executor: CancellablePromiseExecutor<T>, oncancelled?: CancellablePromiseCanceller);
-    /**
-     * Cancels immediately the execution of the operation associated with this promise.
-     * The promise rejects with a {@link CancelError} instance as reason,
-     * with the {@link CancelError#cause} property set to the given argument, if any.
-     *
-     * Has no effect if called after the promise has already settled;
-     * repeated calls in particular are safe, but only the first one
-     * will set the cancellation cause.
-     *
-     * The `CancelError` exception _need not_ be handled explicitly _on the promises that are being cancelled:_
-     * cancelling a promise with no attached rejection handler does not trigger an unhandled rejection event.
-     * Therefore, the following idioms are all equally correct:
-     * ```ts
-     * new CancellablePromise((resolve, reject) => { ... }).cancel();
-     * new CancellablePromise((resolve, reject) => { ... }).then(...).cancel();
-     * new CancellablePromise((resolve, reject) => { ... }).then(...).catch(...).cancel();
-     * ```
-     * Whenever some cancelled promise in a chain rejects with a `CancelError`
-     * with the same cancellation cause as itself, the error will be discarded silently.
-     * However, the `CancelError` _will still be delivered_ to all attached rejection handlers
-     * added by {@link then} and related methods:
-     * ```ts
-     * let cancellable = new CancellablePromise((resolve, reject) => { ... });
-     * cancellable.then(() => { ... }).catch(console.log);
-     * cancellable.cancel(); // A CancelError is printed to the console.
-     * ```
-     * If the `CancelError` is not handled downstream by the time it reaches
-     * a _non-cancelled_ promise, it _will_ trigger an unhandled rejection event,
-     * just like normal rejections would:
-     * ```ts
-     * let cancellable = new CancellablePromise((resolve, reject) => { ... });
-     * let chained = cancellable.then(() => { ... }).then(() => { ... }); // No catch...
-     * cancellable.cancel(); // Unhandled rejection event on chained!
-     * ```
-     * Therefore, it is important to either cancel whole promise chains from their tail,
-     * as shown in the correct idioms above, or take care of handling errors everywhere.
-     *
-     * @returns A cancellable promise that _fulfills_ after the cancel callback (if any)
-     * and all handlers attached up to the call to cancel have run.
-     * If the cancel callback returns a thenable, the promise returned by `cancel`
-     * will also wait for that thenable to settle.
-     * This enables callers to wait for the cancelled operation to terminate
-     * without being forced to handle potential errors at the call site.
-     * ```ts
-     * cancellable.cancel().then(() => {
-     *     // Cleanup finished, it's safe to do something else.
-     * }, (err) => {
-     *     // Unreachable: the promise returned from cancel will never reject.
-     * });
-     * ```
-     * Note that the returned promise will _not_ handle implicitly any rejection
-     * that might have occurred already in the cancelled chain.
-     * It will just track whether registered handlers have been executed or not.
-     * Therefore, unhandled rejections will never be silently handled by calling cancel.
-     */
-    cancel(cause?: any): CancellablePromise<void>;
-    /**
-     * Binds promise cancellation to the abort event of the given {@link AbortSignal}.
-     * If the signal has already aborted, the promise will be cancelled immediately.
-     * When either condition is verified, the cancellation cause will be set
-     * to the signal's abort reason (see {@link AbortSignal#reason}).
-     *
-     * Has no effect if called (or if the signal aborts) _after_ the promise has already settled.
-     * Only the first signal to abort will set the cancellation cause.
-     *
-     * For more details about the cancellation process,
-     * see {@link cancel} and the `CancellablePromise` constructor.
-     *
-     * This method enables `await`ing cancellable promises without having
-     * to store them for future cancellation, e.g.:
-     * ```ts
-     * await longRunningOperation().cancelOn(signal);
-     * ```
-     * instead of:
-     * ```ts
-     * let promiseToBeCancelled = longRunningOperation();
-     * await promiseToBeCancelled;
-     * ```
-     *
-     * @returns This promise, for method chaining.
-     */
-    cancelOn(signal: AbortSignal): CancellablePromise<T>;
-    /**
-     * Attaches callbacks for the resolution and/or rejection of the `CancellablePromise`.
-     *
-     * The optional `oncancelled` argument will be invoked when the returned promise is cancelled,
-     * with the same semantics as the `oncancelled` argument of the constructor.
-     * When the parent promise rejects or is cancelled, the `onrejected` callback will run,
-     * _even after the returned promise has been cancelled:_
-     * in that case, should it reject or throw, the reason will be wrapped
-     * in a {@link CancelledRejectionError} and bubbled up as an unhandled rejection.
-     *
-     * @param onfulfilled The callback to execute when the Promise is resolved.
-     * @param onrejected The callback to execute when the Promise is rejected.
-     * @returns A `CancellablePromise` for the completion of whichever callback is executed.
-     * The returned promise is hooked up to propagate cancellation requests up the chain, but not down:
-     *
-     *   - if the parent promise is cancelled, the `onrejected` handler will be invoked with a `CancelError`
-     *     and the returned promise _will resolve regularly_ with its result;
-     *   - conversely, if the returned promise is cancelled, _the parent promise is cancelled too;_
-     *     the `onrejected` handler will still be invoked with the parent's `CancelError`,
-     *     but its result will be discarded
-     *     and the returned promise will reject with a `CancelError` as well.
-     *
-     * The promise returned from {@link cancel} will fulfill only after all attached handlers
-     * up the entire promise chain have been run.
-     *
-     * If either callback returns a cancellable promise,
-     * cancellation requests will be diverted to it,
-     * and the specified `oncancelled` callback will be discarded.
-     */
-    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1> | CancellablePromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2> | CancellablePromiseLike<TResult2>) | undefined | null, oncancelled?: CancellablePromiseCanceller): CancellablePromise<TResult1 | TResult2>;
-    /**
-     * Attaches a callback for only the rejection of the Promise.
-     *
-     * The optional `oncancelled` argument will be invoked when the returned promise is cancelled,
-     * with the same semantics as the `oncancelled` argument of the constructor.
-     * When the parent promise rejects or is cancelled, the `onrejected` callback will run,
-     * _even after the returned promise has been cancelled:_
-     * in that case, should it reject or throw, the reason will be wrapped
-     * in a {@link CancelledRejectionError} and bubbled up as an unhandled rejection.
-     *
-     * It is equivalent to
-     * ```ts
-     * cancellablePromise.then(undefined, onrejected, oncancelled);
-     * ```
-     * and the same caveats apply.
-     *
-     * @returns A Promise for the completion of the callback.
-     * Cancellation requests on the returned promise
-     * will propagate up the chain to the parent promise,
-     * but not in the other direction.
-     *
-     * The promise returned from {@link cancel} will fulfill only after all attached handlers
-     * up the entire promise chain have been run.
-     *
-     * If `onrejected` returns a cancellable promise,
-     * cancellation requests will be diverted to it,
-     * and the specified `oncancelled` callback will be discarded.
-     * See {@link then} for more details.
-     */
-    catch<TResult = never>(onrejected?: ((reason: any) => (PromiseLike<TResult> | TResult)) | undefined | null, oncancelled?: CancellablePromiseCanceller): CancellablePromise<T | TResult>;
-    /**
-     * Attaches a callback that is invoked when the CancellablePromise is settled (fulfilled or rejected). The
-     * resolved value cannot be accessed or modified from the callback.
-     * The returned promise will settle in the same state as the original one
-     * after the provided callback has completed execution,
-     * unless the callback throws or returns a rejecting promise,
-     * in which case the returned promise will reject as well.
-     *
-     * The optional `oncancelled` argument will be invoked when the returned promise is cancelled,
-     * with the same semantics as the `oncancelled` argument of the constructor.
-     * Once the parent promise settles, the `onfinally` callback will run,
-     * _even after the returned promise has been cancelled:_
-     * in that case, should it reject or throw, the reason will be wrapped
-     * in a {@link CancelledRejectionError} and bubbled up as an unhandled rejection.
-     *
-     * This method is implemented in terms of {@link then} and the same caveats apply.
-     * It is polyfilled, hence available in every OS/webview version.
-     *
-     * @returns A Promise for the completion of the callback.
-     * Cancellation requests on the returned promise
-     * will propagate up the chain to the parent promise,
-     * but not in the other direction.
-     *
-     * The promise returned from {@link cancel} will fulfill only after all attached handlers
-     * up the entire promise chain have been run.
-     *
-     * If `onfinally` returns a cancellable promise,
-     * cancellation requests will be diverted to it,
-     * and the specified `oncancelled` callback will be discarded.
-     * See {@link then} for more details.
-     */
-    finally(onfinally?: (() => void) | undefined | null, oncancelled?: CancellablePromiseCanceller): CancellablePromise<T>;
-    /**
-     * Creates a CancellablePromise that is resolved with an array of results
-     * when all of the provided Promises resolve, or rejected when any Promise is rejected.
-     *
-     * Every one of the provided objects that is a thenable _and_ cancellable object
-     * will be cancelled when the returned promise is cancelled, with the same cause.
-     *
-     * @group Static Methods
-     */
-    static all<T>(values: Iterable<T | PromiseLike<T>>): CancellablePromise<Awaited<T>[]>;
-    static all<T extends readonly unknown[] | []>(values: T): CancellablePromise<{
-        -readonly [P in keyof T]: Awaited<T[P]>;
-    }>;
-    /**
-     * Creates a CancellablePromise that is resolved with an array of results
-     * when all of the provided Promises resolve or reject.
-     *
-     * Every one of the provided objects that is a thenable _and_ cancellable object
-     * will be cancelled when the returned promise is cancelled, with the same cause.
-     *
-     * @group Static Methods
-     */
-    static allSettled<T>(values: Iterable<T | PromiseLike<T>>): CancellablePromise<PromiseSettledResult<Awaited<T>>[]>;
-    static allSettled<T extends readonly unknown[] | []>(values: T): CancellablePromise<{
-        -readonly [P in keyof T]: PromiseSettledResult<Awaited<T[P]>>;
-    }>;
-    /**
-     * The any function returns a promise that is fulfilled by the first given promise to be fulfilled,
-     * or rejected with an AggregateError containing an array of rejection reasons
-     * if all of the given promises are rejected.
-     * It resolves all elements of the passed iterable to promises as it runs this algorithm.
-     *
-     * Every one of the provided objects that is a thenable _and_ cancellable object
-     * will be cancelled when the returned promise is cancelled, with the same cause.
-     *
-     * @group Static Methods
-     */
-    static any<T>(values: Iterable<T | PromiseLike<T>>): CancellablePromise<Awaited<T>>;
-    static any<T extends readonly unknown[] | []>(values: T): CancellablePromise<Awaited<T[number]>>;
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved or rejected.
-     *
-     * Every one of the provided objects that is a thenable _and_ cancellable object
-     * will be cancelled when the returned promise is cancelled, with the same cause.
-     *
-     * @group Static Methods
-     */
-    static race<T>(values: Iterable<T | PromiseLike<T>>): CancellablePromise<Awaited<T>>;
-    static race<T extends readonly unknown[] | []>(values: T): CancellablePromise<Awaited<T[number]>>;
-    /**
-     * Creates a new cancelled CancellablePromise for the provided cause.
-     *
-     * @group Static Methods
-     */
-    static cancel<T = never>(cause?: any): CancellablePromise<T>;
-    /**
-     * Creates a new CancellablePromise that cancels
-     * after the specified timeout, with the provided cause.
-     *
-     * If the {@link AbortSignal.timeout} factory method is available,
-     * it is used to base the timeout on _active_ time rather than _elapsed_ time.
-     * Otherwise, `timeout` falls back to {@link setTimeout}.
-     *
-     * @group Static Methods
-     */
-    static timeout<T = never>(milliseconds: number, cause?: any): CancellablePromise<T>;
-    /**
-     * Creates a new CancellablePromise that resolves after the specified timeout.
-     * The returned promise can be cancelled without consequences.
-     *
-     * @group Static Methods
-     */
-    static sleep(milliseconds: number): CancellablePromise<void>;
-    /**
-     * Creates a new CancellablePromise that resolves after
-     * the specified timeout, with the provided value.
-     * The returned promise can be cancelled without consequences.
-     *
-     * @group Static Methods
-     */
-    static sleep<T>(milliseconds: number, value: T): CancellablePromise<T>;
-    /**
-     * Creates a new rejected CancellablePromise for the provided reason.
-     *
-     * @group Static Methods
-     */
-    static reject<T = never>(reason?: any): CancellablePromise<T>;
-    /**
-     * Creates a new resolved CancellablePromise.
-     *
-     * @group Static Methods
-     */
-    static resolve(): CancellablePromise<void>;
-    /**
-     * Creates a new resolved CancellablePromise for the provided value.
-     *
-     * @group Static Methods
-     */
-    static resolve<T>(value: T): CancellablePromise<Awaited<T>>;
-    /**
-     * Creates a new resolved CancellablePromise for the provided value.
-     *
-     * @group Static Methods
-     */
-    static resolve<T>(value: T | PromiseLike<T>): CancellablePromise<Awaited<T>>;
-    /**
-     * Creates a new CancellablePromise and returns it in an object, along with its resolve and reject functions
-     * and a getter/setter for the cancellation callback.
-     *
-     * This method is polyfilled, hence available in every OS/webview version.
-     *
-     * @group Static Methods
-     */
-    static withResolvers<T>(): CancellablePromiseWithResolvers<T>;
-}
-export {};
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/clipboard.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/clipboard.d.ts
deleted file mode 100644
index 4d0363428..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/clipboard.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Sets the text to the Clipboard.
- *
- * @param text - The text to be set to the Clipboard.
- * @return A Promise that resolves when the operation is successful.
- */
-export declare function SetText(text: string): Promise<void>;
-/**
- * Get the Clipboard text
- *
- * @returns A promise that resolves with the text from the Clipboard.
- */
-export declare function Text(): Promise<string>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/contextmenu.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/contextmenu.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/contextmenu.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/create.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/create.d.ts
deleted file mode 100644
index a3332a4fd..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/create.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Any is a dummy creation function for simple or unknown types.
- */
-export declare function Any<T = any>(source: any): T;
-/**
- * ByteSlice is a creation function that replaces
- * null strings with empty strings.
- */
-export declare function ByteSlice(source: any): string;
-/**
- * Array takes a creation function for an arbitrary type
- * and returns an in-place creation function for an array
- * whose elements are of that type.
- */
-export declare function Array<T = any>(element: (source: any) => T): (source: any) => T[];
-/**
- * Map takes creation functions for two arbitrary types
- * and returns an in-place creation function for an object
- * whose keys and values are of those types.
- */
-export declare function Map<V = any>(key: (source: any) => string, value: (source: any) => V): (source: any) => Record<string, V>;
-/**
- * Nullable takes a creation function for an arbitrary type
- * and returns a creation function for a nullable value of that type.
- */
-export declare function Nullable<T = any>(element: (source: any) => T): (source: any) => (T | null);
-/**
- * Struct takes an object mapping field names to creation functions
- * and returns an in-place creation function for a struct.
- */
-export declare function Struct(createField: Record<string, (source: any) => any>): <U extends Record<string, any> = any>(source: any) => U;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/dialogs.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/dialogs.d.ts
deleted file mode 100644
index 223d43eae..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/dialogs.d.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-export interface OpenFileDialogOptions {
-    /** Indicates if directories can be chosen. */
-    CanChooseDirectories?: boolean;
-    /** Indicates if files can be chosen. */
-    CanChooseFiles?: boolean;
-    /** Indicates if directories can be created. */
-    CanCreateDirectories?: boolean;
-    /** Indicates if hidden files should be shown. */
-    ShowHiddenFiles?: boolean;
-    /** Indicates if aliases should be resolved. */
-    ResolvesAliases?: boolean;
-    /** Indicates if multiple selection is allowed. */
-    AllowsMultipleSelection?: boolean;
-    /** Indicates if the extension should be hidden. */
-    HideExtension?: boolean;
-    /** Indicates if hidden extensions can be selected. */
-    CanSelectHiddenExtension?: boolean;
-    /** Indicates if file packages should be treated as directories. */
-    TreatsFilePackagesAsDirectories?: boolean;
-    /** Indicates if other file types are allowed. */
-    AllowsOtherFiletypes?: boolean;
-    /** Array of file filters. */
-    Filters?: FileFilter[];
-    /** Title of the dialog. */
-    Title?: string;
-    /** Message to show in the dialog. */
-    Message?: string;
-    /** Text to display on the button. */
-    ButtonText?: string;
-    /** Directory to open in the dialog. */
-    Directory?: string;
-    /** Indicates if the dialog should appear detached from the main window. */
-    Detached?: boolean;
-}
-export interface SaveFileDialogOptions {
-    /** Default filename to use in the dialog. */
-    Filename?: string;
-    /** Indicates if directories can be chosen. */
-    CanChooseDirectories?: boolean;
-    /** Indicates if files can be chosen. */
-    CanChooseFiles?: boolean;
-    /** Indicates if directories can be created. */
-    CanCreateDirectories?: boolean;
-    /** Indicates if hidden files should be shown. */
-    ShowHiddenFiles?: boolean;
-    /** Indicates if aliases should be resolved. */
-    ResolvesAliases?: boolean;
-    /** Indicates if the extension should be hidden. */
-    HideExtension?: boolean;
-    /** Indicates if hidden extensions can be selected. */
-    CanSelectHiddenExtension?: boolean;
-    /** Indicates if file packages should be treated as directories. */
-    TreatsFilePackagesAsDirectories?: boolean;
-    /** Indicates if other file types are allowed. */
-    AllowsOtherFiletypes?: boolean;
-    /** Array of file filters. */
-    Filters?: FileFilter[];
-    /** Title of the dialog. */
-    Title?: string;
-    /** Message to show in the dialog. */
-    Message?: string;
-    /** Text to display on the button. */
-    ButtonText?: string;
-    /** Directory to open in the dialog. */
-    Directory?: string;
-    /** Indicates if the dialog should appear detached from the main window. */
-    Detached?: boolean;
-}
-export interface MessageDialogOptions {
-    /** The title of the dialog window. */
-    Title?: string;
-    /** The main message to show in the dialog. */
-    Message?: string;
-    /** Array of button options to show in the dialog. */
-    Buttons?: Button[];
-    /** True if the dialog should appear detached from the main window (if applicable). */
-    Detached?: boolean;
-}
-export interface Button {
-    /** Text that appears within the button. */
-    Label?: string;
-    /** True if the button should cancel an operation when clicked. */
-    IsCancel?: boolean;
-    /** True if the button should be the default action when the user presses enter. */
-    IsDefault?: boolean;
-}
-export interface FileFilter {
-    /** Display name for the filter, it could be "Text Files", "Images" etc. */
-    DisplayName?: string;
-    /** Pattern to match for the filter, e.g. "*.txt;*.md" for text markdown files. */
-    Pattern?: string;
-}
-/**
- * Presents an info dialog.
- *
- * @param options - Dialog options
- * @returns A promise that resolves with the label of the chosen button.
- */
-export declare function Info(options: MessageDialogOptions): Promise<string>;
-/**
- * Presents a warning dialog.
- *
- * @param options - Dialog options.
- * @returns A promise that resolves with the label of the chosen button.
- */
-export declare function Warning(options: MessageDialogOptions): Promise<string>;
-/**
- * Presents an error dialog.
- *
- * @param options - Dialog options.
- * @returns A promise that resolves with the label of the chosen button.
- */
-export declare function Error(options: MessageDialogOptions): Promise<string>;
-/**
- * Presents a question dialog.
- *
- * @param options - Dialog options.
- * @returns A promise that resolves with the label of the chosen button.
- */
-export declare function Question(options: MessageDialogOptions): Promise<string>;
-/**
- * Presents a file selection dialog to pick one or more files to open.
- *
- * @param options - Dialog options.
- * @returns Selected file or list of files, or a blank string/empty list if no file has been selected.
- */
-export declare function OpenFile(options: OpenFileDialogOptions & {
-    AllowsMultipleSelection: true;
-}): Promise<string[]>;
-export declare function OpenFile(options: OpenFileDialogOptions & {
-    AllowsMultipleSelection?: false | undefined;
-}): Promise<string>;
-export declare function OpenFile(options: OpenFileDialogOptions): Promise<string | string[]>;
-/**
- * Presents a file selection dialog to pick a file to save.
- *
- * @param options - Dialog options.
- * @returns Selected file, or a blank string if no file has been selected.
- */
-export declare function SaveFile(options: SaveFileDialogOptions): Promise<string>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/drag.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/drag.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/drag.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/event_types.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/event_types.d.ts
deleted file mode 100644
index 382c32436..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/event_types.d.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-export declare const Types: Readonly<{
-    Windows: Readonly<{
-        APMPowerSettingChange: "windows:APMPowerSettingChange";
-        APMPowerStatusChange: "windows:APMPowerStatusChange";
-        APMResumeAutomatic: "windows:APMResumeAutomatic";
-        APMResumeSuspend: "windows:APMResumeSuspend";
-        APMSuspend: "windows:APMSuspend";
-        ApplicationStarted: "windows:ApplicationStarted";
-        SystemThemeChanged: "windows:SystemThemeChanged";
-        WebViewNavigationCompleted: "windows:WebViewNavigationCompleted";
-        WindowActive: "windows:WindowActive";
-        WindowBackgroundErase: "windows:WindowBackgroundErase";
-        WindowClickActive: "windows:WindowClickActive";
-        WindowClosing: "windows:WindowClosing";
-        WindowDidMove: "windows:WindowDidMove";
-        WindowDidResize: "windows:WindowDidResize";
-        WindowDPIChanged: "windows:WindowDPIChanged";
-        WindowDragDrop: "windows:WindowDragDrop";
-        WindowDragEnter: "windows:WindowDragEnter";
-        WindowDragLeave: "windows:WindowDragLeave";
-        WindowDragOver: "windows:WindowDragOver";
-        WindowEndMove: "windows:WindowEndMove";
-        WindowEndResize: "windows:WindowEndResize";
-        WindowFullscreen: "windows:WindowFullscreen";
-        WindowHide: "windows:WindowHide";
-        WindowInactive: "windows:WindowInactive";
-        WindowKeyDown: "windows:WindowKeyDown";
-        WindowKeyUp: "windows:WindowKeyUp";
-        WindowKillFocus: "windows:WindowKillFocus";
-        WindowNonClientHit: "windows:WindowNonClientHit";
-        WindowNonClientMouseDown: "windows:WindowNonClientMouseDown";
-        WindowNonClientMouseLeave: "windows:WindowNonClientMouseLeave";
-        WindowNonClientMouseMove: "windows:WindowNonClientMouseMove";
-        WindowNonClientMouseUp: "windows:WindowNonClientMouseUp";
-        WindowPaint: "windows:WindowPaint";
-        WindowRestore: "windows:WindowRestore";
-        WindowSetFocus: "windows:WindowSetFocus";
-        WindowShow: "windows:WindowShow";
-        WindowStartMove: "windows:WindowStartMove";
-        WindowStartResize: "windows:WindowStartResize";
-        WindowUnFullscreen: "windows:WindowUnFullscreen";
-        WindowZOrderChanged: "windows:WindowZOrderChanged";
-        WindowMinimise: "windows:WindowMinimise";
-        WindowUnMinimise: "windows:WindowUnMinimise";
-        WindowMaximise: "windows:WindowMaximise";
-        WindowUnMaximise: "windows:WindowUnMaximise";
-    }>;
-    Mac: Readonly<{
-        ApplicationDidBecomeActive: "mac:ApplicationDidBecomeActive";
-        ApplicationDidChangeBackingProperties: "mac:ApplicationDidChangeBackingProperties";
-        ApplicationDidChangeEffectiveAppearance: "mac:ApplicationDidChangeEffectiveAppearance";
-        ApplicationDidChangeIcon: "mac:ApplicationDidChangeIcon";
-        ApplicationDidChangeOcclusionState: "mac:ApplicationDidChangeOcclusionState";
-        ApplicationDidChangeScreenParameters: "mac:ApplicationDidChangeScreenParameters";
-        ApplicationDidChangeStatusBarFrame: "mac:ApplicationDidChangeStatusBarFrame";
-        ApplicationDidChangeStatusBarOrientation: "mac:ApplicationDidChangeStatusBarOrientation";
-        ApplicationDidChangeTheme: "mac:ApplicationDidChangeTheme";
-        ApplicationDidFinishLaunching: "mac:ApplicationDidFinishLaunching";
-        ApplicationDidHide: "mac:ApplicationDidHide";
-        ApplicationDidResignActive: "mac:ApplicationDidResignActive";
-        ApplicationDidUnhide: "mac:ApplicationDidUnhide";
-        ApplicationDidUpdate: "mac:ApplicationDidUpdate";
-        ApplicationShouldHandleReopen: "mac:ApplicationShouldHandleReopen";
-        ApplicationWillBecomeActive: "mac:ApplicationWillBecomeActive";
-        ApplicationWillFinishLaunching: "mac:ApplicationWillFinishLaunching";
-        ApplicationWillHide: "mac:ApplicationWillHide";
-        ApplicationWillResignActive: "mac:ApplicationWillResignActive";
-        ApplicationWillTerminate: "mac:ApplicationWillTerminate";
-        ApplicationWillUnhide: "mac:ApplicationWillUnhide";
-        ApplicationWillUpdate: "mac:ApplicationWillUpdate";
-        MenuDidAddItem: "mac:MenuDidAddItem";
-        MenuDidBeginTracking: "mac:MenuDidBeginTracking";
-        MenuDidClose: "mac:MenuDidClose";
-        MenuDidDisplayItem: "mac:MenuDidDisplayItem";
-        MenuDidEndTracking: "mac:MenuDidEndTracking";
-        MenuDidHighlightItem: "mac:MenuDidHighlightItem";
-        MenuDidOpen: "mac:MenuDidOpen";
-        MenuDidPopUp: "mac:MenuDidPopUp";
-        MenuDidRemoveItem: "mac:MenuDidRemoveItem";
-        MenuDidSendAction: "mac:MenuDidSendAction";
-        MenuDidSendActionToItem: "mac:MenuDidSendActionToItem";
-        MenuDidUpdate: "mac:MenuDidUpdate";
-        MenuWillAddItem: "mac:MenuWillAddItem";
-        MenuWillBeginTracking: "mac:MenuWillBeginTracking";
-        MenuWillDisplayItem: "mac:MenuWillDisplayItem";
-        MenuWillEndTracking: "mac:MenuWillEndTracking";
-        MenuWillHighlightItem: "mac:MenuWillHighlightItem";
-        MenuWillOpen: "mac:MenuWillOpen";
-        MenuWillPopUp: "mac:MenuWillPopUp";
-        MenuWillRemoveItem: "mac:MenuWillRemoveItem";
-        MenuWillSendAction: "mac:MenuWillSendAction";
-        MenuWillSendActionToItem: "mac:MenuWillSendActionToItem";
-        MenuWillUpdate: "mac:MenuWillUpdate";
-        WebViewDidCommitNavigation: "mac:WebViewDidCommitNavigation";
-        WebViewDidFinishNavigation: "mac:WebViewDidFinishNavigation";
-        WebViewDidReceiveServerRedirectForProvisionalNavigation: "mac:WebViewDidReceiveServerRedirectForProvisionalNavigation";
-        WebViewDidStartProvisionalNavigation: "mac:WebViewDidStartProvisionalNavigation";
-        WindowDidBecomeKey: "mac:WindowDidBecomeKey";
-        WindowDidBecomeMain: "mac:WindowDidBecomeMain";
-        WindowDidBeginSheet: "mac:WindowDidBeginSheet";
-        WindowDidChangeAlpha: "mac:WindowDidChangeAlpha";
-        WindowDidChangeBackingLocation: "mac:WindowDidChangeBackingLocation";
-        WindowDidChangeBackingProperties: "mac:WindowDidChangeBackingProperties";
-        WindowDidChangeCollectionBehavior: "mac:WindowDidChangeCollectionBehavior";
-        WindowDidChangeEffectiveAppearance: "mac:WindowDidChangeEffectiveAppearance";
-        WindowDidChangeOcclusionState: "mac:WindowDidChangeOcclusionState";
-        WindowDidChangeOrderingMode: "mac:WindowDidChangeOrderingMode";
-        WindowDidChangeScreen: "mac:WindowDidChangeScreen";
-        WindowDidChangeScreenParameters: "mac:WindowDidChangeScreenParameters";
-        WindowDidChangeScreenProfile: "mac:WindowDidChangeScreenProfile";
-        WindowDidChangeScreenSpace: "mac:WindowDidChangeScreenSpace";
-        WindowDidChangeScreenSpaceProperties: "mac:WindowDidChangeScreenSpaceProperties";
-        WindowDidChangeSharingType: "mac:WindowDidChangeSharingType";
-        WindowDidChangeSpace: "mac:WindowDidChangeSpace";
-        WindowDidChangeSpaceOrderingMode: "mac:WindowDidChangeSpaceOrderingMode";
-        WindowDidChangeTitle: "mac:WindowDidChangeTitle";
-        WindowDidChangeToolbar: "mac:WindowDidChangeToolbar";
-        WindowDidDeminiaturize: "mac:WindowDidDeminiaturize";
-        WindowDidEndSheet: "mac:WindowDidEndSheet";
-        WindowDidEnterFullScreen: "mac:WindowDidEnterFullScreen";
-        WindowDidEnterVersionBrowser: "mac:WindowDidEnterVersionBrowser";
-        WindowDidExitFullScreen: "mac:WindowDidExitFullScreen";
-        WindowDidExitVersionBrowser: "mac:WindowDidExitVersionBrowser";
-        WindowDidExpose: "mac:WindowDidExpose";
-        WindowDidFocus: "mac:WindowDidFocus";
-        WindowDidMiniaturize: "mac:WindowDidMiniaturize";
-        WindowDidMove: "mac:WindowDidMove";
-        WindowDidOrderOffScreen: "mac:WindowDidOrderOffScreen";
-        WindowDidOrderOnScreen: "mac:WindowDidOrderOnScreen";
-        WindowDidResignKey: "mac:WindowDidResignKey";
-        WindowDidResignMain: "mac:WindowDidResignMain";
-        WindowDidResize: "mac:WindowDidResize";
-        WindowDidUpdate: "mac:WindowDidUpdate";
-        WindowDidUpdateAlpha: "mac:WindowDidUpdateAlpha";
-        WindowDidUpdateCollectionBehavior: "mac:WindowDidUpdateCollectionBehavior";
-        WindowDidUpdateCollectionProperties: "mac:WindowDidUpdateCollectionProperties";
-        WindowDidUpdateShadow: "mac:WindowDidUpdateShadow";
-        WindowDidUpdateTitle: "mac:WindowDidUpdateTitle";
-        WindowDidUpdateToolbar: "mac:WindowDidUpdateToolbar";
-        WindowDidZoom: "mac:WindowDidZoom";
-        WindowFileDraggingEntered: "mac:WindowFileDraggingEntered";
-        WindowFileDraggingExited: "mac:WindowFileDraggingExited";
-        WindowFileDraggingPerformed: "mac:WindowFileDraggingPerformed";
-        WindowHide: "mac:WindowHide";
-        WindowMaximise: "mac:WindowMaximise";
-        WindowUnMaximise: "mac:WindowUnMaximise";
-        WindowMinimise: "mac:WindowMinimise";
-        WindowUnMinimise: "mac:WindowUnMinimise";
-        WindowShouldClose: "mac:WindowShouldClose";
-        WindowShow: "mac:WindowShow";
-        WindowWillBecomeKey: "mac:WindowWillBecomeKey";
-        WindowWillBecomeMain: "mac:WindowWillBecomeMain";
-        WindowWillBeginSheet: "mac:WindowWillBeginSheet";
-        WindowWillChangeOrderingMode: "mac:WindowWillChangeOrderingMode";
-        WindowWillClose: "mac:WindowWillClose";
-        WindowWillDeminiaturize: "mac:WindowWillDeminiaturize";
-        WindowWillEnterFullScreen: "mac:WindowWillEnterFullScreen";
-        WindowWillEnterVersionBrowser: "mac:WindowWillEnterVersionBrowser";
-        WindowWillExitFullScreen: "mac:WindowWillExitFullScreen";
-        WindowWillExitVersionBrowser: "mac:WindowWillExitVersionBrowser";
-        WindowWillFocus: "mac:WindowWillFocus";
-        WindowWillMiniaturize: "mac:WindowWillMiniaturize";
-        WindowWillMove: "mac:WindowWillMove";
-        WindowWillOrderOffScreen: "mac:WindowWillOrderOffScreen";
-        WindowWillOrderOnScreen: "mac:WindowWillOrderOnScreen";
-        WindowWillResignMain: "mac:WindowWillResignMain";
-        WindowWillResize: "mac:WindowWillResize";
-        WindowWillUnfocus: "mac:WindowWillUnfocus";
-        WindowWillUpdate: "mac:WindowWillUpdate";
-        WindowWillUpdateAlpha: "mac:WindowWillUpdateAlpha";
-        WindowWillUpdateCollectionBehavior: "mac:WindowWillUpdateCollectionBehavior";
-        WindowWillUpdateCollectionProperties: "mac:WindowWillUpdateCollectionProperties";
-        WindowWillUpdateShadow: "mac:WindowWillUpdateShadow";
-        WindowWillUpdateTitle: "mac:WindowWillUpdateTitle";
-        WindowWillUpdateToolbar: "mac:WindowWillUpdateToolbar";
-        WindowWillUpdateVisibility: "mac:WindowWillUpdateVisibility";
-        WindowWillUseStandardFrame: "mac:WindowWillUseStandardFrame";
-        WindowZoomIn: "mac:WindowZoomIn";
-        WindowZoomOut: "mac:WindowZoomOut";
-        WindowZoomReset: "mac:WindowZoomReset";
-    }>;
-    Linux: Readonly<{
-        ApplicationStartup: "linux:ApplicationStartup";
-        SystemThemeChanged: "linux:SystemThemeChanged";
-        WindowDeleteEvent: "linux:WindowDeleteEvent";
-        WindowDidMove: "linux:WindowDidMove";
-        WindowDidResize: "linux:WindowDidResize";
-        WindowFocusIn: "linux:WindowFocusIn";
-        WindowFocusOut: "linux:WindowFocusOut";
-        WindowLoadChanged: "linux:WindowLoadChanged";
-    }>;
-    Common: Readonly<{
-        ApplicationOpenedWithFile: "common:ApplicationOpenedWithFile";
-        ApplicationStarted: "common:ApplicationStarted";
-        ThemeChanged: "common:ThemeChanged";
-        WindowClosing: "common:WindowClosing";
-        WindowDidMove: "common:WindowDidMove";
-        WindowDidResize: "common:WindowDidResize";
-        WindowDPIChanged: "common:WindowDPIChanged";
-        WindowFilesDropped: "common:WindowFilesDropped";
-        WindowFocus: "common:WindowFocus";
-        WindowFullscreen: "common:WindowFullscreen";
-        WindowHide: "common:WindowHide";
-        WindowLostFocus: "common:WindowLostFocus";
-        WindowMaximise: "common:WindowMaximise";
-        WindowMinimise: "common:WindowMinimise";
-        WindowRestore: "common:WindowRestore";
-        WindowRuntimeReady: "common:WindowRuntimeReady";
-        WindowShow: "common:WindowShow";
-        WindowUnFullscreen: "common:WindowUnFullscreen";
-        WindowUnMaximise: "common:WindowUnMaximise";
-        WindowUnMinimise: "common:WindowUnMinimise";
-        WindowZoom: "common:WindowZoom";
-        WindowZoomIn: "common:WindowZoomIn";
-        WindowZoomOut: "common:WindowZoomOut";
-        WindowZoomReset: "common:WindowZoomReset";
-    }>;
-}>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/events.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/events.d.ts
deleted file mode 100644
index 11d03e1aa..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/events.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-export { Types } from "./event_types.js";
-/**
- * The type of handlers for a given event.
- */
-export type Callback = (ev: WailsEvent) => void;
-/**
- * Represents a system event or a custom event emitted through wails-provided facilities.
- */
-export declare class WailsEvent {
-    /**
-     * The name of the event.
-     */
-    name: string;
-    /**
-     * Optional data associated with the emitted event.
-     */
-    data: any;
-    /**
-     * Name of the originating window. Omitted for application events.
-     * Will be overridden if set manually.
-     */
-    sender?: string;
-    constructor(name: string, data?: any);
-}
-/**
- * Register a callback function to be called multiple times for a specific event.
- *
- * @param eventName - The name of the event to register the callback for.
- * @param callback - The callback function to be called when the event is triggered.
- * @param maxCallbacks - The maximum number of times the callback can be called for the event. Once the maximum number is reached, the callback will no longer be called.
- * @returns A function that, when called, will unregister the callback from the event.
- */
-export declare function OnMultiple(eventName: string, callback: Callback, maxCallbacks: number): () => void;
-/**
- * Registers a callback function to be executed when the specified event occurs.
- *
- * @param eventName - The name of the event to register the callback for.
- * @param callback - The callback function to be called when the event is triggered.
- * @returns A function that, when called, will unregister the callback from the event.
- */
-export declare function On(eventName: string, callback: Callback): () => void;
-/**
- * Registers a callback function to be executed only once for the specified event.
- *
- * @param eventName - The name of the event to register the callback for.
- * @param callback - The callback function to be called when the event is triggered.
- * @returns A function that, when called, will unregister the callback from the event.
- */
-export declare function Once(eventName: string, callback: Callback): () => void;
-/**
- * Removes event listeners for the specified event names.
- *
- * @param eventNames - The name of the events to remove listeners for.
- */
-export declare function Off(...eventNames: [string, ...string[]]): void;
-/**
- * Removes all event listeners.
- */
-export declare function OffAll(): void;
-/**
- * Emits the given event.
- *
- * @param event - The name of the event to emit.
- * @returns A promise that will be fulfilled once the event has been emitted.
- */
-export declare function Emit(event: WailsEvent): Promise<void>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/flags.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/flags.d.ts
deleted file mode 100644
index 272aa9193..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/flags.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Retrieves the value associated with the specified key from the flag map.
- *
- * @param key - The key to retrieve the value for.
- * @return The value associated with the specified key.
- */
-export declare function GetFlag(key: string): any;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/index.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/index.d.ts
deleted file mode 100644
index 54dca2206..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/index.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import "./contextmenu.js";
-import "./drag.js";
-import * as Application from "./application.js";
-import * as Browser from "./browser.js";
-import * as Call from "./calls.js";
-import * as Clipboard from "./clipboard.js";
-import * as Create from "./create.js";
-import * as Dialogs from "./dialogs.js";
-import * as Events from "./events.js";
-import * as Flags from "./flags.js";
-import * as Screens from "./screens.js";
-import * as System from "./system.js";
-import Window from "./window.js";
-import * as WML from "./wml.js";
-export { Application, Browser, Call, Clipboard, Dialogs, Events, Flags, Screens, System, Window, WML };
-export * from "./cancellable.js";
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/listener.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/listener.d.ts
deleted file mode 100644
index 75bb5c458..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/listener.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export declare const eventListeners: Map<string, Listener[]>;
-export declare class Listener {
-    eventName: string;
-    callback: (data: any) => void;
-    maxCallbacks: number;
-    constructor(eventName: string, callback: (data: any) => void, maxCallbacks: number);
-    dispatch(data: any): boolean;
-}
-export declare function listenerOff(listener: Listener): void;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/nanoid.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/nanoid.d.ts
deleted file mode 100644
index a691510e5..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/nanoid.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare function nanoid(size?: number): string;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/runtime.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/runtime.d.ts
deleted file mode 100644
index 60f760628..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/runtime.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export declare const objectNames: Readonly<{
-    Call: 0;
-    Clipboard: 1;
-    Application: 2;
-    Events: 3;
-    ContextMenu: 4;
-    Dialog: 5;
-    Window: 6;
-    Screens: 7;
-    System: 8;
-    Browser: 9;
-    CancelCall: 10;
-}>;
-export declare let clientId: string;
-/**
- * Creates a new runtime caller with specified ID.
- *
- * @param object - The object to invoke the method on.
- * @param windowName - The name of the window.
- * @return The new runtime caller function.
- */
-export declare function newRuntimeCaller(object: number, windowName?: string): (method: number, args?: any) => Promise<any>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/screens.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/screens.d.ts
deleted file mode 100644
index b4a2f622d..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/screens.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-export interface Size {
-    /** The width of a rectangular area. */
-    Width: number;
-    /** The height of a rectangular area. */
-    Height: number;
-}
-export interface Rect {
-    /** The X coordinate of the origin. */
-    X: number;
-    /** The Y coordinate of the origin. */
-    Y: number;
-    /** The width of the rectangle. */
-    Width: number;
-    /** The height of the rectangle. */
-    Height: number;
-}
-export interface Screen {
-    /** Unique identifier for the screen. */
-    ID: string;
-    /** Human-readable name of the screen. */
-    Name: string;
-    /** The scale factor of the screen (DPI/96). 1 = standard DPI, 2 = HiDPI (Retina), etc. */
-    ScaleFactor: number;
-    /** The X coordinate of the screen. */
-    X: number;
-    /** The Y coordinate of the screen. */
-    Y: number;
-    /** Contains the width and height of the screen. */
-    Size: Size;
-    /** Contains the bounds of the screen in terms of X, Y, Width, and Height. */
-    Bounds: Rect;
-    /** Contains the physical bounds of the screen in terms of X, Y, Width, and Height (before scaling). */
-    PhysicalBounds: Rect;
-    /** Contains the area of the screen that is actually usable (excluding taskbar and other system UI). */
-    WorkArea: Rect;
-    /** Contains the physical WorkArea of the screen (before scaling). */
-    PhysicalWorkArea: Rect;
-    /** True if this is the primary monitor selected by the user in the operating system. */
-    IsPrimary: boolean;
-    /** The rotation of the screen. */
-    Rotation: number;
-}
-/**
- * Gets all screens.
- *
- * @returns A promise that resolves to an array of Screen objects.
- */
-export declare function GetAll(): Promise<Screen[]>;
-/**
- * Gets the primary screen.
- *
- * @returns A promise that resolves to the primary screen.
- */
-export declare function GetPrimary(): Promise<Screen>;
-/**
- * Gets the current active screen.
- *
- * @returns A promise that resolves with the current active screen.
- */
-export declare function GetCurrent(): Promise<Screen>;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/system.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/system.d.ts
deleted file mode 100644
index 1e1924bd3..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/system.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-export declare function invoke(msg: any): void;
-/**
- * Retrieves the system dark mode status.
- *
- * @returns A promise that resolves to a boolean value indicating if the system is in dark mode.
- */
-export declare function IsDarkMode(): Promise<boolean>;
-/**
- * Fetches the capabilities of the application from the server.
- *
- * @returns A promise that resolves to an object containing the capabilities.
- */
-export declare function Capabilities(): Promise<Record<string, any>>;
-export interface OSInfo {
-    /** The branding of the OS. */
-    Branding: string;
-    /** The ID of the OS. */
-    ID: string;
-    /** The name of the OS. */
-    Name: string;
-    /** The version of the OS. */
-    Version: string;
-}
-export interface EnvironmentInfo {
-    /** The architecture of the system. */
-    Arch: string;
-    /** True if the application is running in debug mode, otherwise false. */
-    Debug: boolean;
-    /** The operating system in use. */
-    OS: string;
-    /** Details of the operating system. */
-    OSInfo: OSInfo;
-    /** Additional platform information. */
-    PlatformInfo: Record<string, any>;
-}
-/**
- * Retrieves environment details.
- *
- * @returns A promise that resolves to an object containing OS and system architecture.
- */
-export declare function Environment(): Promise<EnvironmentInfo>;
-/**
- * Checks if the current operating system is Windows.
- *
- * @return True if the operating system is Windows, otherwise false.
- */
-export declare function IsWindows(): boolean;
-/**
- * Checks if the current operating system is Linux.
- *
- * @returns Returns true if the current operating system is Linux, false otherwise.
- */
-export declare function IsLinux(): boolean;
-/**
- * Checks if the current environment is a macOS operating system.
- *
- * @returns True if the environment is macOS, false otherwise.
- */
-export declare function IsMac(): boolean;
-/**
- * Checks if the current environment architecture is AMD64.
- *
- * @returns True if the current environment architecture is AMD64, false otherwise.
- */
-export declare function IsAMD64(): boolean;
-/**
- * Checks if the current architecture is ARM.
- *
- * @returns True if the current architecture is ARM, false otherwise.
- */
-export declare function IsARM(): boolean;
-/**
- * Checks if the current environment is ARM64 architecture.
- *
- * @returns Returns true if the environment is ARM64 architecture, otherwise returns false.
- */
-export declare function IsARM64(): boolean;
-/**
- * Reports whether the app is being run in debug mode.
- *
- * @returns True if the app is being run in debug mode.
- */
-export declare function IsDebug(): boolean;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/utils.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/utils.d.ts
deleted file mode 100644
index d748a049c..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/utils.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Logs a message to the console with custom formatting.
- *
- * @param message - The message to be logged.
- */
-export declare function debugLog(message: any): void;
-/**
- * Checks whether the webview supports the {@link MouseEvent#buttons} property.
- * Looking at you macOS High Sierra!
- */
-export declare function canTrackButtons(): boolean;
-/**
- * Checks whether the browser supports removing listeners by triggering an AbortSignal
- * (see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#signal).
- */
-export declare function canAbortListeners(): boolean;
-/**
- * Resolves the closest HTMLElement ancestor of an event's target.
- */
-export declare function eventTarget(event: Event): HTMLElement;
-export declare function whenReady(callback: () => void): void;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/window.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/window.d.ts
deleted file mode 100644
index 3acecfb38..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/window.d.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-import type { Screen } from "./screens.js";
-/**
- * A record describing the position of a window.
- */
-interface Position {
-    /** The horizontal position of the window. */
-    x: number;
-    /** The vertical position of the window. */
-    y: number;
-}
-/**
- * A record describing the size of a window.
- */
-interface Size {
-    /** The width of the window. */
-    width: number;
-    /** The height of the window. */
-    height: number;
-}
-declare const callerSym: unique symbol;
-declare class Window {
-    private [callerSym];
-    /**
-     * Initialises a window object with the specified name.
-     *
-     * @private
-     * @param name - The name of the target window.
-     */
-    constructor(name?: string);
-    /**
-     * Gets the specified window.
-     *
-     * @param name - The name of the window to get.
-     * @returns The corresponding window object.
-     */
-    Get(name: string): Window;
-    /**
-     * Returns the absolute position of the window.
-     *
-     * @returns The current absolute position of the window.
-     */
-    Position(): Promise<Position>;
-    /**
-     * Centers the window on the screen.
-     */
-    Center(): Promise<void>;
-    /**
-     * Closes the window.
-     */
-    Close(): Promise<void>;
-    /**
-     * Disables min/max size constraints.
-     */
-    DisableSizeConstraints(): Promise<void>;
-    /**
-     * Enables min/max size constraints.
-     */
-    EnableSizeConstraints(): Promise<void>;
-    /**
-     * Focuses the window.
-     */
-    Focus(): Promise<void>;
-    /**
-     * Forces the window to reload the page assets.
-     */
-    ForceReload(): Promise<void>;
-    /**
-     * Switches the window to fullscreen mode.
-     */
-    Fullscreen(): Promise<void>;
-    /**
-     * Returns the screen that the window is on.
-     *
-     * @returns The screen the window is currently on.
-     */
-    GetScreen(): Promise<Screen>;
-    /**
-     * Returns the current zoom level of the window.
-     *
-     * @returns The current zoom level.
-     */
-    GetZoom(): Promise<number>;
-    /**
-     * Returns the height of the window.
-     *
-     * @returns The current height of the window.
-     */
-    Height(): Promise<number>;
-    /**
-     * Hides the window.
-     */
-    Hide(): Promise<void>;
-    /**
-     * Returns true if the window is focused.
-     *
-     * @returns Whether the window is currently focused.
-     */
-    IsFocused(): Promise<boolean>;
-    /**
-     * Returns true if the window is fullscreen.
-     *
-     * @returns Whether the window is currently fullscreen.
-     */
-    IsFullscreen(): Promise<boolean>;
-    /**
-     * Returns true if the window is maximised.
-     *
-     * @returns Whether the window is currently maximised.
-     */
-    IsMaximised(): Promise<boolean>;
-    /**
-     * Returns true if the window is minimised.
-     *
-     * @returns Whether the window is currently minimised.
-     */
-    IsMinimised(): Promise<boolean>;
-    /**
-     * Maximises the window.
-     */
-    Maximise(): Promise<void>;
-    /**
-     * Minimises the window.
-     */
-    Minimise(): Promise<void>;
-    /**
-     * Returns the name of the window.
-     *
-     * @returns The name of the window.
-     */
-    Name(): Promise<string>;
-    /**
-     * Opens the development tools pane.
-     */
-    OpenDevTools(): Promise<void>;
-    /**
-     * Returns the relative position of the window to the screen.
-     *
-     * @returns The current relative position of the window.
-     */
-    RelativePosition(): Promise<Position>;
-    /**
-     * Reloads the page assets.
-     */
-    Reload(): Promise<void>;
-    /**
-     * Returns true if the window is resizable.
-     *
-     * @returns Whether the window is currently resizable.
-     */
-    Resizable(): Promise<boolean>;
-    /**
-     * Restores the window to its previous state if it was previously minimised, maximised or fullscreen.
-     */
-    Restore(): Promise<void>;
-    /**
-     * Sets the absolute position of the window.
-     *
-     * @param x - The desired horizontal absolute position of the window.
-     * @param y - The desired vertical absolute position of the window.
-     */
-    SetPosition(x: number, y: number): Promise<void>;
-    /**
-     * Sets the window to be always on top.
-     *
-     * @param alwaysOnTop - Whether the window should stay on top.
-     */
-    SetAlwaysOnTop(alwaysOnTop: boolean): Promise<void>;
-    /**
-     * Sets the background colour of the window.
-     *
-     * @param r - The desired red component of the window background.
-     * @param g - The desired green component of the window background.
-     * @param b - The desired blue component of the window background.
-     * @param a - The desired alpha component of the window background.
-     */
-    SetBackgroundColour(r: number, g: number, b: number, a: number): Promise<void>;
-    /**
-     * Removes the window frame and title bar.
-     *
-     * @param frameless - Whether the window should be frameless.
-     */
-    SetFrameless(frameless: boolean): Promise<void>;
-    /**
-     * Disables the system fullscreen button.
-     *
-     * @param enabled - Whether the fullscreen button should be enabled.
-     */
-    SetFullscreenButtonEnabled(enabled: boolean): Promise<void>;
-    /**
-     * Sets the maximum size of the window.
-     *
-     * @param width - The desired maximum width of the window.
-     * @param height - The desired maximum height of the window.
-     */
-    SetMaxSize(width: number, height: number): Promise<void>;
-    /**
-     * Sets the minimum size of the window.
-     *
-     * @param width - The desired minimum width of the window.
-     * @param height - The desired minimum height of the window.
-     */
-    SetMinSize(width: number, height: number): Promise<void>;
-    /**
-     * Sets the relative position of the window to the screen.
-     *
-     * @param x - The desired horizontal relative position of the window.
-     * @param y - The desired vertical relative position of the window.
-     */
-    SetRelativePosition(x: number, y: number): Promise<void>;
-    /**
-     * Sets whether the window is resizable.
-     *
-     * @param resizable - Whether the window should be resizable.
-     */
-    SetResizable(resizable: boolean): Promise<void>;
-    /**
-     * Sets the size of the window.
-     *
-     * @param width - The desired width of the window.
-     * @param height - The desired height of the window.
-     */
-    SetSize(width: number, height: number): Promise<void>;
-    /**
-     * Sets the title of the window.
-     *
-     * @param title - The desired title of the window.
-     */
-    SetTitle(title: string): Promise<void>;
-    /**
-     * Sets the zoom level of the window.
-     *
-     * @param zoom - The desired zoom level.
-     */
-    SetZoom(zoom: number): Promise<void>;
-    /**
-     * Shows the window.
-     */
-    Show(): Promise<void>;
-    /**
-     * Returns the size of the window.
-     *
-     * @returns The current size of the window.
-     */
-    Size(): Promise<Size>;
-    /**
-     * Toggles the window between fullscreen and normal.
-     */
-    ToggleFullscreen(): Promise<void>;
-    /**
-     * Toggles the window between maximised and normal.
-     */
-    ToggleMaximise(): Promise<void>;
-    /**
-     * Un-fullscreens the window.
-     */
-    UnFullscreen(): Promise<void>;
-    /**
-     * Un-maximises the window.
-     */
-    UnMaximise(): Promise<void>;
-    /**
-     * Un-minimises the window.
-     */
-    UnMinimise(): Promise<void>;
-    /**
-     * Returns the width of the window.
-     *
-     * @returns The current width of the window.
-     */
-    Width(): Promise<number>;
-    /**
-     * Zooms the window.
-     */
-    Zoom(): Promise<void>;
-    /**
-     * Increases the zoom level of the webview content.
-     */
-    ZoomIn(): Promise<void>;
-    /**
-     * Decreases the zoom level of the webview content.
-     */
-    ZoomOut(): Promise<void>;
-    /**
-     * Resets the zoom level of the webview content.
-     */
-    ZoomReset(): Promise<void>;
-}
-/**
- * The window within which the script is running.
- */
-declare const thisWindow: Window;
-export default thisWindow;
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/types/wml.d.ts b/v3/internal/runtime/desktop/@wailsio/runtime/types/wml.d.ts
deleted file mode 100644
index 020a3c59d..000000000
--- a/v3/internal/runtime/desktop/@wailsio/runtime/types/wml.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Schedules an automatic reload of WML to be performed as soon as the document is fully loaded.
- */
-export declare function Enable(): void;
-/**
- * Reloads the WML page by adding necessary event listeners and browser listeners.
- */
-export declare function Reload(): void;