mirror of
https://github.com/SkyfallWasTaken/dinopkg.git
synced 2024-11-10 04:09:39 +00:00
fix: repository
and author
objects in package.json
now parse
This commit is contained in:
parent
2181a82cb8
commit
ee0e593b37
4 changed files with 12 additions and 5 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -402,7 +402,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "dinopkg-package-json"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
|
@ -4,7 +4,7 @@ use camino::Utf8PathBuf;
|
|||
use color_eyre::eyre::eyre;
|
||||
use color_eyre::Result;
|
||||
use dialoguer::{theme::ColorfulTheme, Confirm, Input};
|
||||
use dinopkg_package_json::{AuthorVariant, PackageJson};
|
||||
use dinopkg_package_json::{AuthorVariant, PackageJson, RepositoryVariant};
|
||||
use gix_config::File as GitConfigFile;
|
||||
use maplit::hashmap;
|
||||
use owo_colors::OwoColorize;
|
||||
|
@ -101,7 +101,7 @@ pub async fn init() -> Result<()> {
|
|||
name: package_name,
|
||||
version,
|
||||
author: Some(AuthorVariant::String(author)),
|
||||
repository: Some(git_repository),
|
||||
repository: Some(RepositoryVariant::String(git_repository)),
|
||||
license: Some(license),
|
||||
description: Some(description),
|
||||
private,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "dinopkg-package-json"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
|
|
@ -20,7 +20,7 @@ pub struct PackageJson {
|
|||
pub license: Option<String>,
|
||||
pub description: Option<String>,
|
||||
pub main: Option<String>,
|
||||
pub repository: Option<String>,
|
||||
pub repository: Option<RepositoryVariant>,
|
||||
|
||||
pub scripts: Option<Scripts>,
|
||||
|
||||
|
@ -35,6 +35,13 @@ pub enum AuthorVariant {
|
|||
String(String),
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
#[serde(untagged)]
|
||||
pub enum RepositoryVariant {
|
||||
Repository { r#type: String, url: Option<String> },
|
||||
String(String),
|
||||
}
|
||||
|
||||
// serde :/
|
||||
#[allow(clippy::trivially_copy_pass_by_ref)]
|
||||
#[inline(always)]
|
||||
|
|
Loading…
Reference in a new issue