cross-state 0.33.6 → 0.33.8

package/README.md

@@ -5,18 +5,186 @@ State library for frontend and backend. With React bindings.
 
 # Getting started
 
-### Install
+## Install
 
 ```
 npm install cross-state
 ```
 
+## The basics
+
+cross-state provides a number of tools to manage state in your application.
+The most important building blocks are: stores (`createStore`) for global state and caches (`createCache`) for e.g. wrapping api calls.
+They can be used in any JavaScript environment and are not tied to any specific framework.
+React bindings are provided and can be used to easily integrate cross-state in your ui.
+
+### React bindings
+
+You can use cross-state with React by importing the respective hooks - e.g. `useStore`.
+
+```tsx
+import { useStore } from 'cross-state/react';
+
+function Counter() {
+  const counter = useStore(store, (state) => state.counter); // with or without selector
+  return <div>{counter}</div>;
+}
+```
+
+Or you can register the react bindings with the Store and Cache prototypes.
+
+```tsx
+// Somewhere in your app setup
+import 'cross-state/react/register';
+
+function Counter() {
+  const counter = store.useStore((state) => state.counter); // with or without selector
+  return <div>{counter}</div>;
+}
+```
+
+## Stores
+
 ### Create a store
 
-```ts
-import { createStore } from 'cross-state';
+The state can be any value, e.g. a number, an object or an array.
 
+```ts
 export const store = createStore({
   counter: 0,
 });
 ```
+
+### Get the current state
+
+```ts
+const state = store.get();
+```
+
+### Update the store
+
+Pass in a new state or a function that updates the current state.
+
+```ts
+store.set((state) => ({
+  counter: state.counter + 1,
+}));
+```
+
+### Subscribe to changes
+
+```ts
+const cancel = store.subscribe((state) => {
+  console.log('New state:', state);
+});
+
+// Later, to unsubscribe
+cancel();
+```
+
+### Use the store in a React component
+
+```tsx
+function Counter() {
+  const state = store.useStore(); // without selector - be careful with this, as it will rerender on every state change
+  const counter1 = store.useStore((state) => state.counter); // with selector - will only rerender when the selected value changes
+  const counter2 = store.useStore('counter'); // with string selector
+
+  return (
+    <div>
+      <div>{state.counter}</div>
+      <div>{counter1}</div>
+      <div>{counter2}</div>
+    </div>
+  );
+}
+```
+
+### Use the store in a React component with an update function
+
+```tsx
+function Counter() {
+  const [value, setValue] = store.useProp('counter');
+
+  return (
+    <div>
+      <div>{value}</div>
+      <button onClick={() => setValue((value) => value + 1)}>Increment</button>
+    </div>
+  );
+}
+```
+
+## Caches
+
+### Create a cache
+
+```ts
+export const user = createCache(
+  async (org: string, id: string) => {
+    const response = await fetch(`https://api.example.com/${org}/${id}`);
+    const user: User = response.json();
+    return user;
+  },
+  {
+    invalidateAfter: { minutes: 10 }, // automatically invalidate the cache after 10 minutes
+  },
+);
+```
+
+- `invalidateAfter: Duration | ((state: ValueState<T> | ErrorState) => Duration | null) | null;` - automatically invalidate the cache after a certain duration. You can also provide a function that returns a duration or null based on the current state of the cache:
+
+```ts
+export const cache = createCache([...],
+  {
+    invalidateAfter(({ status, value, error }) => {
+      if (status === 'error') {
+        return { minutes: 5 };
+      }
+
+      return value.expiresAt - Date.now();
+    }),
+    },
+  },
+);
+```
+
+### Use the cache
+
+```ts
+const data = await cache('users', '123');
+```
+
+### Use the cache in a React component
+
+```tsx
+function User({ org, id }: { org: string; id: string }) {
+  const [user, error, isLoading] = user(org, id).useCache();
+
+  if (isLoading) {
+    return <div>Loading...</div>;
+  }
+
+  if (error) {
+    return <div>Error: {error.message}</div>;
+  }
+
+  return <div>{user.name}</div>;
+}
+```
+
+### Cache without parameters
+
+When the cache does not have parameters or only optional parameters, you can use the cache without the parantheses.
+
+```ts
+const cache = createCache(async () => {
+  return await fetch('https://api.example.com');
+});
+
+const data = await cache.useCache(); // equivalent to cache().useCache()
+
+// or in a React component
+
+const [data, error, isLoading] = cache.useCache();
+```

package/dist/cjs/cache.cjs

@@ -122,6 +122,7 @@ class Cache extends store.Store {
     store.autobind(Cache);
     this.watchPromise();
     this.watchFocus();
+    this.state.addEffect(() => this.subscribe(() => void 0));
   }
   get({ update = "whenStale", backgroundUpdate = false } = {}) {
     var _a, _b;
@@ -276,7 +277,7 @@ class Cache extends store.Store {
         document.removeEventListener("visibilitychange", onFocus);
         return;
       }
-      if (!document.hidden) {
+      if (!document.hidden && !that.state.get().isConnected) {
         that.invalidate();
       }
     };

package/dist/cjs/cache.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"cache.cjs","sources":["../../src/lib/instanceCache.ts","../../src/core/resourceGroup.ts","../../src/core/cache.ts"],"sourcesContent":["import { hash } from './hash';\n\nexport class InstanceCache<Args extends any[], T extends object> {\n  private cache = new Map<string, { t: number; ref?: T; weakRef: WeakRef<T> }>();\n\n  private interval = this.cacheTime\n    ? setInterval(() => this.cleanup(), Math.max(this.cacheTime / 10, 1))\n    : undefined;\n\n  constructor(public readonly factory: (...args: Args) => T, public readonly cacheTime?: number) {}\n\n  cleanup() {\n    const cutoff = this.now() - (this.cacheTime ?? 0);\n\n    for (const [key, entry] of this.cache.entries()) {\n      if (entry.ref && entry.t <= cutoff) {\n        delete entry.ref;\n      }\n\n      if (!entry.ref && !entry.weakRef?.deref()) {\n        this.cache.delete(key);\n      }\n    }\n  }\n\n  get(...args: Args) {\n    const key = hash(args);\n    let entry = this.cache.get(key);\n    let value = entry?.ref ?? entry?.weakRef?.deref();\n\n    if (!entry || !value) {\n      value = this.factory(...args);\n      entry = {\n        t: this.now(),\n        ref: value,\n        weakRef: new WeakRef(value),\n      };\n\n      this.cache.set(key, entry);\n    } else {\n      entry.t = this.now();\n      entry.ref ??= value;\n    }\n\n    return value;\n  }\n\n  values() {\n    return [...this.cache.values()]\n      .map((entry) => entry.ref ?? entry.weakRef?.deref())\n      .filter((value): value is T => !!value);\n  }\n\n  stop() {\n    if (this.interval) {\n      clearInterval(this.interval);\n    }\n  }\n\n  stats() {\n    return {\n      count: this.cache.size,\n      withRef: [...this.cache.values()].filter((x) => !!x.ref).length,\n      withWeakRef: [...this.cache.values()].filter((x) => !!x.weakRef?.deref()).length,\n    };\n  }\n\n  private now() {\n    return performance.now();\n  }\n}\n","import { autobind } from '@lib/autobind';\n\nexport interface Resource {\n  invalidateAll(): void;\n  clearAll(): void;\n}\n\nexport class ResourceGroup {\n  private refMap = new WeakMap<Resource, WeakRef<Resource>>();\n\n  private refSet = new Set<WeakRef<Resource>>();\n\n  constructor(public readonly name?: string) {\n    autobind(ResourceGroup);\n  }\n\n  add(resource: Resource) {\n    const ref = new WeakRef(resource);\n    this.refMap.set(resource, ref);\n    this.refSet.add(ref);\n  }\n\n  delete(resource: Resource) {\n    const ref = this.refMap.get(resource);\n    if (ref) {\n      this.refMap.delete(resource);\n      this.refSet.delete(ref);\n    }\n  }\n\n  invalidateAll() {\n    for (const ref of this.refSet) {\n      const resource = ref.deref();\n      if (resource) {\n        resource.invalidateAll();\n      } else {\n        this.refSet.delete(ref);\n      }\n    }\n  }\n\n  clearAll() {\n    for (const ref of this.refSet) {\n      const resource = ref.deref();\n      if (resource) {\n        resource.clearAll();\n      } else {\n        this.refSet.delete(ref);\n      }\n    }\n  }\n}\n\nexport const allResources = /* @__PURE__ */ new ResourceGroup();\n\nexport function createResourceGroup(name?: string) {\n  return new ResourceGroup(name);\n}\n","import { autobind } from '@lib/autobind';\nimport type { CacheState, ErrorState, ValueState } from '@lib/cacheState';\nimport { calcDuration } from '@lib/calcDuration';\nimport { calculatedValue } from '@lib/calculatedValue';\nimport { InstanceCache } from '@lib/instanceCache';\nimport { makeSelector } from '@lib/makeSelector';\nimport { type MaybePromise } from '@lib/maybePromise';\nimport type { Path, Value } from '@lib/path';\nimport { PromiseWithState } from '@lib/promiseWithState';\nimport type { Duration, Selector } from './commonTypes';\nimport { allResources, type ResourceGroup } from './resourceGroup';\nimport { Store, createStore, type Calculate, type StoreOptions } from './store';\n\nexport interface CacheGetOptions {\n  update?: 'whenMissing' | 'whenStale' | 'force';\n  backgroundUpdate?: boolean;\n}\n\nexport interface CacheFunction<T, Args extends any[] = []> {\n  (...args: Args): Promise<T> | Calculate<Promise<T>>;\n}\n\nexport interface CacheOptions<T> extends StoreOptions {\n  invalidateAfter?: Duration | ((state: ValueState<T> | ErrorState) => Duration | null) | null;\n  invalidateOnWindowFocus?: boolean;\n  invalidateOnActivation?: boolean;\n  clearOnInvalidate?: boolean;\n  clearUnusedAfter?: Duration | null;\n  resourceGroup?: ResourceGroup | ResourceGroup[];\n}\n\nexport class Cache<T> extends Store<Promise<T>> {\n  readonly state = createStore<CacheState<T>>({\n    status: 'pending',\n    isStale: true,\n    isUpdating: false,\n    isConnected: false,\n  });\n\n  protected stalePromise?: Promise<T>;\n\n  protected invalidationTimer?: ReturnType<typeof setTimeout>;\n\n  constructor(\n    getter: Calculate<Promise<T>>,\n    public readonly options: CacheOptions<T> = {},\n    public readonly derivedFromCache?: {\n      cache: Cache<any>;\n      selectors: (Selector<any, any> | Path<any>)[];\n    },\n    _call?: (...args: any[]) => any,\n  ) {\n    super(getter, options, undefined, _call);\n    autobind(Cache);\n\n    this.watchPromise();\n    this.watchFocus();\n  }\n\n  get({ update = 'whenStale', backgroundUpdate = false }: CacheGetOptions = {}) {\n    const promise = this.calculatedValue?.value;\n    const stalePromise = this.stalePromise;\n\n    if (\n      (update === 'whenMissing' && !promise && !stalePromise) ||\n      (update === 'whenStale' && !promise) ||\n      update === 'force'\n    ) {\n      this.calculatedValue?.stop();\n      this.calculatedValue = calculatedValue(this, this.notify);\n      this.notify();\n\n      if ((!promise && !stalePromise) || !backgroundUpdate) {\n        return super.get();\n      }\n    }\n\n    if (!promise || (stalePromise && backgroundUpdate)) {\n      return stalePromise!;\n    }\n\n    return promise;\n  }\n\n  updateValue(value: MaybePromise<T>) {\n    this.set(PromiseWithState.resolve(value));\n  }\n\n  updateError(error: unknown) {\n    this.set(PromiseWithState.reject(error));\n  }\n\n  invalidate(recursive?: boolean) {\n    const { clearOnInvalidate } = this.options;\n\n    if (clearOnInvalidate) {\n      return this.clear(recursive);\n    }\n\n    const { status, isStale, isUpdating } = this.state.get();\n    if (status !== 'pending' && !isStale && !isUpdating) {\n      this.stalePromise = this.calculatedValue?.value;\n    }\n\n    this.state.set((state) => ({\n      ...state,\n      isStale: true,\n      isUpdating: false,\n    }));\n\n    super.invalidate(recursive);\n  }\n\n  clear(recursive?: boolean): void {\n    this.state.set({\n      status: 'pending',\n      isStale: true,\n      isUpdating: false,\n      isConnected: false,\n    });\n    delete this.stalePromise;\n\n    super.invalidate(recursive);\n  }\n\n  mapValue<S>(selector: Selector<T, S>): Cache<S>;\n\n  mapValue<P extends Path<T>>(selector: P): Cache<Value<T, P>>;\n\n  mapValue<S>(_selector: Selector<T, S> | Path<any>): Cache<S> {\n    const selector = makeSelector(_selector);\n    const derivedFromCache = {\n      cache: this.derivedFromCache ? this.derivedFromCache.cache : this,\n      selectors: this.derivedFromCache\n        ? [...this.derivedFromCache.selectors, _selector]\n        : [_selector],\n    };\n\n    return new Cache(\n      async ({ use }) => {\n        const value = await use(this);\n        return selector(value);\n      },\n      {},\n      derivedFromCache,\n    );\n  }\n\n  protected watchPromise() {\n    this.subscribe(\n      async (promise) => {\n        if (promise instanceof PromiseWithState) {\n          this.state.set((state) => ({\n            ...promise.state,\n            isStale: false,\n            isUpdating: false,\n            isConnected: state.isConnected,\n          }));\n\n          delete this.stalePromise;\n          this.setTimers();\n          return;\n        }\n\n        this.state.set((state) => ({\n          ...state,\n          isUpdating: true,\n        }));\n\n        this.setTimers();\n\n        try {\n          const value = await promise;\n\n          if (promise !== this.calculatedValue?.value) {\n            return;\n          }\n\n          this.state.set((state) => ({\n            status: 'value',\n            value,\n            isStale: false,\n            isUpdating: false,\n            isConnected: state.isConnected,\n          }));\n          delete this.stalePromise;\n          this.setTimers();\n        } catch (error) {\n          if (promise !== this.calculatedValue?.value) {\n            return;\n          }\n\n          this.state.set((state) => ({\n            status: 'error',\n            error,\n            isStale: false,\n            isUpdating: false,\n            isConnected: state.isConnected,\n          }));\n          delete this.stalePromise;\n          this.setTimers();\n        }\n      },\n      { passive: true },\n    );\n  }\n\n  protected setTimers() {\n    if (this.invalidationTimer) {\n      clearTimeout(this.invalidationTimer);\n    }\n    this.invalidationTimer = undefined;\n\n    const state = this.state.get();\n    let { invalidateAfter } = this.options;\n    const ref = new WeakRef(this);\n\n    if (state.status === 'pending') {\n      return;\n    }\n\n    if (invalidateAfter instanceof Function) {\n      invalidateAfter = invalidateAfter(state);\n    }\n\n    if (invalidateAfter !== null && invalidateAfter !== undefined) {\n      this.invalidationTimer = setTimeout(\n        () => ref?.deref()?.invalidate(),\n        calcDuration(invalidateAfter),\n      );\n    }\n  }\n\n  protected watchFocus() {\n    const { invalidateOnWindowFocus } = this.options;\n\n    if (\n      !invalidateOnWindowFocus ||\n      typeof document === 'undefined' ||\n      typeof document.addEventListener === 'undefined'\n    ) {\n      return;\n    }\n\n    const ref = new WeakRef(this);\n\n    const onFocus = () => {\n      const that = ref?.deref();\n      if (!that) {\n        document.removeEventListener('visibilitychange', onFocus);\n        return;\n      }\n\n      if (!document.hidden) {\n        that.invalidate();\n      }\n    };\n\n    document.addEventListener('visibilitychange', onFocus);\n  }\n}\n\ntype CreateReturnType<T, Args extends any[]> = {\n  (...args: Args): Cache<T>;\n  invalidateAll: () => void;\n  clearAll: () => void;\n} & ([] extends Args ? Cache<T> : {});\n\nfunction create<T, Args extends any[] = []>(\n  cacheFunction: CacheFunction<T, Args>,\n  options?: CacheOptions<T>,\n): CreateReturnType<T, Args> {\n  options = { ...createCache.defaultOptions, ...options };\n  const { clearUnusedAfter, resourceGroup } = options ?? {};\n\n  let baseInstance: CreateReturnType<T, Args> & Cache<T>;\n\n  const instanceCache = new InstanceCache<Args, Cache<T>>(\n    (...args: Args): Cache<T> => {\n      if (args.length === 0 && baseInstance) {\n        return baseInstance;\n      }\n\n      return new Cache((helpers) => {\n        const result = cacheFunction.apply(helpers, args);\n\n        if (result instanceof Function) {\n          return result(helpers);\n        }\n\n        return result;\n      }, options);\n    },\n    clearUnusedAfter ? calcDuration(clearUnusedAfter) : undefined,\n  );\n\n  const get = (...args: Args) => {\n    return instanceCache.get(...args);\n  };\n\n  const invalidateAll = () => {\n    for (const instance of instanceCache.values()) {\n      instance.invalidate();\n    }\n  };\n\n  const clearAll = () => {\n    for (const instance of instanceCache.values()) {\n      instance.clear();\n    }\n  };\n\n  baseInstance = Object.assign(\n    new Cache(\n      (helpers) => {\n        const result = cacheFunction.apply(helpers);\n\n        if (result instanceof Function) {\n          return result(helpers);\n        }\n\n        return result;\n      },\n      options,\n      undefined,\n      get,\n    ),\n    {\n      invalidateAll,\n      clearAll,\n    },\n  ) as CreateReturnType<T, Args> & Cache<T>;\n\n  const groups = Array.isArray(resourceGroup)\n    ? resourceGroup\n    : resourceGroup\n      ? [resourceGroup]\n      : [];\n  for (const group of groups.concat(allResources)) {\n    group.add(baseInstance);\n  }\n\n  get(...([] as any));\n\n  return baseInstance;\n}\n\nexport const createCache = /* @__PURE__ */ Object.assign(create, {\n  defaultOptions: {\n    invalidateOnWindowFocus: true,\n    invalidateOnActivation: true,\n    clearUnusedAfter: { days: 1 },\n    retain: { seconds: 1 },\n  } as CacheOptions<unknown>,\n});\n"],"names":["hash","autobind","Store","createStore","calculatedValue","PromiseWithState","makeSelector","calcDuration"],"mappings":"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"}
+{"version":3,"file":"cache.cjs","sources":["../../src/lib/instanceCache.ts","../../src/core/resourceGroup.ts","../../src/core/cache.ts"],"sourcesContent":["import { hash } from './hash';\n\nexport class InstanceCache<Args extends any[], T extends object> {\n  private cache = new Map<string, { t: number; ref?: T; weakRef: WeakRef<T> }>();\n\n  private interval = this.cacheTime\n    ? setInterval(() => this.cleanup(), Math.max(this.cacheTime / 10, 1))\n    : undefined;\n\n  constructor(public readonly factory: (...args: Args) => T, public readonly cacheTime?: number) {}\n\n  cleanup() {\n    const cutoff = this.now() - (this.cacheTime ?? 0);\n\n    for (const [key, entry] of this.cache.entries()) {\n      if (entry.ref && entry.t <= cutoff) {\n        delete entry.ref;\n      }\n\n      if (!entry.ref && !entry.weakRef?.deref()) {\n        this.cache.delete(key);\n      }\n    }\n  }\n\n  get(...args: Args) {\n    const key = hash(args);\n    let entry = this.cache.get(key);\n    let value = entry?.ref ?? entry?.weakRef?.deref();\n\n    if (!entry || !value) {\n      value = this.factory(...args);\n      entry = {\n        t: this.now(),\n        ref: value,\n        weakRef: new WeakRef(value),\n      };\n\n      this.cache.set(key, entry);\n    } else {\n      entry.t = this.now();\n      entry.ref ??= value;\n    }\n\n    return value;\n  }\n\n  values() {\n    return [...this.cache.values()]\n      .map((entry) => entry.ref ?? entry.weakRef?.deref())\n      .filter((value): value is T => !!value);\n  }\n\n  stop() {\n    if (this.interval) {\n      clearInterval(this.interval);\n    }\n  }\n\n  stats() {\n    return {\n      count: this.cache.size,\n      withRef: [...this.cache.values()].filter((x) => !!x.ref).length,\n      withWeakRef: [...this.cache.values()].filter((x) => !!x.weakRef?.deref()).length,\n    };\n  }\n\n  private now() {\n    return performance.now();\n  }\n}\n","import { autobind } from '@lib/autobind';\n\nexport interface Resource {\n  invalidateAll(): void;\n  clearAll(): void;\n}\n\nexport class ResourceGroup {\n  private refMap = new WeakMap<Resource, WeakRef<Resource>>();\n\n  private refSet = new Set<WeakRef<Resource>>();\n\n  constructor(public readonly name?: string) {\n    autobind(ResourceGroup);\n  }\n\n  add(resource: Resource) {\n    const ref = new WeakRef(resource);\n    this.refMap.set(resource, ref);\n    this.refSet.add(ref);\n  }\n\n  delete(resource: Resource) {\n    const ref = this.refMap.get(resource);\n    if (ref) {\n      this.refMap.delete(resource);\n      this.refSet.delete(ref);\n    }\n  }\n\n  invalidateAll() {\n    for (const ref of this.refSet) {\n      const resource = ref.deref();\n      if (resource) {\n        resource.invalidateAll();\n      } else {\n        this.refSet.delete(ref);\n      }\n    }\n  }\n\n  clearAll() {\n    for (const ref of this.refSet) {\n      const resource = ref.deref();\n      if (resource) {\n        resource.clearAll();\n      } else {\n        this.refSet.delete(ref);\n      }\n    }\n  }\n}\n\nexport const allResources = /* @__PURE__ */ new ResourceGroup();\n\nexport function createResourceGroup(name?: string) {\n  return new ResourceGroup(name);\n}\n","import { autobind } from '@lib/autobind';\nimport type { CacheState, ErrorState, ValueState } from '@lib/cacheState';\nimport { calcDuration } from '@lib/calcDuration';\nimport { calculatedValue } from '@lib/calculatedValue';\nimport { InstanceCache } from '@lib/instanceCache';\nimport { makeSelector } from '@lib/makeSelector';\nimport { type MaybePromise } from '@lib/maybePromise';\nimport type { Path, Value } from '@lib/path';\nimport { PromiseWithState } from '@lib/promiseWithState';\nimport type { Duration, Selector } from './commonTypes';\nimport { allResources, type ResourceGroup } from './resourceGroup';\nimport { Store, createStore, type Calculate, type StoreOptions } from './store';\n\nexport interface CacheGetOptions {\n  update?: 'whenMissing' | 'whenStale' | 'force';\n  backgroundUpdate?: boolean;\n}\n\nexport interface CacheFunction<T, Args extends any[] = []> {\n  (...args: Args): Promise<T> | Calculate<Promise<T>>;\n}\n\nexport interface CacheOptions<T> extends StoreOptions {\n  invalidateAfter?: Duration | ((state: ValueState<T> | ErrorState) => Duration | null) | null;\n  invalidateOnWindowFocus?: boolean;\n  invalidateOnActivation?: boolean;\n  clearOnInvalidate?: boolean;\n  clearUnusedAfter?: Duration | null;\n  resourceGroup?: ResourceGroup | ResourceGroup[];\n}\n\nexport class Cache<T> extends Store<Promise<T>> {\n  readonly state = createStore<CacheState<T>>({\n    status: 'pending',\n    isStale: true,\n    isUpdating: false,\n    isConnected: false,\n  });\n\n  protected stalePromise?: Promise<T>;\n\n  protected invalidationTimer?: ReturnType<typeof setTimeout>;\n\n  constructor(\n    getter: Calculate<Promise<T>>,\n    public readonly options: CacheOptions<T> = {},\n    public readonly derivedFromCache?: {\n      cache: Cache<any>;\n      selectors: (Selector<any, any> | Path<any>)[];\n    },\n    _call?: (...args: any[]) => any,\n  ) {\n    super(getter, options, undefined, _call);\n    autobind(Cache);\n\n    this.watchPromise();\n    this.watchFocus();\n\n    this.state.addEffect(() => this.subscribe(() => undefined));\n  }\n\n  get({ update = 'whenStale', backgroundUpdate = false }: CacheGetOptions = {}) {\n    const promise = this.calculatedValue?.value;\n    const stalePromise = this.stalePromise;\n\n    if (\n      (update === 'whenMissing' && !promise && !stalePromise) ||\n      (update === 'whenStale' && !promise) ||\n      update === 'force'\n    ) {\n      this.calculatedValue?.stop();\n      this.calculatedValue = calculatedValue(this, this.notify);\n      this.notify();\n\n      if ((!promise && !stalePromise) || !backgroundUpdate) {\n        return super.get();\n      }\n    }\n\n    if (!promise || (stalePromise && backgroundUpdate)) {\n      return stalePromise!;\n    }\n\n    return promise;\n  }\n\n  updateValue(value: MaybePromise<T>) {\n    this.set(PromiseWithState.resolve(value));\n  }\n\n  updateError(error: unknown) {\n    this.set(PromiseWithState.reject(error));\n  }\n\n  invalidate(recursive?: boolean) {\n    const { clearOnInvalidate } = this.options;\n\n    if (clearOnInvalidate) {\n      return this.clear(recursive);\n    }\n\n    const { status, isStale, isUpdating } = this.state.get();\n    if (status !== 'pending' && !isStale && !isUpdating) {\n      this.stalePromise = this.calculatedValue?.value;\n    }\n\n    this.state.set((state) => ({\n      ...state,\n      isStale: true,\n      isUpdating: false,\n    }));\n\n    super.invalidate(recursive);\n  }\n\n  clear(recursive?: boolean): void {\n    this.state.set({\n      status: 'pending',\n      isStale: true,\n      isUpdating: false,\n      isConnected: false,\n    });\n    delete this.stalePromise;\n\n    super.invalidate(recursive);\n  }\n\n  mapValue<S>(selector: Selector<T, S>): Cache<S>;\n\n  mapValue<P extends Path<T>>(selector: P): Cache<Value<T, P>>;\n\n  mapValue<S>(_selector: Selector<T, S> | Path<any>): Cache<S> {\n    const selector = makeSelector(_selector);\n    const derivedFromCache = {\n      cache: this.derivedFromCache ? this.derivedFromCache.cache : this,\n      selectors: this.derivedFromCache\n        ? [...this.derivedFromCache.selectors, _selector]\n        : [_selector],\n    };\n\n    return new Cache(\n      async ({ use }) => {\n        const value = await use(this);\n        return selector(value);\n      },\n      {},\n      derivedFromCache,\n    );\n  }\n\n  protected watchPromise() {\n    this.subscribe(\n      async (promise) => {\n        if (promise instanceof PromiseWithState) {\n          this.state.set((state) => ({\n            ...promise.state,\n            isStale: false,\n            isUpdating: false,\n            isConnected: state.isConnected,\n          }));\n\n          delete this.stalePromise;\n          this.setTimers();\n          return;\n        }\n\n        this.state.set((state) => ({\n          ...state,\n          isUpdating: true,\n        }));\n\n        this.setTimers();\n\n        try {\n          const value = await promise;\n\n          if (promise !== this.calculatedValue?.value) {\n            return;\n          }\n\n          this.state.set((state) => ({\n            status: 'value',\n            value,\n            isStale: false,\n            isUpdating: false,\n            isConnected: state.isConnected,\n          }));\n          delete this.stalePromise;\n          this.setTimers();\n        } catch (error) {\n          if (promise !== this.calculatedValue?.value) {\n            return;\n          }\n\n          this.state.set((state) => ({\n            status: 'error',\n            error,\n            isStale: false,\n            isUpdating: false,\n            isConnected: state.isConnected,\n          }));\n          delete this.stalePromise;\n          this.setTimers();\n        }\n      },\n      { passive: true },\n    );\n  }\n\n  protected setTimers() {\n    if (this.invalidationTimer) {\n      clearTimeout(this.invalidationTimer);\n    }\n    this.invalidationTimer = undefined;\n\n    const state = this.state.get();\n    let { invalidateAfter } = this.options;\n    const ref = new WeakRef(this);\n\n    if (state.status === 'pending') {\n      return;\n    }\n\n    if (invalidateAfter instanceof Function) {\n      invalidateAfter = invalidateAfter(state);\n    }\n\n    if (invalidateAfter !== null && invalidateAfter !== undefined) {\n      this.invalidationTimer = setTimeout(\n        () => ref?.deref()?.invalidate(),\n        calcDuration(invalidateAfter),\n      );\n    }\n  }\n\n  protected watchFocus() {\n    const { invalidateOnWindowFocus } = this.options;\n\n    if (\n      !invalidateOnWindowFocus ||\n      typeof document === 'undefined' ||\n      typeof document.addEventListener === 'undefined'\n    ) {\n      return;\n    }\n\n    const ref = new WeakRef(this);\n\n    const onFocus = () => {\n      const that = ref?.deref();\n      if (!that) {\n        document.removeEventListener('visibilitychange', onFocus);\n        return;\n      }\n\n      if (!document.hidden && !that.state.get().isConnected) {\n        that.invalidate();\n      }\n    };\n\n    document.addEventListener('visibilitychange', onFocus);\n  }\n}\n\ntype CreateReturnType<T, Args extends any[]> = {\n  (...args: Args): Cache<T>;\n  invalidateAll: () => void;\n  clearAll: () => void;\n} & ([] extends Args ? Cache<T> : {});\n\nfunction create<T, Args extends any[] = []>(\n  cacheFunction: CacheFunction<T, Args>,\n  options?: CacheOptions<T>,\n): CreateReturnType<T, Args> {\n  options = { ...createCache.defaultOptions, ...options };\n  const { clearUnusedAfter, resourceGroup } = options ?? {};\n\n  let baseInstance: CreateReturnType<T, Args> & Cache<T>;\n\n  const instanceCache = new InstanceCache<Args, Cache<T>>(\n    (...args: Args): Cache<T> => {\n      if (args.length === 0 && baseInstance) {\n        return baseInstance;\n      }\n\n      return new Cache((helpers) => {\n        const result = cacheFunction.apply(helpers, args);\n\n        if (result instanceof Function) {\n          return result(helpers);\n        }\n\n        return result;\n      }, options);\n    },\n    clearUnusedAfter ? calcDuration(clearUnusedAfter) : undefined,\n  );\n\n  const get = (...args: Args) => {\n    return instanceCache.get(...args);\n  };\n\n  const invalidateAll = () => {\n    for (const instance of instanceCache.values()) {\n      instance.invalidate();\n    }\n  };\n\n  const clearAll = () => {\n    for (const instance of instanceCache.values()) {\n      instance.clear();\n    }\n  };\n\n  baseInstance = Object.assign(\n    new Cache(\n      (helpers) => {\n        const result = cacheFunction.apply(helpers);\n\n        if (result instanceof Function) {\n          return result(helpers);\n        }\n\n        return result;\n      },\n      options,\n      undefined,\n      get,\n    ),\n    {\n      invalidateAll,\n      clearAll,\n    },\n  ) as CreateReturnType<T, Args> & Cache<T>;\n\n  const groups = Array.isArray(resourceGroup)\n    ? resourceGroup\n    : resourceGroup\n      ? [resourceGroup]\n      : [];\n  for (const group of groups.concat(allResources)) {\n    group.add(baseInstance);\n  }\n\n  get(...([] as any));\n\n  return baseInstance;\n}\n\nexport const createCache = /* @__PURE__ */ Object.assign(create, {\n  defaultOptions: {\n    invalidateOnWindowFocus: true,\n    invalidateOnActivation: true,\n    clearUnusedAfter: { days: 1 },\n    retain: { seconds: 1 },\n  } as CacheOptions<unknown>,\n});\n"],"names":["hash","autobind","Store","createStore","calculatedValue","PromiseWithState","makeSelector","calcDuration"],"mappings":"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"}

package/dist/cjs/store.cjs

@@ -194,11 +194,11 @@ function calculatedValue(store, notify) {
   let value;
   const whenConnected = new Deferred();
   const whenExecuted = new Deferred();
-  let cancelConnection;
+  let connection;
   const q = queue();
   q(() => whenExecuted);
   const cancelEffect = store.addEffect(() => {
-    if (cancelConnection) {
+    if (connection) {
       store.invalidate();
       return;
     }
@@ -207,13 +207,18 @@ function calculatedValue(store, notify) {
       dep.on();
     }
     return () => {
+      var _a;
       active = false;
       for (const dep of deps) {
         dep.off();
       }
-      cancelConnection == null ? void 0 : cancelConnection();
-      if ("state" in store) {
-        store.state.set("isConnected", false);
+      if (connection) {
+        connection.active = false;
+        (_a = connection.cancel) == null ? void 0 : _a.call(connection);
+        q.clear();
+        if ("state" in store) {
+          store.state.set("isConnected", false);
+        }
       }
     };
   });
@@ -233,34 +238,40 @@ function calculatedValue(store, notify) {
     }
     return value2;
   }
-  async function connect(connection) {
+  async function connect(createConnection) {
     if (!active) {
       return;
     }
     const actions = {
       set(value2) {
-        q(() => {
+        (connection == null ? void 0 : connection.active) && q(() => {
           store.set(value2);
         });
       },
       updateValue(update) {
-        q(async () => {
+        (connection == null ? void 0 : connection.active) && q(async () => {
           if (update instanceof Function) {
             update = update(await value);
           }
           if (update instanceof Promise) {
             update = await update;
           }
+          if (!(connection == null ? void 0 : connection.active)) {
+            return;
+          }
           value = PromiseWithState.resolve(update);
           notify();
         });
       },
       updateError(error) {
-        q(() => {
+        (connection == null ? void 0 : connection.active) && q(() => {
           store.set(Promise.reject(error));
         });
       },
       updateIsConnected(isConnected) {
+        if (!(connection == null ? void 0 : connection.active)) {
+          return;
+        }
         if (isConnected) {
           whenConnected.resolve();
         }
@@ -271,10 +282,14 @@ function calculatedValue(store, notify) {
         });
       },
       close() {
-        store.invalidate();
+        (connection == null ? void 0 : connection.active) && store.invalidate();
       }
     };
-    cancelConnection = connection(actions);
+    connection = { active: true };
+    connection.cancel = createConnection(actions);
+    if (!connection.active) {
+      connection.cancel();
+    }
     return whenConnected;
   }
   value = store.getter instanceof Function ? store.getter({ use, connect }) : store.getter;
@@ -293,9 +308,12 @@ function calculatedValue(store, notify) {
     }
   }
   function stop() {
+    var _a;
     cancelEffect();
-    cancelConnection == null ? void 0 : cancelConnection();
-    if (cancelConnection) {
+    if (connection) {
+      connection.active = false;
+      (_a = connection.cancel) == null ? void 0 : _a.call(connection);
+      q.clear();
       whenConnected.reject();
       whenExecuted.reject();
     } else {
@@ -645,9 +663,13 @@ class Store extends Callable {
       debounce: debounceOption,
       equals = deepEqual
     } = options ?? {};
+    let isSetup = false;
     let previousValue;
     let innerListener = () => {
       var _a;
+      if (!isSetup) {
+        return;
+      }
       const value = passive ? this.calculatedValue : { value: this.get() };
       if (!value) {
         return;
@@ -672,6 +694,7 @@ class Store extends Callable {
     if (!passive) {
       this.onSubscribe();
     }
+    isSetup = true;
     if (runNow) {
       innerListener();
     } else {