@dedot/codegen 0.0.1-next.cb041b89.17 → 0.0.1-next.cfee875e.21

package/cjs/shared/TypeImports.js

@@ -42,7 +42,7 @@ class TypeImports {
             [this.knownJsonRpcTypes, `${prefix}dedot/types/json-rpc`],
             [this.codecTypes, `${prefix}dedot/codecs`],
             [this.contractTypes, `${prefix}dedot/contracts`],
-            [this.chainTypes, prefix ? '@dedot/api/chaintypes' : 'dedot/contracts'],
+            [this.chainTypes, prefix ? '@dedot/api/chaintypes' : 'dedot/chaintypes'],
             [this.portableTypes, './types'],
         ];
         return toImports

package/cjs/typink/generator/ConstructorQueryGen.js

@@ -7,9 +7,9 @@ class ConstructorQueryGen extends QueryGen_js_1.QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'ConstructorCallOptions', 'ConstructorResult');
+        this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'ConstructorCallOptions', 'ContractInstantiateResult');
         const { constructors } = this.contractMetadata.spec;
-        const constructorsOut = this.doGenerate(constructors);
+        const constructorsOut = this.doGenerate(constructors, 'ConstructorCallOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('typink/templates/constructor-query.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, constructorsOut }));
@@ -18,7 +18,7 @@ class ConstructorQueryGen extends QueryGen_js_1.QueryGen {
         const { args } = def;
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorCallOptions) => Promise<ConstructorResult<ChainApi>>>`;
+        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorCallOptions) => Promise<ContractInstantiateResult<ChainApi>>>`;
     }
 }
 exports.ConstructorQueryGen = ConstructorQueryGen;

package/cjs/typink/generator/ConstructorTxGen.js

@@ -7,9 +7,9 @@ class ConstructorTxGen extends QueryGen_js_1.QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericConstructorTx', 'GenericConstructorTxCall', 'ConstructorTxOptions', 'GenericConstructorSubmittableExtrinsic');
+        this.typesGen.typeImports.addContractType('GenericConstructorTx', 'GenericConstructorTxCall', 'ConstructorTxOptions', 'GenericInstantiateSubmittableExtrinsic');
         const { constructors } = this.contractMetadata.spec;
-        const constructorsOut = this.doGenerate(constructors);
+        const constructorsOut = this.doGenerate(constructors, 'ConstructorTxOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('typink/templates/constructor-tx.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, constructorsOut }));
@@ -18,7 +18,7 @@ class ConstructorTxGen extends QueryGen_js_1.QueryGen {
         const { args } = def;
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        return `GenericConstructorTxCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorTxOptions) => GenericConstructorSubmittableExtrinsic<ChainApi>>`;
+        return `GenericConstructorTxCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi>>`;
     }
 }
 exports.ConstructorTxGen = ConstructorTxGen;

package/cjs/typink/generator/QueryGen.js

@@ -14,18 +14,18 @@ class QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericContractQuery', 'GenericContractQueryCall', 'ContractCallOptions', 'GenericContractCallResult', 'ContractResult');
+        this.typesGen.typeImports.addContractType('GenericContractQuery', 'GenericContractQueryCall', 'ContractCallOptions', 'GenericContractCallResult', 'ContractCallResult');
         const { messages } = this.contractMetadata.spec;
-        const queryCallsOut = this.doGenerate(messages);
+        const queryCallsOut = this.doGenerate(messages, 'ContractCallOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('typink/templates/query.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, queryCallsOut }));
     }
