ccstate-solid 4.13.0 → 5.2.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # ccstate-solid
 
+## 5.2.0
+
+### Patch Changes
+
+- Updated dependencies [304895d]
+  - ccstate@5.2.0
+
+## 5.1.0
+
+### Patch Changes
+
+- ccstate@5.1.0
+
+## 5.0.0
+
+### Major Changes
+
+- 2fdba09: feat: provide watch method to replace sub
+
+### Minor Changes
+
+- 52c52fd: refactor: remove defaultStore
+
+### Patch Changes
+
+- Updated dependencies [2fdba09]
+- Updated dependencies [52c52fd]
+  - ccstate@5.0.0
+
 ## 4.13.0
 
 ### Patch Changes

package/dist/index.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 var solidJs = require('solid-js');
-var ccstate = require('ccstate');
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -57,24 +56,27 @@ var StoreProvider = StoreContext.Provider;
 function useStore() {
   var store = solidJs.useContext(StoreContext);
   if (!store) {
-    return ccstate.getDefaultStore();
+    throw new Error('useStore must be used within a StoreProvider');
   }
   return store;
 }
 
-function useGet(atom) {
+function useGet(signal$) {
   var store = useStore();
-  var _createSignal = solidJs.createSignal(store.get(atom)),
+  var _createSignal = solidJs.createSignal(store.get(signal$)),
     _createSignal2 = _slicedToArray(_createSignal, 2),
     value = _createSignal2[0],
     setValue = _createSignal2[1];
-  var unsub = store.sub(atom, ccstate.command(function () {
+  var controller = new AbortController();
+  store.watch(function (get) {
     setValue(function () {
-      return store.get(atom);
+      return get(signal$);
     });
-  }));
+  }, {
+    signal: controller.signal
+  });
   solidJs.onCleanup(function () {
-    unsub();
+    controller.abort();
   });
   return value;
 }

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import * as solid_js from 'solid-js';
 import { Resource } from 'solid-js';
 import { State, Computed, Command, StateArg, Store } from 'ccstate';
 
-declare function useGet<T>(atom: State<T> | Computed<T>): solid_js.Accessor<T>;
+declare function useGet<T>(signal$: State<T> | Computed<T>): solid_js.Accessor<T>;
 
 type ValueSetter<T> = (val: StateArg<T>) => void;
 type CommandInvoker<T, CommandArgs extends unknown[]> = (...args: CommandArgs) => T;

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as solid_js from 'solid-js';
 import { Resource } from 'solid-js';
 import { State, Computed, Command, StateArg, Store } from 'ccstate';
 
-declare function useGet<T>(atom: State<T> | Computed<T>): solid_js.Accessor<T>;
+declare function useGet<T>(signal$: State<T> | Computed<T>): solid_js.Accessor<T>;
 
 type ValueSetter<T> = (val: StateArg<T>) => void;
 type CommandInvoker<T, CommandArgs extends unknown[]> = (...args: CommandArgs) => T;

package/dist/index.js

@@ -1,5 +1,4 @@
 import { createContext, useContext, createSignal, onCleanup, createResource } from 'solid-js';
-import { getDefaultStore, command } from 'ccstate';
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -55,24 +54,27 @@ var StoreProvider = StoreContext.Provider;
 function useStore() {
   var store = useContext(StoreContext);
   if (!store) {
-    return getDefaultStore();
+    throw new Error('useStore must be used within a StoreProvider');
   }
   return store;
 }
 
-function useGet(atom) {
+function useGet(signal$) {
   var store = useStore();
-  var _createSignal = createSignal(store.get(atom)),
+  var _createSignal = createSignal(store.get(signal$)),
     _createSignal2 = _slicedToArray(_createSignal, 2),
     value = _createSignal2[0],
     setValue = _createSignal2[1];
-  var unsub = store.sub(atom, command(function () {
+  var controller = new AbortController();
+  store.watch(function (get) {
     setValue(function () {
-      return store.get(atom);
+      return get(signal$);
     });
-  }));
+  }, {
+    signal: controller.signal
+  });
   onCleanup(function () {
-    unsub();
+    controller.abort();
   });
   return value;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstate-solid",
-  "version": "4.13.0",
+  "version": "5.2.0",
   "description": "CCState Solid.js Hooks",
   "repository": {
     "type": "git",
@@ -8,6 +8,10 @@
   },
   "license": "MIT",
   "type": "module",
+  "scripts": {
+    "build": "rollup -c",
+    "prebuild": "shx rm -rf dist"
+  },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "exports": {
@@ -20,7 +24,7 @@
     "solid-js": ">=1.6.0"
   },
   "dependencies": {
-    "ccstate": "^4.13.0"
+    "ccstate": "workspace:^"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.26.0",
@@ -30,6 +34,7 @@
     "@solidjs/testing-library": "^0.8.10",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/user-event": "^14.5.2",
+    "ccstate": "workspace:^",
     "happy-dom": "^15.11.7",
     "jest-leak-detector": "^29.7.0",
     "json": "^11.0.0",
@@ -39,11 +44,6 @@
     "signal-timers": "^1.0.4",
     "solid-js": "^1.9.3",
     "vite-plugin-solid": "^2.11.0",
-    "vitest": "^2.1.8",
-    "ccstate": "^4.13.0"
-  },
-  "scripts": {
-    "build": "rollup -c",
-    "prebuild": "shx rm -rf dist"
+    "vitest": "^2.1.8"
   }
-}
+}

package/src/__tests__/get-and-set.test.tsx

@@ -1,7 +1,7 @@
 import { render } from '@solidjs/testing-library';
 import userEvent from '@testing-library/user-event';
 import { expect, it } from 'vitest';
-import { computed, command, state, createDebugStore, getDefaultStore } from 'ccstate';
+import { computed, command, state, createDebugStore, createStore } from 'ccstate';
 import { StoreProvider, useGet, useSet } from '..';
 import { createSignal } from 'solid-js';
 import '@testing-library/jest-dom/vitest';
@@ -14,10 +14,15 @@ it('using ccstate in solid', async () => {
     return <div>{ret()}</div>;
   }
 
-  const screen = render(() => <App />);
+  const store = createStore();
+  const screen = render(() => (
+    <StoreProvider value={store}>
+      <App />
+    </StoreProvider>
+  ));
 
   expect(screen.getByText('0')).toBeInTheDocument();
-  getDefaultStore().set(base$, 1);
+  store.set(base$, 1);
   expect(await screen.findByText('1')).toBeInTheDocument();
 });
 
