From 0b71d6493116a649c104eeb80a1242ae42274c06 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Wed, 1 Sep 2021 20:52:34 +1000 Subject: [PATCH] [v2] window.backend -> window.go --- .../templates/svelte/frontend/src/App.svelte | 2 +- .../templates/templates/vanilla/frontend/src/main.js | 3 +-- v2/internal/binding/generate.go | 6 +++--- v2/internal/frontend/runtime/desktop/bindings.js | 12 ++++++------ v2/internal/parse/parse.go | 2 +- v2/internal/runtime/js/core/bindings.js | 10 +++++----- v2/internal/runtime/js/core/main.js | 4 ++-- v2/pkg/parser/globals.d.template | 2 +- v2/pkg/parser/package.json | 2 +- 9 files changed, 21 insertions(+), 22 deletions(-) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/App.svelte b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/App.svelte index 6f5db445..f4e7df98 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/App.svelte +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/App.svelte @@ -3,7 +3,7 @@ let greeting = ""; function greet() { - window.backend.main.App.Greet(name).then((result) => { + window.go.main.App.Greet(name).then((result) => { greeting = result; }); } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/main.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/main.js index 42855db2..5a3f0ff8 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/main.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/main.js @@ -1,4 +1,3 @@ - import {ready} from '@wails/runtime'; ready( () => { @@ -13,7 +12,7 @@ ready( () => { let name = nameElement.value; // Call App.Greet(name) - window.backend.main.App.Greet(name).then((result) => { + window.go.main.App.Greet(name).then((result) => { // Update result with data back from App.Greet() document.getElementById("result").innerText = result; }); diff --git a/v2/internal/binding/generate.go b/v2/internal/binding/generate.go index 30fcc0a0..5babd6ad 100644 --- a/v2/internal/binding/generate.go +++ b/v2/internal/binding/generate.go @@ -24,7 +24,7 @@ func (b *Bindings) GenerateBackendJS(targetfile string) error { // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT -const backend = {`) +const go = {`) output.WriteString("\n") var sortedPackageNames slicer.StringSlicer @@ -82,7 +82,7 @@ const backend = {`) argsString := args.Join(", ") output.WriteString(fmt.Sprintf(" \"%s\": (%s) => {", methodName, argsString)) output.WriteString("\n") - output.WriteString(fmt.Sprintf(" return window.backend.%s.%s.%s(%s);", packageName, structName, methodName, argsString)) + output.WriteString(fmt.Sprintf(" return window.go.%s.%s.%s(%s);", packageName, structName, methodName, argsString)) output.WriteString("\n") output.WriteString(fmt.Sprintf(" },")) output.WriteString("\n") @@ -98,7 +98,7 @@ const backend = {`) }) output.WriteString(`}; -export default backend;`) +export default go;`) output.WriteString("\n") dir := filepath.Dir(targetfile) diff --git a/v2/internal/frontend/runtime/desktop/bindings.js b/v2/internal/frontend/runtime/desktop/bindings.js index 69478371..fe3623cd 100644 --- a/v2/internal/frontend/runtime/desktop/bindings.js +++ b/v2/internal/frontend/runtime/desktop/bindings.js @@ -11,7 +11,7 @@ The electron alternative for Go import {Call} from './calls'; -window.backend = {}; +window.go = {}; export function SetBindings(bindingsMap) { try { @@ -20,24 +20,24 @@ export function SetBindings(bindingsMap) { console.error(e); } - // Initialise the backend map - window.backend = window.backend || {}; + // Initialise the bindings map + window.go = window.go || {}; // Iterate package names Object.keys(bindingsMap).forEach((packageName) => { // Create inner map if it doesn't exist - window.backend[packageName] = window.backend[packageName] || {}; + window.go[packageName] = window.go[packageName] || {}; // Iterate struct names Object.keys(bindingsMap[packageName]).forEach((structName) => { // Create inner map if it doesn't exist - window.backend[packageName][structName] = window.backend[packageName][structName] || {}; + window.go[packageName][structName] = window.go[packageName][structName] || {}; Object.keys(bindingsMap[packageName][structName]).forEach((methodName) => { - window.backend[packageName][structName][methodName] = function () { + window.go[packageName][structName][methodName] = function () { // No timeout by default let timeout = 0; diff --git a/v2/internal/parse/parse.go b/v2/internal/parse/parse.go index cadbc2f8..0d897ff5 100644 --- a/v2/internal/parse/parse.go +++ b/v2/internal/parse/parse.go @@ -414,7 +414,7 @@ func ParseProject(projectPath string) (BoundStructs, error) { inputNames = inputNames[:len(inputNames)-2] } println(" ", m.Name+": function("+inputNames+") {") - println(" return window.backend." + s.Name + "." + m.Name + "(" + inputNames + ");") + println(" return window.go." + s.Name + "." + m.Name + "(" + inputNames + ");") print(" }") if methodCount < noOfMethods-1 { print(",") diff --git a/v2/internal/runtime/js/core/bindings.js b/v2/internal/runtime/js/core/bindings.js index a5209d30..368166ce 100644 --- a/v2/internal/runtime/js/core/bindings.js +++ b/v2/internal/runtime/js/core/bindings.js @@ -11,7 +11,7 @@ The electron alternative for Go import {Call} from './calls'; -window.backend = {}; +window.go = {}; /** @@ -46,23 +46,23 @@ export function SetBindings(bindingsMap) { } // Initialise the backend map - window.backend = window.backend || {}; + window.go = window.go || {}; // Iterate package names Object.keys(bindingsMap).forEach((packageName) => { // Create inner map if it doesn't exist - window.backend[packageName] = window.backend[packageName] || {}; + window.go[packageName] = window.go[packageName] || {}; // Iterate struct names Object.keys(bindingsMap[packageName]).forEach((structName) => { // Create inner map if it doesn't exist - window.backend[packageName][structName] = window.backend[packageName][structName] || {}; + window.go[packageName][structName] = window.go[packageName][structName] || {}; Object.keys(bindingsMap[packageName][structName]).forEach((methodName) => { - window.backend[packageName][structName][methodName] = function () { + window.go[packageName][structName][methodName] = function () { // No timeout by default let timeout = 0; diff --git a/v2/internal/runtime/js/core/main.js b/v2/internal/runtime/js/core/main.js index 90ab7341..3971cfc9 100644 --- a/v2/internal/runtime/js/core/main.js +++ b/v2/internal/runtime/js/core/main.js @@ -16,8 +16,8 @@ import {AddIPCListener, SendMessage} from 'ipc'; import * as Platform from 'platform'; export function Init() { - // Backend is where the Go struct wrappers get bound to - window.backend = {}; + // Where the Go struct wrappers get bound to + window.go = {}; // Initialise global if not already window.wails = { diff --git a/v2/pkg/parser/globals.d.template b/v2/pkg/parser/globals.d.template index 2309600a..acf85a7a 100644 --- a/v2/pkg/parser/globals.d.template +++ b/v2/pkg/parser/globals.d.template @@ -4,7 +4,7 @@ interface Window { - backend: { + go: { {{- range . }}{{$packageName:=.Name}} {{- if .HasBoundStructs }} diff --git a/v2/pkg/parser/package.json b/v2/pkg/parser/package.json index ab37717c..5d0ddb82 100644 --- a/v2/pkg/parser/package.json +++ b/v2/pkg/parser/package.json @@ -1,5 +1,5 @@ { - "name": "backend", + "name": "go", "version": "1.0.0", "description": "Auto generated module wrapping your Wails backend", "main": "index.js",