@dedot/codegen 0.0.1-alpha.26 → 0.0.1-alpha.4

package/cjs/generator/RuntimeApisGen.js

@@ -30,20 +30,18 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
             });
         }
         else {
-            const specs = this.#targetRuntimeApiSpecs();
-            specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
-                runtimeCallsOut += (0, utils_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
-                runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
+            const specsByModule = this.#runtimeApisSpecsByModule();
+            Object.values(specsByModule).forEach((specs) => {
+                specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
+                    runtimeCallsOut += (0, utils_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
+                    runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
             ${Object.keys(methods)
-                    .map((methodName) => this.#generateMethodDefFromSpec({
-                    ...methods[methodName],
-                    runtimeApiName,
-                    methodName,
-                }))
-                    .join('\n')} 
+                        .map((methodName) => this.#generateMethodDefFromSpec({ ...methods[methodName], runtimeApiName, methodName }))
+                        .join('\n')} 
               
             ${(0, utils_1.commentBlock)('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
           }`;
+                });
             });
         }
         const importTypes = this.typesGen.typeImports.toImports();
@@ -94,7 +92,7 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
             .join(', ');
         return `${(0, utils_1.commentBlock)(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${(0, util_1.stringCamelCase)(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
     }
-    #targetRuntimeApiSpecs() {
+    #runtimeApisSpecsByModule() {
         const specs = this.runtimeApis.map(([runtimeApiHash, version]) => {
             const runtimeApiSpec = (0, specs_1.findRuntimeApiSpec)(runtimeApiHash, version);
             if (!runtimeApiSpec)
@@ -108,8 +106,15 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
             if (!spec) {
                 return o;
             }
-            return [...o, spec];
-        }, []);
+            const { moduleName } = spec;
+            if (!moduleName) {
+                return o;
+            }
+            return {
+                ...o,
+                [moduleName]: o[moduleName] ? [...o[moduleName], spec] : [spec],
+            };
+        }, {});
     }
 }
 exports.RuntimeApisGen = RuntimeApisGen;

package/cjs/generator/utils.js

@@ -26,12 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = exports.commentBlock = exports.TUPLE_TYPE_REGEX = exports.WRAPPER_TYPE_REGEX = void 0;
+exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = exports.resolveFilePath = exports.commentBlock = exports.TUPLE_TYPE_REGEX = exports.WRAPPER_TYPE_REGEX = void 0;
 const fs = __importStar(require("fs"));
 const handlebars_1 = __importDefault(require("handlebars"));
 const path = __importStar(require("path"));
+const process = __importStar(require("process"));
 const prettier = __importStar(require("prettier"));
-const dirname_1 = require("./dirname");
 exports.WRAPPER_TYPE_REGEX = /^(\w+)<(.*)>$/;
 exports.TUPLE_TYPE_REGEX = /^\[(.*)]$/;
 const commentBlock = (...docs) => {
@@ -48,13 +48,18 @@ ${flatLines.map((line) => `* ${line.replaceAll(/\s+/g, ' ').trim()}`).join('\n')
     }
 };
 exports.commentBlock = commentBlock;
+const resolveFilePath = (relativePath) => {
+    relativePath = Array.isArray(relativePath) ? relativePath : [relativePath];
+    return path.resolve(process.cwd(), ...relativePath);
+};
+exports.resolveFilePath = resolveFilePath;
 const beautifySourceCode = async (source) => {
-    const prettierOptions = await prettier.resolveConfig(path.resolve((0, dirname_1.currentDirname)(), '../../../../.prettierrc.js'));
+    const prettierOptions = await prettier.resolveConfig((0, exports.resolveFilePath)('./.prettierrc.js'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
 };
 exports.beautifySourceCode = beautifySourceCode;
 const compileTemplate = (templateFileName) => {
-    const templateFilePath = path.resolve((0, dirname_1.currentDirname)(), `../templates/${templateFileName}`);
+    const templateFilePath = (0, exports.resolveFilePath)(`packages/codegen/src/templates/${templateFileName}`);
     return handlebars_1.default.compile(fs.readFileSync(templateFilePath, 'utf8'));
 };
 exports.compileTemplate = compileTemplate;

package/cjs/index.js

@@ -42,15 +42,15 @@ async function generateTypesFromChain(network, endpoint, outDir) {
 exports.generateTypesFromChain = generateTypesFromChain;
 async function generateTypes(network, metadata, rpcMethods, runtimeApis, outDir = '.') {
     const dirPath = path.resolve(outDir, network.chain);
-    const defTypesFileName = path.join(dirPath, `types.d.ts`);
-    const constsTypesFileName = path.join(dirPath, `consts.d.ts`);
-    const queryTypesFileName = path.join(dirPath, `query.d.ts`);
-    const rpcCallsFileName = path.join(dirPath, `rpc.d.ts`);
-    const indexFileName = path.join(dirPath, `index.d.ts`);
-    const errorsFileName = path.join(dirPath, `errors.d.ts`);
-    const eventsFileName = path.join(dirPath, `events.d.ts`);
-    const runtimeApisFileName = path.join(dirPath, `runtime.d.ts`);
-    const txFileName = path.join(dirPath, `tx.d.ts`);
+    const defTypesFileName = path.join(dirPath, `types.ts`);
+    const constsTypesFileName = path.join(dirPath, `consts.ts`);
+    const queryTypesFileName = path.join(dirPath, `query.ts`);
+    const rpcCallsFileName = path.join(dirPath, `rpc.ts`);
+    const indexFileName = path.join(dirPath, `index.ts`);
+    const errorsFileName = path.join(dirPath, `errors.ts`);
+    const eventsFileName = path.join(dirPath, `events.ts`);
+    const runtimeApisFileName = path.join(dirPath, `runtime.ts`);
+    const txFileName = path.join(dirPath, `tx.ts`);
     if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath, { recursive: true });
     }

package/cjs/packageInfo.js

@@ -2,4 +2,4 @@
 // THIS FILE IS AUTO-GENERATED, DO NOT EDIT!
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.25' };
+exports.packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.23' };

package/generator/RuntimeApisGen.js

@@ -27,20 +27,18 @@ export class RuntimeApisGen extends RpcGen {
             });
         }
         else {
-            const specs = this.#targetRuntimeApiSpecs();
-            specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
-                runtimeCallsOut += commentBlock(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
-                runtimeCallsOut += `${stringCamelCase(runtimeApiName)}: {
+            const specsByModule = this.#runtimeApisSpecsByModule();
+            Object.values(specsByModule).forEach((specs) => {
+                specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
+                    runtimeCallsOut += commentBlock(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
+                    runtimeCallsOut += `${stringCamelCase(runtimeApiName)}: {
             ${Object.keys(methods)
-                    .map((methodName) => this.#generateMethodDefFromSpec({
-                    ...methods[methodName],
-                    runtimeApiName,
-                    methodName,
-                }))
-                    .join('\n')} 
+                        .map((methodName) => this.#generateMethodDefFromSpec({ ...methods[methodName], runtimeApiName, methodName }))
+                        .join('\n')} 
               
             ${commentBlock('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
           }`;
+                });
             });
         }
         const importTypes = this.typesGen.typeImports.toImports();
@@ -91,7 +89,7 @@ export class RuntimeApisGen extends RpcGen {
             .join(', ');
         return `${commentBlock(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${stringCamelCase(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
     }
-    #targetRuntimeApiSpecs() {
+    #runtimeApisSpecsByModule() {
         const specs = this.runtimeApis.map(([runtimeApiHash, version]) => {
             const runtimeApiSpec = findRuntimeApiSpec(runtimeApiHash, version);
             if (!runtimeApiSpec)
@@ -105,7 +103,14 @@ export class RuntimeApisGen extends RpcGen {
             if (!spec) {
                 return o;
             }
-            return [...o, spec];
-        }, []);
+            const { moduleName } = spec;
+            if (!moduleName) {
+                return o;
+            }
+            return {
+                ...o,
+                [moduleName]: o[moduleName] ? [...o[moduleName], spec] : [spec],
+            };
+        }, {});
     }
 }

package/generator/utils.d.ts

@@ -1,6 +1,7 @@
 export declare const WRAPPER_TYPE_REGEX: RegExp;
 export declare const TUPLE_TYPE_REGEX: RegExp;
 export declare const commentBlock: (...docs: (string | string[])[]) => string;
+export declare const resolveFilePath: (relativePath: string | string[]) => string;
 export declare const beautifySourceCode: (source: string) => Promise<string>;
 export declare const compileTemplate: (templateFileName: string) => HandlebarsTemplateDelegate<any>;
 /**

package/generator/utils.js

@@ -1,8 +1,8 @@
 import * as fs from 'fs';
 import handlebars from 'handlebars';
 import * as path from 'path';
+import * as process from 'process';
 import * as prettier from 'prettier';
-import { currentDirname } from './dirname';
 export const WRAPPER_TYPE_REGEX = /^(\w+)<(.*)>$/;
 export const TUPLE_TYPE_REGEX = /^\[(.*)]$/;
 export const commentBlock = (...docs) => {
@@ -18,12 +18,16 @@ ${flatLines.map((line) => `* ${line.replaceAll(/\s+/g, ' ').trim()}`).join('\n')
       `;
     }
 };
+export const resolveFilePath = (relativePath) => {
+    relativePath = Array.isArray(relativePath) ? relativePath : [relativePath];
+    return path.resolve(process.cwd(), ...relativePath);
+};
 export const beautifySourceCode = async (source) => {
-    const prettierOptions = await prettier.resolveConfig(path.resolve(currentDirname(), '../../../../.prettierrc.js'));
+    const prettierOptions = await prettier.resolveConfig(resolveFilePath('./.prettierrc.js'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
 };
 export const compileTemplate = (templateFileName) => {
-    const templateFilePath = path.resolve(currentDirname(), `../templates/${templateFileName}`);
+    const templateFilePath = resolveFilePath(`packages/codegen/src/templates/${templateFileName}`);
     return handlebars.compile(fs.readFileSync(templateFilePath, 'utf8'));
 };
 // TODO add more reserved words

package/index.js

@@ -15,15 +15,15 @@ export async function generateTypesFromChain(network, endpoint, outDir) {
 }
 export async function generateTypes(network, metadata, rpcMethods, runtimeApis, outDir = '.') {
     const dirPath = path.resolve(outDir, network.chain);
-    const defTypesFileName = path.join(dirPath, `types.d.ts`);
-    const constsTypesFileName = path.join(dirPath, `consts.d.ts`);
-    const queryTypesFileName = path.join(dirPath, `query.d.ts`);
-    const rpcCallsFileName = path.join(dirPath, `rpc.d.ts`);
-    const indexFileName = path.join(dirPath, `index.d.ts`);
-    const errorsFileName = path.join(dirPath, `errors.d.ts`);
-    const eventsFileName = path.join(dirPath, `events.d.ts`);
-    const runtimeApisFileName = path.join(dirPath, `runtime.d.ts`);
-    const txFileName = path.join(dirPath, `tx.d.ts`);
+    const defTypesFileName = path.join(dirPath, `types.ts`);
+    const constsTypesFileName = path.join(dirPath, `consts.ts`);
+    const queryTypesFileName = path.join(dirPath, `query.ts`);
+    const rpcCallsFileName = path.join(dirPath, `rpc.ts`);
+    const indexFileName = path.join(dirPath, `index.ts`);
+    const errorsFileName = path.join(dirPath, `errors.ts`);
+    const eventsFileName = path.join(dirPath, `events.ts`);
+    const runtimeApisFileName = path.join(dirPath, `runtime.ts`);
+    const txFileName = path.join(dirPath, `tx.ts`);
     if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath, { recursive: true });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.0.1-alpha.26",
+  "version": "0.0.1-alpha.4+cef1b29",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -12,17 +12,16 @@
   "main": "./cjs/index.js",
   "type": "module",
   "scripts": {
-    "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json && yarn copy",
-    "clean": "rm -rf ./dist && rm -rf ./tsconfig.tsbuildinfo ./tsconfig.build.tsbuildinfo",
-    "copy": "cp -R ./src/templates ./dist && cp -R ./src/templates ./dist/cjs"
+    "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
+    "clean": "rm -rf ./dist && rm -rf ./tsconfig.tsbuildinfo ./tsconfig.build.tsbuildinfo"
   },
   "dependencies": {
-    "@dedot/codecs": "0.0.1-alpha.26",
-    "@dedot/shape": "0.0.1-alpha.26",
-    "@dedot/specs": "0.0.1-alpha.26",
-    "@dedot/utils": "0.0.1-alpha.26",
+    "@dedot/codecs": "0.0.1-alpha.4+cef1b29",
+    "@dedot/shape": "0.0.1-alpha.4+cef1b29",
+    "@dedot/specs": "0.0.1-alpha.4+cef1b29",
+    "@dedot/utils": "0.0.1-alpha.4+cef1b29",
     "@polkadot/util": "^12.6.2",
-    "dedot": "0.0.1-alpha.26",
+    "dedot": "0.0.1-alpha.4+cef1b29",
     "handlebars": "^4.7.8",
     "prettier": "^3.0.3"
   },
@@ -31,7 +30,7 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "5b114a0d2359316f07654915f3c03b44761cac73",
+  "gitHead": "cef1b29a1f5b0d92fb8c9893dfabff20b658fa5f",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/packageInfo.js

@@ -1,3 +1,2 @@
 // THIS FILE IS AUTO-GENERATED, DO NOT EDIT!
-
-export const packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.26' };
+export const packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.23' };

package/cjs/generator/dirname.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.currentDirname = () => {
-    return __dirname;
-};

package/cjs/templates/consts.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface ChainConsts extends GenericChainConsts {
-  {{{ defTypeOut }}}
-}

package/cjs/templates/errors.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface ChainErrors extends GenericChainErrors {
-  {{{ defTypeOut }}}
-}

package/cjs/templates/events.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface ChainEvents extends GenericChainEvents {
-  {{{ defTypeOut }}}
-}

package/cjs/templates/index.hbs

@@ -1,22 +0,0 @@
-// Generated by @dedot/codegen
-
-import { GenericSubstrateApi } from '@dedot/types';
-import { ChainConsts } from './consts';
-import { ChainStorage } from './query';
-import { RpcCalls } from './rpc';
-import { ChainErrors } from './errors';
-import { ChainEvents } from './events';
-import { RuntimeApis } from './runtime';
-import { ChainTx } from './tx';
-
-export * from './types';
-
-export interface {{{interfaceName}}}Api extends GenericSubstrateApi {
-  rpc: RpcCalls;
-  consts: ChainConsts;
-  query: ChainStorage;
-  errors: ChainErrors;
-  events: ChainEvents;
-  call: RuntimeApis;
-  tx: ChainTx;
-}

package/cjs/templates/query.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface ChainStorage extends GenericChainStorage {
-  {{{ defTypeOut }}}
-}

package/cjs/templates/rpc.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface RpcCalls extends GenericRpcCalls {
-  {{{rpcCallsOut}}}
-}

package/cjs/templates/runtime.hbs

@@ -1,8 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface RuntimeApis extends GenericRuntimeApis {
-{{{ runtimeCallsOut }}}
-}
-

package/cjs/templates/tx.hbs

@@ -1,9 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-{{{ defTypes }}}
-
-export interface ChainTx extends GenericChainTx<TxCall> {
-  {{{ txDefsOut }}}
-}

package/cjs/templates/types.hbs

@@ -1,5 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-{{{ defTypeOut }}}

package/generator/dirname.d.ts

@@ -1 +0,0 @@
-export function currentDirname(): string;

package/generator/dirname.js

@@ -1,6 +0,0 @@
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
-export const currentDirname = () => {
-    const __filename = fileURLToPath(import.meta.url);
-    return dirname(__filename);
-};

package/templates/consts.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface ChainConsts extends GenericChainConsts {
-  {{{ defTypeOut }}}
-}

package/templates/errors.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface ChainErrors extends GenericChainErrors {
-  {{{ defTypeOut }}}
-}

package/templates/events.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface ChainEvents extends GenericChainEvents {
-  {{{ defTypeOut }}}
-}

package/templates/index.hbs

@@ -1,22 +0,0 @@
-// Generated by @dedot/codegen
-
-import { GenericSubstrateApi } from '@dedot/types';
-import { ChainConsts } from './consts';
-import { ChainStorage } from './query';
-import { RpcCalls } from './rpc';
-import { ChainErrors } from './errors';
-import { ChainEvents } from './events';
-import { RuntimeApis } from './runtime';
-import { ChainTx } from './tx';
-
-export * from './types';
-
-export interface {{{interfaceName}}}Api extends GenericSubstrateApi {
-  rpc: RpcCalls;
-  consts: ChainConsts;
-  query: ChainStorage;
-  errors: ChainErrors;
-  events: ChainEvents;
-  call: RuntimeApis;
-  tx: ChainTx;
-}

package/templates/query.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface ChainStorage extends GenericChainStorage {
-  {{{ defTypeOut }}}
-}

package/templates/rpc.hbs

@@ -1,7 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface RpcCalls extends GenericRpcCalls {
-  {{{rpcCallsOut}}}
-}

package/templates/runtime.hbs

@@ -1,8 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-export interface RuntimeApis extends GenericRuntimeApis {
-{{{ runtimeCallsOut }}}
-}
-

package/templates/tx.hbs

@@ -1,9 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-{{{ defTypes }}}
-
-export interface ChainTx extends GenericChainTx<TxCall> {
-  {{{ txDefsOut }}}
-}

package/templates/types.hbs

@@ -1,5 +0,0 @@
-// Generated by @dedot/codegen
-
-{{{ importTypes }}}
-
-{{{ defTypeOut }}}