Skip to content

(GH-538) Define newtypes for versions and version requirements #1350

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

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

(GH-538) Define newtypes for versions and version requirements #1350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2eedf9a
(GH-538) Define `SemanticVersion` newtype
michaeltlombardi Jan 22, 2026
adb726f
(GH-538) Define `SemanticVersionReq` as newtype
michaeltlombardi Jan 30, 2026
f930386
(GH-538) Define `ResourceVersion` as newtype
michaeltlombardi Feb 2, 2026
fd2ae52
(GH-538) Define `ResourceVersionReq` as newtype
michaeltlombardi Feb 5, 2026
76e7a06
(MAINT) fix broken rustdocs link
michaeltlombardi Feb 4, 2026
5c29625
(MAINT) Address copilot review
michaeltlombardi Feb 5, 2026
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
46 changes: 46 additions & 0 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.

6 changes: 5 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ chrono = { version = "0.4" }
clap = { version = "4.5", features = ["derive"] }
# dsc
clap_complete = { version = "4.5" }
# dsc-lib
const-str = {version = "1.0" }
# dsc, registry, dsc-lib-registry, sshdconfig
crossterm = { version = "0.29" }
# dsc
Expand Down Expand Up @@ -255,8 +257,10 @@ cc = { version = "1.2" }
tonic-prost-build = { version = "0.14" }

# test-only dependencies
# dsc-lib-jsonschema
# dsc-lib-jsonschema, dsc-lib
pretty_assertions = { version = "1.4.1" }
# dsc-lib
test-case = { version = "3.3" }

# Workspace crates as dependencies
dsc-lib = { path = "lib/dsc-lib" }
Expand Down
9 changes: 7 additions & 2 deletions lib/dsc-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ base32 = { workspace = true }
base64 = { workspace = true }
chrono = { workspace = true, features = ["alloc"] }
clap = { workspace = true }
const-str = { workspace = true }
derive_builder = { workspace = true }
indicatif = { workspace = true }
jsonschema = { workspace = true }
Expand All @@ -28,7 +29,7 @@ serde = { workspace = true }
serde_json = { workspace = true }
serde_yaml = { workspace = true }
thiserror = { workspace = true }
semver = { workspace = true }
semver = { workspace = true, features = ["serde"] }
tokio = { workspace = true, features = [
"io-util",
"macros",
Expand All @@ -38,7 +39,7 @@ tokio = { workspace = true, features = [
tracing = { workspace = true }
tracing-indicatif = { workspace = true }
tree-sitter = { workspace = true }
tree-sitter-rust = { workspace = true}
tree-sitter-rust = { workspace = true }
uuid = { workspace = true }
url = { workspace = true }
urlencoding = { workspace = true }
Expand All @@ -52,6 +53,10 @@ tree-sitter-dscexpression = { workspace = true }

[dev-dependencies]
serde_yaml = { workspace = true }
# Helps review complex comparisons, like schemas
pretty_assertions = { workspace = true }
# Enables parameterized test cases
test-case = { workspace = true }

[build-dependencies]
cc = { workspace = true }
5 changes: 5 additions & 0 deletions lib/dsc-lib/locales/en-us.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,9 +750,14 @@ parser = "Parser"
progress = "Progress"
resourceNotFound = "Resource not found"
resourceManifestNotFound = "Resource manifest not found"
resourceVersionToSemverConversion = "Unable to convert arbitrary string resource version to semantic version"
resourceVersionReqToSemverConversion = "Unable to convert arbitrary string resource version requirement to semantic version requirement"
schema = "Schema"
schemaNotAvailable = "No Schema found and `validate` is not supported"
securityContext = "Security context"
semverReqWithBuildMetadataPrefix = "Invalid semantic version requirement: version"
semverReqWithBuildMetadataInfix = "contains the build metadata segment"
semverReqWithBuildMetadataSuffix = "DSC semantic version requirements must not include build metadata."
utf8Conversion = "UTF-8 conversion"
unknown = "Unknown"
validation = "Validation"
Expand Down
Loading