-    doGenerate(messages) {
+    doGenerate(messages, optionsTypeName) {
         let callsOut = '';
         messages.forEach((messageDef) => {
             const { label, docs, selector, args } = messageDef;
-            callsOut += `${(0, utils_js_1.commentBlock)(docs, '\n', args.map((arg) => `@param {${this.typesGen.generateType(arg.type.type, 1)}} ${(0, utils_1.stringCamelCase)(arg.label)}`), '\n', `@selector {${selector}}`)}`;
+            callsOut += `${(0, utils_js_1.commentBlock)(docs, '\n', args.map((arg) => `@param {${this.typesGen.generateType(arg.type.type, 1)}} ${(0, utils_1.stringCamelCase)(arg.label)}`), optionsTypeName ? `@param {${optionsTypeName}} options` : '', '\n', `@selector ${selector}`)}`;
             callsOut += `${(0, contracts_1.normalizeLabel)(label)}: ${this.generateMethodDef(messageDef)};\n\n`;
         });
         return callsOut;
@@ -36,7 +36,7 @@ class QueryGen {
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
         const typeOut = this.typesGen.generateType(returnType.type, 0, true);
-        return `GenericContractQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractResult<ChainApi>>>>`;
+        return `GenericContractQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractCallResult<ChainApi>>>>`;
     }
     generateParamsOut(args) {
         return args

package/cjs/typink/generator/TxGen.js

@@ -7,10 +7,10 @@ class TxGen extends QueryGen_js_1.QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericContractTx', 'GenericContractTxCall', 'ContractTxOptions', 'ChainSubmittableExtrinsic');
+        this.typesGen.typeImports.addContractType('GenericContractTx', 'GenericContractTxCall', 'ContractTxOptions', 'ContractSubmittableExtrinsic');
         const { messages } = this.contractMetadata.spec;
         const txMessages = messages.filter((one) => one.mutates);
-        const txCallsOut = this.doGenerate(txMessages);
+        const txCallsOut = this.doGenerate(txMessages, 'ContractTxOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('typink/templates/tx.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, txCallsOut }));
@@ -19,7 +19,7 @@ class TxGen extends QueryGen_js_1.QueryGen {
         const { args } = def;
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        return `GenericContractTxCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractTxOptions) => ChainSubmittableExtrinsic<ChainApi>>`;
+        return `GenericContractTxCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>>`;
     }
 }
 exports.TxGen = TxGen;

package/cjs/typink/templates/index.hbs

@@ -6,7 +6,7 @@ import { ContractTx } from './tx';
 import { ConstructorQuery } from './constructor-query';
 import { ConstructorTx } from './constructor-tx';
 
