mirror of
https://github.com/apple/container.git
synced 2026-07-12 12:37:02 +00:00
Raj
3366916e80
## Motivation and Context This PR consolidates duplicated list-output formatting across the CLI into shared rendering infrastructure. Currently, each list command has its own copy of the same json/quiet/table branching. This PR pulls that into shared rendering infrastructure in `ContainerCommands`: - `ListDisplayable` protocol for table + quiet output - `renderJSON`, `renderTable`, `renderList` as pure functions that return strings - `emit()` as the single stdout boundary (no-ops on empty strings to avoid blank-line regressions) - `JSONOptions` so all JSON encoding goes through one path, including volume inspect's pretty + ISO 8601 case JSON encoding remains separate from display formatting: each command still chooses its own JSON model, while `ListDisplayable` is used only for table and quiet output. `ImageList` remains the intentional exception for quiet mode so it can avoid unnecessary async work. This change also replaces inline `JSONEncoder` usage with `renderJSON`, removes the old `Codable+JSON.swift` helper, and moves `TableOutput` and `ListFormat` into `ContainerCommands`. It also adds unit tests for the shared rendering helpers and expands integration coverage for image, network, and registry list formatting. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
61 lines
2.1 KiB
Swift
61 lines
2.1 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import Foundation
|
|
|
|
public struct TableOutput: Sendable {
|
|
private let rows: [[String]]
|
|
private let spacing: Int
|
|
|
|
public init(
|
|
rows: [[String]],
|
|
spacing: Int = 2
|
|
) {
|
|
self.rows = rows
|
|
self.spacing = spacing
|
|
}
|
|
|
|
public func format() -> String {
|
|
var output = ""
|
|
let maxLengths = self.maxLength()
|
|
|
|
for rowIndex in 0..<self.rows.count {
|
|
let row = self.rows[rowIndex]
|
|
for columnIndex in 0..<row.count - 1 {
|
|
let currentLength = (maxLengths[columnIndex] ?? 0) + self.spacing
|
|
let padded = row[columnIndex].padding(toLength: currentLength, withPad: " ", startingAt: 0)
|
|
output += padded
|
|
}
|
|
// Skip padding for the last column.
|
|
output += row.last ?? ""
|
|
output += (rowIndex == self.rows.count - 1) ? "" : "\n"
|
|
}
|
|
return output
|
|
}
|
|
|
|
/// Returns a mapping of column index and the maximum length of all elements belonging under that column.
|
|
private func maxLength() -> [Int: Int] {
|
|
var output: [Int: Int] = [:]
|
|
for row in self.rows {
|
|
for (i, column) in row.enumerated() {
|
|
let currentMax = output[i] ?? 0
|
|
output[i] = (column.count > currentMax) ? column.count : currentMax
|
|
}
|
|
}
|
|
return output
|
|
}
|
|
}
|