diff --git a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap index 5473654dc10cf0..18cb404067dc0b 100644 --- a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap +++ b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap @@ -320,111 +320,6 @@ struct Bridging { } }; -#pragma mark - NativeEnumTurboModuleBaseStateType - -template -struct [[deprecated(\\"Use NativeEnumTurboModuleStateType instead.\\")]] NativeEnumTurboModuleBaseStateType { - P0 state; - bool operator==(const NativeEnumTurboModuleBaseStateType &other) const { - return state == other.state; - } -}; - -template -struct [[deprecated(\\"Use NativeEnumTurboModuleStateTypeBridging instead.\\")]] NativeEnumTurboModuleBaseStateTypeBridging { - static NativeEnumTurboModuleBaseStateType fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - NativeEnumTurboModuleBaseStateType result{ - bridging::fromJs(rt, value.getProperty(rt, \\"state\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String stateToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const NativeEnumTurboModuleBaseStateType &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"state\\", bridging::toJs(rt, value.state, jsInvoker)); - return result; - } -}; - - - -#pragma mark - NativeEnumTurboModuleBaseStateTypeWithEnums - -template -struct [[deprecated(\\"Use NativeEnumTurboModuleStateTypeWithEnums instead.\\")]] NativeEnumTurboModuleBaseStateTypeWithEnums { - P0 state; - P1 regular; - P2 str; - P3 num; - P4 fraction; - bool operator==(const NativeEnumTurboModuleBaseStateTypeWithEnums &other) const { - return state == other.state && regular == other.regular && str == other.str && num == other.num && fraction == other.fraction; - } -}; - -template -struct [[deprecated(\\"Use NativeEnumTurboModuleStateTypeWithEnumsBridging instead.\\")]] NativeEnumTurboModuleBaseStateTypeWithEnumsBridging { - static NativeEnumTurboModuleBaseStateTypeWithEnums fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - NativeEnumTurboModuleBaseStateTypeWithEnums result{ - bridging::fromJs(rt, value.getProperty(rt, \\"state\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"regular\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"str\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"num\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"fraction\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String stateToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::String regularToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static jsi::String strToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } - - static jsi::Value numToJs(jsi::Runtime &rt, P3 value) { - return bridging::toJs(rt, value); - } - - static jsi::Value fractionToJs(jsi::Runtime &rt, P4 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const NativeEnumTurboModuleBaseStateTypeWithEnums &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"state\\", bridging::toJs(rt, value.state, jsInvoker)); - result.setProperty(rt, \\"regular\\", bridging::toJs(rt, value.regular, jsInvoker)); - result.setProperty(rt, \\"str\\", bridging::toJs(rt, value.str, jsInvoker)); - result.setProperty(rt, \\"num\\", bridging::toJs(rt, value.num, jsInvoker)); - result.setProperty(rt, \\"fraction\\", bridging::toJs(rt, value.fraction, jsInvoker)); - return result; - } -}; - - #pragma mark - NativeEnumTurboModuleStateType template @@ -899,53 +794,6 @@ private: -#pragma mark - NativePartialAnnotationTurboModuleBaseSomeObj - -template -struct [[deprecated(\\"Use NativePartialAnnotationTurboModuleSomeObj instead.\\")]] NativePartialAnnotationTurboModuleBaseSomeObj { - P0 a; - P1 b; - bool operator==(const NativePartialAnnotationTurboModuleBaseSomeObj &other) const { - return a == other.a && b == other.b; - } -}; - -template -struct [[deprecated(\\"Use NativePartialAnnotationTurboModuleSomeObjBridging instead.\\")]] NativePartialAnnotationTurboModuleBaseSomeObjBridging { - static NativePartialAnnotationTurboModuleBaseSomeObj fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - NativePartialAnnotationTurboModuleBaseSomeObj result{ - bridging::fromJs(rt, value.getProperty(rt, \\"a\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"b\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String aToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static bool bToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const NativePartialAnnotationTurboModuleBaseSomeObj &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"a\\", bridging::toJs(rt, value.a, jsInvoker)); - if (value.b) { - result.setProperty(rt, \\"b\\", bridging::toJs(rt, value.b.value(), jsInvoker)); - } - return result; - } -}; - - #pragma mark - NativePartialAnnotationTurboModuleSomeObj template @@ -1123,44 +971,6 @@ private: -#pragma mark - SampleTurboModuleBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleAnimal instead.\\")]] SampleTurboModuleBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleAnimalBridging instead.\\")]] SampleTurboModuleBaseAnimalBridging { - static SampleTurboModuleBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name, jsInvoker)); - return result; - } -}; - - #pragma mark - SampleTurboModuleAnimal template @@ -1355,44 +1165,6 @@ private: -#pragma mark - SampleTurboModuleArraysBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleArraysAnimal instead.\\")]] SampleTurboModuleArraysBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleArraysBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleArraysAnimalBridging instead.\\")]] SampleTurboModuleArraysBaseAnimalBridging { - static SampleTurboModuleArraysBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleArraysBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleArraysBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name, jsInvoker)); - return result; - } -}; - - #pragma mark - SampleTurboModuleArraysAnimal template @@ -1587,44 +1359,6 @@ private: -#pragma mark - SampleTurboModuleNullableBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleNullableAnimal instead.\\")]] SampleTurboModuleNullableBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleNullableBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleNullableAnimalBridging instead.\\")]] SampleTurboModuleNullableBaseAnimalBridging { - static SampleTurboModuleNullableBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleNullableBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static std::optional nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleNullableBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name, jsInvoker)); - return result; - } -}; - - #pragma mark - SampleTurboModuleNullableAnimal template @@ -1819,46 +1553,6 @@ private: -#pragma mark - SampleTurboModuleNullableAndOptionalBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleNullableAndOptionalAnimal instead.\\")]] SampleTurboModuleNullableAndOptionalBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleNullableAndOptionalBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleNullableAndOptionalAnimalBridging instead.\\")]] SampleTurboModuleNullableAndOptionalBaseAnimalBridging { - static SampleTurboModuleNullableAndOptionalBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleNullableAndOptionalBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static std::optional nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleNullableAndOptionalBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - if (value.name) { - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name.value(), jsInvoker)); - } - return result; - } -}; - - #pragma mark - SampleTurboModuleNullableAndOptionalAnimal template @@ -2055,36 +1749,38 @@ private: -#pragma mark - SampleTurboModuleOptionalBaseAnimal +#pragma mark - SampleTurboModuleOptionalAnimal template -struct [[deprecated(\\"Use SampleTurboModuleOptionalAnimal instead.\\")]] SampleTurboModuleOptionalBaseAnimal { +struct SampleTurboModuleOptionalAnimal { P0 name; - bool operator==(const SampleTurboModuleOptionalBaseAnimal &other) const { + bool operator==(const SampleTurboModuleOptionalAnimal &other) const { return name == other.name; } }; -template -struct [[deprecated(\\"Use SampleTurboModuleOptionalAnimalBridging instead.\\")]] SampleTurboModuleOptionalBaseAnimalBridging { - static SampleTurboModuleOptionalBaseAnimal fromJs( +template +struct SampleTurboModuleOptionalAnimalBridging { + static T types; + + static T fromJs( jsi::Runtime &rt, const jsi::Object &value, const std::shared_ptr &jsInvoker) { - SampleTurboModuleOptionalBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; + T result{ + bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; return result; } #ifdef DEBUG - static jsi::String nameToJs(jsi::Runtime &rt, P0 value) { + static jsi::String nameToJs(jsi::Runtime &rt, decltype(types.name) value) { return bridging::toJs(rt, value); } #endif static jsi::Object toJs( jsi::Runtime &rt, - const SampleTurboModuleOptionalBaseAnimal &value, + const T &value, const std::shared_ptr &jsInvoker) { auto result = facebook::jsi::Object(rt); if (value.name) { @@ -2094,51 +1790,9 @@ struct [[deprecated(\\"Use SampleTurboModuleOptionalAnimalBridging instead.\\")] } }; - -#pragma mark - SampleTurboModuleOptionalAnimal - -template -struct SampleTurboModuleOptionalAnimal { - P0 name; - bool operator==(const SampleTurboModuleOptionalAnimal &other) const { - return name == other.name; - } -}; - -template -struct SampleTurboModuleOptionalAnimalBridging { - static T types; - - static T fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - T result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String nameToJs(jsi::Runtime &rt, decltype(types.name) value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const T &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - if (value.name) { - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name.value(), jsInvoker)); - } - return result; - } -}; - -class JSI_EXPORT NativeSampleTurboModuleOptionalCxxSpecJSI : public TurboModule { -protected: - NativeSampleTurboModuleOptionalCxxSpecJSI(std::shared_ptr jsInvoker); +class JSI_EXPORT NativeSampleTurboModuleOptionalCxxSpecJSI : public TurboModule { +protected: + NativeSampleTurboModuleOptionalCxxSpecJSI(std::shared_ptr jsInvoker); public: virtual jsi::Object getConstants(jsi::Runtime &rt) = 0; @@ -2668,111 +2322,6 @@ struct Bridging { } }; -#pragma mark - NativeEnumTurboModuleBaseStateType - -template -struct [[deprecated(\\"Use NativeEnumTurboModuleStateType instead.\\")]] NativeEnumTurboModuleBaseStateType { - P0 state; - bool operator==(const NativeEnumTurboModuleBaseStateType &other) const { - return state == other.state; - } -}; - -template -struct [[deprecated(\\"Use NativeEnumTurboModuleStateTypeBridging instead.\\")]] NativeEnumTurboModuleBaseStateTypeBridging { - static NativeEnumTurboModuleBaseStateType fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - NativeEnumTurboModuleBaseStateType result{ - bridging::fromJs(rt, value.getProperty(rt, \\"state\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String stateToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const NativeEnumTurboModuleBaseStateType &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"state\\", bridging::toJs(rt, value.state, jsInvoker)); - return result; - } -}; - - - -#pragma mark - NativeEnumTurboModuleBaseStateTypeWithEnums - -template -struct [[deprecated(\\"Use NativeEnumTurboModuleStateTypeWithEnums instead.\\")]] NativeEnumTurboModuleBaseStateTypeWithEnums { - P0 state; - P1 regular; - P2 str; - P3 num; - P4 fraction; - bool operator==(const NativeEnumTurboModuleBaseStateTypeWithEnums &other) const { - return state == other.state && regular == other.regular && str == other.str && num == other.num && fraction == other.fraction; - } -}; - -template -struct [[deprecated(\\"Use NativeEnumTurboModuleStateTypeWithEnumsBridging instead.\\")]] NativeEnumTurboModuleBaseStateTypeWithEnumsBridging { - static NativeEnumTurboModuleBaseStateTypeWithEnums fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - NativeEnumTurboModuleBaseStateTypeWithEnums result{ - bridging::fromJs(rt, value.getProperty(rt, \\"state\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"regular\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"str\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"num\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"fraction\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String stateToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::String regularToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static jsi::String strToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } - - static jsi::Value numToJs(jsi::Runtime &rt, P3 value) { - return bridging::toJs(rt, value); - } - - static jsi::Value fractionToJs(jsi::Runtime &rt, P4 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const NativeEnumTurboModuleBaseStateTypeWithEnums &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"state\\", bridging::toJs(rt, value.state, jsInvoker)); - result.setProperty(rt, \\"regular\\", bridging::toJs(rt, value.regular, jsInvoker)); - result.setProperty(rt, \\"str\\", bridging::toJs(rt, value.str, jsInvoker)); - result.setProperty(rt, \\"num\\", bridging::toJs(rt, value.num, jsInvoker)); - result.setProperty(rt, \\"fraction\\", bridging::toJs(rt, value.fraction, jsInvoker)); - return result; - } -}; - - #pragma mark - NativeEnumTurboModuleStateType template @@ -3247,53 +2796,6 @@ private: -#pragma mark - NativePartialAnnotationTurboModuleBaseSomeObj - -template -struct [[deprecated(\\"Use NativePartialAnnotationTurboModuleSomeObj instead.\\")]] NativePartialAnnotationTurboModuleBaseSomeObj { - P0 a; - P1 b; - bool operator==(const NativePartialAnnotationTurboModuleBaseSomeObj &other) const { - return a == other.a && b == other.b; - } -}; - -template -struct [[deprecated(\\"Use NativePartialAnnotationTurboModuleSomeObjBridging instead.\\")]] NativePartialAnnotationTurboModuleBaseSomeObjBridging { - static NativePartialAnnotationTurboModuleBaseSomeObj fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - NativePartialAnnotationTurboModuleBaseSomeObj result{ - bridging::fromJs(rt, value.getProperty(rt, \\"a\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"b\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String aToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static bool bToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const NativePartialAnnotationTurboModuleBaseSomeObj &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"a\\", bridging::toJs(rt, value.a, jsInvoker)); - if (value.b) { - result.setProperty(rt, \\"b\\", bridging::toJs(rt, value.b.value(), jsInvoker)); - } - return result; - } -}; - - #pragma mark - NativePartialAnnotationTurboModuleSomeObj template @@ -3471,44 +2973,6 @@ private: -#pragma mark - SampleTurboModuleBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleAnimal instead.\\")]] SampleTurboModuleBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleAnimalBridging instead.\\")]] SampleTurboModuleBaseAnimalBridging { - static SampleTurboModuleBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name, jsInvoker)); - return result; - } -}; - - #pragma mark - SampleTurboModuleAnimal template @@ -3703,44 +3167,6 @@ private: -#pragma mark - SampleTurboModuleArraysBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleArraysAnimal instead.\\")]] SampleTurboModuleArraysBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleArraysBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleArraysAnimalBridging instead.\\")]] SampleTurboModuleArraysBaseAnimalBridging { - static SampleTurboModuleArraysBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleArraysBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleArraysBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name, jsInvoker)); - return result; - } -}; - - #pragma mark - SampleTurboModuleArraysAnimal template @@ -3935,44 +3361,6 @@ private: -#pragma mark - SampleTurboModuleNullableBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleNullableAnimal instead.\\")]] SampleTurboModuleNullableBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleNullableBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleNullableAnimalBridging instead.\\")]] SampleTurboModuleNullableBaseAnimalBridging { - static SampleTurboModuleNullableBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleNullableBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static std::optional nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleNullableBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name, jsInvoker)); - return result; - } -}; - - #pragma mark - SampleTurboModuleNullableAnimal template @@ -4167,46 +3555,6 @@ private: -#pragma mark - SampleTurboModuleNullableAndOptionalBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleNullableAndOptionalAnimal instead.\\")]] SampleTurboModuleNullableAndOptionalBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleNullableAndOptionalBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleNullableAndOptionalAnimalBridging instead.\\")]] SampleTurboModuleNullableAndOptionalBaseAnimalBridging { - static SampleTurboModuleNullableAndOptionalBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleNullableAndOptionalBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static std::optional nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleNullableAndOptionalBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - if (value.name) { - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name.value(), jsInvoker)); - } - return result; - } -}; - - #pragma mark - SampleTurboModuleNullableAndOptionalAnimal template @@ -4403,46 +3751,6 @@ private: -#pragma mark - SampleTurboModuleOptionalBaseAnimal - -template -struct [[deprecated(\\"Use SampleTurboModuleOptionalAnimal instead.\\")]] SampleTurboModuleOptionalBaseAnimal { - P0 name; - bool operator==(const SampleTurboModuleOptionalBaseAnimal &other) const { - return name == other.name; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleOptionalAnimalBridging instead.\\")]] SampleTurboModuleOptionalBaseAnimalBridging { - static SampleTurboModuleOptionalBaseAnimal fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleOptionalBaseAnimal result{ - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String nameToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleOptionalBaseAnimal &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - if (value.name) { - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name.value(), jsInvoker)); - } - return result; - } -}; - - #pragma mark - SampleTurboModuleOptionalAnimal template diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js index 6cfbdd06097230..f41465745609c6 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js @@ -231,135 +231,53 @@ function createStructsString( enumMap, ); - // TODO: T171006733 [Begin] Remove deprecated Cxx TMs structs after a new release. - return ( - Object.keys(aliasMap) - .map(alias => { - const value = aliasMap[alias]; - if (value.properties.length === 0) { - return ''; - } - const structName = `${moduleName}Base${alias}`; - const structNameNew = `${moduleName}${alias}`; - const templateParameterWithTypename = value.properties - .map((v, i) => `typename P${i}`) - .join(', '); - const templateParameter = value.properties - .map((v, i) => 'P' + i) - .join(', '); - const debugParameterConversion = value.properties - .map( - (v, i) => ` static ${getCppType(alias, v)} ${ - v.name - }ToJs(jsi::Runtime &rt, P${i} value) { - return bridging::toJs(rt, value); - }`, - ) - .join('\n\n'); - return ` -#pragma mark - ${structName} - -template <${templateParameterWithTypename}> -struct [[deprecated("Use ${structNameNew} instead.")]] ${structName} { -${value.properties.map((v, i) => ' P' + i + ' ' + v.name).join(';\n')}; - bool operator==(const ${structName} &other) const { - return ${value.properties - .map(v => `${v.name} == other.${v.name}`) - .join(' && ')}; - } -}; - -template <${templateParameterWithTypename}> -struct [[deprecated("Use ${structNameNew}Bridging instead.")]] ${structName}Bridging { - static ${structName}<${templateParameter}> fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - ${structName}<${templateParameter}> result{ -${value.properties - .map( - (v, i) => - ` bridging::fromJs(rt, value.getProperty(rt, "${v.name}"), jsInvoker)`, - ) - .join(',\n')}}; - return result; - } - -#ifdef DEBUG -${debugParameterConversion} -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const ${structName}<${templateParameter}> &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); -${value.properties - .map((v, i) => { - if (v.optional) { - return ` if (value.${v.name}) { - result.setProperty(rt, "${v.name}", bridging::toJs(rt, value.${v.name}.value(), jsInvoker)); - }`; - } else { - return ` result.setProperty(rt, "${v.name}", bridging::toJs(rt, value.${v.name}, jsInvoker));`; - } - }) - .join('\n')} - return result; - } -}; - -`; - }) - .join('\n') + - // TODO: T171006733 [End] Remove deprecated Cxx TMs structs after a new release. - Object.keys(aliasMap) - .map(alias => { - const value = aliasMap[alias]; - if (value.properties.length === 0) { - return ''; + return Object.keys(aliasMap) + .map(alias => { + const value = aliasMap[alias]; + if (value.properties.length === 0) { + return ''; + } + const structName = `${moduleName}${alias}`; + const templateParameter = value.properties.filter( + v => + !isDirectRecursiveMember(alias, v.typeAnnotation) && + !isArrayRecursiveMember(alias, v.typeAnnotation), + ); + const templateParameterWithTypename = templateParameter + .map((v, i) => `typename P${i}`) + .join(', '); + const templateParameterWithoutTypename = templateParameter + .map((v, i) => `P${i}`) + .join(', '); + let i = -1; + const templateMemberTypes = value.properties.map(v => { + if (isDirectRecursiveMember(alias, v.typeAnnotation)) { + return `std::unique_ptr<${structName}<${templateParameterWithoutTypename}>> ${v.name}`; + } else if (isArrayRecursiveMember(alias, v.typeAnnotation)) { + const [nullable] = unwrapNullable( + v.typeAnnotation, + ); + return ( + (nullable + ? `std::optional>>` + : `std::vector<${structName}<${templateParameterWithoutTypename}>>`) + + ` ${v.name}` + ); + } else { + i++; + return `P${i} ${v.name}`; } - const structName = `${moduleName}${alias}`; - const templateParameter = value.properties.filter( - v => - !isDirectRecursiveMember(alias, v.typeAnnotation) && - !isArrayRecursiveMember(alias, v.typeAnnotation), - ); - const templateParameterWithTypename = templateParameter - .map((v, i) => `typename P${i}`) - .join(', '); - const templateParameterWithoutTypename = templateParameter - .map((v, i) => `P${i}`) - .join(', '); - let i = -1; - const templateMemberTypes = value.properties.map(v => { - if (isDirectRecursiveMember(alias, v.typeAnnotation)) { - return `std::unique_ptr<${structName}<${templateParameterWithoutTypename}>> ${v.name}`; - } else if (isArrayRecursiveMember(alias, v.typeAnnotation)) { - const [nullable] = unwrapNullable( - v.typeAnnotation, - ); - return ( - (nullable - ? `std::optional>>` - : `std::vector<${structName}<${templateParameterWithoutTypename}>>`) + - ` ${v.name}` - ); - } else { - i++; - return `P${i} ${v.name}`; - } - }); - const debugParameterConversion = value.properties - .map( - v => ` static ${getCppType(alias, v)} ${ - v.name - }ToJs(jsi::Runtime &rt, decltype(types.${v.name}) value) { + }); + const debugParameterConversion = value.properties + .map( + v => ` static ${getCppType(alias, v)} ${ + v.name + }ToJs(jsi::Runtime &rt, decltype(types.${v.name}) value) { return bridging::toJs(rt, value); }`, - ) - .join('\n\n'); - return ` + ) + .join('\n\n'); + return ` #pragma mark - ${structName} template <${templateParameterWithTypename}> @@ -422,9 +340,8 @@ ${value.properties }; `; - }) - .join('\n') - ); + }) + .join('\n'); } type NativeEnumMemberValueType = 'std::string' | 'int32_t' | 'float'; diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap index 8fcc178ac21168..3ff3850785f777 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap +++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap @@ -316,336 +316,6 @@ struct Bridging { } }; -#pragma mark - SampleTurboModuleCxxBaseConstantsStruct - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxConstantsStruct instead.\\")]] SampleTurboModuleCxxBaseConstantsStruct { - P0 const1; - P1 const2; - P2 const3; - bool operator==(const SampleTurboModuleCxxBaseConstantsStruct &other) const { - return const1 == other.const1 && const2 == other.const2 && const3 == other.const3; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxConstantsStructBridging instead.\\")]] SampleTurboModuleCxxBaseConstantsStructBridging { - static SampleTurboModuleCxxBaseConstantsStruct fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleCxxBaseConstantsStruct result{ - bridging::fromJs(rt, value.getProperty(rt, \\"const1\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"const2\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"const3\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static bool const1ToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static double const2ToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static jsi::String const3ToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleCxxBaseConstantsStruct &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"const1\\", bridging::toJs(rt, value.const1, jsInvoker)); - result.setProperty(rt, \\"const2\\", bridging::toJs(rt, value.const2, jsInvoker)); - result.setProperty(rt, \\"const3\\", bridging::toJs(rt, value.const3, jsInvoker)); - return result; - } -}; - - - - -#pragma mark - SampleTurboModuleCxxBaseBinaryTreeNode - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxBinaryTreeNode instead.\\")]] SampleTurboModuleCxxBaseBinaryTreeNode { - P0 left; - P1 value; - P2 right; - bool operator==(const SampleTurboModuleCxxBaseBinaryTreeNode &other) const { - return left == other.left && value == other.value && right == other.right; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxBinaryTreeNodeBridging instead.\\")]] SampleTurboModuleCxxBaseBinaryTreeNodeBridging { - static SampleTurboModuleCxxBaseBinaryTreeNode fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleCxxBaseBinaryTreeNode result{ - bridging::fromJs(rt, value.getProperty(rt, \\"left\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"value\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"right\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::Object leftToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static double valueToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static jsi::Object rightToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleCxxBaseBinaryTreeNode &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - if (value.left) { - result.setProperty(rt, \\"left\\", bridging::toJs(rt, value.left.value(), jsInvoker)); - } - result.setProperty(rt, \\"value\\", bridging::toJs(rt, value.value, jsInvoker)); - if (value.right) { - result.setProperty(rt, \\"right\\", bridging::toJs(rt, value.right.value(), jsInvoker)); - } - return result; - } -}; - - - -#pragma mark - SampleTurboModuleCxxBaseGraphNode - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxGraphNode instead.\\")]] SampleTurboModuleCxxBaseGraphNode { - P0 label; - P1 neighbors; - bool operator==(const SampleTurboModuleCxxBaseGraphNode &other) const { - return label == other.label && neighbors == other.neighbors; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxGraphNodeBridging instead.\\")]] SampleTurboModuleCxxBaseGraphNodeBridging { - static SampleTurboModuleCxxBaseGraphNode fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleCxxBaseGraphNode result{ - bridging::fromJs(rt, value.getProperty(rt, \\"label\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"neighbors\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String labelToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::Array neighborsToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleCxxBaseGraphNode &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"label\\", bridging::toJs(rt, value.label, jsInvoker)); - if (value.neighbors) { - result.setProperty(rt, \\"neighbors\\", bridging::toJs(rt, value.neighbors.value(), jsInvoker)); - } - return result; - } -}; - - - -#pragma mark - SampleTurboModuleCxxBaseObjectStruct - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxObjectStruct instead.\\")]] SampleTurboModuleCxxBaseObjectStruct { - P0 a; - P1 b; - P2 c; - bool operator==(const SampleTurboModuleCxxBaseObjectStruct &other) const { - return a == other.a && b == other.b && c == other.c; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxObjectStructBridging instead.\\")]] SampleTurboModuleCxxBaseObjectStructBridging { - static SampleTurboModuleCxxBaseObjectStruct fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleCxxBaseObjectStruct result{ - bridging::fromJs(rt, value.getProperty(rt, \\"a\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"b\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"c\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static double aToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::String bToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static std::optional cToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleCxxBaseObjectStruct &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"a\\", bridging::toJs(rt, value.a, jsInvoker)); - result.setProperty(rt, \\"b\\", bridging::toJs(rt, value.b, jsInvoker)); - if (value.c) { - result.setProperty(rt, \\"c\\", bridging::toJs(rt, value.c.value(), jsInvoker)); - } - return result; - } -}; - - - -#pragma mark - SampleTurboModuleCxxBaseValueStruct - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxValueStruct instead.\\")]] SampleTurboModuleCxxBaseValueStruct { - P0 x; - P1 y; - P2 z; - bool operator==(const SampleTurboModuleCxxBaseValueStruct &other) const { - return x == other.x && y == other.y && z == other.z; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxValueStructBridging instead.\\")]] SampleTurboModuleCxxBaseValueStructBridging { - static SampleTurboModuleCxxBaseValueStruct fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleCxxBaseValueStruct result{ - bridging::fromJs(rt, value.getProperty(rt, \\"x\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"y\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"z\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static double xToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::String yToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static jsi::Object zToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleCxxBaseValueStruct &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"x\\", bridging::toJs(rt, value.x, jsInvoker)); - result.setProperty(rt, \\"y\\", bridging::toJs(rt, value.y, jsInvoker)); - result.setProperty(rt, \\"z\\", bridging::toJs(rt, value.z, jsInvoker)); - return result; - } -}; - - - -#pragma mark - SampleTurboModuleCxxBaseMenuItem - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxMenuItem instead.\\")]] SampleTurboModuleCxxBaseMenuItem { - P0 label; - P1 onPress; - P2 shortcut; - P3 items; - bool operator==(const SampleTurboModuleCxxBaseMenuItem &other) const { - return label == other.label && onPress == other.onPress && shortcut == other.shortcut && items == other.items; - } -}; - -template -struct [[deprecated(\\"Use SampleTurboModuleCxxMenuItemBridging instead.\\")]] SampleTurboModuleCxxBaseMenuItemBridging { - static SampleTurboModuleCxxBaseMenuItem fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - SampleTurboModuleCxxBaseMenuItem result{ - bridging::fromJs(rt, value.getProperty(rt, \\"label\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"onPress\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"shortcut\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"items\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String labelToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::Function onPressToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static std::optional shortcutToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } - - static jsi::Array itemsToJs(jsi::Runtime &rt, P3 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const SampleTurboModuleCxxBaseMenuItem &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"label\\", bridging::toJs(rt, value.label, jsInvoker)); - result.setProperty(rt, \\"onPress\\", bridging::toJs(rt, value.onPress, jsInvoker)); - if (value.shortcut) { - result.setProperty(rt, \\"shortcut\\", bridging::toJs(rt, value.shortcut.value(), jsInvoker)); - } - if (value.items) { - result.setProperty(rt, \\"items\\", bridging::toJs(rt, value.items.value(), jsInvoker)); - } - return result; - } -}; - - #pragma mark - SampleTurboModuleCxxConstantsStruct template @@ -1353,97 +1023,25 @@ namespace facebook::react { -#pragma mark - AliasTurboModuleBaseOptions +#pragma mark - AliasTurboModuleOptions template -struct [[deprecated(\\"Use AliasTurboModuleOptions instead.\\")]] AliasTurboModuleBaseOptions { +struct AliasTurboModuleOptions { P0 offset; P1 size; P2 displaySize; P3 resizeMode; P4 allowExternalStorage; - bool operator==(const AliasTurboModuleBaseOptions &other) const { + bool operator==(const AliasTurboModuleOptions &other) const { return offset == other.offset && size == other.size && displaySize == other.displaySize && resizeMode == other.resizeMode && allowExternalStorage == other.allowExternalStorage; } }; -template -struct [[deprecated(\\"Use AliasTurboModuleOptionsBridging instead.\\")]] AliasTurboModuleBaseOptionsBridging { - static AliasTurboModuleBaseOptions fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - AliasTurboModuleBaseOptions result{ - bridging::fromJs(rt, value.getProperty(rt, \\"offset\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"size\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"displaySize\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"resizeMode\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"allowExternalStorage\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::Object offsetToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::Object sizeToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static jsi::Object displaySizeToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } - - static jsi::String resizeModeToJs(jsi::Runtime &rt, P3 value) { - return bridging::toJs(rt, value); - } - - static bool allowExternalStorageToJs(jsi::Runtime &rt, P4 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const AliasTurboModuleBaseOptions &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"offset\\", bridging::toJs(rt, value.offset, jsInvoker)); - result.setProperty(rt, \\"size\\", bridging::toJs(rt, value.size, jsInvoker)); - if (value.displaySize) { - result.setProperty(rt, \\"displaySize\\", bridging::toJs(rt, value.displaySize.value(), jsInvoker)); - } - if (value.resizeMode) { - result.setProperty(rt, \\"resizeMode\\", bridging::toJs(rt, value.resizeMode.value(), jsInvoker)); - } - if (value.allowExternalStorage) { - result.setProperty(rt, \\"allowExternalStorage\\", bridging::toJs(rt, value.allowExternalStorage.value(), jsInvoker)); - } - return result; - } -}; - - -#pragma mark - AliasTurboModuleOptions - -template -struct AliasTurboModuleOptions { - P0 offset; - P1 size; - P2 displaySize; - P3 resizeMode; - P4 allowExternalStorage; - bool operator==(const AliasTurboModuleOptions &other) const { - return offset == other.offset && size == other.size && displaySize == other.displaySize && resizeMode == other.resizeMode && allowExternalStorage == other.allowExternalStorage; - } -}; - -template -struct AliasTurboModuleOptionsBridging { - static T types; - - static T fromJs( +template +struct AliasTurboModuleOptionsBridging { + static T types; + + static T fromJs( jsi::Runtime &rt, const jsi::Object &value, const std::shared_ptr &jsInvoker) { @@ -1577,259 +1175,6 @@ namespace facebook::react { -#pragma mark - CameraRollManagerBasePhotoIdentifierImage - -template -struct [[deprecated(\\"Use CameraRollManagerPhotoIdentifierImage instead.\\")]] CameraRollManagerBasePhotoIdentifierImage { - P0 uri; - P1 playableDuration; - P2 width; - P3 height; - P4 isStored; - P5 filename; - bool operator==(const CameraRollManagerBasePhotoIdentifierImage &other) const { - return uri == other.uri && playableDuration == other.playableDuration && width == other.width && height == other.height && isStored == other.isStored && filename == other.filename; - } -}; - -template -struct [[deprecated(\\"Use CameraRollManagerPhotoIdentifierImageBridging instead.\\")]] CameraRollManagerBasePhotoIdentifierImageBridging { - static CameraRollManagerBasePhotoIdentifierImage fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - CameraRollManagerBasePhotoIdentifierImage result{ - bridging::fromJs(rt, value.getProperty(rt, \\"uri\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"playableDuration\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"width\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"height\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"isStored\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"filename\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String uriToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static double playableDurationToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static double widthToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } - - static double heightToJs(jsi::Runtime &rt, P3 value) { - return bridging::toJs(rt, value); - } - - static bool isStoredToJs(jsi::Runtime &rt, P4 value) { - return bridging::toJs(rt, value); - } - - static jsi::String filenameToJs(jsi::Runtime &rt, P5 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const CameraRollManagerBasePhotoIdentifierImage &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"uri\\", bridging::toJs(rt, value.uri, jsInvoker)); - result.setProperty(rt, \\"playableDuration\\", bridging::toJs(rt, value.playableDuration, jsInvoker)); - result.setProperty(rt, \\"width\\", bridging::toJs(rt, value.width, jsInvoker)); - result.setProperty(rt, \\"height\\", bridging::toJs(rt, value.height, jsInvoker)); - if (value.isStored) { - result.setProperty(rt, \\"isStored\\", bridging::toJs(rt, value.isStored.value(), jsInvoker)); - } - result.setProperty(rt, \\"filename\\", bridging::toJs(rt, value.filename, jsInvoker)); - return result; - } -}; - - - -#pragma mark - CameraRollManagerBasePhotoIdentifier - -template -struct [[deprecated(\\"Use CameraRollManagerPhotoIdentifier instead.\\")]] CameraRollManagerBasePhotoIdentifier { - P0 node; - bool operator==(const CameraRollManagerBasePhotoIdentifier &other) const { - return node == other.node; - } -}; - -template -struct [[deprecated(\\"Use CameraRollManagerPhotoIdentifierBridging instead.\\")]] CameraRollManagerBasePhotoIdentifierBridging { - static CameraRollManagerBasePhotoIdentifier fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - CameraRollManagerBasePhotoIdentifier result{ - bridging::fromJs(rt, value.getProperty(rt, \\"node\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::Object nodeToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const CameraRollManagerBasePhotoIdentifier &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"node\\", bridging::toJs(rt, value.node, jsInvoker)); - return result; - } -}; - - - -#pragma mark - CameraRollManagerBasePhotoIdentifiersPage - -template -struct [[deprecated(\\"Use CameraRollManagerPhotoIdentifiersPage instead.\\")]] CameraRollManagerBasePhotoIdentifiersPage { - P0 edges; - P1 page_info; - bool operator==(const CameraRollManagerBasePhotoIdentifiersPage &other) const { - return edges == other.edges && page_info == other.page_info; - } -}; - -template -struct [[deprecated(\\"Use CameraRollManagerPhotoIdentifiersPageBridging instead.\\")]] CameraRollManagerBasePhotoIdentifiersPageBridging { - static CameraRollManagerBasePhotoIdentifiersPage fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - CameraRollManagerBasePhotoIdentifiersPage result{ - bridging::fromJs(rt, value.getProperty(rt, \\"edges\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"page_info\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::Array edgesToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::Object page_infoToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const CameraRollManagerBasePhotoIdentifiersPage &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"edges\\", bridging::toJs(rt, value.edges, jsInvoker)); - result.setProperty(rt, \\"page_info\\", bridging::toJs(rt, value.page_info, jsInvoker)); - return result; - } -}; - - - -#pragma mark - CameraRollManagerBaseGetPhotosParams - -template -struct [[deprecated(\\"Use CameraRollManagerGetPhotosParams instead.\\")]] CameraRollManagerBaseGetPhotosParams { - P0 first; - P1 after; - P2 groupName; - P3 groupTypes; - P4 assetType; - P5 maxSize; - P6 mimeTypes; - bool operator==(const CameraRollManagerBaseGetPhotosParams &other) const { - return first == other.first && after == other.after && groupName == other.groupName && groupTypes == other.groupTypes && assetType == other.assetType && maxSize == other.maxSize && mimeTypes == other.mimeTypes; - } -}; - -template -struct [[deprecated(\\"Use CameraRollManagerGetPhotosParamsBridging instead.\\")]] CameraRollManagerBaseGetPhotosParamsBridging { - static CameraRollManagerBaseGetPhotosParams fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - CameraRollManagerBaseGetPhotosParams result{ - bridging::fromJs(rt, value.getProperty(rt, \\"first\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"after\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"groupName\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"groupTypes\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"assetType\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"maxSize\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"mimeTypes\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static double firstToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::String afterToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static jsi::String groupNameToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } - - static jsi::String groupTypesToJs(jsi::Runtime &rt, P3 value) { - return bridging::toJs(rt, value); - } - - static jsi::String assetTypeToJs(jsi::Runtime &rt, P4 value) { - return bridging::toJs(rt, value); - } - - static double maxSizeToJs(jsi::Runtime &rt, P5 value) { - return bridging::toJs(rt, value); - } - - static jsi::Array mimeTypesToJs(jsi::Runtime &rt, P6 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const CameraRollManagerBaseGetPhotosParams &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"first\\", bridging::toJs(rt, value.first, jsInvoker)); - if (value.after) { - result.setProperty(rt, \\"after\\", bridging::toJs(rt, value.after.value(), jsInvoker)); - } - if (value.groupName) { - result.setProperty(rt, \\"groupName\\", bridging::toJs(rt, value.groupName.value(), jsInvoker)); - } - if (value.groupTypes) { - result.setProperty(rt, \\"groupTypes\\", bridging::toJs(rt, value.groupTypes.value(), jsInvoker)); - } - if (value.assetType) { - result.setProperty(rt, \\"assetType\\", bridging::toJs(rt, value.assetType.value(), jsInvoker)); - } - if (value.maxSize) { - result.setProperty(rt, \\"maxSize\\", bridging::toJs(rt, value.maxSize.value(), jsInvoker)); - } - if (value.mimeTypes) { - result.setProperty(rt, \\"mimeTypes\\", bridging::toJs(rt, value.mimeTypes.value(), jsInvoker)); - } - return result; - } -}; - - #pragma mark - CameraRollManagerPhotoIdentifierImage template @@ -2164,168 +1509,6 @@ private: -#pragma mark - ExceptionsManagerBaseStackFrame - -template -struct [[deprecated(\\"Use ExceptionsManagerStackFrame instead.\\")]] ExceptionsManagerBaseStackFrame { - P0 column; - P1 file; - P2 lineNumber; - P3 methodName; - P4 collapse; - bool operator==(const ExceptionsManagerBaseStackFrame &other) const { - return column == other.column && file == other.file && lineNumber == other.lineNumber && methodName == other.methodName && collapse == other.collapse; - } -}; - -template -struct [[deprecated(\\"Use ExceptionsManagerStackFrameBridging instead.\\")]] ExceptionsManagerBaseStackFrameBridging { - static ExceptionsManagerBaseStackFrame fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - ExceptionsManagerBaseStackFrame result{ - bridging::fromJs(rt, value.getProperty(rt, \\"column\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"file\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"lineNumber\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"methodName\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"collapse\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static double columnToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::String fileToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static double lineNumberToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } - - static jsi::String methodNameToJs(jsi::Runtime &rt, P3 value) { - return bridging::toJs(rt, value); - } - - static bool collapseToJs(jsi::Runtime &rt, P4 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const ExceptionsManagerBaseStackFrame &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - if (value.column) { - result.setProperty(rt, \\"column\\", bridging::toJs(rt, value.column.value(), jsInvoker)); - } - result.setProperty(rt, \\"file\\", bridging::toJs(rt, value.file, jsInvoker)); - if (value.lineNumber) { - result.setProperty(rt, \\"lineNumber\\", bridging::toJs(rt, value.lineNumber.value(), jsInvoker)); - } - result.setProperty(rt, \\"methodName\\", bridging::toJs(rt, value.methodName, jsInvoker)); - if (value.collapse) { - result.setProperty(rt, \\"collapse\\", bridging::toJs(rt, value.collapse.value(), jsInvoker)); - } - return result; - } -}; - - - -#pragma mark - ExceptionsManagerBaseExceptionData - -template -struct [[deprecated(\\"Use ExceptionsManagerExceptionData instead.\\")]] ExceptionsManagerBaseExceptionData { - P0 message; - P1 originalMessage; - P2 name; - P3 componentStack; - P4 stack; - P5 id; - P6 isFatal; - P7 extraData; - bool operator==(const ExceptionsManagerBaseExceptionData &other) const { - return message == other.message && originalMessage == other.originalMessage && name == other.name && componentStack == other.componentStack && stack == other.stack && id == other.id && isFatal == other.isFatal && extraData == other.extraData; - } -}; - -template -struct [[deprecated(\\"Use ExceptionsManagerExceptionDataBridging instead.\\")]] ExceptionsManagerBaseExceptionDataBridging { - static ExceptionsManagerBaseExceptionData fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { - ExceptionsManagerBaseExceptionData result{ - bridging::fromJs(rt, value.getProperty(rt, \\"message\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"originalMessage\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"name\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"componentStack\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"stack\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"id\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"isFatal\\"), jsInvoker), - bridging::fromJs(rt, value.getProperty(rt, \\"extraData\\"), jsInvoker)}; - return result; - } - -#ifdef DEBUG - static jsi::String messageToJs(jsi::Runtime &rt, P0 value) { - return bridging::toJs(rt, value); - } - - static jsi::String originalMessageToJs(jsi::Runtime &rt, P1 value) { - return bridging::toJs(rt, value); - } - - static jsi::String nameToJs(jsi::Runtime &rt, P2 value) { - return bridging::toJs(rt, value); - } - - static jsi::String componentStackToJs(jsi::Runtime &rt, P3 value) { - return bridging::toJs(rt, value); - } - - static jsi::Array stackToJs(jsi::Runtime &rt, P4 value) { - return bridging::toJs(rt, value); - } - - static double idToJs(jsi::Runtime &rt, P5 value) { - return bridging::toJs(rt, value); - } - - static bool isFatalToJs(jsi::Runtime &rt, P6 value) { - return bridging::toJs(rt, value); - } - - static jsi::Object extraDataToJs(jsi::Runtime &rt, P7 value) { - return bridging::toJs(rt, value); - } -#endif - - static jsi::Object toJs( - jsi::Runtime &rt, - const ExceptionsManagerBaseExceptionData &value, - const std::shared_ptr &jsInvoker) { - auto result = facebook::jsi::Object(rt); - result.setProperty(rt, \\"message\\", bridging::toJs(rt, value.message, jsInvoker)); - result.setProperty(rt, \\"originalMessage\\", bridging::toJs(rt, value.originalMessage, jsInvoker)); - result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name, jsInvoker)); - result.setProperty(rt, \\"componentStack\\", bridging::toJs(rt, value.componentStack, jsInvoker)); - result.setProperty(rt, \\"stack\\", bridging::toJs(rt, value.stack, jsInvoker)); - result.setProperty(rt, \\"id\\", bridging::toJs(rt, value.id, jsInvoker)); - result.setProperty(rt, \\"isFatal\\", bridging::toJs(rt, value.isFatal, jsInvoker)); - if (value.extraData) { - result.setProperty(rt, \\"extraData\\", bridging::toJs(rt, value.extraData.value(), jsInvoker)); - } - return result; - } -}; - - #pragma mark - ExceptionsManagerStackFrame template