Test data updates

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

v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js

@@ -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>}
      */

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

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

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

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

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

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

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

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);
 }
 
 /**

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

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

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

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

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

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

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

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

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

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

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

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

v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js

@@ -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);

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

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

v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js

@@ -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);

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

@@ -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));

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/aliases/models.js

@@ -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>}
      */

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

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

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

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

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

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

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

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);
 }
 
 /**

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

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

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

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

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

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

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

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

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

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

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

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

v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/map_keys/models.js

@@ -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);

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

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

v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/generator/testcases/no_bindings_here/models.js

@@ -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);

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

@@ -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));

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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);
 }
 
 /**

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

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

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