@typemove/aptos 1.2.9-rc.1 → 1.3.0-rc.1

package/src/to-internal.ts

@@ -4,10 +4,15 @@ import {
   InternalMoveModule,
   InternalMoveStruct,
   InternalMoveStructField,
-  parseMoveType,
+  parseMoveType
 } from '@typemove/move'
-import { Types } from 'aptos'
-import { MoveFunction, MoveModuleBytecode, MoveStruct, MoveStructField } from './move-types.js'
+import {
+  MoveFunctionVisibility,
+  MoveFunction,
+  MoveModuleBytecode,
+  MoveStruct,
+  MoveStructField
+} from '@aptos-labs/ts-sdk'
 
 export function toInternalModule(module: MoveModuleBytecode): InternalMoveModule {
   if (!module.abi) {
@@ -18,20 +23,20 @@ export function toInternalModule(module: MoveModuleBytecode): InternalMoveModule
     address: abi.address,
     exposedFunctions: abi.exposed_functions.map(toInternalFunction),
     name: abi.name,
-    structs: abi.structs.map(toInternalStruct),
+    structs: abi.structs.map(toInternalStruct)
   }
 }
 
 export function toInternalFunction(func: MoveFunction): InternalMoveFunction {
   let visibility
   switch (func.visibility) {
-    case Types.MoveFunctionVisibility.PRIVATE:
+    case MoveFunctionVisibility.PRIVATE:
       visibility = InternalMoveFunctionVisibility.PRIVATE
       break
-    case Types.MoveFunctionVisibility.PUBLIC:
+    case MoveFunctionVisibility.PUBLIC:
       visibility = InternalMoveFunctionVisibility.PUBLIC
       break
-    case Types.MoveFunctionVisibility.FRIEND:
+    case MoveFunctionVisibility.FRIEND:
       visibility = InternalMoveFunctionVisibility.FRIEND
       break
   }
@@ -42,7 +47,7 @@ export function toInternalFunction(func: MoveFunction): InternalMoveFunction {
     name: func.name,
     params: func.params.map(parseMoveType),
     return: func.return.map(parseMoveType),
-    visibility: visibility,
+    visibility: visibility
   }
 }
 
@@ -52,13 +57,13 @@ export function toInternalStruct(struct: MoveStruct): InternalMoveStruct {
     fields: struct.fields.map(toInternalField),
     typeParams: struct.generic_type_params,
     isNative: struct.is_native,
-    name: struct.name,
+    name: struct.name
   }
 }
 
 export function toInternalField(module: MoveStructField): InternalMoveStructField {
   return {
     name: module.name,
-    type: parseMoveType(module.type),
+    type: parseMoveType(module.type)
   }
 }