goscript 0.0.44 → 0.0.47

package/compiler/expr.go

@@ -251,6 +251,113 @@ func (c *GoToTSCompiler) getTypeNameString(typeExpr ast.Expr) string {
 	return "unknown"
 }
 
+// getFinalUnderlyingType traverses the chain of named types to find the ultimate underlying type.
+// This handles cases like: type A B; type B C; type C string.
+// Returns the final underlying type and whether the original type was a named type.
+func (c *GoToTSCompiler) getFinalUnderlyingType(t types.Type) (types.Type, bool) {
+	if t == nil {
+		return nil, false
+	}
+
+	// Check if this is a named type
+	namedType, isNamed := t.(*types.Named)
+	if !isNamed {
+		return t, false
+	}
+
+	// Follow the chain of named types to find the ultimate underlying type
+	ultimate := namedType
+	for {
+		underlying := ultimate.Underlying()
+		if underlyingNamed, isNamedUnderlying := underlying.(*types.Named); isNamedUnderlying {
+			// Continue following the chain
+			ultimate = underlyingNamed
+		} else {
+			// We've reached the final underlying type
+			return underlying, true
+		}
+	}
+}
+
+// isNamedNumericType checks if a given type is a named type with an underlying numeric type.
+func (c *GoToTSCompiler) isNamedNumericType(t types.Type) bool {
+	finalType, wasNamed := c.getFinalUnderlyingType(t)
+	if !wasNamed {
+		return false
+	}
+
+	if basicType, isBasic := finalType.(*types.Basic); isBasic {
+		info := basicType.Info()
+		return (info&types.IsInteger) != 0 || (info&types.IsFloat) != 0
+	}
+
+	return false
+}
+
+// isWrapperType checks if a type is implemented as a wrapper class with valueOf() method
+// This is true for named types that have methods defined on them
+func (c *GoToTSCompiler) isWrapperType(t types.Type) bool {
+	if t == nil {
+		return false
+	}
+
+	// Follow any type aliases to get to the actual named type
+	namedType, ok := t.(*types.Named)
+	if !ok {
+		return false
+	}
+
+	// If the named type has methods, it's implemented as a class with valueOf()
+	numMethods := namedType.NumMethods()
+	return numMethods > 0
+}
+
+// needsValueOfForBitwiseOp checks if an operand in a bitwise operation needs .valueOf() to be called
+// This is needed for custom types (like FileMode) that have a valueOf() method and need to be treated as numbers
+func (c *GoToTSCompiler) needsValueOfForBitwiseOp(expr ast.Expr) bool {
+	if c.pkg == nil || c.pkg.TypesInfo == nil {
+		return false
+	}
+
+	exprType := c.pkg.TypesInfo.TypeOf(expr)
+	if exprType == nil {
+		return false
+	}
+
+	// Don't add valueOf() for basic literals (numeric, string, bool literals)
+	switch expr.(type) {
+	case *ast.BasicLit:
+		return false
+	}
+
+	// Check if this is a compile-time constant of a primitive type
+	if tv, ok := c.pkg.TypesInfo.Types[expr]; ok {
+		if tv.Value != nil {
+			// This is a constant expression - but only skip valueOf() if it's truly a primitive type
+			// (not a named type with methods that happens to be constant)
+			if _, isBasic := exprType.(*types.Basic); isBasic {
+				// Primitive constant, don't add valueOf()
+				return false
+			}
+		}
+	}
+
+	// Check if this type is implemented as a wrapper class with valueOf()
+	return c.isWrapperType(exprType)
+}
+
+// writeBitwiseOperand writes an operand for a bitwise operation, adding .valueOf() if needed
+func (c *GoToTSCompiler) writeBitwiseOperand(expr ast.Expr) error {
+	if c.needsValueOfForBitwiseOp(expr) {
+		if err := c.WriteValueExpr(expr); err != nil {
+			return err
+		}
+		c.tsw.WriteLiterally(".valueOf()")
+		return nil
+	}
+	return c.WriteValueExpr(expr)
+}
+
 // WriteBinaryExpr translates a Go binary expression (`ast.BinaryExpr`) into its
 // TypeScript equivalent.
 // It handles several cases:
