@dedot/codegen 0.4.1-next.b1afe683.1 → 0.4.2-next.5d9d02c1.7

package/chaintypes/generator/JsonRpcGen.js

@@ -35,8 +35,10 @@ export class JsonRpcGen extends ApiGen {
         super(typesGen);
         this.typesGen = typesGen;
         this.rpcMethods = rpcMethods;
-        HIDDEN_RPCS.filter((one) => !rpcMethods.includes(one)).forEach((one) => rpcMethods.push(one));
-        rpcMethods.sort();
+        if (rpcMethods.length > 0) {
+            HIDDEN_RPCS.filter((one) => !rpcMethods.includes(one)).forEach((one) => rpcMethods.push(one));
+            rpcMethods.sort();
+        }
     }
     generate(useSubPaths = false) {
         this.typesGen.clearCache();

package/chaintypes/index.js

@@ -47,5 +47,5 @@ export async function generateTypes(chain, metadata, rpcMethods, runtimeApis, ou
     fs.writeFileSync(txFileName, await txGen.generate(useSubPaths));
     fs.writeFileSync(indexFileName, await indexGen.generate(useSubPaths));
     fs.writeFileSync(runtimeApisFileName, await runtimeApisGen.generate(useSubPaths));
-    return { interfaceName };
+    return { interfaceName, outputFolder: dirPath };
 }

package/chaintypes/templates/json-rpc.hbs

@@ -2,4 +2,9 @@
 
 {{{ importTypes }}}
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<JsonRpcApis, {{{jsonRpcMethods}}}> & GenericJsonRpcApis<Rv>;
+export type ChainJsonRpcApis<Rv extends RpcVersion> =
+  {{#if jsonRpcMethods.length}}
+    Pick<JsonRpcApis, {{{jsonRpcMethods}}}> & GenericJsonRpcApis<Rv>;
+  {{else}}
+    JsonRpcApis & GenericJsonRpcApis<Rv>;
+  {{/if}}

package/cjs/chaintypes/generator/JsonRpcGen.js

@@ -38,8 +38,10 @@ class JsonRpcGen extends ApiGen_js_1.ApiGen {
         super(typesGen);
         this.typesGen = typesGen;
         this.rpcMethods = rpcMethods;
-        HIDDEN_RPCS.filter((one) => !rpcMethods.includes(one)).forEach((one) => rpcMethods.push(one));
-        rpcMethods.sort();
+        if (rpcMethods.length > 0) {
+            HIDDEN_RPCS.filter((one) => !rpcMethods.includes(one)).forEach((one) => rpcMethods.push(one));
+            rpcMethods.sort();
+        }
     }
     generate(useSubPaths = false) {
         this.typesGen.clearCache();

package/cjs/chaintypes/index.js

@@ -74,6 +74,6 @@ async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir =
     fs.writeFileSync(txFileName, await txGen.generate(useSubPaths));
     fs.writeFileSync(indexFileName, await indexGen.generate(useSubPaths));
     fs.writeFileSync(runtimeApisFileName, await runtimeApisGen.generate(useSubPaths));
-    return { interfaceName };
+    return { interfaceName, outputFolder: dirPath };
 }
 exports.generateTypes = generateTypes;

package/cjs/chaintypes/templates/json-rpc.hbs

@@ -2,4 +2,9 @@
 
 {{{ importTypes }}}
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<JsonRpcApis, {{{jsonRpcMethods}}}> & GenericJsonRpcApis<Rv>;
+export type ChainJsonRpcApis<Rv extends RpcVersion> =
+  {{#if jsonRpcMethods.length}}
+    Pick<JsonRpcApis, {{{jsonRpcMethods}}}> & GenericJsonRpcApis<Rv>;
+  {{else}}
+    JsonRpcApis & GenericJsonRpcApis<Rv>;
+  {{/if}}

package/cjs/typink/index.js

@@ -38,6 +38,6 @@ async function generateContractTypes(metadata, contract, outDir = '.', extension
     fs_1.default.writeFileSync(constructorTxTypesFileName, await constructorTxGen.generate(useSubPaths));
     fs_1.default.writeFileSync(eventsTypesFile, await eventsGen.generate(useSubPaths));
     fs_1.default.writeFileSync(indexTypesFileName, await indexGen.generate(useSubPaths));
-    return { interfaceName };
+    return { interfaceName, outputFolder: dirPath };
 }
 exports.generateContractTypes = generateContractTypes;

package/cjs/typink/templates/index.hbs

@@ -9,7 +9,7 @@ import { ContractEvents } from './events';
 
 export * from './types';
 
-export interface {{{interfaceName}}}<Rv extends RpcVersion = RpcV2, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<Rv, ChainApi> {
+export interface {{{interfaceName}}}<Rv extends RpcVersion = RpcVersion, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<Rv, ChainApi> {
     query: ContractQuery<ChainApi[Rv]>;
     tx: ContractTx<ChainApi[Rv]>;
     constructorQuery: ConstructorQuery<ChainApi[Rv]>;

package/cjs/utils.js

@@ -31,7 +31,7 @@ const fs = __importStar(require("fs"));
 const handlebars_1 = __importDefault(require("handlebars"));
 const path = __importStar(require("path"));
 const prettier = __importStar(require("prettier"));
-const dirname_1 = require("./dirname");
+const dirname_js_1 = require("./dirname.js");
 exports.WRAPPER_TYPE_REGEX = /^(\w+)<(.*)>$/;
 exports.TUPLE_TYPE_REGEX = /^\[(.*)]$/;
 const commentBlock = (...docs) => {
@@ -49,12 +49,12 @@ ${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.cjs'));
+    const prettierOptions = await prettier.resolveConfig(path.resolve((0, dirname_js_1.currentDirname)(), '../../../.prettierrc.cjs'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
 };
 exports.beautifySourceCode = beautifySourceCode;
 const compileTemplate = (templateFile) => {
-    const templateFilePath = path.resolve((0, dirname_1.currentDirname)(), templateFile);
+    const templateFilePath = path.resolve((0, dirname_js_1.currentDirname)(), templateFile);
     return handlebars_1.default.compile(fs.readFileSync(templateFilePath, 'utf8'));
 };
 exports.compileTemplate = compileTemplate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.4.1-next.b1afe683.1+b1afe68",
+  "version": "0.4.2-next.5d9d02c1.7+5d9d02c",
   "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.4.1-next.b1afe683.1+b1afe68",
-    "@dedot/codecs": "0.4.1-next.b1afe683.1+b1afe68",
-    "@dedot/contracts": "0.4.1-next.b1afe683.1+b1afe68",
-    "@dedot/providers": "0.4.1-next.b1afe683.1+b1afe68",
-    "@dedot/runtime-specs": "0.4.1-next.b1afe683.1+b1afe68",
-    "@dedot/shape": "0.4.1-next.b1afe683.1+b1afe68",
-    "@dedot/types": "0.4.1-next.b1afe683.1+b1afe68",
-    "@dedot/utils": "0.4.1-next.b1afe683.1+b1afe68",
+    "@dedot/api": "0.4.2-next.5d9d02c1.7+5d9d02c",
+    "@dedot/codecs": "0.4.2-next.5d9d02c1.7+5d9d02c",
+    "@dedot/contracts": "0.4.2-next.5d9d02c1.7+5d9d02c",
+    "@dedot/providers": "0.4.2-next.5d9d02c1.7+5d9d02c",
+    "@dedot/runtime-specs": "0.4.2-next.5d9d02c1.7+5d9d02c",
+    "@dedot/shape": "0.4.2-next.5d9d02c1.7+5d9d02c",
+    "@dedot/types": "0.4.2-next.5d9d02c1.7+5d9d02c",
+    "@dedot/utils": "0.4.2-next.5d9d02c1.7+5d9d02c",
     "handlebars": "^4.7.8",
     "prettier": "^3.3.3"
   },
@@ -34,7 +34,7 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "b1afe683dd8f237ef804130b721525a59accd280",
+  "gitHead": "5d9d02c17067074674ae588eb266a46f36742cb4",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/types.d.ts

@@ -1,3 +1,4 @@
 export interface GeneratedResult {
     interfaceName: string;
+    outputFolder: string;
 }

package/typink/index.js

@@ -32,5 +32,5 @@ export async function generateContractTypes(metadata, contract, outDir = '.', ex
     fs.writeFileSync(constructorTxTypesFileName, await constructorTxGen.generate(useSubPaths));
     fs.writeFileSync(eventsTypesFile, await eventsGen.generate(useSubPaths));
     fs.writeFileSync(indexTypesFileName, await indexGen.generate(useSubPaths));
-    return { interfaceName };
+    return { interfaceName, outputFolder: dirPath };
 }

package/typink/templates/index.hbs

@@ -9,7 +9,7 @@ import { ContractEvents } from './events';
 
 export * from './types';
 
-export interface {{{interfaceName}}}<Rv extends RpcVersion = RpcV2, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<Rv, ChainApi> {
+export interface {{{interfaceName}}}<Rv extends RpcVersion = RpcVersion, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<Rv, ChainApi> {
     query: ContractQuery<ChainApi[Rv]>;
     tx: ContractTx<ChainApi[Rv]>;
     constructorQuery: ConstructorQuery<ChainApi[Rv]>;

package/utils.js

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import handlebars from 'handlebars';
 import * as path from 'path';
 import * as prettier from 'prettier';
-import { currentDirname } from './dirname';
+import { currentDirname } from './dirname.js';
 export const WRAPPER_TYPE_REGEX = /^(\w+)<(.*)>$/;
 export const TUPLE_TYPE_REGEX = /^\[(.*)]$/;
 export const commentBlock = (...docs) => {