@dedot/codegen 0.17.1-next.db98ff20.1 → 0.18.0

package/cjs/sol/generator/ConstructorQueryGen.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConstructorQueryGen = void 0;
-const utils_1 = require("@dedot/utils");
 const utils_js_1 = require("../../utils.js");
 class ConstructorQueryGen {
     abi;
@@ -11,6 +10,7 @@ class ConstructorQueryGen {
         this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'GenericConstructorCallResult', 'ConstructorCallOptions', 'ContractInstantiateResult', 'MetadataType');
         let constructor = this.findConstructor();
@@ -26,7 +26,7 @@ class ConstructorQueryGen {
         // we use the name `_options` for the last options param
         // This is just and edge case, so this approach works for now
         const optionsParamName = inputs.some(({ name }) => name === 'options') ? '_options' : 'options';
-        callsOut += `${(0, utils_js_1.commentBlock)(inputs.map((input, idx) => `@param {${this.typesGen.generateType(input, abiItem, 1)}} ${(0, utils_1.stringCamelCase)(input.name || `arg${idx}`)}`), optionsTypeName ? `@param {${optionsTypeName}} ${optionsParamName}` : '')}`;
+        callsOut += `${(0, utils_js_1.commentBlock)(inputs.map((input, idx) => `@param {${this.typesGen.generateType(input, abiItem, 1)}} ${input.name || `arg${idx}`}`), optionsTypeName ? `@param {${optionsTypeName}} ${optionsParamName}` : '')}`;
         callsOut += `new: ${this.generateMethodDef(abiItem, optionsParamName)};\n\n`;
         return callsOut;
     }
@@ -36,7 +36,7 @@ class ConstructorQueryGen {
     }
     generateParamsOut(abiItem) {
         return abiItem.inputs
-            .map((input, idx) => `${(0, utils_1.stringCamelCase)(input.name || `arg${idx}`)}: ${this.typesGen.generateType(input, abiItem, 1)}`)
+            .map((input, idx) => `${input.name || `arg${idx}`}: ${this.typesGen.generateType(input, abiItem, 1)}`)
             .join(', ');
     }
     findConstructor() {

package/cjs/sol/generator/ConstructorTxGen.js

@@ -5,6 +5,7 @@ const utils_js_1 = require("../../utils.js");
 const ConstructorQueryGen_js_1 = require("./ConstructorQueryGen.js");
 class ConstructorTxGen extends ConstructorQueryGen_js_1.ConstructorQueryGen {
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericConstructorTx', 'SolGenericContractApi', 'GenericConstructorTxCall', 'ConstructorTxOptions', 'GenericInstantiateSubmittableExtrinsic', 'MetadataType');
         let constructor = this.findConstructor();

package/cjs/sol/generator/EventsGen.js

@@ -11,12 +11,13 @@ class EventsGen {
         this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericContractEvents', 'GenericContractEvent', 'MetadataType');
         const events = this.abi.filter((o) => o.type === 'event');
         let eventsOut = '';
         events.forEach((event) => {
-            const { name, anonymous } = event;
+            const { name } = event;
             eventsOut += `${(0, utils_1.stringPascalCase)(name)}: ${this.#generateEventDef(event)};\n\n`;
         });
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
@@ -26,13 +27,16 @@ class EventsGen {
     #generateEventDef(abiItem) {
         const { name } = abiItem;
         const paramsOut = this.generateParamsOut(abiItem);
-        return `GenericContractEvent<'${(0, utils_1.stringPascalCase)(name)}', {${paramsOut}}, Type>`;
+        return `GenericContractEvent<'${(0, utils_1.stringPascalCase)(name)}', ${paramsOut}, Type>`;
     }
     generateParamsOut(abiItem) {
         const { inputs } = abiItem;
-        return inputs
-            .map((o, idx) => `${(0, utils_js_1.commentBlock)(`@indexed: ${o.indexed}`)}${(0, utils_1.stringCamelCase)(o.name || `arg${idx}`)}: ${this.typesGen.generateType(o, abiItem, 1)}`)
-            .join(', ');
+        if (inputs.length > 0 && !inputs.at(0).name) {
+            return `[${inputs.map((o) => `${(0, utils_js_1.commentBlock)(`@indexed: ${o.indexed}`)}${this.typesGen.generateType(o, abiItem, 1)}`).join(', ')}]`;
+        }
+        return `{${inputs
+            .map((o, idx) => `${(0, utils_js_1.commentBlock)(`@indexed: ${o.indexed}`)}${o.name || `arg${idx}`}: ${this.typesGen.generateType(o, abiItem, 1)}`)
+            .join(', ')}}`;
     }
 }
 exports.EventsGen = EventsGen;

package/cjs/sol/generator/QueryGen.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryGen = void 0;
 const contracts_1 = require("@dedot/contracts");
-const utils_1 = require("@dedot/utils");
 const utils_js_1 = require("../../utils.js");
 class QueryGen {
     abi;
@@ -12,6 +11,7 @@ class QueryGen {
         this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericContractQuery', 'GenericContractQueryCall', 'ContractCallOptions', 'GenericContractCallResult', 'ContractCallResult', 'MetadataType');
         const functions = this.abi.filter((item) => item.type === 'function');
@@ -28,7 +28,7 @@ class QueryGen {
             // we use the name `_options` for the last options param
             // This is just and edge case, so this approach works for now
             const optionsParamName = inputs.some(({ name }) => name === 'options') ? '_options' : 'options';
-            callsOut += `${(0, utils_js_1.commentBlock)(inputs.map((input, idx) => `@param {${this.typesGen.generateType(input, def, 1)}} ${(0, utils_1.stringCamelCase)(input.name || `arg${idx}`)}`), optionsTypeName ? `@param {${optionsTypeName}} ${optionsParamName}` : '')}`;
+            callsOut += `${(0, utils_js_1.commentBlock)(inputs.map((input, idx) => `@param {${this.typesGen.generateType(input, def, 1)}} ${input.name || `arg${idx}`}`), optionsTypeName ? `@param {${optionsTypeName}} ${optionsParamName}` : '')}`;
             callsOut += `${(0, contracts_1.normalizeLabel)(name)}: ${this.generateMethodDef(def, optionsParamName)};\n\n`;
         });
         return callsOut;
@@ -43,7 +43,7 @@ class QueryGen {
     }
     generateParamsOut(abiItem) {
         return abiItem.inputs
-            .map((input, idx) => `${(0, utils_1.stringCamelCase)(input.name || `arg${idx}`)}: ${this.typesGen.generateType(input, abiItem, 1)}`)
+            .map((input, idx) => `${input.name || `arg${idx}`}: ${this.typesGen.generateType(input, abiItem, 1)}`)
             .join(', ');
     }
 }

package/cjs/sol/generator/TxGen.js

@@ -5,6 +5,7 @@ const utils_js_1 = require("../../utils.js");
 const QueryGen_js_1 = require("./QueryGen.js");
 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', 'ContractSubmittableExtrinsic', 'MetadataType');
         const txFunctions = this.abi.filter((item) => item.type === 'function' && item.stateMutability !== 'view');

package/cjs/sol/generator/TypesGen.js

@@ -191,7 +191,7 @@ class TypesGen {
                 type,
             };
         });
-        if (props.length > 0 && props.at(0).name.length === 0) {
+        if (props.length > 0 && !props.at(0).name) {
             return `[${props.map(({ type }) => `${type}`).join(', ')}]`;
         }
         return `{${props.map(({ name, type }) => `${name}: ${type}`).join(',\n')}}`;
@@ -212,5 +212,8 @@ class TypesGen {
         }
         this.typeImports.addPortableType(typeName);
     }
+    clearCache() {
+        this.typeImports.clear();
+    }
 }
 exports.TypesGen = TypesGen;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.17.1-next.db98ff20.1+db98ff20",
