Support Typescript generate scaffold #2111
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stwiname
reviewed
Oct 19, 2023
packages/cli/src/utils/utils.ts
Outdated
| @@ -113,27 +114,131 @@ export function findReplace(manifest: string, replacer: RegExp, value: string): | |||
| return manifest.replace(replacer, value); | |||
| } | |||
|
|
|||
| export function replaceArrayValueInTsManifest(manifest: string, key: string, newValue: string): string { | |||
There was a problem hiding this comment.
I think it would be better to generalise this. Im also a little confused with the naming. It says to replace an array value, but takes a key rather than an index.
packages/cli/src/utils/utils.ts
Outdated
| @@ -113,27 +114,131 @@ export function findReplace(manifest: string, replacer: RegExp, value: string): | |||
| return manifest.replace(replacer, value); | |||
| } | |||
|
|
|||
| export function replaceArrayValueInTsManifest(manifest: string, key: string, newValue: string): string { | |||
| const start = manifest.indexOf(`${key}:`); | |||
| if (start === -1) return manifest; // If the value is not found, return the original manifest | |||
There was a problem hiding this comment.
I think rather than this function doing a no-op it would be better to throw and let the caller decide what to do.
Same with the open brackets check
packages/cli/src/utils/utils.ts
Outdated
| if (start === -1) return manifest; // If the value is not found, return the original manifest | ||
|
|
||
| let openBrackets = 0; | ||
| let startIndex, endIndex; |
packages/cli/src/utils/utils.ts
Outdated
Comment on lines
223
to
232
| let openBraces = 0; | ||
| let startIndex = 0; | ||
| const components: string[] = []; | ||
|
|
||
| for (let i = 0; i < content.length; i++) { | ||
| if (content[i] === '{') { | ||
| if (openBraces === 0) startIndex = i; | ||
| openBraces++; | ||
| } else if (content[i] === '}') { | ||
| openBraces--; | ||
| if (openBraces === 0) { | ||
| components.push(content.slice(startIndex, i + 1).trim()); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This could be deduped with above functions too
| @@ -152,6 +160,23 @@ export function constructDatasources(userInput: UserInput): EthereumDs { | |||
|
|
|||
| const assets = new Map([[abiName, {file: userInput.abiPath}]]); | |||
|
|
|||
| if (isTs) { | |||
There was a problem hiding this comment.
I think for readability, reduced union types and easier testing it would be worth splitting these functions into yaml and TS versions
packages/cli/src/utils/utils.ts
Outdated
| @@ -113,27 +114,131 @@ export function findReplace(manifest: string, replacer: RegExp, value: string): | |||
| return manifest.replace(replacer, value); | |||
| } | |||
|
|
|||
| export function replaceArrayValueInTsManifest(manifest: string, key: string, newValue: string): string { | |||
| const start = manifest.indexOf(`${key}:`); | |||
There was a problem hiding this comment.
What if there are multiple occurrences?
stwiname
changed the title
stwiname
reviewed
Oct 20, 2023
Comment on lines
131
to
148
| [cleanEvents, cleanFunctions] = filterExistingMethods( | ||
| selectedEvents, | ||
| selectedFunctions, | ||
| existingDs, | ||
| address, | ||
| yamlExtractor | ||
| ); | ||
|
|
||
| constructedEvents = constructMethod<EventFragment>(cleanEvents); | ||
| constructedFunctions = constructMethod<FunctionFragment>(cleanFunctions); | ||
|
|
||
| const userInput: UserInput = { | ||
| startBlock: startBlock, | ||
| functions: constructedFunctions, | ||
| events: constructedEvents, | ||
| abiPath: `./abis/${abiFileName}`, | ||
| address: address, | ||
| }; |
stwiname
reviewed
Oct 24, 2023
Comment on lines
292
to
295
| if (casedInputAddress && d.options.address) { | ||
| return casedInputAddress.toLowerCase() === d.options.address.toLowerCase(); | ||
| return casedInputAddress === d.options.address.toLowerCase(); | ||
| } | ||
| return casedInputAddress === d.options.address || (!casedInputAddress && !d.options.address); |
There was a problem hiding this comment.
This doesn't make much sense. The casedInputAddress === d.options.address outside of the if will always be false.
Also why is .toLowerCase() removed here?
| splitArrayString(dataSources) | ||
| .filter((d) => { | ||
| const match = d.match(ADDRESS_REG); | ||
| return match && match[1].toLowerCase() === casedInputAddress; |
There was a problem hiding this comment.
I think this check needs to be added.
Suggested change
| return match && match[1].toLowerCase() === casedInputAddress; | |
| return match && match.length >= 2 && match[1].toLowerCase() === casedInputAddress; |
bz888
force-pushed
the
fix/ts-generate-scaffold
branch
from
b5e6c4e to
26850a3
Compare
stwiname
approved these changes
Oct 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
Fixes #2098
codegen:generateworking with ts-manifest, instead of targetting.yamlit will now be updating the.tsmanifest with chosen abi methodsPlease delete options that are not relevant.
Checklist