cross-state 0.8.5 → 0.9.0

package/dist/es/react/index.mjs

@@ -1,9 +1,159 @@
-import { u as useCache } from "../scope2.mjs";
-import { S, r, b, a, c } from "../scope2.mjs";
-import { useState, useRef, useEffect, useMemo, startTransition } from "react";
-import { h as debounce, t as throttle } from "../store.mjs";
-import { h as hash } from "../hash.mjs";
-import "react/jsx-runtime";
+import { jsx } from "react/jsx-runtime";
+import { createContext, useMemo, useContext, useState, useRef, useEffect, startTransition } from "react";
+import { u as useScope, a as useStore, b as useCache } from "../useCache.mjs";
+import { S, r, c } from "../useCache.mjs";
+import { b as castArrayPath, g as get, h as deepEqual, i as debounce, t as throttle } from "../store.mjs";
+import { S as Scope, h as hash } from "../scope.mjs";
+function wildcardMatch(s, w) {
+  if (typeof s === "string") {
+    s = castArrayPath(s);
+  }
+  if (typeof w === "string") {
+    w = castArrayPath(w);
+  }
+  return s.length === w.length && s.every((s2, i) => w[i] === "*" || s2 === w[i]);
+}
+function getWildCardMatches(object, path) {
+  const matches = {};
+  const [first, ...rest] = castArrayPath(path);
+  if (first === void 0) {
+    return object;
+  }
+  if (!(object instanceof Object)) {
+    return {};
+  }
+  if (first === "*") {
+    for (const [key, value] of Object.entries(object)) {
+      matches[key] = getWildCardMatches(value, rest);
+    }
+  } else {
+    matches[first] = getWildCardMatches(object[first], rest);
+  }
+  return matches;
+}
+class Form {
+  constructor(options) {
+    this.options = options;
+    this.context = createContext({
+      original: void 0,
+      options: this.options
+    });
+    this.state = new Scope({});
+    this.Provider = this.Provider.bind(this);
+  }
+  Provider({
+    children,
+    original,
+    defaultValue = this.options.defaultValue,
+    validations = this.options.validations
+  }) {
+    const value = useMemo(
+      () => ({ original, options: { defaultValue, validations } }),
+      [original, defaultValue, validations]
+    );
+    return /* @__PURE__ */ jsx(this.context.Provider, { value, children: /* @__PURE__ */ jsx(this.state.Provider, { children }) });
+  }
+  useForm() {
+    const { original, options } = useContext(this.context);
+    const state = useScope(this.state);
+    return useMemo(
+      () => ({
+        original,
+        draft: state.map(
+          (state2) => state2.draft ?? original ?? options.defaultValue,
+          (draft) => (state2) => ({ ...state2, draft })
+        ),
+        getField(path) {
+          const { draft } = this;
+          return {
+            get originalValue() {
+              return original !== void 0 ? get(original, path) : void 0;
+            },
+            get value() {
+              return get(draft.get(), path);
+            },
+            setValue(update) {
+              draft.set(path, update);
+            },
+            get isDirty() {
+              return state.get().hasTriggeredValidations || !deepEqual(this.originalValue, this.value);
+            },
+            get error() {
+              const blocks = Object.entries(
+                options.validations ?? {}
+              ).filter(([key]) => wildcardMatch(path, key)).map(([, value2]) => value2);
+              const value = this.value;
+              const draftValue = draft.get();
+              for (const block of blocks ?? []) {
+                for (const [validationName, validate] of Object.entries(block)) {
+                  if (!validate(value, { draft: draftValue, original, field: path })) {
+                    return validationName;
+                  }
+                }
+              }
+              return void 0;
+            }
+          };
+        },
+        hasChanges() {
+          const { draft } = state.get();
+          return !!draft && !deepEqual(draft, original);
+        },
+        getErrors() {
+          const draft = this.draft.get();
+          const errors = /* @__PURE__ */ new Set();
+          for (const [path, block] of Object.entries(options.validations ?? {})) {
+            for (const [validationName, validate] of Object.entries(
+              block
+            )) {
+              for (const [field, value] of Object.entries(getWildCardMatches(draft, path))) {
+                if (!validate(value, { draft, original, field })) {
+                  errors.add(`${field}.${validationName}`);
+                }
+              }
+            }
+          }
+          return [...errors];
+        },
+        isValid() {
+          return this.getErrors().length === 0;
+        },
+        validate() {
+          state.set("hasTriggeredValidations", true);
+          return this.isValid();
+        },
+        reset() {
+          state.set("draft", void 0);
+        }
+      }),
+      [original, options, state]
+    );
+  }
+  useField(path, useStoreOptions) {
+    const form = this.useForm();
+    const state = useScope(this.state);
+    useStore(
+      form.draft.map((draft) => get(draft, path)),
+      useStoreOptions
+    );
+    useStore(
+      state.map((state2) => state2.hasTriggeredValidations),
+      useStoreOptions
+    );
+    return form.getField(path);
+  }
+  useHasChanges() {
+    const form = this.useForm();
+    return useStore(form.draft.map(() => form.hasChanges()));
+  }
+  useIsValid() {
+    const form = this.useForm();
+    return useStore(form.draft.map(() => form.isValid()));
+  }
+}
+function createForm(options) {
+  return new Form(options);
+}
 function read(cache, options) {
   const { status, value, error } = useCache(cache, options);
   if (status === "value") {
@@ -43,13 +193,15 @@ function useDecoupledState(value, onChange, options = {}) {
   return [dirty ? dirty.v : value, update];
 }
 export {
+  Form,
   S as ScopeProvider,
+  createForm,
   r as reactMethods,
   read,
   useCache,
   useDecoupledState,
-  b as useProp,
-  a as useScope,
-  c as useStore
+  c as useProp,
+  useScope,
+  useStore
 };
 //# sourceMappingURL=index.mjs.map

package/dist/es/react/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../src/react/read.ts","../../../src/react/useDecoupledState.ts"],"sourcesContent":["import { useCache } from './useCache';\nimport type { UseStoreOptions } from './useStore';\nimport type { Cache } from '@core';\n\nexport function read<T>(cache: Cache<T>, options?: UseStoreOptions): T {\n  const { status, value, error } = useCache(cache, options);\n\n  if (status === 'value') {\n    return value;\n  }\n\n  if (status === 'error') {\n    throw error;\n  }\n\n  throw cache.state.once((state) => state.status !== 'pending');\n}\n","import { startTransition, useEffect, useMemo, useRef, useState } from 'react';\nimport { type Duration } from '@core';\nimport { debounce } from '@lib/debounce';\nimport { hash } from '@lib/hash';\nimport { throttle } from '@lib/throttle';\n\nexport interface UseDecoupledStateOptions<T> {\n  debounce?: Duration;\n  throttle?: Duration;\n  onCommit?: (value: T) => void;\n}\n\nexport function useDecoupledState<T>(\n  value: T,\n  onChange: (value: T) => void,\n  options: UseDecoupledStateOptions<T> = {},\n): [state: T, setState: (value: T) => void] {\n  const [dirty, setDirty] = useState<{ v: T }>();\n  const ref = useRef({ onChange, onCommit: options.onCommit });\n\n  useEffect(() => {\n    ref.current = { onChange, onCommit: options.onCommit };\n  }, [onChange]);\n\n  const update = useMemo(() => {\n    const { onChange, onCommit } = ref.current;\n\n    const update = (value: T) => {\n      onChange(value);\n      setDirty(undefined);\n      onCommit?.(value);\n    };\n\n    let delayedUpdate: (value: T) => void;\n\n    if (options.debounce) {\n      delayedUpdate = debounce(update, options.debounce);\n    } else if (options.throttle) {\n      delayedUpdate = throttle(update, options.throttle);\n    } else {\n      delayedUpdate = (value) => startTransition(() => update(value));\n    }\n\n    return (value: T) => {\n      setDirty({ v: value });\n      delayedUpdate(value);\n    };\n  }, [hash([options.debounce, options.throttle])]);\n\n  return [dirty ? dirty.v : value, update];\n}\n"],"names":["onChange","update","value"],"mappings":";;;;;;AAIgB,SAAA,KAAQ,OAAiB,SAA8B;AACrE,QAAM,EAAE,QAAQ,OAAO,MAAU,IAAA,SAAS,OAAO,OAAO;AAExD,MAAI,WAAW,SAAS;AACf,WAAA;AAAA,EACT;AAEA,MAAI,WAAW,SAAS;AAChB,UAAA;AAAA,EACR;AAEA,QAAM,MAAM,MAAM,KAAK,CAAC,UAAU,MAAM,WAAW,SAAS;AAC9D;ACJO,SAAS,kBACd,OACA,UACA,UAAuC,CAAA,GACG;AAC1C,QAAM,CAAC,OAAO,QAAQ,IAAI,SAAmB;AAC7C,QAAM,MAAM,OAAO,EAAE,UAAU,UAAU,QAAQ,UAAU;AAE3D,YAAU,MAAM;AACd,QAAI,UAAU,EAAE,UAAU,UAAU,QAAQ;EAAS,GACpD,CAAC,QAAQ,CAAC;AAEP,QAAA,SAAS,QAAQ,MAAM;AAC3B,UAAM,EAAE,UAAAA,WAAU,SAAA,IAAa,IAAI;AAE7BC,UAAAA,UAAS,CAACC,WAAa;AAC3BF,gBAASE,MAAK;AACd,eAAS,MAAS;AAClB,2CAAWA;AAAAA,IAAK;AAGd,QAAA;AAEJ,QAAI,QAAQ,UAAU;AACJ,sBAAA,SAASD,SAAQ,QAAQ,QAAQ;AAAA,IAAA,WACxC,QAAQ,UAAU;AACX,sBAAA,SAASA,SAAQ,QAAQ,QAAQ;AAAA,IAAA,OAC5C;AACL,sBAAgB,CAACC,WAAU,gBAAgB,MAAMD,QAAOC,MAAK,CAAC;AAAA,IAChE;AAEA,WAAO,CAACA,WAAa;AACV,eAAA,EAAE,GAAGA,OAAAA,CAAO;AACrB,oBAAcA,MAAK;AAAA,IAAA;AAAA,EACrB,GACC,CAAC,KAAK,CAAC,QAAQ,UAAU,QAAQ,QAAQ,CAAC,CAAC,CAAC;AAE/C,SAAO,CAAC,QAAQ,MAAM,IAAI,OAAO,MAAM;AACzC;"}
+{"version":3,"file":"index.mjs","sources":["../../../src/lib/wildcardMatch.ts","../../../src/react/form.tsx","../../../src/react/read.ts","../../../src/react/useDecoupledState.ts"],"sourcesContent":["import { type KeyType } from './path';\nimport { castArrayPath } from './propAccess';\n\nexport function wildcardMatch(s: KeyType[] | string, w: KeyType[] | string): boolean {\n  if (typeof s === 'string') {\n    s = castArrayPath(s);\n  }\n\n  if (typeof w === 'string') {\n    w = castArrayPath(w);\n  }\n\n  return s.length === w.length && s.every((s, i) => w[i] === '*' || s === w[i]);\n}\n\nexport function getWildCardMatches(object: any, path: KeyType[] | string): Record<KeyType, any> {\n  const matches: Record<KeyType, any> = {};\n  const [first, ...rest] = castArrayPath(path);\n\n  if (first === undefined) {\n    return object;\n  }\n\n  if (!(object instanceof Object)) {\n    return {};\n  }\n\n  if (first === '*') {\n    for (const [key, value] of Object.entries(object)) {\n      matches[key] = getWildCardMatches(value, rest);\n    }\n  } else {\n    matches[first] = getWildCardMatches(object[first], rest);\n  }\n\n  return matches;\n}\n","/* eslint-disable react-hooks/rules-of-hooks */\n\nimport { createContext, useContext, useMemo, type ReactNode } from 'react';\nimport { useScope } from './scope';\nimport { useStore, type UseStoreOptions } from './useStore';\nimport { Scope } from '@core';\nimport { deepEqual } from '@lib/equals';\nimport {\n  type PathAsString,\n  type Value,\n  type WildcardMatch,\n  type WildcardPathAsString,\n  type WildcardValue,\n} from '@lib/path';\nimport { get } from '@lib/propAccess';\nimport { getWildCardMatches, wildcardMatch } from '@lib/wildcardMatch';\n\nexport interface FormOptions<\n  TDraft,\n  TOriginal,\n  TValidations extends Validations<TDraft, TOriginal>,\n> {\n  defaultValue: TDraft;\n  validations?: TValidations;\n}\n\nexport type Validation<TValue, TDraft, TOriginal> = (\n  value: TValue,\n  context: { draft: TDraft; original: TOriginal; field: PathAsString<TDraft> },\n) => boolean;\n\nexport type Validations<TDraft, TOriginal> = {\n  [P in WildcardPathAsString<TDraft>]?: Record<\n    string,\n    Validation<WildcardValue<TDraft, P>, TDraft, TOriginal>\n  >;\n};\n\nexport interface Field<\n  TDraft,\n  TOriginal,\n  TPath extends PathAsString<TDraft>,\n  TValidations extends Validations<TDraft, TOriginal>,\n> {\n  originalValue: Value<TOriginal, TPath> | undefined;\n  value: Value<TDraft, TPath>;\n  setValue: (\n    value: Value<TDraft, TPath> | ((value: Value<TDraft, TPath>) => Value<TDraft, TPath>),\n  ) => void;\n  isDirty: boolean;\n  error?: keyof {\n    [P in keyof TValidations as WildcardMatch<TPath, P> extends true\n      ? keyof TValidations[P]\n      : never]: 1;\n  };\n}\n\nexport class Form<\n  TDraft,\n  TOriginal extends TDraft = TDraft,\n  TValidations extends Validations<TDraft, TOriginal> = {},\n> {\n  private context = createContext({\n    original: undefined as TOriginal | undefined,\n    options: this.options,\n  });\n\n  private state = new Scope<{\n    draft?: TDraft;\n    hasTriggeredValidations?: boolean;\n  }>({});\n\n  constructor(public readonly options: FormOptions<TDraft, TOriginal, TValidations>) {\n    this.Provider = this.Provider.bind(this);\n  }\n\n  Provider({\n    children,\n    original,\n    defaultValue = this.options.defaultValue,\n    validations = this.options.validations,\n  }: { children?: ReactNode; original?: TOriginal } & Partial<\n    FormOptions<TDraft, TOriginal, TValidations>\n  >) {\n    const value = useMemo(\n      () => ({ original, options: { defaultValue, validations } }),\n      [original, defaultValue, validations],\n    );\n\n    return (\n      <this.context.Provider value={value}>\n        <this.state.Provider>{children}</this.state.Provider>\n      </this.context.Provider>\n    );\n  }\n\n  useForm() {\n    const { original, options } = useContext(this.context);\n    const state = useScope(this.state);\n\n    return useMemo(\n      () => ({\n        original,\n\n        draft: state.map(\n          (state) => state.draft ?? original ?? options.defaultValue,\n          (draft) => (state) => ({ ...state, draft }),\n        ),\n\n        getField<TPath extends PathAsString<TDraft>>(\n          path: TPath,\n        ): Field<TDraft, TOriginal, TPath, TValidations> {\n          const { draft } = this;\n\n          return {\n            get originalValue() {\n              return original !== undefined ? get(original as any, path as any) : undefined;\n            },\n\n            get value() {\n              return get(draft.get(), path);\n            },\n\n            setValue(update) {\n              draft.set(path, update);\n            },\n\n            get isDirty() {\n              return (\n                state.get().hasTriggeredValidations || !deepEqual(this.originalValue, this.value)\n              );\n            },\n\n            get error() {\n              const blocks: Record<string, Validation<any, any, any>>[] = Object.entries(\n                options.validations ?? {},\n              )\n                .filter(([key]) => wildcardMatch(path, key))\n                .map(([, value]) => value);\n\n              const value = this.value;\n              const draftValue = draft.get();\n\n              for (const block of blocks ?? []) {\n                for (const [validationName, validate] of Object.entries(block)) {\n                  if (!validate(value, { draft: draftValue, original, field: path })) {\n                    return validationName as any;\n                  }\n                }\n              }\n\n              return undefined;\n            },\n          };\n        },\n\n        hasChanges() {\n          const { draft } = state.get();\n          return !!draft && !deepEqual(draft, original);\n        },\n\n        getErrors(): (keyof {\n          [Field in PathAsString<TDraft> as keyof {\n            [Pattern in keyof TValidations as WildcardMatch<Field, Pattern> extends true\n              ? `${Field}.${keyof TValidations[Pattern] & string}`\n              : never]: 1;\n          }]: 1;\n        })[] {\n          const draft = this.draft.get();\n          const errors = new Set<string>();\n\n          for (const [path, block] of Object.entries(options.validations ?? {})) {\n            for (const [validationName, validate] of Object.entries(\n              block as Record<string, Validation<any, any, any>>,\n            )) {\n              for (const [field, value] of Object.entries(getWildCardMatches(draft, path))) {\n                if (!validate(value, { draft, original, field })) {\n                  errors.add(`${field}.${validationName}`);\n                }\n              }\n            }\n          }\n\n          return [...errors] as any;\n        },\n\n        isValid() {\n          return this.getErrors().length === 0;\n        },\n\n        validate() {\n          state.set('hasTriggeredValidations', true);\n          return this.isValid();\n        },\n\n        reset() {\n          state.set('draft', undefined);\n        },\n      }),\n      [original, options, state],\n    );\n  }\n\n  useField<TPath extends PathAsString<TDraft>>(path: TPath, useStoreOptions?: UseStoreOptions) {\n    const form = this.useForm();\n    const state = useScope(this.state);\n\n    useStore(\n      form.draft.map((draft) => get(draft, path)),\n      useStoreOptions,\n    );\n\n    useStore(\n      state.map((state) => state.hasTriggeredValidations),\n      useStoreOptions,\n    );\n\n    return form.getField(path);\n  }\n\n  useHasChanges() {\n    const form = this.useForm();\n\n    return useStore(form.draft.map(() => form.hasChanges()));\n  }\n\n  useIsValid() {\n    const form = this.useForm();\n\n    return useStore(form.draft.map(() => form.isValid()));\n  }\n}\n\nexport function createForm<\n  TDraft,\n  TOriginal extends TDraft = TDraft,\n  TValidations extends Validations<TDraft, TOriginal> = {},\n>(options: FormOptions<TDraft, TOriginal, TValidations>) {\n  return new Form(options);\n}\n\n/* eslint-enable react-hooks/rules-of-hooks */\n","import { useCache } from './useCache';\nimport type { UseStoreOptions } from './useStore';\nimport type { Cache } from '@core';\n\nexport function read<T>(cache: Cache<T>, options?: UseStoreOptions): T {\n  const { status, value, error } = useCache(cache, options);\n\n  if (status === 'value') {\n    return value;\n  }\n\n  if (status === 'error') {\n    throw error;\n  }\n\n  throw cache.state.once((state) => state.status !== 'pending');\n}\n","import { startTransition, useEffect, useMemo, useRef, useState } from 'react';\nimport { type Duration } from '@core';\nimport { debounce } from '@lib/debounce';\nimport { hash } from '@lib/hash';\nimport { throttle } from '@lib/throttle';\n\nexport interface UseDecoupledStateOptions<T> {\n  debounce?: Duration;\n  throttle?: Duration;\n  onCommit?: (value: T) => void;\n}\n\nexport function useDecoupledState<T>(\n  value: T,\n  onChange: (value: T) => void,\n  options: UseDecoupledStateOptions<T> = {},\n): [state: T, setState: (value: T) => void] {\n  const [dirty, setDirty] = useState<{ v: T }>();\n  const ref = useRef({ onChange, onCommit: options.onCommit });\n\n  useEffect(() => {\n    ref.current = { onChange, onCommit: options.onCommit };\n  }, [onChange]);\n\n  const update = useMemo(() => {\n    const { onChange, onCommit } = ref.current;\n\n    const update = (value: T) => {\n      onChange(value);\n      setDirty(undefined);\n      onCommit?.(value);\n    };\n\n    let delayedUpdate: (value: T) => void;\n\n    if (options.debounce) {\n      delayedUpdate = debounce(update, options.debounce);\n    } else if (options.throttle) {\n      delayedUpdate = throttle(update, options.throttle);\n    } else {\n      delayedUpdate = (value) => startTransition(() => update(value));\n    }\n\n    return (value: T) => {\n      setDirty({ v: value });\n      delayedUpdate(value);\n    };\n  }, [hash([options.debounce, options.throttle])]);\n\n  return [dirty ? dirty.v : value, update];\n}\n"],"names":["s","state","value","onChange","update"],"mappings":"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"}

package/dist/es/react/register.mjs

@@ -1,9 +1,9 @@
-import { r as reactMethods, u as useCache, a as useScope, d as useScopeStore, e as useScopeProp, S as ScopeProvider } from "../scope2.mjs";
+import { r as reactMethods, b as useCache, u as useScope, d as useScopeStore, e as useScopeProp, S as ScopeProvider } from "../useCache.mjs";
 import { S as Store } from "../store.mjs";
-import { C as Cache, S as Scope } from "../scope.mjs";
-import "react";
+import { C as Cache } from "../cache.mjs";
+import { S as Scope } from "../scope.mjs";
 import "react/jsx-runtime";
-import "../hash.mjs";
+import "react";
 const cacheMethods = {
   useCache(options) {
     return useCache(this, options);

package/dist/es/scope.mjs

@@ -1,381 +1,18 @@
-import { S as Store, c as createStore, a as calcDuration, i as makeSelector } from "./store.mjs";
-import { h as hash } from "./hash.mjs";
-class ResourceGroup {
-  constructor(name) {
-    this.name = name;
-    this.refMap = /* @__PURE__ */ new WeakMap();
-    this.refSet = /* @__PURE__ */ new Set();
-    this.add = this.add.bind(this);
-    this.delete = this.delete.bind(this);
-    this.invalidateAll = this.invalidateAll.bind(this);
-    this.clearAll = this.clearAll.bind(this);
+function hash(value) {
+  if (value instanceof Set) {
+    return `s[${[...value].map(hash).sort().join(",")}]`;
   }
-  add(resource) {
-    const ref = new WeakRef(resource);
-    this.refMap.set(resource, ref);
-    this.refSet.add(ref);
+  if (value instanceof Map) {
+    return `m[${[...value.entries()].map(hash).sort().join(",")}]`;
   }
-  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 = 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 {
-  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 = createStore({
-      status: "pending",
-      isStale: true,
-      isUpdating: false
-    });
-    this.invalidate = this.invalidate.bind(this);
-    this.clear = this.clear.bind(this);
-    this.mapValue = this.mapValue.bind(this);
-    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 = 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 }
-    );
+  if (Array.isArray(value)) {
+    return `[${value.map(hash).join(",")}]`;
   }
-  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();
-        },
-        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);
+  if (value instanceof Object) {
+    return `o[${Object.entries(value).map(hash).sort().join(",")}]`;
   }
+  return JSON.stringify(value);
 }
-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 ? 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 }
-  }
-});
 class Scope {
   constructor(defaultValue) {
     this.defaultValue = defaultValue;
@@ -388,13 +25,8 @@ function createScope(defaultValue) {
   return new Scope(defaultValue);
 }
 export {
-  Cache as C,
-  InstanceCache as I,
-  ResourceGroup as R,
   Scope as S,
-  allResources as a,
-  createResourceGroup as b,
-  createCache as c,
-  createScope as d
+  createScope as c,
+  hash as h
 };
 //# sourceMappingURL=scope.mjs.map