Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert "feat: support selecting outputs with flake attribute installa… #49

Closed
wants to merge 1 commit into from
Closed

Revert "feat: support selecting outputs with flake attribute installa… #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 4 additions & 100 deletions crates/runix/src/installable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use thiserror::Error;

use crate::flake_ref::{FlakeRef, ParseFlakeRefError};
use crate::store_path::StorePath;
use crate::url_parser::{InstallableOutputs, UrlParseError};
use crate::url_parser::UrlParseError;

/// regex listing valid characters for attributes
///
Expand All @@ -35,7 +35,6 @@ pub enum Installable {
pub struct FlakeAttribute {
pub flakeref: FlakeRef,
pub attr_path: AttrPath,
pub outputs: InstallableOutputs,
}

/// The attrpath component of an installable
Expand Down Expand Up @@ -234,32 +233,13 @@ impl FromStr for FlakeAttribute {
/// in order to separate the parsing of the components.
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s.split_once('#') {
Some((flakeref, attr_path)) => Ok(match attr_path.split_once('^') {
Some((attr_path, outputs)) => {
let outputs = if outputs == "*" {
InstallableOutputs::All
} else {
InstallableOutputs::Selected(
outputs.split(',').map(ToString::to_string).collect(),
)
};
FlakeAttribute {
flakeref: flakeref.parse()?,
attr_path: attr_path.parse()?,
outputs,
}
},
None => FlakeAttribute {
flakeref: flakeref.parse()?,
attr_path: attr_path.parse()?,
outputs: InstallableOutputs::Default,
},
Some((flakeref, attr_path)) => Ok(FlakeAttribute {
flakeref: flakeref.parse()?,
attr_path: attr_path.parse()?,
}),

None => Ok(FlakeAttribute {
flakeref: s.parse()?,
attr_path: AttrPath::default(),
outputs: InstallableOutputs::Default,
}),
}
}
Expand All @@ -271,8 +251,6 @@ impl Display for FlakeAttribute {
if !self.attr_path.is_empty() {
write!(f, "#{}", self.attr_path)?;
}
write!(f, "{}", self.outputs.as_url_suffix())?;

Ok(())
}
}
Expand Down Expand Up @@ -322,27 +300,6 @@ mod tests {
.expect_err(&format!("({input}) was expected to fail: {description}"));
}

fn assert_outputs(input: &str, expected: InstallableOutputs, description: &str) {
let actual = input.parse::<FlakeAttribute>().unwrap().outputs;
assert_eq!(actual, expected, "{description}");
}

fn assert_written_outputs(
input: InstallableOutputs,
expected: Option<&str>,
description: &str,
) {
let flake_attributes = FlakeAttribute {
flakeref: "flake:xyz".parse().unwrap(),
attr_path: "a.b.c".parse().unwrap(),
outputs: input,
};
let s = flake_attributes.to_string();
let actual = s.split_once('^').map(|(_, actual)| actual);

assert_eq!(actual, expected, "{description}");
}

#[test]
fn attr_path_from_str() {
assert_parse("a", "parse single attribute");
Expand Down Expand Up @@ -370,57 +327,4 @@ mod tests {
.expect_err("should not parse with interpolation in the front");
AttrPath::try_from(["x.${asdf}", "c"]).expect_err("should not parse with dynamic element");
}

#[test]
fn parse_flake_outputs() {
assert_outputs(
"flake:xyz",
InstallableOutputs::Default,
"No attributes results in default outputs",
);
assert_outputs(
"flake:xyz#a.b.c",
InstallableOutputs::Default,
"Attributes without output selected results in default outputs",
);
assert_outputs(
"flake:xyz#a.b.c^out",
InstallableOutputs::Selected(["out".to_string()].to_vec()),
"Selecting one output (`out`) is captured",
);
assert_outputs(
"flake:xyz#a.b.c^out,dev,man",
InstallableOutputs::Selected(["out", "dev", "man"].map(ToString::to_string).to_vec()),
"Selecting three outputs (`out`, `dev`, `man`) is captured",
);
assert_outputs(
"flake:xyz#a.b.c^*",
InstallableOutputs::All,
"Selecting all outputs is captured",
);
}

#[test]
fn write_outputs() {
assert_written_outputs(
InstallableOutputs::Default,
None,
"Default outputs are not printed",
);
assert_written_outputs(
InstallableOutputs::All,
Some("*"),
"All outputs wildcard is printed as '*'",
);
assert_written_outputs(
InstallableOutputs::Selected(["out".to_string()].to_vec()),
Some("out"),
"Selected output 'out' is printed as 'out'",
);
assert_written_outputs(
InstallableOutputs::Selected(["out", "dev", "man"].map(ToString::to_string).to_vec()),
Some("out,dev,man"),
"Selected outputs (`out`, `dev`, `man`) are printed as 'out,dev,man'",
);
}
}
15 changes: 2 additions & 13 deletions crates/runix/src/url_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,25 +241,14 @@ where
}

/// The possible flake output types
#[derive(Debug, Deserialize, Clone, PartialEq, Eq, Default)]
#[derive(Debug, Deserialize, Clone)]
#[serde(rename_all = "lowercase")]
pub enum InstallableOutputs {
#[default]
Default,
All,
Default,
Selected(Vec<String>),
}

impl InstallableOutputs {
pub fn as_url_suffix(&self) -> String {
match self {
InstallableOutputs::Default => String::new(),
InstallableOutputs::All => "^*".to_string(),
InstallableOutputs::Selected(ref outputs) => format!("^{}", outputs.join(",")),
}
}
}

/// A flake reference that has been parsed by Nix
#[derive(Debug, Deserialize, Clone)]
pub struct DeserializedFlakeRef {
Expand Down