refactor: PR comments

Closes #52

Author: seanaye

src/cursor/base_cursor.rs

@@ -1,5 +1,6 @@
 use super::{CursorDirection, CursorSys};
-use crate::future::{EventTargetResult, PollUnpinned, VoidRequest};
+use crate::future::request::listeners::EventTargetResult;
+use crate::future::{PollUnpinned, Request};
 use crate::internal_utils::SystemRepr;
 use crate::primitive::{TryFromJs, TryToJs};
 use fancy_constructor::new;
@@ -27,7 +28,7 @@ pub(crate) enum CursorState {
     TryNext,
 
     /// We are currently reading the next record.
-    ReadingNext(VoidRequest),
+    ReadingNext(Request<EventTargetResult>),
 }
 
 impl BaseCursor {
@@ -108,8 +109,8 @@ impl BaseCursor {
         self.as_sys().direction()
     }
 
-    pub(crate) fn req(&self) -> VoidRequest {
-        VoidRequest::new(self.as_sys().req())
+    pub(crate) fn req(&self) -> Request<EventTargetResult> {
+        Request::new(self.as_sys().req())
     }
 
     pub(crate) fn poll_state<R, F>(

src/future/mod.rs

@@ -5,15 +5,15 @@ pub use basic::BasicRequest;
 pub use get_all::*;
 pub use maybe_errored::MaybeErrored;
 pub use open_db::{OpenDbListener, OpenDbRequest};
-pub use request::{EventTargetResult, Request, VoidRequest};
+pub use request::{Request, VoidRequest};
 pub use traits::*;
 
 mod array_map;
 mod basic;
 mod get_all;
 mod maybe_errored;
 mod open_db;
-mod request;
+pub(crate) mod request;
 mod traits;
 
 iffeat! {

src/future/open_db.rs

@@ -71,7 +71,7 @@ impl OpenDbRequest {
 impl OpenDbRequest {
     fn phase_poll_req(&mut self, cx: &mut Context) -> Poll<crate::OpenDbResult<Database>> {
         match self.req.poll_unpinned(cx) {
-            Poll::Ready(Ok(_)) => {
+            Poll::Ready(Ok(())) => {
                 cfg_if! {
                     if #[cfg(feature = "async-upgrade")] {
                         self.polling_fn = Self::phase_poll_listeners;

src/future/request.rs

@@ -1,9 +1,8 @@
-mod listeners;
+pub(crate) mod listeners;
 mod untyped;
 
 use crate::internal_utils::SystemRepr;
 use internal_macros::{FutureFromPollUnpinned, StructNameDebug};
-pub use listeners::EventTargetResult;
 use listeners::Listeners;
 use sealed::sealed;
 use std::marker::PhantomData;
@@ -63,11 +62,22 @@ impl PollUnpinned for Request {
 }
 
 #[sealed]
-impl PollUnpinned for Request<()> {
-    type Output = crate::Result<EventTargetResult>;
+#[cfg(feature = "cursors")]
+impl PollUnpinned for Request<listeners::EventTargetResult> {
+    type Output = crate::Result<listeners::EventTargetResult>;
 
     #[inline]
     fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
         self.inner.poll_unpinned(cx)
     }
 }
+
+#[sealed]
+impl PollUnpinned for Request<()> {
+    type Output = crate::Result<()>;
+
+    #[inline]
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        self.inner.poll_unpinned(cx).map(|res| res.map(|_| ()))
+    }
+}

src/future/request/listeners.rs

@@ -8,7 +8,7 @@ use wasm_bindgen::prelude::*;
 type Callback = Closure<dyn FnMut(web_sys::Event) + 'static>;
 
 /// represents the value on an event.target.result
-pub enum EventTargetResult {
+pub(crate) enum EventTargetResult {
     /// the event.target.result was null
     Null,
     /// the event.target.result was a [`web_sys::IdbCursor`] instance

src/future/request/untyped.rs

@@ -39,9 +39,9 @@ impl UntypedRequest {
         }
     }
 
-    fn poll_request(req: &web_sys::IdbRequest) -> Poll<crate::Result<()>> {
+    fn poll_request<T>(req: &web_sys::IdbRequest, v: T) -> Poll<crate::Result<T>> {
         if matches!(req.ready_state(), IdbRequestReadyState::Done) {
-            Poll::Ready(Self::req_to_result(req, ()))
+            Poll::Ready(Self::req_to_result(req, v))
         } else {
             Poll::Pending
         }
@@ -62,8 +62,8 @@ impl PollUnpinned for UntypedRequest {
         match self {
             Self::WithListeners(listeners) => listeners.poll_unpinned(cx),
             Self::Bare(req) => {
-                if let Poll::Ready(res) = Self::poll_request(req) {
-                    Poll::Ready(res.map(|()| EventTargetResult::NotNull))
+                if let Poll::Ready(res) = Self::poll_request(req, EventTargetResult::NotNull) {
+                    Poll::Ready(res)
                 } else {
                     let mut listeners = Self::create_listeners(req);
                     let out = listeners.poll_unpinned(cx);