Skip to content

[swift2objc] Generate initializers as public #2667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2025
Merged

[swift2objc] Generate initializers as public #2667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ad2eca
fix https://github.com/dart-lang/native/issues/2666
liamappelbe Oct 2, 2025
e19736c
fmt
liamappelbe Oct 2, 2025
f662b0e
fix test
liamappelbe Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 20 additions & 24 deletions pkgs/swift2objc/lib/src/generator/generators/class_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,35 +72,31 @@ String? _generateClassWrappedInstance(ClassDeclaration declaration) {
}

List<String> _generateInitializers(ClassDeclaration declaration) {
final initializers = [
declaration.wrapperInitializer,
...declaration.initializers,
].nonNulls;
return [for (final init in initializers) ..._generateInitializer(init)];
return [
..._generateInitializer(declaration.wrapperInitializer, isPublic: false),
for (final init in declaration.initializers)
..._generateInitializer(init, isPublic: true),
];
}

List<String> _generateInitializer(InitializerDeclaration initializer) {
final header = StringBuffer();

if (initializer.hasObjCAnnotation) {
header.write('@objc ');
}

if (initializer.isOverriding) {
header.write('override ');
}

header.write('init');

if (initializer.isFailable) {
header.write('?');
}

header.write('(${generateParameters(initializer.params)})');
List<String> _generateInitializer(
InitializerDeclaration? initializer, {
required bool isPublic,
}) {
if (initializer == null) return [];
final header = [
if (initializer.hasObjCAnnotation) '@objc ',
if (initializer.isOverriding) 'override ',
if (isPublic) 'public ',
'init',
if (initializer.isFailable) '?',
'(${generateParameters(initializer.params)}) ',
'${generateAnnotations(initializer)}{',
].join('');

return [
...generateAvailability(initializer),
'$header ${generateAnnotations(initializer)}{',
header,
...initializer.statements.indent(),
'}\n',
];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/swift2objc/test/integration/async_init_output.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc override init() {
@objc override public init() {
wrappedInstance = MyClass()
}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/swift2objc/test/integration/available_output.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import Foundation

@available(macOS, introduced: 456)
@available(iOS, introduced: 101)
@objc init(x: Int) {
@objc public init(x: Int) {
wrappedInstance = NewApi(x: x)
}

Expand Down
6 changes: 3 additions & 3 deletions pkgs/swift2objc/test/integration/classes_and_initializers_output.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(outerLabel representableProperty: Int, customProperty: MyOtherClassWrapper) {
@objc public init(outerLabel representableProperty: Int, customProperty: MyOtherClassWrapper) {
wrappedInstance = MyClass(outerLabel: representableProperty, customProperty: customProperty.wrappedInstance)
}

@objc init?(outerLabel x: Int) {
@objc public init?(outerLabel x: Int) {
if let instance = MyClass(outerLabel: x) {
wrappedInstance = instance
} else {
return nil
}
}

@objc init(label1 name1: Int, label2: Int, _ name3: Int) {
@objc public init(label1 name1: Int, label2: Int, _ name3: Int) {
wrappedInstance = MyClass(label1: name1, label2: label2, name3)
}

Expand Down
6 changes: 3 additions & 3 deletions pkgs/swift2objc/test/integration/optional_output.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(label param: MyClassWrapper?) {
@objc public init(label param: MyClassWrapper?) {
wrappedInstance = MyClass(label: param?.wrappedInstance)
}

@objc init(label1 param1: MyClassWrapper?, label2: Int, label3 param3: MyStructWrapper?) {
@objc public init(label1 param1: MyClassWrapper?, label2: Int, label3 param3: MyStructWrapper?) {
wrappedInstance = MyClass(label1: param1?.wrappedInstance, label2: label2, label3: param3?.wrappedInstance)
}

Expand Down Expand Up @@ -88,7 +88,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(label param: MyClassWrapper?) {
@objc public init(label param: MyClassWrapper?) {
wrappedInstance = MyStruct(label: param?.wrappedInstance)
}

Expand Down
6 changes: 3 additions & 3 deletions pkgs/swift2objc/test/integration/structs_and_initializers_output.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(outerLabel representableProperty: Int, customProperty: MyOtherStructWrapper) {
@objc public init(outerLabel representableProperty: Int, customProperty: MyOtherStructWrapper) {
wrappedInstance = MyStruct(outerLabel: representableProperty, customProperty: customProperty.wrappedInstance)
}

@objc init?(outerLabel x: Int) {
@objc public init?(outerLabel x: Int) {
if let instance = MyStruct(outerLabel: x) {
wrappedInstance = instance
} else {
return nil
}
}

@objc init(label1 name1: Int, label2: Int, _ name3: Int) {
@objc public init(label1 name1: Int, label2: Int, _ name3: Int) {
wrappedInstance = MyStruct(label1: name1, label2: label2, name3)
}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/swift2objc/test/integration/throwing_getters_output.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(y: Int) throws {
@objc public init(y: Int) throws {
wrappedInstance = try MyClass(y: y)
}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/swift2objc/test/integration/throws_output.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(y: Int) throws {
@objc public init(y: Int) throws {
wrappedInstance = try MyClass(y: y)
}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/swift2objc/test/unit/filter_test_output_a.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(type: String, horsepower: Int) {
@objc public init(type: String, horsepower: Int) {
wrappedInstance = Engine(type: type, horsepower: horsepower)
}

Expand Down
6 changes: 3 additions & 3 deletions pkgs/swift2objc/test/unit/filter_test_output_b.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc override init() {
@objc override public init() {
wrappedInstance = Garage()
}

Expand Down Expand Up @@ -141,7 +141,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(brand: String, gearCount: Int, dimensions: DimensionsWrapper) {
@objc public init(brand: String, gearCount: Int, dimensions: DimensionsWrapper) {
wrappedInstance = Bicycle(brand: brand, gearCount: gearCount, dimensions: dimensions.wrappedInstance)
}

Expand Down Expand Up @@ -194,7 +194,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(make: String, model: String, engine: EngineWrapper, dimensions: DimensionsWrapper) {
@objc public init(make: String, model: String, engine: EngineWrapper, dimensions: DimensionsWrapper) {
wrappedInstance = Vehicle(make: make, model: model, engine: engine.wrappedInstance, dimensions: dimensions.wrappedInstance)
}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/swift2objc/test/unit/filter_test_output_d.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc init(make: String, model: String, engine: EngineWrapper, dimensions: DimensionsWrapper) {
@objc public init(make: String, model: String, engine: EngineWrapper, dimensions: DimensionsWrapper) {
wrappedInstance = Vehicle(make: make, model: model, engine: engine.wrappedInstance, dimensions: dimensions.wrappedInstance)
}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/swift2objc/test/unit/filter_test_output_g.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Foundation
self.wrappedInstance = wrappedInstance
}

@objc override init() {
@objc override public init() {
wrappedInstance = Garage()
}

Expand Down