@@ -30,10 +35,15 @@ it('computed should re-render', async () => {
     return <div>{ret()}</div>;
   }
 
-  const screen = render(() => <App />);
+  const store = createStore();
+  const screen = render(() => (
+    <StoreProvider value={store}>
+      <App />
+    </StoreProvider>
+  ));
 
   expect(screen.getByText('0')).toBeInTheDocument();
-  getDefaultStore().set(base$, 1);
+  store.set(base$, 1);
   expect(await screen.findByText('2')).toBeInTheDocument();
 });
 
@@ -51,7 +61,12 @@ it('user click counter should increment', async () => {
     return <button onClick={onClick}>{ret()}</button>;
   }
 
-  const screen = render(() => <App />);
+  const store = createStore();
+  const screen = render(() => (
+    <StoreProvider value={store}>
+      <App />
+    </StoreProvider>
+  ));
   const button = screen.getByText('0');
   expect(button).toBeInTheDocument();
 
@@ -72,11 +87,16 @@ it('two atom changes should re-render once', async () => {
     return <div>{ret1() + ret2()}</div>;
   }
 
-  const screen = render(() => <App />);
+  const store = createDebugStore();
+  const screen = render(() => (
+    <StoreProvider value={store}>
+      <App />
+    </StoreProvider>
+  ));
   expect(screen.getByText('0')).toBeInTheDocument();
 
-  getDefaultStore().set(state1$, 1);
-  getDefaultStore().set(state2$, 2);
+  store.set(state1$, 1);
+  store.set(state2$, 2);
   await Promise.resolve();
   expect(screen.getByText('3')).toBeInTheDocument();
 });
