nitrogen 0.33.2 → 0.33.4

package/lib/syntax/swift/SwiftFunction.js

@@ -34,7 +34,6 @@ return ${returnType.parseFromSwiftToCpp('__result', 'swift')}
     const code = `
 ${createFileMetadataString(`${swiftClassName}.swift`)}
 
-import Foundation
 ${imports.join('\n')}
 
 /**

package/lib/syntax/swift/SwiftHybridObject.js

@@ -58,7 +58,6 @@ public ${hasBaseClass ? 'override func' : 'func'} getCxxWrapper() -> ${name.Hybr
     const protocolCode = `
 ${createFileMetadataString(`${protocolName}.swift`)}
 
-import Foundation
 ${imports.join('\n')}
 
 /// See \`\`${protocolName}\`\`

package/lib/syntax/swift/SwiftHybridObjectBridge.js

@@ -43,7 +43,7 @@ public final func afterUpdate() {
 }
 `.trim(), `
 public final func maybePrepareForRecycle() {
-  guard let recyclable = __implementation as? RecyclableView else { return }
+  guard let recyclable = __implementation as? any RecyclableView else { return }
   recyclable.prepareForRecycle()
 }
 `.trim());
@@ -82,7 +82,6 @@ public override func getCxxPart() -> bridge.${baseBridge.specializationName} {
     const swiftCxxWrapperCode = `
 ${createFileMetadataString(`${name.HybridTSpecCxx}.swift`)}
 
