nitrogen 0.32.2 → 0.33.0

package/lib/autolinking/ios/createHybridObjectInitializer.js

@@ -10,7 +10,7 @@ export function createHybridObjectIntializer() {
     const umbrellaHeaderName = getUmbrellaHeaderName();
     const bridgeNamespace = NitroConfig.current.getSwiftBridgeNamespace('swift');
     const autolinkedHybridObjects = NitroConfig.current.getAutolinkedHybridObjects();
-    const swiftFunctions = [];
+    const swiftRegistrations = [];
     const cppRegistrations = [];
     const cppImports = [];
     let containsSwiftObjects = false;
@@ -28,13 +28,13 @@ export function createHybridObjectIntializer() {
         if (config?.swift != null) {
             // Autolink a Swift HybridObject!
             containsSwiftObjects = true;
-            const { cppCode, requiredImports, swiftFunction } = createSwiftHybridObjectRegistration({
+            const { cppCode, requiredImports, swiftRegistrationClass } = createSwiftHybridObjectRegistration({
                 hybridObjectName: hybridObjectName,
                 swiftClassName: config.swift,
             });
             cppImports.push(...requiredImports);
             cppRegistrations.push(cppCode);
-            swiftFunctions.push(swiftFunction);
+            swiftRegistrations.push(swiftRegistrationClass);
         }
     }
     if (cppRegistrations.length === 0) {
@@ -72,10 +72,31 @@ ${imports}
     const swiftCode = `
 ${createFileMetadataString(`${autolinkingClassName}.swift`)}
 
+import NitroModules
+
+// TODO: Use empty enums once Swift supports exporting them as namespaces
+//       See: https://github.com/swiftlang/swift/pull/83616
 public final class ${autolinkingClassName} {
   public typealias bridge = ${bridgeNamespace}
 
-  ${indent(swiftFunctions.join('\n\n'), '  ')}
+  private protocol AutolinkedClass {
+    associatedtype T
+    /**
+     * Creates an instance of the Swift class that implements the HybridObject's spec,
+     * and wraps it in a Swift class that can directly interop with C++.
+     *
+     * This is generated by Nitrogen and will initialize the class specified
+     * in the \`"autolinking"\` property of \`nitro.json\`.
+     */
+    static func create() -> T
+    /**
+     * Returns whether this concrete implementation is also
+     * conforming to the \`RecyclableView\` protocol, or not.
+     */
+    static var isRecyclableHybridView: Bool { get }
+  }
+
+  ${indent(swiftRegistrations.join('\n\n'), '  ')}
 }
   `.trim();
     return [

package/lib/syntax/swift/SwiftHybridObject.js

@@ -40,14 +40,14 @@ export function createSwiftHybridObject(spec) {
     baseMembers.push(`
 public ${hasBaseClass ? 'override func' : 'func'} getCxxWrapper() -> ${name.HybridTSpecCxx} {
 #if DEBUG
-  guard self is ${name.HybridTSpec} else {
+  guard self is any ${name.HybridTSpec} else {
     fatalError("\`self\` is not a \`${name.HybridTSpec}\`! Did you accidentally inherit from \`${name.HybridTSpec}_base\` instead of \`${name.HybridTSpec}\`?")
   }
 #endif
   if let cxxWrapper = self.cxxWrapper {
     return cxxWrapper
   } else {
-    let cxxWrapper = ${name.HybridTSpecCxx}(self as! ${name.HybridTSpec})
+    let cxxWrapper = ${name.HybridTSpecCxx}(self as! any ${name.HybridTSpec})
     self.cxxWrapper = cxxWrapper
     return cxxWrapper
   }

package/lib/syntax/swift/SwiftHybridObjectBridge.js

@@ -41,6 +41,11 @@ public final func beforeUpdate() {
 public final func afterUpdate() {
   __implementation.afterUpdate()
 }
+`.trim(), `
+public final func maybePrepareForRecycle() {
+  guard let recyclable = __implementation as? RecyclableView else { return }
+  recyclable.prepareForRecycle()
+}
 `.trim());
     }
     const hybridObject = new HybridObjectType(spec);

package/lib/syntax/swift/SwiftHybridObjectRegistration.d.ts

@@ -11,9 +11,10 @@ interface Props {
 }
 interface SwiftHybridObjectRegistration {
     cppCode: string;
-    swiftFunction: string;
+    swiftRegistrationClass: string;
     requiredImports: SourceImport[];
 }
+export declare function getAutolinkingNamespace(): string;
 export declare function getHybridObjectConstructorCall(hybridObjectName: string): string;
 export declare function createSwiftHybridObjectRegistration({ hybridObjectName, swiftClassName, }: Props): SwiftHybridObjectRegistration;
 export {};

package/lib/syntax/swift/SwiftHybridObjectRegistration.js

@@ -3,27 +3,29 @@ import { indent } from '../../utils.js';
 import { getHybridObjectName } from '../getHybridObjectName.js';
 import { HybridObjectType } from '../types/HybridObjectType.js';
 import { SwiftCxxBridgedType } from './SwiftCxxBridgedType.js';
-export function getHybridObjectConstructorCall(hybridObjectName) {
+export function getAutolinkingNamespace() {
     const swiftNamespace = NitroConfig.current.getIosModuleName();
     const autolinkingClassName = `${swiftNamespace}Autolinking`;
-    return `${swiftNamespace}::${autolinkingClassName}::create${hybridObjectName}();`;
+    return `${swiftNamespace}::${autolinkingClassName}`;
+}
+export function getHybridObjectConstructorCall(hybridObjectName) {
+    const namespace = getAutolinkingNamespace();
+    return `${namespace}::${hybridObjectName}::create();`;
 }
 export function createSwiftHybridObjectRegistration({ hybridObjectName, swiftClassName, }) {
-    const { HybridTSpecCxx, HybridTSpecSwift, HybridTSpec } = getHybridObjectName(hybridObjectName);
+    const { HybridTSpecSwift } = getHybridObjectName(hybridObjectName);
     const type = new HybridObjectType(hybridObjectName, 'swift', [], NitroConfig.current);
     const bridge = new SwiftCxxBridgedType(type);
     return {
-        swiftFunction: `
-/**
- * Creates an instance of a Swift class that implements \`${HybridTSpec}\`,
- * and wraps it in a Swift class that can directly interop with C++ (\`${HybridTSpecCxx}\`)
- *
- * This is generated by Nitrogen and will initialize the class specified
- * in the \`"autolinking"\` property of \`nitro.json\` (in this case, \`${swiftClassName}\`).
- */
-public static func create${hybridObjectName}() -> ${bridge.getTypeCode('swift')} {
-  let hybridObject = ${swiftClassName}()
-  return ${indent(bridge.parseFromSwiftToCpp('hybridObject', 'swift'), '  ')}
+        swiftRegistrationClass: `
+public final class ${hybridObjectName}: AutolinkedClass {
+  public static func create() -> ${bridge.getTypeCode('swift')} {
+    let hybridObject = ${swiftClassName}()
+    return ${indent(bridge.parseFromSwiftToCpp('hybridObject', 'swift'), '    ')}
+  }
+  public static var isRecyclableHybridView: Bool {
+    return ${swiftClassName}.self is any RecyclableView.Type
+  }
 }
     `.trim(),
         requiredImports: [

package/lib/views/kotlin/KotlinHybridViewManager.js

@@ -26,13 +26,20 @@ import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
+import com.margelo.nitro.R.id.associated_hybrid_view_tag
+import com.margelo.nitro.views.RecyclableView
 import ${javaNamespace}.*
 
 /**
  * Represents the React Native \`ViewManager\` for the "${spec.name}" Nitro HybridView.
  */
 open class ${manager}: SimpleViewManager<View>() {
-  private val views = hashMapOf<View, ${viewImplementation}>()
+  init {
+    if (RecyclableView::class.java.isAssignableFrom(${viewImplementation}::class.java)) {
+      // Enable view recycling
+      super.setupViewRecycling()
+    }
+  }
 
   override fun getName(): String {
     return "${spec.name}"
@@ -41,17 +48,13 @@ open class ${manager}: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = ${viewImplementation}(reactContext)
     val view = hybridView.view
-    views[view] = hybridView
+    view.setTag(associated_hybrid_view_tag, hybridView)
     return view
   }
 
-  override fun onDropViewInstance(view: View) {
-    super.onDropViewInstance(view)
-    views.remove(view)
-  }
-
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = views[view] ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = view.getTag(associated_hybrid_view_tag) as? ${viewImplementation}
+      ?: throw Error("Couldn't find view $view in local views table!")
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
@@ -62,10 +65,21 @@ open class ${manager}: SimpleViewManager<View>() {
     return super.updateState(view, props, stateWrapper)
   }
 
-  protected override fun setupViewRecycling() {
-    // TODO: Recycling should be controllable by the user. WIP, but disabled for now.
-    // By not calling \`super.setupViewRecycling()\`, we effectively
-    // disable view recycling for now.
+  protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
+    super.prepareToRecycleView(reactContext, view)
+    val hybridView = view.getTag(associated_hybrid_view_tag) as? ${viewImplementation}
+      ?: return null
+
+    @Suppress("USELESS_IS_CHECK")
+    if (hybridView is RecyclableView) {
+      // Recycle in it's implementation
+      hybridView.prepareForRecycle()
+
+      // Maybe update the view if it changed
+      return hybridView.view
+    } else {
+      return null
+    }
   }
 }
   `.trim();

package/lib/views/swift/SwiftHybridViewManager.js

@@ -2,7 +2,7 @@ import { createViewComponentShadowNodeFiles, getViewComponentNames, } from '../C
 import { createFileMetadataString, escapeCppName, } from '../../syntax/helpers.js';
 import { getUmbrellaHeaderName } from '../../autolinking/ios/createSwiftUmbrellaHeader.js';
 import { getHybridObjectName } from '../../syntax/getHybridObjectName.js';
-import { getHybridObjectConstructorCall } from '../../syntax/swift/SwiftHybridObjectRegistration.js';
+import { getAutolinkingNamespace, getHybridObjectConstructorCall, } from '../../syntax/swift/SwiftHybridObjectRegistration.js';
 import { indent } from '../../utils.js';
 import { SwiftCxxBridgedType } from '../../syntax/swift/SwiftCxxBridgedType.js';
 export function createSwiftHybridViewManager(spec) {
@@ -68,11 +68,6 @@ using namespace ${namespace}::views;
   return react::concreteComponentDescriptorProvider<${descriptorClassName}>();
 }
 
-+ (BOOL)shouldBeRecycled {
-  // TODO: Recycling should be controllable by the user. WIP, but disabled for now.
-  return NO;
-}
-
 - (instancetype) init {
   if (self = [super init]) {
     std::shared_ptr<${HybridTSpec}> hybridView = ${getHybridObjectConstructorCall(spec.name)}
@@ -122,6 +117,16 @@ using namespace ${namespace}::views;
   [super updateProps:props oldProps:oldProps];
 }
 
++ (BOOL)shouldBeRecycled {
+  return ${getAutolinkingNamespace()}::${spec.name}::isRecyclableHybridView();
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  ${swiftNamespace}::${HybridTSpecCxx}& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.maybePrepareForRecycle();
+}
+
 @end
   `;
     return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitrogen",
-  "version": "0.32.2",
+  "version": "0.33.0",
   "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.32.2",
+    "react-native-nitro-modules": "^0.33.0",
     "ts-morph": "^27.0.0",
     "yargs": "^18.0.0",
     "zod": "^4.0.5"

package/src/autolinking/ios/createHybridObjectInitializer.ts

@@ -18,7 +18,7 @@ export function createHybridObjectIntializer(): [ObjcFile, SwiftFile] | [] {
   const autolinkedHybridObjects =
     NitroConfig.current.getAutolinkedHybridObjects()
 
-  const swiftFunctions: string[] = []
+  const swiftRegistrations: string[] = []
   const cppRegistrations: string[] = []
   const cppImports: SourceImport[] = []
   let containsSwiftObjects = false
@@ -37,14 +37,14 @@ export function createHybridObjectIntializer(): [ObjcFile, SwiftFile] | [] {
     if (config?.swift != null) {
       // Autolink a Swift HybridObject!
       containsSwiftObjects = true
-      const { cppCode, requiredImports, swiftFunction } =
+      const { cppCode, requiredImports, swiftRegistrationClass } =
         createSwiftHybridObjectRegistration({
           hybridObjectName: hybridObjectName,
           swiftClassName: config.swift,
         })
       cppImports.push(...requiredImports)
       cppRegistrations.push(cppCode)
-      swiftFunctions.push(swiftFunction)
+      swiftRegistrations.push(swiftRegistrationClass)
     }
   }
 
@@ -86,10 +86,31 @@ ${imports}
   const swiftCode = `
 ${createFileMetadataString(`${autolinkingClassName}.swift`)}
 
+import NitroModules
+
+// TODO: Use empty enums once Swift supports exporting them as namespaces
+//       See: https://github.com/swiftlang/swift/pull/83616
 public final class ${autolinkingClassName} {
   public typealias bridge = ${bridgeNamespace}
 
-  ${indent(swiftFunctions.join('\n\n'), '  ')}
+  private protocol AutolinkedClass {
+    associatedtype T
+    /**
+     * Creates an instance of the Swift class that implements the HybridObject's spec,
+     * and wraps it in a Swift class that can directly interop with C++.
+     *
+     * This is generated by Nitrogen and will initialize the class specified
+     * in the \`"autolinking"\` property of \`nitro.json\`.
+     */
+    static func create() -> T
+    /**
+     * Returns whether this concrete implementation is also
+     * conforming to the \`RecyclableView\` protocol, or not.
+     */
+    static var isRecyclableHybridView: Bool { get }
+  }
+
+  ${indent(swiftRegistrations.join('\n\n'), '  ')}
 }
   `.trim()
 

package/src/syntax/swift/SwiftHybridObject.ts

@@ -49,14 +49,14 @@ export function createSwiftHybridObject(spec: HybridObjectSpec): SourceFile[] {
     `
 public ${hasBaseClass ? 'override func' : 'func'} getCxxWrapper() -> ${name.HybridTSpecCxx} {
 #if DEBUG
-  guard self is ${name.HybridTSpec} else {
+  guard self is any ${name.HybridTSpec} else {
     fatalError("\`self\` is not a \`${name.HybridTSpec}\`! Did you accidentally inherit from \`${name.HybridTSpec}_base\` instead of \`${name.HybridTSpec}\`?")
   }
 #endif
   if let cxxWrapper = self.cxxWrapper {
     return cxxWrapper
   } else {
-    let cxxWrapper = ${name.HybridTSpecCxx}(self as! ${name.HybridTSpec})
+    let cxxWrapper = ${name.HybridTSpecCxx}(self as! any ${name.HybridTSpec})
     self.cxxWrapper = cxxWrapper
     return cxxWrapper
   }

package/src/syntax/swift/SwiftHybridObjectBridge.ts

@@ -63,6 +63,12 @@ public final func beforeUpdate() {
 public final func afterUpdate() {
   __implementation.afterUpdate()
 }
+`.trim(),
+      `
+public final func maybePrepareForRecycle() {
+  guard let recyclable = __implementation as? RecyclableView else { return }
+  recyclable.prepareForRecycle()
+}
 `.trim()
     )
   }

package/src/syntax/swift/SwiftHybridObjectRegistration.ts

@@ -18,24 +18,28 @@ interface Props {
 
 interface SwiftHybridObjectRegistration {
   cppCode: string
-  swiftFunction: string
+  swiftRegistrationClass: string
   requiredImports: SourceImport[]
 }
 
+export function getAutolinkingNamespace() {
+  const swiftNamespace = NitroConfig.current.getIosModuleName()
+  const autolinkingClassName = `${swiftNamespace}Autolinking`
+  return `${swiftNamespace}::${autolinkingClassName}`
+}
+
 export function getHybridObjectConstructorCall(
   hybridObjectName: string
 ): string {
-  const swiftNamespace = NitroConfig.current.getIosModuleName()
-  const autolinkingClassName = `${swiftNamespace}Autolinking`
-  return `${swiftNamespace}::${autolinkingClassName}::create${hybridObjectName}();`
+  const namespace = getAutolinkingNamespace()
+  return `${namespace}::${hybridObjectName}::create();`
 }
 
 export function createSwiftHybridObjectRegistration({
   hybridObjectName,
   swiftClassName,
 }: Props): SwiftHybridObjectRegistration {
-  const { HybridTSpecCxx, HybridTSpecSwift, HybridTSpec } =
-    getHybridObjectName(hybridObjectName)
+  const { HybridTSpecSwift } = getHybridObjectName(hybridObjectName)
 
   const type = new HybridObjectType(
     hybridObjectName,
@@ -46,17 +50,15 @@ export function createSwiftHybridObjectRegistration({
   const bridge = new SwiftCxxBridgedType(type)
 
   return {
-    swiftFunction: `
-/**
- * Creates an instance of a Swift class that implements \`${HybridTSpec}\`,
- * and wraps it in a Swift class that can directly interop with C++ (\`${HybridTSpecCxx}\`)
- *
- * This is generated by Nitrogen and will initialize the class specified
- * in the \`"autolinking"\` property of \`nitro.json\` (in this case, \`${swiftClassName}\`).
- */
-public static func create${hybridObjectName}() -> ${bridge.getTypeCode('swift')} {
-  let hybridObject = ${swiftClassName}()
-  return ${indent(bridge.parseFromSwiftToCpp('hybridObject', 'swift'), '  ')}
+    swiftRegistrationClass: `
+public final class ${hybridObjectName}: AutolinkedClass {
+  public static func create() -> ${bridge.getTypeCode('swift')} {
+    let hybridObject = ${swiftClassName}()
+    return ${indent(bridge.parseFromSwiftToCpp('hybridObject', 'swift'), '    ')}
+  }
+  public static var isRecyclableHybridView: Bool {
+    return ${swiftClassName}.self is any RecyclableView.Type
+  }
 }
     `.trim(),
     requiredImports: [

package/src/views/kotlin/KotlinHybridViewManager.ts

@@ -46,13 +46,20 @@ import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
+import com.margelo.nitro.R.id.associated_hybrid_view_tag
+import com.margelo.nitro.views.RecyclableView
 import ${javaNamespace}.*
 
 /**
  * Represents the React Native \`ViewManager\` for the "${spec.name}" Nitro HybridView.
  */
 open class ${manager}: SimpleViewManager<View>() {
-  private val views = hashMapOf<View, ${viewImplementation}>()
+  init {
+    if (RecyclableView::class.java.isAssignableFrom(${viewImplementation}::class.java)) {
+      // Enable view recycling
+      super.setupViewRecycling()
+    }
+  }
 
   override fun getName(): String {
     return "${spec.name}"
@@ -61,17 +68,13 @@ open class ${manager}: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = ${viewImplementation}(reactContext)
     val view = hybridView.view
-    views[view] = hybridView
+    view.setTag(associated_hybrid_view_tag, hybridView)
     return view
   }
 
-  override fun onDropViewInstance(view: View) {
-    super.onDropViewInstance(view)
-    views.remove(view)
-  }
-
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = views[view] ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = view.getTag(associated_hybrid_view_tag) as? ${viewImplementation}
+      ?: throw Error("Couldn't find view $view in local views table!")
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
@@ -82,10 +85,21 @@ open class ${manager}: SimpleViewManager<View>() {
     return super.updateState(view, props, stateWrapper)
   }
 
-  protected override fun setupViewRecycling() {
-    // TODO: Recycling should be controllable by the user. WIP, but disabled for now.
-    // By not calling \`super.setupViewRecycling()\`, we effectively
-    // disable view recycling for now.
+  protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
+    super.prepareToRecycleView(reactContext, view)
+    val hybridView = view.getTag(associated_hybrid_view_tag) as? ${viewImplementation}
+      ?: return null
+
+    @Suppress("USELESS_IS_CHECK")
+    if (hybridView is RecyclableView) {
+      // Recycle in it's implementation
+      hybridView.prepareForRecycle()
+
+      // Maybe update the view if it changed
+      return hybridView.view
+    } else {
+      return null
+    }
   }
 }
   `.trim()

package/src/views/swift/SwiftHybridViewManager.ts

@@ -10,7 +10,10 @@ import {
 } from '../../syntax/helpers.js'
 import { getUmbrellaHeaderName } from '../../autolinking/ios/createSwiftUmbrellaHeader.js'
 import { getHybridObjectName } from '../../syntax/getHybridObjectName.js'
-import { getHybridObjectConstructorCall } from '../../syntax/swift/SwiftHybridObjectRegistration.js'
+import {
+  getAutolinkingNamespace,
+  getHybridObjectConstructorCall,
+} from '../../syntax/swift/SwiftHybridObjectRegistration.js'
 import { indent } from '../../utils.js'
 import { SwiftCxxBridgedType } from '../../syntax/swift/SwiftCxxBridgedType.js'
 
@@ -89,11 +92,6 @@ using namespace ${namespace}::views;
   return react::concreteComponentDescriptorProvider<${descriptorClassName}>();
 }
 
-+ (BOOL)shouldBeRecycled {
-  // TODO: Recycling should be controllable by the user. WIP, but disabled for now.
-  return NO;
-}
-
 - (instancetype) init {
   if (self = [super init]) {
     std::shared_ptr<${HybridTSpec}> hybridView = ${getHybridObjectConstructorCall(spec.name)}
@@ -143,6 +141,16 @@ using namespace ${namespace}::views;
   [super updateProps:props oldProps:oldProps];
 }
 
++ (BOOL)shouldBeRecycled {
+  return ${getAutolinkingNamespace()}::${spec.name}::isRecyclableHybridView();
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  ${swiftNamespace}::${HybridTSpecCxx}& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.maybePrepareForRecycle();
+}
+
 @end
   `