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
wants to merge 7 commits into
base: main
Choose a base branch
from
+145 −100
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
7 commits
Select commit Hold shift + click to select a range
fc4063c
refactor(codegen): separate property names, extract variable name dec…
mfazekas Sep 19, 2025
41688be
use variable names with suffix to avoid shdowing variables
mfazekas Sep 19, 2025
0f12ede
test: update fixutres
mfazekas Sep 19, 2025
da248dc
doc: added comment
mfazekas Sep 19, 2025
5f8cb34
fix: flow types
mfazekas Sep 19, 2025
f64541f
prettier
mfazekas Sep 19, 2025
6dcb8ef
added codegen suffix
mfazekas Sep 19, 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 location_codegen1 = jsi::Object(runtime);
{
auto source = jsi::Object(runtime);
source.setProperty(runtime, \\"url\\", event.location.source.url);
location.setProperty(runtime, \\"source\\", source);
auto source_codegen2 = jsi::Object(runtime);
source_codegen2.setProperty(runtime, \\"url\\", event.location.source.url);
location_codegen1.setProperty(runtime, \\"source\\", source_codegen2);
}
location.setProperty(runtime, \\"x\\", event.location.x);
location.setProperty(runtime, \\"y\\", event.location.y);
location_codegen1.setProperty(runtime, \\"x\\", event.location.x);
location_codegen1.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 arrayOfObjects_codegen3 = jsi::Array(runtime, event.location.arrayOfObjects.size());
size_t arrayOfObjectsIndex_codegen4 = 0;
for (auto arrayOfObjectsValue_codegen5 : event.location.arrayOfObjects) {
auto arrayOfObjectsObject_codegen6 = jsi::Object(runtime);
{
auto value = jsi::Object(runtime);
value.setProperty(runtime, \\"str\\", arrayOfObjectsValue.value.str);
arrayOfObjectsObject.setProperty(runtime, \\"value\\", value);
auto value_codegen7 = jsi::Object(runtime);
value_codegen7.setProperty(runtime, \\"str\\", arrayOfObjectsValue_codegen5.value.str);
arrayOfObjectsObject_codegen6.setProperty(runtime, \\"value\\", value_codegen7);
}
arrayOfObjects.setValueAtIndex(runtime, arrayOfObjectsIndex++, arrayOfObjectsObject);
arrayOfObjects_codegen3.setValueAtIndex(runtime, arrayOfObjectsIndex_codegen4++, arrayOfObjectsObject_codegen6);
}
location.setProperty(runtime, \\"arrayOfObjects\\", arrayOfObjects);
location_codegen1.setProperty(runtime, \\"arrayOfObjects\\", arrayOfObjects_codegen3);

payload.setProperty(runtime, \\"location\\", location);
payload.setProperty(runtime, \\"location\\", location_codegen1);
}
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 location_codegen1 = jsi::Object(runtime);
{
auto source = jsi::Object(runtime);
source.setProperty(runtime, \\"url\\", event.location.source.url);
location.setProperty(runtime, \\"source\\", source);
auto source_codegen2 = jsi::Object(runtime);
source_codegen2.setProperty(runtime, \\"url\\", event.location.source.url);
location_codegen1.setProperty(runtime, \\"source\\", source_codegen2);
}
location.setProperty(runtime, \\"x\\", event.location.x);
location.setProperty(runtime, \\"y\\", event.location.y);
location_codegen1.setProperty(runtime, \\"x\\", event.location.x);
location_codegen1.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 arrayOfObjects_codegen3 = jsi::Array(runtime, event.location.arrayOfObjects.size());
size_t arrayOfObjectsIndex_codegen4 = 0;
for (auto arrayOfObjectsValue_codegen5 : event.location.arrayOfObjects) {
auto arrayOfObjectsObject_codegen6 = jsi::Object(runtime);
{
auto value = jsi::Object(runtime);
value.setProperty(runtime, \\"str\\", arrayOfObjectsValue.value.str);
arrayOfObjectsObject.setProperty(runtime, \\"value\\", value);
auto value_codegen7 = jsi::Object(runtime);
value_codegen7.setProperty(runtime, \\"str\\", arrayOfObjectsValue_codegen5.value.str);
arrayOfObjectsObject_codegen6.setProperty(runtime, \\"value\\", value_codegen7);
}
arrayOfObjects.setValueAtIndex(runtime, arrayOfObjectsIndex++, arrayOfObjectsObject);
arrayOfObjects_codegen3.setValueAtIndex(runtime, arrayOfObjectsIndex_codegen4++, arrayOfObjectsObject_codegen6);
}
location.setProperty(runtime, \\"arrayOfObjects\\", arrayOfObjects);
location_codegen1.setProperty(runtime, \\"arrayOfObjects\\", arrayOfObjects_codegen3);

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