Skip to content

Commit 73b5161

Browse files
Update generate script to expose clean types (#2553)
1 parent 95eb75a commit 73b5161

File tree

174 files changed

+1720
-1801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+1720
-1801
lines changed

packages/thirdweb/scripts/generate/generate.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ function generateWriteFunction(f: AbiFunction, extensionName: string): string {
111111
import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
112112
${
113113
f.inputs.length > 0
114-
? `import type { Prettify } from "../../../../../utils/type-utils.js";
115-
import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";`
114+
? `import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";`
116115
: ""
117116
}
118117
@@ -122,17 +121,14 @@ ${
122121
* Represents the parameters for the "${f.name}" function.
123122
*/
124123
125-
type ${inputTypeName}Internal = {
124+
export type ${inputTypeName} = {
126125
${f.inputs
127126
.map(
128127
(x) =>
129128
`${removeLeadingUnderscore(x.name)}: AbiParameterToPrimitiveType<${JSON.stringify(x)}>`,
130129
)
131130
.join("\n")}}
132131
133-
export type ${inputTypeName} = Prettify<${inputTypeName}Internal | {
134-
asyncParams: () => Promise<${inputTypeName}Internal>;
135-
}>;
136132
`
137133
: ""
138134
};
@@ -156,7 +152,7 @@ ${
156152
.join("\n * ")}\n * });
157153
* \`\`\`
158154
*/
159-
export function encode${uppercaseFirstLetter(f.name)}Params(options: ${inputTypeName}Internal) {
155+
export function encode${uppercaseFirstLetter(f.name)}Params(options: ${inputTypeName}) {
160156
return encodeAbiParameters(FN_INPUTS, [${f.inputs
161157
.map((x) => `options.${removeLeadingUnderscore(x.name)}`)
162158
.join(", ")}]);
@@ -178,7 +174,7 @@ export function encode${uppercaseFirstLetter(f.name)}Params(options: ${inputType
178174
*
179175
* const transaction = ${f.name}(${
180176
f.inputs.length > 0
181-
? `{\n * ${f.inputs
177+
? `{\n * contract,\n * ${f.inputs
182178
.map((x) => ` ${removeLeadingUnderscore(x.name)}: ...,`)
183179
.join("\n * ")}\n * }`
184180
: ""
@@ -191,7 +187,11 @@ export function encode${uppercaseFirstLetter(f.name)}Params(options: ${inputType
191187
*/
192188
export function ${f.name}(
193189
options: BaseTransactionOptions${
194-
f.inputs.length > 0 ? `<${inputTypeName}>` : ""
190+
f.inputs.length > 0
191+
? `<${inputTypeName} | {
192+
asyncParams: () => Promise<${inputTypeName}>
193+
}>`
194+
: ""
195195
}
196196
) {
197197
return prepareContractCall({

packages/thirdweb/src/extensions/common/__generated__/IClaimConditionsSinglePhase/write/setClaimConditions.ts

Lines changed: 9 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/write/setContractURI.ts

Lines changed: 9 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/thirdweb/src/extensions/common/__generated__/IMulticall/write/multicall.ts

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/thirdweb/src/extensions/common/__generated__/IOwnable/write/setOwner.ts

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/thirdweb/src/extensions/common/__generated__/IPermissions/write/grantRole.ts

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)