Merge branch 'main' into cli

Aleph-Alpha · Aug 1, 2024 · 7c9643e · 7c9643e
2 parents 00f14af + 5cbc740
commit 7c9643e
Show file tree

Hide file tree

Showing 24 changed files with 1,614 additions and 1,302 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,14 @@
 # master
 ### Breaking
 ### Features
+
+- The `bson-uuid-impl` feature now supports `bson::oid::ObjectId` as well ([#340](https://github.com/Aleph-Alpha/ts-rs/pull/340))
+- Allow multile types to have the same `#[ts(export_to = "...")]` attribute and be exported to the same file ([#316](https://github.com/Aleph-Alpha/ts-rs/pull/316))
+
 ### Fixes
 
+- Properly handle block doc comments ([#342](https://github.com/Aleph-Alpha/ts-rs/pull/342))
+
 # 9.0.1
 ### Fixes
 - Allow using `#[ts(flatten)]` on fields using generic parameters ([#336](https://github.com/Aleph-Alpha/ts-rs/pull/336))

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ When running `cargo test`, the TypeScript bindings will be exported to the file
 | bigdecimal-impl    | Implement `TS` for types from *bigdecimal*                                                                                                                                                                |
 | url-impl           | Implement `TS` for types from *url*                                                                                                                                                                       |
 | uuid-impl          | Implement `TS` for types from *uuid*                                                                                                                                                                      |
-| bson-uuid-impl     | Implement `TS` for types from *bson*                                                                                                                                                                      |
+| bson-uuid-impl     | Implement `TS` for *bson::oid::ObjectId* and *bson::uuid*                                                                                                                                                 |
 | bytes-impl         | Implement `TS` for types from *bytes*                                                                                                                                                                     |
 | indexmap-impl      | Implement `TS` for types from *indexmap*                                                                                                                                                                  |
 | ordered-float-impl | Implement `TS` for types from *ordered_float*                                                                                                                                                             |