-import Foundation
 ${imports.join('\n')}
 
 /**

package/lib/syntax/swift/SwiftStruct.js

@@ -28,7 +28,6 @@ var ${p.escapedName}: ${p.getCode('swift')} {
     const code = `
 ${createFileMetadataString(`${struct.structName}.swift`)}
 
-import Foundation
 ${imports.join('\n')}
 
 /**

package/lib/views/CppHybridViewComponent.js

@@ -74,7 +74,6 @@ namespace ${namespace} {
   class ${propsClassName} final: public react::ViewProps {
   public:
     ${propsClassName}() = default;
-    ${propsClassName}(const ${propsClassName}&);
     ${propsClassName}(const react::PropsParserContext& context,
   ${createIndentation(propsClassName.length)}   const ${propsClassName}& sourceProps,
   ${createIndentation(propsClassName.length)}   const react::RawProps& rawProps);
@@ -92,10 +91,14 @@ namespace ${namespace} {
   class ${stateClassName} final {
   public:
     ${stateClassName}() = default;
+    explicit ${stateClassName}(const std::shared_ptr<${propsClassName}>& props):
+      _props(props) {}
 
   public:
-    void setProps(const ${propsClassName}& props) { _props.emplace(props); }
-    const std::optional<${propsClassName}>& getProps() const { return _props; }
+    [[nodiscard]]
+    const std::shared_ptr<${propsClassName}>& getProps() const {
+      return _props;
+    }
 
   public:
 #ifdef ANDROID
@@ -109,7 +112,7 @@ namespace ${namespace} {
 #endif
 
   private:
-    std::optional<${propsClassName}> _props;
+    std::shared_ptr<${propsClassName}> _props;
   };
 
   /**
@@ -125,7 +128,7 @@ namespace ${namespace} {
    */
   class ${descriptorClassName} final: public react::ConcreteComponentDescriptor<${shadowNodeClassName}> {
   public:
-    ${descriptorClassName}(const react::ComponentDescriptorParameters& parameters);
+    explicit ${descriptorClassName}(const react::ComponentDescriptorParameters& parameters);
 
   public:
     /**
@@ -198,9 +201,6 @@ namespace ${namespace} {
   ${ctorIndent}   const react::RawProps& rawProps):
     ${indent(propInitializers.join(',\n'), '    ')} { }
 
-  ${propsClassName}::${propsClassName}(const ${propsClassName}& other):
-    ${indent(propCopyInitializers.join(',\n'), '    ')} { }
-
   bool ${propsClassName}::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
       ${indent(cases.join('\n'), '      ')}
@@ -225,10 +225,10 @@ namespace ${namespace} {
   void ${descriptorClassName}::adopt(react::ShadowNode& shadowNode) const {
     // This is called immediately after \`ShadowNode\` is created, cloned or in progress.
     // On Android, we need to wrap props in our state, which gets routed through Java and later unwrapped in JNI/C++.
-    auto& concreteShadowNode = dynamic_cast<${shadowNodeClassName}&>(shadowNode);
-    const ${propsClassName}& props = concreteShadowNode.getConcreteProps();
-    ${stateClassName} state;
-    state.setProps(props);
+    auto& concreteShadowNode = static_cast<${shadowNodeClassName}&>(shadowNode);
+    const std::shared_ptr<const ${propsClassName}>& constProps = concreteShadowNode.getConcreteSharedProps();
+    const std::shared_ptr<${propsClassName}>& props = std::const_pointer_cast<${propsClassName}>(constProps);
+    ${stateClassName} state{props};
     concreteShadowNode.setStateData(std::move(state));
   }
 #endif

package/lib/views/kotlin/KotlinHybridViewManager.js

@@ -33,7 +33,7 @@ import ${javaNamespace}.*
 /**
  * Represents the React Native \`ViewManager\` for the "${spec.name}" Nitro HybridView.
  */
-open class ${manager}: SimpleViewManager<View>() {
+public class ${manager}: SimpleViewManager<View>() {
   init {
     if (RecyclableView::class.java.isAssignableFrom(${viewImplementation}::class.java)) {
       // Enable view recycling
@@ -114,8 +114,8 @@ ${createFileMetadataString(`J${stateUpdaterName}.hpp`)}
 #endif
 
 #include <fbjni/fbjni.h>
-#include <react/fabric/StateWrapperImpl.h>
 #include <react/fabric/CoreComponentsRegistry.h>
+#include <react/fabric/StateWrapperImpl.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <NitroModules/NitroDefines.hpp>
 #include <NitroModules/JStateWrapper.hpp>
@@ -126,7 +126,7 @@ namespace ${cxxNamespace} {
 
 using namespace facebook;
 
-class J${stateUpdaterName}: public jni::JavaClass<J${stateUpdaterName}> {
+class J${stateUpdaterName} final: public jni::JavaClass<J${stateUpdaterName}> {
 public:
   static constexpr auto kJavaDescriptor = "L${updaterJniDescriptor};";
 
@@ -154,9 +154,9 @@ public:
         const name = escapeCppName(p.name);
         const setter = p.getSetterName('other');
         return `
-if (props.${name}.isDirty) {
-  view->${setter}(props.${name}.value);
-  // TODO: Set isDirty = false
+if (props->${name}.isDirty) {
+  view->${setter}(props->${name}.value);
+  props->${name}.isDirty = false;
 }
     `.trim();
     });
@@ -166,6 +166,7 @@ ${createFileMetadataString(`J${stateUpdaterName}.cpp`)}
 #include "J${stateUpdaterName}.hpp"
 #include "views/${component}.hpp"
 #include <NitroModules/NitroDefines.hpp>
+#include <react/fabric/StateWrapperImpl.h>
 
 namespace ${cxxNamespace} {
 
@@ -179,32 +180,32 @@ void J${stateUpdaterName}::updateViewProps(jni::alias_ref<jni::JClass> /* class
 
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
   jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) {
+  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
       throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
   }
   auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
             static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
-
   std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
-  auto concreteState = std::dynamic_pointer_cast<const ConcreteStateData>(state);
+  auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
   const ${stateClassName}& data = concreteState->getData();
-  const std::optional<${propsClassName}>& maybeProps = data.getProps();
-  if (!maybeProps.has_value()) {
+  const std::shared_ptr<${propsClassName}>& props = data.getProps();
+  if (props == nullptr) [[unlikely]] {
     // Props aren't set yet!
     throw std::runtime_error("${stateClassName}'s data doesn't contain any props!");
   }
-  const ${propsClassName}& props = maybeProps.value();
+
+  // Update all props if they are dirty
   ${indent(propsUpdaterCalls.join('\n'), '  ')}
 
   // Update hybridRef if it changed
-  if (props.hybridRef.isDirty) {
+  if (props->hybridRef.isDirty) {
     // hybridRef changed - call it with new this
-    const auto& maybeFunc = props.hybridRef.value;
+    const auto& maybeFunc = props->hybridRef.value;
     if (maybeFunc.has_value()) {
       std::shared_ptr<${JHybridTSpec}> shared = javaView->cthis()->shared_cast<${JHybridTSpec}>();
       maybeFunc.value()(shared);
     }
-    // TODO: Set isDirty = false
+    props->hybridRef.isDirty = false;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitrogen",
-  "version": "0.33.2",
+  "version": "0.33.4",
   "description": "The code-generator for react-native-nitro-modules.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "chalk": "^5.3.0",
-    "react-native-nitro-modules": "^0.33.2",
+    "react-native-nitro-modules": "^0.33.4",
     "ts-morph": "^27.0.0",
     "yargs": "^18.0.0",
     "zod": "^4.0.5"

package/src/syntax/swift/SwiftFunction.ts

@@ -41,7 +41,6 @@ return ${returnType.parseFromSwiftToCpp('__result', 'swift')}
   const code = `
 ${createFileMetadataString(`${swiftClassName}.swift`)}
 
-import Foundation
 ${imports.join('\n')}
 
 /**

package/src/syntax/swift/SwiftHybridObject.ts

@@ -70,7 +70,6 @@ public ${hasBaseClass ? 'override func' : 'func'} getCxxWrapper() -> ${name.Hybr
   const protocolCode = `
 ${createFileMetadataString(`${protocolName}.swift`)}
 
-import Foundation
 ${imports.join('\n')}
 
 /// See \`\`${protocolName}\`\`

package/src/syntax/swift/SwiftHybridObjectBridge.ts

@@ -66,7 +66,7 @@ public final func afterUpdate() {
 `.trim(),
       `
 public final func maybePrepareForRecycle() {
-  guard let recyclable = __implementation as? RecyclableView else { return }
+  guard let recyclable = __implementation as? any RecyclableView else { return }
   recyclable.prepareForRecycle()
 }
 `.trim()
@@ -130,7 +130,6 @@ public override func getCxxPart() -> bridge.${baseBridge.specializationName} {
   const swiftCxxWrapperCode = `
 ${createFileMetadataString(`${name.HybridTSpecCxx}.swift`)}
 
-import Foundation
 ${imports.join('\n')}
 
 /**

package/src/syntax/swift/SwiftStruct.ts

@@ -37,7 +37,6 @@ var ${p.escapedName}: ${p.getCode('swift')} {
   const code = `
 ${createFileMetadataString(`${struct.structName}.swift`)}
 
-import Foundation
 ${imports.join('\n')}
 
 /**

package/src/views/CppHybridViewComponent.ts

@@ -115,7 +115,6 @@ namespace ${namespace} {
   class ${propsClassName} final: public react::ViewProps {
   public:
     ${propsClassName}() = default;
-    ${propsClassName}(const ${propsClassName}&);
     ${propsClassName}(const react::PropsParserContext& context,
   ${createIndentation(propsClassName.length)}   const ${propsClassName}& sourceProps,
   ${createIndentation(propsClassName.length)}   const react::RawProps& rawProps);
@@ -133,10 +132,14 @@ namespace ${namespace} {
   class ${stateClassName} final {
   public:
     ${stateClassName}() = default;
+    explicit ${stateClassName}(const std::shared_ptr<${propsClassName}>& props):
+      _props(props) {}
 
   public:
-    void setProps(const ${propsClassName}& props) { _props.emplace(props); }
-    const std::optional<${propsClassName}>& getProps() const { return _props; }
+    [[nodiscard]]
+    const std::shared_ptr<${propsClassName}>& getProps() const {
+      return _props;
+    }
 
   public:
 #ifdef ANDROID
@@ -150,7 +153,7 @@ namespace ${namespace} {
 #endif
 
   private:
-    std::optional<${propsClassName}> _props;
+    std::shared_ptr<${propsClassName}> _props;
   };
 
   /**
@@ -166,7 +169,7 @@ namespace ${namespace} {
    */
   class ${descriptorClassName} final: public react::ConcreteComponentDescriptor<${shadowNodeClassName}> {
   public:
-    ${descriptorClassName}(const react::ComponentDescriptorParameters& parameters);
+    explicit ${descriptorClassName}(const react::ComponentDescriptorParameters& parameters);
 
   public:
     /**
@@ -245,9 +248,6 @@ namespace ${namespace} {
   ${ctorIndent}   const react::RawProps& rawProps):
     ${indent(propInitializers.join(',\n'), '    ')} { }
 
-  ${propsClassName}::${propsClassName}(const ${propsClassName}& other):
-    ${indent(propCopyInitializers.join(',\n'), '    ')} { }
-
   bool ${propsClassName}::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
       ${indent(cases.join('\n'), '      ')}
@@ -272,10 +272,10 @@ namespace ${namespace} {
   void ${descriptorClassName}::adopt(react::ShadowNode& shadowNode) const {
     // This is called immediately after \`ShadowNode\` is created, cloned or in progress.
     // On Android, we need to wrap props in our state, which gets routed through Java and later unwrapped in JNI/C++.
-    auto& concreteShadowNode = dynamic_cast<${shadowNodeClassName}&>(shadowNode);
-    const ${propsClassName}& props = concreteShadowNode.getConcreteProps();
-    ${stateClassName} state;
-    state.setProps(props);
+    auto& concreteShadowNode = static_cast<${shadowNodeClassName}&>(shadowNode);
+    const std::shared_ptr<const ${propsClassName}>& constProps = concreteShadowNode.getConcreteSharedProps();
+    const std::shared_ptr<${propsClassName}>& props = std::const_pointer_cast<${propsClassName}>(constProps);
+    ${stateClassName} state{props};
     concreteShadowNode.setStateData(std::move(state));
   }
 #endif

package/src/views/kotlin/KotlinHybridViewManager.ts

@@ -53,7 +53,7 @@ import ${javaNamespace}.*
 /**
  * Represents the React Native \`ViewManager\` for the "${spec.name}" Nitro HybridView.
  */
-open class ${manager}: SimpleViewManager<View>() {
+public class ${manager}: SimpleViewManager<View>() {
   init {
     if (RecyclableView::class.java.isAssignableFrom(${viewImplementation}::class.java)) {
       // Enable view recycling
@@ -140,8 +140,8 @@ ${createFileMetadataString(`J${stateUpdaterName}.hpp`)}
 #endif
 
 #include <fbjni/fbjni.h>
-#include <react/fabric/StateWrapperImpl.h>
 #include <react/fabric/CoreComponentsRegistry.h>
+#include <react/fabric/StateWrapperImpl.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <NitroModules/NitroDefines.hpp>
 #include <NitroModules/JStateWrapper.hpp>
@@ -152,7 +152,7 @@ namespace ${cxxNamespace} {
 
 using namespace facebook;
 
-class J${stateUpdaterName}: public jni::JavaClass<J${stateUpdaterName}> {
+class J${stateUpdaterName} final: public jni::JavaClass<J${stateUpdaterName}> {
 public:
   static constexpr auto kJavaDescriptor = "L${updaterJniDescriptor};";
 
@@ -181,9 +181,9 @@ public:
     const name = escapeCppName(p.name)
     const setter = p.getSetterName('other')
     return `
-if (props.${name}.isDirty) {
-  view->${setter}(props.${name}.value);
-  // TODO: Set isDirty = false
+if (props->${name}.isDirty) {
+  view->${setter}(props->${name}.value);
+  props->${name}.isDirty = false;
 }
     `.trim()
   })
@@ -193,6 +193,7 @@ ${createFileMetadataString(`J${stateUpdaterName}.cpp`)}
 #include "J${stateUpdaterName}.hpp"
 #include "views/${component}.hpp"
 #include <NitroModules/NitroDefines.hpp>
+#include <react/fabric/StateWrapperImpl.h>
 
 namespace ${cxxNamespace} {
 
@@ -206,32 +207,32 @@ void J${stateUpdaterName}::updateViewProps(jni::alias_ref<jni::JClass> /* class
 
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
   jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) {
+  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
       throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
   }
   auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
             static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
-
   std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
-  auto concreteState = std::dynamic_pointer_cast<const ConcreteStateData>(state);
+  auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
   const ${stateClassName}& data = concreteState->getData();
-  const std::optional<${propsClassName}>& maybeProps = data.getProps();
-  if (!maybeProps.has_value()) {
+  const std::shared_ptr<${propsClassName}>& props = data.getProps();
+  if (props == nullptr) [[unlikely]] {
     // Props aren't set yet!
     throw std::runtime_error("${stateClassName}'s data doesn't contain any props!");
   }
-  const ${propsClassName}& props = maybeProps.value();
+
+  // Update all props if they are dirty
   ${indent(propsUpdaterCalls.join('\n'), '  ')}
 
   // Update hybridRef if it changed
-  if (props.hybridRef.isDirty) {
+  if (props->hybridRef.isDirty) {
     // hybridRef changed - call it with new this
-    const auto& maybeFunc = props.hybridRef.value;
+    const auto& maybeFunc = props->hybridRef.value;
     if (maybeFunc.has_value()) {
       std::shared_ptr<${JHybridTSpec}> shared = javaView->cthis()->shared_cast<${JHybridTSpec}>();
       maybeFunc.value()(shared);
     }
-    // TODO: Set isDirty = false
+    props->hybridRef.isDirty = false;
   }
 }