-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat(swift): add A2UICore error types, JSONValue path extensions, and message models #1999
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
pinieb
wants to merge
19
commits into
a2ui-project:main
Choose a base branch
from
pinieb:swift-3
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.
Open
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
d7e16af
Update folder structure
pinieb f9b72b1
feat(swift): set up production package structure with swift-json-sche…
pinieb eed034d
feat(swift): define A2UI v0.9.1 common type schemas with swift-json-s…
pinieb 16c1805
feat(swift): add A2UICore error types, JSONValue path extensions, and…
pinieb 8c629d3
Merge branch 'main' into swift-2
pinieb 1d5d29b
Fix testMakeContextResolvesA2UIRefs
pinieb 115ff74
Fix formatting script
pinieb 6d70301
Address feedback
pinieb dbdf6ea
Update swift/core/Sources/A2UIJSON/A2UICommonSchema.swift
pinieb d4e4f99
Merge branch 'main' into swift-2
pinieb 1d1f093
Merge branch 'swift-2' into swift-3
pinieb c4171d8
Addressing feedback
pinieb f7825e4
Apply suggestions from code review
pinieb d5cd20b
Merge branch 'swift-3' of https://github.com/pinieb/a2ui into swift-3
pinieb c0678e3
Merge branch 'main' into swift-3
pinieb 8294b02
Merge branch 'main' into swift-2
pinieb a0b6950
Merge branch 'swift-2' into swift-3
pinieb 5a4c8f5
Conforming to spec
pinieb 0900cce
Merge branch 'main' into swift-3
pinieb 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
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
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
43 changes: 43 additions & 0 deletions
43
swift/core/Sources/A2UICore/Errors/ClientServerError.swift
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 Google LLC | ||
| // | ||
| // 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. | ||
|
|
||
| /// Encapsulates all client-to-server error types. | ||
| public enum ClientServerError: Equatable, Codable, Sendable { | ||
| case validationFailed(ValidationFailedError) | ||
| case generic(GenericError) | ||
|
|
||
| private struct Discriminator: Decodable { | ||
| let code: String | ||
| } | ||
|
|
||
| public init(from decoder: Decoder) throws { | ||
| let container = try decoder.singleValueContainer() | ||
| let discriminator = try container.decode(Discriminator.self) | ||
| if discriminator.code == ValidationFailedError.errorCode { | ||
| self = .validationFailed(try container.decode(ValidationFailedError.self)) | ||
| } else { | ||
| self = .generic(try container.decode(GenericError.self)) | ||
| } | ||
| } | ||
|
|
||
| public func encode(to encoder: Encoder) throws { | ||
| var container = encoder.singleValueContainer() | ||
| switch self { | ||
| case .validationFailed(let validation): | ||
| try container.encode(validation) | ||
| case .generic(let generic): | ||
| try container.encode(generic) | ||
| } | ||
| } | ||
| } | ||
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
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
51 changes: 51 additions & 0 deletions
51
swift/core/Sources/A2UICore/Errors/ValidationFailedError.swift
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,51 @@ | ||
| // Copyright 2026 Google LLC | ||
| // | ||
| // 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. | ||
|
|
||
| /// Represents a structured validation failure. | ||
| public struct ValidationFailedError: Error, Equatable, Codable, Sendable { | ||
| public static let errorCode = "VALIDATION_FAILED" | ||
|
|
||
| public let code: String = errorCode | ||
| public let surfaceID: String | ||
| public let path: String | ||
| public let message: String | ||
|
|
||
| private enum CodingKeys: String, CodingKey { | ||
| case code | ||
| case surfaceID = "surfaceId" | ||
| case path | ||
| case message | ||
| } | ||
|
|
||
| public init(surfaceID: String, path: String, message: String) { | ||
| self.surfaceID = surfaceID | ||
| self.path = path | ||
| self.message = message | ||
| } | ||
|
|
||
| public init(from decoder: Decoder) throws { | ||
| let container = try decoder.container(keyedBy: CodingKeys.self) | ||
| let decodedCode = try container.decode(String.self, forKey: .code) | ||
| guard decodedCode == Self.errorCode else { | ||
| throw DecodingError.dataCorruptedError( | ||
| forKey: .code, | ||
| in: container, | ||
| debugDescription: "Invalid error code: \(decodedCode)" | ||
| ) | ||
| } | ||
| surfaceID = try container.decode(String.self, forKey: .surfaceID) | ||
| path = try container.decode(String.self, forKey: .path) | ||
| message = try container.decode(String.self, forKey: .message) | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.