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

Optional fields default to none #194

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Optional fields default to none #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
90f7537
Add experimental typeshare support for Python
hculea Apr 30, 2024
ee5673c
Resolve clippy errors
hculea May 28, 2024
78bca98
Resolve merge conflicts with latest main
hculea May 28, 2024
dfd6522
Resolve merge conflicts with latest main
hculea May 28, 2024
0c14914
Add python as an option for the --lang flag
hculea May 28, 2024
439783b
Add support for todo and priorly unsupported types
hculea Jun 10, 2024
d7f12d0
Leverage mutable self to remove RefCell around Module
hculea Jun 10, 2024
2039818
Fix ParsedRusthThing typo
hculea Jun 10, 2024
48a8adb
Merge branch 'main' into hculea/add-python-support-in-typeshare
MOmarMiraj Jul 23, 2024
1427223
Merge branch '1Password:main' into hculea/add-python-support-in-types…
AndyTitu Aug 5, 2024
c9f4be4
Use serialization alias in renaming fields in Python
hculea Aug 5, 2024
ad6645a
Merge branch '1Password:main' into hculea/add-python-support-in-types…
hculea Aug 20, 2024
459f596
Fix python serializing and deserialzing using pydantic Field aliasing…
AndyTitu Aug 20, 2024
fde8907
Fix indentation of writing config dict
AndyTitu Aug 20, 2024
6e50bb7
added None default to Optional python type
amandayu1 Aug 20, 2024
b709aff
fixed optional field default
amandayu1 Aug 27, 2024
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
128 changes: 80 additions & 48 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cli/src/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ pub const ARG_FOLLOW_LINKS: &str = "follow-links";
pub const ARG_TARGET_OS: &str = "target_os";

#[cfg(feature = "go")]
const AVAILABLE_LANGUAGES: [&str; 5] = ["kotlin", "scala", "swift", "typescript", "go"];
const AVAILABLE_LANGUAGES: [&str; 6] = ["kotlin", "scala", "swift", "typescript", "go", "python"];

#[cfg(not(feature = "go"))]
const AVAILABLE_LANGUAGES: [&str; 4] = ["kotlin", "scala", "swift", "typescript"];
const AVAILABLE_LANGUAGES: [&str; 5] = ["kotlin", "scala", "swift", "typescript", "python"];

/// Parse command line arguments.
pub(crate) fn build_command() -> Command<'static> {
Expand Down
7 changes: 7 additions & 0 deletions cli/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ use std::{

const DEFAULT_CONFIG_FILE_NAME: &str = "typeshare.toml";

#[derive(Default, Serialize, Deserialize, PartialEq, Eq, Debug)]
#[serde(default)]
pub struct PythonParams {
pub type_mappings: HashMap<String, String>,
}

#[derive(Default, Serialize, Deserialize, Debug, PartialEq, Eq)]
#[serde(default)]
pub struct KotlinParams {
Expand Down Expand Up @@ -62,6 +68,7 @@ pub(crate) struct Config {
pub typescript: TypeScriptParams,
pub kotlin: KotlinParams,
pub scala: ScalaParams,
pub python: PythonParams,
#[cfg(feature = "go")]
pub go: GoParams,
#[serde(skip)]
Expand Down
Loading