-export interface {{{contractName}}}<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<ChainApi[RpcVersion]> {
+export interface {{{contractName}}}<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<ChainApi> {
     query: ContractQuery<ChainApi[RpcVersion]>;
     tx: ContractTx<ChainApi[RpcVersion]>;
     constructorQuery: ConstructorQuery<ChainApi[RpcVersion]>;

package/cjs/utils.js

@@ -49,7 +49,7 @@ ${flatLines.map((line) => `* ${line.replaceAll(/\s+/g, ' ').trim()}`).join('\n')
 };
 exports.commentBlock = commentBlock;
 const beautifySourceCode = async (source) => {
-    const prettierOptions = await prettier.resolveConfig(path.resolve((0, dirname_1.currentDirname)(), '../../../../.prettierrc.js'));
+    const prettierOptions = await prettier.resolveConfig(path.resolve((0, dirname_1.currentDirname)(), '../../../.prettierrc.cjs'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
 };
 exports.beautifySourceCode = beautifySourceCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.0.1-next.cb041b89.17+cb041b8",
+  "version": "0.0.1-next.cfee875e.21+cfee875",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -18,13 +18,13 @@
     "copy": "cp -R ./src/chaintypes/templates ./dist/chaintypes && cp -R ./src/chaintypes/templates ./dist/cjs/chaintypes && cp -R ./src/typink/templates ./dist/typink && cp -R ./src/typink/templates ./dist/cjs/typink"
   },
   "dependencies": {
-    "@dedot/api": "0.0.1-next.cb041b89.17+cb041b8",
-    "@dedot/codecs": "0.0.1-next.cb041b89.17+cb041b8",
-    "@dedot/providers": "0.0.1-next.cb041b89.17+cb041b8",
-    "@dedot/runtime-specs": "0.0.1-next.cb041b89.17+cb041b8",
-    "@dedot/shape": "0.0.1-next.cb041b89.17+cb041b8",
-    "@dedot/types": "0.0.1-next.cb041b89.17+cb041b8",
-    "@dedot/utils": "0.0.1-next.cb041b89.17+cb041b8",
+    "@dedot/api": "0.0.1-next.cfee875e.21+cfee875",
+    "@dedot/codecs": "0.0.1-next.cfee875e.21+cfee875",
+    "@dedot/providers": "0.0.1-next.cfee875e.21+cfee875",
+    "@dedot/runtime-specs": "0.0.1-next.cfee875e.21+cfee875",
+    "@dedot/shape": "0.0.1-next.cfee875e.21+cfee875",
+    "@dedot/types": "0.0.1-next.cfee875e.21+cfee875",
+    "@dedot/utils": "0.0.1-next.cfee875e.21+cfee875",
     "handlebars": "^4.7.7",
     "prettier": "^3.2.5"
   },
@@ -33,7 +33,7 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "cb041b890507eefeb5c614d1f27105f0be404a9a",
+  "gitHead": "cfee875eafba07e0fbb8a72556ca549a62ddceff",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/shared/TypeImports.js

@@ -39,7 +39,7 @@ export class TypeImports {
             [this.knownJsonRpcTypes, `${prefix}dedot/types/json-rpc`],
             [this.codecTypes, `${prefix}dedot/codecs`],
             [this.contractTypes, `${prefix}dedot/contracts`],
-            [this.chainTypes, prefix ? '@dedot/api/chaintypes' : 'dedot/contracts'],
+            [this.chainTypes, prefix ? '@dedot/api/chaintypes' : 'dedot/chaintypes'],
             [this.portableTypes, './types'],
         ];
         return toImports

package/typink/generator/ConstructorQueryGen.js

@@ -4,9 +4,9 @@ export class ConstructorQueryGen extends QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'ConstructorCallOptions', 'ConstructorResult');
+        this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'ConstructorCallOptions', 'ContractInstantiateResult');
         const { constructors } = this.contractMetadata.spec;
-        const constructorsOut = this.doGenerate(constructors);
+        const constructorsOut = this.doGenerate(constructors, 'ConstructorCallOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('typink/templates/constructor-query.hbs');
         return beautifySourceCode(template({ importTypes, constructorsOut }));
@@ -15,6 +15,6 @@ export class ConstructorQueryGen extends QueryGen {
         const { args } = def;
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorCallOptions) => Promise<ConstructorResult<ChainApi>>>`;
+        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorCallOptions) => Promise<ContractInstantiateResult<ChainApi>>>`;
     }
 }

package/typink/generator/ConstructorTxGen.js

@@ -4,9 +4,9 @@ export class ConstructorTxGen extends QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericConstructorTx', 'GenericConstructorTxCall', 'ConstructorTxOptions', 'GenericConstructorSubmittableExtrinsic');
+        this.typesGen.typeImports.addContractType('GenericConstructorTx', 'GenericConstructorTxCall', 'ConstructorTxOptions', 'GenericInstantiateSubmittableExtrinsic');
         const { constructors } = this.contractMetadata.spec;
-        const constructorsOut = this.doGenerate(constructors);
+        const constructorsOut = this.doGenerate(constructors, 'ConstructorTxOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('typink/templates/constructor-tx.hbs');
         return beautifySourceCode(template({ importTypes, constructorsOut }));
@@ -15,6 +15,6 @@ export class ConstructorTxGen extends QueryGen {
         const { args } = def;
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        return `GenericConstructorTxCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorTxOptions) => GenericConstructorSubmittableExtrinsic<ChainApi>>`;
+        return `GenericConstructorTxCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi>>`;
     }
 }

package/typink/generator/QueryGen.d.ts

