-
Notifications
You must be signed in to change notification settings - Fork 282
[os]: add FilePathOps utility type + initial absolute path function #751
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.
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
Open
saehejkang
wants to merge
1
commit into
apple:main
Choose a base branch
from
saehejkang:add-file-path-ops-with-absolute-path
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+83
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // Copyright © 2026 Apple Inc. and the Containerization 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 | ||
| import SystemPackage | ||
|
|
||
| /// Static utility functions for path operations. | ||
| /// | ||
| /// The type is never instantiated; it exists solely as a namespace. | ||
| public struct FilePathOps { | ||
| private init() {} | ||
|
|
||
| /// Returns an absolute version of `path`. | ||
| /// | ||
| /// This is a purely lexical operation: it does not resolve symlinks | ||
| /// and does not access the file system. If `path` is already absolute, | ||
| /// this returns `path` unchanged. | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The description here should mention that the function performs no tilde expansion. |
||
| public static func absolutePath(_ path: FilePath) -> FilePath { | ||
| guard !path.isAbsolute else { | ||
| return path | ||
| } | ||
|
|
||
| return FilePath(FileManager.default.currentDirectoryPath) | ||
| .appending(path.components) | ||
| .lexicallyNormalized() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // Copyright © 2026 Apple Inc. and the Containerization 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 | ||
| import SystemPackage | ||
| import Testing | ||
|
|
||
| @testable import ContainerizationOS | ||
|
|
||
| struct FilePathOpsTests { | ||
| @Test("absolutePath returns absolute inputs unchanged") | ||
| func absolutePathPreservesAbsolutePath() { | ||
| let absolute = FilePath("/tmp/containerization/file.tar") | ||
| let resolved = FilePathOps.absolutePath(absolute) | ||
|
|
||
| #expect(resolved == absolute) | ||
| } | ||
|
|
||
| @Test("absolutePath resolves relative paths against cwd and normalizes lexically") | ||
| func absolutePathResolvesRelativePath() { | ||
| let relative = FilePath("./images/../image.tar") | ||
| let expected = FilePath(FileManager.default.currentDirectoryPath) | ||
| .appending(relative.components) | ||
| .lexicallyNormalized() | ||
| let resolved = FilePathOps.absolutePath(relative) | ||
|
|
||
| #expect(resolved == expected) | ||
| #expect(resolved.isAbsolute) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you change this to a caseless enum, remove the private
init(), and do the same for FileDescriptorOps?