nitrogen 0.33.1 → 0.33.3

package/lib/autolinking/ios/createHybridObjectInitializer.js

@@ -28,13 +28,13 @@ export function createHybridObjectIntializer() {
         if (config?.swift != null) {
             // Autolink a Swift HybridObject!
             containsSwiftObjects = true;
-            const { cppCode, requiredImports, swiftRegistrationClass } = createSwiftHybridObjectRegistration({
+            const { cppCode, requiredImports, swiftRegistrationMethods } = createSwiftHybridObjectRegistration({
                 hybridObjectName: hybridObjectName,
                 swiftClassName: config.swift,
             });
             cppImports.push(...requiredImports);
             cppRegistrations.push(cppCode);
-            swiftRegistrations.push(swiftRegistrationClass);
+            swiftRegistrations.push(swiftRegistrationMethods);
         }
     }
     if (cppRegistrations.length === 0) {
@@ -79,23 +79,6 @@ import NitroModules
 public final class ${autolinkingClassName} {
   public typealias bridge = ${bridgeNamespace}
 
-  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/lib/syntax/swift/SwiftCxxBridgedType.js

@@ -310,7 +310,7 @@ export class SwiftCxxBridgedType {
                 switch (language) {
                     case 'swift':
                         return `
-{ () -> ${name.HybridTSpec} in
+{ () -> any ${name.HybridTSpec} in
   let __unsafePointer = ${getFunc}(${cppParameterName})
   let __instance = ${name.HybridTSpecCxx}.fromUnsafe(__unsafePointer)
   return __instance.get${name.HybridTSpec}()

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/SwiftHybridObjectRegistration.d.ts

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

package/lib/syntax/swift/SwiftHybridObjectRegistration.js

@@ -3,9 +3,6 @@ import { indent } from '../../utils.js';
 import { getHybridObjectName } from '../getHybridObjectName.js';
 import { HybridObjectType } from '../types/HybridObjectType.js';
 import { SwiftCxxBridgedType } from './SwiftCxxBridgedType.js';
-export function getAutolinkingClassName(hybridObjectName) {
-    return `Autolinked${hybridObjectName}`;
-}
 export function getAutolinkingNamespace() {
     const swiftNamespace = NitroConfig.current.getIosModuleName();
     const autolinkingClassName = `${swiftNamespace}Autolinking`;
@@ -13,24 +10,25 @@ export function getAutolinkingNamespace() {
 }
 export function getHybridObjectConstructorCall(hybridObjectName) {
     const namespace = getAutolinkingNamespace();
-    const autolinkingClassName = getAutolinkingClassName(hybridObjectName);
-    return `${namespace}::${autolinkingClassName}::create();`;
+    return `${namespace}::create${hybridObjectName}();`;
+}
+export function getIsRecyclableCall(hybridObjectName) {
+    const namespace = getAutolinkingNamespace();
+    return `${namespace}::is${hybridObjectName}Recyclable();`;
 }
 export function createSwiftHybridObjectRegistration({ hybridObjectName, swiftClassName, }) {
     const { HybridTSpecSwift } = getHybridObjectName(hybridObjectName);
     const type = new HybridObjectType(hybridObjectName, 'swift', [], NitroConfig.current);
     const bridge = new SwiftCxxBridgedType(type);
-    const autolinkingClassName = getAutolinkingClassName(hybridObjectName);
     return {
-        swiftRegistrationClass: `
-public final class ${autolinkingClassName}: 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
-  }
+        swiftRegistrationMethods: `
+public static func create${hybridObjectName}() -> ${bridge.getTypeCode('swift')} {
+  let hybridObject = ${swiftClassName}()
+  return ${indent(bridge.parseFromSwiftToCpp('hybridObject', 'swift'), '  ')}
+}
+
+public static func is${hybridObjectName}Recyclable() -> Bool {
+  return ${swiftClassName}.self is any RecyclableView.Type
 }
     `.trim(),
         requiredImports: [

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

@@ -225,7 +225,7 @@ 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);
+    auto& concreteShadowNode = static_cast<${shadowNodeClassName}&>(shadowNode);
     const ${propsClassName}& props = concreteShadowNode.getConcreteProps();
     ${stateClassName} state;
     state.setProps(props);

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
@@ -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};";
 
@@ -186,7 +186,7 @@ void J${stateUpdaterName}::updateViewProps(jni::alias_ref<jni::JClass> /* class
             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()) {

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 { getAutolinkingClassName, getAutolinkingNamespace, getHybridObjectConstructorCall, } from '../../syntax/swift/SwiftHybridObjectRegistration.js';
+import { getHybridObjectConstructorCall, getIsRecyclableCall, } from '../../syntax/swift/SwiftHybridObjectRegistration.js';
 import { indent } from '../../utils.js';
 import { SwiftCxxBridgedType } from '../../syntax/swift/SwiftCxxBridgedType.js';
 export function createSwiftHybridViewManager(spec) {
@@ -118,7 +118,7 @@ using namespace ${namespace}::views;
 }
 
 + (BOOL)shouldBeRecycled {
-  return ${getAutolinkingNamespace()}::${getAutolinkingClassName(spec.name)}::isRecyclableHybridView();
+  return ${getIsRecyclableCall(spec.name)}
 }
 
 - (void)prepareForRecycle {

package/package.json

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

package/src/autolinking/ios/createHybridObjectInitializer.ts

@@ -37,14 +37,14 @@ export function createHybridObjectIntializer(): [ObjcFile, SwiftFile] | [] {
     if (config?.swift != null) {
       // Autolink a Swift HybridObject!
       containsSwiftObjects = true
-      const { cppCode, requiredImports, swiftRegistrationClass } =
+      const { cppCode, requiredImports, swiftRegistrationMethods } =
         createSwiftHybridObjectRegistration({
           hybridObjectName: hybridObjectName,
           swiftClassName: config.swift,
         })
       cppImports.push(...requiredImports)
       cppRegistrations.push(cppCode)
-      swiftRegistrations.push(swiftRegistrationClass)
+      swiftRegistrations.push(swiftRegistrationMethods)
     }
   }
 
@@ -93,23 +93,6 @@ import NitroModules
 public final class ${autolinkingClassName} {
   public typealias bridge = ${bridgeNamespace}
 
-  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/SwiftCxxBridgedType.ts

@@ -353,7 +353,7 @@ export class SwiftCxxBridgedType implements BridgedType<'swift', 'c++'> {
         switch (language) {
           case 'swift':
             return `
-{ () -> ${name.HybridTSpec} in
+{ () -> any ${name.HybridTSpec} in
   let __unsafePointer = ${getFunc}(${cppParameterName})
   let __instance = ${name.HybridTSpecCxx}.fromUnsafe(__unsafePointer)
   return __instance.get${name.HybridTSpec}()

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/SwiftHybridObjectRegistration.ts

@@ -18,14 +18,10 @@ interface Props {
 
 interface SwiftHybridObjectRegistration {
   cppCode: string
-  swiftRegistrationClass: string
+  swiftRegistrationMethods: string
   requiredImports: SourceImport[]
 }
 
-export function getAutolinkingClassName(hybridObjectName: string): string {
-  return `Autolinked${hybridObjectName}`
-}
-
 export function getAutolinkingNamespace() {
   const swiftNamespace = NitroConfig.current.getIosModuleName()
   const autolinkingClassName = `${swiftNamespace}Autolinking`
@@ -36,8 +32,12 @@ export function getHybridObjectConstructorCall(
   hybridObjectName: string
 ): string {
   const namespace = getAutolinkingNamespace()
-  const autolinkingClassName = getAutolinkingClassName(hybridObjectName)
-  return `${namespace}::${autolinkingClassName}::create();`
+  return `${namespace}::create${hybridObjectName}();`
+}
+
+export function getIsRecyclableCall(hybridObjectName: string): string {
+  const namespace = getAutolinkingNamespace()
+  return `${namespace}::is${hybridObjectName}Recyclable();`
 }
 
 export function createSwiftHybridObjectRegistration({
@@ -53,18 +53,16 @@ export function createSwiftHybridObjectRegistration({
     NitroConfig.current
   )
   const bridge = new SwiftCxxBridgedType(type)
-  const autolinkingClassName = getAutolinkingClassName(hybridObjectName)
 
   return {
-    swiftRegistrationClass: `
-public final class ${autolinkingClassName}: 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
-  }
+    swiftRegistrationMethods: `
+public static func create${hybridObjectName}() -> ${bridge.getTypeCode('swift')} {
+  let hybridObject = ${swiftClassName}()
+  return ${indent(bridge.parseFromSwiftToCpp('hybridObject', 'swift'), '  ')}
+}
+
+public static func is${hybridObjectName}Recyclable() -> Bool {
+  return ${swiftClassName}.self is any RecyclableView.Type
 }
     `.trim(),
     requiredImports: [

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

@@ -272,7 +272,7 @@ 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);
+    auto& concreteShadowNode = static_cast<${shadowNodeClassName}&>(shadowNode);
     const ${propsClassName}& props = concreteShadowNode.getConcreteProps();
     ${stateClassName} state;
     state.setProps(props);

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
@@ -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};";
 
@@ -213,7 +213,7 @@ void J${stateUpdaterName}::updateViewProps(jni::alias_ref<jni::JClass> /* class
             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()) {

package/src/views/swift/SwiftHybridViewManager.ts

@@ -11,9 +11,8 @@ import {
 import { getUmbrellaHeaderName } from '../../autolinking/ios/createSwiftUmbrellaHeader.js'
 import { getHybridObjectName } from '../../syntax/getHybridObjectName.js'
 import {
-  getAutolinkingClassName,
-  getAutolinkingNamespace,
   getHybridObjectConstructorCall,
+  getIsRecyclableCall,
 } from '../../syntax/swift/SwiftHybridObjectRegistration.js'
 import { indent } from '../../utils.js'
 import { SwiftCxxBridgedType } from '../../syntax/swift/SwiftCxxBridgedType.js'
@@ -143,7 +142,7 @@ using namespace ${namespace}::views;
 }
 
 + (BOOL)shouldBeRecycled {
-  return ${getAutolinkingNamespace()}::${getAutolinkingClassName(spec.name)}::isRecyclableHybridView();
+  return ${getIsRecyclableCall(spec.name)}
 }
 
 - (void)prepareForRecycle {