Skip to content
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

Jump to bottom

Use hasteModuleName for C++ Turbo Module enums #44631

Closed
wants to merge 2 commits into from
Closed

Use hasteModuleName for C++ Turbo Module enums #44631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c98effd
[skip ci] Use hasteModuleName for C++ Turbo Module structs (#44630)
christophpurrer May 23, 2024
cd78c8d
Use hasteModuleName for C++ Turbo Module enums (#44631)
christophpurrer May 23, 2024
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
80 changes: 40 additions & 40 deletions ...ges/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,18 +923,18 @@ private:



#pragma mark - SampleTurboModuleAnimal
#pragma mark - NativeSampleTurboModuleAnimal

template <typename P0>
struct SampleTurboModuleAnimal {
struct NativeSampleTurboModuleAnimal {
P0 name;
bool operator==(const SampleTurboModuleAnimal &other) const {
bool operator==(const NativeSampleTurboModuleAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleAnimalBridging {
struct NativeSampleTurboModuleAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -1117,18 +1117,18 @@ private:



#pragma mark - SampleTurboModuleArraysAnimal
#pragma mark - NativeSampleTurboModuleArraysAnimal

template <typename P0>
struct SampleTurboModuleArraysAnimal {
struct NativeSampleTurboModuleArraysAnimal {
P0 name;
bool operator==(const SampleTurboModuleArraysAnimal &other) const {
bool operator==(const NativeSampleTurboModuleArraysAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleArraysAnimalBridging {
struct NativeSampleTurboModuleArraysAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -1311,18 +1311,18 @@ private:



#pragma mark - SampleTurboModuleNullableAnimal
#pragma mark - NativeSampleTurboModuleNullableAnimal

template <typename P0>
struct SampleTurboModuleNullableAnimal {
struct NativeSampleTurboModuleNullableAnimal {
P0 name;
bool operator==(const SampleTurboModuleNullableAnimal &other) const {
bool operator==(const NativeSampleTurboModuleNullableAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleNullableAnimalBridging {
struct NativeSampleTurboModuleNullableAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -1505,18 +1505,18 @@ private:



#pragma mark - SampleTurboModuleNullableAndOptionalAnimal
#pragma mark - NativeSampleTurboModuleNullableAndOptionalAnimal

template <typename P0>
struct SampleTurboModuleNullableAndOptionalAnimal {
struct NativeSampleTurboModuleNullableAndOptionalAnimal {
P0 name;
bool operator==(const SampleTurboModuleNullableAndOptionalAnimal &other) const {
bool operator==(const NativeSampleTurboModuleNullableAndOptionalAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleNullableAndOptionalAnimalBridging {
struct NativeSampleTurboModuleNullableAndOptionalAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -1701,18 +1701,18 @@ private:



#pragma mark - SampleTurboModuleOptionalAnimal
#pragma mark - NativeSampleTurboModuleOptionalAnimal

template <typename P0>
struct SampleTurboModuleOptionalAnimal {
struct NativeSampleTurboModuleOptionalAnimal {
P0 name;
bool operator==(const SampleTurboModuleOptionalAnimal &other) const {
bool operator==(const NativeSampleTurboModuleOptionalAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleOptionalAnimalBridging {
struct NativeSampleTurboModuleOptionalAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -2877,18 +2877,18 @@ private:



#pragma mark - SampleTurboModuleAnimal
#pragma mark - NativeSampleTurboModuleAnimal

template <typename P0>
struct SampleTurboModuleAnimal {
struct NativeSampleTurboModuleAnimal {
P0 name;
bool operator==(const SampleTurboModuleAnimal &other) const {
bool operator==(const NativeSampleTurboModuleAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleAnimalBridging {
struct NativeSampleTurboModuleAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -3071,18 +3071,18 @@ private:



#pragma mark - SampleTurboModuleArraysAnimal
#pragma mark - NativeSampleTurboModuleArraysAnimal

template <typename P0>
struct SampleTurboModuleArraysAnimal {
struct NativeSampleTurboModuleArraysAnimal {
P0 name;
bool operator==(const SampleTurboModuleArraysAnimal &other) const {
bool operator==(const NativeSampleTurboModuleArraysAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleArraysAnimalBridging {
struct NativeSampleTurboModuleArraysAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -3265,18 +3265,18 @@ private:



#pragma mark - SampleTurboModuleNullableAnimal
#pragma mark - NativeSampleTurboModuleNullableAnimal

template <typename P0>
struct SampleTurboModuleNullableAnimal {
struct NativeSampleTurboModuleNullableAnimal {
P0 name;
bool operator==(const SampleTurboModuleNullableAnimal &other) const {
bool operator==(const NativeSampleTurboModuleNullableAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleNullableAnimalBridging {
struct NativeSampleTurboModuleNullableAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -3459,18 +3459,18 @@ private:



#pragma mark - SampleTurboModuleNullableAndOptionalAnimal
#pragma mark - NativeSampleTurboModuleNullableAndOptionalAnimal

template <typename P0>
struct SampleTurboModuleNullableAndOptionalAnimal {
struct NativeSampleTurboModuleNullableAndOptionalAnimal {
P0 name;
bool operator==(const SampleTurboModuleNullableAndOptionalAnimal &other) const {
bool operator==(const NativeSampleTurboModuleNullableAndOptionalAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleNullableAndOptionalAnimalBridging {
struct NativeSampleTurboModuleNullableAndOptionalAnimalBridging {
static T types;

static T fromJs(
Expand Down Expand Up @@ -3655,18 +3655,18 @@ private:



#pragma mark - SampleTurboModuleOptionalAnimal
#pragma mark - NativeSampleTurboModuleOptionalAnimal

template <typename P0>
struct SampleTurboModuleOptionalAnimal {
struct NativeSampleTurboModuleOptionalAnimal {
P0 name;
bool operator==(const SampleTurboModuleOptionalAnimal &other) const {
bool operator==(const NativeSampleTurboModuleOptionalAnimal &other) const {
return name == other.name;
}
};

template <typename T>
struct SampleTurboModuleOptionalAnimalBridging {
struct NativeSampleTurboModuleOptionalAnimalBridging {
static T types;

static T fromJs(
Expand Down
33 changes: 19 additions & 14 deletions packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ function translatePrimitiveJSTypeToCpp(
}

function createStructsString(
moduleName: string,
hasteModuleName: string,
aliasMap: NativeModuleAliasMap,
resolveAlias: AliasResolver,
enumMap: NativeModuleEnumMap,
Expand All @@ -221,7 +221,7 @@ function createStructsString(
v: NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>,
) =>
translatePrimitiveJSTypeToCpp(
moduleName,
hasteModuleName,
parentObjectAlias,
v.typeAnnotation,
false,
Expand All @@ -236,7 +236,7 @@ function createStructsString(
if (value.properties.length === 0) {
return '';
}
const structName = `${moduleName}${alias}`;
const structName = `${hasteModuleName}${alias}`;
const templateParameter = value.properties.filter(
v =>
!isDirectRecursiveMember(alias, v.typeAnnotation) &&
Expand Down Expand Up @@ -390,12 +390,12 @@ struct Bridging<${enumName}> {
};

function generateEnum(
moduleName: string,
hasteModuleName: string,
origEnumName: string,
members: NativeModuleEnumMembers,
memberType: NativeModuleEnumMemberType,
): string {
const enumName = getEnumName(moduleName, origEnumName);
const enumName = getEnumName(hasteModuleName, origEnumName);

const nativeEnumMemberType: NativeEnumMemberValueType =
memberType === 'StringTypeAnnotation' ? 'std::string' : 'int32_t';
Expand Down Expand Up @@ -437,14 +437,14 @@ function generateEnum(
}

function createEnums(
moduleName: string,
hasteModuleName: string,
enumMap: NativeModuleEnumMap,
resolveAlias: AliasResolver,
): string {
return Object.entries(enumMap)
.map(([enumName, enumNode]) => {
return generateEnum(
moduleName,
hasteModuleName,
enumName,
enumNode.members,
enumNode.memberType,
Expand All @@ -455,7 +455,7 @@ function createEnums(
}

function translatePropertyToCpp(
moduleName: string,
hasteModuleName: string,
prop: NativeModulePropertyShape,
resolveAlias: AliasResolver,
enumMap: NativeModuleEnumMap,
Expand All @@ -470,7 +470,7 @@ function translatePropertyToCpp(

const paramTypes = propTypeAnnotation.params.map(param => {
const translatedParam = translatePrimitiveJSTypeToCpp(
moduleName,
hasteModuleName,
null,
param.typeAnnotation,
param.optional,
Expand All @@ -483,7 +483,7 @@ function translatePropertyToCpp(
});

const returnType = translatePrimitiveJSTypeToCpp(
moduleName,
hasteModuleName,
null,
propTypeAnnotation.returnTypeAnnotation,
false,
Expand Down Expand Up @@ -530,19 +530,19 @@ module.exports = {
} = nativeModules[hasteModuleName];
const resolveAlias = createAliasResolver(aliasMap);
const structs = createStructsString(
moduleName,
hasteModuleName,
aliasMap,
resolveAlias,
enumMap,
);
const enums = createEnums(moduleName, enumMap, resolveAlias);
const enums = createEnums(hasteModuleName, enumMap, resolveAlias);

return [
ModuleClassDeclarationTemplate({
hasteModuleName,
moduleProperties: properties.map(prop =>
translatePropertyToCpp(
moduleName,
hasteModuleName,
prop,
resolveAlias,
enumMap,
Expand All @@ -556,7 +556,12 @@ module.exports = {
hasteModuleName,
moduleName,
moduleProperties: properties.map(prop =>
translatePropertyToCpp(moduleName, prop, resolveAlias, enumMap),
translatePropertyToCpp(
hasteModuleName,
prop,
resolveAlias,
enumMap,
),
),
}),
];
Expand Down
Loading
Loading