@typemove/sui 1.2.0 → 1.2.1-rc.1

package/src/codegen/codegen.ts

@@ -113,20 +113,17 @@ export class SuiCodegen extends AbstractCodegen<
       if (arg.reference) {
         args.push({
           paramType: `${this.ADDRESS_TYPE} | ObjectCallArg | TransactionArgument`,
-          callValue: `_args.push(TransactionArgument.is(args[${idx}]) ? args[${idx}] : tx.object(args[${idx}]))`
+          callValue: `_args.push(transactionArgumentOrObject(args[${idx}], tx))`
         })
       } else if (arg.isVector()) {
         args.push({
           paramType: `(${this.ADDRESS_TYPE} | ObjectCallArg)[] | TransactionArgument`,
-          callValue: `_args.push(TransactionArgument.is(args[${idx}]) ? args[${idx}] : tx.makeMoveVec({
-            objects: args[${idx}].map((a: any) => tx.object(a))
-            // type: TODO
-          }))`
+          callValue: `_args.push(transactionArgumentOrVec(args[${idx}], tx))`
         })
       } else {
         args.push({
           paramType: `${this.generateTypeForDescriptor(arg, module.address)} | TransactionArgument`,
-          callValue: `_args.push(TransactionArgument.is(args[${idx}]) ? args[${idx}] : tx.pure(args[${idx}]))`
+          callValue: `_args.push(transactionArgumentOrPure(args[${idx}], tx))`
         })
       }
     }
@@ -205,9 +202,10 @@ export class SuiCodegen extends AbstractCodegen<
     return `
       ${super.generateImports()}
       import { ZERO_ADDRESS, TypedDevInspectResults, getMoveCoder } from '@typemove/sui'
-      import { TransactionBlock } from '@mysten/sui.js/transactions'
-      import { ObjectCallArg, TransactionArgument } from '@mysten/sui.js'
+      import { TransactionBlock, TransactionArgument } from '@mysten/sui.js/transactions'
       import { SuiClient } from '@mysten/sui.js/client'
+      import { type ObjectCallArg } from "@mysten/sui.js/dist/esm/builder/Inputs.js";
+      import { transactionArgumentOrObject, transactionArgumentOrPure, transactionArgumentOrVec } from '@typemove/sui'
     `
   }
 }

package/src/index.ts

@@ -1,3 +1,4 @@
 export * from './models.js'
+export * from './transaction.js'
 
 export { MoveCoder, defaultMoveCoder, getMoveCoder } from './move-coder.js'

package/src/tests/types/testnet/0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5.ts

@@ -14,9 +14,17 @@ import {
   TypedDevInspectResults,
   getMoveCoder,
 } from "@typemove/sui";
-import { TransactionBlock } from "@mysten/sui.js/transactions";
-import { ObjectCallArg, TransactionArgument } from "@mysten/sui.js";
+import {
+  TransactionBlock,
+  TransactionArgument,
+} from "@mysten/sui.js/transactions";
 import { SuiClient } from "@mysten/sui.js/client";
+import { type ObjectCallArg } from "@mysten/sui.js/dist/esm/builder/Inputs.js";
+import {
+  transactionArgumentOrObject,
+  transactionArgumentOrPure,
+  transactionArgumentOrVec,
+} from "@typemove/sui";
 
 import { _0x2 } from "@typemove/sui/builtin";
 import { _0x1 } from "@typemove/sui/builtin";
@@ -97,13 +105,9 @@ export namespace oracle {
     ): TransactionArgument &
       [TransactionArgument, TransactionArgument, TransactionArgument] {
       const _args: any[] = [];
-      _args.push(
-        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0]),
-      );
-      _args.push(TransactionArgument.is(args[1]) ? args[1] : tx.pure(args[1]));
-      _args.push(
-        TransactionArgument.is(args[2]) ? args[2] : tx.object(args[2]),
-      );
+      _args.push(transactionArgumentOrObject(args[0], tx));
+      _args.push(transactionArgumentOrPure(args[1], tx));
+      _args.push(transactionArgumentOrObject(args[2], tx));
 
       // @ts-ignore
       return tx.moveCall({
@@ -123,9 +127,7 @@ export namespace oracle {
       typeArguments: [TypeDescriptor<T0> | string],
     ): TransactionArgument & [TransactionArgument] {
       const _args: any[] = [];
-      _args.push(
-        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0]),
-      );
+      _args.push(transactionArgumentOrObject(args[0], tx));
 
       // @ts-ignore
       return tx.moveCall({
@@ -148,10 +150,8 @@ export namespace oracle {
       typeArguments: [TypeDescriptor<T0> | string],
     ): TransactionArgument & [TransactionArgument, TransactionArgument] {
       const _args: any[] = [];
-      _args.push(TransactionArgument.is(args[0]) ? args[0] : tx.pure(args[0]));
-      _args.push(
-        TransactionArgument.is(args[1]) ? args[1] : tx.object(args[1]),
-      );
+      _args.push(transactionArgumentOrPure(args[0], tx));
+      _args.push(transactionArgumentOrObject(args[1], tx));
 
       // @ts-ignore
       return tx.moveCall({
@@ -186,18 +186,12 @@ export namespace oracle {
         TransactionArgument,
       ] {
       const _args: any[] = [];
-      _args.push(
-        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0]),
-      );
-      _args.push(
-        TransactionArgument.is(args[1]) ? args[1] : tx.object(args[1]),
-      );
-      _args.push(TransactionArgument.is(args[2]) ? args[2] : tx.pure(args[2]));
-      _args.push(TransactionArgument.is(args[3]) ? args[3] : tx.pure(args[3]));
-      _args.push(TransactionArgument.is(args[4]) ? args[4] : tx.pure(args[4]));
-      _args.push(
-        TransactionArgument.is(args[5]) ? args[5] : tx.object(args[5]),
-      );
+      _args.push(transactionArgumentOrObject(args[0], tx));
+      _args.push(transactionArgumentOrObject(args[1], tx));
+      _args.push(transactionArgumentOrPure(args[2], tx));
+      _args.push(transactionArgumentOrPure(args[3], tx));
+      _args.push(transactionArgumentOrPure(args[4], tx));
+      _args.push(transactionArgumentOrObject(args[5], tx));
 
       // @ts-ignore
       return tx.moveCall({