Fix tests

v3/internal/commands/icons_test.go

@@ -52,7 +52,7 @@ func TestGenerateIcon(t *testing.T) {
 				_, thisFile, _, _ := runtime.Caller(1)
 				localDir := filepath.Dir(thisFile)
 				// Get the path to the example icon
-				exampleIcon := filepath.Join(localDir, "examples", "appicon.png")
+				exampleIcon := filepath.Join(localDir, "defaults", "appicon.png")
 				return &IconsOptions{
 					Input:           exampleIcon,
 					WindowsFilename: "appicon.ico",
@@ -94,7 +94,7 @@ func TestGenerateIcon(t *testing.T) {
 				_, thisFile, _, _ := runtime.Caller(1)
 				localDir := filepath.Dir(thisFile)
 				// Get the path to the example icon
-				exampleIcon := filepath.Join(localDir, "examples", "appicon.png")
+				exampleIcon := filepath.Join(localDir, "defaults", "appicon.png")
 				return &IconsOptions{
 					Input:       exampleIcon,
 					MacFilename: "appicon.icns",
@@ -133,7 +133,7 @@ func TestGenerateIcon(t *testing.T) {
 				_, thisFile, _, _ := runtime.Caller(1)
 				localDir := filepath.Dir(thisFile)
 				// Get the path to the example icon
-				exampleIcon := filepath.Join(localDir, "examples", "appicon.png")
+				exampleIcon := filepath.Join(localDir, "defaults", "appicon.png")
 				return &IconsOptions{
 					Input:           exampleIcon,
 					Sizes:           "16",
@@ -181,7 +181,7 @@ func TestGenerateIcon(t *testing.T) {
 				_, thisFile, _, _ := runtime.Caller(1)
 				localDir := filepath.Dir(thisFile)
 				// Get the path to the example icon
-				exampleIcon := filepath.Join(localDir, "examples", "appicon.png")
+				exampleIcon := filepath.Join(localDir, "defaults", "appicon.png")
 				return &IconsOptions{
 					Input: exampleIcon,
 				}
@@ -195,7 +195,7 @@ func TestGenerateIcon(t *testing.T) {
 				_, thisFile, _, _ := runtime.Caller(1)
 				localDir := filepath.Dir(thisFile)
 				// Get the path to the example icon
-				exampleIcon := filepath.Join(localDir, "examples", "appicon.png")
+				exampleIcon := filepath.Join(localDir, "defaults", "appicon.png")
 				return &IconsOptions{
 					Input:           exampleIcon,
 					WindowsFilename: "appicon.ico",
@@ -211,7 +211,7 @@ func TestGenerateIcon(t *testing.T) {
 				_, thisFile, _, _ := runtime.Caller(1)
 				localDir := filepath.Dir(thisFile)
 				// Get the path to the example icon
-				exampleIcon := filepath.Join(localDir, "examples", "appicon.png")
+				exampleIcon := filepath.Join(localDir, "defaults", "appicon.png")
 				return &IconsOptions{
 					Input:           exampleIcon,
 					WindowsFilename: "appicon.ico",

v3/internal/commands/task_test.go

@@ -1,39 +0,0 @@
-package commands
-
-import "testing"
-
-func TestBuild(t *testing.T) {
-	type args struct {
-		options   *RunTaskOptions
-		otherArgs []string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantErr bool
-	}{
-		{
-			name: "should error if task name not provided",
-			args: args{
-				options: &RunTaskOptions{},
-			},
-			wantErr: true,
-		},
-		{
-			name: "should work if task name provided",
-			args: args{
-				options: &RunTaskOptions{
-					Name: "build",
-				},
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if err := RunTask(tt.args.options, tt.args.otherArgs); (err != nil) != tt.wantErr {
-				t.Errorf("Run() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}

v3/internal/parser/bindings.go

@@ -18,7 +18,7 @@ const header = `// @ts-check
 const bindingTemplate = `
 		/**
 		 * {{structName}}.{{methodName}}
-		 * Comments
+		 *Comments
 		 * @param name {string}
 		 * @returns {Promise<string>}
 		 **/
@@ -108,6 +108,9 @@ func GenerateBinding(structName string, method *BoundMethod) (string, []string)
 	result = strings.ReplaceAll(result, "{{methodName}}", method.Name)
 	result = strings.ReplaceAll(result, "{{ID}}", fmt.Sprintf("%v", method.ID))
 	comments := strings.TrimSpace(method.DocComment)
+	if comments != "" {
+		comments = " " + comments
+	}
 	result = strings.ReplaceAll(result, "Comments", comments)
 	var params string
 	for _, input := range method.Inputs {
@@ -238,7 +241,7 @@ window.go = window.go || {};
 			for _, method := range methods {
 				thisBinding, models := GenerateBinding(structName, method)
 				allModels = append(allModels, models...)
-				result[normalisedPackageNames[packageName]] += "        " + thisBinding
+				result[normalisedPackageNames[packageName]] += thisBinding
 			}
 			result[normalisedPackageNames[packageName]] += "    },\n"
 		}

v3/internal/parser/bindings_test.go

@@ -110,6 +110,11 @@ func TestGenerateBindings(t *testing.T) {
 					return
 				}
 				// compare the binding
+
+				// convert all line endings to \n
+				binding = convertLineEndings(binding)
+				expected = convertLineEndings(expected)
+
 				if diff := cmp.Diff(expected, binding); diff != "" {
 					err = os.WriteFile(tt.dir+"/bindings_"+name+".got.js", []byte(binding), 0644)
 					if err != nil {

v3/internal/parser/models_test.go

@@ -4,6 +4,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 )
 
@@ -63,8 +64,10 @@ func TestGenerateModels(t *testing.T) {
 			if err != nil {
 				t.Fatalf("GenerateModels() error = %v", err)
 			}
-
-			if diff := cmp.Diff(tt.want, got); diff != "" {
+			// convert all line endings to \n
+			got = convertLineEndings(got)
+			want := convertLineEndings(tt.want)
+			if diff := cmp.Diff(want, got); diff != "" {
 				err = os.WriteFile(filepath.Join(tt.dir, "models.got.ts"), []byte(got), 0644)
 				if err != nil {
 					t.Errorf("os.WriteFile() error = %v", err)
@@ -75,3 +78,8 @@ func TestGenerateModels(t *testing.T) {
 		})
 	}
 }
+
+func convertLineEndings(str string) string {
+	// replace all \r\n with \n
+	return strings.ReplaceAll(str, "\r\n", "\n")
+}

v3/internal/parser/parser_test.go

@@ -40,6 +40,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 						{
 							Name:       "NoInputsStringOut",
@@ -53,6 +54,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1075577233,
 						},
 						{
 							Name: "StringArrayInputStringOut",
@@ -72,6 +74,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1091960237,
 						},
 						{
 							Name: "StringArrayInputStringArrayOut",
@@ -92,6 +95,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 383995060,
 						},
 						{
 							Name: "StringArrayInputNamedOutput",
@@ -113,6 +117,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 3678582682,
 						},
 						{
 							Name: "StringArrayInputNamedOutputs",
@@ -140,6 +145,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 319259595,
 						},
 						{
 							Name: "IntPointerInputNamedOutputs",
@@ -166,6 +172,7 @@ func TestParseDirectory(t *testing.T) {
 										Name: "error",
 									}},
 							},
+							ID: 2718999663,
 						},
 						{
 							Name: "UIntPointerInAndOutput",
@@ -186,6 +193,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1367187362,
 						},
 						{
 							Name: "UInt8PointerInAndOutput",
@@ -206,6 +214,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 518250834,
 						},
 						{
 							Name: "UInt16PointerInAndOutput",
@@ -226,6 +235,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1236957573,
 						},
 						{
 							Name: "UInt32PointerInAndOutput",
@@ -246,6 +256,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1739300671,
 						},
 						{
 							Name: "UInt64PointerInAndOutput",
@@ -266,6 +277,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1403757716,
 						},
 						{
 							Name: "IntPointerInAndOutput",
@@ -286,6 +298,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1066151743,
 						},
 						{
 							Name: "Int8PointerInAndOutput",
@@ -306,6 +319,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2189402897,
 						},
 						{
 							Name: "Int16PointerInAndOutput",
@@ -326,6 +340,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1754277916,
 						},
 						{
 							Name: "Int32PointerInAndOutput",
@@ -346,6 +361,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 4251088558,
 						},
 						{
 							Name: "Int64PointerInAndOutput",
@@ -366,6 +382,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2205561041,
 						},
 						{
 							Name: "IntInIntOut",
@@ -384,6 +401,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 642881729,
 						},
 						{
 							Name: "Int8InIntOut",
@@ -402,6 +420,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 572240879,
 						},
 						{
 							Name: "Int16InIntOut",
@@ -420,6 +439,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 3306292566,
 						},
 						{
 							Name: "Int32InIntOut",
@@ -438,6 +458,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1909469092,
 						},
 						{
 							Name: "Int64InIntOut",
@@ -456,6 +477,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1343888303,
 						},
 						{
 							Name: "UIntInUIntOut",
@@ -474,6 +496,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2836661285,
 						},
 						{
 							Name: "UInt8InUIntOut",
@@ -492,6 +515,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2988345717,
 						},
 						{
 							Name: "UInt16InUIntOut",
@@ -510,6 +534,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 3401034892,
 						},
 						{
 							Name: "UInt32InUIntOut",
@@ -528,6 +553,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1160383782,
 						},
 						{
 							Name: "UInt64InUIntOut",
@@ -546,6 +572,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 793803239,
 						},
 						{
 							Name: "Float32InFloat32Out",
@@ -564,6 +591,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 3132595881,
 						},
 						{
 							Name: "Float64InFloat64Out",
@@ -582,6 +610,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2182412247,
 						},
 						{
 							Name: "PointerFloat32InFloat32Out",
@@ -602,6 +631,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 224675106,
 						},
 						{
 							Name: "PointerFloat64InFloat64Out",
@@ -622,6 +652,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2124953624,
 						},
 						{
 							Name: "BoolInBoolOut",
@@ -640,6 +671,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2424639793,
 						},
 						{
 							Name: "PointerBoolInBoolOut",
@@ -660,6 +692,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 3589606958,
 						},
 						{
 							Name: "PointerStringInStringOut",
@@ -680,6 +713,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 229603958,
 						},
 						{
 							Name: "StructPointerInputErrorOutput",
@@ -701,6 +735,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2447692557,
 						},
 						{
 							Name: "StructInputStructOutput",
@@ -723,6 +758,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 3835643147,
 						},
 						{
 							Name: "StructPointerInputStructPointerOutput",
@@ -747,6 +783,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2943477349,
 						},
 						{
 							Name: "MapIntInt",
@@ -764,6 +801,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2386486356,
 						},
 						{
 							Name: "PointerMapIntInt",
@@ -782,6 +820,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 3516977899,
 						},
 						{
 							Name: "MapIntPointerInt",
@@ -800,6 +839,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 550413585,
 						},
 						{
 							Name: "MapIntSliceInt",
@@ -818,6 +858,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 2900172572,
 						},
 						{
 							Name: "MapIntSliceIntInMapIntSliceIntOut",
@@ -851,6 +892,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 881980169,
 						},
 						{
 							Name: "ArrayInt",
@@ -863,6 +905,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 3862002418,
 						},
 					},
 				},
@@ -956,11 +999,13 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 					},
 					"OtherService": {
 						{
 							Name: "Hello",
+							ID:   4249972365,
 						},
 					},
 				},
@@ -992,11 +1037,13 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 					},
 					"OtherService": {
 						{
 							Name: "Hello",
+							ID:   4249972365,
 						},
 					},
 				},
@@ -1029,6 +1076,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 						{
 							Name:       "NewPerson",
@@ -1052,6 +1100,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1661412647,
 						},
 					},
 				},
@@ -1069,6 +1118,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 469445984,
 						},
 					},
 				},
@@ -1149,6 +1199,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 					},
 				},
@@ -1180,6 +1231,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 					},
 				},
@@ -1211,6 +1263,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 						{
 							Name:       "NewPerson",
@@ -1234,6 +1287,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1661412647,
 						},
 					},
 				},