@@ -435,8 +542,15 @@ func (c *GoToTSCompiler) WriteBinaryExpr(exp *ast.BinaryExpr) error {
 		c.tsw.WriteLiterally("(") // Add opening parenthesis for bitwise operations
 	}
 
-	if err := c.WriteValueExpr(exp.X); err != nil {
-		return fmt.Errorf("failed to write binary expression left operand: %w", err)
+	// For bitwise operations, use special operand writing that adds .valueOf() when needed
+	if isBitwise {
+		if err := c.writeBitwiseOperand(exp.X); err != nil {
+			return fmt.Errorf("failed to write binary expression left operand: %w", err)
+		}
+	} else {
+		if err := c.WriteValueExpr(exp.X); err != nil {
+			return fmt.Errorf("failed to write binary expression left operand: %w", err)
+		}
 	}
 	c.tsw.WriteLiterally(" ")
 	tokStr, ok := TokenToTs(exp.Op)
@@ -446,8 +560,16 @@ func (c *GoToTSCompiler) WriteBinaryExpr(exp *ast.BinaryExpr) error {
 
 	c.tsw.WriteLiterally(tokStr)
 	c.tsw.WriteLiterally(" ")
-	if err := c.WriteValueExpr(exp.Y); err != nil {
-		return fmt.Errorf("failed to write binary expression right operand: %w", err)
+
+	// For bitwise operations, use special operand writing that adds .valueOf() when needed
+	if isBitwise {
+		if err := c.writeBitwiseOperand(exp.Y); err != nil {
+			return fmt.Errorf("failed to write binary expression right operand: %w", err)
+		}
+	} else {
+		if err := c.WriteValueExpr(exp.Y); err != nil {
+			return fmt.Errorf("failed to write binary expression right operand: %w", err)
+		}
 	}
 
 	if isBitwise {

package/compiler/spec-struct.go

@@ -63,7 +63,7 @@ func (c *GoToTSCompiler) WriteStructTypeSpec(a *ast.TypeSpec, t *ast.StructType)
 			if fieldType == nil {
 				fieldType = types.Typ[types.Invalid]
 			}
-			c.writeGetterSetter(fieldName, fieldType, field.Doc, field.Comment)
+			c.writeGetterSetter(fieldName, fieldType, field.Doc, field.Comment, field.Type)
 		}
 	}
 
@@ -72,7 +72,17 @@ func (c *GoToTSCompiler) WriteStructTypeSpec(a *ast.TypeSpec, t *ast.StructType)
 		field := underlyingStruct.Field(i)
 		if field.Anonymous() {
 			fieldKeyName := c.getEmbeddedFieldKeyName(field.Type())
-			c.writeGetterSetter(fieldKeyName, field.Type(), nil, nil)
+			c.writeGetterSetter(fieldKeyName, field.Type(), nil, nil, nil)
+		}
+	}
+
+	// Create a mapping from field names to AST types for preserving qualified names
+	fieldASTTypes := make(map[string]ast.Expr)
+	for _, field := range t.Fields.List {
+		if len(field.Names) > 0 {
+			for _, name := range field.Names {
+				fieldASTTypes[name.Name] = field.Type
+			}
 		}
 	}
 
@@ -93,14 +103,17 @@ func (c *GoToTSCompiler) WriteStructTypeSpec(a *ast.TypeSpec, t *ast.StructType)
 		if fieldKeyName == "_" {
 			continue
 		}
-		fieldTsType := c.getTypeString(field.Type())
+
+		// Use AST-based type string when available, fall back to types-based
+		astType := fieldASTTypes[fieldKeyName]
+		fieldTsType := c.getASTTypeString(astType, field.Type())
 		c.tsw.WriteLinef("%s: $.VarRef<%s>;", fieldKeyName, fieldTsType)
 	}
 	c.tsw.Indent(-1)
 	c.tsw.WriteLine("}")
 
 	// Generate the flattened type string for the constructor init parameter
-	flattenedInitType := c.generateFlattenedInitTypeString(goStructType)
+	flattenedInitType := c.generateFlattenedInitTypeString(goStructType, fieldASTTypes)
 
 	c.tsw.WriteLine("")
 	c.tsw.WriteLinef("constructor(init?: Partial<%s>) {", flattenedInitType)