@@ -103,7 +123,12 @@ it('async callback will trigger rerender', async () => {
     );
   }
 
-  const screen = render(() => <App />);
+  const store = createDebugStore();
+  const screen = render(() => (
+    <StoreProvider value={store}>
+      <App />
+    </StoreProvider>
+  ));
   const button = screen.getByText('0');
   expect(button).toBeInTheDocument();
 
@@ -126,7 +151,12 @@ it('floating promise trigger rerender', async () => {
     return <button onClick={onClick}>{val()}</button>;
   }
 
-  const screen = render(() => <App />);
+  const store = createDebugStore();
+  const screen = render(() => (
+    <StoreProvider value={store}>
+      <App />
+    </StoreProvider>
+  ));
   const button = screen.getByText('0');
   expect(button).toBeInTheDocument();
 
@@ -135,17 +165,17 @@ it('floating promise trigger rerender', async () => {
   expect(await screen.findByText('1')).toBeInTheDocument();
 });
 
-it('should use default store if no provider', () => {
+it('should throw Error store if no provider', () => {
   const count$ = state(0);
-  getDefaultStore().set(count$, 10);
 
   function App() {
     const count = useGet(count$);
     return <div>{count()}</div>;
   }
 
-  const screen = render(() => <App />);
-  expect(screen.getByText('10')).toBeInTheDocument();
+  expect(() => {
+    render(() => <App />);
+  }).toThrowError('useStore must be used within a StoreProvider');
 });
 
 it('will unmount when component cleanup', async () => {
@@ -181,9 +211,9 @@ it('will unmount when component cleanup', async () => {
   ));
 
   const user = userEvent.setup();
-  expect(store.getSubscribeGraph()).toHaveLength(1);
+  expect(store.isMounted(base$)).toBeTruthy();
   const button = screen.getByText('hide');
   await user.click(button);
   expect(await screen.findByText('unmounted')).toBeInTheDocument();
-  expect(store.getSubscribeGraph()).toHaveLength(0);
+  expect(store.isMounted(base$)).toBeFalsy();
 });

package/src/provider.ts

@@ -1,5 +1,4 @@
 import { createContext, useContext } from 'solid-js';
-import { getDefaultStore } from 'ccstate';
 import type { Store } from 'ccstate';
 
 const StoreContext = createContext<Store | null>(null);
@@ -10,7 +9,7 @@ export function useStore(): Store {
   const store = useContext(StoreContext);
 
   if (!store) {
-    return getDefaultStore();
+    throw new Error('useStore must be used within a StoreProvider');
   }
 
   return store;

package/src/useGet.ts

@@ -1,20 +1,24 @@
 import { useStore } from './provider';
-import { command, type Computed, type State } from 'ccstate';
+import { type Computed, type State } from 'ccstate';
 import { createSignal, onCleanup } from 'solid-js';
 
-export function useGet<T>(atom: State<T> | Computed<T>) {
+export function useGet<T>(signal$: State<T> | Computed<T>) {
   const store = useStore();
-  const [value, setValue] = createSignal<T>(store.get(atom));
+  const [value, setValue] = createSignal<T>(store.get(signal$));
 
-  const unsub = store.sub(
-    atom,
-    command(() => {
-      setValue(() => store.get(atom));
-    }),
+  const controller = new AbortController();
+
+  store.watch(
+    (get) => {
+      setValue(() => get(signal$));
+    },
+    {
+      signal: controller.signal,
+    },
   );
 
   onCleanup(() => {
-    unsub();
+    controller.abort();
   });
 
   return value;

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 e7h4n
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN EFFECT OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.