Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions crates/workshop-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ serde_json.workspace = true
sha2.workspace = true
unicode-ident.workspace = true

[build-dependencies]
serde_json.workspace = true

[dev-dependencies]
regex = "1"

Expand Down
281 changes: 0 additions & 281 deletions crates/workshop-rs/build.rs

This file was deleted.

6 changes: 2 additions & 4 deletions crates/workshop-rs/src/catalog/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ pub struct CatalogEntry {
pub kind: Kind,
/// Parameter names, when the catalog documents them.
params: Vec<String>,
/// Reviewed semantic parameter names for consumer-facing typed APIs,
/// parallel to `params`.
/// Reviewed semantic parameter names, parallel to `params`.
param_names: Vec<String>,
/// Reviewed localized spellings for each parameter, parallel to `params`.
param_aliases: Vec<HashMap<Locale, Vec<String>>>,
Expand Down Expand Up @@ -475,8 +474,7 @@ struct EntryFile {
aliases: HashMap<String, AliasFile>,
#[serde(default)]
params: Vec<String>,
/// Reviewed semantic parameter names for consumer-facing typed APIs,
/// parallel to `params`.
/// Reviewed semantic parameter names, parallel to `params`.
#[serde(default)]
param_names: Vec<String>,
#[serde(default)]
Expand Down
2 changes: 0 additions & 2 deletions crates/workshop-rs/src/program.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2122,5 +2122,3 @@ impl<T: Into<Value>, const N: usize> From<[T; N]> for Value {
Self::Array(values.into_iter().map(Into::into).collect())
}
}

include!(concat!(env!("OUT_DIR"), "/typed_api.rs"));
23 changes: 23 additions & 0 deletions crates/workshop-rs/tests/catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,29 @@ fn documented_action_and_value_signatures_are_inventory_entries() {
assert_eq!(array.param_type(3), Some("Object|Array"));
}

#[test]
fn builtin_entries_with_parameters_declare_reviewed_parameter_names() {
let raw: serde_json::Value =
serde_json::from_str(workshop_rs::catalog::CATALOG_DATA).expect("embedded catalog is JSON");
for section in ["actions", "values"] {
for entry in raw[section].as_array().expect("catalog section") {
let id = entry["id"].as_str().expect("entry id");
let params = entry["params"].as_array().map_or(0, Vec::len);
if params == 0 {
continue;
}
let names = entry["paramNames"]
.as_array()
.unwrap_or_else(|| panic!("{section} entry '{id}' must declare paramNames"));
assert_eq!(
names.len(),
params,
"{section} entry '{id}' must declare one paramNames entry per params entry"
);
}
}
}

#[test]
fn catalog_defaults_remain_available_through_position_queries() {
let catalog = builtin();
Expand Down
2 changes: 0 additions & 2 deletions crates/workshop-rs/tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ mod program_model;
mod public_api;
#[path = "real_projects.rs"]
mod real_projects;
#[path = "typed_api.rs"]
mod typed_api;
Loading
Loading