@@ -5,7 +5,7 @@ export declare class QueryGen {
     typesGen: TypesGen;
     constructor(contractMetadata: ContractMetadata, typeGen: TypesGen);
     generate(useSubPaths?: boolean): Promise<string>;
-    doGenerate(messages: Message[]): string;
+    doGenerate(messages: Message[], optionsTypeName?: string): string;
     generateMethodDef(def: Message): string;
     generateParamsOut(args: ContractMessageArg[]): string;
     importType(typeId: number): any;

package/typink/generator/QueryGen.js

@@ -11,18 +11,18 @@ export class QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericContractQuery', 'GenericContractQueryCall', 'ContractCallOptions', 'GenericContractCallResult', 'ContractResult');
+        this.typesGen.typeImports.addContractType('GenericContractQuery', 'GenericContractQueryCall', 'ContractCallOptions', 'GenericContractCallResult', 'ContractCallResult');
         const { messages } = this.contractMetadata.spec;
-        const queryCallsOut = this.doGenerate(messages);
+        const queryCallsOut = this.doGenerate(messages, 'ContractCallOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('typink/templates/query.hbs');
         return beautifySourceCode(template({ importTypes, queryCallsOut }));
     }
-    doGenerate(messages) {
+    doGenerate(messages, optionsTypeName) {
         let callsOut = '';
         messages.forEach((messageDef) => {
             const { label, docs, selector, args } = messageDef;
-            callsOut += `${commentBlock(docs, '\n', args.map((arg) => `@param {${this.typesGen.generateType(arg.type.type, 1)}} ${stringCamelCase(arg.label)}`), '\n', `@selector {${selector}}`)}`;
+            callsOut += `${commentBlock(docs, '\n', args.map((arg) => `@param {${this.typesGen.generateType(arg.type.type, 1)}} ${stringCamelCase(arg.label)}`), optionsTypeName ? `@param {${optionsTypeName}} options` : '', '\n', `@selector ${selector}`)}`;
             callsOut += `${normalizeLabel(label)}: ${this.generateMethodDef(messageDef)};\n\n`;
         });
         return callsOut;
@@ -33,7 +33,7 @@ export class QueryGen {
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
         const typeOut = this.typesGen.generateType(returnType.type, 0, true);
-        return `GenericContractQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractResult<ChainApi>>>>`;
+        return `GenericContractQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractCallResult<ChainApi>>>>`;
     }
     generateParamsOut(args) {
         return args

package/typink/generator/TxGen.js

@@ -4,10 +4,10 @@ export class TxGen extends QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericContractTx', 'GenericContractTxCall', 'ContractTxOptions', 'ChainSubmittableExtrinsic');
+        this.typesGen.typeImports.addContractType('GenericContractTx', 'GenericContractTxCall', 'ContractTxOptions', 'ContractSubmittableExtrinsic');
         const { messages } = this.contractMetadata.spec;
         const txMessages = messages.filter((one) => one.mutates);
-        const txCallsOut = this.doGenerate(txMessages);
+        const txCallsOut = this.doGenerate(txMessages, 'ContractTxOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('typink/templates/tx.hbs');
         return beautifySourceCode(template({ importTypes, txCallsOut }));
@@ -16,6 +16,6 @@ export class TxGen extends QueryGen {
         const { args } = def;
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        return `GenericContractTxCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractTxOptions) => ChainSubmittableExtrinsic<ChainApi>>`;
+        return `GenericContractTxCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>>`;
     }
 }

package/typink/templates/index.hbs

@@ -6,7 +6,7 @@ import { ContractTx } from './tx';
 import { ConstructorQuery } from './constructor-query';
 import { ConstructorTx } from './constructor-tx';
 
-export interface {{{contractName}}}<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<ChainApi[RpcVersion]> {
+export interface {{{contractName}}}<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<ChainApi> {
     query: ContractQuery<ChainApi[RpcVersion]>;
     tx: ContractTx<ChainApi[RpcVersion]>;
     constructorQuery: ConstructorQuery<ChainApi[RpcVersion]>;

package/utils.js

@@ -19,7 +19,7 @@ ${flatLines.map((line) => `* ${line.replaceAll(/\s+/g, ' ').trim()}`).join('\n')
     }
 };
 export const beautifySourceCode = async (source) => {
-    const prettierOptions = await prettier.resolveConfig(path.resolve(currentDirname(), '../../../../.prettierrc.js'));
+    const prettierOptions = await prettier.resolveConfig(path.resolve(currentDirname(), '../../../.prettierrc.cjs'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
 };
 export const compileTemplate = (templateFile) => {