refactor(components): rename package to component in manifest file (#214

)

crates/cli/src/commands/components/build.rs

@@ -11,9 +11,9 @@ pub async fn run(_opts: Options) -> anyhow::Result<()> {
     };
     let manifest = Manifest::load(&manifest_path).map_err(|err| anyhow::anyhow!(err))?;
 
-    tracing::info!("Running: {}", manifest.package.build.command);
+    tracing::info!("Running: {}", manifest.component.build.command);
     let mut cmd = Command::new("sh");
-    cmd.arg("-c").arg(manifest.package.build.command);
+    cmd.arg("-c").arg(manifest.component.build.command);
     let status = cmd.status()?;
 
     if status.success() {

crates/cli/src/commands/components/check.rs

@@ -75,7 +75,7 @@ pub async fn run(_opts: Options) -> anyhow::Result<()> {
 
     let manifest = Manifest::load(&manifest_path)?;
     let component_path = manifest
-        .package
+        .component
         .build
         .output_path
         .to_str()

crates/cli/src/commands/components/init.rs

@@ -1,6 +1,6 @@
 use crate::components::{
     boilerplate::{CATEGORY_OPTIONS, LANGUAGE_OPTIONS, SUBCATEGORY_OPTIONS},
-    manifest::{self, Build, Manifest, Package},
+    manifest::{self, Build, Component, Manifest},
 };
 
 #[derive(Debug, clap::Parser)]
@@ -48,7 +48,7 @@ pub async fn run(_opts: Options) -> anyhow::Result<()> {
 
     Manifest {
         manifest_version: manifest::MANIFEST_VERSION,
-        package: Package {
+        component: Component {
             name: component_name,
             version: "0.1.0".to_string(),
             wit_world_version: "0.4.0".to_string(),

crates/cli/src/commands/components/push.rs

@@ -41,7 +41,7 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
             .api_context("Could not get user organization")?
             .into_inner(),
     };
-    let component_slug = slug::slugify(&manifest.package.name);
+    let component_slug = slug::slugify(&manifest.component.name);
     match client
         .get_component_by_slug()
         .org_slug(&organization.slug)
@@ -75,21 +75,21 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
                 .body(
                     api_types::ComponentCreateInput::builder()
                         .organization_id(organization.id.clone())
-                        .name(&manifest.package.name)
+                        .name(&manifest.component.name)
                         .slug(component_slug.clone())
-                        .description(manifest.package.description.clone())
-                        .category(manifest.package.category)
-                        .subcategory(manifest.package.subcategory)
+                        .description(manifest.component.description.clone())
+                        .category(manifest.component.category)
+                        .subcategory(manifest.component.subcategory)
                         .documentation_link(
                             manifest
-                                .package
+                                .component
                                 .documentation
                                 .as_ref()
                                 .map(|url| url.to_string()),
                         )
                         .repo_link(
                             manifest
-                                .package
+                                .component
                                 .repository
                                 .as_ref()
                                 .map(|url| url.to_string()),
@@ -123,7 +123,7 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
 
     tracing::info!("Uploading WASM file...");
     let asset_url = client
-        .upload_file(&manifest.package.build.output_path)
+        .upload_file(&manifest.component.build.output_path)
         .await
         .expect("Could not upload component");
 
@@ -134,8 +134,8 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
         .component_slug(&component_slug)
         .body(
             api_types::ComponentVersionCreateInput::builder()
-                .version(&manifest.package.version)
-                .wit_world_version(&manifest.package.wit_world_version)
+                .version(&manifest.component.version)
+                .wit_world_version(&manifest.component.wit_world_version)
                 .wasm_url(asset_url)
                 .dynamic_fields(convert_manifest_config_fields(&manifest))
                 .changelog(changelog),
@@ -147,15 +147,15 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
     tracing::info!(
         "{} {} pushed successfully!",
         component_slug,
-        manifest.package.version
+        manifest.component.version,
     );
 
     Ok(())
 }
 
 fn convert_manifest_config_fields(manifest: &Manifest) -> Vec<api_types::ConfigurationField> {
     manifest
-        .package
+        .component
         .settings
         .iter()
         .map(|(name, field)| api_types::ConfigurationField {

crates/cli/src/commands/components/test.rs

@@ -43,7 +43,7 @@ async fn test_data_collection_component(opts: Options) -> anyhow::Result<()> {
 
     let manifest = Manifest::load(&manifest_path)?;
     let component_path = manifest
-        .package
+        .component
         .build
         .output_path
         .into_os_string()
@@ -89,14 +89,14 @@ async fn test_data_collection_component(opts: Options) -> anyhow::Result<()> {
     }
 
     // check that all required settings are provided
-    for (name, setting) in &manifest.package.settings {
+    for (name, setting) in &manifest.component.settings {
         if setting.required && !settings_map.contains_key(name) {
             return Err(anyhow::anyhow!("missing required setting {}", name));
         }
     }
 
     for name in settings_map.keys() {
-        if !manifest.package.settings.contains_key(name) {
+        if !manifest.component.settings.contains_key(name) {
             return Err(anyhow::anyhow!("unknown setting {}", name));
         }
     }

crates/cli/src/components/manifest.rs

@@ -15,12 +15,12 @@ pub const MANIFEST_FILENAME: &str = "edgee-component.toml";
 #[serde(rename_all = "kebab-case")]
 pub struct Manifest {
     pub manifest_version: u8,
-    pub package: Package,
+    pub component: Component,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
-pub struct Package {
+pub struct Component {
     pub name: String,
     pub version: String,
     #[serde(with = "Category")]