+  "version": "0.18.0",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -19,14 +19,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 && cp -R ./src/sol/templates ./dist/sol && cp -R ./src/sol/templates ./dist/cjs/sol"
   },
   "dependencies": {
-    "@dedot/api": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/codecs": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/contracts": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/providers": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/runtime-specs": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/shape": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/types": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/utils": "0.17.1-next.db98ff20.1+db98ff20",
+    "@dedot/api": "0.18.0",
+    "@dedot/codecs": "0.18.0",
+    "@dedot/contracts": "0.18.0",
+    "@dedot/providers": "0.18.0",
+    "@dedot/runtime-specs": "0.18.0",
+    "@dedot/shape": "0.18.0",
+    "@dedot/types": "0.18.0",
+    "@dedot/utils": "0.18.0",
     "handlebars": "^4.7.8",
     "prettier": "^3.6.2"
   },
@@ -38,7 +38,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "db98ff20684d2a74b5e5402cabf43ef601d05d31",
+  "gitHead": "32395b356a4febaac0d52506742947c916ac9895",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/sol/generator/ConstructorQueryGen.js

@@ -1,4 +1,3 @@
-import { stringCamelCase } from '@dedot/utils';
 import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
 export class ConstructorQueryGen {
     abi;
@@ -8,6 +7,7 @@ export class ConstructorQueryGen {
         this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericConstructorQuery', 'GenericConstructorQueryCall', 'GenericConstructorCallResult', 'ConstructorCallOptions', 'ContractInstantiateResult', 'MetadataType');
         let constructor = this.findConstructor();
@@ -23,7 +23,7 @@ export class ConstructorQueryGen {
         // we use the name `_options` for the last options param
         // This is just and edge case, so this approach works for now
         const optionsParamName = inputs.some(({ name }) => name === 'options') ? '_options' : 'options';
-        callsOut += `${commentBlock(inputs.map((input, idx) => `@param {${this.typesGen.generateType(input, abiItem, 1)}} ${stringCamelCase(input.name || `arg${idx}`)}`), optionsTypeName ? `@param {${optionsTypeName}} ${optionsParamName}` : '')}`;
+        callsOut += `${commentBlock(inputs.map((input, idx) => `@param {${this.typesGen.generateType(input, abiItem, 1)}} ${input.name || `arg${idx}`}`), optionsTypeName ? `@param {${optionsTypeName}} ${optionsParamName}` : '')}`;
         callsOut += `new: ${this.generateMethodDef(abiItem, optionsParamName)};\n\n`;
         return callsOut;
     }
@@ -33,7 +33,7 @@ export class ConstructorQueryGen {
     }
     generateParamsOut(abiItem) {
         return abiItem.inputs
-            .map((input, idx) => `${stringCamelCase(input.name || `arg${idx}`)}: ${this.typesGen.generateType(input, abiItem, 1)}`)
+            .map((input, idx) => `${input.name || `arg${idx}`}: ${this.typesGen.generateType(input, abiItem, 1)}`)
             .join(', ');
     }
     findConstructor() {

package/sol/generator/ConstructorTxGen.js

@@ -2,6 +2,7 @@ import { beautifySourceCode, compileTemplate } from '../../utils.js';
 import { ConstructorQueryGen } from './ConstructorQueryGen.js';
 export class ConstructorTxGen extends ConstructorQueryGen {
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericConstructorTx', 'SolGenericContractApi', 'GenericConstructorTxCall', 'ConstructorTxOptions', 'GenericInstantiateSubmittableExtrinsic', 'MetadataType');
         let constructor = this.findConstructor();

package/sol/generator/EventsGen.js

@@ -1,4 +1,4 @@
-import { stringCamelCase, stringPascalCase } from '@dedot/utils';
+import { stringPascalCase } from '@dedot/utils';
 import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
 export class EventsGen {
     abi;
@@ -8,12 +8,13 @@ export class EventsGen {
         this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericContractEvents', 'GenericContractEvent', 'MetadataType');
         const events = this.abi.filter((o) => o.type === 'event');
         let eventsOut = '';
         events.forEach((event) => {
-            const { name, anonymous } = event;
+            const { name } = event;
             eventsOut += `${stringPascalCase(name)}: ${this.#generateEventDef(event)};\n\n`;
         });
         const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
@@ -23,12 +24,15 @@ export class EventsGen {
     #generateEventDef(abiItem) {
         const { name } = abiItem;
         const paramsOut = this.generateParamsOut(abiItem);
-        return `GenericContractEvent<'${stringPascalCase(name)}', {${paramsOut}}, Type>`;
+        return `GenericContractEvent<'${stringPascalCase(name)}', ${paramsOut}, Type>`;
     }
     generateParamsOut(abiItem) {
         const { inputs } = abiItem;
-        return inputs
-            .map((o, idx) => `${commentBlock(`@indexed: ${o.indexed}`)}${stringCamelCase(o.name || `arg${idx}`)}: ${this.typesGen.generateType(o, abiItem, 1)}`)
-            .join(', ');
+        if (inputs.length > 0 && !inputs.at(0).name) {
+            return `[${inputs.map((o) => `${commentBlock(`@indexed: ${o.indexed}`)}${this.typesGen.generateType(o, abiItem, 1)}`).join(', ')}]`;
+        }
+        return `{${inputs
+            .map((o, idx) => `${commentBlock(`@indexed: ${o.indexed}`)}${o.name || `arg${idx}`}: ${this.typesGen.generateType(o, abiItem, 1)}`)
+            .join(', ')}}`;
     }
 }

package/sol/generator/QueryGen.js

@@ -1,5 +1,4 @@
 import { normalizeLabel } from '@dedot/contracts';
-import { stringCamelCase } from '@dedot/utils';
 import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
 export class QueryGen {
     abi;
@@ -9,6 +8,7 @@ export class QueryGen {
         this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericContractQuery', 'GenericContractQueryCall', 'ContractCallOptions', 'GenericContractCallResult', 'ContractCallResult', 'MetadataType');
         const functions = this.abi.filter((item) => item.type === 'function');
@@ -25,7 +25,7 @@ export class QueryGen {
             // we use the name `_options` for the last options param
             // This is just and edge case, so this approach works for now
             const optionsParamName = inputs.some(({ name }) => name === 'options') ? '_options' : 'options';
-            callsOut += `${commentBlock(inputs.map((input, idx) => `@param {${this.typesGen.generateType(input, def, 1)}} ${stringCamelCase(input.name || `arg${idx}`)}`), optionsTypeName ? `@param {${optionsTypeName}} ${optionsParamName}` : '')}`;
+            callsOut += `${commentBlock(inputs.map((input, idx) => `@param {${this.typesGen.generateType(input, def, 1)}} ${input.name || `arg${idx}`}`), optionsTypeName ? `@param {${optionsTypeName}} ${optionsParamName}` : '')}`;
             callsOut += `${normalizeLabel(name)}: ${this.generateMethodDef(def, optionsParamName)};\n\n`;
         });
         return callsOut;
@@ -40,7 +40,7 @@ export class QueryGen {
     }
     generateParamsOut(abiItem) {
         return abiItem.inputs
-            .map((input, idx) => `${stringCamelCase(input.name || `arg${idx}`)}: ${this.typesGen.generateType(input, abiItem, 1)}`)
+            .map((input, idx) => `${input.name || `arg${idx}`}: ${this.typesGen.generateType(input, abiItem, 1)}`)
             .join(', ');
     }
 }

package/sol/generator/TxGen.js

@@ -2,6 +2,7 @@ import { beautifySourceCode, compileTemplate } from '../../utils.js';
 import { QueryGen } from './QueryGen.js';
 export class TxGen extends QueryGen {
     generate(useSubPaths = false) {
+        this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericContractTx', 'GenericContractTxCall', 'ContractTxOptions', 'ContractSubmittableExtrinsic', 'MetadataType');
         const txFunctions = this.abi.filter((item) => item.type === 'function' && item.stateMutability !== 'view');

package/sol/generator/TypesGen.d.ts

@@ -12,4 +12,5 @@ export declare class TypesGen {
     generateType(typeDef: SolAbiTypeDef, abiItem?: SolAbiItem, nestedLevel?: number, typeOut?: boolean): string;
     generateObjectType(components: SolAbiTypeDef[], nestedLevel?: number, typeOut?: boolean): string;
     addTypeImport(typeName: string | string[]): void;
+    clearCache(): void;
 }

package/sol/generator/TypesGen.js

@@ -188,7 +188,7 @@ export class TypesGen {
                 type,
             };
         });
-        if (props.length > 0 && props.at(0).name.length === 0) {
+        if (props.length > 0 && !props.at(0).name) {
             return `[${props.map(({ type }) => `${type}`).join(', ')}]`;
         }
         return `{${props.map(({ name, type }) => `${name}: ${type}`).join(',\n')}}`;
@@ -209,4 +209,7 @@ export class TypesGen {
         }
         this.typeImports.addPortableType(typeName);
     }
+    clearCache() {
+        this.typeImports.clear();
+    }
 }