Fork declare (#3)

Author: davidbrochart

Diff for: .github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Test
 
 on:
   push:
@@ -14,29 +14,30 @@ concurrency:
 
 jobs:
   test:
-    name: Test
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [ '3.8', '3.9', '3.10', '3.11' ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Upgrade pip
-      run: python3 -m pip install --upgrade pip
-
-    - name: Install ypywidgets in dev mode
+    - name: Install reacttrs
       run: |
         pip install .[test]
 
+    - name: Check types
+      run: |
+        mypy ./reacttrs
+        mypy ./tests
+
     - name: Run tests
       run: |
-        pytest ./tests -v
+        pytest ./tests -v --color=yes

Diff for: README.md

@@ -1,35 +1,31 @@
 # reacttrs
 
-Reactive attributes extracted out from [Textual](https://textual.textualize.io/guide/reactivity).
+Reactive attributes, initially extracted out from [Textual](https://textual.textualize.io/guide/reactivity), now a fork of [Declare](https://github.com/willmcgugan/declare).
 
 ```py
-from reacttrs import reactive
+from reacttrs import Int, Str
 
 
 class Foo:
 
-    name = reactive("Paul")
-    age = reactive(33)
-    birth = reactive(1990)
+    name = Str("Paul")
+    age = Int(34)
+    birth = Int(1990)
 
-    def watch_name(self, old, new):
+    @name.watch
+    def _watch_name(self, old: str, new: str):
         print(f"{old=}, {new=}")
 
-    def validate_name(self, name):
-        if name == "John":
-            print("Hey John!")
-        return name
-
-    def compute_age(self) -> int:
-        age = 2023 - self.birth
-        print(f"{age=}")
-        return age
+    @age.validate
+    def _validate_age(self, value: int) -> int:
+        return 2024 - self.birth
 
 foo = Foo()
-foo.name = "John"
-foo.name = "Steve"
+foo.name = "John"  # old='Paul', new='John'
+foo.name = "Steve"  # old='John', new='Steve'
 
-foo.age
+print(foo.age)  # 34
 foo.birth = 1991
-foo.age
+foo.age = 34
+print(foo.age)  # 33
 ```

Diff for: pyproject.toml

@@ -11,17 +11,16 @@ license = "MIT"
 requires-python = ">=3.8"
 authors = [
     { name = "David Brochart", email = "[email protected]" },
-]
-keywords = [
-    "textual",
+    { name = "Will McGugan", email = "[email protected]" },
 ]
 
 [project.urls]
 Homepage = "https://github.com/davidbrochart/reacttrs"
 
 [project.optional-dependencies]
 test = [
-    "pytest",
+    "pytest >=8.1.1",
+    "mypy >=1.9.0",
 ]
 
 [tool.hatch.version]

Diff for: reacttrs/__init__.py

@@ -1,3 +1,22 @@
-from .reactive import reactive  # noqa
+from __future__ import annotations
+
+from .reactive import Reactive as Reactive
+from .reactive import watch as watch
 
 __version__ = "0.1.4"
+
+__all__ = [
+    "Reactive",
+    "Int",
+    "Float",
+    "Bool",
+    "Str",
+    "Bytes",
+    "watch",
+]
+
+Int: type[Reactive[int]] = Reactive
+Float: type[Reactive[float]] = Reactive
+Bool: type[Reactive[bool]] = Reactive
+Str: type[Reactive[str]] = Reactive
+Bytes: type[Reactive[bytes]] = Reactive