Fix rendering of generic named class aliases

Author: fbbdev

v3/internal/parser/collect/model.go

@@ -145,6 +145,11 @@ func (info *ModelInfo) Collect() *ModelInfo {
 				// Type marshals to a custom string of unknown shape.
 				info.Type = types.Typ[types.String]
 				return
+			} else if isGeneric && !collector.options.UseInterfaces && IsClass(typ) {
+				// Generic classes cannot be defined in terms of other generic classes.
+				// That would break class creation code,
+				// and I (@fbbdev) couldn't find any other satisfying workaround.
+				def = typ.Underlying()
 			}
 
 			// Test for enums (excluding generic types).
@@ -162,11 +167,6 @@ func (info *ModelInfo) Collect() *ModelInfo {
 			}
 		}
 
-		if IsClass(typ) {
-			// Skip alias chains for classes.
-			def = types.Unalias(def)
-		}
-
 		// Record required imports.
 		info.Imports.AddType(def)
 

v3/internal/parser/render/create.go

@@ -86,11 +86,6 @@ func (m *module) JSCreateWithParams(typ types.Type, params string) string {
 
 	switch t := typ.(type) {
 	case *types.Alias:
-		if t.Obj().Pkg() == nil {
-			// Builtin alias: render underlying type.
-			return m.JSCreateWithParams(t.Underlying(), params)
-		}
-
 		return m.JSCreateWithParams(types.Unalias(typ), params)
 
 	case *types.Array:

v3/internal/parser/testdata/lang=JS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/parser/testcases/no_bindings_here/models.js

@@ -8,18 +8,56 @@ import * as other$0 from "./other/models.js";
 
 import * as $internal from "./internal.js";
 
-/**
- * HowDifferent is a curious kind of person
- * that lets other people decide how they are different.
- */
-export const HowDifferent = other$0.OtherPerson;
-
 /**
  * HowDifferent is a curious kind of person
  * that lets other people decide how they are different.
  * @template How
- * @typedef {other$0.OtherPerson<{ [_: string]: How | null }>} HowDifferent
  */
+export class HowDifferent {
+    /**
+     * Creates a new HowDifferent instance.
+     * @param {Partial<HowDifferent<How>>} [$$source = {}] - The source object to create the HowDifferent.
+     */
+    constructor($$source = {}) {
+        if (!("Name" in $$source)) {
+            /**
+             * They have a name as well.
+             * @member
+             * @type {string}
+             */
+            this["Name"] = "";
+        }
+        if (!("Differences" in $$source)) {
+            /**
+             * But they may have many differences.
+             * @member
+             * @type {{ [_: string]: How | null }[]}
+             */
+            this["Differences"] = [];
+        }
+
+        Object.assign(this, $$source);
+    }
+
+    /**
+     * Given creation functions for each type parameter,
+     * returns a creation function for a concrete instance
+     * of the generic class HowDifferent.
+     * @template How
+     * @param {(any) => How} $$createParamHow
+     * @returns {($$source?: any) => HowDifferent<How>}
+     */
+    static createFrom($$createParamHow) {
+        const $$createField1_0 = $$createType1($$createParamHow);
+        return ($$source = {}) => {
+            let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
+            if ("Differences" in $$parsedSource) {
+                $$parsedSource["Differences"] = $$createField1_0($$parsedSource["Differences"]);
+            }
+            return new HowDifferent(/** @type {Partial<HowDifferent<How>>} */($$parsedSource));
+        };
+    }
+}
 
 /**
  * Impersonator gets their fields from other people.
@@ -72,3 +110,7 @@ export const PrivatePerson = $internal.personImpl;
  * PrivatePerson gets their fields from hidden sources.
  * @typedef {$internal.personImpl} PrivatePerson
  */
+
+// Private type creation functions
+const $$createType0 = ($$createParamHow) => $Create.Map($Create.Any, $$createParamHow);
+const $$createType1 = ($$createParamHow) => $Create.Array($$createType0($$createParamHow));

v3/internal/parser/testdata/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/parser/testcases/no_bindings_here/models.js

@@ -8,18 +8,56 @@ import * as other$0 from "./other/models.js";
 
 import * as $internal from "./internal.js";
 
-/**
- * HowDifferent is a curious kind of person
- * that lets other people decide how they are different.
- */
-export const HowDifferent = other$0.OtherPerson;
-
 /**
  * HowDifferent is a curious kind of person
  * that lets other people decide how they are different.
  * @template How
- * @typedef {other$0.OtherPerson<{ [_: string]: How | null }>} HowDifferent
  */
+export class HowDifferent {
+    /**
+     * Creates a new HowDifferent instance.
+     * @param {Partial<HowDifferent<How>>} [$$source = {}] - The source object to create the HowDifferent.
+     */
+    constructor($$source = {}) {
+        if (!("Name" in $$source)) {
+            /**
+             * They have a name as well.
+             * @member
+             * @type {string}
+             */
+            this["Name"] = "";
+        }
+        if (!("Differences" in $$source)) {
+            /**
+             * But they may have many differences.
+             * @member
+             * @type {{ [_: string]: How | null }[]}
+             */
+            this["Differences"] = [];
+        }
+
+        Object.assign(this, $$source);
+    }
+
+    /**
+     * Given creation functions for each type parameter,
+     * returns a creation function for a concrete instance
+     * of the generic class HowDifferent.
+     * @template How
+     * @param {(any) => How} $$createParamHow
+     * @returns {($$source?: any) => HowDifferent<How>}
+     */
+    static createFrom($$createParamHow) {
+        const $$createField1_0 = $$createType1($$createParamHow);
+        return ($$source = {}) => {
+            let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
+            if ("Differences" in $$parsedSource) {
+                $$parsedSource["Differences"] = $$createField1_0($$parsedSource["Differences"]);
+            }
+            return new HowDifferent(/** @type {Partial<HowDifferent<How>>} */($$parsedSource));
+        };
+    }
+}
 
 /**
  * Impersonator gets their fields from other people.
@@ -72,3 +110,7 @@ export const PrivatePerson = $internal.personImpl;
  * PrivatePerson gets their fields from hidden sources.
  * @typedef {$internal.personImpl} PrivatePerson
  */
+
+// Private type creation functions
+const $$createType0 = ($$createParamHow) => $Create.Map($Create.Any, $$createParamHow);
+const $$createType1 = ($$createParamHow) => $Create.Array($$createType0($$createParamHow));

v3/internal/parser/testdata/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/parser/testcases/no_bindings_here/models.ts

@@ -11,13 +11,45 @@ import * as $internal from "./internal.ts";
  * HowDifferent is a curious kind of person
  * that lets other people decide how they are different.
  */
-export const HowDifferent = other$0.OtherPerson;
+export class HowDifferent<How> {
+    /**
+     * They have a name as well.
+     */
+    "Name": string;
 
-/**
- * HowDifferent is a curious kind of person
- * that lets other people decide how they are different.
- */
-export type HowDifferent<How> = other$0.OtherPerson<{ [_: string]: How | null }>;
+    /**
+     * But they may have many differences.
+     */
+    "Differences": { [_: string]: How | null }[];
+
+    /** Creates a new HowDifferent instance. */
+    constructor($$source: Partial<HowDifferent<How>> = {}) {
+        if (!("Name" in $$source)) {
+            this["Name"] = "";
+        }
+        if (!("Differences" in $$source)) {
+            this["Differences"] = [];
+        }
+
+        Object.assign(this, $$source);
+    }
+
+    /**
+     * Given creation functions for each type parameter,
+     * returns a creation function for a concrete instance
+     * of the generic class HowDifferent.
+     */
+    static createFrom<How>($$createParamHow: (any) => How): ($$source?: any) => HowDifferent<How> {
+        const $$createField1_0 = $$createType1($$createParamHow);
+        return ($$source: any = {}) => {
+            let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
+            if ("Differences" in $$parsedSource) {
+                $$parsedSource["Differences"] = $$createField1_0($$parsedSource["Differences"]);
+            }
+            return new HowDifferent<How>($$parsedSource as Partial<HowDifferent<How>>);
+        };
+    }
+}
 
 /**
  * Impersonator gets their fields from other people.
@@ -65,3 +97,7 @@ export const PrivatePerson = $internal.personImpl;
  * PrivatePerson gets their fields from hidden sources.
  */
 export type PrivatePerson = $internal.personImpl;
+
+// Private type creation functions
+const $$createType0 = ($$createParamHow) => $Create.Map($Create.Any, $$createParamHow);
+const $$createType1 = ($$createParamHow) => $Create.Array($$createType0($$createParamHow));

v3/internal/parser/testdata/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/parser/testcases/no_bindings_here/models.ts

@@ -11,13 +11,45 @@ import * as $internal from "./internal.ts";
  * HowDifferent is a curious kind of person
  * that lets other people decide how they are different.
  */
-export const HowDifferent = other$0.OtherPerson;
+export class HowDifferent<How> {
+    /**
+     * They have a name as well.
+     */
+    "Name": string;
 
-/**
- * HowDifferent is a curious kind of person
- * that lets other people decide how they are different.
- */
-export type HowDifferent<How> = other$0.OtherPerson<{ [_: string]: How | null }>;
+    /**
+     * But they may have many differences.
+     */
+    "Differences": { [_: string]: How | null }[];
+
+    /** Creates a new HowDifferent instance. */
+    constructor($$source: Partial<HowDifferent<How>> = {}) {
+        if (!("Name" in $$source)) {
+            this["Name"] = "";
+        }
+        if (!("Differences" in $$source)) {
+            this["Differences"] = [];
+        }
+
+        Object.assign(this, $$source);
+    }
+
+    /**
+     * Given creation functions for each type parameter,
+     * returns a creation function for a concrete instance
+     * of the generic class HowDifferent.
+     */
+    static createFrom<How>($$createParamHow: (any) => How): ($$source?: any) => HowDifferent<How> {
+        const $$createField1_0 = $$createType1($$createParamHow);
+        return ($$source: any = {}) => {
+            let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
+            if ("Differences" in $$parsedSource) {
+                $$parsedSource["Differences"] = $$createField1_0($$parsedSource["Differences"]);
+            }
+            return new HowDifferent<How>($$parsedSource as Partial<HowDifferent<How>>);
+        };
+    }
+}
 
 /**
  * Impersonator gets their fields from other people.
@@ -65,3 +97,7 @@ export const PrivatePerson = $internal.personImpl;
  * PrivatePerson gets their fields from hidden sources.
  */
 export type PrivatePerson = $internal.personImpl;
+
+// Private type creation functions
+const $$createType0 = ($$createParamHow) => $Create.Map($Create.Any, $$createParamHow);
+const $$createType1 = ($$createParamHow) => $Create.Array($$createType0($$createParamHow));