@sentio/sdk 2.5.0 → 2.5.1-rc.1

package/lib/move/abstract-move-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-move-coder.js","sourceRoot":"","sources":["../../src/move/abstract-move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { moduleQname, SPLITTER, VECTOR_STR } from './utils.js'\nimport { parseMoveType, TypeDescriptor } from './types.js'\nimport { NeutralMoveFunction, NeutralMoveModule, NeutralMoveStruct } from './neutral-models.js'\nimport { bytesToBigInt } from '../utils/index.js'\n\ntype StructWithTag<Base> = Base & {\n  type: string\n  data: any\n}\n\ntype DecodedStructWithTag<B, T> = StructWithTag<B> & {\n  data_decoded: T\n  type_arguments: string[]\n}\n\nexport abstract class AbstractMoveCoder<StructType> {\n  private moduleMapping = new Map<string, NeutralMoveModule>()\n  private typeMapping = new Map<string, NeutralMoveStruct>()\n  private funcMapping = new Map<string, NeutralMoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  loadNeutral(module: NeutralMoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposed_functions) {\n      if (!func.is_entry) {\n        continue\n      }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  protected dataToBigInt(data: any): bigint {\n    if (Array.isArray(data)) {\n      // Only sui function need this, strange\n      const bytes = data as number[]\n      return bytesToBigInt(new Uint8Array(bytes.slice().reverse()))\n    } else {\n      return BigInt(data)\n    }\n  }\n\n  protected getMoveStruct(type: string): NeutralMoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type + ' type are not imported anywhere')\n    }\n    return struct\n  }\n\n  protected getMoveFunction(type: string): NeutralMoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function' + type + ' type are not imported anywhere')\n    }\n    return func\n  }\n\n  protected decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n        return this.dataToBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  protected filterAndDecodeInternal<T>(\n    typeQname: string,\n    structs: StructWithTag<StructType>[]\n  ): DecodedStructWithTag<StructType, T>[] {\n    if (!structs) {\n      return []\n    }\n    const results: DecodedStructWithTag<StructType, T>[] = []\n    for (const resource of structs) {\n      if (resource.type.split('<')[0] !== typeQname) {\n        continue\n      }\n      const result = this.decodedInternal(resource)\n      if (result) {\n        results.push(result as DecodedStructWithTag<StructType, T>)\n      }\n    }\n    return results\n  }\n\n  protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined {\n    const typeDescriptor = parseMoveType(typeStruct.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n\n    let dataTyped = undefined\n    try {\n      dataTyped = this.decode(typeStruct.data, typeDescriptor)\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(typeStruct), e)\n      return undefined\n    }\n    return {\n      ...typeStruct,\n      data_decoded: dataTyped,\n      type_arguments: typeArguments,\n    } as DecodedStructWithTag<StructType, T>\n  }\n}\n"]}
+{"version":3,"file":"abstract-move-coder.js","sourceRoot":"","sources":["../../src/move/abstract-move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { moduleQname, SPLITTER, VECTOR_STR } from './utils.js'\nimport { parseMoveType, TypeDescriptor } from './types.js'\nimport { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'\nimport { bytesToBigInt } from '../utils/index.js'\n\ntype StructWithTag<Base> = Base & {\n  type: string\n  data: any\n}\n\ntype DecodedStructWithTag<B, T> = StructWithTag<B> & {\n  data_decoded: T\n  type_arguments: string[]\n}\n\nexport abstract class AbstractMoveCoder<StructType> {\n  private moduleMapping = new Map<string, InternalMoveModule>()\n  private typeMapping = new Map<string, InternalMoveStruct>()\n  private funcMapping = new Map<string, InternalMoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  loadInternal(module: InternalMoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposedFunctions) {\n      if (!func.isEntry) {\n        continue\n      }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  protected dataToBigInt(data: any): bigint {\n    if (Array.isArray(data)) {\n      // Only sui function need this, strange\n      const bytes = data as number[]\n      return bytesToBigInt(new Uint8Array(bytes.slice().reverse()))\n    } else {\n      return BigInt(data)\n    }\n  }\n\n  protected getMoveStruct(type: string): InternalMoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type + ' type are not imported anywhere')\n    }\n    return struct\n  }\n\n  protected getMoveFunction(type: string): InternalMoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function' + type + ' type are not imported anywhere')\n    }\n    return func\n  }\n\n  protected decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n        return this.dataToBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  protected filterAndDecodeInternal<T>(\n    typeQname: string,\n    structs: StructWithTag<StructType>[]\n  ): DecodedStructWithTag<StructType, T>[] {\n    if (!structs) {\n      return []\n    }\n    const results: DecodedStructWithTag<StructType, T>[] = []\n    for (const resource of structs) {\n      if (resource.type.split('<')[0] !== typeQname) {\n        continue\n      }\n      const result = this.decodedInternal(resource)\n      if (result) {\n        results.push(result as DecodedStructWithTag<StructType, T>)\n      }\n    }\n    return results\n  }\n\n  protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined {\n    const typeDescriptor = parseMoveType(typeStruct.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n\n    let dataTyped = undefined\n    try {\n      dataTyped = this.decode(typeStruct.data, typeDescriptor)\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(typeStruct), e)\n      return undefined\n    }\n    return {\n      ...typeStruct,\n      data_decoded: dataTyped,\n      type_arguments: typeArguments,\n    } as DecodedStructWithTag<StructType, T>\n  }\n}\n"]}

package/lib/move/account.d.ts

@@ -1,5 +1,4 @@
-import { TypeDescriptor } from './types.js';
-import { NeutralMoveModule } from './neutral-models.js';
+import { InternalMoveModule } from './internal-models.js';
 export declare class AccountModulesImportInfo {
     imports: Map<string, Set<string>>;
     account: string;
@@ -10,9 +9,7 @@ export declare class AccountModulesImportInfo {
 export declare class AccountRegister {
     accountImports: Map<string, AccountModulesImportInfo>;
     pendingAccounts: Set<string>;
-    typeDescriptors: Map<string, TypeDescriptor>;
-    protected loadTypeDescriptor(type: string): TypeDescriptor;
-    register(module: NeutralMoveModule, tsModuleName: string): AccountModulesImportInfo;
-    registerFunctions(module: NeutralMoveModule, accountModuleImports: AccountModulesImportInfo): void;
-    registerStruct(module: NeutralMoveModule, accountModuleImports: AccountModulesImportInfo): void;
+    register(module: InternalMoveModule, tsModuleName: string): AccountModulesImportInfo;
+    private registerFunctions;
+    private registerStruct;
 }

package/lib/move/account.js

@@ -1,4 +1,3 @@
-import { parseMoveType } from './types.js';
 import { moduleQname, moduleQnameForType } from './utils.js';
 export class AccountModulesImportInfo {
     // account to module
@@ -25,17 +24,6 @@ export class AccountModulesImportInfo {
 export class AccountRegister {
     accountImports = new Map();
     pendingAccounts = new Set();
-    // loadedAccount = new Set<string>()
-    typeDescriptors = new Map();
-    loadTypeDescriptor(type) {
-        let descriptor = this.typeDescriptors.get(type);
-        // const descriptparseMoveType(type)
-        if (!descriptor) {
-            descriptor = parseMoveType(type);
-            this.typeDescriptors.set(type, descriptor);
-        }
-        return descriptor;
-    }
     register(module, tsModuleName) {
         const currentModuleFqn = moduleQname(module);
         let accountModuleImports = this.accountImports.get(module.address);
@@ -51,8 +39,8 @@ export class AccountRegister {
         return accountModuleImports;
     }
     registerFunctions(module, accountModuleImports) {
-        for (const func of module.exposed_functions) {
-            if (!func.is_entry) {
+        for (const func of module.exposedFunctions) {
+            if (!func.isEntry) {
                 continue;
             }
             for (const param of func.params) {

package/lib/move/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/move/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkB,MAAM,YAAY,CAAA;AAC1D,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAG5D,MAAM,OAAO,wBAAwB;IACnC,oBAAoB;IACpB,OAAO,CAA0B;IACjC,OAAO,CAAQ;IACf,UAAU,CAAQ;IAElB,YAAY,OAAe,EAAE,YAAoB;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,YAAY,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC/C,CAAC;IAED,SAAS,CAAC,OAAe,EAAE,MAAc;QACvC,IAAI,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;YAC5B,OAAM;SACP;QACD,IAAI,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,cAAc,EAAE;YACnB,cAAc,GAAG,IAAI,GAAG,EAAU,CAAA;YAClC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;SAC1C;QACD,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,eAAe;IAC1B,cAAc,GAAG,IAAI,GAAG,EAAoC,CAAA;IAC5D,eAAe,GAAG,IAAI,GAAG,EAAU,CAAA;IAEnC,oCAAoC;IACpC,eAAe,GAAG,IAAI,GAAG,EAA0B,CAAA;IAEzC,kBAAkB,CAAC,IAAY;QACvC,IAAI,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAE/C,oCAAoC;QACpC,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;YAChC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;SAC3C;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,QAAQ,CAAC,MAAyB,EAAE,YAAoB;QACtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;QAE5C,IAAI,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAClE,IAAI,CAAC,oBAAoB,EAAE;YACzB,oBAAoB,GAAG,IAAI,wBAAwB,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YACjF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAA;YAC7D,4DAA4D;YAC5D,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;SAC5C;QAED,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;QACjD,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;QAEpD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;QAC/D,OAAO,oBAAoB,CAAA;IAC7B,CAAC;IAED,iBAAiB,CAAC,MAAyB,EAAE,oBAA8C;QACzF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,iBAAiB,EAAE;YAC3C,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,SAAQ;aACT;YACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,aAAa,EAAE,EAAE;oBACxC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;oBAClD,oBAAoB,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;oBAC/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;wBACrC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;qBAClC;iBACF;aACF;SACF;IACH,CAAC;IAED,cAAc,CAAC,MAAyB,EAAE,oBAA8C;QACtF,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;gBACjC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE;oBAC7C,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;oBAClD,oBAAoB,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;oBAC/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;wBACrC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;qBAClC;iBACF;aACF;SACF;IACH,CAAC;CACF","sourcesContent":["import { parseMoveType, TypeDescriptor } from './types.js'\nimport { moduleQname, moduleQnameForType } from './utils.js'\nimport { NeutralMoveModule } from './neutral-models.js'\n\nexport class AccountModulesImportInfo {\n  // account to module\n  imports: Map<string, Set<string>>\n  account: string\n  moduleName: string\n\n  constructor(account: string, tsModuleName: string) {\n    this.account = account\n    this.moduleName = tsModuleName\n    this.imports = new Map<string, Set<string>>()\n  }\n\n  addImport(account: string, module: string) {\n    if (account === this.account) {\n      return\n    }\n    let accountModules = this.imports.get(account)\n    if (!accountModules) {\n      accountModules = new Set<string>()\n      this.imports.set(account, accountModules)\n    }\n    accountModules.add(module)\n  }\n}\n\nexport class AccountRegister {\n  accountImports = new Map<string, AccountModulesImportInfo>()\n  pendingAccounts = new Set<string>()\n\n  // loadedAccount = new Set<string>()\n  typeDescriptors = new Map<string, TypeDescriptor>()\n\n  protected loadTypeDescriptor(type: string) {\n    let descriptor = this.typeDescriptors.get(type)\n\n    // const descriptparseMoveType(type)\n    if (!descriptor) {\n      descriptor = parseMoveType(type)\n      this.typeDescriptors.set(type, descriptor)\n    }\n    return descriptor\n  }\n\n  register(module: NeutralMoveModule, tsModuleName: string): AccountModulesImportInfo {\n    const currentModuleFqn = moduleQname(module)\n\n    let accountModuleImports = this.accountImports.get(module.address)\n    if (!accountModuleImports) {\n      accountModuleImports = new AccountModulesImportInfo(module.address, tsModuleName)\n      this.accountImports.set(module.address, accountModuleImports)\n      // the account has already be processed, delete pending task\n      this.pendingAccounts.delete(module.address)\n    }\n\n    this.registerStruct(module, accountModuleImports)\n    this.registerFunctions(module, accountModuleImports)\n\n    this.accountImports.set(currentModuleFqn, accountModuleImports)\n    return accountModuleImports\n  }\n\n  registerFunctions(module: NeutralMoveModule, accountModuleImports: AccountModulesImportInfo): void {\n    for (const func of module.exposed_functions) {\n      if (!func.is_entry) {\n        continue\n      }\n      for (const param of func.params) {\n        for (const type of param.dependedTypes()) {\n          const [account, module] = moduleQnameForType(type)\n          accountModuleImports.addImport(account, module)\n          if (!this.accountImports.has(account)) {\n            this.pendingAccounts.add(account)\n          }\n        }\n      }\n    }\n  }\n\n  registerStruct(module: NeutralMoveModule, accountModuleImports: AccountModulesImportInfo): void {\n    for (const struct of module.structs) {\n      for (const field of struct.fields) {\n        for (const type of field.type.dependedTypes()) {\n          const [account, module] = moduleQnameForType(type)\n          accountModuleImports.addImport(account, module)\n          if (!this.accountImports.has(account)) {\n            this.pendingAccounts.add(account)\n          }\n        }\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/move/account.ts"],"names":[],"mappings":"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","sourcesContent":["import { moduleQname, moduleQnameForType } from './utils.js'\nimport { InternalMoveModule } from './internal-models.js'\n\nexport class AccountModulesImportInfo {\n  // account to module\n  imports: Map<string, Set<string>>\n  account: string\n  moduleName: string\n\n  constructor(account: string, tsModuleName: string) {\n    this.account = account\n    this.moduleName = tsModuleName\n    this.imports = new Map<string, Set<string>>()\n  }\n\n  addImport(account: string, module: string) {\n    if (account === this.account) {\n      return\n    }\n    let accountModules = this.imports.get(account)\n    if (!accountModules) {\n      accountModules = new Set<string>()\n      this.imports.set(account, accountModules)\n    }\n    accountModules.add(module)\n  }\n}\n\nexport class AccountRegister {\n  accountImports = new Map<string, AccountModulesImportInfo>()\n  pendingAccounts = new Set<string>()\n\n  register(module: InternalMoveModule, tsModuleName: string): AccountModulesImportInfo {\n    const currentModuleFqn = moduleQname(module)\n\n    let accountModuleImports = this.accountImports.get(module.address)\n    if (!accountModuleImports) {\n      accountModuleImports = new AccountModulesImportInfo(module.address, tsModuleName)\n      this.accountImports.set(module.address, accountModuleImports)\n      // the account has already be processed, delete pending task\n      this.pendingAccounts.delete(module.address)\n    }\n\n    this.registerStruct(module, accountModuleImports)\n    this.registerFunctions(module, accountModuleImports)\n\n    this.accountImports.set(currentModuleFqn, accountModuleImports)\n    return accountModuleImports\n  }\n\n  private registerFunctions(module: InternalMoveModule, accountModuleImports: AccountModulesImportInfo): void {\n    for (const func of module.exposedFunctions) {\n      if (!func.isEntry) {\n        continue\n      }\n      for (const param of func.params) {\n        for (const type of param.dependedTypes()) {\n          const [account, module] = moduleQnameForType(type)\n          accountModuleImports.addImport(account, module)\n          if (!this.accountImports.has(account)) {\n            this.pendingAccounts.add(account)\n          }\n        }\n      }\n    }\n  }\n\n  private registerStruct(module: InternalMoveModule, accountModuleImports: AccountModulesImportInfo): void {\n    for (const struct of module.structs) {\n      for (const field of struct.fields) {\n        for (const type of field.type.dependedTypes()) {\n          const [account, module] = moduleQnameForType(type)\n          accountModuleImports.addImport(account, module)\n          if (!this.accountImports.has(account)) {\n            this.pendingAccounts.add(account)\n          }\n        }\n      }\n    }\n  }\n}\n"]}

package/lib/move/internal-models.d.ts

@@ -0,0 +1,34 @@
+import { TypeDescriptor } from './types.js';
+export interface InternalMoveModule {
+    address: string;
+    name: string;
+    exposedFunctions: InternalMoveFunction[];
+    structs: InternalMoveStruct[];
+}
+export interface InternalMoveFunction {
+    name: string;
+    visibility: InternalMoveFunctionVisibility;
+    isEntry: boolean;
+    typeParams: InternalMoveTypeParam[];
+    params: TypeDescriptor[];
+    return: TypeDescriptor[];
+}
+export interface InternalMoveStruct {
+    name: string;
+    isNative: boolean;
+    abilities: string[];
+    typeParams: InternalMoveTypeParam[];
+    fields: InternalMoveStructField[];
+}
+export interface InternalMoveStructField {
+    name: string;
+    type: TypeDescriptor;
+}
+export declare enum InternalMoveFunctionVisibility {
+    PRIVATE = "private",
+    PUBLIC = "public",
+    FRIEND = "friend"
+}
+export type InternalMoveTypeParam = {
+    constraints: string[];
+};

package/lib/move/internal-models.js

@@ -0,0 +1,7 @@
+export var InternalMoveFunctionVisibility;
+(function (InternalMoveFunctionVisibility) {
+    InternalMoveFunctionVisibility["PRIVATE"] = "private";
+    InternalMoveFunctionVisibility["PUBLIC"] = "public";
+    InternalMoveFunctionVisibility["FRIEND"] = "friend";
+})(InternalMoveFunctionVisibility || (InternalMoveFunctionVisibility = {}));
+//# sourceMappingURL=internal-models.js.map

package/lib/move/internal-models.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-models.js","sourceRoot":"","sources":["../../src/move/internal-models.ts"],"names":[],"mappings":"AA+BA,MAAM,CAAN,IAAY,8BAIX;AAJD,WAAY,8BAA8B;IACxC,qDAAmB,CAAA;IACnB,mDAAiB,CAAA;IACjB,mDAAiB,CAAA;AACnB,CAAC,EAJW,8BAA8B,KAA9B,8BAA8B,QAIzC","sourcesContent":["import { TypeDescriptor } from './types.js'\n\nexport interface InternalMoveModule {\n  address: string\n  name: string\n  exposedFunctions: InternalMoveFunction[]\n  structs: InternalMoveStruct[]\n}\n\nexport interface InternalMoveFunction {\n  name: string\n  visibility: InternalMoveFunctionVisibility\n  isEntry: boolean\n  typeParams: InternalMoveTypeParam[]\n  params: TypeDescriptor[]\n  return: TypeDescriptor[]\n}\n\nexport interface InternalMoveStruct {\n  name: string\n  isNative: boolean\n  abilities: string[]\n  typeParams: InternalMoveTypeParam[]\n  fields: InternalMoveStructField[]\n}\n\nexport interface InternalMoveStructField {\n  name: string\n  type: TypeDescriptor\n}\n\nexport enum InternalMoveFunctionVisibility {\n  PRIVATE = 'private',\n  PUBLIC = 'public',\n  FRIEND = 'friend',\n}\n\nexport type InternalMoveTypeParam = {\n  constraints: string[]\n}\n"]}

package/lib/move/ts-type.js

@@ -1,9 +1,7 @@
 import { normalizeToJSName, SPLITTER, VECTOR_STR } from './utils.js';
 export function generateTypeForDescriptor(type, currentAddress, addressType) {
-    // TODO &signer is defintely an address, but what if &OTHER_TYPE?
     if (type.qname.startsWith('&')) {
-        console.error('Unexpected &');
-        return addressType;
+        throw Error('Unexpected &');
     }
     if (type.reference) {
         return addressType;

package/lib/move/ts-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-type.js","sourceRoot":"","sources":["../../src/move/ts-type.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypeDescriptor } from './types.js'\nimport { normalizeToJSName, SPLITTER, VECTOR_STR } from './utils.js'\n\nexport function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string, addressType: string): string {\n  // TODO &signer is defintely an address, but what if &OTHER_TYPE?\n  if (type.qname.startsWith('&')) {\n    console.error('Unexpected &')\n    return addressType\n  }\n  if (type.reference) {\n    return addressType\n  }\n\n  switch (type.qname) {\n    case 'signer': // TODO check this\n    case 'address':\n    case 'Address':\n      return addressType\n    case '0x2::object::ID':\n    case '0x2::coin::Coin':\n      return 'string'\n    case '0x1::string::String':\n      return 'string'\n    case 'bool':\n    case 'Bool':\n      return 'Boolean'\n    case 'u8':\n    case 'U8':\n    case 'u16':\n    case 'U16':\n    case 'u32':\n    case 'U32':\n      return 'number'\n    case 'u64':\n    case 'U64':\n    case 'u128':\n    case 'U128':\n      return 'bigint'\n  }\n\n  if (type.qname.toLowerCase() === VECTOR_STR) {\n    // vector<u8> as hex string\n    const elementTypeQname = type.typeArgs[0].qname\n    if (elementTypeQname === 'u8' || elementTypeQname === 'U8') {\n      return 'string'\n    }\n    if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {\n      return `${elementTypeQname}[] | string`\n    }\n    return generateTypeForDescriptor(type.typeArgs[0], currentAddress, addressType) + '[]'\n  }\n\n  const simpleName = generateSimpleType(type.qname, currentAddress)\n  if (simpleName.length === 0) {\n    console.error('unexpected error')\n  }\n  if (simpleName.toLowerCase().includes(VECTOR_STR)) {\n    console.error('unexpected vector type error')\n  }\n  if (type.typeArgs.length > 0) {\n    // return simpleName\n    return (\n      simpleName +\n      '<' +\n      type.typeArgs.map((t) => generateTypeForDescriptor(t, currentAddress, addressType)).join(',') +\n      '>'\n    )\n  }\n  return simpleName\n}\n\nfunction generateSimpleType(type: string, currentAddress: string): string {\n  const parts = type.split(SPLITTER)\n\n  for (let i = 0; i < parts.length; i++) {\n    parts[i] = normalizeToJSName(parts[i])\n  }\n\n  if (parts.length < 2) {\n    return parts[0]\n  }\n  if (parts[0] === currentAddress) {\n    return parts.slice(1).join('.')\n  }\n  return '_' + parts.join('.')\n}\n"]}
+{"version":3,"file":"ts-type.js","sourceRoot":"","sources":["../../src/move/ts-type.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypeDescriptor } from './types.js'\nimport { normalizeToJSName, SPLITTER, VECTOR_STR } from './utils.js'\n\nexport function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string, addressType: string): string {\n  if (type.qname.startsWith('&')) {\n    throw Error('Unexpected &')\n  }\n  if (type.reference) {\n    return addressType\n  }\n\n  switch (type.qname) {\n    case 'signer': // TODO check this\n    case 'address':\n    case 'Address':\n      return addressType\n    case '0x2::object::ID':\n    case '0x2::coin::Coin':\n      return 'string'\n    case '0x1::string::String':\n      return 'string'\n    case 'bool':\n    case 'Bool':\n      return 'Boolean'\n    case 'u8':\n    case 'U8':\n    case 'u16':\n    case 'U16':\n    case 'u32':\n    case 'U32':\n      return 'number'\n    case 'u64':\n    case 'U64':\n    case 'u128':\n    case 'U128':\n      return 'bigint'\n  }\n\n  if (type.qname.toLowerCase() === VECTOR_STR) {\n    // vector<u8> as hex string\n    const elementTypeQname = type.typeArgs[0].qname\n    if (elementTypeQname === 'u8' || elementTypeQname === 'U8') {\n      return 'string'\n    }\n    if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {\n      return `${elementTypeQname}[] | string`\n    }\n    return generateTypeForDescriptor(type.typeArgs[0], currentAddress, addressType) + '[]'\n  }\n\n  const simpleName = generateSimpleType(type.qname, currentAddress)\n  if (simpleName.length === 0) {\n    console.error('unexpected error')\n  }\n  if (simpleName.toLowerCase().includes(VECTOR_STR)) {\n    console.error('unexpected vector type error')\n  }\n  if (type.typeArgs.length > 0) {\n    // return simpleName\n    return (\n      simpleName +\n      '<' +\n      type.typeArgs.map((t) => generateTypeForDescriptor(t, currentAddress, addressType)).join(',') +\n      '>'\n    )\n  }\n  return simpleName\n}\n\nfunction generateSimpleType(type: string, currentAddress: string): string {\n  const parts = type.split(SPLITTER)\n\n  for (let i = 0; i < parts.length; i++) {\n    parts[i] = normalizeToJSName(parts[i])\n  }\n\n  if (parts.length < 2) {\n    return parts[0]\n  }\n  if (parts[0] === currentAddress) {\n    return parts.slice(1).join('.')\n  }\n  return '_' + parts.join('.')\n}\n"]}

package/lib/move/types.d.ts

@@ -1,6 +1,7 @@
 export declare class TypeDescriptor {
     qname: string;
     reference: boolean;
+    mutable: boolean;
     typeArgs: TypeDescriptor[];
     constructor(symbol: string, typeParams?: TypeDescriptor[]);
     getSignature(): string;

package/lib/move/types.js

@@ -1,15 +1,13 @@
 import { SPLITTER, VECTOR_STR } from './utils.js';
 export class TypeDescriptor {
-    // type: string
-    // TODO add reference flag
-    // qualified name without type parameters
     qname;
     reference;
-    // account?: string
-    // module?: string
+    mutable;
     typeArgs;
     constructor(symbol, typeParams) {
         this.qname = symbol;
+        this.reference = false;
+        this.mutable = false;
         this.typeArgs = typeParams || [];
     }
     getSignature() {
@@ -84,16 +82,14 @@ export class TypeDescriptor {
     }
 }
 export function parseMoveType(type) {
-    // type = type.replace('&', '')
-    type = type.replaceAll('&mut ', '&');
-    type = type.replaceAll('mut ', '');
-    // TODO replace ' ' is not exactly safe, need to double check this
-    type = type.replaceAll(' ', '');
     const stack = [new TypeDescriptor('')];
     let buffer = [];
     // xxx:asdf<g1<a,<c,d>>, b, g2<a,b>, e>
     for (let i = 0; i < type.length; i++) {
         const ch = type[i];
+        if (ch === ' ') {
+            continue;
+        }
         if (ch === '<') {
             // const symbol = type.slice(symbolStart, i)
             // symbolStart =
@@ -104,7 +100,7 @@ export function parseMoveType(type) {
             stack.push(new TypeDescriptor(''));
             continue;
         }
-        if (ch === '>') {
+        if (ch === '>' || ch === ',') {
             const typeParam = stack.pop();
             if (!typeParam) {
                 throw Error('Unexpected stack size');
@@ -115,21 +111,9 @@ export function parseMoveType(type) {
             }
             adjustType(typeParam);
             stack[stack.length - 1].typeArgs.push(typeParam);
-            continue;
-        }
-        if (ch === ',') {
-            const typeParam = stack.pop();
-            if (!typeParam) {
-                throw Error('Unexpected stack size');
+            if (ch === ',') {
+                stack.push(new TypeDescriptor(''));
             }
-            if (buffer.length > 0) {
-                typeParam.qname = buffer.join('');
-                buffer = [];
-            }
-            adjustType(typeParam);
-            stack[stack.length - 1].typeArgs.push(typeParam);
-            // continue parse next param
-            stack.push(new TypeDescriptor(''));
             continue;
         }
         buffer.push(ch);
@@ -149,5 +133,9 @@ function adjustType(type) {
         type.reference = true;
         type.qname = type.qname.slice(1);
     }
+    if (type.qname.startsWith('mut')) {
+        type.mutable = true;
+        type.qname = type.qname.slice(3);
+    }
 }
 //# sourceMappingURL=types.js.map

package/lib/move/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/move/types.ts"],"names":[],"mappings":"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","sourcesContent":["import { SPLITTER, VECTOR_STR } from './utils.js'\n\nexport class TypeDescriptor {\n  // type: string\n\n  // TODO add reference flag\n\n  // qualified name without type parameters\n  qname: string\n  reference: boolean\n  // account?: string\n  // module?: string\n\n  typeArgs: TypeDescriptor[]\n\n  constructor(symbol: string, typeParams?: TypeDescriptor[]) {\n    this.qname = symbol\n    this.typeArgs = typeParams || []\n  }\n\n  getSignature(): string {\n    if (this.typeArgs.length > 0) {\n      return this.qname + '<' + this.typeArgs.map((t) => t.getSignature()).join(', ') + '>'\n    }\n    return this.qname\n  }\n\n  // Replace T0, T1 with more concrete type\n  applyTypeArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor {\n    const replace = ctx.get(this.qname)\n    if (replace) {\n      return replace\n    }\n    if (ctx.size === 0 || this.typeArgs.length === 0) {\n      return this\n    }\n\n    const typeArgs: TypeDescriptor[] = []\n    for (const arg of this.typeArgs) {\n      const replace = ctx.get(arg.qname)\n      if (replace) {\n        typeArgs.push(replace)\n      } else {\n        typeArgs.push(arg.applyTypeArgs(ctx))\n      }\n    }\n    return new TypeDescriptor(this.qname, typeArgs)\n  }\n\n  // all depended types including itself, not include system type\n  dependedTypes(): string[] {\n    if (this.qname.startsWith('&')) {\n      console.error('Not expected &')\n      return []\n    }\n    if (this.reference) {\n      return []\n    }\n    switch (this.qname) {\n      case 'signer':\n      case 'address':\n      case 'Address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n        return []\n    }\n\n    // Type parameters are not depended\n    if (this.qname.indexOf(SPLITTER) == -1) {\n      if (this.qname.startsWith('T')) {\n        return []\n      }\n    }\n\n    const types = new Set<string>()\n    for (const param of this.typeArgs) {\n      param.dependedTypes().forEach((t) => types.add(t))\n    }\n\n    if (this.qname !== VECTOR_STR) {\n      types.add(this.qname)\n    }\n\n    return Array.from(types)\n  }\n}\n\nexport function parseMoveType(type: string): TypeDescriptor {\n  // type = type.replace('&', '')\n\n  type = type.replaceAll('&mut ', '&')\n  type = type.replaceAll('mut ', '')\n\n  // TODO replace ' ' is not exactly safe, need to double check this\n  type = type.replaceAll(' ', '')\n\n  const stack: TypeDescriptor[] = [new TypeDescriptor('')]\n  let buffer = []\n\n  // xxx:asdf<g1<a,<c,d>>, b, g2<a,b>, e>\n  for (let i = 0; i < type.length; i++) {\n    const ch = type[i]\n    if (ch === '<') {\n      // const symbol = type.slice(symbolStart, i)\n      // symbolStart =\n      const symbol = buffer.join('')\n      buffer = []\n      stack[stack.length - 1].qname = symbol\n      adjustType(stack[stack.length - 1])\n      stack.push(new TypeDescriptor(''))\n      continue\n    }\n    if (ch === '>') {\n      const typeParam = stack.pop()\n      if (!typeParam) {\n        throw Error('Unexpected stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\n      adjustType(typeParam)\n      stack[stack.length - 1].typeArgs.push(typeParam)\n      continue\n    }\n    if (ch === ',') {\n      const typeParam = stack.pop()\n      if (!typeParam) {\n        throw Error('Unexpected stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\n      adjustType(typeParam)\n\n      stack[stack.length - 1].typeArgs.push(typeParam)\n      // continue parse next param\n      stack.push(new TypeDescriptor(''))\n      continue\n    }\n\n    buffer.push(ch)\n  }\n\n  if (buffer.length > 0) {\n    stack[stack.length - 1].qname = buffer.join('')\n  }\n  adjustType(stack[stack.length - 1])\n\n  const res = stack.pop()\n  if (!res || stack.length > 0) {\n    throw Error('Unexpected stack size')\n  }\n  return res\n}\n\nfunction adjustType(type: TypeDescriptor) {\n  if (type.qname.startsWith('&')) {\n    type.reference = true\n    type.qname = type.qname.slice(1)\n  }\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/move/types.ts"],"names":[],"mappings":"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","sourcesContent":["import { SPLITTER, VECTOR_STR } from './utils.js'\n\nexport class TypeDescriptor {\n  qname: string\n  reference: boolean\n  mutable: boolean\n  typeArgs: TypeDescriptor[]\n\n  constructor(symbol: string, typeParams?: TypeDescriptor[]) {\n    this.qname = symbol\n    this.reference = false\n    this.mutable = false\n    this.typeArgs = typeParams || []\n  }\n\n  getSignature(): string {\n    if (this.typeArgs.length > 0) {\n      return this.qname + '<' + this.typeArgs.map((t) => t.getSignature()).join(', ') + '>'\n    }\n    return this.qname\n  }\n\n  // Replace T0, T1 with more concrete type\n  applyTypeArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor {\n    const replace = ctx.get(this.qname)\n    if (replace) {\n      return replace\n    }\n    if (ctx.size === 0 || this.typeArgs.length === 0) {\n      return this\n    }\n\n    const typeArgs: TypeDescriptor[] = []\n    for (const arg of this.typeArgs) {\n      const replace = ctx.get(arg.qname)\n      if (replace) {\n        typeArgs.push(replace)\n      } else {\n        typeArgs.push(arg.applyTypeArgs(ctx))\n      }\n    }\n    return new TypeDescriptor(this.qname, typeArgs)\n  }\n\n  // all depended types including itself, not include system type\n  dependedTypes(): string[] {\n    if (this.qname.startsWith('&')) {\n      console.error('Not expected &')\n      return []\n    }\n    if (this.reference) {\n      return []\n    }\n    switch (this.qname) {\n      case 'signer':\n      case 'address':\n      case 'Address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n        return []\n    }\n\n    // Type parameters are not depended\n    if (this.qname.indexOf(SPLITTER) == -1) {\n      if (this.qname.startsWith('T')) {\n        return []\n      }\n    }\n\n    const types = new Set<string>()\n    for (const param of this.typeArgs) {\n      param.dependedTypes().forEach((t) => types.add(t))\n    }\n\n    if (this.qname !== VECTOR_STR) {\n      types.add(this.qname)\n    }\n\n    return Array.from(types)\n  }\n}\n\nexport function parseMoveType(type: string): TypeDescriptor {\n  const stack: TypeDescriptor[] = [new TypeDescriptor('')]\n  let buffer = []\n\n  // xxx:asdf<g1<a,<c,d>>, b, g2<a,b>, e>\n  for (let i = 0; i < type.length; i++) {\n    const ch = type[i]\n    if (ch === ' ') {\n      continue\n    }\n    if (ch === '<') {\n      // const symbol = type.slice(symbolStart, i)\n      // symbolStart =\n      const symbol = buffer.join('')\n      buffer = []\n      stack[stack.length - 1].qname = symbol\n      adjustType(stack[stack.length - 1])\n      stack.push(new TypeDescriptor(''))\n      continue\n    }\n    if (ch === '>' || ch === ',') {\n      const typeParam = stack.pop()\n      if (!typeParam) {\n        throw Error('Unexpected stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\n      adjustType(typeParam)\n      stack[stack.length - 1].typeArgs.push(typeParam)\n      if (ch === ',') {\n        stack.push(new TypeDescriptor(''))\n      }\n      continue\n    }\n    buffer.push(ch)\n  }\n\n  if (buffer.length > 0) {\n    stack[stack.length - 1].qname = buffer.join('')\n  }\n  adjustType(stack[stack.length - 1])\n\n  const res = stack.pop()\n  if (!res || stack.length > 0) {\n    throw Error('Unexpected stack size')\n  }\n  return res\n}\n\nfunction adjustType(type: TypeDescriptor) {\n  if (type.qname.startsWith('&')) {\n    type.reference = true\n    type.qname = type.qname.slice(1)\n  }\n  if (type.qname.startsWith('mut')) {\n    type.mutable = true\n    type.qname = type.qname.slice(3)\n  }\n}\n"]}

package/lib/sui/codegen/codegen.js

@@ -3,14 +3,14 @@ import * as fs from 'fs';
 import chalk from 'chalk';
 import { AbstractCodegen } from '../../move/abstract-codegen.js';
 import { JsonRpcProvider } from '@mysten/sui.js';
-import { toNeutralModule } from '../move-types.js';
+import { toInternalModule } from '../move-types.js';
 import { moduleQname, SPLITTER } from '../../move/index.js';
 export async function codegen(abisDir, outDir = 'src/types/sui') {
     if (!fs.existsSync(abisDir)) {
         return;
     }
     console.log(chalk.green('Generated Types for Sui'));
-    const gen = new SuiCodeGen();
+    const gen = new SuiCodegen();
     await gen.generate(abisDir, outDir);
 }
 function getRpcEndpoint(network) {
@@ -23,7 +23,7 @@ function getRpcEndpoint(network) {
 function getRpcClient(network) {
     return new JsonRpcProvider(getRpcEndpoint(network));
 }
-class SuiCodeGen extends AbstractCodegen {
+class SuiCodegen extends AbstractCodegen {
     ADDRESS_TYPE = 'SuiAddress';
     MAIN_NET = SuiNetwork.MAIN_NET;
     TEST_NET = SuiNetwork.TEST_NET;
@@ -36,8 +36,8 @@ class SuiCodeGen extends AbstractCodegen {
     getMeaningfulFunctionParams(params) {
         return params.slice(0, params.length - 1);
     }
-    toNeutral(modules) {
-        return Object.values(modules).map(toNeutralModule);
+    toInternalModules(modules) {
+        return Object.values(modules).map(toInternalModule);
     }
     getEventStructs(module) {
         const qname = moduleQname(module);

package/lib/sui/codegen/codegen.js.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/sui/codegen/codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,eAAe,EAA4B,MAAM,gBAAgB,CAAA;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAkB,MAAM,qBAAqB,CAAA;AAE3E,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAe,EAAE,MAAM,GAAG,eAAe;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAM;KACP;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAA;IACnD,MAAM,GAAG,GAAG,IAAI,UAAU,EAAE,CAAA;IAC5B,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;AACrC,CAAC;AAED,SAAS,cAAc,CAAC,OAAmB;IACzC,QAAQ,OAAO,EAAE;QACf,KAAK,UAAU,CAAC,QAAQ;YACtB,OAAO,kCAAkC,CAAA;KAC5C;IACD,OAAO,kCAAkC,CAAA;AAC3C,CAAC;AAED,SAAS,YAAY,CAAC,OAAmB;IACvC,OAAO,IAAI,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAA;AACrD,CAAC;AAED,MAAM,UAAW,SAAQ,eAAqD;IAC5E,YAAY,GAAG,YAAY,CAAA;IAC3B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;IAC9B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;IAC9B,MAAM,GAAG,KAAK,CAAA;IACd,iBAAiB,GAAG,QAAQ,CAAA;IAE5B,KAAK,CAAC,YAAY,CAAC,OAAe,EAAE,OAAmB;QACrD,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;QACpC,OAAO,MAAM,MAAM,CAAC,iCAAiC,CAAC,OAAO,CAAC,CAAA;IAChE,CAAC;IAED,2BAA2B,CAAC,MAAwB;QAClD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,SAAS,CAAC,OAAiC;QACzC,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IACpD,CAAC;IAED,eAAe,CAAC,MAAyB;QACvC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA6B,CAAA;QAErD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAC3C,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAClD,QAAQ,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;aACrD;SACF;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,eAAe,CAAC,QAAgB;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC3C,IAAI,GAAG,CAAC,MAAM,EAAE;YACd,OAAO,GAAG,CAAC,MAAM,CAAA;SAClB;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF","sourcesContent":["import { SuiNetwork } from '../network.js'\nimport * as fs from 'fs'\nimport chalk from 'chalk'\nimport { NeutralMoveModule, NeutralMoveStruct } from '../../move/neutral-models.js'\nimport { AbstractCodegen } from '../../move/abstract-codegen.js'\nimport { JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'\nimport { toNeutralModule } from '../move-types.js'\nimport { moduleQname, SPLITTER, TypeDescriptor } from '../../move/index.js'\n\nexport async function codegen(abisDir: string, outDir = 'src/types/sui') {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  console.log(chalk.green('Generated Types for Sui'))\n  const gen = new SuiCodeGen()\n  await gen.generate(abisDir, outDir)\n}\n\nfunction getRpcEndpoint(network: SuiNetwork): string {\n  switch (network) {\n    case SuiNetwork.TEST_NET:\n      return 'https://fullnode.testnet.sui.io/'\n  }\n  return 'https://fullnode.mainnet.sui.io/'\n}\n\nfunction getRpcClient(network: SuiNetwork): JsonRpcProvider {\n  return new JsonRpcProvider(getRpcEndpoint(network))\n}\n\nclass SuiCodeGen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {\n  ADDRESS_TYPE = 'SuiAddress'\n  MAIN_NET = SuiNetwork.MAIN_NET\n  TEST_NET = SuiNetwork.TEST_NET\n  PREFIX = 'Sui'\n  STRUCT_FIELD_NAME = 'fields'\n\n  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {\n    const client = getRpcClient(network)\n    return await client.getNormalizedMoveModulesByPackage(account)\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return params.slice(0, params.length - 1)\n  }\n\n  toNeutral(modules: SuiMoveNormalizedModules): NeutralMoveModule[] {\n    return Object.values(modules).map(toNeutralModule)\n  }\n\n  getEventStructs(module: NeutralMoveModule) {\n    const qname = moduleQname(module)\n    const eventMap = new Map<string, NeutralMoveStruct>()\n\n    for (const struct of module.structs) {\n      const abilities = new Set(struct.abilities)\n      if (abilities.has('Drop') && abilities.has('Copy')) {\n        eventMap.set(qname + SPLITTER + struct.name, struct)\n      }\n    }\n    return eventMap\n  }\n\n  readModulesFile(fullPath: string) {\n    const res = super.readModulesFile(fullPath)\n    if (res.result) {\n      return res.result\n    }\n    return res\n  }\n}\n"]}
+{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/sui/codegen/codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,eAAe,EAA4B,MAAM,gBAAgB,CAAA;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAkB,MAAM,qBAAqB,CAAA;AAE3E,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAe,EAAE,MAAM,GAAG,eAAe;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAM;KACP;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAA;IACnD,MAAM,GAAG,GAAG,IAAI,UAAU,EAAE,CAAA;IAC5B,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;AACrC,CAAC;AAED,SAAS,cAAc,CAAC,OAAmB;IACzC,QAAQ,OAAO,EAAE;QACf,KAAK,UAAU,CAAC,QAAQ;YACtB,OAAO,kCAAkC,CAAA;KAC5C;IACD,OAAO,kCAAkC,CAAA;AAC3C,CAAC;AAED,SAAS,YAAY,CAAC,OAAmB;IACvC,OAAO,IAAI,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAA;AACrD,CAAC;AAED,MAAM,UAAW,SAAQ,eAAqD;IAC5E,YAAY,GAAG,YAAY,CAAA;IAC3B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;IAC9B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;IAC9B,MAAM,GAAG,KAAK,CAAA;IACd,iBAAiB,GAAG,QAAQ,CAAA;IAE5B,KAAK,CAAC,YAAY,CAAC,OAAe,EAAE,OAAmB;QACrD,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;QACpC,OAAO,MAAM,MAAM,CAAC,iCAAiC,CAAC,OAAO,CAAC,CAAA;IAChE,CAAC;IAED,2BAA2B,CAAC,MAAwB;QAClD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,iBAAiB,CAAC,OAAiC;QACjD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;IACrD,CAAC;IAED,eAAe,CAAC,MAA0B;QACxC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAA;QAEtD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAC3C,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAClD,QAAQ,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;aACrD;SACF;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,eAAe,CAAC,QAAgB;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC3C,IAAI,GAAG,CAAC,MAAM,EAAE;YACd,OAAO,GAAG,CAAC,MAAM,CAAA;SAClB;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF","sourcesContent":["import { SuiNetwork } from '../network.js'\nimport * as fs from 'fs'\nimport chalk from 'chalk'\nimport { InternalMoveModule, InternalMoveStruct } from '../../move/internal-models.js'\nimport { AbstractCodegen } from '../../move/abstract-codegen.js'\nimport { JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'\nimport { toInternalModule } from '../move-types.js'\nimport { moduleQname, SPLITTER, TypeDescriptor } from '../../move/index.js'\n\nexport async function codegen(abisDir: string, outDir = 'src/types/sui') {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  console.log(chalk.green('Generated Types for Sui'))\n  const gen = new SuiCodegen()\n  await gen.generate(abisDir, outDir)\n}\n\nfunction getRpcEndpoint(network: SuiNetwork): string {\n  switch (network) {\n    case SuiNetwork.TEST_NET:\n      return 'https://fullnode.testnet.sui.io/'\n  }\n  return 'https://fullnode.mainnet.sui.io/'\n}\n\nfunction getRpcClient(network: SuiNetwork): JsonRpcProvider {\n  return new JsonRpcProvider(getRpcEndpoint(network))\n}\n\nclass SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {\n  ADDRESS_TYPE = 'SuiAddress'\n  MAIN_NET = SuiNetwork.MAIN_NET\n  TEST_NET = SuiNetwork.TEST_NET\n  PREFIX = 'Sui'\n  STRUCT_FIELD_NAME = 'fields'\n\n  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {\n    const client = getRpcClient(network)\n    return await client.getNormalizedMoveModulesByPackage(account)\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return params.slice(0, params.length - 1)\n  }\n\n  toInternalModules(modules: SuiMoveNormalizedModules): InternalMoveModule[] {\n    return Object.values(modules).map(toInternalModule)\n  }\n\n  getEventStructs(module: InternalMoveModule) {\n    const qname = moduleQname(module)\n    const eventMap = new Map<string, InternalMoveStruct>()\n\n    for (const struct of module.structs) {\n      const abilities = new Set(struct.abilities)\n      if (abilities.has('Drop') && abilities.has('Copy')) {\n        eventMap.set(qname + SPLITTER + struct.name, struct)\n      }\n    }\n    return eventMap\n  }\n\n  readModulesFile(fullPath: string) {\n    const res = super.readModulesFile(fullPath)\n    if (res.result) {\n      return res.result\n    }\n    return res\n  }\n}\n"]}

package/lib/sui/move-coder.js

@@ -1,12 +1,12 @@
 import { AbstractMoveCoder } from '../move/abstract-move-coder.js';
-import { toNeutralModule } from './move-types.js';
+import { toInternalModule } from './move-types.js';
 import { SPLITTER } from '../move/index.js';
 export class MoveCoder extends AbstractMoveCoder {
     load(module) {
         if (this.contains(module.address, module.name)) {
             return;
         }
-        this.loadNeutral(toNeutralModule(module));
+        this.loadInternal(toInternalModule(module));
     }
     decodeEvent(event) {
         const res = this.decodedInternal({ ...event, data: event.fields });

package/lib/sui/move-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/sui/move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedEventInstance, TypedEntryFunctionPayload } from './models.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\nimport { MoveCall, MoveEvent, SuiMoveNormalizedModule } from '@mysten/sui.js'\nimport { toNeutralModule } from './move-types.js'\nimport { SPLITTER } from '../move/index.js'\n\nexport class MoveCoder extends AbstractMoveCoder<MoveEvent> {\n  load(module: SuiMoveNormalizedModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.loadNeutral(toNeutralModule(module))\n  }\n\n  decodeEvent<T>(event: MoveEvent): TypedEventInstance<T> | undefined {\n    const res = this.decodedInternal<T>({ ...event, data: event.fields })\n    return { ...event, fields_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: MoveEvent[]): TypedEventInstance<T>[] {\n    const resp = this.filterAndDecodeInternal(\n      typeQname,\n      resources.map((event) => {\n        return { ...event, data: event.fields, type: event.type }\n      })\n    )\n    return resp.map((res) => {\n      delete res.data_decoded\n      const event = res as MoveEvent\n      return { ...event, fields_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n    })\n  }\n\n  decodeFunctionPayload(payload: MoveCall): MoveCall {\n    // this.loadTypes(registry)\n    const argumentsTyped: any[] = []\n\n    try {\n      const functionType = [payload.package.objectId, payload.module, payload.function].join(SPLITTER)\n      const func = this.getMoveFunction(functionType)\n      const params = func.params.slice(0, func.params.length - 1)\n      const args = payload.arguments || []\n      for (const [idx, arg] of args.entries()) {\n        // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n        const argType = params[idx]\n        argumentsTyped.push(this.decode(arg, argType))\n      }\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(payload), e)\n      return payload\n    }\n\n    return {\n      ...payload,\n      arguments_decoded: argumentsTyped,\n    } as TypedEntryFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}
+{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/sui/move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedEventInstance, TypedEntryFunctionPayload } from './models.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\nimport { MoveCall, MoveEvent, SuiMoveNormalizedModule } from '@mysten/sui.js'\nimport { toInternalModule } from './move-types.js'\nimport { SPLITTER } from '../move/index.js'\n\nexport class MoveCoder extends AbstractMoveCoder<MoveEvent> {\n  load(module: SuiMoveNormalizedModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decodeEvent<T>(event: MoveEvent): TypedEventInstance<T> | undefined {\n    const res = this.decodedInternal<T>({ ...event, data: event.fields })\n    return { ...event, fields_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: MoveEvent[]): TypedEventInstance<T>[] {\n    const resp = this.filterAndDecodeInternal(\n      typeQname,\n      resources.map((event) => {\n        return { ...event, data: event.fields, type: event.type }\n      })\n    )\n    return resp.map((res) => {\n      delete res.data_decoded\n      const event = res as MoveEvent\n      return { ...event, fields_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n    })\n  }\n\n  decodeFunctionPayload(payload: MoveCall): MoveCall {\n    // this.loadTypes(registry)\n    const argumentsTyped: any[] = []\n\n    try {\n      const functionType = [payload.package.objectId, payload.module, payload.function].join(SPLITTER)\n      const func = this.getMoveFunction(functionType)\n      const params = func.params.slice(0, func.params.length - 1)\n      const args = payload.arguments || []\n      for (const [idx, arg] of args.entries()) {\n        // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n        const argType = params[idx]\n        argumentsTyped.push(this.decode(arg, argType))\n      }\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(payload), e)\n      return payload\n    }\n\n    return {\n      ...payload,\n      arguments_decoded: argumentsTyped,\n    } as TypedEntryFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}

package/lib/sui/move-types.d.ts

@@ -1,9 +1,9 @@
-import { SuiMoveNormalizedField, SuiMoveNormalizedFunction, SuiMoveNormalizedModule, SuiMoveNormalizedStruct, SuiMoveNormalizedType } from '@mysten/sui.js';
-import { NeutralMoveFunction, NeutralMoveModule, NeutralMoveStruct, NeutralMoveStructField } from '../move/neutral-models.js';
+import type { SuiMoveNormalizedField, SuiMoveNormalizedFunction, SuiMoveNormalizedModule, SuiMoveNormalizedStruct, SuiMoveNormalizedType } from '@mysten/sui.js';
+import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct, InternalMoveStructField } from '../move/internal-models.js';
 import { TypeDescriptor } from '../move/index.js';
 export type { SuiAddress } from '@mysten/sui.js';
-export declare function toNeutralModule(module: SuiMoveNormalizedModule): NeutralMoveModule;
-export declare function toNeutralFunction(name: string, func: SuiMoveNormalizedFunction): NeutralMoveFunction;
-export declare function toNeutralStruct(name: string, struct: SuiMoveNormalizedStruct): NeutralMoveStruct;
-export declare function toNeutralField(module: SuiMoveNormalizedField): NeutralMoveStructField;
-export declare function convertToTypeDescriptor(normalizedType: SuiMoveNormalizedType): TypeDescriptor;
+export declare function toInternalModule(module: SuiMoveNormalizedModule): InternalMoveModule;
+export declare function toInternalFunction(name: string, func: SuiMoveNormalizedFunction): InternalMoveFunction;
+export declare function toInternalStruct(name: string, struct: SuiMoveNormalizedStruct): InternalMoveStruct;
+export declare function toInternalField(module: SuiMoveNormalizedField): InternalMoveStructField;
+export declare function toTypeDescriptor(normalizedType: SuiMoveNormalizedType): TypeDescriptor;

package/lib/sui/move-types.js

@@ -1,79 +1,80 @@
-import { NeutralMoveFunctionVisibility, } from '../move/neutral-models.js';
+import { InternalMoveFunctionVisibility, } from '../move/internal-models.js';
 import { SPLITTER, TypeDescriptor } from '../move/index.js';
-export function toNeutralModule(module) {
+export function toInternalModule(module) {
     return {
         address: module.address,
-        exposed_functions: Object.entries(module.exposed_functions).map(([n, f]) => toNeutralFunction(n, f)),
+        exposedFunctions: Object.entries(module.exposed_functions).map(([n, f]) => toInternalFunction(n, f)),
         name: module.name,
-        structs: Object.entries(module.structs).map(([n, s]) => toNeutralStruct(n, s)),
+        structs: Object.entries(module.structs).map(([n, s]) => toInternalStruct(n, s)),
     };
 }
-export function toNeutralFunction(name, func) {
+export function toInternalFunction(name, func) {
     let visibility;
     switch (func.visibility) {
         case 'Private':
-            visibility = NeutralMoveFunctionVisibility.PRIVATE;
+            visibility = InternalMoveFunctionVisibility.PRIVATE;
             break;
         case 'Public':
-            visibility = NeutralMoveFunctionVisibility.PUBLIC;
+            visibility = InternalMoveFunctionVisibility.PUBLIC;
             break;
         case 'Friend':
-            visibility = NeutralMoveFunctionVisibility.FRIEND;
+            visibility = InternalMoveFunctionVisibility.FRIEND;
             break;
+        default:
+            throw Error('No visibility for function' + name);
     }
     return {
-        generic_type_params: func.type_parameters.map((p) => {
+        typeParams: func.type_parameters.map((p) => {
             return { constraints: p.abilities };
         }),
-        is_entry: func.is_entry,
+        isEntry: func.is_entry,
         name: name,
-        params: func.parameters.map(convertToTypeDescriptor),
-        return: func.return_.map(convertToTypeDescriptor),
+        params: func.parameters.map(toTypeDescriptor),
+        return: func.return_.map(toTypeDescriptor),
         visibility: visibility,
     };
 }
-export function toNeutralStruct(name, struct) {
+export function toInternalStruct(name, struct) {
     return {
         abilities: struct.abilities.abilities,
-        fields: struct.fields.map(toNeutralField),
-        generic_type_params: struct.type_parameters.map((p) => {
+        fields: struct.fields.map(toInternalField),
+        typeParams: struct.type_parameters.map((p) => {
             return { constraints: p.constraints.abilities };
         }),
-        is_native: false,
+        isNative: false,
         name: name,
     };
 }
-export function toNeutralField(module) {
+export function toInternalField(module) {
     return {
         name: module.name,
-        type: convertToTypeDescriptor(module.type_),
+        type: toTypeDescriptor(module.type_),
     };
 }
-export function convertToTypeDescriptor(normalizedType) {
+export function toTypeDescriptor(normalizedType) {
     if (typeof normalizedType === 'string') {
         return new TypeDescriptor(normalizedType);
     }
     if ('Struct' in normalizedType) {
-        // normalizedType.Struct.
-        // return normalizedType;
         const qname = [normalizedType.Struct.address, normalizedType.Struct.module, normalizedType.Struct.name].join(SPLITTER);
-        const args = normalizedType.Struct.type_arguments.map(convertToTypeDescriptor);
+        const args = normalizedType.Struct.type_arguments.map(toTypeDescriptor);
         return new TypeDescriptor(qname, args);
     }
     if ('Vector' in normalizedType) {
-        return new TypeDescriptor('vector', [convertToTypeDescriptor(normalizedType.Vector)]);
+        return new TypeDescriptor('vector', [toTypeDescriptor(normalizedType.Vector)]);
     }
     if ('TypeParameter' in normalizedType) {
         return new TypeDescriptor('T' + normalizedType.TypeParameter);
     }
     if ('Reference' in normalizedType) {
-        const res = convertToTypeDescriptor(normalizedType.Reference);
+        const res = toTypeDescriptor(normalizedType.Reference);
         res.reference = true;
         return res;
     }
     if ('MutableReference' in normalizedType) {
-        const res = convertToTypeDescriptor(normalizedType.MutableReference);
+        const res = toTypeDescriptor(normalizedType.MutableReference);
         res.reference = true;
+        res.mutable = true;
         return res;
     }
     throw new Error('Unexpected sui type');