-
Notifications
You must be signed in to change notification settings - Fork 35
feat: Generate schemas with native-Swift code generator #998
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
Draft
jbelkins
wants to merge
27
commits into
epic/sbs
Choose a base branch
from
jbe/swift_codegen_schema
base: epic/sbs
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.
Draft
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
495f2e1
Disable input/output serializers
jbelkins ca5b331
add ShapeID, doc comments
jbelkins 212120e
Re-enable serde code
jbelkins fcdf1bf
Cleanup
jbelkins b2152c2
Merge branch 'main' into jbe/add_schema
jbelkins 88f7be9
Merge branch 'main' into jbe/add_schema
jbelkins aa823be
feat: Add Swift-native codegen plugin
jbelkins e817d55
Fix lint
jbelkins 6a9c537
Make service trait optional
jbelkins 33cc093
Fix ktlint again
jbelkins 6b54575
Refactor code generator plugin
jbelkins ae474f1
Convert smithy model info file to .json
jbelkins 70f7669
Fix Swift 5.9 URL initializer
jbelkins 3d623e6
Code cleanup
jbelkins d535e66
Revert disabling of schemas
jbelkins 52f9532
Schemas generate for entire SDK
jbelkins 1fa7fbd
Merge branch 'epic/sbs' into jbe/swift_codegen_schema
jbelkins 70e8a15
Fix method name renderSchema
jbelkins b1548a7
Fix swiftlint
jbelkins 94a901d
Fix ktlint
jbelkins 54a4300
Fix SmithyCodegenCoreTests
jbelkins 6b860df
Merge branch 'epic/sbs' into jbe/swift_codegen_schema
jbelkins 1eb996b
Merge branch 'epic/sbs' into jbe/swift_codegen_schema
jbelkins 3fd9854
Cleanup
jbelkins 64dd13a
Merge branch 'epic/sbs' into jbe/swift_codegen_schema
jbelkins 6a65655
Fixes
jbelkins db5b76a
Merge branch 'epic/sbs' into jbe/swift_codegen_schema
jbelkins 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
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
File renamed without changes.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
|
Contributor
Author
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. This and the other Once the JSON AST is loaded, it is transformed into a |
||
| public struct ASTError: Error { | ||
| public let localizedDescription: String | ||
|
|
||
| init(_ localizedDescription: String) { | ||
| self.localizedDescription = localizedDescription | ||
| } | ||
| } | ||
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,11 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| struct ASTMember: Decodable { | ||
| let target: String | ||
| let traits: [String: ASTNode]? | ||
| } |
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,12 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| struct ASTModel: Decodable { | ||
| let smithy: String | ||
| let metadata: ASTNode? | ||
| let shapes: [String: ASTShape] | ||
| } |
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,45 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| /// Contains the value of a Smithy Node, as used in a JSON AST. | ||
| /// | ||
| /// Smithy node data is basically the same as the data that can be stored in JSON. | ||
| /// The root of a Smithy node may be of any type, i.e. unlike JSON, the root element is not limited to object or list. | ||
| /// | ||
| /// See the definition of node value in the Smithy spec: https://smithy.io/2.0/spec/model.html#node-values | ||
| enum ASTNode: Sendable { | ||
| case object([String: ASTNode]) | ||
| case list([ASTNode]) | ||
| case string(String) | ||
| case number(Double) | ||
| case boolean(Bool) | ||
| case null | ||
| } | ||
|
|
||
| extension ASTNode: Decodable { | ||
|
|
||
| init(from decoder: any Decoder) throws { | ||
| let container = try decoder.singleValueContainer() | ||
| if container.decodeNil() { | ||
| self = .null | ||
| } else if let bool = try? container.decode(Bool.self) { | ||
| self = .boolean(bool) | ||
| } else if let int = try? container.decode(Int.self) { | ||
| self = .number(Double(int)) | ||
| } else if let double = try? container.decode(Double.self) { | ||
| self = .number(double) | ||
| } else if let string = try? container.decode(String.self) { | ||
| self = .string(string) | ||
| } else if let array = try? container.decode([ASTNode].self) { | ||
| self = .list(array) | ||
| } else if let dictionary = try? container.decode([String: ASTNode].self) { | ||
| self = .object(dictionary) | ||
| } else { | ||
| throw ASTError("Undecodable value in AST node") | ||
| } | ||
| } | ||
| } |
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,10 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| struct ASTReference: Decodable { | ||
| let target: String | ||
| } |
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,31 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| struct ASTShape: Decodable { | ||
| let type: ASTType | ||
| let traits: [String: ASTNode]? | ||
| let member: ASTMember? | ||
| let key: ASTMember? | ||
| let value: ASTMember? | ||
| let members: [String: ASTMember]? | ||
| let version: String? | ||
| let operations: [ASTReference]? | ||
| let resources: [ASTReference]? | ||
| let errors: [ASTReference]? | ||
| let rename: [String: String]? | ||
| let identifiers: [String: ASTReference]? | ||
| let properties: [String: ASTReference]? | ||
| let create: ASTReference? | ||
| let put: ASTReference? | ||
| let read: ASTReference? | ||
| let update: ASTReference? | ||
| let delete: ASTReference? | ||
| let list: ASTReference? | ||
| let collectionOperations: [ASTReference]? | ||
| let input: ASTReference? | ||
| let output: ASTReference? | ||
| } |
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,37 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| enum ASTType: String, Decodable { | ||
| // These cases are all the Smithy shape types | ||
| case blob | ||
| case boolean | ||
| case string | ||
| case timestamp | ||
| case byte | ||
| case short | ||
| case integer | ||
| case long | ||
| case float | ||
| case document | ||
| case double | ||
| case bigDecimal | ||
| case bigInteger | ||
| case `enum` | ||
| case intEnum | ||
| case list | ||
| case set | ||
| case map | ||
| case structure | ||
| case union | ||
| case member | ||
| case service | ||
| case resource | ||
| case operation | ||
|
|
||
| // Special for AST, added 'apply' case | ||
| case apply | ||
| } |
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,30 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| import struct Foundation.Data | ||
| import struct Foundation.URL | ||
|
|
||
| public struct CodeGenerator { | ||
| let modelFileURL: URL | ||
| let schemasFileURL: URL? | ||
|
|
||
| public init(modelFileURL: URL, schemasFileURL: URL?) { | ||
| self.modelFileURL = modelFileURL | ||
| self.schemasFileURL = schemasFileURL | ||
| } | ||
|
|
||
| public func run() throws { | ||
| // Load the model from the model file | ||
| let model = try Model(modelFileURL: modelFileURL) | ||
|
|
||
| // If a schema file URL was provided, generate it | ||
| if let schemasFileURL { | ||
| let schemaContents = try SmithySchemaCodegen().generate(model: model) | ||
| try Data(schemaContents.utf8).write(to: schemasFileURL) | ||
| } | ||
| } | ||
| } |
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,14 @@ | ||
| // | ||
| // Copyright Amazon.com Inc. or its affiliates. | ||
| // All Rights Reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| struct CodegenError: Error { | ||
| let localizedDescription: String | ||
|
|
||
| init(_ localizedDescription: String) { | ||
| self.localizedDescription = localizedDescription | ||
| } | ||
| } |
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.
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.
Here, the "placeholder" for code generation is replaced with a call to the actual code generator, implemented below.