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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [0.7.7][] - 2026-06-21

- Support `DataVisualization` block.
- Improve type inference for vector type.
- Fix validation of `DataTable` block.

## [0.7.6][] - 2026-06-20

- Introduce prelude module for rich text objects.
Expand Down Expand Up @@ -140,6 +146,7 @@ And the `select menu element` and the `multi-select menu element` are renewed.

- pre-release

[0.7.7]: https://github.com/kaicoh/slack-messaging/releases/v0.7.7
[0.7.6]: https://github.com/kaicoh/slack-messaging/releases/v0.7.6
[0.7.5]: https://github.com/kaicoh/slack-messaging/releases/v0.7.5
[0.7.4]: https://github.com/kaicoh/slack-messaging/releases/v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion slack-messaging-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "slack-messaging-derive"
version = "0.7.6"
version = "0.7.7"
edition = "2024"
authors = ["kaicoh <sumireminami@gmail.com>"]
keywords = ["slack", "messaging", "webhook"]
Expand Down
21 changes: 18 additions & 3 deletions slack-messaging-derive/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,21 @@ impl Field {
} else {
quote! {}
};
let (setter_generic, setter_arg, setter_logic, setter_bounds) = if let InnerType::Vec(inner_ty) = InnerType::new(self.inner_ty()) {
(
quote! { <Iter, Inner> },
quote! { Iter },
quote! { val.into_iter().map(|v| v.into()).collect() },
quote! { where Iter: IntoIterator<Item = Inner>, Inner: Into<#inner_ty> }
)
} else {
(
quote! {},
quote! { impl Into<#ty> },
quote! { val.into() },
quote! {},
)
};

let push_item = match (self.push_item.as_ref(), InnerType::new(self.inner_ty())) {
(Some(expr), InnerType::Vec(inner_ty)) => {
Expand Down Expand Up @@ -144,15 +159,15 @@ impl Field {
}

#[doc = #doc_setter]
#setter_visibility fn #setter(self, value: ::std::option::Option<impl Into<#ty>>) -> Self {
#setter_visibility fn #setter #setter_generic (self, value: ::std::option::Option<#setter_arg>) -> Self #setter_bounds {
Self {
#ident: Self::#constructor_name(value.map(|v| v.into())),
#ident: Self::#constructor_name(value.map(|val| #setter_logic)),
#after_set
}
}

#[doc = #doc_setter]
#setter_visibility fn #ident(self, value: impl Into<#ty>) -> Self {
#setter_visibility fn #ident #setter_generic(self, value: #setter_arg) -> Self #setter_bounds {
self.#setter(Some(value))
}

Expand Down
6 changes: 3 additions & 3 deletions slack-messaging/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "slack-messaging"
version = "0.7.6"
version = "0.7.7"
authors = ["kaicoh <sumireminami@gmail.com>"]
edition = "2024"
keywords = ["slack", "messaging", "webhook"]
Expand All @@ -20,9 +20,9 @@ paste = "1.0"
regex = "1.12"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
slack-messaging-derive = { version = "0.7.6", path = "../slack-messaging-derive" }
slack-messaging-derive = { version = "0.7.7", path = "../slack-messaging-derive" }
thiserror = "2.0"

[dev-dependencies]
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13", features = ["json"] }
tokio = { version = "1", features = ["full"] }
9 changes: 6 additions & 3 deletions slack-messaging/src/blocks/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -413,16 +413,19 @@ mod tests {
.set_block_id(Some("actions_0"))
.set_elements(Some(vec![
datepicker().into(),
btn("button_0", "value_0").into(),
]))
btn("button_0", "value_0").into()
] as Vec<ActionsElement>))
.build()
.unwrap();

assert_eq!(val, expected);

let val = Actions::builder()
.block_id("actions_0")
.elements(vec![datepicker().into(), btn("button_0", "value_0").into()])
.elements(vec![
datepicker().into(),
btn("button_0", "value_0").into()
] as Vec<ActionsElement>)
.build()
.unwrap();

