Cache publicity for named types and parameters for type aliases

Author: GearsDatapacks

compiler-core/generated/schema_capnp.rs

@@ -71,6 +71,7 @@ struct TypeAliasConstructor {
     deprecation @4 :Text;
     documentation @5 :Text;
     origin @6 :SrcSpan;
+    parameters @7 :List(Type);
 }
 
 struct Version {
@@ -145,6 +146,7 @@ struct Type {
       parameters @2 :List(Type);
       package @7 :Text;
       inferredVariant @8 :InferredVariant;
+      publicity @9 :Publicity;
     }
 
     fn :group {

compiler-core/schema.capnp

@@ -1395,7 +1395,7 @@ impl<'a, A> ModuleAnalyzer<'a, A> {
                 TypeConstructor {
                     origin: *location,
                     module: self.module_name.clone(),
-                    parameters,
+                    parameters: parameters.clone(),
                     type_: type_.clone(),
                     deprecation: deprecation.clone(),
                     publicity: *publicity,
@@ -1413,6 +1413,7 @@ impl<'a, A> ModuleAnalyzer<'a, A> {
                     deprecation: deprecation.clone(),
                     documentation: documentation.as_ref().map(|(_, doc)| doc.clone()),
                     arity,
+                    parameters,
                 },
             )?;
 

compiler-core/src/analyse.rs

@@ -197,6 +197,7 @@ impl ModuleDecoder {
                 message: self.string(deprecation)?,
             }
         };
+        let parameters = read_vec!(&reader.get_parameters()?, self, type_);
         Ok(TypeAliasConstructor {
             publicity: self.publicity(reader.get_publicity()?)?,
             origin: self.src_span(&reader.get_origin()?)?,
@@ -205,6 +206,7 @@ impl ModuleDecoder {
             deprecation,
             documentation: self.optional_string(self.str(reader.get_documentation()?)?),
             arity: reader.get_arity() as usize,
+            parameters,
         })
     }
 
@@ -224,9 +226,10 @@ impl ModuleDecoder {
         let name = self.string(reader.get_name()?)?;
         let arguments = read_vec!(&reader.get_parameters()?, self, type_);
         let inferred_variant = self.inferred_variant(&reader.get_inferred_variant()?)?;
+        let publicity = self.publicity(reader.get_publicity()?)?;
 
         Ok(Arc::new(Type::Named {
-            publicity: Publicity::Public,
+            publicity,
             package,
             module,
             name,

compiler-core/src/metadata/module_decoder.rs

@@ -311,7 +311,12 @@ impl<'a> ModuleEncoder<'a> {
         self.build_type(type_builder, &constructor.type_);
         self.build_src_span(builder.reborrow().init_origin(), constructor.origin);
         builder.set_documentation(constructor.documentation.as_deref().unwrap_or_default());
-        builder.set_arity(constructor.arity as u32)
+        builder.set_arity(constructor.arity as u32);
+
+        let mut parameters_builder = builder.init_parameters(constructor.parameters.len() as u32);
+        for (index, parameter) in constructor.parameters.iter().enumerate() {
+            self.build_type(parameters_builder.reborrow().get(index as u32), parameter);
+        }
     }
 
     fn build_type_value_constructor(
@@ -652,7 +657,7 @@ impl<'a> ModuleEncoder<'a> {
                 module,
                 package,
                 inferred_variant,
-                ..
+                publicity,
             } => {
                 let mut app = builder.init_app();
                 app.set_name(name);
@@ -667,6 +672,7 @@ impl<'a> ModuleEncoder<'a> {
                     app.reborrow().init_parameters(arguments.len() as u32),
                     arguments,
                 );
+                self.build_publicity(app.init_publicity(), *publicity);
             }
 
             Type::Tuple { elements } => self.build_types(

compiler-core/src/metadata/module_encoder.rs

@@ -1761,14 +1761,18 @@ fn type_with_inferred_variant() {
             "Wibble".into(),
             TypeConstructor {
                 type_: Arc::new(Type::Named {
-                    publicity: Publicity::Public,
+                    publicity: Publicity::Internal {
+                        attribute_location: None,
+                    },
                     package: "some_package".into(),
                     module: "the/module".into(),
                     name: "Wibble".into(),
                     arguments: Vec::new(),
                     inferred_variant: Some(1),
                 }),
-                publicity: Publicity::Public,
+                publicity: Publicity::Internal {
+                    attribute_location: Some(SrcSpan::new(0, 10)),
+                },
                 origin: Default::default(),
                 module: "the/module".into(),
                 parameters: vec![],
@@ -1816,6 +1820,7 @@ fn module_with_type_aliases() {
                 deprecation: Deprecation::NotDeprecated,
                 documentation: Some("Some documentation".into()),
                 origin: Default::default(),
+                parameters: vec![type_::generic_var(0)],
             },
         )]
         .into(),

compiler-core/src/metadata/tests.rs

@@ -1495,6 +1495,7 @@ pub struct TypeAliasConstructor {
     pub deprecation: Deprecation,
     pub documentation: Option<EcoString>,
     pub origin: SrcSpan,
+    pub parameters: Vec<Arc<Type>>,
 }
 
 impl ValueConstructor {