Fix parser/generator tests

v3/internal/parser/parser.go

@@ -400,15 +400,17 @@ func (p *Project) parseBoundStructMethods(name string, pkg *ParsedPackage) error
 						var alias *uint32
 						var err error
 						// Check for the text `wails:methodID <integer>`
-						for _, docstring := range funcDecl.Doc.List {
-							if strings.Contains(docstring.Text, "//wails:methodID") {
-								idString := strings.TrimSpace(strings.TrimPrefix(docstring.Text, "//wails:methodID"))
-								parsedID, err := strconv.ParseUint(idString, 10, 32)
-								if err != nil {
-									return fmt.Errorf("invalid value in `wails:methodID` directive: '%s'. Expected a valid uint32 value", idString)
+						if funcDecl.Doc != nil {
+							for _, docstring := range funcDecl.Doc.List {
+								if strings.Contains(docstring.Text, "//wails:methodID") {
+									idString := strings.TrimSpace(strings.TrimPrefix(docstring.Text, "//wails:methodID"))
+									parsedID, err := strconv.ParseUint(idString, 10, 32)
+									if err != nil {
+										return fmt.Errorf("invalid value in `wails:methodID` directive: '%s'. Expected a valid uint32 value", idString)
+									}
+									alias = lo.ToPtr(uint32(parsedID))
+									break
 								}
-								alias = lo.ToPtr(uint32(parsedID))
-								break
 							}
 						}
 						id, err := hash.Fnv(fqn)

v3/internal/parser/testdata/function_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/pkg/application/messageprocessor.go

@@ -140,7 +140,7 @@ func (m *MessageProcessor) HandleRuntimeCallWithIDs(rw http.ResponseWriter, r *h
 	case systemRequest:
 		m.processSystemMethod(method, rw, r, targetWindow, params)
 	default:
-		m.httpError(rw, "Unknown runtime call: %s", object)
+		m.httpError(rw, "Unknown runtime call: %d", object)
 	}
 }
 

v3/pkg/application/messageprocessor_call.go

@@ -26,7 +26,7 @@ func (m *MessageProcessor) callCallback(window *WebviewWindow, callID *string, r
 func (m *MessageProcessor) processCallMethod(method int, rw http.ResponseWriter, r *http.Request, window *WebviewWindow, params QueryParams) {
 	args, err := params.Args()
 	if err != nil {
-		m.httpError(rw, "Unable to parse arguments: %s", err)
+		m.httpError(rw, "Unable to parse arguments: %s", err.Error())
 		return
 	}
 	callID := args.String("call-id")
@@ -76,7 +76,7 @@ func (m *MessageProcessor) processCallMethod(method int, rw http.ResponseWriter,
 		}()
 		m.ok(rw)
 	default:
-		m.httpError(rw, "Unknown call method: %s", method)
+		m.httpError(rw, "Unknown call method: %d", method)
 	}
 
 }

v3/pkg/application/messageprocessor_clipboard.go

@@ -18,7 +18,7 @@ func (m *MessageProcessor) processClipboardMethod(method int, rw http.ResponseWr
 
 	args, err := params.Args()
 	if err != nil {
-		m.httpError(rw, "Unable to parse arguments: %s", err)
+		m.httpError(rw, "Unable to parse arguments: %s", err.Error())
 		return
 	}
 
@@ -37,7 +37,7 @@ func (m *MessageProcessor) processClipboardMethod(method int, rw http.ResponseWr
 		m.text(rw, text)
 		m.Info("Runtime Call:", "method", "Clipboard."+clipboardMethods[method], "text", text)
 	default:
-		m.httpError(rw, "Unknown clipboard method: %s", method)
+		m.httpError(rw, "Unknown clipboard method: %d", method)
 		return
 	}
 

v3/pkg/application/messageprocessor_contextmenu.go

@@ -32,7 +32,7 @@ func (m *MessageProcessor) processContextMenuMethod(method int, rw http.Response
 		window.openContextMenu(&data)
 		m.ok(rw)
 	default:
-		m.httpError(rw, "Unknown contextmenu method: %s", method)
+		m.httpError(rw, "Unknown contextmenu method: %d", method)
 	}
 
 	m.Info("Runtime:", "method", "ContextMenu."+contextmenuMethodNames[method])

v3/pkg/application/messageprocessor_dialog.go

@@ -43,7 +43,7 @@ func (m *MessageProcessor) processDialogMethod(method int, rw http.ResponseWrite
 
 	args, err := params.Args()
 	if err != nil {
-		m.httpError(rw, "Unable to parse arguments: %s", err)
+		m.httpError(rw, "Unable to parse arguments: %s", err.Error())
 		return
 	}
 	dialogID := args.String("dialog-id")
@@ -164,7 +164,7 @@ func (m *MessageProcessor) processDialogMethod(method int, rw http.ResponseWrite
 		m.Info("Runtime:", "method", methodName, "options", options)
 
 	default:
-		m.httpError(rw, "Unknown dialog method: %s", method)
+		m.httpError(rw, "Unknown dialog method: %d", method)
 	}
 
 }

v3/pkg/application/messageprocessor_events.go

@@ -20,7 +20,7 @@ func (m *MessageProcessor) processEventsMethod(method int, rw http.ResponseWrite
 	case EventsEmit:
 		err := params.ToStruct(&event)
 		if err != nil {
-			m.httpError(rw, "Error parsing event: %s", err)
+			m.httpError(rw, "Error parsing event: %s", err.Error())
 			return
 		}
 		if event.Name == "" {
@@ -31,7 +31,7 @@ func (m *MessageProcessor) processEventsMethod(method int, rw http.ResponseWrite
 		globalApplication.Events.Emit(&event)
 		m.ok(rw)
 	default:
-		m.httpError(rw, "Unknown event method: %s", method)
+		m.httpError(rw, "Unknown event method: %d", method)
 		return
 	}
 

v3/pkg/application/messageprocessor_screens.go

@@ -41,7 +41,7 @@ func (m *MessageProcessor) processScreensMethod(method int, rw http.ResponseWrit
 		}
 		m.json(rw, screen)
 	default:
-		m.httpError(rw, "Unknown screens method: %s", method)
+		m.httpError(rw, "Unknown screens method: %d", method)
 	}
 
 	m.Info("Runtime:", "method", "Screens."+screensMethodNames[method])

v3/pkg/application/messageprocessor_system.go

@@ -18,7 +18,7 @@ func (m *MessageProcessor) processSystemMethod(method int, rw http.ResponseWrite
 	case SystemIsDarkMode:
 		m.json(rw, globalApplication.IsDarkMode())
 	default:
-		m.httpError(rw, "Unknown system method: %s", method)
+		m.httpError(rw, "Unknown system method: %d", method)
 	}
 
 	m.Info("Runtime:", "method", "System."+systemMethodNames[method])

v3/pkg/application/messageprocessor_window.go

@@ -74,7 +74,7 @@ func (m *MessageProcessor) processWindowMethod(method int, rw http.ResponseWrite
 
 	args, err := params.Args()
 	if err != nil {
-		m.httpError(rw, "Unable to parse arguments: %s", err)
+		m.httpError(rw, "Unable to parse arguments: %s", err.Error())
 		return
 	}
 
@@ -252,7 +252,7 @@ func (m *MessageProcessor) processWindowMethod(method int, rw http.ResponseWrite
 		window.SetZoom(*zoomLevel)
 		m.ok(rw)
 	default:
-		m.httpError(rw, "Unknown window method id: %s", method)
+		m.httpError(rw, "Unknown window method id: %d", method)
 	}
 
 	m.Info("Runtime:", "method", "Window."+windowMethodNames[method])