@dedot/codegen 0.1.1-next.77a2d8eb.4 → 0.2.0

package/cjs/typink/generator/ConstructorQueryGen.js

@@ -7,7 +7,7 @@ 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', 'ContractInstantiateResult');
+        this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'GenericConstructorCallResult', 'ConstructorCallOptions', 'ContractInstantiateResult');
         const { constructors } = this.contractMetadata.spec;
         const constructorsOut = this.doGenerate(constructors, 'ConstructorCallOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
@@ -15,10 +15,13 @@ class ConstructorQueryGen extends QueryGen_js_1.QueryGen {
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, constructorsOut }));
     }
     generateMethodDef(def) {
-        const { args } = def;
+        const { args, returnType } = def;
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorCallOptions) => Promise<ContractInstantiateResult<ChainApi>>>`;
+        const typeOutRaw = this.typesGen.generateType(returnType.type, 0, true);
+        // Unwrap langError result
+        const typeOut = typeOutRaw.match(/^(\w+)<(.*), (.*)>$/).at(2);
+        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorCallOptions) => Promise<GenericConstructorCallResult<${typeOut}, ContractInstantiateResult<ChainApi>>>>`;
     }
 }
 exports.ConstructorQueryGen = ConstructorQueryGen;

package/cjs/typink/generator/IndexGen.js

@@ -7,18 +7,23 @@ const utils_js_1 = require("../../utils.js");
 const SUFFIX = 'contract_api';
 class IndexGen {
     contractMetadata;
-    constructor(contractMetadata) {
+    typesGen;
+    constructor(contractMetadata, typesGen) {
         this.contractMetadata = contractMetadata;
+        this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
         const contractName = (0, utils_1.stringPascalCase)(`${this.contractMetadata.contract.name}_${SUFFIX}`);
+        const langErrorId = this.contractMetadata.spec.lang_error.type;
+        const langErrorName = this.typesGen.cleanPath(this.contractMetadata.types[langErrorId].type.path);
         const typeImports = new index_js_1.TypeImports();
         typeImports.addKnownType('VersionedGenericSubstrateApi', 'RpcVersion', 'RpcV2');
         typeImports.addContractType('GenericContractApi');
         typeImports.addChainType('SubstrateApi');
+        typeImports.addPortableType(langErrorName);
         const importTypes = typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('typink/templates/index.hbs');
-        return (0, utils_js_1.beautifySourceCode)(template({ contractName, importTypes }));
+        return (0, utils_js_1.beautifySourceCode)(template({ contractName, langErrorName, importTypes }));
     }
 }
 exports.IndexGen = IndexGen;

package/cjs/typink/generator/QueryGen.js

@@ -35,7 +35,9 @@ class QueryGen {
         this.importType(returnType.type);
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        const typeOut = this.typesGen.generateType(returnType.type, 0, true);
+        const typeOutRaw = this.typesGen.generateType(returnType.type, 0, true);
+        // Unwrap langError result
+        const typeOut = typeOutRaw.match(/^(\w+)<(.*), (.*)>$/).at(2);
         return `GenericContractQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractCallResult<ChainApi>>>>`;
     }
     generateParamsOut(args) {

package/cjs/typink/index.js

@@ -28,7 +28,7 @@ async function generateContractTypes(metadata, contract, outDir = '.', extension
     const constructorTxGen = new index_js_1.ConstructorTxGen(contractMetadata, typesGen);
     const constructorQueryGen = new index_js_1.ConstructorQueryGen(contractMetadata, typesGen);
     const eventsGen = new index_js_1.EventsGen(contractMetadata, typesGen);
-    const indexGen = new index_js_1.IndexGen(contractMetadata);
+    const indexGen = new index_js_1.IndexGen(contractMetadata, typesGen);
     fs_1.default.writeFileSync(typesFileName, await typesGen.generate(useSubPaths));
     fs_1.default.writeFileSync(queryTypesFileName, await queryGen.generate(useSubPaths));
     fs_1.default.writeFileSync(txTypesFileName, await txGen.generate(useSubPaths));

package/cjs/typink/templates/index.hbs

@@ -13,4 +13,9 @@ export interface {{{contractName}}}<Rv extends RpcVersion = RpcV2, ChainApi exte
     constructorQuery: ConstructorQuery<ChainApi[Rv]>;
     constructorTx: ConstructorTx<ChainApi[Rv]>;
     events: ContractEvents<ChainApi[Rv]>;
+
+    types: {
+      LangError: {{{langErrorName}}};
+      ChainApi: ChainApi[Rv];
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.1.1-next.77a2d8eb.4+77a2d8e",
+  "version": "0.2.0",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -18,14 +18,14 @@
     "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.1.1-next.77a2d8eb.4+77a2d8e",
-    "@dedot/codecs": "0.1.1-next.77a2d8eb.4+77a2d8e",
-    "@dedot/contracts": "0.1.1-next.77a2d8eb.4+77a2d8e",
-    "@dedot/providers": "0.1.1-next.77a2d8eb.4+77a2d8e",
-    "@dedot/runtime-specs": "0.1.1-next.77a2d8eb.4+77a2d8e",
-    "@dedot/shape": "0.1.1-next.77a2d8eb.4+77a2d8e",
-    "@dedot/types": "0.1.1-next.77a2d8eb.4+77a2d8e",
-    "@dedot/utils": "0.1.1-next.77a2d8eb.4+77a2d8e",
+    "@dedot/api": "0.2.0",
+    "@dedot/codecs": "0.2.0",
+    "@dedot/contracts": "0.2.0",
+    "@dedot/providers": "0.2.0",
+    "@dedot/runtime-specs": "0.2.0",
+    "@dedot/shape": "0.2.0",
+    "@dedot/types": "0.2.0",
+    "@dedot/utils": "0.2.0",
     "handlebars": "^4.7.8",
     "prettier": "^3.3.3"
   },
@@ -34,7 +34,7 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "77a2d8eb1aa950c978c1057657ef39b9061b3969",
+  "gitHead": "f29e8784997251518df1e33ef782f1d87207b126",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/typink/generator/ConstructorQueryGen.js

@@ -4,7 +4,7 @@ export class ConstructorQueryGen extends QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
-        this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'ConstructorCallOptions', 'ContractInstantiateResult');
+        this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'GenericConstructorCallResult', 'ConstructorCallOptions', 'ContractInstantiateResult');
         const { constructors } = this.contractMetadata.spec;
         const constructorsOut = this.doGenerate(constructors, 'ConstructorCallOptions');
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
@@ -12,9 +12,12 @@ export class ConstructorQueryGen extends QueryGen {
         return beautifySourceCode(template({ importTypes, constructorsOut }));
     }
     generateMethodDef(def) {
-        const { args } = def;
+        const { args, returnType } = def;
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorCallOptions) => Promise<ContractInstantiateResult<ChainApi>>>`;
+        const typeOutRaw = this.typesGen.generateType(returnType.type, 0, true);
+        // Unwrap langError result
+        const typeOut = typeOutRaw.match(/^(\w+)<(.*), (.*)>$/).at(2);
+        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ConstructorCallOptions) => Promise<GenericConstructorCallResult<${typeOut}, ContractInstantiateResult<ChainApi>>>>`;
     }
 }

