cross-state 0.31.5 → 0.33.1

package/dist/cjs/cache.cjs

@@ -0,0 +1,381 @@
+"use strict";
+const store = require("./store.cjs");
+const scope = require("./scope.cjs");
+class ResourceGroup {
+  constructor(name) {
+    this.name = name;
+    this.refMap = /* @__PURE__ */ new WeakMap();
+    this.refSet = /* @__PURE__ */ new Set();
+    store.autobind(ResourceGroup);
+  }
+  add(resource) {
+    const ref = new WeakRef(resource);
+    this.refMap.set(resource, ref);
+    this.refSet.add(ref);
+  }
+  delete(resource) {
+    const ref = this.refMap.get(resource);
+    if (ref) {
+      this.refMap.delete(resource);
+      this.refSet.delete(ref);
+    }
+  }
+  invalidateAll() {
+    for (const ref of this.refSet) {
+      const resource = ref.deref();
+      if (resource) {
+        resource.invalidateAll();
+      } else {
+        this.refSet.delete(ref);
+      }
+    }
+  }
+  clearAll() {
+    for (const ref of this.refSet) {
+      const resource = ref.deref();
+      if (resource) {
+        resource.clearAll();
+      } else {
+        this.refSet.delete(ref);
+      }
+    }
+  }
+}
+const allResources = /* @__PURE__ */ new ResourceGroup();
+function createResourceGroup(name) {
+  return new ResourceGroup(name);
+}
+class InstanceCache {
+  constructor(factory, cacheTime) {
+    this.factory = factory;
+    this.cacheTime = cacheTime;
+    this.cache = /* @__PURE__ */ new Map();
+    this.interval = this.cacheTime ? setInterval(() => this.cleanup(), Math.max(this.cacheTime / 10, 1)) : void 0;
+  }
+  cleanup() {
+    var _a;
+    const cutoff = this.now() - (this.cacheTime ?? 0);
+    for (const [key, entry] of this.cache.entries()) {
+      if (entry.ref && entry.t <= cutoff) {
+        delete entry.ref;
+      }
+      if (!entry.ref && !((_a = entry.weakRef) == null ? void 0 : _a.deref())) {
+        this.cache.delete(key);
+      }
+    }
+  }
+  get(...args) {
+    var _a;
+    const key = scope.hash(args);
+    let entry = this.cache.get(key);
+    let value = (entry == null ? void 0 : entry.ref) ?? ((_a = entry == null ? void 0 : entry.weakRef) == null ? void 0 : _a.deref());
+    if (!entry || !value) {
+      value = this.factory(...args);
+      entry = {
+        t: this.now(),
+        ref: value,
+        weakRef: new WeakRef(value)
+      };
+      this.cache.set(key, entry);
+    } else {
+      entry.t = this.now();
+      entry.ref ?? (entry.ref = value);
+    }
+    return value;
+  }
+  values() {
+    return [...this.cache.values()].map((entry) => {
+      var _a;
+      return entry.ref ?? ((_a = entry.weakRef) == null ? void 0 : _a.deref());
+    }).filter((value) => !!value);
+  }
+  stop() {
+    if (this.interval) {
+      clearInterval(this.interval);
+    }
+  }
+  stats() {
+    return {
+      count: this.cache.size,
+      withRef: [...this.cache.values()].filter((x) => !!x.ref).length,
+      withWeakRef: [...this.cache.values()].filter((x) => {
+        var _a;
+        return !!((_a = x.weakRef) == null ? void 0 : _a.deref());
+      }).length
+    };
+  }
+  now() {
+    return performance.now();
+  }
+}
+class PromiseWithState extends Promise {
+  constructor(value, state = { status: "pending" }) {
+    super((resolve) => resolve(value));
+    this.state = state;
+    value.then((value2) => {
+      this.state = { status: "value", value: value2 };
+    }).catch((error) => {
+      this.state = { status: "error", error };
+    });
+  }
+  static resolve(value) {
+    return new PromiseWithState(Promise.resolve(value), {
+      status: "value",
+      value
+    });
+  }
+  static reject(error) {
+    return new PromiseWithState(Promise.reject(error), { status: "error", error });
+  }
+}
+class Cache extends store.Store {
+  constructor(getter, options = {}, derivedFromCache, _call) {
+    super(
+      function() {
+        let result = getter.apply(this);
+        if (result instanceof Function) {
+          result = result(this);
+        }
+        return result;
+      },
+      options,
+      void 0,
+      _call
+    );
+    this.options = options;
+    this.derivedFromCache = derivedFromCache;
+    this.state = store.createStore({
+      status: "pending",
+      isStale: true,
+      isUpdating: false
+    });
+    store.autobind(Cache);
+    this.calculationHelper.options.onInvalidate = () => this.invalidate({ invalidateDependencies: false });
+    this.watchPromise();
+    this.watchFocus();
+  }
+  get({ update = "whenStale", backgroundUpdate = false } = {}) {
+    var _a;
+    const promise = (_a = this._value) == null ? void 0 : _a.v;
+    const stalePromise = this.stalePromise;
+    if (update === "whenMissing" && !promise && !stalePromise || update === "whenStale" && !promise || update === "force") {
+      this.calculationHelper.execute();
+      if (!promise && !stalePromise || !backgroundUpdate) {
+        return super.get();
+      }
+    }
+    if (!promise || stalePromise && backgroundUpdate) {
+      return stalePromise;
+    }
+    return promise;
+  }
+  updateValue(value) {
+    this.set(PromiseWithState.resolve(value));
+  }
+  updateError(error) {
+    this.set(PromiseWithState.reject(error));
+  }
+  invalidate({ invalidateDependencies = true } = {}) {
+    var _a;
+    const { clearOnInvalidate = createCache.defaultOptions.clearOnInvalidate } = this.options;
+    if (clearOnInvalidate) {
+      return this.clear({ invalidateDependencies });
+    }
+    if (invalidateDependencies) {
+      this.calculationHelper.invalidateDependencies();
+    }
+    const { status, isStale, isUpdating } = this.state.get();
+    if (status !== "pending" && !isStale && !isUpdating) {
+      this.stalePromise = (_a = this._value) == null ? void 0 : _a.v;
+    }
+    this.state.set((state) => ({
+      ...state,
+      isStale: true,
+      isUpdating: false
+    }));
+    this.calculationHelper.stop();
+    super.reset();
+  }
+  clear({ invalidateDependencies = true } = {}) {
+    if (invalidateDependencies) {
+      this.calculationHelper.invalidateDependencies();
+    }
+    this.state.set({
+      status: "pending",
+      isStale: true,
+      isUpdating: false
+    });
+    delete this.stalePromise;
+    this.calculationHelper.stop();
+    super.reset();
+  }
+  mapValue(_selector) {
+    const selector = store.makeSelector(_selector);
+    const derivedFromCache = {
+      cache: this.derivedFromCache ? this.derivedFromCache.cache : this,
+      selectors: this.derivedFromCache ? [...this.derivedFromCache.selectors, _selector] : [_selector]
+    };
+    const that = this;
+    return new Cache(
+      async function() {
+        const value = await this.use(that);
+        return selector(value);
+      },
+      {},
+      derivedFromCache
+    );
+  }
+  watchPromise() {
+    this.subscribe(
+      async (promise) => {
+        var _a, _b;
+        if (promise instanceof PromiseWithState) {
+          this.state.set({
+            ...promise.state,
+            isStale: false,
+            isUpdating: false
+          });
+          delete this.stalePromise;
+          this.setTimers();
+          return;
+        }
+        this.state.set((state) => ({
+          ...state,
+          isUpdating: true
+        }));
+        this.setTimers();
+        try {
+          const value = await promise;
+          if (promise !== ((_a = this._value) == null ? void 0 : _a.v)) {
+            return;
+          }
+          this.state.set({
+            status: "value",
+            value,
+            isStale: false,
+            isUpdating: false
+          });
+          delete this.stalePromise;
+          this.setTimers();
+        } catch (error) {
+          if (promise !== ((_b = this._value) == null ? void 0 : _b.v)) {
+            return;
+          }
+          this.state.set({
+            status: "error",
+            error,
+            isStale: false,
+            isUpdating: false
+          });
+          delete this.stalePromise;
+          this.setTimers();
+        }
+      },
+      { passive: true }
+    );
+  }
+  setTimers() {
+    if (this.invalidationTimer) {
+      clearTimeout(this.invalidationTimer);
+    }
+    this.invalidationTimer = void 0;
+    const state = this.state.get();
+    let { invalidateAfter = createCache.defaultOptions.invalidateAfter } = this.options;
+    const ref = new WeakRef(this);
+    if (state.status === "pending") {
+      return;
+    }
+    if (invalidateAfter instanceof Function) {
+      invalidateAfter = invalidateAfter(state);
+    }
+    if (invalidateAfter !== null && invalidateAfter !== void 0) {
+      this.invalidationTimer = setTimeout(
+        () => {
+          var _a;
+          return (_a = ref == null ? void 0 : ref.deref()) == null ? void 0 : _a.invalidate();
+        },
+        store.calcDuration(invalidateAfter)
+      );
+    }
+  }
+  watchFocus() {
+    const { invalidateOnWindowFocus = createCache.defaultOptions.invalidateOnWindowFocus } = this.options;
+    if (!invalidateOnWindowFocus || typeof document === "undefined" || typeof document.addEventListener === "undefined") {
+      return;
+    }
+    const ref = new WeakRef(this);
+    const onFocus = () => {
+      const that = ref == null ? void 0 : ref.deref();
+      if (!that) {
+        document.removeEventListener("visibilitychange", onFocus);
+        return;
+      }
+      if (!document.hidden) {
+        that.invalidate();
+      }
+    };
+    document.addEventListener("visibilitychange", onFocus);
+  }
+}
+function create(cacheFunction, options) {
+  const { clearUnusedAfter = createCache.defaultOptions.clearUnusedAfter, resourceGroup } = options ?? {};
+  let baseInstance;
+  const instanceCache = new InstanceCache(
+    (...args) => {
+      if (args.length === 0 && baseInstance) {
+        return baseInstance;
+      }
+      return new Cache(function() {
+        return cacheFunction.apply(this, args);
+      }, options);
+    },
+    clearUnusedAfter ? store.calcDuration(clearUnusedAfter) : void 0
+  );
+  const get = (...args) => {
+    return instanceCache.get(...args);
+  };
+  const invalidateAll = () => {
+    for (const instance of instanceCache.values()) {
+      instance.invalidate();
+    }
+  };
+  const clearAll = () => {
+    for (const instance of instanceCache.values()) {
+      instance.clear();
+    }
+  };
+  baseInstance = Object.assign(
+    new Cache(
+      function() {
+        return cacheFunction.apply(this);
+      },
+      options,
+      void 0,
+      get
+    ),
+    {
+      invalidateAll,
+      clearAll
+    }
+  );
+  const groups = Array.isArray(resourceGroup) ? resourceGroup : resourceGroup ? [resourceGroup] : [];
+  for (const group of groups.concat(allResources)) {
+    group.add(baseInstance);
+  }
+  get(...[]);
+  return baseInstance;
+}
+const createCache = /* @__PURE__ */ Object.assign(create, {
+  defaultOptions: {
+    invalidateOnWindowFocus: true,
+    invalidateOnActivation: true,
+    clearUnusedAfter: { days: 1 }
+  }
+});
+exports.Cache = Cache;
+exports.InstanceCache = InstanceCache;
+exports.ResourceGroup = ResourceGroup;
+exports.allResources = allResources;
+exports.createCache = createCache;
+exports.createResourceGroup = createResourceGroup;
+//# sourceMappingURL=cache.cjs.map

