email: encapsulate bindings within worker::email

chompfile.toml

@@ -6,7 +6,7 @@ deps = ['install:ts-gen']
 # `Env` / `ExecutionContext` are project-specific re-exports that ts-gen
 # can't infer; everything else (`ReadableStream`, `Headers`, `Event`, …)
 # resolves through ts-gen's built-in web_sys defaults.
-run = '''ts-gen --input types/email.d.ts --output worker/src/email.rs \
+run = '''ts-gen --input types/email.d.ts --output worker/src/bindings/email.rs \
   --errors-as-error \
   --external "Env=crate::Env" \
   --external "ExecutionContext=crate::Context"'''

examples/send-email/src/lib.rs

@@ -19,9 +19,9 @@ async fn fetch(req: Request, env: Env, _ctx: Context) -> Result<Response> {
     Response::ok(format!("sent: {}", result.message_id()))
 }
 
-async fn send_structured(sender: &SendEmail) -> Result<EmailSendResult> {
-    let from = EmailAddress::new("Sending email test", SENDER);
-    let builder = SendEmailBuilder::builder_with_email_address_and_str(
+async fn send_structured(sender: &email::SendEmail) -> Result<email::EmailSendResult> {
+    let from = email::EmailAddress::new("Sending email test", SENDER);
+    let builder = email::SendEmailBuilder::builder_with_email_address_and_str(
         &from,
         RECIPIENT,
         "An email generated in a Worker",
@@ -33,7 +33,7 @@ async fn send_structured(sender: &SendEmail) -> Result<EmailSendResult> {
     Ok(sender.send_with_builder(&builder).await?)
 }
 
-async fn send_raw_mime(sender: &SendEmail) -> Result<EmailSendResult> {
+async fn send_raw_mime(sender: &email::SendEmail) -> Result<email::EmailSendResult> {
     // mail-builder's auto-generated `Date:` and `Message-ID:` headers rely on
     // `SystemTime::now()` and `gethostname`, neither of which work on
     // `wasm32-unknown-unknown`. https://github.com/stalwartlabs/mail-builder/pull/26
@@ -50,6 +50,6 @@ async fn send_raw_mime(sender: &SendEmail) -> Result<EmailSendResult> {
         .write_to_string()
         .map_err(|e| Error::RustError(e.to_string()))?;
 
-    let message = EmailMessage::new(SENDER, RECIPIENT, &raw)?;
+    let message = email::EmailMessage::new(SENDER, RECIPIENT, &raw)?;
     Ok(sender.send(&message).await?)
 }

publish.sh

@@ -0,0 +1,4 @@
+cargo publish -p worker-sys
+cargo publish -p worker-macros
+cargo publish -p worker
+cargo publish -p worker-build

test/src/send_email.rs

@@ -1,8 +1,9 @@
 use crate::SomeSharedData;
 use futures_util::stream::once;
 use worker::{
-    js_sys::Uint8Array, worker_sys, Date, EmailAddress, EmailAttachment, EmailMessage, Env,
-    FixedLengthStream, Request, Response, Result, SendEmail, SendEmailBuilder,
+    email::{EmailAddress, EmailAttachment, EmailMessage, SendEmail, SendEmailBuilder},
+    js_sys::Uint8Array,
+    worker_sys, Date, Env, FixedLengthStream, Request, Response, Result,
 };
 
 const SENDER: &str = "allowed-sender@example.com";