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

Fix creation function types

Browse Source
This commit is contained in:
Fabio Massaioli 2025-02-26 16:41:51 +01:00
parent 6c34e74f0a
commit 5da789c24f
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
v3/internal/generator/render/info.go
View File

@ -50,11 +50,14 @@ func modelinfo(model *collect.ModelInfo, useInterfaces bool) (info modelInfo) {
createList.WriteRune('(')
for i, param := range model.TypeParams {
param = typeparam(i, param)
if i > 0 {
params.WriteRune(',')
paramList.WriteString(", ")
createList.WriteString(", ")
}
params.WriteString(param)
paramList.WriteString(param)

5
v3/internal/generator/render/templates/models.js.tmpl
View File

@ -147,7 +147,10 @@ export class {{jsid $model.Name}} {
* Given creation functions for each type parameter,
* returns a creation function for a concrete instance
* of the generic class {{jsid $model.Name}}.
* @template {{$template.Params}}
{{- range $i, $param := $model.TypeParams}}
{{- $param = (typeparam $i $param)}}
* @template [{{$param}}=any]
{{- end}}
{{- range $i, $param := $model.TypeParams}}
{{- $param = (typeparam $i $param)}}
* @param {(source: any) => {{$param -}} } $$createParam{{$param}}

7
v3/internal/generator/render/templates/models.ts.tmpl
View File

@ -139,7 +139,12 @@ export {{if $info.IsInterface}}interface{{else}}class{{end}} {{jsid $model.Name}
* Creates a new {{jsid $model.Name}} instance from a string or object.
{{- end}}
*/
static createFrom{{$template.ParamList}}({{if $template.ParamList}}
static createFrom{{if $template.ParamList}}<
{{- range $i, $param := $model.TypeParams}}
{{- $param = (typeparam $i $param)}}
{{- if gt $i 0}}, {{end -}}
{{$param}} = any
{{- end}}>{{end}}({{if $template.ParamList}}
{{- range $i, $param := $model.TypeParams}}
{{- $param = (typeparam $i $param)}}
{{- if gt $i 0}}, {{end -}}

15
v3/internal/runtime/desktop/@wailsio/runtime/src/create.ts
View File

@ -11,7 +11,7 @@ The electron alternative for Go
/**
* Any is a dummy creation function for simple or unknown types.
*/
export function Any<T>(source: any): T {
export function Any<T = any>(source: any): T {
return source;
}
@ -28,7 +28,7 @@ export function ByteSlice(source: any): string {
* and returns an in-place creation function for an array
* whose elements are of that type.
*/
export function Array<T>(element: (source: any) => T): (source: any) => T[] {
export function Array<T = any>(element: (source: any) => T): (source: any) => T[] {
if (element === Any) {
return (source) => (source === null ? [] : source);
}
@ -49,7 +49,7 @@ export function Array<T>(element: (source: any) => T): (source: any) => T[] {
* and returns an in-place creation function for an object
* whose keys and values are of those types.
*/
export function Map<V>(key: (source: any) => string, value: (source: any) => V): (source: any) => Record<string, V> {
export function Map<V = any>(key: (source: any) => string, value: (source: any) => V): (source: any) => Record<string, V> {
if (value === Any) {
return (source) => (source === null ? {} : source);
}
@ -69,7 +69,7 @@ export function Map<V>(key: (source: any) => string, value: (source: any) => V):
* Nullable takes a creation function for an arbitrary type
* and returns a creation function for a nullable value of that type.
*/
export function Nullable<T>(element: (source: any) => T): (source: any) => (T | null) {
export function Nullable<T = any>(element: (source: any) => T): (source: any) => (T | null) {
if (element === Any) {
return Any;
}
@ -81,10 +81,9 @@ export function Nullable<T>(element: (source: any) => T): (source: any) => (T |
* Struct takes an object mapping field names to creation functions
* and returns an in-place creation function for a struct.
*/
export function Struct<
T extends { [_: string]: ((source: any) => any) },
U extends { [Key in keyof T]?: ReturnType<T[Key]> }
>(createField: T): (source: any) => U {
export function Struct(createField: Record<string, (source: any) => any>):
<U extends Record<string, any> = any>(source: any) => U
{
let allAny = true;
for (const name in createField) {
if (createField[name] !== Any) {