-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
34 changed files
with
4,874 additions
and
554 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| use std::{ | ||
| collections::HashMap, | ||
| env::current_dir, | ||
| path::{Path, PathBuf}, | ||
| }; | ||
|
|
||
| use nickel_lang_core::{identifier::Ident, package::PackageMap}; | ||
| use nickel_lang_package::{index::PackageIndex, ManifestFile}; | ||
|
|
||
| use crate::{ | ||
| cli::GlobalOptions, | ||
| error::{CliResult, Error}, | ||
| }; | ||
|
|
||
| #[derive(clap::Subcommand, Debug)] | ||
| pub enum Command { | ||
| GenerateLockfile, | ||
| DebugResolution, | ||
| RefreshIndex, | ||
| Publish { | ||
| #[arg(long)] | ||
| index: PathBuf, | ||
|
|
||
| #[arg(long)] | ||
| // TODO: make this an index::Id and have clap use FromStr somehow | ||
| package_id: String, | ||
| }, | ||
| } | ||
|
|
||
| #[derive(clap::Parser, Debug)] | ||
| pub struct PackageCommand { | ||
| #[command(subcommand)] | ||
| pub command: Command, | ||
|
|
||
| #[arg(long, global = true)] | ||
| pub manifest_path: Option<PathBuf>, | ||
| } | ||
|
|
||
| impl PackageCommand { | ||
| fn find_manifest(&self) -> CliResult<PathBuf> { | ||
| match &self.manifest_path { | ||
| Some(p) => Ok(p.clone()), | ||
| None => { | ||
| let mut dir = current_dir()?; | ||
|
|
||
| loop { | ||
| let path = dir.join("package.ncl"); | ||
| if path.is_file() { | ||
| return Ok(path); | ||
| } | ||
|
|
||
| if !dir.pop() { | ||
| return Err(Error::NoManifest); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn load_manifest(&self) -> CliResult<ManifestFile> { | ||
| Ok(ManifestFile::from_path(self.find_manifest()?)?) | ||
| } | ||
|
|
||
| pub fn run(self, _global: GlobalOptions) -> CliResult<()> { | ||
| match &self.command { | ||
| Command::GenerateLockfile => { | ||
| self.load_manifest()?.regenerate_lock()?; | ||
| } | ||
| Command::DebugResolution => { | ||
| let path = self.find_manifest()?; | ||
| let manifest = ManifestFile::from_path(path.clone())?; | ||
| let resolution = manifest.resolve()?; | ||
| let package_map = resolution.package_map(&manifest)?; | ||
| print_package_map(&package_map); | ||
| } | ||
| Command::Publish { index, package_id } => { | ||
| let id = package_id.parse().unwrap(); | ||
| let package_file = nickel_lang_package::index::scrape::scrape(&id).unwrap(); | ||
| dbg!(&package_file); | ||
| let mut package_index = PackageIndex::new_with_root(index.clone()); | ||
| // TODO: check for conflicts between the new thing and what's already in the index | ||
| for pkg in package_file.packages.into_values() { | ||
| package_index.save(pkg); | ||
| } | ||
| } | ||
| Command::RefreshIndex => { | ||
| let index = PackageIndex::new(); | ||
| index.refresh_from_github(); | ||
| } | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| fn print_package_map(map: &PackageMap) { | ||
| let mut by_parent: HashMap<&Path, Vec<(Ident, &Path)>> = HashMap::new(); | ||
| for ((parent, name), child) in &map.packages { | ||
| by_parent | ||
| .entry(parent.as_path()) | ||
| .or_default() | ||
| .push((*name, child)); | ||
| } | ||
|
|
||
| if map.top_level.is_empty() { | ||
| eprintln!("No top-level dependencies"); | ||
| } else { | ||
| eprintln!("Top-level dependencies:"); | ||
| let mut top_level = map.top_level.iter().collect::<Vec<_>>(); | ||
| top_level.sort(); | ||
| for (name, path) in top_level { | ||
| eprintln!(" {} -> {}", name, path.display()); | ||
| } | ||
| } | ||
|
|
||
| let mut by_parent = by_parent.into_iter().collect::<Vec<_>>(); | ||
| by_parent.sort(); | ||
| if by_parent.is_empty() { | ||
| eprintln!("No transitive dependencies"); | ||
| } else { | ||
| eprintln!("Transitive dependencies:"); | ||
|
|
||
| for (parent, mut deps) in by_parent { | ||
| deps.sort(); | ||
| eprintln!(" {}", parent.display()); | ||
|
|
||
| for (name, path) in deps { | ||
| eprintln!(" {} -> {}", name, path.display()); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.