@typemove/aptos 1.7.1 → 1.8.0

package/src/codegen/codegen.ts

@@ -2,7 +2,14 @@ import * as fs from 'fs'
 import chalk from 'chalk'
 import { join } from 'path'
 import { AptosChainAdapter } from '../aptos-chain-adapter.js'
-import { camel, InternalMoveFunction, InternalMoveModule, normalizeToJSName } from '@typemove/move'
+import {
+  camel,
+  InternalMoveFunction,
+  InternalMoveModule,
+  InternalMoveStruct,
+  normalizeToJSName,
+  structQname
+} from '@typemove/move'
 import { AbstractCodegen } from '@typemove/move/codegen'
 import { Aptos, AptosConfig, Event, MoveModuleBytecode, MoveResource } from '@aptos-labs/ts-sdk'
 
@@ -63,6 +70,16 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
     `
   }
 
+  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string {
+    let content = ''
+    switch (structQname(module, struct)) {
+      case '0x1::object::Object':
+        content += `export type ${struct.name}<T> = MoveAddressType`
+        break
+    }
+    return content + super.generateStructs(module, struct, events, content !== '')
+  }
+
   protected generateViewFunction(module: InternalMoveModule, func: InternalMoveFunction): string {
     if (!func.isView) {
       return ''
@@ -94,7 +111,7 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
     client: Aptos,
     ${requestArg}
     version?: bigint): Promise<[${returns.join(',')}]> {
-      const coder = defaultMoveCoder(client.config.fullnode)        
+      const coder = ${this.getGetDefaultCoder()}        
       const data: InputViewFunctionData = {
         function: "${module.address}::${module.name}::${func.name}",
         functionArguments: ${func.params.length > 0 ? 'coder.encodeArray(request.functionArguments)' : '[]'},
@@ -106,6 +123,10 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
     }`
   }
 
+  protected getGetDefaultCoder() {
+    return `defaultMoveCoder(client.config.fullnode)`
+  }
+
   protected generateEntryForFunction(module: InternalMoveModule, func: InternalMoveFunction): string {
     if (!func.isEntry) {
       return ''
@@ -132,7 +153,7 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
       },
       options?: InputGenerateTransactionOptions
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode)  
+      const coder = ${this.getGetDefaultCoder()}
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {

package/src/move-coder.ts

@@ -46,6 +46,17 @@ export class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | Mov
   decodeResource<T>(res: MoveResource): Promise<TypedMoveResource<T> | undefined> {
     return this.decodedStruct(res)
   }
+
+  protected async decode(data: any, type: TypeDescriptor): Promise<any> {
+    switch (type.qname) {
+      case '0x1::object::Object':
+        if (data?.inner !== undefined && typeof data?.inner === 'string') {
+          return data.inner
+        }
+    }
+    return super.decode(data, type)
+  }
+
   filterAndDecodeResources<T>(
     type: string | TypeDescriptor<T>,
     resources: MoveResource[]