@dedot/codegen 0.0.1-next.6cd3bbb0.6 → 0.0.1-next.70fc26c6.11

package/cjs/generator/ConstsGen.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConstsGen = void 0;
-const util_1 = require("@polkadot/util");
 const utils_1 = require("@dedot/utils");
 const index_js_1 = require("../generator/index.js");
 const utils_js_1 = require("./utils.js");
@@ -18,7 +17,7 @@ class ConstsGen extends index_js_1.ApiGen {
                 docs: one.docs,
             }));
             defTypeOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s constants`);
-            defTypeOut += `${(0, util_1.stringLowerFirst)(pallet.name)}: {
+            defTypeOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
         ${typedConstants.map(({ name, type, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${name}: ${type}`).join(',\n')}
           
         ${(0, utils_js_1.commentBlock)('Generic pallet constant')}[name: string]: any,

package/cjs/generator/ErrorsGen.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorsGen = void 0;
 const ApiGen_js_1 = require("./ApiGen.js");
 const utils_js_1 = require("./utils.js");
-const util_1 = require("@polkadot/util");
 const utils_1 = require("@dedot/utils");
 class ErrorsGen extends ApiGen_js_1.ApiGen {
     generate() {
@@ -18,9 +17,9 @@ class ErrorsGen extends ApiGen_js_1.ApiGen {
             }
             const errorDefs = this.#getErrorDefs(errorTypeId);
             defTypeOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s errors`);
-            defTypeOut += `${(0, util_1.stringCamelCase)(pallet.name)}: {
+            defTypeOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
         ${errorDefs
-                .map(({ name, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${(0, util_1.stringPascalCase)(name)}: GenericPalletError`)
+                .map(({ name, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${(0, utils_1.stringPascalCase)(name)}: GenericPalletError`)
                 .join(',\n')}
           
         ${(0, utils_js_1.commentBlock)('Generic pallet error')}[error: string]: GenericPalletError,

package/cjs/generator/EventsGen.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventsGen = void 0;
 const ApiGen_js_1 = require("./ApiGen.js");
 const utils_js_1 = require("./utils.js");
-const util_1 = require("@polkadot/util");
 const utils_1 = require("@dedot/utils");
 class EventsGen extends ApiGen_js_1.ApiGen {
     generate() {
@@ -19,7 +18,7 @@ class EventsGen extends ApiGen_js_1.ApiGen {
             const eventDefs = this.#getEventDefs(eventTypeId);
             const flatMembers = eventDefs.every((d) => d.fields.length === 0);
             defTypeOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s events`);
-            defTypeOut += `${(0, util_1.stringCamelCase)(pallet.name)}: {
+            defTypeOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
         ${eventDefs
                 .map((def) => {
                 const genericParts = [`'${pallet.name}'`, `'${def.name}'`];
@@ -32,7 +31,7 @@ class EventsGen extends ApiGen_js_1.ApiGen {
                 }
                 return { ...def, genericParts };
             })
-                .map(({ name, docs, fields, genericParts }) => `${(0, utils_js_1.commentBlock)(docs)}${(0, util_1.stringPascalCase)(name)}: GenericPalletEvent<${genericParts.join(', ')}>`)
+                .map(({ name, docs, fields, genericParts }) => `${(0, utils_js_1.commentBlock)(docs)}${(0, utils_1.stringPascalCase)(name)}: GenericPalletEvent<${genericParts.join(', ')}>`)
                 .join(',\n')}
           
         ${(0, utils_js_1.commentBlock)('Generic pallet event')}[prop: string]: GenericPalletEvent,

package/cjs/generator/IndexGen.js

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexGen = void 0;
 const utils_js_1 = require("./utils.js");
-const util_1 = require("@polkadot/util");
+const utils_1 = require("@dedot/utils");
 class IndexGen {
-    networkInfo;
-    constructor(networkInfo) {
-        this.networkInfo = networkInfo;
+    chain;
+    constructor(chain) {
+        this.chain = chain;
     }
     async generate() {
-        const { chain } = this.networkInfo;
-        const interfaceName = (0, util_1.stringPascalCase)(chain);
+        const interfaceName = (0, utils_1.stringPascalCase)(this.chain);
         const template = (0, utils_js_1.compileTemplate)('index.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ interfaceName }));
     }

package/cjs/generator/QueryGen.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryGen = void 0;
-const util_1 = require("@polkadot/util");
 const utils_1 = require("@dedot/utils");
 const index_js_1 = require("../generator/index.js");
 const utils_js_1 = require("./utils.js");
@@ -18,7 +17,7 @@ class QueryGen extends index_js_1.ApiGen {
             const queries = storage.entries.map((one) => this.#generateEntry(one));
             const queryDefs = queries.map(({ name, valueType, keyType, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${name}: GenericStorageQuery<(${keyType}) => ${valueType}>`);
             defTypeOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s storage queries`);
-            defTypeOut += `${(0, util_1.stringLowerFirst)(pallet.name)}: {
+            defTypeOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
         ${queryDefs.join(',\n')}
         
         ${(0, utils_js_1.commentBlock)('Generic pallet storage query')}[storage: string]: GenericStorageQuery;

package/cjs/generator/RpcGen.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcGen = void 0;
 const specs_1 = require("@dedot/specs");
-const utils_1 = require("@dedot/utils");
 const index_js_1 = require("../generator/index.js");
 const utils_js_1 = require("./utils.js");
 const known_codecs_js_1 = require("./known-codecs.js");
@@ -105,7 +104,7 @@ class RpcGen extends index_js_1.ApiGen {
             return;
         }
         type = type.trim();
-        if ((0, utils_1.isNativeType)(type)) {
+        if ((0, utils_js_1.isNativeType)(type)) {
             return;
         }
         // Handle generic wrapper types
@@ -132,7 +131,7 @@ class RpcGen extends index_js_1.ApiGen {
         }
         try {
             const codecType = this.#getCodecType(type, toTypeIn);
-            if ((0, utils_1.isNativeType)(codecType))
+            if ((0, utils_js_1.isNativeType)(codecType))
                 return;
             this.typesGen.typeImports.addCodecType(codecType);
             return;

package/cjs/generator/RuntimeApisGen.js

@@ -5,7 +5,6 @@ const specs_1 = require("@dedot/specs");
 const utils_js_1 = require("./utils.js");
 const utils_1 = require("@dedot/utils");
 const RpcGen_js_1 = require("./RpcGen.js");
-const util_1 = require("@polkadot/util");
 class RuntimeApisGen extends RpcGen_js_1.RpcGen {
     typesGen;
     runtimeApis;
@@ -21,8 +20,8 @@ class RuntimeApisGen extends RpcGen_js_1.RpcGen {
         if (this.metadata.apis.length > 0) {
             this.metadata.apis.forEach((runtimeApi) => {
                 const { name: runtimeApiName, methods } = runtimeApi;
-                runtimeCallsOut += (0, utils_js_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${(0, utils_1.calculateRuntimeApiHash)(runtimeApiName)}`);
-                runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
+                runtimeCallsOut += (0, utils_js_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${(0, utils_1.calcRuntimeApiHash)(runtimeApiName)}`);
+                runtimeCallsOut += `${(0, utils_1.stringCamelCase)(runtimeApiName)}: {
             ${methods.map((method) => this.#generateMethodDef(runtimeApiName, method)).join('\n')} 
               
             ${(0, utils_js_1.commentBlock)('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
@@ -33,7 +32,7 @@ class RuntimeApisGen extends RpcGen_js_1.RpcGen {
             const specs = this.#targetRuntimeApiSpecs();
             specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
                 runtimeCallsOut += (0, utils_js_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
-                runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
+                runtimeCallsOut += `${(0, utils_1.stringCamelCase)(runtimeApiName)}: {
             ${Object.keys(methods)
                     .map((methodName) => this.#generateMethodDefFromSpec({
                     ...methods[methodName],
@@ -68,7 +67,7 @@ class RuntimeApisGen extends RpcGen_js_1.RpcGen {
             plainType: this.getGeneratedTypeName(param.type),
         }));
         const paramsOut = typedParams
-            .map(({ name, isOptional, plainType }) => `${(0, util_1.stringCamelCase)(name)}${isOptional ? '?' : ''}: ${plainType}`)
+            .map(({ name, isOptional, plainType }) => `${(0, utils_1.stringCamelCase)(name)}${isOptional ? '?' : ''}: ${plainType}`)
             .join(', ');
         const typeOut = this.getGeneratedTypeName(type, false);
         return `${(0, utils_js_1.commentBlock)(docs, '\n', defaultDocs, typedParams.map(({ plainType, name }) => `@param {${plainType}} ${name}`))}${methodName}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
@@ -90,9 +89,9 @@ class RuntimeApisGen extends RpcGen_js_1.RpcGen {
         }));
         this.addTypeImport(typedInputs.map((t) => t.type));
         const paramsOut = typedInputs
-            .map(({ name, type, isOptional }) => `${(0, util_1.stringCamelCase)(name)}${isOptional ? '?' : ''}: ${type}`)
+            .map(({ name, type, isOptional }) => `${(0, utils_1.stringCamelCase)(name)}${isOptional ? '?' : ''}: ${type}`)
             .join(', ');
-        return `${(0, utils_js_1.commentBlock)(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${(0, util_1.stringCamelCase)(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
+        return `${(0, utils_js_1.commentBlock)(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${(0, utils_1.stringCamelCase)(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
     }
     #targetRuntimeApiSpecs() {
         const specs = this.runtimeApis.map(([runtimeApiHash, version]) => {
@@ -112,7 +111,7 @@ class RuntimeApisGen extends RpcGen_js_1.RpcGen {
         }, []);
     }
     #findRuntimeApiSpec = (runtimeApiHash, version) => {
-        const runtimeApiName = (0, specs_1.getRuntimeApiNames)().find((one) => (0, utils_1.calculateRuntimeApiHash)(one) === runtimeApiHash);
+        const runtimeApiName = (0, specs_1.getRuntimeApiNames)().find((one) => (0, utils_1.calcRuntimeApiHash)(one) === runtimeApiHash);
         return (0, specs_1.getRuntimeApiSpecs)().find((one) => one.runtimeApiName === runtimeApiName && one.version === version);
     };
 }

package/cjs/generator/TxGen.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxGen = void 0;
 const index_js_1 = require("../generator/index.js");
-const util_1 = require("@polkadot/util");
+const utils_1 = require("@dedot/utils");
 const utils_js_1 = require("./utils.js");
 class TxGen extends index_js_1.ApiGen {
     generate() {
@@ -26,9 +26,9 @@ class TxGen extends index_js_1.ApiGen {
             const isFlatEnum = type.value.members.every((m) => m.fields.length === 0);
             const typedTxs = type.value.members
                 .map((one) => ({
-                functionName: (0, util_1.stringCamelCase)(one.name),
+                functionName: (0, utils_1.stringCamelCase)(one.name),
                 params: one.fields.map((f) => ({
-                    name: (0, util_1.stringCamelCase)(f.name),
+                    name: (0, utils_1.stringCamelCase)(f.name),
                     normalizedName: this.#normalizeParamName(f.name),
                     type: this.typesGen.generateType(f.typeId, 1),
                     docs: f.docs,
@@ -38,11 +38,11 @@ class TxGen extends index_js_1.ApiGen {
                 .map((f) => {
                 return {
                     ...f,
-                    callInput: this.#generateCallInput((0, util_1.stringPascalCase)(pallet.name), (0, util_1.stringPascalCase)(f.functionName), !isFlatEnum ? f.params.map((p) => `${p.name}: ${p.type}`) : undefined),
+                    callInput: this.#generateCallInput((0, utils_1.stringPascalCase)(pallet.name), (0, utils_1.stringPascalCase)(f.functionName), !isFlatEnum ? f.params.map((p) => `${p.name}: ${p.type}`) : undefined),
                 };
             });
             txDefsOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s transaction calls`);
-            txDefsOut += `${(0, util_1.stringCamelCase)(pallet.name)}: {
+            txDefsOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
           ${typedTxs
                 .map(({ functionName, params, docs, callInput }) => `${(0, utils_js_1.commentBlock)(docs, '\n', params.map((p) => `@param {${p.type}} ${p.normalizedName} ${p.docs}`))}${functionName}: GenericTxCall<(${params.map((p) => `${p.normalizedName}: ${p.type}`).join(', ')}) => ChainSubmittableExtrinsic<${callInput}>>`)
                 .join(',\n')}
@@ -63,7 +63,7 @@ class TxGen extends index_js_1.ApiGen {
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypes, txDefsOut }));
     }
     #normalizeParamName(name) {
-        name = (0, util_1.stringCamelCase)(name);
+        name = (0, utils_1.stringCamelCase)(name);
         return (0, utils_js_1.isReservedWord)(name) ? `${name}_` : name;
     }
     #generateCallInput(palletName, callName, params) {

package/cjs/generator/TypesGen.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypesGen = exports.BASIC_KNOWN_TYPES = void 0;
-const util_1 = require("@polkadot/util");
 const codecs_1 = require("@dedot/codecs");
 const utils_1 = require("@dedot/utils");
 const utils_js_1 = require("./utils.js");
@@ -151,12 +150,12 @@ class TypesGen {
                     return 'null';
                 }
                 else if (members.every((x) => x.fields.length === 0)) {
-                    return members.map(({ name, docs }) => `${(0, utils_js_1.commentBlock)(docs)}'${(0, util_1.stringPascalCase)(name)}'`).join(' | ');
+                    return members.map(({ name, docs }) => `${(0, utils_js_1.commentBlock)(docs)}'${(0, utils_1.stringPascalCase)(name)}'`).join(' | ');
                 }
                 else {
                     const membersType = [];
                     for (const { fields, name, docs } of members) {
-                        const keyName = (0, util_1.stringPascalCase)(name);
+                        const keyName = (0, utils_1.stringPascalCase)(name);
                         if (fields.length === 0) {
                             membersType.push([keyName, null, docs]);
                         }
@@ -315,7 +314,7 @@ class TypesGen {
      */
     #cleanPath(path) {
         return path
-            .map((one) => (0, util_1.stringPascalCase)(one))
+            .map((one) => (0, utils_1.stringPascalCase)(one))
             .filter((one, idx, currentPath) => idx === 0 || one !== currentPath[idx - 1])
             .join('');
     }
@@ -390,10 +389,10 @@ class TypesGen {
         if (diffParam?.typeId) {
             const diffType = types[diffParam.typeId];
             if (diffType.path.length > 0) {
-                return (0, util_1.stringPascalCase)(diffType.path.at(-1));
+                return (0, utils_1.stringPascalCase)(diffType.path.at(-1));
             }
             else if (diffType.type.tag === 'Primitive') {
-                return (0, util_1.stringPascalCase)(diffType.type.value.kind);
+                return (0, utils_1.stringPascalCase)(diffType.type.value.kind);
             }
         }
         // Last resort!
@@ -404,7 +403,7 @@ class TypesGen {
             typeName.forEach((one) => this.addTypeImport(one));
             return;
         }
-        if ((0, utils_1.isNativeType)(typeName)) {
+        if ((0, utils_js_1.isNativeType)(typeName)) {
             return;
         }
         for (let type of Object.values(this.includedTypes)) {

package/cjs/generator/utils.js

@@ -26,7 +26,7 @@ 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.isNativeType = exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = 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"));
@@ -66,3 +66,32 @@ const TS_RESERVED_WORDS = ['new', 'class'];
  */
 const isReservedWord = (word) => TS_RESERVED_WORDS.includes(word);
 exports.isReservedWord = isReservedWord;
+const TS_PRIMITIVE_TYPES = [
+    'void',
+    'undefined',
+    'null',
+    'number',
+    'boolean',
+    'bigint',
+    'Map',
+    'Set',
+    'string',
+    'any',
+    'Array',
+    'Record',
+];
+/**
+ * Check if a type is native JS/TS type
+ * @param type
+ */
+const isNativeType = (type) => {
+    return TS_PRIMITIVE_TYPES.some((one) => {
+        if (typeof one === 'string') {
+            return one === type;
+        }
+        else {
+            return type.match(one);
+        }
+    });
+};
+exports.isNativeType = isNativeType;

package/cjs/index.js

@@ -23,25 +23,25 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTypes = exports.generateTypesFromChain = void 0;
+exports.generateTypes = exports.generateTypesFromEndpoint = void 0;
 const dedot_1 = require("dedot");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const index_js_1 = require("./generator/index.js");
-const util_1 = require("@polkadot/util");
-async function generateTypesFromChain(network, endpoint, outDir) {
-    const api = await dedot_1.Dedot.create(endpoint);
+const utils_1 = require("@dedot/utils");
+async function generateTypesFromEndpoint(chain, endpoint, outDir) {
+    const api = await dedot_1.Dedot.new(endpoint);
     const { methods } = await api.rpc.rpc.methods();
     const apis = api.runtimeVersion?.apis || [];
-    if (!network.chain) {
-        network.chain = (0, util_1.stringCamelCase)(api.runtimeVersion?.specName || api.runtimeChain || 'local');
+    if (!chain) {
+        chain = (0, utils_1.stringCamelCase)(api.runtimeVersion?.specName || api.runtimeChain || 'local');
     }
-    await generateTypes(network, api.metadataLatest, methods, apis, outDir);
+    await generateTypes(chain, api.metadataLatest, methods, apis, outDir);
     await api.disconnect();
 }
-exports.generateTypesFromChain = generateTypesFromChain;
-async function generateTypes(network, metadata, rpcMethods, runtimeApis, outDir = '.') {
-    const dirPath = path.resolve(outDir, network.chain);
+exports.generateTypesFromEndpoint = generateTypesFromEndpoint;
+async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir = '.') {
+    const dirPath = path.resolve(outDir, 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`);
@@ -58,7 +58,7 @@ async function generateTypes(network, metadata, rpcMethods, runtimeApis, outDir
     const constsGen = new index_js_1.ConstsGen(typesGen);
     const queryGen = new index_js_1.QueryGen(typesGen);
     const rpcGen = new index_js_1.RpcGen(typesGen, rpcMethods);
-    const indexGen = new index_js_1.IndexGen(network);
+    const indexGen = new index_js_1.IndexGen(chain);
     const errorsGen = new index_js_1.ErrorsGen(typesGen);
     const eventsGen = new index_js_1.EventsGen(typesGen);
     const runtimeApisGen = new index_js_1.RuntimeApisGen(typesGen, runtimeApis);

package/generator/ConstsGen.js

@@ -1,5 +1,4 @@
-import { stringLowerFirst } from '@polkadot/util';
-import { normalizeName } from '@dedot/utils';
+import { normalizeName, stringCamelCase } from '@dedot/utils';
 import { ApiGen } from '../generator/index.js';
 import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 export class ConstsGen extends ApiGen {
@@ -15,7 +14,7 @@ export class ConstsGen extends ApiGen {
                 docs: one.docs,
             }));
             defTypeOut += commentBlock(`Pallet \`${pallet.name}\`'s constants`);
-            defTypeOut += `${stringLowerFirst(pallet.name)}: {
+            defTypeOut += `${stringCamelCase(pallet.name)}: {
         ${typedConstants.map(({ name, type, docs }) => `${commentBlock(docs)}${name}: ${type}`).join(',\n')}
           
         ${commentBlock('Generic pallet constant')}[name: string]: any,

package/generator/ErrorsGen.js

@@ -1,7 +1,6 @@
 import { ApiGen } from './ApiGen.js';
 import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
-import { stringCamelCase, stringPascalCase } from '@polkadot/util';
-import { assert } from '@dedot/utils';
+import { assert, stringCamelCase, stringPascalCase } from '@dedot/utils';
 export class ErrorsGen extends ApiGen {
     generate() {
         const { pallets } = this.metadata;

package/generator/EventsGen.js

@@ -1,7 +1,6 @@
 import { ApiGen } from './ApiGen.js';
 import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
-import { stringCamelCase, stringPascalCase } from '@polkadot/util';
-import { assert } from '@dedot/utils';
+import { assert, stringCamelCase, stringPascalCase } from '@dedot/utils';
 export class EventsGen extends ApiGen {
     generate() {
         const { pallets } = this.metadata;

package/generator/IndexGen.d.ts

@@ -1,6 +1,5 @@
-import { NetworkInfo } from '../types.js';
 export declare class IndexGen {
-    readonly networkInfo: NetworkInfo;
-    constructor(networkInfo: NetworkInfo);
+    readonly chain: string;
+    constructor(chain: string);
     generate(): Promise<string>;
 }

package/generator/IndexGen.js

@@ -1,13 +1,12 @@
 import { beautifySourceCode, compileTemplate } from './utils.js';
-import { stringPascalCase } from '@polkadot/util';
+import { stringPascalCase } from '@dedot/utils';
 export class IndexGen {
-    networkInfo;
-    constructor(networkInfo) {
-        this.networkInfo = networkInfo;
+    chain;
+    constructor(chain) {
+        this.chain = chain;
     }
     async generate() {
-        const { chain } = this.networkInfo;
-        const interfaceName = stringPascalCase(chain);
+        const interfaceName = stringPascalCase(this.chain);
         const template = compileTemplate('index.hbs');
         return beautifySourceCode(template({ interfaceName }));
     }

package/generator/QueryGen.js

@@ -1,5 +1,4 @@
-import { stringLowerFirst } from '@polkadot/util';
-import { normalizeName } from '@dedot/utils';
+import { normalizeName, stringCamelCase } from '@dedot/utils';
 import { ApiGen } from '../generator/index.js';
 import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 export class QueryGen extends ApiGen {
@@ -15,7 +14,7 @@ export class QueryGen extends ApiGen {
             const queries = storage.entries.map((one) => this.#generateEntry(one));
             const queryDefs = queries.map(({ name, valueType, keyType, docs }) => `${commentBlock(docs)}${name}: GenericStorageQuery<(${keyType}) => ${valueType}>`);
             defTypeOut += commentBlock(`Pallet \`${pallet.name}\`'s storage queries`);
-            defTypeOut += `${stringLowerFirst(pallet.name)}: {
+            defTypeOut += `${stringCamelCase(pallet.name)}: {
         ${queryDefs.join(',\n')}
         
         ${commentBlock('Generic pallet storage query')}[storage: string]: GenericStorageQuery;

package/generator/RpcGen.js

@@ -1,7 +1,6 @@
 import { findAliasRpcSpec, findRpcSpec, isUnsubscribeMethod } from '@dedot/specs';
-import { isNativeType } from '@dedot/utils';
 import { ApiGen } from '../generator/index.js';
-import { beautifySourceCode, commentBlock, compileTemplate, TUPLE_TYPE_REGEX, WRAPPER_TYPE_REGEX } from './utils.js';
+import { isNativeType, beautifySourceCode, commentBlock, compileTemplate, TUPLE_TYPE_REGEX, WRAPPER_TYPE_REGEX, } from './utils.js';
 import { findKnownCodecType } from './known-codecs.js';
 const HIDDEN_RPCS = [
     // Ref: https://github.com/paritytech/polkadot-sdk/blob/43415ef58c143b985e09015cd000dbd65f6d3997/substrate/client/rpc-servers/src/lib.rs#L152C9-L158

package/generator/RuntimeApisGen.js

@@ -1,8 +1,7 @@
 import { getRuntimeApiNames, getRuntimeApiSpecs } from '@dedot/specs';
 import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
-import { calculateRuntimeApiHash, stringSnakeCase } from '@dedot/utils';
+import { calcRuntimeApiHash, stringSnakeCase, stringCamelCase } from '@dedot/utils';
 import { RpcGen } from './RpcGen.js';
-import { stringCamelCase } from '@polkadot/util';
 export class RuntimeApisGen extends RpcGen {
     typesGen;
     runtimeApis;
@@ -18,7 +17,7 @@ export class RuntimeApisGen extends RpcGen {
         if (this.metadata.apis.length > 0) {
             this.metadata.apis.forEach((runtimeApi) => {
                 const { name: runtimeApiName, methods } = runtimeApi;
-                runtimeCallsOut += commentBlock(`@runtimeapi: ${runtimeApiName} - ${calculateRuntimeApiHash(runtimeApiName)}`);
+                runtimeCallsOut += commentBlock(`@runtimeapi: ${runtimeApiName} - ${calcRuntimeApiHash(runtimeApiName)}`);
                 runtimeCallsOut += `${stringCamelCase(runtimeApiName)}: {
             ${methods.map((method) => this.#generateMethodDef(runtimeApiName, method)).join('\n')} 
               
@@ -109,7 +108,7 @@ export class RuntimeApisGen extends RpcGen {
         }, []);
     }
     #findRuntimeApiSpec = (runtimeApiHash, version) => {
-        const runtimeApiName = getRuntimeApiNames().find((one) => calculateRuntimeApiHash(one) === runtimeApiHash);
+        const runtimeApiName = getRuntimeApiNames().find((one) => calcRuntimeApiHash(one) === runtimeApiHash);
         return getRuntimeApiSpecs().find((one) => one.runtimeApiName === runtimeApiName && one.version === version);
     };
 }

package/generator/TxGen.js

@@ -1,5 +1,5 @@
 import { ApiGen } from '../generator/index.js';
-import { stringCamelCase, stringPascalCase } from '@polkadot/util';
+import { stringCamelCase, stringPascalCase } from '@dedot/utils';
 import { beautifySourceCode, commentBlock, compileTemplate, isReservedWord } from './utils.js';
 export class TxGen extends ApiGen {
     generate() {

package/generator/TypesGen.js

@@ -1,7 +1,6 @@
-import { stringPascalCase } from '@polkadot/util';
 import { PortableRegistry } from '@dedot/codecs';
-import { isNativeType, normalizeName } from '@dedot/utils';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
+import { normalizeName, stringPascalCase } from '@dedot/utils';
+import { isNativeType, beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 import { knownTypes } from './known-types.js';
 import { TypeImports } from './TypeImports.js';
 import { findKnownCodec, findKnownCodecType, isKnownCodecType } from './known-codecs.js';

package/generator/utils.d.ts

@@ -8,3 +8,8 @@ export declare const compileTemplate: (templateFileName: string) => HandlebarsTe
  * @param word
  */
 export declare const isReservedWord: (word: string) => boolean;
+/**
+ * Check if a type is native JS/TS type
+ * @param type
+ */
+export declare const isNativeType: (type: string) => boolean;

package/generator/utils.js

@@ -33,3 +33,31 @@ const TS_RESERVED_WORDS = ['new', 'class'];
  * @param word
  */
 export const isReservedWord = (word) => TS_RESERVED_WORDS.includes(word);
+const TS_PRIMITIVE_TYPES = [
+    'void',
+    'undefined',
+    'null',
+    'number',
+    'boolean',
+    'bigint',
+    'Map',
+    'Set',
+    'string',
+    'any',
+    'Array',
+    'Record',
+];
+/**
+ * Check if a type is native JS/TS type
+ * @param type
+ */
+export const isNativeType = (type) => {
+    return TS_PRIMITIVE_TYPES.some((one) => {
+        if (typeof one === 'string') {
+            return one === type;
+        }
+        else {
+            return type.match(one);
+        }
+    });
+};

package/index.d.ts

@@ -1,4 +1,3 @@
 import { MetadataLatest } from '@dedot/codecs';
-import { NetworkInfo } from './types.js';
-export declare function generateTypesFromChain(network: NetworkInfo, endpoint: string, outDir: string): Promise<void>;
-export declare function generateTypes(network: NetworkInfo, metadata: MetadataLatest, rpcMethods: string[], runtimeApis: any[], outDir?: string): Promise<void>;
+export declare function generateTypesFromEndpoint(chain: string, endpoint: string, outDir?: string): Promise<void>;
+export declare function generateTypes(chain: string, metadata: MetadataLatest, rpcMethods: string[], runtimeApis: any[], outDir?: string): Promise<void>;

package/index.js

@@ -2,19 +2,19 @@ import { Dedot } from 'dedot';
 import * as fs from 'fs';
 import * as path from 'path';
 import { ConstsGen, ErrorsGen, EventsGen, IndexGen, QueryGen, RpcGen, RuntimeApisGen, TxGen, TypesGen, } from './generator/index.js';
-import { stringCamelCase } from '@polkadot/util';
-export async function generateTypesFromChain(network, endpoint, outDir) {
-    const api = await Dedot.create(endpoint);
+import { stringCamelCase } from '@dedot/utils';
+export async function generateTypesFromEndpoint(chain, endpoint, outDir) {
+    const api = await Dedot.new(endpoint);
     const { methods } = await api.rpc.rpc.methods();
     const apis = api.runtimeVersion?.apis || [];
-    if (!network.chain) {
-        network.chain = stringCamelCase(api.runtimeVersion?.specName || api.runtimeChain || 'local');
+    if (!chain) {
+        chain = stringCamelCase(api.runtimeVersion?.specName || api.runtimeChain || 'local');
     }
-    await generateTypes(network, api.metadataLatest, methods, apis, outDir);
+    await generateTypes(chain, api.metadataLatest, methods, apis, outDir);
     await api.disconnect();
 }
-export async function generateTypes(network, metadata, rpcMethods, runtimeApis, outDir = '.') {
-    const dirPath = path.resolve(outDir, network.chain);
+export async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir = '.') {
+    const dirPath = path.resolve(outDir, 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`);
@@ -31,7 +31,7 @@ export async function generateTypes(network, metadata, rpcMethods, runtimeApis,
     const constsGen = new ConstsGen(typesGen);
     const queryGen = new QueryGen(typesGen);
     const rpcGen = new RpcGen(typesGen, rpcMethods);
-    const indexGen = new IndexGen(network);
+    const indexGen = new IndexGen(chain);
     const errorsGen = new ErrorsGen(typesGen);
     const eventsGen = new EventsGen(typesGen);
     const runtimeApisGen = new RuntimeApisGen(typesGen, runtimeApis);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.0.1-next.6cd3bbb0.6+6cd3bbb",
+  "version": "0.0.1-next.70fc26c6.11+70fc26c",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -18,12 +18,11 @@
     "copy": "cp -R ./src/templates ./dist && cp -R ./src/templates ./dist/cjs"
   },
   "dependencies": {
-    "@dedot/codecs": "0.0.1-next.6cd3bbb0.6+6cd3bbb",
-    "@dedot/shape": "0.0.1-next.6cd3bbb0.6+6cd3bbb",
-    "@dedot/specs": "0.0.1-next.6cd3bbb0.6+6cd3bbb",
-    "@dedot/utils": "0.0.1-next.6cd3bbb0.6+6cd3bbb",
-    "@polkadot/util": "^12.6.2",
-    "dedot": "0.0.1-next.6cd3bbb0.6+6cd3bbb",
+    "@dedot/codecs": "0.0.1-next.70fc26c6.11+70fc26c",
+    "@dedot/shape": "0.0.1-next.70fc26c6.11+70fc26c",
+    "@dedot/specs": "0.0.1-next.70fc26c6.11+70fc26c",
+    "@dedot/utils": "0.0.1-next.70fc26c6.11+70fc26c",
+    "dedot": "0.0.1-next.70fc26c6.11+70fc26c",
     "handlebars": "^4.7.8",
     "prettier": "^3.0.3"
   },
@@ -32,7 +31,7 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "6cd3bbb03af089ee218d1b3f4665623eb9fc82a2",
+  "gitHead": "70fc26c6203468dad24de97361eae314cab3b32b",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/cjs/genSupportedChainTypes.js

@@ -1,83 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_js_1 = require("./index.js");
-const static_substrate_1 = require("@polkadot/types-support/metadata/static-substrate");
-const substrate_hex_1 = __importDefault(require("@polkadot/types-support/metadata/v15/substrate-hex"));
-const codecs_1 = require("@dedot/codecs");
-const dedot_1 = require("dedot");
-const NETWORKS = [
-    {
-        chain: 'substrate',
-        metadataHex: substrate_hex_1.default,
-        rpcMethods: static_substrate_1.rpc.methods,
-    },
-    {
-        chain: 'polkadot',
-        endpoint: 'wss://rpc.polkadot.io',
-    },
-    {
-        chain: 'kusama',
-        endpoint: 'wss://kusama-rpc.polkadot.io',
-    },
-    {
-        chain: 'astar',
-        endpoint: 'wss://rpc.astar.network',
-    },
-    {
-        chain: 'moonbeam',
-        endpoint: 'wss://moonbeam.api.onfinality.io/public-ws',
-    },
-    {
-        chain: 'polkadotAssetHub',
-        endpoint: 'wss://polkadot-asset-hub-rpc.polkadot.io/',
-    },
-    {
-        chain: 'kusamaAssetHub',
-        endpoint: 'wss://kusama-asset-hub-rpc.polkadot.io/',
-    },
-    {
-        chain: 'rococo',
-        endpoint: 'wss://rococo-rpc.polkadot.io/',
-    },
-    {
-        chain: 'rococoAssetHub',
-        endpoint: 'wss://rococo-asset-hub-rpc.polkadot.io/',
-    },
-    {
-        chain: 'aleph',
-        endpoint: 'wss://aleph-zero.api.onfinality.io/public-ws',
-    },
-    {
-        chain: 'westendAssetHub',
-        endpoint: 'wss://westend-asset-hub-rpc.polkadot.io',
-    },
-];
-const OUT_DIR = 'packages/chaintypes/src';
-async function run() {
-    for (const network of NETWORKS) {
-        const { chain, endpoint, metadataHex, rpcMethods } = network;
-        if (endpoint) {
-            console.log(`Generate types for ${chain} via endpoint ${endpoint}`);
-            await (0, index_js_1.generateTypesFromChain)(network, endpoint, OUT_DIR);
-        }
-        else if (metadataHex && rpcMethods) {
-            console.log(`Generate types for ${chain} via raw data`);
-            const metadata = codecs_1.$Metadata.tryDecode(metadataHex);
-            const runtimeVersion = getRuntimeVersion(metadata);
-            await (0, index_js_1.generateTypes)(network, metadata.latest, rpcMethods, runtimeVersion.apis, OUT_DIR);
-        }
-    }
-    console.log('DONE!');
-}
-const getRuntimeVersion = (metadata) => {
-    const registry = new codecs_1.PortableRegistry(metadata.latest);
-    const executor = new dedot_1.ConstantExecutor({
-        registry,
-        metadataLatest: metadata.latest,
-    });
-    return executor.execute('system', 'version');
-};
-run().catch(console.log);

package/cjs/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/genSupportedChainTypes.d.ts

@@ -1 +0,0 @@
-export {};

package/genSupportedChainTypes.js

@@ -1,78 +0,0 @@
-import { generateTypes, generateTypesFromChain } from './index.js';
-import { rpc } from '@polkadot/types-support/metadata/static-substrate';
-import staticSubstrate from '@polkadot/types-support/metadata/v15/substrate-hex';
-import { $Metadata, PortableRegistry } from '@dedot/codecs';
-import { ConstantExecutor } from 'dedot';
-const NETWORKS = [
-    {
-        chain: 'substrate',
-        metadataHex: staticSubstrate,
-        rpcMethods: rpc.methods,
-    },
-    {
-        chain: 'polkadot',
-        endpoint: 'wss://rpc.polkadot.io',
-    },
-    {
-        chain: 'kusama',
-        endpoint: 'wss://kusama-rpc.polkadot.io',
-    },
-    {
-        chain: 'astar',
-        endpoint: 'wss://rpc.astar.network',
-    },
-    {
-        chain: 'moonbeam',
-        endpoint: 'wss://moonbeam.api.onfinality.io/public-ws',
-    },
-    {
-        chain: 'polkadotAssetHub',
-        endpoint: 'wss://polkadot-asset-hub-rpc.polkadot.io/',
-    },
-    {
-        chain: 'kusamaAssetHub',
-        endpoint: 'wss://kusama-asset-hub-rpc.polkadot.io/',
-    },
-    {
-        chain: 'rococo',
-        endpoint: 'wss://rococo-rpc.polkadot.io/',
-    },
-    {
-        chain: 'rococoAssetHub',
-        endpoint: 'wss://rococo-asset-hub-rpc.polkadot.io/',
-    },
-    {
-        chain: 'aleph',
-        endpoint: 'wss://aleph-zero.api.onfinality.io/public-ws',
-    },
-    {
-        chain: 'westendAssetHub',
-        endpoint: 'wss://westend-asset-hub-rpc.polkadot.io',
-    },
-];
-const OUT_DIR = 'packages/chaintypes/src';
-async function run() {
-    for (const network of NETWORKS) {
-        const { chain, endpoint, metadataHex, rpcMethods } = network;
-        if (endpoint) {
-            console.log(`Generate types for ${chain} via endpoint ${endpoint}`);
-            await generateTypesFromChain(network, endpoint, OUT_DIR);
-        }
-        else if (metadataHex && rpcMethods) {
-            console.log(`Generate types for ${chain} via raw data`);
-            const metadata = $Metadata.tryDecode(metadataHex);
-            const runtimeVersion = getRuntimeVersion(metadata);
-            await generateTypes(network, metadata.latest, rpcMethods, runtimeVersion.apis, OUT_DIR);
-        }
-    }
-    console.log('DONE!');
-}
-const getRuntimeVersion = (metadata) => {
-    const registry = new PortableRegistry(metadata.latest);
-    const executor = new ConstantExecutor({
-        registry,
-        metadataLatest: metadata.latest,
-    });
-    return executor.execute('system', 'version');
-};
-run().catch(console.log);

package/types.d.ts

@@ -1,6 +0,0 @@
-export type NetworkInfo = {
-    chain: string;
-    endpoint?: string;
-    metadataHex?: string;
-    rpcMethods?: string[];
-};

package/types.js

@@ -1 +0,0 @@
-export {};