@@ -1251,6 +1305,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 302702907,
 						},
 					},
 				},
@@ -1331,6 +1386,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 					},
 				},
@@ -1362,6 +1418,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1411160069,
 						},
 						{
 							Name:       "NewPerson",
@@ -1385,6 +1442,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 1661412647,
 						},
 					},
 				},
@@ -1402,6 +1460,7 @@ func TestParseDirectory(t *testing.T) {
 									},
 								},
 							},
+							ID: 302702907,
 						},
 					},
 				},

v3/internal/parser/testdata/function_from_imported_package/bindings_main.js

@@ -4,40 +4,25 @@
 
 import {main} from './models';
 
-function GreetService(method) {
-    return {
-        packageName: "main",
-        serviceName: "GreetService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * GreetService.Greet
- * Greet does XYZ
- * @param name {string}
- * @returns {Promise<string>}
- **/
-function Greet(name) {
-    return wails.Call(GreetService("Greet", name));
-}
-
-/**
- * GreetService.NewPerson
- * NewPerson creates a new person
- * @param name {string}
- * @returns {Promise<main.Person | null>}
- **/
-function NewPerson(name) {
-    return wails.Call(GreetService("NewPerson", name));
-}
-
 window.go = window.go || {};
 window.go.main = {
     GreetService: {
-        Greet,
-        NewPerson,
+
+		/**
+		 * GreetService.Greet
+		 * Greet does XYZ
+		 * @param name {string}
+		 * @returns {Promise<string>}
+		 **/
+	    Greet: function(name) { wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0)); },
+
+		/**
+		 * GreetService.NewPerson
+		 * NewPerson creates a new person
+		 * @param name {string}
+		 * @returns {Promise<main.Person | null>}
+		 **/
+	    NewPerson: function(name) { wails.CallByID(1661412647, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };
 

v3/internal/parser/testdata/function_from_imported_package/bindings_services.js

@@ -4,29 +4,17 @@
 
 import {services} from './models';
 
-function OtherService(method) {
-    return {
-        packageName: "services",
-        serviceName: "OtherService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * OtherService.Yay
- * 
- *
- * @returns {Promise<services.Address | null>}
- **/
-function Yay() {
-    return wails.Call(OtherService("Yay"));
-}
-
 window.go = window.go || {};
 window.go.services = {
     OtherService: {
-        Yay,
+
+		/**
+		 * OtherService.Yay
+		 *
+		 *
+		 * @returns {Promise<services.Address | null>}
+		 **/
+	    Yay: function() { wails.CallByID(302702907, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };
 

v3/internal/parser/testdata/struct_literal_multiple/bindings_main.js

@@ -2,49 +2,27 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
-function GreetService(method) {
-    return {
-        packageName: "main",
-        serviceName: "GreetService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * GreetService.Greet
- * 
- * @param name {string}
- * @returns {Promise<string>}
- **/
-function Greet(name) {
-    return wails.Call(GreetService("Greet", name));
-}
-function OtherService(method) {
-    return {
-        packageName: "main",
-        serviceName: "OtherService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * OtherService.Hello
- * 
- *
- * @returns {Promise<void>}
- **/
-function Hello() {
-    return wails.Call(OtherService("Hello"));
-}
 
 window.go = window.go || {};
 window.go.main = {
     GreetService: {
-        Greet,
+
+		/**
+		 * GreetService.Greet
+		 *
+		 * @param name {string}
+		 * @returns {Promise<string>}
+		 **/
+	    Greet: function(name) { wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0)); },
     },
     OtherService: {
-        Hello,
+
+		/**
+		 * OtherService.Hello
+		 *
+		 *
+		 * @returns {Promise<void>}
+		 **/
+	    Hello: function() { wails.CallByID(4249972365, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };

v3/internal/parser/testdata/struct_literal_multiple_files/bindings_main.js

@@ -2,49 +2,27 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
-function GreetService(method) {
-    return {
-        packageName: "main",
-        serviceName: "GreetService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * GreetService.Greet
- * 
- * @param name {string}
- * @returns {Promise<string>}
- **/
-function Greet(name) {
-    return wails.Call(GreetService("Greet", name));
-}
-function OtherService(method) {
-    return {
-        packageName: "main",
-        serviceName: "OtherService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * OtherService.Hello
- * 
- *
- * @returns {Promise<void>}
- **/
-function Hello() {
-    return wails.Call(OtherService("Hello"));
-}
 
 window.go = window.go || {};
 window.go.main = {
     GreetService: {
-        Greet,
+
+		/**
+		 * GreetService.Greet
+		 *
+		 * @param name {string}
+		 * @returns {Promise<string>}
+		 **/
+	    Greet: function(name) { wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0)); },
     },
     OtherService: {
-        Hello,
+
+		/**
+		 * OtherService.Hello
+		 *
+		 *
+		 * @returns {Promise<void>}
+		 **/
+	    Hello: function() { wails.CallByID(4249972365, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };

v3/internal/parser/testdata/struct_literal_multiple_other/bindings_main.js

@@ -4,40 +4,25 @@
 
 import {main} from './models';
 
-function GreetService(method) {
-    return {
-        packageName: "main",
-        serviceName: "GreetService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * GreetService.Greet
- * Greet does XYZ
- * @param name {string}
- * @returns {Promise<string>}
- **/
-function Greet(name) {
-    return wails.Call(GreetService("Greet", name));
-}
-
-/**
- * GreetService.NewPerson
- * NewPerson creates a new person
- * @param name {string}
- * @returns {Promise<main.Person | null>}
- **/
-function NewPerson(name) {
-    return wails.Call(GreetService("NewPerson", name));
-}
-
 window.go = window.go || {};
 window.go.main = {
     GreetService: {
-        Greet,
-        NewPerson,
+
+		/**
+		 * GreetService.Greet
+		 * Greet does XYZ
+		 * @param name {string}
+		 * @returns {Promise<string>}
+		 **/
+	    Greet: function(name) { wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0)); },
+
+		/**
+		 * GreetService.NewPerson
+		 * NewPerson creates a new person
+		 * @param name {string}
+		 * @returns {Promise<main.Person | null>}
+		 **/
+	    NewPerson: function(name) { wails.CallByID(1661412647, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };
 

v3/internal/parser/testdata/struct_literal_multiple_other/bindings_services.js

@@ -4,29 +4,17 @@
 
 import {services} from './models';
 
-function OtherService(method) {
-    return {
-        packageName: "services",
-        serviceName: "OtherService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * OtherService.Yay
- * 
- *
- * @returns {Promise<services.Address | null>}
- **/
-function Yay() {
-    return wails.Call(OtherService("Yay"));
-}
-
 window.go = window.go || {};
 window.go.services = {
     OtherService: {
-        Yay,
+
+		/**
+		 * OtherService.Yay
+		 *
+		 *
+		 * @returns {Promise<services.Address | null>}
+		 **/
+	    Yay: function() { wails.CallByID(469445984, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };
 

v3/internal/parser/testdata/variable_single/bindings_main.js

@@ -2,28 +2,17 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
-function GreetService(method) {
-    return {
-        packageName: "main",
-        serviceName: "GreetService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * GreetService.Greet
- * Greet someone
- * @param name {string}
- * @returns {Promise<string>}
- **/
-function Greet(name) {
-    return wails.Call(GreetService("Greet", name));
-}
 
 window.go = window.go || {};
 window.go.main = {
     GreetService: {
-        Greet,
+
+		/**
+		 * GreetService.Greet
+		 * Greet someone
+		 * @param name {string}
+		 * @returns {Promise<string>}
+		 **/
+	    Greet: function(name) { wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };

v3/internal/parser/testdata/variable_single_from_function/bindings_main.js

@@ -2,28 +2,17 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
-function GreetService(method) {
-    return {
-        packageName: "main",
-        serviceName: "GreetService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * GreetService.Greet
- * Greet someone
- * @param name {string}
- * @returns {Promise<string>}
- **/
-function Greet(name) {
-    return wails.Call(GreetService("Greet", name));
-}
 
 window.go = window.go || {};
 window.go.main = {
     GreetService: {
-        Greet,
+
+		/**
+		 * GreetService.Greet
+		 * Greet someone
+		 * @param name {string}
+		 * @returns {Promise<string>}
+		 **/
+	    Greet: function(name) { wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };

v3/internal/parser/testdata/variable_single_from_other_function/bindings_main.js

@@ -4,40 +4,25 @@
 
 import {main} from './models';
 
-function GreetService(method) {
-    return {
-        packageName: "main",
-        serviceName: "GreetService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * GreetService.Greet
- * Greet does XYZ
- * @param name {string}
- * @returns {Promise<string>}
- **/
-function Greet(name) {
-    return wails.Call(GreetService("Greet", name));
-}
-
-/**
- * GreetService.NewPerson
- * NewPerson creates a new person
- * @param name {string}
- * @returns {Promise<main.Person | null>}
- **/
-function NewPerson(name) {
-    return wails.Call(GreetService("NewPerson", name));
-}
-
 window.go = window.go || {};
 window.go.main = {
     GreetService: {
-        Greet,
-        NewPerson,
+
+		/**
+		 * GreetService.Greet
+		 * Greet does XYZ
+		 * @param name {string}
+		 * @returns {Promise<string>}
+		 **/
+	    Greet: function(name) { wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0)); },
+
+		/**
+		 * GreetService.NewPerson
+		 * NewPerson creates a new person
+		 * @param name {string}
+		 * @returns {Promise<main.Person | null>}
+		 **/
+	    NewPerson: function(name) { wails.CallByID(1661412647, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };
 

v3/internal/parser/testdata/variable_single_from_other_function/bindings_services.js

@@ -4,29 +4,17 @@
 
 import {services} from './models';
 
-function OtherService(method) {
-    return {
-        packageName: "services",
-        serviceName: "OtherService",
-        methodName: method,
-        args: Array.prototype.slice.call(arguments, 1),
-    };
-}
-
-/**
- * OtherService.Yay
- * 
- *
- * @returns {Promise<services.Address | null>}
- **/
-function Yay() {
-    return wails.Call(OtherService("Yay"));
-}
-
 window.go = window.go || {};
 window.go.services = {
     OtherService: {
-        Yay,
+
+		/**
+		 * OtherService.Yay
+		 *
+		 *
+		 * @returns {Promise<services.Address | null>}
+		 **/
+	    Yay: function() { wails.CallByID(302702907, ...Array.prototype.slice.call(arguments, 0)); },
     },
 };
 

v3/internal/templates/templates_test.go

@@ -1,14 +1,14 @@
 package templates
 
 import (
+	"os"
 	"testing"
 
 	"github.com/wailsapp/wails/v3/internal/flags"
 )
 
 func TestInstall(t *testing.T) {
-	type args struct {
-	}
+
 	tests := []struct {
 		name    string
 		options *flags.Init
@@ -25,6 +25,10 @@ func TestInstall(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		// Remove test directory if it exists
+		if _, err := os.Stat(tt.options.ProjectName); err == nil {
+			_ = os.RemoveAll(tt.options.ProjectName)
+		}
 		t.Run(tt.name, func(t *testing.T) {
 			if err := Install(tt.options); (err != nil) != tt.wantErr {
 				t.Errorf("Install() error = %v, wantErr %v", err, tt.wantErr)