fix: import_type_methods: export wrapper type methods (#95)

Signed-off-by: Christian Stewart <christian@aperture.us>

Author: paralin

compiler/compiler.go

@@ -434,6 +434,24 @@ func (c *PackageCompiler) generateIndexFile(compiledFiles []string) error {
 				case *ast.FuncDecl:
 					if d.Recv == nil && d.Name.IsExported() {
 						valueSymbols = append(valueSymbols, sanitizeIdentifier(d.Name.Name))
+					} else if d.Recv != nil && len(d.Recv.List) == 1 && d.Name.IsExported() {
+						recvField := d.Recv.List[0]
+						recvTypeExpr := recvField.Type
+						if star, ok := recvTypeExpr.(*ast.StarExpr); ok {
+							recvTypeExpr = star.X
+						}
+						if ident, ok := recvTypeExpr.(*ast.Ident); ok {
+							typeObj := c.pkg.TypesInfo.ObjectOf(ident)
+							if typeObj != nil && typeObj.Exported() {
+								if typeName, ok := typeObj.(*types.TypeName); ok {
+									underlying := typeName.Type().Underlying()
+									if _, isStruct := underlying.(*types.Struct); !isStruct {
+										methodName := sanitizeIdentifier(ident.Name + "_" + d.Name.Name)
+										valueSymbols = append(valueSymbols, methodName)
+									}
+								}
+							}
+						}
 					}
 				case *ast.GenDecl:
 					for _, spec := range d.Specs {

compliance/tests/import_type_methods/errlist/errlist.go

@@ -2,14 +2,6 @@ package errlist
 
 type ErrorList []string
 
-func (p *ErrorList) Add(msg string) {
-	*p = append(*p, msg)
-}
-
-type AStruct struct {
-	Msg string
-}
-
-func (a *AStruct) Set(msg string) {
-	a.Msg = msg
+func (p ErrorList) Add(msg string) ErrorList {
+	return append(p, msg)
 }

compliance/tests/import_type_methods/errlist/errlist.gs.ts

@@ -5,49 +5,8 @@ import * as $ from "@goscript/builtin/index.js";
 
 export type ErrorList = $.Slice<string>;
 
-export function ErrorList_Add(p: ErrorList, msg: string): void {
-	p!.value = $.append(p!.value, msg)
+export function ErrorList_Add(p: ErrorList, msg: string): ErrorList {
+	return $.append(p, msg)
 }
 
 
-export class AStruct {
-	public get Msg(): string {
-		return this._fields.Msg.value
-	}
-	public set Msg(value: string) {
-		this._fields.Msg.value = value
-	}
-
-	public _fields: {
-		Msg: $.VarRef<string>;
-	}
-
-	constructor(init?: Partial<{Msg?: string}>) {
-		this._fields = {
-			Msg: $.varRef(init?.Msg ?? "")
-		}
-	}
-
-	public clone(): AStruct {
-		const cloned = new AStruct()
-		cloned._fields = {
-			Msg: $.varRef(this._fields.Msg.value)
-		}
-		return cloned
-	}
-
-	public Set(msg: string): void {
-		const a = this
-		a.Msg = msg
-	}
-
-	// Register this type with the runtime type system
-	static __typeInfo = $.registerStructType(
-	  'AStruct',
-	  new AStruct(),
-	  [{ name: "Set", args: [{ name: "msg", type: { kind: $.TypeKind.Basic, name: "string" } }], returns: [] }],
-	  AStruct,
-	  {"Msg": { kind: $.TypeKind.Basic, name: "string" }}
-	);
-}
-

compliance/tests/import_type_methods/errlist/index.ts

@@ -1,2 +1,2 @@
-export { AStruct } from "./errlist.gs.js"
+export { ErrorList_Add } from "./errlist.gs.js"
 export type { ErrorList } from "./errlist.gs.js"

compliance/tests/import_type_methods/expected.log

@@ -1,3 +1 @@
-error
-astruct
-
+error

compliance/tests/import_type_methods/import_type_methods.go

@@ -5,17 +5,11 @@ import (
 )
 
 type parser struct {
-	errors  errlist.ErrorList
-	astruct errlist.AStruct
+	errors errlist.ErrorList
 }
 
 func main() {
 	var p parser
-	// this Add method does not work:
-	p.errors.Add("error")
+	p.errors = p.errors.Add("error")
 	println(p.errors[0])
-
-	// but it does work for a struct type:
-	p.astruct.Set("astruct")
-	println(p.astruct.Msg)
 }

compliance/tests/import_type_methods/import_type_methods.gs.ts

@@ -13,30 +13,20 @@ export class parser {
 		this._fields.errors.value = value
 	}
 
-	public get astruct(): errlist.AStruct {
-		return this._fields.astruct.value
-	}
-	public set astruct(value: errlist.AStruct) {
-		this._fields.astruct.value = value
-	}
-
 	public _fields: {
 		errors: $.VarRef<errlist.ErrorList>;
-		astruct: $.VarRef<errlist.AStruct>;
 	}
 
-	constructor(init?: Partial<{astruct?: errlist.AStruct, errors?: errlist.ErrorList}>) {
+	constructor(init?: Partial<{errors?: errlist.ErrorList}>) {
 		this._fields = {
-			errors: $.varRef(init?.errors ?? null as errlist.ErrorList),
-			astruct: $.varRef(init?.astruct?.clone() ?? new errlist.AStruct())
+			errors: $.varRef(init?.errors ?? null as errlist.ErrorList)
 		}
 	}
 
 	public clone(): parser {
 		const cloned = new parser()
 		cloned._fields = {
-			errors: $.varRef(this._fields.errors.value),
-			astruct: $.varRef(this._fields.astruct.value?.clone() ?? null)
+			errors: $.varRef(this._fields.errors.value)
 		}
 		return cloned
 	}
@@ -47,18 +37,13 @@ export class parser {
 	  new parser(),
 	  [],
 	  parser,
-	  {"errors": "ErrorList", "astruct": "AStruct"}
+	  {"errors": "ErrorList"}
 	);
 }
 
 export async function main(): Promise<void> {
 	let p: parser = new parser()
-	// this Add method does not work:
-	errlist.ErrorList_Add(p.errors, "error")
+	p.errors = errlist.ErrorList_Add(p.errors, "error")
 	console.log(p.errors![0])
-
-	// but it does work for a struct type:
-	p.astruct.Set("astruct")
-	console.log(p.astruct.Msg)
 }
 

compliance/tests/import_type_methods/actual.log renamed to compliance/tests/wrapper_slice_append/actual.log

@@ -0,0 +1,15 @@
+package errlist
+
+type ErrorList []string
+
+func (p *ErrorList) Add(msg string) {
+	*p = append(*p, msg)
+}
+
+type AStruct struct {
+	Msg string
+}
+
+func (a *AStruct) Set(msg string) {
+	a.Msg = msg
+}

compliance/tests/wrapper_slice_append/errlist/errlist.go

@@ -0,0 +1,53 @@
+// Generated file based on errlist/errlist.go
+// Updated when compliance tests are re-run, DO NOT EDIT!
+
+import * as $ from "@goscript/builtin/index.js";
+
+export type ErrorList = $.Slice<string>;
+
+export function ErrorList_Add(p: ErrorList, msg: string): void {
+	p!.value = $.append(p!.value, msg)
+}
+
+
+export class AStruct {
+	public get Msg(): string {
+		return this._fields.Msg.value
+	}
+	public set Msg(value: string) {
+		this._fields.Msg.value = value
+	}
+
+	public _fields: {
+		Msg: $.VarRef<string>;
+	}
+
+	constructor(init?: Partial<{Msg?: string}>) {
+		this._fields = {
+			Msg: $.varRef(init?.Msg ?? "")
+		}
+	}
+
+	public clone(): AStruct {
+		const cloned = new AStruct()
+		cloned._fields = {
+			Msg: $.varRef(this._fields.Msg.value)
+		}
+		return cloned
+	}
+
+	public Set(msg: string): void {
+		const a = this
+		a.Msg = msg
+	}
+
+	// Register this type with the runtime type system
+	static __typeInfo = $.registerStructType(
+	  'AStruct',
+	  new AStruct(),
+	  [{ name: "Set", args: [{ name: "msg", type: { kind: $.TypeKind.Basic, name: "string" } }], returns: [] }],
+	  AStruct,
+	  {"Msg": { kind: $.TypeKind.Basic, name: "string" }}
+	);
+}
+