Extract reactive primitives into new crate

.github/workflows/build_website.yml

@@ -1,6 +1,10 @@
 name: Build Website
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
   deploy:
@@ -23,8 +27,9 @@ jobs:
 
       - name: Install trunk
         run: >
-          wget -qO- https://github.com/thedodd/trunk/releases/download/v0.12.1/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- &&
-          sudo mv trunk /usr/bin/
+          wget -qO-
+          https://github.com/thedodd/trunk/releases/download/v0.12.1/trunk-x86_64-unknown-linux-gnu.tar.gz
+          | tar -xzf- && sudo mv trunk /usr/bin/
 
       - name: Cargo generate-lockfile
         run: cargo generate-lockfile
@@ -42,9 +47,7 @@ jobs:
 
       - name: Build website
         run: >
-          cd website/ &&
-          npm ci &&
-          npm run prod
+          cd website/ && npm ci && npm run prod
 
       - name: Build examples
         run: |

.github/workflows/test.yml

@@ -1,6 +1,10 @@
 name: Test
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 env:
   CARGO_TERM_COLOR: always

Cargo.toml

@@ -2,6 +2,7 @@
 members = [
   "packages/sycamore",
   "packages/sycamore-macro",
+  "packages/sycamore-reactive",
   "packages/sycamore-router",
   "packages/sycamore-router-macro",
   "examples/components",

examples/context/src/main.rs

@@ -1,5 +1,6 @@
+use sycamore::context::{ContextProvider, ContextProviderProps};
 use sycamore::prelude::*;
-use sycamore::rx::{use_context, ContextProvider, ContextProviderProps};
+use sycamore::rx::use_context;
 
 #[component(Counter<G>)]
 fn counter() -> Template<G> {

examples/tweened/src/main.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use sycamore::rx::Tweened;
+use sycamore::motion::Tweened;
 use sycamore::{easing, prelude::*};
 
 #[component(App<G>)]

packages/sycamore-macro/tests/component/component-pass.rs

@@ -6,7 +6,7 @@ fn comp1() -> Template<G> {
 }
 
 #[component(Comp2<G>)]
-fn comp2(props: ()) -> Template<G> {
+fn comp2(_props: ()) -> Template<G> {
     todo!();
 }
 

packages/sycamore-reactive/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+authors = ["Luke Chu <37006668+lukechu10@users.noreply.github.com>"]
+categories = ["gui", "wasm", "web-programming"]
+description = "Reactive primitives for Sycamore"
+edition = "2018"
+homepage = "https://github.com/sycamore-rs/sycamore"
+keywords = ["reactive"]
+license = "MIT"
+name = "sycamore-reactive"
+readme = "../../README.md"
+repository = "https://github.com/sycamore-rs/sycamore"
+version = "0.5.2"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+ahash = "0.7.4"
+indexmap = { version = "1.7.0", features = ["std"] }
+smallvec = "1.6.1"
+serde = { version = "1.0.127", optional = true }
+
+[dependencies.web-sys]
+features = ["console"]
+version = "0.3.52"

packages/sycamore/src/rx/context.rs → packages/sycamore-reactive/src/context.rs

@@ -1,8 +1,6 @@
 use std::any::{Any, TypeId};
 
-use crate::prelude::*;
-
-use super::*;
+use crate::*;
 
 /// Trait for any type of context.
 ///
@@ -32,38 +30,6 @@ impl<T: 'static> ContextAny for Context<T> {
     }
 }
 
-/// Props for [`ContextProvider`].
-pub struct ContextProviderProps<T, F, G>
-where
-    T: 'static,
-    F: FnOnce() -> Template<G>,
-    G: GenericNode,
-{
-    pub value: T,
-    pub children: F,
-}
-
-/// Creates a new [`ReactiveScope`] with a context.
-#[component(ContextProvider<G>)]
-pub fn context_provider<T, F>(props: ContextProviderProps<T, F, G>) -> Template<G>
-where
-    T: 'static,
-    F: FnOnce() -> Template<G>,
-{
-    let ContextProviderProps { value, children } = props;
-
-    SCOPES.with(|scopes| {
-        // Create a new ReactiveScope with a context.
-        let mut scope = ReactiveScope::default();
-        scope.context = Some(Box::new(Context { value }));
-        scopes.borrow_mut().push(scope);
-        let template = children();
-        let scope = scopes.borrow_mut().pop().unwrap();
-        on_cleanup(move || drop(scope));
-        template
-    })
-}
-
 /// Get the value of a context in the current [`ReactiveScope`].
 ///
 /// # Panics
@@ -83,23 +49,16 @@ pub fn use_context<T: Clone + 'static>() -> T {
     })
 }
 
-#[cfg(all(test, feature = "ssr"))]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn basic_context() {
-        sycamore::render_to_string(|| {
-            template! {
-                ContextProvider(ContextProviderProps {
-                    value: 1i32,
-                    children: || {
-                        let ctx = use_context::<i32>();
-                        assert_eq!(ctx, 1);
-                        template! {}
-                    }
-                })
-            }
-        });
-    }
+/// Creates a new [`ReactiveScope`] with a context and runs the supplied callback function.
+pub fn create_context_scope<T: 'static, Out>(value: T, f: impl FnOnce() -> Out) -> Out {
+    SCOPES.with(|scopes| {
+        // Create a new ReactiveScope with a context.
+        let mut scope = ReactiveScope::default();
+        scope.context = Some(Box::new(Context { value }));
+        scopes.borrow_mut().push(scope);
+        let out = f();
+        let scope = scopes.borrow_mut().pop().unwrap();
+        on_cleanup(move || drop(scope));
+        out
+    })
 }