feat: Allow destructuring arguments in TGSL function implementations #1257
Conversation
This file contains hidden or 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
|
pkg.pr.new packages benchmark commit |
reczkok
approved these changes
May 19, 2025
mhawryluk
changed the title
reczkok
approved these changes
May 22, 2025
Comment on lines
198
to
201
| const argAlias = layer.argAliases[id]; | ||
| if (argAlias !== undefined) { | ||
| return argAlias; | ||
| } |
There was a problem hiding this comment.
Suggested change
| const argAlias = layer.argAliases[id]; | |
| if (argAlias !== undefined) { | |
| return argAlias; | |
| } | |
| if (layer.argAliases[id]) { | |
| return layer.argAliases[id]; | |
| } |
Comment on lines
-123
to
+153
| applyExternals( | ||
| externalMap, | ||
| Object.fromEntries( | ||
| ast.argNames.props.map(({ prop, alias }) => [alias, prop]), | ||
| ), | ||
| ); | ||
| } | ||
|
|
||
| if ( | ||
| !Array.isArray(shell.argTypes) && | ||
| ast.argNames.type === 'identifiers' && | ||
| ast.argNames.names[0] !== undefined | ||
| ) { | ||
| applyExternals(externalMap, { | ||
| [ast.argNames.names[0]]: Object.fromEntries( | ||
| Object.keys(shell.argTypes).map((arg) => [arg, arg]), | ||
| ), | ||
| }); | ||
| } | ||
|
|
||
| // Verifying all required externals are present. | ||
| // verify all required externals are present | ||
| const missingExternals = ast.externalNames.filter( | ||
| (name) => !(name in externalMap), | ||
| ); | ||
|
|
||
| if (missingExternals.length > 0) { | ||
| throw new MissingLinksError(getName(this), missingExternals); | ||
| } | ||
|
|
||
| const args: Snippet[] = Array.isArray(shell.argTypes) | ||
| ? ast.argNames.type === 'identifiers' | ||
| ? shell.argTypes.map((arg, i) => ({ | ||
| value: (ast.argNames.type === 'identifiers' | ||
| ? ast.argNames.names[i] | ||
| : undefined) ?? `arg_${i}`, | ||
| dataType: arg as AnyWgslData, | ||
| })) | ||
| : [] | ||
| : Object.entries(shell.argTypes).map(([name, dataType]) => ({ | ||
| value: name, | ||
| dataType: dataType as AnyWgslData, | ||
| })); | ||
|
|
||
| // generate wgsl string | ||
| const { head, body } = ctx.fnToWgsl({ | ||
| args, | ||
| args: shell.argTypes.map((arg, i) => ({ | ||
| value: ast.params[i]?.type === FuncParameterType.identifier | ||
| ? ast.params[i].name | ||
| : `_arg_${i}`, | ||
| dataType: arg as AnyWgslData, | ||
| })), | ||
| argAliases: Object.fromEntries( | ||
| ast.params.flatMap((param, i) => | ||
| param.type === FuncParameterType.destructuredObject | ||
| ? param.props.map(({ name, alias }) => [ | ||
| alias, | ||
| { | ||
| value: `_arg_${i}.${name}`, | ||
| dataType: (shell.argTypes[i] as AnyWgslStruct) | ||
| .propTypes[name] as AnyWgslData, | ||
| }, | ||
| ]) | ||
| : [] | ||
| ), | ||
| ), |
There was a problem hiding this comment.
I'm gonna hang this diff on my wall😍
Comment on lines
457
to
459
| params: functionNode.params.filter((param) => | ||
| param.type === 'ObjectPattern' || param.type === 'Identifier' | ||
| ).map((param) => |
There was a problem hiding this comment.
Instead of filtering here we could check if there are any other and have a nice early error
iwoplaza
approved these changes
May 27, 2025
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.
closes #1242
closes #1270
closes #1271