fix(gen): improve test coverage, improve using more Filecoin miner types

matching types to Go and Rust original code in go-state-types and
builtin-actors.

Author: rvagg

lib/gen/go.js

@@ -267,16 +267,30 @@ export function generateGo (schema, options = {}) {
       }
     } else if ('copy' in typeDefn) {
       const { fromType } = typeDefn.copy
+
+      // Check for type-level annotations
+      /** @type { { [k in string]: string }[]} */
+      let annotations = []
+      // @ts-ignore - annotations exist in the parsed data even if not in type definition
+      if (typeof typeDefn.copy.annotations === 'object' && typeof typeDefn.copy.annotations.type === 'object') {
+        // @ts-ignore
+        annotations = typeDefn.copy.annotations.type
+      }
+
       // Resolve fromType - it could be a primitive or custom type
       let resolvedType = fromType
 
       // Check if it's a primitive IPLD type
       if (['Bool', 'Int', 'Float', 'String', 'Bytes', 'Link'].includes(fromType)) {
-        resolvedType = getGoType([], fromType)
+        resolvedType = getGoType(annotations, fromType)
         resolvedType = fixGoType(imports, resolvedType, false)
       }
 
-      typesrc += `type ${typeName} = ${resolvedType}\n\n`
+      // Check if we should use type alias (=) or named type (default)
+      const useAlias = annotations.find(a => 'gotypealias' in a)
+      const typeDeclaration = useAlias ? '= ' : ''
+
+      typesrc += `type ${typeName} ${typeDeclaration}${resolvedType}\n\n`
     }
   }
 

lib/gen/rust.js

