Feature/v3 parser: expand TS model generation tests & some fixes (#2485)

* v3 parser: add tests for model generation

* v3 parser: use single quotes for got model.ts

* v3 parser: fixes for some failing tests

* v3 parser: misc simplification and cleanup

* v3 parser: fix model tests when no structs returned

* v3 parser: fix last failing test case

* Update contributors list

* v3 parser: update README

* Revert "Update contributors list"

This reverts commit f429d2ba890020d7ff0772e6207830508261b489.

* Changelog: add line about my contribution

.github/workflows/generate-contributors.yml

@@ -1,40 +0,0 @@
-name: update-contributors-svg
-
-on:
-  workflow_dispatch: # Can trigger manually
-  schedule:
-    - cron: '0 7 * * *' # Schedule on everyday 7:00
-
-jobs:
-  update-svg:
-    name: Update contributors SVG
-    runs-on: ubuntu-latest # You can also try macos-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set node
-        uses: actions/setup-node@v3
-        with:
-          node-version: lts/*
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2.2.2
-        with:
-          version: 7
-
-      - name: Install deps
-        run: pnpm install
-
-      - name: Run SVG generation script
-        run: pnpx make-github-contributor-svg -t ${{ secrets.GITHUB_TOKEN }} -o vuejs-translations -r docs-zh-cn
-
-      - name: Move SVG
-        run: mv .github-contributors/* website/static/img/ 
-
-      - name: Commit
-        uses: EndBug/add-and-commit@v4
-        with:
-          message: "chore(workflow): update contributors image"
-          add: "website/static/img/*"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label-sponsors.yml

@@ -1,9 +1,9 @@
-name: Label Sponsors
+name: Label sponsors
 on:
   pull_request:
-    types: [opened]
+    types: [ opened ]
   issues:
-    types: [opened]
+    types: [ opened ]
 jobs:
   build:
     name: is-sponsor-label
@@ -11,7 +11,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: JasonEtco/is-sponsor-label-action@v1
-        with:
-          label: Sponsor ❤️
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/push.yml

@@ -1,9 +1,8 @@
-name: Upload Source Documents
+name: Push Checks
 
 on:
   push:
     branches: [master]
-  workflow_dispatch:
 
 jobs:
   push_files_to_crowdin:
@@ -14,28 +13,25 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Verify Changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/verify-changed-files@v11.1
+        id: verify-changed-files
         with:
           files: |
             website/**/*.mdx
             website/**/*.md
             website/**/*.json
 
-      - name: Setup Nodejs
+      - name: Set node
+        if: steps.verify-changed-files.outputs.files_changed != 'true'
         uses: actions/setup-node@v2
         with:
-          node-version: 18.x
+          node-version: 16.x
 
-      - name: Setup Task
-        uses: arduino/setup-task@v1
-        with:
-          version: 3.x
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload source documents
-        if: steps.changed-files.outputs.any_changed == 'true'
+      - name: Push files
         env:
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-        working-directory: ./website
-        run: task crowdin:push
+        run: |
+          cd website
+          corepack enable
+          pnpm install
+          pnpm run crowdin push -b master

.github/workflows/sync-translated-documents.yml

@@ -1,4 +1,4 @@
-name: Sync Translations
+name: Sync Translated Documents
 
 on:
   workflow_dispatch:
@@ -10,30 +10,22 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup Nodejs
+      - name: Set node
         uses: actions/setup-node@v2
         with:
-          node-version: 18.x
-
-      - name: Install Task
-        uses: arduino/setup-task@v1
-        with:
-          version: 3.x
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          node-version: 16.x
 
       - name: Sync Translated Documents
+        run: cd scripts && chmod 755 ./sync-translated-documents.sh && ./sync-translated-documents.sh
         env:
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-        working-directory: ./website
-        run: task crowdin:pull
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4
         with:
-          commit-message: "docs: sync translations"
-          title: "docs: sync translations"
+          commit-message: "docs: sync documents"
+          title: "docs: sync documents"
           body: "- [x] Sync translated documents"
-          branch: chore/sync-translations
-          labels: translation
+          branch: feature/documents
           delete-branch: true
           draft: true

.gitignore

@@ -34,5 +34,3 @@ v2/cmd/wails/internal/commands/initialise/templates/testtemplates/
 
 /v3/.task
 /v3/examples/build/bin/testapp
-/websitev3/site/
-/v3/examples/plugins/bin/testapp

README.md

@@ -97,7 +97,6 @@ This project is supported by these kind people / companies:
 <p align="center">
 <img src="https://wails.io/img/sponsor/jetbrains-grayscale.webp" style="width: 100px"/>
 </p>
-
 ## FAQ
 
 - Is this an alternative to Electron?

Taskfile.yaml

@@ -1,24 +1,24 @@
 # https://taskfile.dev
 
-version: "3"
+version: '3'
 
 vars:
   GREETING: Hello, World!
 
 tasks:
-  contributors:check:
+  check-contributors:
     cmds:
       - npx -y all-contributors-cli check
 
-  contributors:update:
+  update-contributors:
     cmds:
       - go run v3/tasks/contribs/main.go
 
-  contributors:build:
+  build-contributors:
     cmds:
       - npx -y all-contributors-cli generate
 
   release:
     dir: v2/tools/release
     cmds:
-      - go run release.go
+      - go run release.go

scripts/sponsors/package-lock.json

@@ -1775,9 +1775,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.21.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.21.0.tgz",
-      "integrity": "sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmmirror.com/undici/-/undici-5.13.0.tgz",
+      "integrity": "sha512-UDZKtwb2k7KRsK4SdXWG7ErXiL7yTGgLWvk2AXO1JMjgjh404nFo6tWSCM2xMpJwMPx3J8i/vfqEh1zOqvj82Q==",
       "dependencies": {
         "busboy": "^1.6.0"
       },

scripts/sync-translated-documents.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd ../website
+
+npx @crowdin/cli@latest pull -b master

v2/cmd/wails/flags/dev.go

@@ -2,15 +2,14 @@ package flags
 
 import (
 	"fmt"
+	"github.com/samber/lo"
+	"github.com/wailsapp/wails/v2/internal/project"
+	"github.com/wailsapp/wails/v2/pkg/commands/build"
 	"net"
 	"net/url"
 	"os"
 	"path/filepath"
 	"runtime"
-
-	"github.com/samber/lo"
-	"github.com/wailsapp/wails/v2/internal/project"
-	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )
 
 type Dev struct {
@@ -127,7 +126,6 @@ func (d *Dev) GenerateBuildOptions() *build.Options {
 		Compiler:       d.Compiler,
 		ForceBuild:     d.ForceBuild,
 		IgnoreFrontend: d.SkipFrontend,
-		SkipBindings:   d.SkipBindings,
 		Verbosity:      d.Verbosity,
 		WailsJSDir:     d.WailsJSDir,
 		RaceDetector:   d.RaceDetector,

v2/cmd/wails/internal/dev/dev.go

@@ -44,6 +44,31 @@ func sliceToMap(input []string) map[string]struct{} {
 	return result
 }
 
+type devFlags struct {
+	ldflags         string
+	compilerCommand string
+	assetDir        string
+	extensions      string
+	reloadDirs      string
+	openBrowser     bool
+	noReload        bool
+	skipBindings    bool
+	wailsjsdir      string
+	tags            string
+	verbosity       int
+	loglevel        string
+	forceBuild      bool
+	debounceMS      int
+	devServer       string
+	appargs         string
+	saveConfig      bool
+	raceDetector    bool
+
+	frontendDevServerURL string
+	skipFrontend         bool
+	noColour             bool
+}
+
 // Application runs the application in dev mode
 func Application(f *flags.Dev, logger *clilogger.CLILogger) error {
 

v2/cmd/wails/internal/version.txt

@@ -1 +1 @@
-v2.4.1
+v2.4.0

v2/cmd/wails/main.go

@@ -41,7 +41,7 @@ func printBulletPoint(text string, args ...any) {
 		fatal(err.Error())
 	}
 	t = strings.Trim(t, "\n\r")
-	pterm.Printfln(t, args...)
+	pterm.Printf(t, args...)
 }
 
 func printFooter() {

v2/internal/frontend/desktop/darwin/menu.go

@@ -130,5 +130,6 @@ func (f *Frontend) MenuSetApplicationMenu(menu *menu.Menu) {
 }
 
 func (f *Frontend) MenuUpdateApplicationMenu() {
+	f.MenuSetApplicationMenu(f.frontendOptions.Menu)
 	f.mainWindow.UpdateApplicationMenu()
 }

v2/internal/frontend/desktop/linux/frontend.go

@@ -78,6 +78,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"net/http"
 	"net/url"
 	"os"
 	"runtime"
@@ -87,7 +88,6 @@ import (
 	"unsafe"
 
 	"github.com/wailsapp/wails/v2/pkg/assetserver"
-	"github.com/wailsapp/wails/v2/pkg/assetserver/webview"
 
 	"github.com/wailsapp/wails/v2/internal/binding"
 	"github.com/wailsapp/wails/v2/internal/frontend"
@@ -166,7 +166,10 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
 		}
 		result.assets = assets
 
-		go result.startRequestProcessor()
+		// Start 10 processors to handle requests in parallel
+		for i := 0; i < 10; i++ {
+			go result.startRequestProcessor()
+		}
 	}
 
 	go result.startMessageProcessor()
@@ -458,16 +461,50 @@ func processMessage(message *C.char) {
 	messageBuffer <- goMessage
 }
 
-var requestBuffer = make(chan webview.Request, 100)
+var requestBuffer = make(chan unsafe.Pointer, 100)
 
 func (f *Frontend) startRequestProcessor() {
 	for request := range requestBuffer {
-		f.assets.ServeWebViewRequest(request)
-		request.Release()
+		f.processRequest(request)
+		C.g_object_unref(C.gpointer(request))
 	}
 }
 
 //export processURLRequest
 func processURLRequest(request unsafe.Pointer) {
-	requestBuffer <- webview.NewRequest(request)
+	// Increment reference counter to allow async processing, will be decremented after the processing
+	// has been finished by a worker.
+	C.g_object_ref(C.gpointer(request))
+	requestBuffer <- request
+}
+
+func (f *Frontend) processRequest(request unsafe.Pointer) {
+	req := (*C.WebKitURISchemeRequest)(request)
+	uri := C.webkit_uri_scheme_request_get_uri(req)
+	goURI := C.GoString(uri)
+
+	rw := &webKitResponseWriter{req: req}
+	defer rw.Close()
+
+	f.assets.ProcessHTTPRequestLegacy(
+		rw,
+		func() (*http.Request, error) {
+			method := webkit_uri_scheme_request_get_http_method(req)
+			r, err := http.NewRequest(method, goURI, nil)
+			if err != nil {
+				return nil, err
+			}
+			r.Header = webkit_uri_scheme_request_get_http_headers(req)
+
+			if r.URL.Host != f.startURL.Host {
+				if r.Body != nil {
+					r.Body.Close()
+				}
+
+				return nil, fmt.Errorf("Expected host '%s' in request, but was '%s'", f.startURL.Host, r.URL.Host)
+			}
+
+			return r, nil
+		})
+
 }

v2/internal/frontend/desktop/linux/webkit2.go

@@ -12,12 +12,10 @@ import (
 
 	"github.com/wailsapp/wails/v2/pkg/options"
 	"github.com/wailsapp/wails/v2/pkg/options/linux"
-
-	"github.com/wailsapp/wails/v2/pkg/assetserver/webview"
 )
 
 func validateWebKit2Version(options *options.App) {
-	if C.webkit_get_major_version() == 2 && C.webkit_get_minor_version() >= webview.Webkit2MinMinorVersion {
+	if C.webkit_get_major_version() == 2 && C.webkit_get_minor_version() >= webkit2MinMinorVersion {
 		return
 	}
 
@@ -26,6 +24,6 @@ func validateWebKit2Version(options *options.App) {
 		msg = options.Linux.Messages
 	}
 
-	v := fmt.Sprintf("2.%d.0", webview.Webkit2MinMinorVersion)
+	v := fmt.Sprintf("2.%d.0", webkit2MinMinorVersion)
 	showModalDialogAndExit("WebKit2GTK", fmt.Sprintf(msg.WebKit2GTKMinRequired, v))
 }

v2/internal/frontend/desktop/linux/webkit2_36.go

@@ -1,6 +1,6 @@
-//go:build linux && (webkit2_36 || webkit2_40)
+//go:build linux && webkit2_36
 
-package webview
+package linux
 
 /*
 #cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 libsoup-2.4
@@ -15,8 +15,12 @@ import (
 	"net/http"
 	"strings"
 	"unsafe"
+
+	"github.com/wailsapp/wails/v2/pkg/assetserver"
 )
 
+const webkit2MinMinorVersion = 36
+
 func webkit_uri_scheme_request_get_http_method(req *C.WebKitURISchemeRequest) string {
 	method := C.GoString(C.webkit_uri_scheme_request_get_http_method(req))
 	return strings.ToUpper(method)
@@ -47,7 +51,7 @@ func webkit_uri_scheme_request_finish(req *C.WebKitURISchemeRequest, code int, h
 	C.webkit_uri_scheme_response_set_status(resp, C.guint(code), cReason)
 	C.free(unsafe.Pointer(cReason))
 
-	cMimeType := C.CString(header.Get(HeaderContentType))
+	cMimeType := C.CString(header.Get(assetserver.HeaderContentType))
 	C.webkit_uri_scheme_response_set_content_type(resp, cMimeType)
 	C.free(unsafe.Pointer(cMimeType))
 

v2/internal/frontend/desktop/linux/webkit2_legacy.go

@@ -1,6 +1,6 @@
-//go:build linux && !(webkit2_36 || webkit2_40)
+//go:build linux && !webkit2_36
 
-package webview
+package linux
 
 /*
 #cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
@@ -12,12 +12,13 @@ import "C"
 
 import (
 	"fmt"
-	"io"
 	"net/http"
 	"unsafe"
+
+	"github.com/wailsapp/wails/v2/pkg/assetserver"
 )
 
-const Webkit2MinMinorVersion = 0
+const webkit2MinMinorVersion = 0
 
 func webkit_uri_scheme_request_get_http_method(_ *C.WebKitURISchemeRequest) string {
 	return http.MethodGet
@@ -27,16 +28,12 @@ func webkit_uri_scheme_request_get_http_headers(_ *C.WebKitURISchemeRequest) htt
 	return http.Header{}
 }
 
-func webkit_uri_scheme_request_get_http_body(_ *C.WebKitURISchemeRequest) io.ReadCloser {
-	return http.NoBody
-}
-
 func webkit_uri_scheme_request_finish(req *C.WebKitURISchemeRequest, code int, header http.Header, stream *C.GInputStream, streamLength int64) error {
 	if code != http.StatusOK {
 		return fmt.Errorf("StatusCodes not supported: %d - %s", code, http.StatusText(code))
 	}
 
-	cMimeType := C.CString(header.Get(HeaderContentType))
+	cMimeType := C.CString(header.Get(assetserver.HeaderContentType))
 	C.webkit_uri_scheme_request_finish(req, stream, C.gint64(streamLength), cMimeType)
 	C.free(unsafe.Pointer(cMimeType))
 	return nil

v2/internal/frontend/desktop/linux/webkit2_responsewriter.go

@@ -1,7 +1,7 @@
 //go:build linux
 // +build linux
 
-package webview
+package linux
 
 /*
 #cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 gio-unix-2.0
@@ -20,31 +20,28 @@ import (
 	"strconv"
 	"syscall"
 	"unsafe"
+
+	"github.com/wailsapp/wails/v2/pkg/assetserver"
 )
 
-type responseWriter struct {
+type webKitResponseWriter struct {
 	req *C.WebKitURISchemeRequest
 
 	header      http.Header
 	wroteHeader bool
-	finished    bool
 
 	w    io.WriteCloser
 	wErr error
 }
 
-func (rw *responseWriter) Header() http.Header {
+func (rw *webKitResponseWriter) Header() http.Header {
 	if rw.header == nil {
 		rw.header = http.Header{}
 	}
 	return rw.header
 }
 
-func (rw *responseWriter) Write(buf []byte) (int, error) {
-	if rw.finished {
-		return 0, errResponseFinished
-	}
-
+func (rw *webKitResponseWriter) Write(buf []byte) (int, error) {
 	rw.WriteHeader(http.StatusOK)
 	if rw.wErr != nil {
 		return 0, rw.wErr
@@ -52,14 +49,14 @@ func (rw *responseWriter) Write(buf []byte) (int, error) {
 	return rw.w.Write(buf)
 }
 
-func (rw *responseWriter) WriteHeader(code int) {
-	if rw.wroteHeader || rw.finished {
+func (rw *webKitResponseWriter) WriteHeader(code int) {
+	if rw.wroteHeader {
 		return
 	}
 	rw.wroteHeader = true
 
 	contentLength := int64(-1)
-	if sLen := rw.Header().Get(HeaderContentLength); sLen != "" {
+	if sLen := rw.Header().Get(assetserver.HeaderContentLength); sLen != "" {
 		if pLen, _ := strconv.ParseInt(sLen, 10, 64); pLen > 0 {
 			contentLength = pLen
 		}
@@ -75,7 +72,7 @@ func (rw *responseWriter) WriteHeader(code int) {
 	}
 	rw.w = w
 
-	stream := C.g_unix_input_stream_new(C.int(rFD), C.gboolean(1))
+	stream := C.g_unix_input_stream_new(C.int(rFD), gtkBool(true))
 	defer C.g_object_unref(C.gpointer(stream))
 
 	if err := webkit_uri_scheme_request_finish(rw.req, code, rw.Header(), stream, contentLength); err != nil {
@@ -84,22 +81,13 @@ func (rw *responseWriter) WriteHeader(code int) {
 	}
 }
 
-func (rw *responseWriter) Finish() error {
-	if !rw.wroteHeader {
-		rw.WriteHeader(http.StatusNotImplemented)
-	}
-
-	if rw.finished {
-		return nil
-	}
-	rw.finished = true
+func (rw *webKitResponseWriter) Close() {
 	if rw.w != nil {
 		rw.w.Close()
 	}
-	return nil
 }
 
-func (rw *responseWriter) finishWithError(code int, err error) {
+func (rw *webKitResponseWriter) finishWithError(code int, err error) {
 	if rw.w != nil {
 		rw.w.Close()
 		rw.w = &nopCloser{io.Discard}

v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/corewebview2.go

@@ -4,7 +4,6 @@
 package edge
 
 import (
-	"fmt"
 	"log"
 	"runtime"
 	"syscall"
@@ -250,7 +249,7 @@ func (e *ICoreWebView2Environment) CreateWebResourceResponse(content []byte, sta
 		return nil, err
 	}
 	var response *ICoreWebView2WebResourceResponse
-	hr, _, err := e.vtbl.CreateWebResourceResponse.Call(
+	_, _, err = e.vtbl.CreateWebResourceResponse.Call(
 		uintptr(unsafe.Pointer(e)),
 		stream,
 		uintptr(statusCode),
@@ -258,14 +257,7 @@ func (e *ICoreWebView2Environment) CreateWebResourceResponse(content []byte, sta
 		uintptr(unsafe.Pointer(_headers)),
 		uintptr(unsafe.Pointer(&response)),
 	)
-	if windows.Handle(hr) != windows.S_OK {
-		return nil, syscall.Errno(hr)
-	}
-
-	if response == nil {
-		if err == nil {
-			err = fmt.Errorf("unknown error")
-		}
+	if err != windows.ERROR_SUCCESS {
 		return nil, err
 	}
 	return response, nil