@sentio/sdk 2.4.0 → 2.5.0-rc.2

package/src/testing/aptos-facet.ts

@@ -3,7 +3,7 @@ import { DataBinding, HandlerType } from '@sentio/protos'
 import { getChainId } from '../aptos/network.js'
 import { TestProcessorServer } from './test-processor-server.js'
 import { AptosNetwork, Event } from '@sentio/sdk/aptos'
-import { parseMoveType } from '../aptos/types.js'
+import { parseMoveType } from '../move/types.js'
 
 export class AptosFacet {
   server: TestProcessorServer

package/src/testing/sui-facet.ts

@@ -1,10 +1,11 @@
 import { DataBinding, HandlerType } from '@sentio/protos'
 import { getChainId } from '../sui/network.js'
 import { TestProcessorServer } from './test-processor-server.js'
-import { parseMoveType } from '../aptos/types.js'
+import { parseMoveType } from '../move/types.js'
 import { SuiNetwork } from '../sui/index.js'
 import { MoveEvent, SuiTransactionResponse, MoveCall } from '@mysten/sui.js'
 import { getMoveCalls } from '../sui/utils.js'
+import { SPLITTER } from '../move/index.js'
 
 export class SuiFacet {
   server: TestProcessorServer
@@ -38,7 +39,7 @@ export class SuiFacet {
     if (calls.length !== 1) {
       throw Error('Transaction has more than one calls')
     }
-    const functionType = calls[0].package.objectId + calls[0].module + calls[0].function
+    const functionType = [calls[0].package.objectId, calls[0].module, calls[0].function].join(SPLITTER)
 
     for (const config of this.server.contractConfigs) {
       if (config.contract?.chainId !== getChainId(network)) {

package/lib/aptos/codegen/typegen.d.ts

@@ -1,18 +0,0 @@
-import { MoveModule } from '../move-types.js';
-import { TypeDescriptor } from '../types.js';
-export declare function generateType(type: string, currentAddress: string): string;
-export declare class AccountModulesImportInfo {
-    imports: Map<string, Set<string>>;
-    account: string;
-    moduleName: string;
-    constructor(account: string, tsModuleName: string);
-    addImport(account: string, module: string): void;
-}
-export declare class AccountRegister {
-    accountImports: Map<string, AccountModulesImportInfo>;
-    pendingAccounts: Set<string>;
-    typeDescriptors: Map<string, TypeDescriptor>;
-    private loadTypeDescriptor;
-    register(module: MoveModule, tsModuleName: string): AccountModulesImportInfo;
-}
-export declare function normalizeToJSName(name: string): string;

package/lib/aptos/codegen/typegen.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../../src/aptos/codegen/typegen.ts"],"names":[],"mappings":"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","sourcesContent":["import { MoveModule } from '../move-types.js'\nimport { parseMoveType, TypeDescriptor } from '../types.js'\nimport { moduleQname, moduleQnameForType, SPLITTER, VECTOR_STR } from '../utils.js'\n\nfunction generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string): string {\n  // TODO &signer is defintely an address, but what if &OTHER_TYPE?\n  if (type.qname.startsWith('&')) {\n    return 'Address'\n  }\n\n  switch (type.qname) {\n    case 'signer': // TODO check this\n    case 'address':\n      return 'Address'\n    case '0x1::string::String':\n      return 'string'\n    case 'bool':\n      return 'Boolean'\n    case 'u8':\n    case 'u16':\n    case 'u32':\n      return 'number'\n    case 'u64':\n    case 'u128':\n      return 'bigint'\n  }\n\n  if (type.qname === VECTOR_STR) {\n    // vector<u8> as hex string\n    const elementTypeQname = type.typeArgs[0].qname\n    if (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) + '[]'\n  }\n\n  const simpleName = generateSimpleType(type.qname, currentAddress)\n  if (simpleName.length === 0) {\n    console.error('unexpected error')\n  }\n  if (simpleName.includes('vector')) {\n    console.error('unexpected error')\n  }\n  if (type.typeArgs.length > 0) {\n    // return simpleName\n    return simpleName + '<' + type.typeArgs.map((t) => generateTypeForDescriptor(t, currentAddress)).join(',') + '>'\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\n// TODO ctx need to have type parameters\nexport function generateType(type: string, currentAddress: string): string {\n  return generateTypeForDescriptor(parseMoveType(type), currentAddress)\n}\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  private 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: MoveModule, 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    for (const struct of module.structs) {\n      for (const field of struct.fields) {\n        for (const type of this.loadTypeDescriptor(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    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 this.loadTypeDescriptor(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    this.accountImports.set(currentModuleFqn, accountModuleImports)\n    return accountModuleImports\n  }\n}\n\nexport function normalizeToJSName(name: string) {\n  if (name === 'package' || name === 'volatile') {\n    return name + '_'\n  }\n  return name\n}\n"]}

package/lib/aptos/codegen/typegen.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"typegen.test.js","sourceRoot":"","sources":["../../../src/aptos/codegen/typegen.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACtC,MAAM,GAAG,GAAG,aAAa,CAAC,8BAA8B,CAAC,CAAA;QAEzD,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;QACzB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,CAAA;QAClD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IAC/D,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;QAEhC,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;QAC3B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,UAAU,GACd,wJAAwJ,CAAA;QAC1J,MAAM,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;QAErC,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,EAAE,CAAA;QAChC,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;QACzB,MAAM,CACJ,IAAI,CAAC,CAAC,CAAC,KAAK,mGAAmG,CAChH,CAAA;QACD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,yCAAyC,CAAC,CAAA;QAE7D,MAAM,kBAAkB,GAAG,GAAG,CAAC,YAAY,EAAE,CAAA;QAC7C,MAAM,CAAC,kBAAkB,KAAK,UAAU,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;IACF,sCAAsC;IACtC,EAAE;IACF,iEAAiE;IACjE,qBAAqB;IACrB,EAAE;IACF,+BAA+B;IAC/B,4DAA4D;IAC5D,yEAAyE;IACzE,KAAK;AACP,CAAC,CAAC,CAAA","sourcesContent":["import { assert } from 'chai'\nimport { parseMoveType } from '../types.js'\n\ndescribe('type gen', () => {\n  test('type gen for generic', async () => {\n    const res = parseMoveType('x<g1<a,g2<c,d>>,b,g3<a,b>,e>')\n\n    assert(res.qname === 'x')\n    assert(res.typeArgs[0].typeArgs[1].qname === 'g2')\n    assert(res.typeArgs[0].typeArgs[1].typeArgs[1].qname === 'd')\n  })\n\n  test('type gen for non generic', async () => {\n    const res = parseMoveType('xyz')\n\n    assert(res.qname === 'xyz')\n    assert(res.typeArgs.length === 0)\n  })\n\n  test('test depended types', async () => {\n    const typeString =\n      '0x1::table_with_length::TableWithLength<T0, 0xd5f9f2b1c24faee8f07b790e570c75dfa1b7d8c1e9a60162fbd92ade03ea29e4::iterable_table::IterableValue<T0, T1>>'\n    const res = parseMoveType(typeString)\n\n    const deps = res.dependedTypes()\n    assert(deps.length === 2)\n    assert(\n      deps[0] === '0xd5f9f2b1c24faee8f07b790e570c75dfa1b7d8c1e9a60162fbd92ade03ea29e4::iterable_table::IterableValue'\n    )\n    assert(deps[1] === '0x1::table_with_length::TableWithLength')\n\n    const computedTypeString = res.getSignature()\n    assert(computedTypeString === typeString)\n  })\n  // test('type type gen', async () => {\n  //\n  //   const res = parseGenericType('x<g1<a,g2<c,d>>,b,g3<a,b>,e>')\n  //   console.log(res)\n  //\n  //   assert(res.symbol === 'x')\n  //   assert(res.typeParams[0].typeParams[1].symbol === \"g2\")\n  //   assert(res.typeParams[0].typeParams[1].typeParams[1].symbol === \"d\")\n  // })\n})\n"]}

package/lib/aptos/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/aptos/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  // qualified name without type parameters\n  qname: string\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      return []\n    }\n    switch (this.qname) {\n      case 'signer':\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n      case 'u64':\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      stack.push(new TypeDescriptor(''))\n      continue\n    }\n    if (ch === '>') {\n      const typeParam = stack.pop()\n      if (!typeParam) {\n        throw Error('Uxpectecd stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\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('Uxpectecd stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\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\n  const res = stack.pop()\n  if (!res || stack.length > 0) {\n    throw Error('Uxpectecd stack size')\n  }\n  return res\n}\n"]}

package/lib/aptos/types.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.test.js","sourceRoot":"","sources":["../../src/aptos/types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACnC,IAAI,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;QACtD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,MAAM,IAAI,GAAG;IACX,IAAI,EAAE,wBAAwB;IAC9B,cAAc,EAAE,EAAE;IAClB,SAAS,EAAE,CAAC,oEAAoE,CAAC;IACjF,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;IACtB,QAAQ,EAAE,oCAAoC;CAC/C,CAAA","sourcesContent":["import { MOVE_CODER } from './move-coder.js'\nimport { aptos_account } from './builtin/0x1.js'\n\ndescribe('type decode', () => {\n  aptos_account.loadTypes(MOVE_CODER)\n  test('decode function payload', async () => {\n    const decoded = MOVE_CODER.decodeFunctionPayload(data)\n    console.log(decoded)\n  })\n})\n\nconst data = {\n  type: 'entry_function_payload',\n  type_arguments: [],\n  arguments: ['0xaaaf981fec16d967eb79bb51b4c6d39e75acb3482c6dabddb19ca9adbfceee80'],\n  code: { bytecode: '' },\n  function: '0x1::aptos_account::create_account',\n}\n"]}

package/lib/jest.config.d.ts

@@ -1,9 +0,0 @@
-/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
-declare const _default: {
-    preset: string;
-    modulePathIgnorePatterns: string[];
-    moduleNameMapper: {
-        '^(\\.{1,2}/.*)\\.js$': string;
-    };
-};
-export default _default;

package/lib/jest.config.js

@@ -1,9 +0,0 @@
-/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
-export default {
-    preset: 'ts-jest/presets/default-esm',
-    modulePathIgnorePatterns: ['<rootDir>/dist/'],
-    moduleNameMapper: {
-        '^(\\.{1,2}/.*)\\.js$': '$1',
-    },
-};
-//# sourceMappingURL=jest.config.js.map

package/lib/jest.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../src/jest.config.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,eAAe;IACb,MAAM,EAAE,6BAA6B;IACrC,wBAAwB,EAAE,CAAC,iBAAiB,CAAC;IAC7C,gBAAgB,EAAE;QAChB,sBAAsB,EAAE,IAAI;KAC7B;CACF,CAAA","sourcesContent":["/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */\nexport default {\n  preset: 'ts-jest/presets/default-esm',\n  modulePathIgnorePatterns: ['<rootDir>/dist/'],\n  moduleNameMapper: {\n    '^(\\\\.{1,2}/.*)\\\\.js$': '$1',\n  },\n}\n"]}

package/src/aptos/codegen/typegen.ts

@@ -1,165 +0,0 @@
-import { MoveModule } from '../move-types.js'
-import { parseMoveType, TypeDescriptor } from '../types.js'
-import { moduleQname, moduleQnameForType, SPLITTER, VECTOR_STR } from '../utils.js'
-
-function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string): string {
-  // TODO &signer is defintely an address, but what if &OTHER_TYPE?
-  if (type.qname.startsWith('&')) {
-    return 'Address'
-  }
-
-  switch (type.qname) {
-    case 'signer': // TODO check this
-    case 'address':
-      return 'Address'
-    case '0x1::string::String':
-      return 'string'
-    case 'bool':
-      return 'Boolean'
-    case 'u8':
-    case 'u16':
-    case 'u32':
-      return 'number'
-    case 'u64':
-    case 'u128':
-      return 'bigint'
-  }
-
-  if (type.qname === VECTOR_STR) {
-    // vector<u8> as hex string
-    const elementTypeQname = type.typeArgs[0].qname
-    if (elementTypeQname === 'u8') {
-      return 'string'
-    }
-    if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {
-      return `${elementTypeQname}[] | string`
-    }
-    return generateTypeForDescriptor(type.typeArgs[0], currentAddress) + '[]'
-  }
-
-  const simpleName = generateSimpleType(type.qname, currentAddress)
-  if (simpleName.length === 0) {
-    console.error('unexpected error')
-  }
-  if (simpleName.includes('vector')) {
-    console.error('unexpected error')
-  }
-  if (type.typeArgs.length > 0) {
-    // return simpleName
-    return simpleName + '<' + type.typeArgs.map((t) => generateTypeForDescriptor(t, currentAddress)).join(',') + '>'
-  }
-  return simpleName
-}
-
-function generateSimpleType(type: string, currentAddress: string): string {
-  const parts = type.split(SPLITTER)
-
-  for (let i = 0; i < parts.length; i++) {
-    parts[i] = normalizeToJSName(parts[i])
-  }
-
-  if (parts.length < 2) {
-    return parts[0]
-  }
-  if (parts[0] === currentAddress) {
-    return parts.slice(1).join('.')
-  }
-  return '_' + parts.join('.')
-}
-
-// TODO ctx need to have type parameters
-export function generateType(type: string, currentAddress: string): string {
-  return generateTypeForDescriptor(parseMoveType(type), currentAddress)
-}
-
-export class AccountModulesImportInfo {
-  // account to module
-  imports: Map<string, Set<string>>
-  account: string
-  moduleName: string
-
-  constructor(account: string, tsModuleName: string) {
-    this.account = account
-    this.moduleName = tsModuleName
-    this.imports = new Map<string, Set<string>>()
-  }
-
-  addImport(account: string, module: string) {
-    if (account === this.account) {
-      return
-    }
-    let accountModules = this.imports.get(account)
-    if (!accountModules) {
-      accountModules = new Set<string>()
-      this.imports.set(account, accountModules)
-    }
-    accountModules.add(module)
-  }
-}
-
-export class AccountRegister {
-  accountImports = new Map<string, AccountModulesImportInfo>()
-  pendingAccounts = new Set<string>()
-
-  // loadedAccount = new Set<string>()
-  typeDescriptors = new Map<string, TypeDescriptor>()
-
-  private loadTypeDescriptor(type: string) {
-    let descriptor = this.typeDescriptors.get(type)
-
-    // const descriptparseMoveType(type)
-    if (!descriptor) {
-      descriptor = parseMoveType(type)
-      this.typeDescriptors.set(type, descriptor)
-    }
-    return descriptor
-  }
-
-  register(module: MoveModule, tsModuleName: string): AccountModulesImportInfo {
-    const currentModuleFqn = moduleQname(module)
-
-    let accountModuleImports = this.accountImports.get(module.address)
-    if (!accountModuleImports) {
-      accountModuleImports = new AccountModulesImportInfo(module.address, tsModuleName)
-      this.accountImports.set(module.address, accountModuleImports)
-      // the account has already be processed, delete pending task
-      this.pendingAccounts.delete(module.address)
-    }
-
-    for (const struct of module.structs) {
-      for (const field of struct.fields) {
-        for (const type of this.loadTypeDescriptor(field.type).dependedTypes()) {
-          const [account, module] = moduleQnameForType(type)
-          accountModuleImports.addImport(account, module)
-          if (!this.accountImports.has(account)) {
-            this.pendingAccounts.add(account)
-          }
-        }
-      }
-    }
-
-    for (const func of module.exposed_functions) {
-      if (!func.is_entry) {
-        continue
-      }
-      for (const param of func.params) {
-        for (const type of this.loadTypeDescriptor(param).dependedTypes()) {
-          const [account, module] = moduleQnameForType(type)
-          accountModuleImports.addImport(account, module)
-          if (!this.accountImports.has(account)) {
-            this.pendingAccounts.add(account)
-          }
-        }
-      }
-    }
-    this.accountImports.set(currentModuleFqn, accountModuleImports)
-    return accountModuleImports
-  }
-}
-
-export function normalizeToJSName(name: string) {
-  if (name === 'package' || name === 'volatile') {
-    return name + '_'
-  }
-  return name
-}

package/src/jest.config.ts

@@ -1,8 +0,0 @@
-/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
-export default {
-  preset: 'ts-jest/presets/default-esm',
-  modulePathIgnorePatterns: ['<rootDir>/dist/'],
-  moduleNameMapper: {
-    '^(\\.{1,2}/.*)\\.js$': '$1',
-  },
-}