@sentio/sdk 2.4.0-rc.1 → 2.5.0-rc.1

package/lib/{aptos/codegen/typegen.js → move/account.js}

@@ -1,67 +1,5 @@
-import { parseMoveType } from '../types.js';
-import { moduleQname, moduleQnameForType, SPLITTER, VECTOR_STR } from '../utils.js';
-function generateTypeForDescriptor(type, currentAddress) {
-    // 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, currentAddress) {
-    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, currentAddress) {
-    return generateTypeForDescriptor(parseMoveType(type), currentAddress);
-}
+import { parseMoveType } from './types.js';
+import { moduleQname, moduleQnameForType } from './utils.js';
 export class AccountModulesImportInfo {
     // account to module
     imports;
@@ -107,9 +45,18 @@ export class AccountRegister {
             // 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()) {
+        this.registerStruct(module, accountModuleImports);
+        this.registerFunctions(module, accountModuleImports);
+        this.accountImports.set(currentModuleFqn, accountModuleImports);
+        return accountModuleImports;
+    }
+    registerFunctions(module, accountModuleImports) {
+        for (const func of module.exposed_functions) {
+            if (!func.is_entry) {
+                continue;
+            }
+            for (const param of func.params) {
+                for (const type of param.dependedTypes()) {
                     const [account, module] = moduleQnameForType(type);
                     accountModuleImports.addImport(account, module);
                     if (!this.accountImports.has(account)) {
@@ -118,12 +65,11 @@ export class AccountRegister {
                 }
             }
         }
-        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()) {
+    }
+    registerStruct(module, accountModuleImports) {
+        for (const struct of module.structs) {
+            for (const field of struct.fields) {
+                for (const type of field.type.dependedTypes()) {
                     const [account, module] = moduleQnameForType(type);
                     accountModuleImports.addImport(account, module);
                     if (!this.accountImports.has(account)) {
@@ -132,14 +78,6 @@ export class AccountRegister {
                 }
             }
         }
-        this.accountImports.set(currentModuleFqn, accountModuleImports);
-        return accountModuleImports;
-    }
-}
-export function normalizeToJSName(name) {
-    if (name === 'package' || name === 'volatile') {
-        return name + '_';
     }
-    return name;
 }
-//# sourceMappingURL=typegen.js.map
+//# sourceMappingURL=account.js.map

package/lib/move/account.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/move/account.ts"],"names":[],"mappings":"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","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"]}

package/lib/move/filter.d.ts

@@ -0,0 +1,25 @@
+import { MoveFetchConfig, ProcessResult } from '@sentio/protos';
+export interface EventFilter {
+    type: string;
+    account?: string;
+}
+export interface FunctionNameAndCallFilter extends CallFilter {
+    function: string;
+}
+export interface CallFilter {
+    includeFailed?: boolean;
+    typeArguments?: string[];
+}
+export interface ArgumentsFilter {
+    arguments?: string[];
+}
+export declare class EventHandler<T> {
+    filters: EventFilter[];
+    handler: (event: T) => Promise<ProcessResult>;
+    fetchConfig: MoveFetchConfig;
+}
+export declare class CallHandler<T> {
+    filters: FunctionNameAndCallFilter[];
+    handler: (call: T) => Promise<ProcessResult>;
+    fetchConfig: MoveFetchConfig;
+}

package/lib/move/filter.js

@@ -0,0 +1,11 @@
+export class EventHandler {
+    filters;
+    handler;
+    fetchConfig;
+}
+export class CallHandler {
+    filters;
+    handler;
+    fetchConfig;
+}
+//# sourceMappingURL=filter.js.map

package/lib/move/filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../src/move/filter.ts"],"names":[],"mappings":"AAsBA,MAAM,OAAO,YAAY;IACvB,OAAO,CAAe;IACtB,OAAO,CAAsC;IAC7C,WAAW,CAAiB;CAC7B;AAED,MAAM,OAAO,WAAW;IACtB,OAAO,CAA6B;IACpC,OAAO,CAAqC;IAC5C,WAAW,CAAiB;CAC7B","sourcesContent":["// TODO extends ArgumentsFilter\nimport { MoveFetchConfig, ProcessResult } from '@sentio/protos'\n\nexport interface EventFilter {\n  type: string\n  account?: string\n}\n\nexport interface FunctionNameAndCallFilter extends CallFilter {\n  function: string\n}\n\n// TODO extends ArgumentsFilter\nexport interface CallFilter {\n  includeFailed?: boolean\n  typeArguments?: string[]\n}\n\nexport interface ArgumentsFilter {\n  arguments?: string[]\n}\n\nexport class EventHandler<T> {\n  filters: EventFilter[]\n  handler: (event: T) => Promise<ProcessResult>\n  fetchConfig: MoveFetchConfig\n}\n\nexport class CallHandler<T> {\n  filters: FunctionNameAndCallFilter[]\n  handler: (call: T) => Promise<ProcessResult>\n  fetchConfig: MoveFetchConfig\n}\n"]}

package/lib/move/index.d.ts

@@ -1,25 +1,5 @@
-import { MoveFetchConfig, ProcessResult } from '@sentio/protos';
-export interface EventFilter {
-    type: string;
-    account?: string;
-}
-export interface FunctionNameAndCallFilter extends CallFilter {
-    function: string;
-}
-export interface CallFilter {
-    includeFailed?: boolean;
-    typeArguments?: string[];
-}
-export interface ArgumentsFilter {
-    arguments?: string[];
-}
-export declare class EventHandler<T> {
-    filters: EventFilter[];
-    handler: (event: T) => Promise<ProcessResult>;
-    fetchConfig: MoveFetchConfig;
-}
-export declare class CallHandler<T> {
-    filters: FunctionNameAndCallFilter[];
-    handler: (call: T) => Promise<ProcessResult>;
-    fetchConfig: MoveFetchConfig;
-}
+export * from './filter.js';
+export * from './types.js';
+export * from './ts-type.js';
+export * from './utils.js';
+export * from './account.js';

package/lib/move/index.js

@@ -1,11 +1,6 @@
-export class EventHandler {
-    filters;
-    handler;
-    fetchConfig;
-}
-export class CallHandler {
-    filters;
-    handler;
-    fetchConfig;
-}
+export * from './filter.js';
+export * from './types.js';
+export * from './ts-type.js';
+export * from './utils.js';
+export * from './account.js';
 //# sourceMappingURL=index.js.map

package/lib/move/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/move/index.ts"],"names":[],"mappings":"AAsBA,MAAM,OAAO,YAAY;IACvB,OAAO,CAAe;IACtB,OAAO,CAAsC;IAC7C,WAAW,CAAiB;CAC7B;AAED,MAAM,OAAO,WAAW;IACtB,OAAO,CAA6B;IACpC,OAAO,CAAqC;IAC5C,WAAW,CAAiB;CAC7B","sourcesContent":["// TODO extends ArgumentsFilter\nimport { Data_AptCall, Data_AptEvent, MoveFetchConfig, ProcessResult } from '@sentio/protos'\n\nexport interface EventFilter {\n  type: string\n  account?: string\n}\n\nexport interface FunctionNameAndCallFilter extends CallFilter {\n  function: string\n}\n\n// TODO extends ArgumentsFilter\nexport interface CallFilter {\n  includeFailed?: boolean\n  typeArguments?: string[]\n}\n\nexport interface ArgumentsFilter {\n  arguments?: string[]\n}\n\nexport class EventHandler<T> {\n  filters: EventFilter[]\n  handler: (event: T) => Promise<ProcessResult>\n  fetchConfig: MoveFetchConfig\n}\n\nexport class CallHandler<T> {\n  filters: FunctionNameAndCallFilter[]\n  handler: (call: T) => Promise<ProcessResult>\n  fetchConfig: MoveFetchConfig\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/move/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA","sourcesContent":["export * from './filter.js'\nexport * from './types.js'\nexport * from './ts-type.js'\nexport * from './utils.js'\nexport * from './account.js'\n"]}

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

@@ -0,0 +1,34 @@
+import { TypeDescriptor } from './types.js';
+export interface NeutralMoveModule {
+    address: string;
+    name: string;
+    exposed_functions: Array<NeutralMoveFunction>;
+    structs: Array<NeutralMoveStruct>;
+}
+export interface NeutralMoveFunction {
+    name: string;
+    visibility: NeutralMoveFunctionVisibility;
+    is_entry: boolean;
+    generic_type_params: Array<NeutralMoveGenericTypeParam>;
+    params: Array<TypeDescriptor>;
+    return: Array<TypeDescriptor>;
+}
+export interface NeutralMoveStruct {
+    name: string;
+    is_native: boolean;
+    abilities: Array<string>;
+    generic_type_params: Array<NeutralMoveGenericTypeParam>;
+    fields: Array<NeutralMoveStructField>;
+}
+export interface NeutralMoveStructField {
+    name: string;
+    type: TypeDescriptor;
+}
+export declare enum NeutralMoveFunctionVisibility {
+    PRIVATE = "private",
+    PUBLIC = "public",
+    FRIEND = "friend"
+}
+export type NeutralMoveGenericTypeParam = {
+    constraints: Array<string>;
+};

package/lib/move/neutral-models.js

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"neutral-models.js","sourceRoot":"","sources":["../../src/move/neutral-models.ts"],"names":[],"mappings":"AAoCA,MAAM,CAAN,IAAY,6BAIX;AAJD,WAAY,6BAA6B;IACvC,oDAAmB,CAAA;IACnB,kDAAiB,CAAA;IACjB,kDAAiB,CAAA;AACnB,CAAC,EAJW,6BAA6B,KAA7B,6BAA6B,QAIxC","sourcesContent":["import { TypeDescriptor } from './types.js'\n\nexport interface NeutralMoveModule {\n  address: string\n  name: string\n\n  exposed_functions: Array<NeutralMoveFunction>\n  structs: Array<NeutralMoveStruct>\n}\n\nexport interface NeutralMoveFunction {\n  name: string\n  visibility: NeutralMoveFunctionVisibility\n  is_entry: boolean\n  generic_type_params: Array<NeutralMoveGenericTypeParam>\n  params: Array<TypeDescriptor>\n  return: Array<TypeDescriptor>\n}\n\nexport interface NeutralMoveStruct {\n  name: string\n\n  is_native: boolean\n\n  abilities: Array<string>\n\n  generic_type_params: Array<NeutralMoveGenericTypeParam>\n\n  fields: Array<NeutralMoveStructField>\n}\n\nexport interface NeutralMoveStructField {\n  name: string\n  type: TypeDescriptor\n}\n\nexport enum NeutralMoveFunctionVisibility {\n  PRIVATE = 'private',\n  PUBLIC = 'public',\n  FRIEND = 'friend',\n}\n\nexport type NeutralMoveGenericTypeParam = {\n  constraints: Array<string>\n}\n"]}

package/lib/move/ts-type.d.ts

@@ -0,0 +1,2 @@
+import { TypeDescriptor } from './types.js';
+export declare function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string, addressType: string): string;

package/lib/move/ts-type.js

@@ -0,0 +1,77 @@
+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;
+    }
+    if (type.reference) {
+        return addressType;
+    }
+    switch (type.qname) {
+        case 'signer': // TODO check this
+        case 'address':
+        case 'Address':
+            return addressType;
+        case '0x2::object::ID':
+        case '0x2::coin::Coin':
+            return 'string';
+        case '0x1::string::String':
+            return 'string';
+        case 'bool':
+        case 'Bool':
+            return 'Boolean';
+        case 'u8':
+        case 'U8':
+        case 'u16':
+        case 'U16':
+        case 'u32':
+        case 'U32':
+            return 'number';
+        case 'u64':
+        case 'U64':
+        case 'u128':
+        case 'U128':
+            return 'bigint';
+    }
+    if (type.qname.toLowerCase() === VECTOR_STR) {
+        // vector<u8> as hex string
+        const elementTypeQname = type.typeArgs[0].qname;
+        if (elementTypeQname === 'u8' || elementTypeQname === 'U8') {
+            return 'string';
+        }
+        if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {
+            return `${elementTypeQname}[] | string`;
+        }
+        return generateTypeForDescriptor(type.typeArgs[0], currentAddress, addressType) + '[]';
+    }
+    const simpleName = generateSimpleType(type.qname, currentAddress);
+    if (simpleName.length === 0) {
+        console.error('unexpected error');
+    }
+    if (simpleName.toLowerCase().includes(VECTOR_STR)) {
+        console.error('unexpected vector type error');
+    }
+    if (type.typeArgs.length > 0) {
+        // return simpleName
+        return (simpleName +
+            '<' +
+            type.typeArgs.map((t) => generateTypeForDescriptor(t, currentAddress, addressType)).join(',') +
+            '>');
+    }
+    return simpleName;
+}
+function generateSimpleType(type, currentAddress) {
+    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('.');
+}
+//# sourceMappingURL=ts-type.js.map

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

