waveterm/wails
0
0
Fork 0
mirror of https://github.com/wavetermdev/wails.git synced 2026-08-05 13:53:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

[v3] Fix binding generator output and import paths (#3334)

Browse Source 
* Fix relative import path computation

* Fix models output path

* Add option to generate bindings using bundled runtime

* Update binding example

* Fix testdata

* Update changelog

---------

Co-authored-by: Lea Anthony <lea.anthony@gmail.com>
This commit is contained in:
Fabio Massaioli
2024-03-22 21:18:04 +11:00
committed by GitHub
co-authored by Lea Anthony
parent f0986a6441
commit 45b2681dfc
56 changed files with 364 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v3/internal/parser/parser.go
+42 -19
View File
@@ -351,27 +351,32 @@ func GenerateBindingsAndModels(options *flags.GenerateBindingsOptions) (*Project
if err != nil {
return p, err
}
p.outputDirectory = options.OutputDirectory
for _, pkg := range p.BoundMethods {
for _, boundMethods := range pkg {
p.Stats.NumMethods += len(boundMethods)
}
}
generatedMethods := p.GenerateBindings(p.BoundMethods, options.UseIDs, options.TS)
for pkg, structs := range generatedMethods {
generatedMethods := p.GenerateBindings(p.BoundMethods, options.ModelsFilename, options.UseIDs, options.TS, options.UseBundledRuntime)
for pkgDir, structs := range generatedMethods {
// Write the directory
err = os.MkdirAll(filepath.Join(options.OutputDirectory, pkg), 0755)
err = os.MkdirAll(filepath.Join(options.OutputDirectory, pkgDir), 0755)
if err != nil && !os.IsExist(err) {
return p, err
}
// Write the files
for structName, text := range structs {
p.Stats.NumStructs++
filename := structName + ".js"
var filename string
if options.TS {
filename = structName + ".ts"
} else {
filename = structName + ".js"
}
err = os.WriteFile(filepath.Join(options.OutputDirectory, pkg, filename), []byte(text), 0644)
err = os.WriteFile(filepath.Join(options.OutputDirectory, pkgDir, filename), []byte(text), 0644)
if err != nil {
return p, err
}
@@ -387,12 +392,20 @@ func GenerateBindingsAndModels(options *flags.GenerateBindingsOptions) (*Project
if err != nil {
return p, err
}
for pkg, text := range generatedModels {
// Get directory for package
pkgInfo := p.packageCache[pkg]
relativePackageDir := p.RelativeBindingsDir(pkgInfo, pkgInfo)
for pkgDir, text := range generatedModels {
// Write the directory
err = os.WriteFile(filepath.Join(options.OutputDirectory, relativePackageDir, options.ModelsFilename), []byte(text), 0644)
err = os.MkdirAll(filepath.Join(options.OutputDirectory, pkgDir), 0755)
if err != nil && !os.IsExist(err) {
return p, err
}
// Write the file
var filename string
if options.TS {
filename = options.ModelsFilename + ".ts"
} else {
filename = options.ModelsFilename + ".js"
}
err = os.WriteFile(filepath.Join(options.OutputDirectory, pkgDir, filename), []byte(text), 0644)
}
if err != nil {
return p, err
@@ -1175,25 +1188,35 @@ func (p *Project) parseTypes(pkgs map[string]*ParsedPackage) {
}
func (p *Project) RelativeBindingsDir(dir *ParsedPackage, dir2 *ParsedPackage) string {
if dir.Dir == dir2.Dir {
return "."
}
// Calculate the relative path from the bindings directory to the package directory
absoluteSourceDir := dir.Dir
if absoluteSourceDir == p.Path {
// Calculate the relative path from the bindings directory of dir to that of dir2
var (
absoluteSourceDir string
absoluteTargetDir string
)
if dir.Dir == p.Path {
absoluteSourceDir = filepath.Join(p.Path, p.outputDirectory, "main")
} else {
absoluteSourceDir = dir.Dir
relativeSourceDir := strings.TrimPrefix(dir.Dir, p.Path)
absoluteSourceDir = filepath.Join(p.Path, p.outputDirectory, relativeSourceDir)
}
targetRelativeDir := strings.TrimPrefix(dir2.Dir, p.Path)
targetBindingsDir := filepath.Join(p.Path, p.outputDirectory, targetRelativeDir)
// Calculate the relative path from the source directory to the target directory
relativePath, err := filepath.Rel(absoluteSourceDir, targetBindingsDir)
if dir2.Dir == p.Path {
absoluteTargetDir = filepath.Join(p.Path, p.outputDirectory, "main")
} else {
relativeTargetDir := strings.TrimPrefix(dir2.Dir, p.Path)
absoluteTargetDir = filepath.Join(p.Path, p.outputDirectory, relativeTargetDir)
}
relativePath, err := filepath.Rel(absoluteSourceDir, absoluteTargetDir)
if err != nil {
panic(err)
}
return filepath.ToSlash(relativePath)
}