@@ -166,6 +166,13 @@ export function generateRust (schema) {
         // Build serde attributes
         const serdeAttrs = []
 
+        // Check for @rustserde annotations
+        for (const annotation of annotations) {
+          if ('rustserde' in annotation) {
+            serdeAttrs.push(annotation.rustserde)
+          }
+        }
+
         // Determine the serialization name
         let serializationName = fieldName
         if (hasExplicitRename && explicitRenameValue) {
@@ -189,15 +196,21 @@ export function generateRust (schema) {
           if (isMapRepr) {
             serdeAttrs.push('skip_serializing_if = "Option::is_none"')
           } else if (isTupleRepr) {
-            serdeAttrs.push('default')
+            // Only add 'default' if it's not already present
+            if (!serdeAttrs.includes('default')) {
+              serdeAttrs.push('default')
+            }
           }
         } else if (fieldDefn.optional) {
           // Just optional: Option<T>
           fieldType = `Option<${fieldType}>`
           if (isMapRepr) {
             serdeAttrs.push('skip_serializing_if = "Option::is_none"')
           } else if (isTupleRepr) {
-            serdeAttrs.push('default')
+            // Only add 'default' if it's not already present
+            if (!serdeAttrs.includes('default')) {
+              serdeAttrs.push('default')
+            }
           }
         } else if (fieldDefn.nullable) {
           // Just nullable: Option<T> but always serialize
@@ -359,12 +372,25 @@ export function generateRust (schema) {
       }
     } else if ('copy' in typeDefn) {
       const { fromType } = typeDefn.copy
+
+      // Check for type-level annotations only when copying from primitive types
+      /** @type { { [k in string]: string }[]} */
+      let annotations = []
+      if (['Bool', 'Int', 'Float', 'String', 'Bytes', 'Link'].includes(fromType)) {
+        // @ts-ignore - annotations exist in the parsed data even if not in type definition
+        if (typeof typeDefn.copy.annotations === 'object' && typeof typeDefn.copy.annotations.type === 'object') {
+          // @ts-ignore
+          // For copy types, only use @unsigned annotation, ignore @rusttype
+          annotations = typeDefn.copy.annotations.type.filter(a => !('rusttype' in a))
+        }
+      }
+
       // Resolve fromType - it could be a primitive or custom type
       let resolvedType = fromType
 
       // Check if it's a primitive IPLD type
       if (['Bool', 'Int', 'Float', 'String', 'Bytes', 'Link'].includes(fromType)) {
-        resolvedType = getRustType([], fromType)
+        resolvedType = getRustType(annotations, fromType)
         resolvedType = fixRustType(imports, resolvedType, false)
       }
 

lib/gen/typescript.js

@@ -382,7 +382,7 @@ export function generateTypeScript (schema) {
         typesrc += `  export const ${name}: ${typeName} = ${value}\n`
       }
 
-      typesrc += '  \n'
+      typesrc += '\n'
       typesrc += `  export function is${typeName}(value: any): value is ${typeName} {\n`
 
       if (isIntRepr) {

schema-schema.ts

@@ -158,10 +158,10 @@ export type UnionRepresentation_Inline = {
   discriminantTable: { [ k in HexString]: TypeName }
 }
 export type HexString = string
-export type UnionRepresentation_StringPrefix = { 
+export type UnionRepresentation_StringPrefix = {
   prefixes: { [ k in KindString]: TypeName }
 }
-export type UnionRepresentation_BytesPrefix = { 
+export type UnionRepresentation_BytesPrefix = {
   prefixes: { [ k in KindString]: TypeName }
 }
 export type TypeDefnStruct = {

test/fixtures/gen/copy-types.md

@@ -56,22 +56,22 @@ import (
 	"github.com/ipfs/go-cid"
 )
 
-type UserID = string
+type UserID string
 
-type Age = int64
+type Age int64
 
-type Balance = float64
+type Balance float64
 
-type Data = []byte
+type Data []byte
 
-type Reference = cid.Cid
+type Reference cid.Cid
 
 type Person struct {
 	name string
 	age int64
 }
 
-type Employee = Person
+type Employee Person
 
 type Status string
 
@@ -81,25 +81,25 @@ const (
 	StatusPending Status = "Pending"
 )
 
-type UserStatus = Status
+type UserStatus Status
 
 type Names []string
 
-type TeamMembers = Names
+type TeamMembers Names
 
 type Settings map[string]string
 
-type Configuration = Settings
+type Configuration Settings
 
-type ID = string
+type ID string
 
-type UserIdentifier = ID
+type UserIdentifier ID
 
-type AdminID = UserIdentifier
+type AdminID UserIdentifier
 
-type SpecialInt = int64
+type SpecialInt int64
 
-type RegularInt = SpecialInt
+type RegularInt SpecialInt
 ```
 
 [testmark]:# (test/rust)
@@ -236,7 +236,7 @@ export namespace Status {
   export const Active: Status = "Active"
   export const Inactive: Status = "Inactive"
   export const Pending: Status = "Pending"
-  
+
   export function isStatus(value: any): value is Status {
     return value === "Active" || value === "Inactive" || value === "Pending"
   }

test/fixtures/gen/enums.md

@@ -8,7 +8,7 @@ This file tests enum type code generation for Go, Rust, and TypeScript.
 ```ipldsch
 type Status enum {
   | Pending
-  | Active  
+  | Active
   | Completed
   | Failed
 }
@@ -148,7 +148,7 @@ export namespace Status {
   export const Active: Status = "Active"
   export const Completed: Status = "Completed"
   export const Failed: Status = "Failed"
-  
+
   export function isStatus(value: any): value is Status {
     return value === "Pending" || value === "Active" || value === "Completed" || value === "Failed"
   }
@@ -161,7 +161,7 @@ export namespace Color {
   export const Green: Color = "g"
   export const Blue: Color = "b"
   export const Yellow: Color = "Yellow"
-  
+
   export function isColor(value: any): value is Color {
     return value === "r" || value === "g" || value === "b" || value === "Yellow"
   }
@@ -175,7 +175,7 @@ export namespace ErrorCode {
   export const Unauthorized: ErrorCode = 401
   export const NotFound: ErrorCode = 404
   export const ServerError: ErrorCode = 500
-  
+
   export function isErrorCode(value: any): value is ErrorCode {
     return value === 0 || value === 400 || value === 401 || value === 404 || value === 500
   }
@@ -194,7 +194,7 @@ export namespace RegisteredSealProof {
   export const StackedDrg512MiBV1_1: RegisteredSealProof = 7
   export const StackedDrg32GiBV1_1: RegisteredSealProof = 8
   export const StackedDrg64GiBV1_1: RegisteredSealProof = 9
-  
+
   export function isRegisteredSealProof(value: any): value is RegisteredSealProof {
     return value >= 0 && value <= 9 && Number.isInteger(value)
   }