@@ -0,0 +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"]}

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

@@ -0,0 +1 @@
+{"version":3,"file":"ts-type.test.js","sourceRoot":"","sources":["../../src/move/ts-type.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,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 → move}/types.d.ts

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

package/lib/{aptos → move}/types.js

@@ -1,8 +1,10 @@
 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
     typeArgs;
@@ -40,18 +42,29 @@ export class TypeDescriptor {
     // all depended types including itself, not include system type
     dependedTypes() {
         if (this.qname.startsWith('&')) {
+            console.error('Not expected &');
+            return [];
+        }
+        if (this.reference) {
             return [];
         }
         switch (this.qname) {
             case 'signer':
             case 'address':
+            case 'Address':
             case '0x1::string::String':
             case 'bool':
+            case 'Bool':
             case 'u8':
+            case 'U8':
             case 'u16':
+            case 'U16':
             case 'u32':
+            case 'U32':
             case 'u64':
+            case 'U64':
             case 'u128':
+            case 'U128':
                 return [];
         }
         // Type parameters are not depended
@@ -87,30 +100,33 @@ export function parseMoveType(type) {
             const symbol = buffer.join('');
             buffer = [];
             stack[stack.length - 1].qname = symbol;
+            adjustType(stack[stack.length - 1]);
             stack.push(new TypeDescriptor(''));
             continue;
         }
         if (ch === '>') {
             const typeParam = stack.pop();
             if (!typeParam) {
-                throw Error('Uxpectecd stack size');
+                throw Error('Unexpected stack size');
             }
             if (buffer.length > 0) {
                 typeParam.qname = buffer.join('');
                 buffer = [];
             }
+            adjustType(typeParam);
             stack[stack.length - 1].typeArgs.push(typeParam);
             continue;
         }
         if (ch === ',') {
             const typeParam = stack.pop();
             if (!typeParam) {
-                throw Error('Uxpectecd stack size');
+                throw Error('Unexpected stack size');
             }
             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(''));
@@ -121,10 +137,17 @@ export function parseMoveType(type) {
     if (buffer.length > 0) {
         stack[stack.length - 1].qname = buffer.join('');
     }
+    adjustType(stack[stack.length - 1]);
     const res = stack.pop();
     if (!res || stack.length > 0) {
-        throw Error('Uxpectecd stack size');
+        throw Error('Unexpected stack size');
     }
     return res;
 }
+function adjustType(type) {
+    if (type.qname.startsWith('&')) {
+        type.reference = true;
+        type.qname = type.qname.slice(1);
+    }
+}
 //# sourceMappingURL=types.js.map

package/lib/move/types.js.map

@@ -0,0 +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"]}

package/lib/move/utils.d.ts

@@ -0,0 +1,9 @@
+export declare const SPLITTER = "::";
+export declare const VECTOR_STR = "vector";
+export declare function isFrameworkAccount(account: string): boolean;
+export declare function normalizeToJSName(name: string): string;
+export declare function moduleQnameForType(type: string): [string, string];
+export declare function moduleQname(module: {
+    address: string;
+    name: string;
+}): string;

package/lib/move/utils.js

@@ -0,0 +1,20 @@
+export const SPLITTER = '::';
+export const VECTOR_STR = 'vector';
+export function isFrameworkAccount(account) {
+    return account === '0x1' || account === '0x2' || account === '0x3';
+}
+const KEYWORDS = new Set(['package', 'namespace', 'volatile', 'object', 'string', 'number', 'bigint']);
+export function normalizeToJSName(name) {
+    if (KEYWORDS.has(name)) {
+        return name + '_';
+    }
+    return name;
+}
+export function moduleQnameForType(type) {
+    const parts = type.split(SPLITTER).slice(0, 2);
+    return [parts[0], parts[1]];
+}
+export function moduleQname(module) {
+    return module.address.toLowerCase() + SPLITTER + module.name;
+}
+//# sourceMappingURL=utils.js.map

package/lib/move/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/move/utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAA;AAE5B,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAA;AAElC,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,CAAA;AACpE,CAAC;AAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;AAEtG,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACtB,OAAO,IAAI,GAAG,GAAG,CAAA;KAClB;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAyC;IACnE,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAA;AAC9D,CAAC","sourcesContent":["export const SPLITTER = '::'\n\nexport const VECTOR_STR = 'vector'\n\nexport function isFrameworkAccount(account: string) {\n  return account === '0x1' || account === '0x2' || account === '0x3'\n}\n\nconst KEYWORDS = new Set(['package', 'namespace', 'volatile', 'object', 'string', 'number', 'bigint'])\n\nexport function normalizeToJSName(name: string) {\n  if (KEYWORDS.has(name)) {\n    return name + '_'\n  }\n  return name\n}\n\nexport function moduleQnameForType(type: string): [string, string] {\n  const parts = type.split(SPLITTER).slice(0, 2)\n  return [parts[0], parts[1]]\n}\n\nexport function moduleQname(module: { address: string; name: string }): string {\n  return module.address.toLowerCase() + SPLITTER + module.name\n}\n"]}