Skip to content

fix(codegen): ensure unique c++ variable names to avoid collision for properties with the same name #53852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mfazekas wants to merge 8 commits into
base: main
Choose a base branch
from
Open

fix(codegen): ensure unique c++ variable names to avoid collision for properties with the same name #53852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1695485
refactor(codegen): separate property names, extract variable name dec…
mfazekas Sep 19, 2025
40a2aa3
use variable names with suffix to avoid shdowing variables
mfazekas Sep 19, 2025
90b4a4d
test: update fixutres
mfazekas Sep 19, 2025
568f149
doc: added comment
mfazekas Sep 19, 2025
09847c0
fix: flow types
mfazekas Sep 19, 2025
b4f89ad
prettier
mfazekas Sep 19, 2025
1dd043d
added codegen suffix
mfazekas Sep 19, 2025
6ce639b
use __codegen__<num>__ prefix
mfazekas Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .../e2e/deep_imports/__tests__/components/__snapshots__/GenerateEventEmitterCpp-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,29 +153,29 @@ void EventNestedObjectPropsNativeComponentViewEventEmitter::onChange(OnChange ev
dispatchEvent(\\"change\\", [event=std::move(event)](jsi::Runtime &runtime) {
auto payload = jsi::Object(runtime);
{
auto location = jsi::Object(runtime);
auto __codegen__1__location = jsi::Object(runtime);
{
auto source = jsi::Object(runtime);
source.setProperty(runtime, \\"url\\", event.location.source.url);
location.setProperty(runtime, \\"source\\", source);
auto __codegen__2__source = jsi::Object(runtime);
__codegen__2__source.setProperty(runtime, \\"url\\", event.location.source.url);
__codegen__1__location.setProperty(runtime, \\"source\\", __codegen__2__source);
}
location.setProperty(runtime, \\"x\\", event.location.x);
location.setProperty(runtime, \\"y\\", event.location.y);
__codegen__1__location.setProperty(runtime, \\"x\\", event.location.x);
__codegen__1__location.setProperty(runtime, \\"y\\", event.location.y);

auto arrayOfObjects = jsi::Array(runtime, event.location.arrayOfObjects.size());
size_t arrayOfObjectsIndex = 0;
for (auto arrayOfObjectsValue : event.location.arrayOfObjects) {
auto arrayOfObjectsObject = jsi::Object(runtime);
auto __codegen__3__arrayOfObjects = jsi::Array(runtime, event.location.arrayOfObjects.size());
size_t __codegen__4__arrayOfObjectsIndex = 0;
for (auto __codegen__5__arrayOfObjectsValue : event.location.arrayOfObjects) {
auto __codegen__6__arrayOfObjectsObject = jsi::Object(runtime);
{
auto value = jsi::Object(runtime);
value.setProperty(runtime, \\"str\\", arrayOfObjectsValue.value.str);
arrayOfObjectsObject.setProperty(runtime, \\"value\\", value);
auto __codegen__7__value = jsi::Object(runtime);
__codegen__7__value.setProperty(runtime, \\"str\\", __codegen__5__arrayOfObjectsValue.value.str);
__codegen__6__arrayOfObjectsObject.setProperty(runtime, \\"value\\", __codegen__7__value);
}
arrayOfObjects.setValueAtIndex(runtime, arrayOfObjectsIndex++, arrayOfObjectsObject);
__codegen__3__arrayOfObjects.setValueAtIndex(runtime, __codegen__4__arrayOfObjectsIndex++, __codegen__6__arrayOfObjectsObject);
}
location.setProperty(runtime, \\"arrayOfObjects\\", arrayOfObjects);
__codegen__1__location.setProperty(runtime, \\"arrayOfObjects\\", __codegen__3__arrayOfObjects);

payload.setProperty(runtime, \\"location\\", location);
payload.setProperty(runtime, \\"location\\", __codegen__1__location);
}
return payload;
});
Expand Down
32 changes: 16 additions & 16 deletions ...en/e2e/namespaced/__tests__/components/__snapshots__/GenerateEventEmitterCpp-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,29 +153,29 @@ void EventNestedObjectPropsNativeComponentViewEventEmitter::onChange(OnChange ev
dispatchEvent(\\"change\\", [event=std::move(event)](jsi::Runtime &runtime) {
auto payload = jsi::Object(runtime);
{
auto location = jsi::Object(runtime);
auto __codegen__1__location = jsi::Object(runtime);
{
auto source = jsi::Object(runtime);
source.setProperty(runtime, \\"url\\", event.location.source.url);
location.setProperty(runtime, \\"source\\", source);
auto __codegen__2__source = jsi::Object(runtime);
__codegen__2__source.setProperty(runtime, \\"url\\", event.location.source.url);
__codegen__1__location.setProperty(runtime, \\"source\\", __codegen__2__source);
}
location.setProperty(runtime, \\"x\\", event.location.x);
location.setProperty(runtime, \\"y\\", event.location.y);
__codegen__1__location.setProperty(runtime, \\"x\\", event.location.x);
__codegen__1__location.setProperty(runtime, \\"y\\", event.location.y);

auto arrayOfObjects = jsi::Array(runtime, event.location.arrayOfObjects.size());
size_t arrayOfObjectsIndex = 0;
for (auto arrayOfObjectsValue : event.location.arrayOfObjects) {
auto arrayOfObjectsObject = jsi::Object(runtime);
auto __codegen__3__arrayOfObjects = jsi::Array(runtime, event.location.arrayOfObjects.size());
size_t __codegen__4__arrayOfObjectsIndex = 0;
for (auto __codegen__5__arrayOfObjectsValue : event.location.arrayOfObjects) {
auto __codegen__6__arrayOfObjectsObject = jsi::Object(runtime);
{
auto value = jsi::Object(runtime);
value.setProperty(runtime, \\"str\\", arrayOfObjectsValue.value.str);
arrayOfObjectsObject.setProperty(runtime, \\"value\\", value);
auto __codegen__7__value = jsi::Object(runtime);
__codegen__7__value.setProperty(runtime, \\"str\\", __codegen__5__arrayOfObjectsValue.value.str);
__codegen__6__arrayOfObjectsObject.setProperty(runtime, \\"value\\", __codegen__7__value);
}
arrayOfObjects.setValueAtIndex(runtime, arrayOfObjectsIndex++, arrayOfObjectsObject);
__codegen__3__arrayOfObjects.setValueAtIndex(runtime, __codegen__4__arrayOfObjectsIndex++, __codegen__6__arrayOfObjectsObject);
}
location.setProperty(runtime, \\"arrayOfObjects\\", arrayOfObjects);
__codegen__1__location.setProperty(runtime, \\"arrayOfObjects\\", __codegen__3__arrayOfObjects);

payload.setProperty(runtime, \\"location\\", location);
payload.setProperty(runtime, \\"location\\", __codegen__1__location);
}
return payload;
});
Expand Down
Loading
Loading