move selector construct onto signals

packages/signals/src/global.rs

@@ -225,7 +225,7 @@ impl<T: PartialEq + 'static> GlobalSelector<T> {
             None => {
                 drop(read);
                 // Constructors are always run in the root scope
-                let signal = ScopeId::ROOT.in_runtime(|| selector(self.selector));
+                let signal = ScopeId::ROOT.in_runtime(|| Signal::selector(self.selector));
                 context.signal.borrow_mut().insert(key, Box::new(signal));
                 signal
             }

packages/signals/src/selector.rs

@@ -2,8 +2,8 @@ use dioxus_core::prelude::*;
 use generational_box::Storage;
 
 use crate::dependency::Dependency;
-use crate::{get_effect_ref, signal::SignalData, CopyValue, Effect, ReadOnlySignal, Signal};
-use crate::{use_signal, EffectInner, EFFECT_STACK};
+use crate::use_signal;
+use crate::{signal::SignalData, ReadOnlySignal, Signal};
 
 /// Creates a new unsync Selector. The selector will be run immediately and whenever any signal it reads changes.
 ///
@@ -50,7 +50,7 @@ pub fn use_selector<R: PartialEq>(f: impl FnMut() -> R + 'static) -> ReadOnlySig
 pub fn use_maybe_sync_selector<R: PartialEq, S: Storage<SignalData<R>>>(
     f: impl FnMut() -> R + 'static,
 ) -> ReadOnlySignal<R, S> {
-    use_hook(|| maybe_sync_selector(f))
+    use_hook(|| Signal::maybe_sync_selector(f))
 }
 
 /// Creates a new unsync Selector with some local dependencies. The selector will be run immediately and whenever any signal it reads or any dependencies it tracks changes
@@ -112,7 +112,7 @@ where
 {
     let mut dependencies_signal = use_signal(|| dependencies.out());
     let selector = use_hook(|| {
-        maybe_sync_selector(move || {
+        Signal::maybe_sync_selector(move || {
             let deref = &*dependencies_signal.read();
             f(deref.clone())
         })
@@ -123,61 +123,3 @@ where
     }
     selector
 }
-
-/// Creates a new unsync Selector. The selector will be run immediately and whenever any signal it reads changes.
-///
-/// Selectors can be used to efficiently compute derived data from signals.
-#[track_caller]
-pub fn selector<R: PartialEq>(f: impl FnMut() -> R + 'static) -> ReadOnlySignal<R> {
-    maybe_sync_selector(f)
-}
-
-/// Creates a new Selector that may be Sync + Send. The selector will be run immediately and whenever any signal it reads changes.
-///
-/// Selectors can be used to efficiently compute derived data from signals.
-#[track_caller]
-pub fn maybe_sync_selector<R: PartialEq, S: Storage<SignalData<R>>>(
-    mut f: impl FnMut() -> R + 'static,
-) -> ReadOnlySignal<R, S> {
-    let mut state = Signal::<R, S> {
-        inner: CopyValue::invalid(),
-    };
-    let effect = Effect {
-        source: current_scope_id().expect("in a virtual dom"),
-        inner: CopyValue::invalid(),
-    };
-
-    {
-        EFFECT_STACK.with(|stack| stack.effects.write().push(effect));
-    }
-    state.inner.value.set(SignalData {
-        subscribers: Default::default(),
-        update_any: schedule_update_any(),
-        value: f(),
-        effect_ref: get_effect_ref(),
-    });
-    {
-        EFFECT_STACK.with(|stack| stack.effects.write().pop());
-    }
-
-    let invalid_id = effect.id();
-    tracing::trace!("Creating effect: {:?}", invalid_id);
-    effect.inner.value.set(EffectInner {
-        callback: Box::new(move || {
-            let value = f();
-            let changed = {
-                let old = state.inner.read();
-                value != old.value
-            };
-            if changed {
-                state.set(value)
-            }
-        }),
-        id: invalid_id,
-    });
-    {
-        EFFECT_STACK.with(|stack| stack.effect_mapping.write().insert(invalid_id, effect));
-    }
-
-    ReadOnlySignal::new_maybe_sync(state)
-}

packages/signals/src/signal.rs

@@ -1,4 +1,4 @@
-use crate::{GlobalSelector, GlobalSignal, MappedSignal};
+use crate::{Effect, EffectInner, GlobalSelector, GlobalSignal, MappedSignal};
 use std::{
     cell::RefCell,
     marker::PhantomData,
@@ -225,7 +225,9 @@ impl<T: 'static> Signal<T> {
     pub const fn global(constructor: fn() -> T) -> GlobalSignal<T> {
         GlobalSignal::new(constructor)
     }
+}
 
+impl<T: PartialEq + 'static> Signal<T> {
     /// Creates a new global Signal that can be used in a global static.
     pub const fn global_selector(constructor: fn() -> T) -> GlobalSelector<T>
     where
@@ -233,6 +235,64 @@ impl<T: 'static> Signal<T> {
     {
         GlobalSelector::new(constructor)
     }
+
+    /// Creates a new unsync Selector. The selector will be run immediately and whenever any signal it reads changes.
+    ///
+    /// Selectors can be used to efficiently compute derived data from signals.
+    #[track_caller]
+    pub fn selector(f: impl FnMut() -> T + 'static) -> ReadOnlySignal<T> {
+        Self::maybe_sync_selector(f)
+    }
+
+    /// Creates a new Selector that may be Sync + Send. The selector will be run immediately and whenever any signal it reads changes.
+    ///
+    /// Selectors can be used to efficiently compute derived data from signals.
+    #[track_caller]
+    pub fn maybe_sync_selector<S: Storage<SignalData<T>>>(
+        mut f: impl FnMut() -> T + 'static,
+    ) -> ReadOnlySignal<T, S> {
+        let mut state = Signal::<T, S> {
+            inner: CopyValue::invalid(),
+        };
+        let effect = Effect {
+            source: current_scope_id().expect("in a virtual dom"),
+            inner: CopyValue::invalid(),
+        };
+
+        {
+            EFFECT_STACK.with(|stack| stack.effects.write().push(effect));
+        }
+        state.inner.value.set(SignalData {
+            subscribers: Default::default(),
+            update_any: schedule_update_any(),
+            value: f(),
+            effect_ref: get_effect_ref(),
+        });
+        {
+            EFFECT_STACK.with(|stack| stack.effects.write().pop());
+        }
+
+        let invalid_id = effect.id();
+        tracing::trace!("Creating effect: {:?}", invalid_id);
+        effect.inner.value.set(EffectInner {
+            callback: Box::new(move || {
+                let value = f();
+                let changed = {
+                    let old = state.inner.read();
+                    value != old.value
+                };
+                if changed {
+                    state.set(value)
+                }
+            }),
+            id: invalid_id,
+        });
+        {
+            EFFECT_STACK.with(|stack| stack.effect_mapping.write().insert(invalid_id, effect));
+        }
+
+        ReadOnlySignal::new_maybe_sync(state)
+    }
 }
 
 impl<T: 'static, S: Storage<SignalData<T>>> Signal<T, S> {