@@ -132,7 +145,7 @@ func (c *GoToTSCompiler) WriteStructTypeSpec(a *ast.TypeSpec, t *ast.StructType)
 				c.tsw.WriteLine(",")
 			}
 
-			c.writeVarRefedFieldInitializer(fieldKeyName, fieldType, field.Anonymous())
+			c.writeVarRefedFieldInitializer(fieldKeyName, fieldType, field.Anonymous(), fieldASTTypes[fieldKeyName])
 			firstFieldWritten = true
 		}
 		if firstFieldWritten {
@@ -300,12 +313,28 @@ func (c *GoToTSCompiler) WriteStructTypeSpec(a *ast.TypeSpec, t *ast.StructType)
 					c.tsw.WriteLine("")
 					c.tsw.WriteLinef("public get %s(): %s {", promotedFieldName, tsPromotedFieldType)
 					c.tsw.Indent(1)
-					c.tsw.WriteLinef("return this.%s.%s", embeddedFieldKeyName, promotedFieldName)
+					// Check if the embedded type is an interface and add null assertion
+					embeddedFieldTypeUnderlying := embeddedFieldType
+					if ptr, isPtr := embeddedFieldTypeUnderlying.(*types.Pointer); isPtr {
+						embeddedFieldTypeUnderlying = ptr.Elem()
+					}
+					if named, isNamed := embeddedFieldTypeUnderlying.(*types.Named); isNamed {
+						embeddedFieldTypeUnderlying = named.Underlying()
+					}
+					if _, isInterface := embeddedFieldTypeUnderlying.(*types.Interface); isInterface {
+						c.tsw.WriteLinef("return this.%s!.%s", embeddedFieldKeyName, promotedFieldName)
+					} else {
+						c.tsw.WriteLinef("return this.%s.%s", embeddedFieldKeyName, promotedFieldName)
+					}
 					c.tsw.Indent(-1)
 					c.tsw.WriteLine("}")
 					c.tsw.WriteLinef("public set %s(value: %s) {", promotedFieldName, tsPromotedFieldType)
 					c.tsw.Indent(1)
-					c.tsw.WriteLinef("this.%s.%s = value", embeddedFieldKeyName, promotedFieldName)
+					if _, isInterface := embeddedFieldTypeUnderlying.(*types.Interface); isInterface {
+						c.tsw.WriteLinef("this.%s!.%s = value", embeddedFieldKeyName, promotedFieldName)
+					} else {
+						c.tsw.WriteLinef("this.%s.%s = value", embeddedFieldKeyName, promotedFieldName)
+					}
 					c.tsw.Indent(-1)
 					c.tsw.WriteLine("}")
 				}
@@ -379,7 +408,13 @@ func (c *GoToTSCompiler) WriteStructTypeSpec(a *ast.TypeSpec, t *ast.StructType)
 				if results.Len() > 0 {
 					c.tsw.WriteLiterally("return ")
 				}
-				c.tsw.WriteLiterallyf("this.%s.%s(%s)", embeddedFieldKeyName, methodName, strings.Join(paramNames, ", "))
+
+				assertionPrefix := "this.%s"
+				if _, isInterface := embeddedFieldType.Underlying().(*types.Interface); isInterface {
+					assertionPrefix = "this.%s!"
+				}
+				c.tsw.WriteLiterallyf(assertionPrefix+".%s(%s)", embeddedFieldKeyName, methodName, strings.Join(paramNames, ", "))
+
 				c.tsw.WriteLine("")
 				c.tsw.Indent(-1)
 				c.tsw.WriteLine("}")
@@ -459,7 +494,7 @@ func (c *GoToTSCompiler) WriteStructTypeSpec(a *ast.TypeSpec, t *ast.StructType)
 //
 // The resulting string is sorted by field name for deterministic output and represents
 // the shape of the object expected by the struct's TypeScript constructor.
