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");
 }