Skip to content

Align on config name for use import access level #35

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 2 commits into from
Jan 24, 2025
Merged

Align on config name for use import access level #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e42cc69
Align on config name for use import access level
glbrntt Jan 24, 2025
ff72257
Merge branch 'main' into access-level-on-imports
glbrntt Jan 24, 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
18 changes: 9 additions & 9 deletions Plugins/GRPCProtobufGenerator/BuildPluginConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ struct BuildPluginConfig: Codable {
/// Whether imports should have explicit access levels.
///
/// Defaults to `false`.
var useAccessLevelOnImports: Bool
var accessLevelOnImports: Bool

static let defaults = Self(
accessLevel: .internal,
useAccessLevelOnImports: false
accessLevelOnImports: false
)

private init(accessLevel: GenerationConfig.AccessLevel, useAccessLevelOnImports: Bool) {
private init(accessLevel: GenerationConfig.AccessLevel, accessLevelOnImports: Bool) {
self.accessLevel = accessLevel
self.useAccessLevelOnImports = useAccessLevelOnImports
self.accessLevelOnImports = accessLevelOnImports
}
}

Expand Down Expand Up @@ -159,7 +159,7 @@ extension BuildPluginConfig.GeneratedSource: Codable {
// Codable conformance with defaults
enum CodingKeys: String, CodingKey {
case accessLevel
case useAccessLevelOnImports
case accessLevelOnImports
}

init(from decoder: any Decoder) throws {
Expand All @@ -168,9 +168,9 @@ extension BuildPluginConfig.GeneratedSource: Codable {
self.accessLevel =
try container.decodeIfPresent(GenerationConfig.AccessLevel.self, forKey: .accessLevel)
?? Self.defaults.accessLevel
self.useAccessLevelOnImports =
try container.decodeIfPresent(Bool.self, forKey: .useAccessLevelOnImports)
?? Self.defaults.useAccessLevelOnImports
self.accessLevelOnImports =
try container.decodeIfPresent(Bool.self, forKey: .accessLevelOnImports)
?? Self.defaults.accessLevelOnImports
}
}

Expand Down Expand Up @@ -199,7 +199,7 @@ extension GenerationConfig {
// hard-code full-path to avoid collisions since this goes into a temporary directory anyway
self.fileNaming = .fullPath
self.visibility = buildPluginConfig.generatedSource.accessLevel
self.useAccessLevelOnImports = buildPluginConfig.generatedSource.useAccessLevelOnImports
self.accessLevelOnImports = buildPluginConfig.generatedSource.accessLevelOnImports
// Generate absolute paths for the imports relative to the config file in which they are specified
self.importPaths = buildPluginConfig.protoc.importPaths.map { relativePath in
configFilePath.deletingLastPathComponent().absoluteStringNoScheme + "/" + relativePath
Expand Down
2 changes: 1 addition & 1 deletion Plugins/PluginsShared/GenerationConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ struct GenerationConfig {
/// The naming of output files with respect to the path of the source file.
var fileNaming: FileNaming
/// Whether imports should have explicit access levels.
var useAccessLevelOnImports: Bool
var accessLevelOnImports: Bool

/// Specify the directory in which to search for imports.
///
Expand Down
4 changes: 2 additions & 2 deletions Plugins/PluginsShared/PluginUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func constructProtocGenSwiftArguments(

protocArgs.append("--swift_opt=Visibility=\(config.visibility.rawValue)")
protocArgs.append("--swift_opt=FileNaming=\(config.fileNaming.rawValue)")
protocArgs.append("--swift_opt=UseAccessLevelOnImports=\(config.useAccessLevelOnImports)")
protocArgs.append("--swift_opt=UseAccessLevelOnImports=\(config.accessLevelOnImports)")
protocArgs.append(contentsOf: inputFiles.map { $0.absoluteStringNoScheme })

return protocArgs
Expand Down Expand Up @@ -101,7 +101,7 @@ func constructProtocGenGRPCSwiftArguments(
protocArgs.append("--grpc-swift_opt=Server=\(config.server)")
protocArgs.append("--grpc-swift_opt=Client=\(config.client)")
protocArgs.append("--grpc-swift_opt=FileNaming=\(config.fileNaming.rawValue)")
protocArgs.append("--grpc-swift_opt=UseAccessLevelOnImports=\(config.useAccessLevelOnImports)")
protocArgs.append("--grpc-swift_opt=UseAccessLevelOnImports=\(config.accessLevelOnImports)")
protocArgs.append(contentsOf: inputFiles.map { $0.absoluteStringNoScheme })

return protocArgs
Expand Down
Loading