-func (c *GoToTSCompiler) generateFlattenedInitTypeString(structType *types.Named) string {
+func (c *GoToTSCompiler) generateFlattenedInitTypeString(structType *types.Named, fieldASTTypes map[string]ast.Expr) string {
 	if structType == nil {
 		return "{}"
 	}
@@ -489,39 +524,24 @@ func (c *GoToTSCompiler) generateFlattenedInitTypeString(structType *types.Named
 
 		if field.Anonymous() {
 			fieldType := field.Type()
-			isPtr := false
 			if ptr, ok := fieldType.(*types.Pointer); ok {
 				fieldType = ptr.Elem()
-				isPtr = true
 			}
 
 			if named, ok := fieldType.(*types.Named); ok {
 				embeddedName := named.Obj().Name()
-				// For embedded structs, the init type should allow providing fields of the embedded struct,
-				// or the embedded struct itself.
-				// We generate Partial<EmbeddedStructFields> | EmbeddedStructType
-				// This is complex. For now, let's use ConstructorParameters as before for simplicity,
-				// or allow the embedded struct type itself.
-				// The example `Person?: ConstructorParameters<typeof Person>[0]` is for the fields.
-				// Let's try to generate a type that allows either the embedded struct instance or its fields.
-				// This might be: `Partial<FlattenedInitType<EmbeddedName>> | EmbeddedName`
-				// For now, stick to the simpler `ConstructorParameters<typeof %s>[0]` which implies field-based init.
-				// Or, more simply, the type of the embedded struct itself if it's a pointer.
-				if isPtr {
-					embeddedTypeMap[c.getEmbeddedFieldKeyName(field.Type())] = c.getTypeString(field.Type()) // MyEmbeddedType | null
+				// Check if the embedded type is an interface
+				if _, isInterface := fieldType.Underlying().(*types.Interface); isInterface {
+					// For embedded interfaces, use the full qualified interface type
+					embeddedTypeMap[c.getEmbeddedFieldKeyName(field.Type())] = c.getTypeString(field.Type())
 				} else {
-					// For value-type embedded structs, allow initializing with its fields.
-					// This requires getting the flattened init type for the embedded struct.
-					// This could lead to recursion if not handled carefully.
-					// A simpler approach for now: use the embedded struct's own type.
-					// embeddedTypeMap[c.getEmbeddedFieldKeyName(field.Type())] = c.getTypeString(field.Type())
-					// Or, using ConstructorParameters to allow field-based initialization:
+					// For embedded structs, use ConstructorParameters for field-based initialization
 					embeddedTypeMap[c.getEmbeddedFieldKeyName(field.Type())] = fmt.Sprintf("Partial<ConstructorParameters<typeof %s>[0]>", embeddedName)
 				}
 			}
 			continue
 		}
-		fieldMap[fieldName] = c.getTypeString(field.Type())
+		fieldMap[fieldName] = c.getASTTypeString(fieldASTTypes[fieldName], field.Type())
 	}
 
 	// Promoted fields (handled by Go's embedding, init should use direct/embedded names)

package/compiler/spec.go

@@ -56,8 +56,14 @@ func (c *GoToTSCompiler) getEmbeddedFieldKeyName(fieldType types.Type) string {
 	}
 }
 
-func (c *GoToTSCompiler) writeGetterSetter(fieldName string, fieldType types.Type, doc, comment *ast.CommentGroup) {
-	fieldTypeStr := c.getTypeString(fieldType)
+func (c *GoToTSCompiler) writeGetterSetter(fieldName string, fieldType types.Type, doc, comment *ast.CommentGroup, astType ast.Expr) {
+	// Use AST type information if available to preserve qualified names
+	var fieldTypeStr string
+	if astType != nil {
+		fieldTypeStr = c.getASTTypeString(astType, fieldType)
+	} else {
+		fieldTypeStr = c.getTypeString(fieldType)
+	}
 
 	// Generate getter
 	if doc != nil {
@@ -81,16 +87,29 @@ func (c *GoToTSCompiler) writeGetterSetter(fieldName string, fieldType types.Typ
 	c.tsw.WriteLine("")
 }
 
-func (c *GoToTSCompiler) writeVarRefedFieldInitializer(fieldName string, fieldType types.Type, isEmbedded bool) {
+func (c *GoToTSCompiler) writeVarRefedFieldInitializer(fieldName string, fieldType types.Type, isEmbedded bool, astType ast.Expr) {
 	c.tsw.WriteLiterally(fieldName)
 	c.tsw.WriteLiterally(": $.varRef(")
 
 	if isEmbedded {
-		if _, isPtr := fieldType.(*types.Pointer); isPtr {
+		_, isPtr := fieldType.(*types.Pointer)
+		_, isInterface := fieldType.Underlying().(*types.Interface)
+		if isPtr || isInterface {
 			c.tsw.WriteLiterallyf("init?.%s ?? null", fieldName)
 		} else {
-			typeForNew := fieldName
-			c.tsw.WriteLiterallyf("new %s(init?.%s)", typeForNew, fieldName)
+			// Check if the embedded type is an interface
+			embeddedTypeUnderlying := fieldType
+			if named, isNamed := embeddedTypeUnderlying.(*types.Named); isNamed {
+				embeddedTypeUnderlying = named.Underlying()
+			}
+			if _, isInterface := embeddedTypeUnderlying.(*types.Interface); isInterface {
+				// For interfaces, use the provided value or null instead of trying to instantiate
+				c.tsw.WriteLiterallyf("init?.%s ?? null", fieldName)
+			} else {
+				// For structs, instantiate with provided fields
+				typeForNew := fieldName
+				c.tsw.WriteLiterallyf("new %s(init?.%s)", typeForNew, fieldName)
+			}
 		}
 	} else {
 		isStructValueType := false
@@ -106,7 +125,47 @@ func (c *GoToTSCompiler) writeVarRefedFieldInitializer(fieldName string, fieldTy
 			c.tsw.WriteLiterallyf("init?.%s?.clone() ?? new %s()", fieldName, structTypeNameForClone)
 		} else {
 			c.tsw.WriteLiterallyf("init?.%s ?? ", fieldName)
-			c.WriteZeroValueForType(fieldType)
+			// Check if this is a named type or type alias and use constructor instead of null
+			if named, isNamed := fieldType.(*types.Named); isNamed {
+				// This is a named type
+				// Check if underlying type is an interface
+				if _, isInterface := named.Underlying().(*types.Interface); isInterface {
+					// For interfaces, use null as the zero value
+					c.tsw.WriteLiterally("null")
+				} else if _, isStruct := named.Underlying().(*types.Struct); !isStruct {
+					// For non-struct, non-interface named types, use constructor
+					c.tsw.WriteLiterally("new ")
+					c.WriteNamedType(named)
+					c.tsw.WriteLiterally("(")
+					c.WriteZeroValueForType(named.Underlying())
+					c.tsw.WriteLiterally(")")
+				} else {
+					c.WriteZeroValueForType(fieldType)
+				}
+			} else if alias, isAlias := fieldType.(*types.Alias); isAlias {
+				// This is a type alias (like os.FileMode)
+				// Check if underlying type is an interface
+				if _, isInterface := alias.Underlying().(*types.Interface); isInterface {
+					// For interface type aliases, use null as the zero value
+					c.tsw.WriteLiterally("null")
+				} else if _, isStruct := alias.Underlying().(*types.Struct); !isStruct {
+					// For non-struct, non-interface type aliases, use constructor
+					c.tsw.WriteLiterally("new ")
+					// Use AST type information if available to preserve qualified names
+					if astType != nil {
+						c.WriteTypeExpr(astType)
+					} else {
+						c.WriteGoType(fieldType, GoTypeContextGeneral)
+					}
+					c.tsw.WriteLiterally("(")
+					c.WriteZeroValueForType(alias.Underlying())
+					c.tsw.WriteLiterally(")")
+				} else {
+					c.WriteZeroValueForType(fieldType)
+				}
+			} else {
+				c.WriteZeroValueForType(fieldType)
+			}
 		}
 	}
 
@@ -281,114 +340,12 @@ func (c *GoToTSCompiler) WriteNamedTypeWithMethods(a *ast.TypeSpec) error {
 
 // writeNamedTypeMethod writes a method for a named type, handling receiver binding properly
 func (c *GoToTSCompiler) writeNamedTypeMethod(decl *ast.FuncDecl) error {
-	if decl.Doc != nil {
-		c.WriteDoc(decl.Doc)
-	}
-
-	// Determine if method is async
-	var isAsync bool
-	if obj := c.pkg.TypesInfo.Defs[decl.Name]; obj != nil {
-		isAsync = c.analysis.IsAsyncFunc(obj)
-	}
-
-	// Methods are typically public in the TS output
-	c.tsw.WriteLiterally("public ")
-
-	// Add async modifier if needed
-	if isAsync {
-		c.tsw.WriteLiterally("async ")
-	}
-
-	// Keep original Go casing for method names
-	if err := c.WriteValueExpr(decl.Name); err != nil { // Method name is a value identifier
+	_, err := c.writeMethodSignature(decl)
+	if err != nil {
 		return err
 	}
 
-	// Write signature (parameters and return type)
-	funcType := decl.Type
-	c.tsw.WriteLiterally("(")
-	if funcType.Params != nil {
-		c.WriteFieldList(funcType.Params, true) // true = arguments
-	}
-	c.tsw.WriteLiterally(")")
-
-	// Handle return type
-	if funcType.Results != nil && len(funcType.Results.List) > 0 {
-		c.tsw.WriteLiterally(": ")
-		if isAsync {
-			c.tsw.WriteLiterally("Promise<")
-		}
-		if len(funcType.Results.List) == 1 {
-			// Single return value
-			resultType := funcType.Results.List[0].Type
-			c.WriteTypeExpr(resultType)
-		} else {
-			// Multiple return values -> tuple type
-			c.tsw.WriteLiterally("[")
-			for i, field := range funcType.Results.List {
-				if i > 0 {
-					c.tsw.WriteLiterally(", ")
-				}
-				c.WriteTypeExpr(field.Type)
-			}
-			c.tsw.WriteLiterally("]")
-		}
-		if isAsync {
-			c.tsw.WriteLiterally(">")
-		}
-	} else {
-		// No return value -> void
-		if isAsync {
-			c.tsw.WriteLiterally(": Promise<void>")
-		} else {
-			c.tsw.WriteLiterally(": void")
-		}
-	}
-
-	c.tsw.WriteLiterally(" ")
-
-	// For named types with methods, bind receiver name to this._value
-	if recvField := decl.Recv.List[0]; len(recvField.Names) > 0 {
-		recvName := recvField.Names[0].Name
-		if recvName != "_" {
-			c.tsw.WriteLine("{")
-			c.tsw.Indent(1)
-			// Bind the receiver name to this._value for value types
-			sanitizedRecvName := c.sanitizeIdentifier(recvName)
-			c.tsw.WriteLinef("const %s = this._value", sanitizedRecvName)
-
-			// Add using statement if needed
-			if c.analysis.NeedsDefer(decl.Body) {
-				if c.analysis.IsInAsyncFunction(decl) {
-					c.tsw.WriteLine("await using __defer = new $.AsyncDisposableStack();")
-				} else {
-					c.tsw.WriteLine("using cleanup = new $.DisposableStack();")
-				}
-			}
-
-			// Declare named return variables and initialize them to their zero values
-			if err := c.writeNamedReturnDeclarations(decl.Type.Results); err != nil {
-				return fmt.Errorf("failed to write named return declarations: %w", err)
-			}
-
-			// write method body without outer braces
-			for _, stmt := range decl.Body.List {
-				if err := c.WriteStmt(stmt); err != nil {
-					return fmt.Errorf("failed to write statement in function body: %w", err)
-				}
-			}
-			c.tsw.Indent(-1)
-			c.tsw.WriteLine("}")
-
-			return nil
-		}
-	}
-	// no named receiver, write whole body
-	if err := c.WriteStmt(decl.Body); err != nil {
-		return fmt.Errorf("failed to write function body: %w", err)
-	}
-
-	return nil
+	return c.writeMethodBodyWithReceiverBinding(decl, "this._value")
 }
 
 // WriteTypeSpec writes the type specification to the output.

package/compiler/type.go

@@ -72,6 +72,38 @@ func (c *GoToTSCompiler) WriteGoType(typ types.Type, context GoTypeContext) {
 	case *types.Struct:
 		c.WriteStructType(t)
 	case *types.Alias:
+		// Check if this type alias is from an imported package
+		aliasObj := t.Obj()
+		if aliasObj != nil && aliasObj.Pkg() != nil && aliasObj.Pkg() != c.pkg.Types {
+			// This type alias is from an imported package, find the import alias
+			aliasPkg := aliasObj.Pkg()
+			aliasPkgPath := aliasPkg.Path()
+			aliasPkgName := aliasPkg.Name() // Get the actual package name
+
+			// Try to find the import alias by matching the package name or path
+			for importAlias := range c.analysis.Imports {
+				// First, try to match by the actual package name
+				if importAlias == aliasPkgName {
+					// Write the qualified name: importAlias.TypeName
+					c.tsw.WriteLiterally(importAlias)
+					c.tsw.WriteLiterally(".")
+					c.tsw.WriteLiterally(aliasObj.Name())
+					return
+				}
+
+				// Fallback: try to match by path-based package name (for backwards compatibility)
+				pts := strings.Split(aliasPkgPath, "/")
+				defaultPkgName := pts[len(pts)-1]
+				if importAlias == defaultPkgName || importAlias == aliasPkgPath {
+					// Write the qualified name: importAlias.TypeName
+					c.tsw.WriteLiterally(importAlias)
+					c.tsw.WriteLiterally(".")
+					c.tsw.WriteLiterally(aliasObj.Name())
+					return
+				}
+			}
+		}
+		// For local type aliases or unmatched imports, expand to underlying type
 		c.WriteGoType(t.Underlying(), context)
 	case *types.TypeParam:
 		// For type parameters, write the type parameter name (e.g., "T", "K", etc.)
@@ -694,6 +726,25 @@ func (c *GoToTSCompiler) getTypeString(goType types.Type) string {
 	return typeStr.String()
 }
 
+// getASTTypeString is a utility function that converts a Go type to its TypeScript
+// type string representation, preferring AST-based type writing when available to
+// preserve qualified names like os.FileMode. Falls back to types.Type-based writing
+// when AST information is not available.
+func (c *GoToTSCompiler) getASTTypeString(astType ast.Expr, goType types.Type) string {
+	var typeStr strings.Builder
+	writer := NewTSCodeWriter(&typeStr)
+	tempCompiler := NewGoToTSCompiler(writer, c.pkg, c.analysis)
+
+	if astType != nil {
+		// Use AST-based type writing to preserve qualified names
+		tempCompiler.WriteTypeExpr(astType)
+	} else {
+		// Fall back to types.Type-based writing
+		tempCompiler.WriteGoType(goType, GoTypeContextGeneral)
+	}
+	return typeStr.String()
+}
+
 // WriteStructType translates a Go struct type definition (`ast.StructType`)
 // into a TypeScript anonymous object type (e.g., `{ Field1: Type1; Field2: Type2 }`).
 // If the struct has no fields, it writes `{}`. Otherwise, it delegates to

package/dist/gs/builtin/builtin.d.ts

@@ -10,7 +10,9 @@ export declare function println(...args: any[]): void;
  */
 export declare function panic(...args: any[]): void;
 export type Bytes = Uint8Array | Slice<number>;
-export declare function int(value: number): number;
+export declare function int(value: number | {
+    valueOf(): number | null;
+}): number;
 export declare function multiplyDuration(duration: any, multiplier: number): any;
 /**
  * Normalizes various byte representations into a `Uint8Array` for protobuf compatibility.

package/dist/gs/builtin/builtin.js

@@ -20,8 +20,14 @@ export function int(value) {
     // we need to handle the conversion properly. The issue is that JavaScript's number type
     // can represent values larger than 32-bit signed integers, but when cast in certain contexts
     // they get interpreted as signed 32-bit integers.
+    //
     // For Go's int type on 64-bit systems, we should preserve the full value
     // since JavaScript numbers can safely represent integers up to Number.MAX_SAFE_INTEGER
+    //
+    // For this we use Math.trunc.
+    if (typeof value === 'object' && 'valueOf' in value) {
+        return Math.trunc(value.valueOf() ?? 0);
+    }
     return Math.trunc(value);
 }
 // Duration multiplication helper for time package operations

package/dist/gs/builtin/builtin.js.map

@@ -1 +1 @@
-{"version":3,"file":"builtin.js","sourceRoot":"","sources":["../../../gs/builtin/builtin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builtin.js","sourceRoot":"","sources":["../../../gs/builtin/builtin.ts"],"names":[],"mappings":"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"}

package/dist/gs/builtin/errors.js

@@ -7,7 +7,7 @@ export function newError(text) {
 // toGoError converts a JavaScript Error to a Go error
 // if the error is already a Go error, it returns it unchanged
 export function toGoError(err) {
-    if ("Error" in err) {
+    if ('Error' in err) {
         return err;
     }
     return {