diff --git a/packages/typechain-polkadot/index.ts b/packages/typechain-polkadot/index.ts index ada2ac6b..197ec5f4 100644 --- a/packages/typechain-polkadot/index.ts +++ b/packages/typechain-polkadot/index.ts @@ -64,16 +64,16 @@ const _argv = YARGS description: 'Plugins directory', type: 'string', }) - .option('jsExt', { - description: 'Use .js extension in imports', - type: 'boolean', - default: false, - }) - .option('assertJson', { - description: 'Use assert JSON in imports', - type: 'boolean', - default: false, - }) + .option('jsExt', { + description: 'Use .js extension in imports', + type: 'boolean', + default: false, + }) + .option('assertJson', { + description: 'Use assert JSON in imports', + type: 'boolean', + default: false, + }) .help().alias( 'h', 'help') .argv; @@ -105,16 +105,16 @@ async function main() { await typechain.loadPluginsFromFiles(pluginFileNames); } - const options = { - jsExt: argv.jsExt ? '.js' : '', - assertJson: argv.assertJson ? " assert { type: 'json' }" : '', - } - console.log('options', options) + const options = { + jsExt: argv.jsExt ? '.js' : '', + assertJson: argv.assertJson ? " assert { type: 'json' }" : '', + }; + console.log('options', options); await typechain.run( PathAPI.resolve(cwdPath, `./${argv.input}`), PathAPI.resolve(cwdPath, `./${argv.output}`), - options + options ); } diff --git a/packages/typechain-polkadot/src/generators/build-extrinsic.ts b/packages/typechain-polkadot/src/generators/build-extrinsic.ts index 65fb01ce..4ae6f90e 100644 --- a/packages/typechain-polkadot/src/generators/build-extrinsic.ts +++ b/packages/typechain-polkadot/src/generators/build-extrinsic.ts @@ -30,61 +30,61 @@ import {TypechainPlugin} from "../types/interfaces"; const generateForMetaTemplate = Handlebars.compile(readTemplate("build-extrinsic")); export default class BuildExtrinsicPlugin implements TypechainPlugin { - generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { - const parser = new TypeParser(abi); + generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { + const parser = new TypeParser(abi); - const __allArgs = abi.messages.map(m => m.args).flat(); - const __uniqueArgs : typeof __allArgs = []; - for(const __arg of __allArgs) - if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) - __uniqueArgs.push(__arg); + const __allArgs = abi.messages.map(m => m.args).flat(); + const __uniqueArgs : typeof __allArgs = []; + for(const __arg of __allArgs) + if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) + __uniqueArgs.push(__arg); - const _argsTypes = __uniqueArgs.map(a => ({ - id: a.type.lookupIndex!, - tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, - })); + const _argsTypes = __uniqueArgs.map(a => ({ + id: a.type.lookupIndex!, + tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, + })); - let _methodsNames = abi.messages.map((m, i) => { - return { - original: m.identifier, - cut: m.identifier.split("::").pop()!, - }; - }); + let _methodsNames = abi.messages.map((m, i) => { + return { + original: m.identifier, + cut: m.identifier.split("::").pop()!, + }; + }); - _methodsNames = _methodsNames.map((m) => { - const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; - if(_overloadsCount > 1) { - return { - original: m.original, - cut: m.original, - }; - } else { - return m; - } - }); + _methodsNames = _methodsNames.map((m) => { + const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; + if(_overloadsCount > 1) { + return { + original: m.original, + cut: m.original, + }; + } else { + return m; + } + }); - const imports: Import[] = []; - const methods: Method[] = []; + const imports: Import[] = []; + const methods: Method[] = []; - for(const __message of abi.messages) { - const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; - methods.push({ - name: _methodName.cut, - originalName: _methodName.original, - args: __message.args.map(__a => ({ - name: __a.name, - type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, - })), - payable: __message.isPayable, - methodType: 'extrinsic', - }); - } + for(const __message of abi.messages) { + const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; + methods.push({ + name: _methodName.cut, + originalName: _methodName.original, + args: __message.args.map(__a => ({ + name: __a.name, + type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, + })), + payable: __message.isPayable, + methodType: 'extrinsic', + }); + } - writeFileSync(absPathToOutput, `build-extrinsic/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, methods, additionalImports: imports})); + writeFileSync(absPathToOutput, `build-extrinsic/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, methods, additionalImports: imports})); } name: string = "BuildExtrinsicPlugin"; outputDir: string = "build-extrinsic"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/constructors.ts b/packages/typechain-polkadot/src/generators/constructors.ts index e4d9a896..58988957 100644 --- a/packages/typechain-polkadot/src/generators/constructors.ts +++ b/packages/typechain-polkadot/src/generators/constructors.ts @@ -33,66 +33,66 @@ export default class ConstructorsPlugin implements TypechainPlugin { name = "ConstructorsPlugin"; outputDir = "constructors"; overrides = false; - options = {} + options = {}; generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { - const relPathFromOutL1toABIs = PathAPI.relative( - process.cwd(), - absPathToABIs - ); + const relPathFromOutL1toABIs = PathAPI.relative( + process.cwd(), + absPathToABIs + ); - const parser = new TypeParser(abi); + const parser = new TypeParser(abi); - const __allArgs = abi.constructors.map(m => m.args).flat(); - const __uniqueArgs : typeof __allArgs = []; - for(const __arg of __allArgs) - if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) - __uniqueArgs.push(__arg); + const __allArgs = abi.constructors.map(m => m.args).flat(); + const __uniqueArgs : typeof __allArgs = []; + for(const __arg of __allArgs) + if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) + __uniqueArgs.push(__arg); - const _argsTypes = __uniqueArgs.map(a => ({ - id: a.type.lookupIndex!, - tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, - })); + const _argsTypes = __uniqueArgs.map(a => ({ + id: a.type.lookupIndex!, + tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, + })); - let _methodsNames = abi.constructors.map((m, i) => { - return { - original: m.identifier, - cut: m.identifier.split("::").pop()!, - }; - }); + let _methodsNames = abi.constructors.map((m, i) => { + return { + original: m.identifier, + cut: m.identifier.split("::").pop()!, + }; + }); - _methodsNames = _methodsNames.map((m) => { - const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; - if(_overloadsCount > 1) { - return { - original: m.original, - cut: m.original, - }; - } else { - return m; - } - }); + _methodsNames = _methodsNames.map((m) => { + const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; + if(_overloadsCount > 1) { + return { + original: m.original, + cut: m.original, + }; + } else { + return m; + } + }); - const methods: Method[] = []; - for(const __message of abi.constructors) { - const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; - methods.push({ - name: _methodName.cut, - originalName: _methodName.original, - args: __message.args.map(__a => ({ - name: __a.name, - type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, - })), - payable: __message.isPayable, - methodType: 'constructor', - }); - } + const methods: Method[] = []; + for(const __message of abi.constructors) { + const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; + methods.push({ + name: _methodName.cut, + originalName: _methodName.original, + args: __message.args.map(__a => ({ + name: __a.name, + type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, + })), + payable: __message.isPayable, + methodType: 'constructor', + }); + } - writeFileSync( - absPathToOutput, - `constructors/${fileName}.ts`, - generateForMetaTemplate({...this.options, fileName, methods}) - ); + writeFileSync( + absPathToOutput, + `constructors/${fileName}.ts`, + generateForMetaTemplate({...this.options, fileName, methods}) + ); } } diff --git a/packages/typechain-polkadot/src/generators/contract-info.ts b/packages/typechain-polkadot/src/generators/contract-info.ts index c13f3a34..2f4ae303 100644 --- a/packages/typechain-polkadot/src/generators/contract-info.ts +++ b/packages/typechain-polkadot/src/generators/contract-info.ts @@ -48,6 +48,6 @@ export default class ContractInfoPlugin implements TypechainPlugin { name: string = "ContractInfoPlugin"; outputDir: string = "contract-info"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/contract.ts b/packages/typechain-polkadot/src/generators/contract.ts index 642691d3..02800880 100644 --- a/packages/typechain-polkadot/src/generators/contract.ts +++ b/packages/typechain-polkadot/src/generators/contract.ts @@ -33,15 +33,15 @@ export default class ContractPlugin implements TypechainPlugin { name: string = 'ContractPlugin'; outputDir: string = 'contracts'; - options = {} + options = {}; generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { - const imports: Import[] = []; - const relPathFromOutL1toABIs = PathAPI.relative( - PathAPI.resolve(absPathToOutput, "contracts"), - absPathToABIs - ); + const imports: Import[] = []; + const relPathFromOutL1toABIs = PathAPI.relative( + PathAPI.resolve(absPathToOutput, "contracts"), + absPathToABIs + ); - writeFileSync(absPathToOutput, `contracts/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, abiDirRelPath: relPathFromOutL1toABIs, additionalImports: imports})); + writeFileSync(absPathToOutput, `contracts/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, abiDirRelPath: relPathFromOutL1toABIs, additionalImports: imports})); } } diff --git a/packages/typechain-polkadot/src/generators/data.ts b/packages/typechain-polkadot/src/generators/data.ts index 257cec14..a501e869 100644 --- a/packages/typechain-polkadot/src/generators/data.ts +++ b/packages/typechain-polkadot/src/generators/data.ts @@ -33,18 +33,18 @@ export default class DataPlugin implements TypechainPlugin { generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { const parser = new TypeParser(abi); - const tsTypes = parser.tsTypes.filter((type) => { - return type.tsArgType.length; - }) + const tsTypes = parser.tsTypes.filter((type) => { + return type.tsArgType.length; + }); - writeFileSync( - absPathToOutput, - `data/${fileName}.json`, - generateForMetaTemplate({...this.options, tsTypes}) - ); + writeFileSync( + absPathToOutput, + `data/${fileName}.json`, + generateForMetaTemplate({...this.options, tsTypes}) + ); } name: string = "DataPlugin"; outputDir: string = "data"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/event-data.ts b/packages/typechain-polkadot/src/generators/event-data.ts index 2366cf7e..bffa2f54 100644 --- a/packages/typechain-polkadot/src/generators/event-data.ts +++ b/packages/typechain-polkadot/src/generators/event-data.ts @@ -33,14 +33,14 @@ export default class EventDataPlugin implements TypechainPlugin { generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { const parser = new TypeParser(abi); - writeFileSync( - absPathToOutput, - `event-data/${fileName}.json`, - generateForMetaTemplate({...this.options, tsTypes: parser.tsEventTypes}) - ); + writeFileSync( + absPathToOutput, + `event-data/${fileName}.json`, + generateForMetaTemplate({...this.options, tsTypes: parser.tsEventTypes}) + ); } name: string = "EventDataPlugin"; outputDir: string = "event-data"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/events-types.ts b/packages/typechain-polkadot/src/generators/events-types.ts index 4befafbe..d524ada1 100644 --- a/packages/typechain-polkadot/src/generators/events-types.ts +++ b/packages/typechain-polkadot/src/generators/events-types.ts @@ -34,14 +34,14 @@ export default class EventTypesPlugin { const parser = new TypeParser(abi); - writeFileSync( - absPathToOutput, - `event-types/${fileName}.ts`, - generateForMetaTemplate({...this.options, fileName, tsTypes: parser.tsEventTypes, additionalImports: []}) - ); + writeFileSync( + absPathToOutput, + `event-types/${fileName}.ts`, + generateForMetaTemplate({...this.options, fileName, tsTypes: parser.tsEventTypes, additionalImports: []}) + ); } name: string = "EventTypesPlugin"; outputDir: string = "event-types"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/events.ts b/packages/typechain-polkadot/src/generators/events.ts index 557fe26e..ab4679d0 100644 --- a/packages/typechain-polkadot/src/generators/events.ts +++ b/packages/typechain-polkadot/src/generators/events.ts @@ -41,18 +41,18 @@ function generate(abi: Abi, fileName: string, absPathToOutput: string) { export default class EventsPlugin { generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { - const parser = new TypeParser(abi); + const parser = new TypeParser(abi); - const events: PolkadotEvent[] = parser.tsEventTypes.map((event) => { - return { - name: event.tsReturnType, - }; - }); + const events: PolkadotEvent[] = parser.tsEventTypes.map((event) => { + return { + name: event.tsReturnType, + }; + }); - writeFileSync(absPathToOutput, `events/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, events})); + writeFileSync(absPathToOutput, `events/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, events})); } name: string = "EventsPlugin"; outputDir: string = "events"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/mixed-methods.ts b/packages/typechain-polkadot/src/generators/mixed-methods.ts index 1faa301f..2fc50fb8 100644 --- a/packages/typechain-polkadot/src/generators/mixed-methods.ts +++ b/packages/typechain-polkadot/src/generators/mixed-methods.ts @@ -33,79 +33,79 @@ const generateForMetaTemplate = Handlebars.compile(readTemplate("mixed-methods") export default class MixedMethodsPlugin implements TypechainPlugin { generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { - const parser = new TypeParser(abi); + const parser = new TypeParser(abi); - const __allArgs = abi.messages.map(m => m.args).flat(); - const __uniqueArgs : typeof __allArgs = []; - for(const __arg of __allArgs) - if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) - __uniqueArgs.push(__arg); + const __allArgs = abi.messages.map(m => m.args).flat(); + const __uniqueArgs : typeof __allArgs = []; + for(const __arg of __allArgs) + if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) + __uniqueArgs.push(__arg); - const _argsTypes = __uniqueArgs.map(a => ({ - id: a.type.lookupIndex!, - tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, - })); + const _argsTypes = __uniqueArgs.map(a => ({ + id: a.type.lookupIndex!, + tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, + })); - let _methodsNames = abi.messages.map((m, i) => { - return { - original: m.identifier, - cut: m.identifier.split("::").pop()!, - }; - }); + let _methodsNames = abi.messages.map((m, i) => { + return { + original: m.identifier, + cut: m.identifier.split("::").pop()!, + }; + }); - _methodsNames = _methodsNames.map((m) => { - const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; - if(_overloadsCount > 1) { - return { - original: m.original, - cut: m.original, - }; - } else { - return m; - } - }); + _methodsNames = _methodsNames.map((m) => { + const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; + if(_overloadsCount > 1) { + return { + original: m.original, + cut: m.original, + }; + } else { + return m; + } + }); - const imports: Import[] = []; - const methods: Method[] = []; + const imports: Import[] = []; + const methods: Method[] = []; - for(const __message of abi.messages) { - const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; - if(__message.isMutating) { - methods.push({ - name: _methodName.cut, - originalName: _methodName.original, - args: __message.args.map(__a => ({ - name: __a.name, - type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, - })), - payable: __message.isPayable, - methodType: 'tx', - }); - } - else { - methods.push({ - name: _methodName.cut, - originalName: _methodName.original, - args: __message.args.map(__a => ({ - name: __a.name, - type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, - })), - returnType: __message.returnType && { - tsStr: parser.getType(__message.returnType!.lookupIndex as number).tsReturnTypePrefixed, - id: __message.returnType!.lookupIndex!, - }, - payable: __message.isPayable, - mutating: __message.isMutating, - methodType: 'query', - resultQuery: getTypeName(abi, __message) === 'Result', - }); - } - } + for(const __message of abi.messages) { + const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; + if(__message.isMutating) { + methods.push({ + name: _methodName.cut, + originalName: _methodName.original, + args: __message.args.map(__a => ({ + name: __a.name, + type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, + })), + payable: __message.isPayable, + methodType: 'tx', + }); + } + else { + methods.push({ + name: _methodName.cut, + originalName: _methodName.original, + args: __message.args.map(__a => ({ + name: __a.name, + type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, + })), + returnType: __message.returnType && { + tsStr: parser.getType(__message.returnType!.lookupIndex as number).tsReturnTypePrefixed, + id: __message.returnType!.lookupIndex!, + }, + payable: __message.isPayable, + mutating: __message.isMutating, + methodType: 'query', + resultQuery: getTypeName(abi, __message) === 'Result', + }); + } + } - writeFileSync(absPathToOutput, `mixed-methods/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, methods, additionalImports: imports})); + writeFileSync(absPathToOutput, `mixed-methods/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, methods, additionalImports: imports})); } name: string = "MixedMethodsPlugin"; outputDir: string = "mixed-methods"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/query.ts b/packages/typechain-polkadot/src/generators/query.ts index 72e237b8..c61ff5b6 100644 --- a/packages/typechain-polkadot/src/generators/query.ts +++ b/packages/typechain-polkadot/src/generators/query.ts @@ -43,67 +43,67 @@ export const FILE = (fileName : string, methods : Method[], additionalImports: I export default class QueryPlugin implements TypechainPlugin { generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { - const parser = new TypeParser(abi); + const parser = new TypeParser(abi); - const __allArgs = abi.messages.map(m => m.args).flat(); - const __uniqueArgs : typeof __allArgs = []; - for(const __arg of __allArgs) - if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) - __uniqueArgs.push(__arg); + const __allArgs = abi.messages.map(m => m.args).flat(); + const __uniqueArgs : typeof __allArgs = []; + for(const __arg of __allArgs) + if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) + __uniqueArgs.push(__arg); - const _argsTypes = __uniqueArgs.map(a => { - return { - id: a.type.lookupIndex!, - tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, - }; - }); + const _argsTypes = __uniqueArgs.map(a => { + return { + id: a.type.lookupIndex!, + tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, + }; + }); - let _methodsNames = abi.messages.map((m, i) => { - return { - original: m.identifier, - cut: m.identifier.split("::").pop()!, - }; - }); + let _methodsNames = abi.messages.map((m, i) => { + return { + original: m.identifier, + cut: m.identifier.split("::").pop()!, + }; + }); - _methodsNames = _methodsNames.map((m) => { - const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; - if(_overloadsCount > 1) { - return { - original: m.original, - cut: m.original, - }; - } else { - return m; - } - }); + _methodsNames = _methodsNames.map((m) => { + const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; + if(_overloadsCount > 1) { + return { + original: m.original, + cut: m.original, + }; + } else { + return m; + } + }); - const imports: Import[] = []; - const methods: Method[] = []; + const imports: Import[] = []; + const methods: Method[] = []; - for(const __message of abi.messages) { - const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; - methods.push({ - name: _methodName.cut, - originalName: _methodName.original, - args: __message.args.map(__a => ({ - name: __a.name, - type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, - })), - returnType: __message.returnType && { - tsStr: parser.getType(__message.returnType!.lookupIndex as number).tsReturnTypePrefixed, - id: __message.returnType!.lookupIndex!, - }, - payable: __message.isPayable, - mutating: __message.isMutating, - methodType: 'query', - resultQuery: getTypeName(abi, __message) === 'Result', - }); - } + for(const __message of abi.messages) { + const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; + methods.push({ + name: _methodName.cut, + originalName: _methodName.original, + args: __message.args.map(__a => ({ + name: __a.name, + type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, + })), + returnType: __message.returnType && { + tsStr: parser.getType(__message.returnType!.lookupIndex as number).tsReturnTypePrefixed, + id: __message.returnType!.lookupIndex!, + }, + payable: __message.isPayable, + mutating: __message.isMutating, + methodType: 'query', + resultQuery: getTypeName(abi, __message) === 'Result', + }); + } - writeFileSync(absPathToOutput, `query/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, methods, additionalImports: imports})); + writeFileSync(absPathToOutput, `query/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, methods, additionalImports: imports})); } name = "QueryPlugin"; outputDir: string = "query"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/tx-sign-and-send.ts b/packages/typechain-polkadot/src/generators/tx-sign-and-send.ts index 0ad41084..57a01776 100644 --- a/packages/typechain-polkadot/src/generators/tx-sign-and-send.ts +++ b/packages/typechain-polkadot/src/generators/tx-sign-and-send.ts @@ -31,60 +31,60 @@ const generateForMetaTemplate = Handlebars.compile(readTemplate('tx-sign-and-sen export default class TxSignAndSendPlugin implements TypechainPlugin { generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { - const parser = new TypeParser(abi); + const parser = new TypeParser(abi); - const __allArgs = abi.messages.map(m => m.args).flat(); - const __uniqueArgs : typeof __allArgs = []; - for(const __arg of __allArgs) - if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) - __uniqueArgs.push(__arg); + const __allArgs = abi.messages.map(m => m.args).flat(); + const __uniqueArgs : typeof __allArgs = []; + for(const __arg of __allArgs) + if(!__uniqueArgs.find(__a => __a.type.lookupIndex === __arg.type.lookupIndex)) + __uniqueArgs.push(__arg); - const _argsTypes = __uniqueArgs.map(a => ({ - id: a.type.lookupIndex!, - tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, - })); + const _argsTypes = __uniqueArgs.map(a => ({ + id: a.type.lookupIndex!, + tsStr: parser.getType(a.type.lookupIndex as number).tsArgTypePrefixed, + })); - let _methodsNames = abi.messages.map((m, i) => { - return { - original: m.identifier, - cut: m.identifier.split("::").pop()!, - }; - }); + let _methodsNames = abi.messages.map((m, i) => { + return { + original: m.identifier, + cut: m.identifier.split("::").pop()!, + }; + }); - _methodsNames = _methodsNames.map((m) => { - const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; - if(_overloadsCount > 1) { - return { - original: m.original, - cut: m.original, - }; - } else { - return m; - } - }); + _methodsNames = _methodsNames.map((m) => { + const _overloadsCount = _methodsNames.filter(__m => __m.cut === m.cut).length; + if(_overloadsCount > 1) { + return { + original: m.original, + cut: m.original, + }; + } else { + return m; + } + }); - const methods: Method[] = []; + const methods: Method[] = []; - for(const __message of abi.messages) { - const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; - methods.push({ - name: _methodName.cut, - originalName: _methodName.original, - args: __message.args.map(__a => ({ - name: __a.name, - type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, - })), - payable: __message.isPayable, - methodType: 'tx', - }); - } + for(const __message of abi.messages) { + const _methodName = _methodsNames.find(__m => __m.original === __message.identifier)!; + methods.push({ + name: _methodName.cut, + originalName: _methodName.original, + args: __message.args.map(__a => ({ + name: __a.name, + type: _argsTypes.find(_a => _a.id === __a.type.lookupIndex)!, + })), + payable: __message.isPayable, + methodType: 'tx', + }); + } - console.log( 'opts', this.options) + console.log( 'opts', this.options); - writeFileSync(absPathToOutput, `tx-sign-and-send/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, methods, additionalImports: []})); + writeFileSync(absPathToOutput, `tx-sign-and-send/${fileName}.ts`, generateForMetaTemplate({...this.options, fileName, methods, additionalImports: []})); } name: string = 'TxSignAndSendPlugin'; outputDir: string = 'tx-sign-and-send'; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/types-arguments.ts b/packages/typechain-polkadot/src/generators/types-arguments.ts index 4abac51e..ef52157b 100644 --- a/packages/typechain-polkadot/src/generators/types-arguments.ts +++ b/packages/typechain-polkadot/src/generators/types-arguments.ts @@ -33,15 +33,15 @@ const generateForMetaTemplate = Handlebars.compile(readTemplate("types-arguments export default class TypesArgumentsPlugin implements TypechainPlugin { generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { - const parser = new TypeParser(abi); - writeFileSync( - absPathToOutput, - `types-arguments/${fileName}.ts`, - generateForMetaTemplate({...this.options, tsTypes: parser.tsTypes, additionalImports: []}) - ); + const parser = new TypeParser(abi); + writeFileSync( + absPathToOutput, + `types-arguments/${fileName}.ts`, + generateForMetaTemplate({...this.options, tsTypes: parser.tsTypes, additionalImports: []}) + ); } name: string = "TypesArgumentsPlugin"; outputDir: string = "types-arguments"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/generators/types-returns.ts b/packages/typechain-polkadot/src/generators/types-returns.ts index 16e9e705..cc465838 100644 --- a/packages/typechain-polkadot/src/generators/types-returns.ts +++ b/packages/typechain-polkadot/src/generators/types-returns.ts @@ -33,14 +33,14 @@ export default class TypesReturnsPlugin { generate(abi: Abi, fileName: string, absPathToABIs: string, absPathToOutput: string): void { const parser = new TypeParser(abi); - writeFileSync( - absPathToOutput, - `types-returns/${fileName}.ts`, - generateForMetaTemplate({...this.options, tsTypes: parser.tsTypes, additionalImports: []}) - ); + writeFileSync( + absPathToOutput, + `types-returns/${fileName}.ts`, + generateForMetaTemplate({...this.options, tsTypes: parser.tsTypes, additionalImports: []}) + ); } name: string = "TypesReturnsPlugin"; outputDir: string = "types-returns"; - options = {} + options = {}; } diff --git a/packages/typechain-polkadot/src/types/typechain.ts b/packages/typechain-polkadot/src/types/typechain.ts index e80b6371..a6458447 100644 --- a/packages/typechain-polkadot/src/types/typechain.ts +++ b/packages/typechain-polkadot/src/types/typechain.ts @@ -31,13 +31,13 @@ export default class TypechainPolkadot { async run( absPathToABIs: string, absPathToOutput: string, - options: object + options: object ) { generateProjectStructure(absPathToOutput); for (const plugin of this.plugins) { - plugin.options = JSON.parse(JSON.stringify(options)); - console.log('plugin.options', plugin.options) + plugin.options = JSON.parse(JSON.stringify(options)); + console.log('plugin.options', plugin.options); if (plugin.beforeRun) { await plugin.beforeRun(