Skip to content

Commit

Permalink
fix: ts codegen for verbatimModuleSyntax
Browse files Browse the repository at this point in the history
  • Loading branch information
olehmisar authored and spalladino committed Aug 29, 2024
1 parent 51d6699 commit 1aac787
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
33 changes: 18 additions & 15 deletions yarn-project/builder/src/contract-interface-gen/typescript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@ function generateEvents(events: any[] | undefined) {
* @returns The corresponding ts code.
*/
export function generateTypescriptContractInterface(input: ContractArtifact, artifactImportPath?: string) {
const methods = input.functions.filter(f => !f.isInternal).map(generateMethod);
const methods = input.functions
.filter(f => !f.isInternal)
.sort((a, b) => a.name.localeCompare(b.name))
.map(generateMethod);
const deploy = artifactImportPath && generateDeploy(input);
const ctor = artifactImportPath && generateConstructor(input.name);
const at = artifactImportPath && generateAt(input.name);
Expand All @@ -332,31 +335,31 @@ export function generateTypescriptContractInterface(input: ContractArtifact, art
/* eslint-disable */
import {
AztecAddress,
AztecAddressLike,
type AztecAddressLike,
CompleteAddress,
Contract,
ContractArtifact,
type ContractArtifact,
ContractBase,
ContractFunctionInteraction,
ContractInstanceWithAddress,
ContractMethod,
ContractStorageLayout,
ContractNotes,
type ContractInstanceWithAddress,
type ContractMethod,
type ContractStorageLayout,
type ContractNotes,
DeployMethod,
EthAddress,
EthAddressLike,
type EthAddressLike,
EventSelector,
FieldLike,
type FieldLike,
Fr,
FunctionSelectorLike,
type FunctionSelectorLike,
L1EventPayload,
loadContractArtifact,
NoirCompiledContract,
type NoirCompiledContract,
NoteSelector,
Point,
PublicKey,
Wallet,
WrappedFieldLike,
type PublicKey,
type Wallet,
type WrappedFieldLike,
} from '@aztec/aztec.js';
${artifactStatement}
Expand All @@ -379,7 +382,7 @@ export class ${input.name}Contract extends ContractBase {
${notesGetter}
/** Type-safe wrappers for the public methods exposed by the contract. */
public override methods!: {
declare public methods: {
${methods.join('\n')}
};
Expand Down
3 changes: 2 additions & 1 deletion yarn-project/noir-contracts.js/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"outDir": "dest",
"rootDir": "src",
"tsBuildInfoFile": ".tsbuildinfo"
"tsBuildInfoFile": ".tsbuildinfo",
"verbatimModuleSyntax": true
},
"references": [
{
Expand Down

0 comments on commit 1aac787

Please sign in to comment.