package/typink/generator/IndexGen.d.ts

@@ -1,6 +1,8 @@
 import { ContractMetadata } from '@dedot/contracts';
+import { TypesGen } from './TypesGen.js';
 export declare class IndexGen {
     contractMetadata: ContractMetadata;
-    constructor(contractMetadata: ContractMetadata);
+    typesGen: TypesGen;
+    constructor(contractMetadata: ContractMetadata, typesGen: TypesGen);
     generate(useSubPaths?: boolean): Promise<string>;
 }

package/typink/generator/IndexGen.js

@@ -4,17 +4,22 @@ import { beautifySourceCode, compileTemplate } from '../../utils.js';
 const SUFFIX = 'contract_api';
 export class IndexGen {
     contractMetadata;
-    constructor(contractMetadata) {
+    typesGen;
+    constructor(contractMetadata, typesGen) {
         this.contractMetadata = contractMetadata;
+        this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
         const contractName = stringPascalCase(`${this.contractMetadata.contract.name}_${SUFFIX}`);
+        const langErrorId = this.contractMetadata.spec.lang_error.type;
+        const langErrorName = this.typesGen.cleanPath(this.contractMetadata.types[langErrorId].type.path);
         const typeImports = new TypeImports();
         typeImports.addKnownType('VersionedGenericSubstrateApi', 'RpcVersion', 'RpcV2');
         typeImports.addContractType('GenericContractApi');
         typeImports.addChainType('SubstrateApi');
+        typeImports.addPortableType(langErrorName);
         const importTypes = typeImports.toImports({ useSubPaths });
         const template = compileTemplate('typink/templates/index.hbs');
-        return beautifySourceCode(template({ contractName, importTypes }));
+        return beautifySourceCode(template({ contractName, langErrorName, importTypes }));
     }
 }

package/typink/generator/QueryGen.js

@@ -32,7 +32,9 @@ export class QueryGen {
         this.importType(returnType.type);
         args.forEach(({ type: { type } }) => this.importType(type));
         const paramsOut = this.generateParamsOut(args);
-        const typeOut = this.typesGen.generateType(returnType.type, 0, true);
+        const typeOutRaw = this.typesGen.generateType(returnType.type, 0, true);
+        // Unwrap langError result
+        const typeOut = typeOutRaw.match(/^(\w+)<(.*), (.*)>$/).at(2);
         return `GenericContractQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} options: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractCallResult<ChainApi>>>>`;
     }
     generateParamsOut(args) {

package/typink/index.js

@@ -22,7 +22,7 @@ export async function generateContractTypes(metadata, contract, outDir = '.', ex
     const constructorTxGen = new ConstructorTxGen(contractMetadata, typesGen);
     const constructorQueryGen = new ConstructorQueryGen(contractMetadata, typesGen);
     const eventsGen = new EventsGen(contractMetadata, typesGen);
-    const indexGen = new IndexGen(contractMetadata);
+    const indexGen = new IndexGen(contractMetadata, typesGen);
     fs.writeFileSync(typesFileName, await typesGen.generate(useSubPaths));
     fs.writeFileSync(queryTypesFileName, await queryGen.generate(useSubPaths));
     fs.writeFileSync(txTypesFileName, await txGen.generate(useSubPaths));

package/typink/templates/index.hbs

@@ -13,4 +13,9 @@ export interface {{{contractName}}}<Rv extends RpcVersion = RpcV2, ChainApi exte
     constructorQuery: ConstructorQuery<ChainApi[Rv]>;
     constructorTx: ConstructorTx<ChainApi[Rv]>;
     events: ContractEvents<ChainApi[Rv]>;
+
+    types: {
+      LangError: {{{langErrorName}}};
+      ChainApi: ChainApi[Rv];
+    };
 }