|
1 | | -use darling::{Result, util::IdentString}; |
2 | | -use proc_macro2::{Span, TokenStream}; |
3 | | -use quote::{format_ident, quote}; |
4 | | -use syn::{Attribute, Ident, ItemEnum, ItemStruct, Visibility}; |
| 1 | +use std::collections::HashMap; |
| 2 | + |
| 3 | +use darling::util::IdentString; |
| 4 | +use k8s_version::Version; |
| 5 | +use proc_macro2::{Span, TokenStream, TokenTree}; |
| 6 | +use quote::format_ident; |
| 7 | +use syn::{Attribute, Ident}; |
5 | 8 |
|
6 | 9 | use crate::{ |
7 | | - attrs::container::{StandaloneContainerAttributes, k8s::KubernetesArguments}, |
| 10 | + attrs::container::StructCrdArguments, |
8 | 11 | codegen::{ |
9 | | - KubernetesTokens, VersionDefinition, |
| 12 | + VersionDefinition, |
10 | 13 | container::{r#enum::Enum, r#struct::Struct}, |
| 14 | + module::ModuleGenerationContext, |
11 | 15 | }, |
12 | 16 | utils::ContainerIdentExt, |
13 | 17 | }; |
@@ -37,57 +41,117 @@ pub enum Container { |
37 | 41 | Enum(Enum), |
38 | 42 | } |
39 | 43 |
|
40 | | -impl Container { |
41 | | - /// Generates the container definition for the specified `version`. |
42 | | - pub fn generate_definition(&self, version: &VersionDefinition) -> TokenStream { |
43 | | - match self { |
44 | | - Container::Struct(s) => s.generate_definition(version), |
45 | | - Container::Enum(e) => e.generate_definition(version), |
46 | | - } |
| 44 | +#[derive(Debug, Default)] |
| 45 | +pub struct ContainerTokens<'a> { |
| 46 | + pub versioned: HashMap<&'a Version, VersionedContainerTokens>, |
| 47 | + pub outer: TokenStream, |
| 48 | +} |
| 49 | + |
| 50 | +#[derive(Debug, Default)] |
| 51 | +/// A collection of generated tokens for a container per version. |
| 52 | +pub struct VersionedContainerTokens { |
| 53 | + /// The inner tokens are placed inside the version module. These tokens mostly only include the |
| 54 | + /// container definition with attributes, doc comments, etc. |
| 55 | + pub inner: TokenStream, |
| 56 | + |
| 57 | + /// These tokens are placed between version modules. These could technically be grouped together |
| 58 | + /// with the outer tokens, but it makes sense to keep them separate to achieve a more structured |
| 59 | + /// code generation. These tokens mostly only include `From` impls to convert between two versions |
| 60 | + pub between: TokenStream, |
| 61 | +} |
| 62 | + |
| 63 | +pub trait ExtendContainerTokens<'a, T> { |
| 64 | + fn extend_inner<I: IntoIterator<Item = T>>( |
| 65 | + &mut self, |
| 66 | + version: &'a Version, |
| 67 | + streams: I, |
| 68 | + ) -> &mut Self; |
| 69 | + fn extend_between<I: IntoIterator<Item = T>>( |
| 70 | + &mut self, |
| 71 | + version: &'a Version, |
| 72 | + streams: I, |
| 73 | + ) -> &mut Self; |
| 74 | + fn extend_outer<I: IntoIterator<Item = T>>(&mut self, streams: I) -> &mut Self; |
| 75 | +} |
| 76 | + |
| 77 | +impl<'a> ExtendContainerTokens<'a, TokenStream> for ContainerTokens<'a> { |
| 78 | + fn extend_inner<I: IntoIterator<Item = TokenStream>>( |
| 79 | + &mut self, |
| 80 | + version: &'a Version, |
| 81 | + streams: I, |
| 82 | + ) -> &mut Self { |
| 83 | + self.versioned |
| 84 | + .entry(version) |
| 85 | + .or_default() |
| 86 | + .inner |
| 87 | + .extend(streams); |
| 88 | + self |
47 | 89 | } |
48 | 90 |
|
49 | | - pub fn generate_from_impl( |
50 | | - &self, |
51 | | - direction: Direction, |
52 | | - version: &VersionDefinition, |
53 | | - next_version: Option<&VersionDefinition>, |
54 | | - add_attributes: bool, |
55 | | - ) -> Option<TokenStream> { |
56 | | - match self { |
57 | | - Container::Struct(s) => { |
58 | | - // TODO (@Techassi): Decide here (based on K8s args) what we want to generate |
59 | | - s.generate_from_impl(direction, version, next_version, add_attributes) |
60 | | - } |
61 | | - Container::Enum(e) => { |
62 | | - e.generate_from_impl(direction, version, next_version, add_attributes) |
63 | | - } |
64 | | - } |
| 91 | + fn extend_between<I: IntoIterator<Item = TokenStream>>( |
| 92 | + &mut self, |
| 93 | + version: &'a Version, |
| 94 | + streams: I, |
| 95 | + ) -> &mut Self { |
| 96 | + self.versioned |
| 97 | + .entry(version) |
| 98 | + .or_default() |
| 99 | + .between |
| 100 | + .extend(streams); |
| 101 | + self |
65 | 102 | } |
66 | 103 |
|
67 | | - /// Generates Kubernetes specific code for the container. |
68 | | - /// |
69 | | - /// This includes CRD merging, CRD conversion, and the conversion tracking status struct. |
70 | | - pub fn generate_kubernetes_code( |
71 | | - &self, |
72 | | - versions: &[VersionDefinition], |
73 | | - tokens: &KubernetesTokens, |
74 | | - vis: &Visibility, |
75 | | - is_nested: bool, |
76 | | - ) -> Option<TokenStream> { |
77 | | - match self { |
78 | | - Container::Struct(s) => s.generate_kubernetes_code(versions, tokens, vis, is_nested), |
79 | | - Container::Enum(_) => None, |
80 | | - } |
| 104 | + fn extend_outer<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) -> &mut Self { |
| 105 | + self.outer.extend(streams); |
| 106 | + self |
| 107 | + } |
| 108 | +} |
| 109 | + |
| 110 | +impl<'a> ExtendContainerTokens<'a, TokenTree> for ContainerTokens<'a> { |
| 111 | + fn extend_inner<I: IntoIterator<Item = TokenTree>>( |
| 112 | + &mut self, |
| 113 | + version: &'a Version, |
| 114 | + streams: I, |
| 115 | + ) -> &mut Self { |
| 116 | + self.versioned |
| 117 | + .entry(version) |
| 118 | + .or_default() |
| 119 | + .inner |
| 120 | + .extend(streams); |
| 121 | + self |
| 122 | + } |
| 123 | + |
| 124 | + fn extend_between<I: IntoIterator<Item = TokenTree>>( |
| 125 | + &mut self, |
| 126 | + version: &'a Version, |
| 127 | + streams: I, |
| 128 | + ) -> &mut Self { |
| 129 | + self.versioned |
| 130 | + .entry(version) |
| 131 | + .or_default() |
| 132 | + .between |
| 133 | + .extend(streams); |
| 134 | + self |
81 | 135 | } |
82 | 136 |
|
83 | | - /// Generates KUbernetes specific code for individual versions. |
84 | | - pub fn generate_kubernetes_version_items( |
85 | | - &self, |
86 | | - version: &VersionDefinition, |
87 | | - ) -> Option<(TokenStream, IdentString, TokenStream, String)> { |
| 137 | + fn extend_outer<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) -> &mut Self { |
| 138 | + self.outer.extend(streams); |
| 139 | + self |
| 140 | + } |
| 141 | +} |
| 142 | + |
| 143 | +impl Container { |
| 144 | + // TODO (@Techassi): Only have a single function here. It should return and store all generated |
| 145 | + // tokens. It should also have access to a single GenerationContext, which provides all external |
| 146 | + // parameters which influence code generation. |
| 147 | + pub fn generate_tokens<'a>( |
| 148 | + &'a self, |
| 149 | + versions: &'a [VersionDefinition], |
| 150 | + ctx: ModuleGenerationContext<'a>, |
| 151 | + ) -> ContainerTokens<'a> { |
88 | 152 | match self { |
89 | | - Container::Struct(s) => s.generate_kubernetes_version_items(version), |
90 | | - Container::Enum(_) => None, |
| 153 | + Container::Struct(s) => s.generate_tokens(versions, ctx), |
| 154 | + Container::Enum(e) => e.generate_tokens(versions, ctx), |
91 | 155 | } |
92 | 156 | } |
93 | 157 |
|
@@ -162,12 +226,8 @@ impl KubernetesIdents { |
162 | 226 |
|
163 | 227 | #[derive(Debug)] |
164 | 228 | pub struct ContainerOptions { |
165 | | - pub kubernetes_arguments: Option<KubernetesArguments>, |
166 | 229 | pub skip_from: bool, |
167 | | -} |
168 | | - |
169 | | -#[derive(Copy, Clone, Debug)] |
170 | | -pub enum Direction { |
171 | | - Upgrade, |
172 | | - Downgrade, |
| 230 | + pub skip_object_from: bool, |
| 231 | + pub skip_merged_crd: bool, |
| 232 | + pub skip_try_convert: bool, |
173 | 233 | } |
0 commit comments