Expand Down
1 change: 1 addition & 0 deletions slack-messaging/src/blocks/builders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ pub use super::carousel::CarouselBuilder;
pub use super::context::ContextBuilder;
pub use super::context_actions::ContextActionsBuilder;
pub use super::data_table::DataTableBuilder;
pub use super::data_visualization::DataVisualizationBuilder;
pub use super::divider::DividerBuilder;
pub use super::file::FileBuilder;
pub use super::header::HeaderBuilder;
Expand Down
5 changes: 4 additions & 1 deletion slack-messaging/src/blocks/carousel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,10 @@ mod tests {

#[test]
fn it_requires_elements_to_have_at_least_1_item() {
let err = Carousel::builder().elements(vec![]).build().unwrap_err();
let err = Carousel::builder()
.elements(vec![] as Vec<Card>)
.build()
.unwrap_err();
assert_eq!(err.object(), "Carousel");

let errors = err.field("elements");
Expand Down
4 changes: 2 additions & 2 deletions slack-messaging/src/blocks/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ mod tests {

let val = Context::builder()
.set_block_id(Some("context_0"))
.set_elements(Some(vec![mrkdwn_text("foo").into()]))
.set_elements(Some(vec![mrkdwn_text("foo")]))
.build()
.unwrap();

assert_eq!(val, expected);

let val = Context::builder()
.block_id("context_0")
.elements(vec![mrkdwn_text("foo").into()])
.elements(vec![mrkdwn_text("foo")])
.build()
.unwrap();

Expand Down
4 changes: 2 additions & 2 deletions slack-messaging/src/blocks/context_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,15 @@ mod tests {

let val = ContextActions::builder()
.set_block_id(Some("context_actions_0"))
.set_elements(Some(vec![fb_buttons().into()]))
.set_elements(Some(vec![fb_buttons()]))
.build()
.unwrap();

assert_eq!(val, expected);

let val = ContextActions::builder()
.block_id("context_actions_0")
.elements(vec![fb_buttons().into()])
.elements(vec![fb_buttons()])
.build()
.unwrap();

Expand Down
14 changes: 14 additions & 0 deletions slack-messaging/src/blocks/data_table/cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@ pub enum DataTableCell {
RichText(RichText),
}

impl DataTableCell {
pub fn is_raw_text(&self) -> bool {
matches!(self, Self::RawText(_))
}

pub fn is_raw_number(&self) -> bool {
matches!(self, Self::RawNumber(_))
}

pub fn is_rich_text(&self) -> bool {
matches!(self, Self::RichText(_))
}
}

impl<T: Into<String>> From<T> for DataTableCell {
fn from(value: T) -> Self {
Self::RawText(RawText::from(value))
Expand Down
55 changes: 53 additions & 2 deletions slack-messaging/src/blocks/data_table/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use crate::errors::ValidationErrorKind;
use crate::value::Value;
use crate::validators::*;

use serde::Serialize;
Expand All @@ -24,7 +26,7 @@ pub use row::DataTableRow;
/// | Field | Type | Required | Validation |
/// |-------|------|----------|------------|
/// | block_id | String | No | Maximum 255 characters. |
/// | rows | Vec<[DataTableRow]> | Yes | Maximum 101 items (100 regular rows plus the header). Minimum 2 items (1 regular row plus the header). |
/// | rows | Vec<[DataTableRow]> | Yes | Maximum 101 items (100 regular rows plus the header). Minimum 2 items (1 regular row plus the header). The first row is a header, and `rich_text` cannot be used for the header cells. |
/// | caption | String | Yes | N/A |
/// | page_size | i64 | No | Minimum 1, maximum 100. |
/// | row_header_column_index | i64 | No | Minimum 0. |
Expand Down Expand Up @@ -247,7 +249,10 @@ pub struct DataTable {
#[builder(validate("text::max_255"))]
pub(crate) block_id: Option<String>,

#[builder(push_item = "row", validate("required", "list::min_item_2", "list::max_item_101"))]
#[builder(
push_item = "row",
validate("required", "list::min_item_2", "list::max_item_101", "valid_header")
)]
pub(crate) rows: Option<Vec<DataTableRow>>,

#[builder(validate("required"))]
Expand All @@ -262,10 +267,19 @@ pub struct DataTable {
pub(crate) row_header_column_index: Option<i64>,
}

fn valid_header(value: Value<Vec<DataTableRow>>) -> Value<Vec<DataTableRow>> {
list::inner_validator(value, ValidationErrorKind::RichTextTableHeader, |rows| {
rows.first().and_then(|row| row.cells.as_ref()).is_some_and(|cells| {
cells.iter().any(DataTableCell::is_rich_text)
})
})
}

#[cfg(test)]
mod tests {
use super::*;
use crate::errors::*;
use crate::blocks::rich_text::prelude::*;

#[test]
fn it_implements_builder() {
Expand Down Expand Up @@ -382,6 +396,20 @@ mod tests {
assert!(errors.includes(ValidationErrorKind::MaxArraySize(101)));
}

#[test]
fn it_requires_rows_field_to_have_header_row_without_rich_text() {
let err = DataTable::builder()
.caption("A Fabulous Table")
.row(rich_text_row(vec!["foo", "bar", "baz"]))
.row(row(vec!["000", "001", "002"]))
.build()
.unwrap_err();
assert_eq!(err.object(), "DataTable");

let errors = err.field("rows");
assert!(errors.includes(ValidationErrorKind::RichTextTableHeader));
}

#[test]
fn it_requires_caption_field() {
let err = DataTable::builder()
Expand Down Expand Up @@ -443,4 +471,27 @@ mod tests {
fn row<T: Into<DataTableCell>>(cells: Vec<T>) -> DataTableRow {
DataTableRow::from_iter(cells)
}

fn rich_text_row(cells: Vec<&str>) -> DataTableRow {
let cells = cells
.into_iter()
.map(|text| {
RichText::builder()
.element(
RichTextSection::builder()
.element(
RichTextElementText::builder()
.text(text)
.build()
.unwrap(),
)
.build()
.unwrap(),
)
.build()
.unwrap()
})
.collect::<Vec<RichText>>();
row(cells)
}
}
Loading