put adapter definitions in adapter enum

Author: rikonor

bin/icp-cli/src/commands/build.rs

@@ -19,8 +19,8 @@ pub async fn dispatch(_cmd: Cmd) -> Result<(), BuildCommandError> {
         return Err(BuildCommandError::ProjectNotFound);
     }
 
-    let bs = read(mpath).context(ProjectLoadSnafu)?;
-    let pm = ProjectManifest::from_bytes(&bs).context(ProjectParseSnafu)?;
+    let bs = read(mpath)?;
+    let pm = ProjectManifest::from_bytes(&bs)?;
 
     // List canisters in project
     let mut cs = Vec::new();
@@ -33,13 +33,14 @@ pub async fn dispatch(_cmd: Cmd) -> Result<(), BuildCommandError> {
             });
         }
 
-        let bs = read(mpath).context(CanisterLoadSnafu)?;
-        let cm = CanisterManifest::from_bytes(&bs).context(CanisterParseSnafu)?;
+        let bs = read(mpath)?;
+        let cm = CanisterManifest::from_bytes(&bs)?;
 
         cs.push(cm);
     }
 
     // Build canisters
+    println!("{cs:?}");
 
     Ok(())
 }
@@ -49,18 +50,15 @@ pub enum BuildCommandError {
     #[snafu(display("no project (icp.yaml) found in current directory or its parents"))]
     ProjectNotFound,
 
-    #[snafu(display("failed to load project manifest: {source}"))]
-    ProjectLoad { source: ReadFileError },
-
-    #[snafu(display("failed to parse project manifest: {source}"))]
+    #[snafu(transparent)]
     ProjectParse { source: ProjectManifestError },
 
     #[snafu(display("canister manifest not found: {path}"))]
     CanisterNotFound { path: String },
 
-    #[snafu(display("failed to load canister manifest: {source}"))]
-    CanisterLoad { source: ReadFileError },
-
-    #[snafu(display("failed to parse canister manifest: {source}"))]
+    #[snafu(transparent)]
     CanisterParse { source: CanisterManifestError },
+
+    #[snafu(transparent)]
+    ReadFile { source: ReadFileError },
 }

lib/icp-canister/src/lib.rs

@@ -1,32 +1,60 @@
 use serde::Deserialize;
 use snafu::{ResultExt, Snafu};
 
-/// Known adapter types that can be used to build a canister.
-/// These correspond to the values found in `build.adapter.type` in the YAML.
+/// Configuration for a Rust-based canister build adapter.
 #[derive(Debug, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum AdapterType {
-    /// A canister written in Rust.
-    Rust,
+pub struct RustAdapter {
+    /// The name of the Cargo package to build.
+    pub package: String,
+}
 
-    /// A canister written in Motoko.
-    Motoko,
+/// Configuration for a Motoko-based canister build adapter.
+#[derive(Debug, Deserialize)]
+pub struct MotokoAdapter {
+    /// Optional path to the main Motoko source file.
+    /// If omitted, a default like `main.mo` may be assumed.
+    #[serde(default)]
+    pub main: Option<String>,
+}
 
-    /// A canister built using custom instructions,
-    /// such as a shell script or other manual build process.
-    Custom,
+/// Configuration for a custom canister build adapter.
+#[derive(Debug, Deserialize)]
+pub struct CustomAdapter {
+    /// Path to a script or executable used to build the canister.
+    pub script: String,
+}
 
-    /// An assets canister used to serve front-end applications
-    /// or static assets on the Internet Computer.
-    Assets,
+/// Configuration for an asset canister used to serve static content.
+#[derive(Debug, Deserialize)]
+pub struct AssetsAdapter {
+    /// Directory containing the static assets to include in the canister.
+    pub source: String,
 }
 
 /// Identifies the type of adapter used to build the canister,
-/// e.g. "motoko", "rust", or "custom".
+/// along with its configuration.
+///
+/// The adapter type is specified via the `type` field in the YAML file.
+/// For example:
+///
+/// ```yaml
+/// type: rust
+/// package: my_canister
+/// ```
 #[derive(Debug, Deserialize)]
-pub struct Adapter {
-    #[serde(rename = "type")]
-    pub typ: AdapterType,
+#[serde(tag = "type", rename_all = "lowercase")]
+pub enum Adapter {
+    /// A canister written in Rust.
+    Rust(RustAdapter),
+
+    /// A canister written in Motoko.
+    Motoko(MotokoAdapter),
+
+    /// A canister built using a custom script or command.
+    Custom(CustomAdapter),
+
+    /// A static asset canister.
+    Assets(AssetsAdapter),
 }
 
 /// Describes how the canister should be built into WebAssembly,
@@ -59,7 +87,4 @@ impl CanisterManifest {
 pub enum CanisterManifestError {
     #[snafu(display("failed to parse canister manifest: {}", source))]
     Parse { source: serde_yaml::Error },
-
-    #[snafu(display("invalid UTF-8 in canister path"))]
-    InvalidPathUtf8,
 }