fix: Rename autolinked class to prevent overlap with hybrid object name (#1146)

mrousavy · web-flow · commit e4e82c1e693c · 2026-01-13T12:09:08.000+01:00
* fix: Rename autolinked class to prevent overlap with hybrid object name

* fix: Now it uses the proper namespace
diff --git a/packages/nitrogen/src/syntax/swift/SwiftHybridObjectRegistration.ts b/packages/nitrogen/src/syntax/swift/SwiftHybridObjectRegistration.ts
@@ -22,6 +22,10 @@ interface SwiftHybridObjectRegistration {
   requiredImports: SourceImport[]
 }
 
+export function getAutolinkingClassName(hybridObjectName: string): string {
+  return `Autolinked${hybridObjectName}`
+}
+
 export function getAutolinkingNamespace() {
   const swiftNamespace = NitroConfig.current.getIosModuleName()
   const autolinkingClassName = `${swiftNamespace}Autolinking`
@@ -32,7 +36,8 @@ export function getHybridObjectConstructorCall(
   hybridObjectName: string
 ): string {
   const namespace = getAutolinkingNamespace()
-  return `${namespace}::${hybridObjectName}::create();`
+  const autolinkingClassName = getAutolinkingClassName(hybridObjectName)
+  return `${namespace}::${autolinkingClassName}::create();`
 }
 
 export function createSwiftHybridObjectRegistration({
@@ -48,10 +53,11 @@ export function createSwiftHybridObjectRegistration({
     NitroConfig.current
   )
   const bridge = new SwiftCxxBridgedType(type)
+  const autolinkingClassName = getAutolinkingClassName(hybridObjectName)
 
   return {
     swiftRegistrationClass: `
-public final class ${hybridObjectName}: AutolinkedClass {
+public final class ${autolinkingClassName}: AutolinkedClass {
   public static func create() -> ${bridge.getTypeCode('swift')} {
     let hybridObject = ${swiftClassName}()
     return ${indent(bridge.parseFromSwiftToCpp('hybridObject', 'swift'), '    ')}
diff --git a/packages/nitrogen/src/views/swift/SwiftHybridViewManager.ts b/packages/nitrogen/src/views/swift/SwiftHybridViewManager.ts
@@ -11,6 +11,7 @@ import {
 import { getUmbrellaHeaderName } from '../../autolinking/ios/createSwiftUmbrellaHeader.js'
 import { getHybridObjectName } from '../../syntax/getHybridObjectName.js'
 import {
+  getAutolinkingClassName,
   getAutolinkingNamespace,
   getHybridObjectConstructorCall,
 } from '../../syntax/swift/SwiftHybridObjectRegistration.js'
@@ -142,7 +143,7 @@ using namespace ${namespace}::views;
 }
 
 + (BOOL)shouldBeRecycled {
-  return ${getAutolinkingNamespace()}::${spec.name}::isRecyclableHybridView();
+  return ${getAutolinkingNamespace()}::${getAutolinkingClassName(spec.name)}::isRecyclableHybridView();
 }
 
 - (void)prepareForRecycle {
diff --git a/packages/react-native-nitro-test-external/nitrogen/generated/ios/NitroTestExternalAutolinking.mm b/packages/react-native-nitro-test-external/nitrogen/generated/ios/NitroTestExternalAutolinking.mm
diff --git a/packages/react-native-nitro-test-external/nitrogen/generated/ios/NitroTestExternalAutolinking.swift b/packages/react-native-nitro-test-external/nitrogen/generated/ios/NitroTestExternalAutolinking.swift
diff --git a/packages/react-native-nitro-test/nitrogen/generated/ios/NitroTestAutolinking.mm b/packages/react-native-nitro-test/nitrogen/generated/ios/NitroTestAutolinking.mm
@@ -39,42 +39,42 @@ + (void) load {
   HybridObjectRegistry::registerHybridObjectConstructor(
     "TestObjectSwiftKotlin",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridTestObjectSwiftKotlinSpec> hybridObject = NitroTest::NitroTestAutolinking::TestObjectSwiftKotlin::create();
+      std::shared_ptr<HybridTestObjectSwiftKotlinSpec> hybridObject = NitroTest::NitroTestAutolinking::AutolinkedTestObjectSwiftKotlin::create();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "Base",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridBaseSpec> hybridObject = NitroTest::NitroTestAutolinking::Base::create();
+      std::shared_ptr<HybridBaseSpec> hybridObject = NitroTest::NitroTestAutolinking::AutolinkedBase::create();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "Child",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridChildSpec> hybridObject = NitroTest::NitroTestAutolinking::Child::create();
+      std::shared_ptr<HybridChildSpec> hybridObject = NitroTest::NitroTestAutolinking::AutolinkedChild::create();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "PlatformObject",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridPlatformObjectSpec> hybridObject = NitroTest::NitroTestAutolinking::PlatformObject::create();
+      std::shared_ptr<HybridPlatformObjectSpec> hybridObject = NitroTest::NitroTestAutolinking::AutolinkedPlatformObject::create();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "TestView",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridTestViewSpec> hybridObject = NitroTest::NitroTestAutolinking::TestView::create();
+      std::shared_ptr<HybridTestViewSpec> hybridObject = NitroTest::NitroTestAutolinking::AutolinkedTestView::create();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "RecyclableTestView",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridRecyclableTestViewSpec> hybridObject = NitroTest::NitroTestAutolinking::RecyclableTestView::create();
+      std::shared_ptr<HybridRecyclableTestViewSpec> hybridObject = NitroTest::NitroTestAutolinking::AutolinkedRecyclableTestView::create();
       return hybridObject;
     }
   );
diff --git a/packages/react-native-nitro-test/nitrogen/generated/ios/NitroTestAutolinking.swift b/packages/react-native-nitro-test/nitrogen/generated/ios/NitroTestAutolinking.swift
@@ -29,7 +29,7 @@ public final class NitroTestAutolinking {
     static var isRecyclableHybridView: Bool { get }
   }
 
-  public final class TestObjectSwiftKotlin: AutolinkedClass {
+  public final class AutolinkedTestObjectSwiftKotlin: AutolinkedClass {
     public static func create() -> bridge.std__shared_ptr_HybridTestObjectSwiftKotlinSpec_ {
       let hybridObject = HybridTestObjectSwift()
       return { () -> bridge.std__shared_ptr_HybridTestObjectSwiftKotlinSpec_ in
@@ -42,7 +42,7 @@ public final class NitroTestAutolinking {
     }
   }
   
-  public final class Base: AutolinkedClass {
+  public final class AutolinkedBase: AutolinkedClass {
     public static func create() -> bridge.std__shared_ptr_HybridBaseSpec_ {
       let hybridObject = HybridBase()
       return { () -> bridge.std__shared_ptr_HybridBaseSpec_ in
@@ -55,7 +55,7 @@ public final class NitroTestAutolinking {
     }
   }
   
-  public final class Child: AutolinkedClass {
+  public final class AutolinkedChild: AutolinkedClass {
     public static func create() -> bridge.std__shared_ptr_HybridChildSpec_ {
       let hybridObject = HybridChild()
       return { () -> bridge.std__shared_ptr_HybridChildSpec_ in
@@ -68,7 +68,7 @@ public final class NitroTestAutolinking {
     }
   }
   
-  public final class PlatformObject: AutolinkedClass {
+  public final class AutolinkedPlatformObject: AutolinkedClass {
     public static func create() -> bridge.std__shared_ptr_HybridPlatformObjectSpec_ {
       let hybridObject = HybridPlatformObject()
       return { () -> bridge.std__shared_ptr_HybridPlatformObjectSpec_ in
@@ -81,7 +81,7 @@ public final class NitroTestAutolinking {
     }
   }
   
-  public final class TestView: AutolinkedClass {
+  public final class AutolinkedTestView: AutolinkedClass {
     public static func create() -> bridge.std__shared_ptr_HybridTestViewSpec_ {
       let hybridObject = HybridTestView()
       return { () -> bridge.std__shared_ptr_HybridTestViewSpec_ in
@@ -94,7 +94,7 @@ public final class NitroTestAutolinking {
     }
   }
   
-  public final class RecyclableTestView: AutolinkedClass {
+  public final class AutolinkedRecyclableTestView: AutolinkedClass {
     public static func create() -> bridge.std__shared_ptr_HybridRecyclableTestViewSpec_ {
       let hybridObject = HybridRecyclableTestView()
       return { () -> bridge.std__shared_ptr_HybridRecyclableTestViewSpec_ in
diff --git a/packages/react-native-nitro-test/nitrogen/generated/ios/c++/views/HybridRecyclableTestViewComponent.mm b/packages/react-native-nitro-test/nitrogen/generated/ios/c++/views/HybridRecyclableTestViewComponent.mm
@@ -43,7 +43,7 @@ + (void) load {
 
 - (instancetype) init {
   if (self = [super init]) {
-    std::shared_ptr<HybridRecyclableTestViewSpec> hybridView = NitroTest::NitroTestAutolinking::RecyclableTestView::create();
+    std::shared_ptr<HybridRecyclableTestViewSpec> hybridView = NitroTest::NitroTestAutolinking::AutolinkedRecyclableTestView::create();
     _hybridView = std::dynamic_pointer_cast<HybridRecyclableTestViewSpecSwift>(hybridView);
     [self updateView];
   }
@@ -95,7 +95,7 @@ - (void) updateProps:(const std::shared_ptr<const react::Props>&)props
 }
 
 + (BOOL)shouldBeRecycled {
-  return NitroTest::NitroTestAutolinking::RecyclableTestView::isRecyclableHybridView();
+  return NitroTest::NitroTestAutolinking::AutolinkedRecyclableTestView::isRecyclableHybridView();
 }
 
 - (void)prepareForRecycle {
diff --git a/packages/react-native-nitro-test/nitrogen/generated/ios/c++/views/HybridTestViewComponent.mm b/packages/react-native-nitro-test/nitrogen/generated/ios/c++/views/HybridTestViewComponent.mm
@@ -43,7 +43,7 @@ + (void) load {
 
 - (instancetype) init {
   if (self = [super init]) {
-    std::shared_ptr<HybridTestViewSpec> hybridView = NitroTest::NitroTestAutolinking::TestView::create();
+    std::shared_ptr<HybridTestViewSpec> hybridView = NitroTest::NitroTestAutolinking::AutolinkedTestView::create();
     _hybridView = std::dynamic_pointer_cast<HybridTestViewSpecSwift>(hybridView);
     [self updateView];
   }
@@ -110,7 +110,7 @@ - (void) updateProps:(const std::shared_ptr<const react::Props>&)props
 }
 
 + (BOOL)shouldBeRecycled {
-  return NitroTest::NitroTestAutolinking::TestView::isRecyclableHybridView();
+  return NitroTest::NitroTestAutolinking::AutolinkedTestView::isRecyclableHybridView();
 }
 
 - (void)prepareForRecycle {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import {`
`11`	`11`	`import { getUmbrellaHeaderName } from '../../autolinking/ios/createSwiftUmbrellaHeader.js'`
`12`	`12`	`import { getHybridObjectName } from '../../syntax/getHybridObjectName.js'`
`13`	`13`	`import {`
	`14`	`+ getAutolinkingClassName,`
`14`	`15`	`getAutolinkingNamespace,`
`15`	`16`	`getHybridObjectConstructorCall,`
`16`	`17`	`} from '../../syntax/swift/SwiftHybridObjectRegistration.js'`
`@@ -142,7 +143,7 @@ using namespace ${namespace}::views;`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`+ (BOOL)shouldBeRecycled {`
`145`		`- return ${getAutolinkingNamespace()}::${spec.name}::isRecyclableHybridView();`
	`146`	`+ return ${getAutolinkingNamespace()}::${getAutolinkingClassName(spec.name)}::isRecyclableHybridView();`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`- (void)prepareForRecycle {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public final class NitroTestAutolinking {`
`29`	`29`	`static var isRecyclableHybridView: Bool { get }`
`30`	`30`	`}`
`31`	`31`
`32`		`- public final class TestObjectSwiftKotlin: AutolinkedClass {`
	`32`	`+ public final class AutolinkedTestObjectSwiftKotlin: AutolinkedClass {`
`33`	`33`	`public static func create() -> bridge.std__shared_ptr_HybridTestObjectSwiftKotlinSpec_ {`
`34`	`34`	`let hybridObject = HybridTestObjectSwift()`
`35`	`35`	`return { () -> bridge.std__shared_ptr_HybridTestObjectSwiftKotlinSpec_ in`
`@@ -42,7 +42,7 @@ public final class NitroTestAutolinking {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- public final class Base: AutolinkedClass {`
	`45`	`+ public final class AutolinkedBase: AutolinkedClass {`
`46`	`46`	`public static func create() -> bridge.std__shared_ptr_HybridBaseSpec_ {`
`47`	`47`	`let hybridObject = HybridBase()`
`48`	`48`	`return { () -> bridge.std__shared_ptr_HybridBaseSpec_ in`
`@@ -55,7 +55,7 @@ public final class NitroTestAutolinking {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- public final class Child: AutolinkedClass {`
	`58`	`+ public final class AutolinkedChild: AutolinkedClass {`
`59`	`59`	`public static func create() -> bridge.std__shared_ptr_HybridChildSpec_ {`
`60`	`60`	`let hybridObject = HybridChild()`
`61`	`61`	`return { () -> bridge.std__shared_ptr_HybridChildSpec_ in`
`@@ -68,7 +68,7 @@ public final class NitroTestAutolinking {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- public final class PlatformObject: AutolinkedClass {`
	`71`	`+ public final class AutolinkedPlatformObject: AutolinkedClass {`
`72`	`72`	`public static func create() -> bridge.std__shared_ptr_HybridPlatformObjectSpec_ {`
`73`	`73`	`let hybridObject = HybridPlatformObject()`
`74`	`74`	`return { () -> bridge.std__shared_ptr_HybridPlatformObjectSpec_ in`
`@@ -81,7 +81,7 @@ public final class NitroTestAutolinking {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`- public final class TestView: AutolinkedClass {`
	`84`	`+ public final class AutolinkedTestView: AutolinkedClass {`
`85`	`85`	`public static func create() -> bridge.std__shared_ptr_HybridTestViewSpec_ {`
`86`	`86`	`let hybridObject = HybridTestView()`
`87`	`87`	`return { () -> bridge.std__shared_ptr_HybridTestViewSpec_ in`
`@@ -94,7 +94,7 @@ public final class NitroTestAutolinking {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`- public final class RecyclableTestView: AutolinkedClass {`
	`97`	`+ public final class AutolinkedRecyclableTestView: AutolinkedClass {`
`98`	`98`	`public static func create() -> bridge.std__shared_ptr_HybridRecyclableTestViewSpec_ {`
`99`	`99`	`let hybridObject = HybridRecyclableTestView()`
`100`	`100`	`return { () -> bridge.std__shared_ptr_HybridRecyclableTestViewSpec_ in`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ + (void) load {`
`43`	`43`
`44`	`44`	`- (instancetype) init {`
`45`	`45`	`if (self = [super init]) {`
`46`		`- std::shared_ptr<HybridRecyclableTestViewSpec> hybridView = NitroTest::NitroTestAutolinking::RecyclableTestView::create();`
	`46`	`+ std::shared_ptr<HybridRecyclableTestViewSpec> hybridView = NitroTest::NitroTestAutolinking::AutolinkedRecyclableTestView::create();`
`47`	`47`	`_hybridView = std::dynamic_pointer_cast<HybridRecyclableTestViewSpecSwift>(hybridView);`
`48`	`48`	`[self updateView];`
`49`	`49`	`}`
`@@ -95,7 +95,7 @@ - (void) updateProps:(const std::shared_ptr<const react::Props>&)props`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`+ (BOOL)shouldBeRecycled {`
`98`		`- return NitroTest::NitroTestAutolinking::RecyclableTestView::isRecyclableHybridView();`
	`98`	`+ return NitroTest::NitroTestAutolinking::AutolinkedRecyclableTestView::isRecyclableHybridView();`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`- (void)prepareForRecycle {`