github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 03:09:17 +08:00
Code Projects Activity

v3 parser: fix last failing test case

Browse Source
This commit is contained in:
Adam Tenderholt 2023-03-13 06:22:18 -07:00
parent 1c9a52463b
commit 66509cfb0b
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
v3/internal/parser/parser.go
View File

@ -97,19 +97,32 @@ func (f *Field) TSBuild(pkg string) string {
return fmt.Sprintf("source['%s']", f.JSName())
}
return fmt.Sprintf("%s.%s.createFrom(source['%s'])", pkgAlias(f.Type.Package), f.Name, f.JSName())
if f.Type.Package == "" || f.Type.Package == pkg {
return fmt.Sprintf("%s.createFrom(source['%s'])", f.Type.Name, f.JSName())
}
return fmt.Sprintf("%s.%s.createFrom(source['%s'])", pkgAlias(f.Type.Package), f.Type.Name, f.JSName())
}
func (f *Field) JSDef(pkg string) string {
name := f.JSName()
var jsType string
switch f.Type.Name {
case "int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64", "uintptr", "float32", "float64":
jsType = "number"
case "string":
jsType = "string"
case "bool":
jsType = "boolean"
default:
jsType = f.Type.Name
}
var result string
if f.Type.Package == "" || f.Type.Package == pkg {
result += fmt.Sprintf("%s: %s;", name, f.Type.Name)
result += fmt.Sprintf("%s: %s;", f.JSName(), jsType)
} else {
parts := strings.Split(f.Type.Package, "/")
result += fmt.Sprintf("%s: %s.%s;", name, parts[len(parts)-1], f.Type.Name)
result += fmt.Sprintf("%s: %s.%s;", f.JSName(), parts[len(parts)-1], jsType)
}
if !ast.IsExported(f.Name) {

4
v3/internal/parser/testdata/struct_literal_single/models.ts vendored
View File

@ -20,7 +20,7 @@ export namespace main {
this.name = source['name'];
this.parent = Person.createFrom(source['parent']);
this.details = source['details'];
this.details = anon1.createFrom(source['details']);
}
}
@ -39,7 +39,7 @@ export namespace main {
}
this.age = source['age'];
this.address = source['address'];
this.address = anon2.createFrom(source['address']);
}
}