package/dist/cjs/cache.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.cjs","sources":["../../src/core/resourceGroup.ts","../../src/lib/instanceCache.ts","../../src/lib/promiseWithState.ts","../../src/core/cache.ts"],"sourcesContent":["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 { 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 { type ErrorState, type PendingState, type ValueState } from './cacheState';\nimport { type MaybePromise } from './maybePromise';\n\nexport class PromiseWithState<T> extends Promise<T> {\n  static override resolve(): PromiseWithState<void>;\n\n  static override resolve<T>(value: MaybePromise<T>): PromiseWithState<T>;\n\n  static override resolve<T>(value?: MaybePromise<T>) {\n    return new PromiseWithState<T>(Promise.resolve(value as MaybePromise<T>), {\n      status: 'value',\n      value: value as T,\n    });\n  }\n\n  static override reject<T = never>(error: unknown) {\n    return new PromiseWithState<T>(Promise.reject(error), { status: 'error', error });\n  }\n\n  constructor(\n    value: Promise<T>,\n    public state: ValueState<T> | ErrorState | PendingState = { status: 'pending' },\n  ) {\n    super((resolve) => resolve(value));\n\n    value\n      .then((value) => {\n        this.state = { status: 'value', value };\n      })\n      .catch((error) => {\n        this.state = { status: 'error', error };\n      });\n  }\n}\n","import type { Duration, Selector, Use } from './commonTypes';\nimport { allResources, type ResourceGroup } from './resourceGroup';\nimport { Store, createStore } from './store';\nimport { autobind } from '@lib/autobind';\nimport type { CacheState, ErrorState, ValueState } from '@lib/cacheState';\nimport { calcDuration } from '@lib/calcDuration';\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';\n\nexport interface CacheGetOptions {\n  update?: 'whenMissing' | 'whenStale' | 'force';\n  backgroundUpdate?: boolean;\n}\n\nexport interface CacheFunction<T, Args extends any[] = []> {\n  (this: { use: Use }, ...args: Args): Promise<T> | ((cache: { use: Use }) => Promise<T>);\n}\n\nexport interface CacheOptions<T> {\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  retain?: number;\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  });\n\n  protected stalePromise?: Promise<T>;\n\n  protected invalidationTimer?: ReturnType<typeof setTimeout>;\n\n  constructor(\n    getter: CacheFunction<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(\n      function () {\n        let result = getter.apply(this);\n\n        if (result instanceof Function) {\n          result = result(this);\n        }\n\n        return result;\n      },\n      options,\n      undefined,\n      _call,\n    );\n    autobind(Cache);\n\n    this.calculationHelper.options.onInvalidate = () =>\n      this.invalidate({ invalidateDependencies: false });\n    this.watchPromise();\n    this.watchFocus();\n  }\n\n  get({ update = 'whenStale', backgroundUpdate = false }: CacheGetOptions = {}) {\n    const promise = this._value?.v;\n    const stalePromise = this.stalePromise;\n\n    if (\n      (update === 'whenMissing' && !promise && !stalePromise) ||\n      (update === 'whenStale' && !promise) ||\n      update === 'force'\n    ) {\n      this.calculationHelper.execute();\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({ invalidateDependencies = true }: { invalidateDependencies?: boolean } = {}) {\n    const { clearOnInvalidate = createCache.defaultOptions.clearOnInvalidate } = this.options;\n\n    if (clearOnInvalidate) {\n      return this.clear({ invalidateDependencies });\n    }\n\n    if (invalidateDependencies) {\n      this.calculationHelper.invalidateDependencies();\n    }\n\n    const { status, isStale, isUpdating } = this.state.get();\n    if (status !== 'pending' && !isStale && !isUpdating) {\n      this.stalePromise = this._value?.v;\n    }\n\n    this.state.set((state) => ({\n      ...state,\n      isStale: true,\n      isUpdating: false,\n    }));\n\n    this.calculationHelper.stop();\n    super.reset();\n  }\n\n  clear({ invalidateDependencies = true }: { invalidateDependencies?: boolean } = {}): void {\n    if (invalidateDependencies) {\n      this.calculationHelper.invalidateDependencies();\n    }\n\n    this.state.set({\n      status: 'pending',\n      isStale: true,\n      isUpdating: false,\n    });\n    delete this.stalePromise;\n\n    this.calculationHelper.stop();\n    super.reset();\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    const that = this;\n\n    return new Cache(\n      async function () {\n        const value = await this.use(that);\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({\n            ...promise.state,\n            isStale: false,\n            isUpdating: false,\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._value?.v) {\n            return;\n          }\n\n          this.state.set({\n            status: 'value',\n            value,\n            isStale: false,\n            isUpdating: false,\n          });\n          delete this.stalePromise;\n          this.setTimers();\n        } catch (error) {\n          if (promise !== this._value?.v) {\n            return;\n          }\n\n          this.state.set({\n            status: 'error',\n            error,\n            isStale: false,\n            isUpdating: false,\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 = createCache.defaultOptions.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 = createCache.defaultOptions.invalidateOnWindowFocus } =\n      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  const { clearUnusedAfter = createCache.defaultOptions.clearUnusedAfter, resourceGroup } =\n    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(function () {\n        return cacheFunction.apply(this, args);\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      function () {\n        return cacheFunction.apply(this);\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  } as CacheOptions<unknown>,\n});\n"],"names":["autobind","hash","value","Store","createStore","makeSelector","calcDuration"],"mappings":"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"}

package/dist/cjs/index.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const cache = require("./cache.cjs");
 const scope = require("./scope.cjs");
 const store = require("./store.cjs");
 const urlStore = require("./urlStore.cjs");
-require("./hash.cjs");
 class SubstriptionCache extends store.Store {
   constructor(connectFunction, options, derivedFromSubscriptionCache, _call) {
     super(options.default, options, void 0, _call);
@@ -68,7 +68,7 @@ function create(cacheFunction, ...[options = {}]) {
   options = Object.assign({}, defaultOptions, options);
   const { clearUnusedAfter, resourceGroup } = options;
   let baseInstance;
-  const instanceCache = new scope.InstanceCache(
+  const instanceCache = new cache.InstanceCache(
     (...args) => {
       if (args.length === 0 && baseInstance) {
         return baseInstance;
@@ -107,7 +107,7 @@ function create(cacheFunction, ...[options = {}]) {
     }
   );
   const groups = Array.isArray(resourceGroup) ? resourceGroup : resourceGroup ? [resourceGroup] : [];
-  for (const group of groups.concat(scope.allResources)) {
+  for (const group of groups.concat(cache.allResources)) {
     group.add(baseInstance);
   }
   get(...[]);
@@ -420,13 +420,13 @@ class Sync {
 function createSync(store2) {
   return new Sync(store2);
 }
-exports.Cache = scope.Cache;
-exports.InstanceCache = scope.InstanceCache;
-exports.ResourceGroup = scope.ResourceGroup;
+exports.Cache = cache.Cache;
+exports.InstanceCache = cache.InstanceCache;
+exports.ResourceGroup = cache.ResourceGroup;
+exports.allResources = cache.allResources;
+exports.createCache = cache.createCache;
+exports.createResourceGroup = cache.createResourceGroup;
 exports.Scope = scope.Scope;
-exports.allResources = scope.allResources;
-exports.createCache = scope.createCache;
-exports.createResourceGroup = scope.createResourceGroup;
 exports.createScope = scope.createScope;
 exports.Store = store.Store;
 exports.arrayMethods = store.arrayMethods;

package/dist/cjs/react/index.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const scope = require("../scope2.cjs");
+const useCache = require("../useCache.cjs");
 const require$$0 = require("react");
 const store = require("../store.cjs");
-const hash = require("../hash.cjs");
+const scope = require("../scope.cjs");
 const jsxRuntime = require("react/jsx-runtime");
 const urlStore = require("../urlStore.cjs");
 function CustomInput({ name, children, ...props }) {
@@ -375,7 +375,7 @@ class Form {
   }
   useFormState(selector, useStoreOptions) {
     const form = this.useForm();
-    return scope.useStore(
+    return useCache.useStore(
       form.derivedState.map(
         (state) => selector({
           ...form,
@@ -486,7 +486,7 @@ class Form {
         );
       }
       return void 0;
-    }, [formState, hash.hash(urlState)]);
+    }, [formState, scope.hash(urlState)]);
     require$$0.useEffect(() => {
       var _a;
       const handles = (_a = options.transform) == null ? void 0 : _a.map(({ trigger, update }) => {
@@ -531,7 +531,7 @@ function createForm(options) {
   return new Form(options);
 }
 function read(cache, options) {
-  const { status, value, error } = scope.useCache(cache, options);
+  const { status, value, error } = useCache.useCache(cache, options);
   if (status === "value") {
     return value;
   }
@@ -565,7 +565,7 @@ function useDecoupledState(value, onChange, options = {}) {
       setDirty({ v: value2 });
       delayedUpdate(value2);
     };
-  }, [hash.hash([options.debounce, options.throttle])]);
+  }, [scope.hash([options.debounce, options.throttle])]);
   return [dirty ? dirty.v : value, update];
 }
 function castArray(value) {
@@ -585,15 +585,17 @@ function useUrlParamScope({
       url[type] = parameters.toString();
       window.history.replaceState(null, "", url.toString());
     },
-    [hash.hash(key), type]
+    [scope.hash(key), type]
   );
 }
-exports.ScopeProvider = scope.ScopeProvider;
-exports.reactMethods = scope.reactMethods;
-exports.useCache = scope.useCache;
-exports.useProp = scope.useProp;
-exports.useScope = scope.useScope;
-exports.useStore = scope.useStore;
+exports.LoadingBoundary = useCache.LoadingBoundary;
+exports.ScopeProvider = useCache.ScopeProvider;
+exports.reactMethods = useCache.reactMethods;
+exports.useCache = useCache.useCache;
+exports.useLoadingBoundary = useCache.useLoadingBoundary;
+exports.useProp = useCache.useProp;
+exports.useScope = useCache.useScope;
+exports.useStore = useCache.useStore;
 exports.CustomInput = CustomInput;
 exports.Form = Form;
 exports.createForm = createForm;