valdres 0.2.0-alpha.9 → 0.2.0-y.0

package/dist/index.js

@@ -1,11 +1,106 @@
-// src/lib/setAtom.ts
-import equal4 from "fast-deep-equal";
+// src/index.ts
+import { version } from "../package.json";
 
-// src/utils/isPromiseLike.ts
-var isPromiseLike = (object) => {
-  return object && object.then && typeof object.then === "function";
+// src/lib/equal.ts
+var hasElementType = typeof Element !== "undefined";
+var hasMap = typeof Map === "function";
+var hasSet = typeof Set === "function";
+var hasArrayBuffer = typeof ArrayBuffer === "function" && !!ArrayBuffer.isView;
+var deepEqualFn = (a, b) => {
+  if (a === b)
+    return true;
+  if (a && b && typeof a == "object" && typeof b == "object") {
+    if (a.constructor !== b.constructor)
+      return false;
+    var length, i, keys;
+    if (Array.isArray(a)) {
+      length = a.length;
+      if (length != b.length)
+        return false;
+      for (i = length;i-- !== 0; )
+        if (!deepEqualFn(a[i], b[i]))
+          return false;
+      return true;
+    }
+    var it;
+    if (hasMap && a instanceof Map && b instanceof Map) {
+      if (a.size !== b.size)
+        return false;
+      it = a.entries();
+      while (!(i = it.next()).done)
+        if (!b.has(i.value[0]))
+          return false;
+      it = a.entries();
+      while (!(i = it.next()).done)
+        if (!deepEqualFn(i.value[1], b.get(i.value[0])))
+          return false;
+      return true;
+    }
+    if (hasSet && a instanceof Set && b instanceof Set) {
+      if (a.size !== b.size)
+        return false;
+      it = a.entries();
+      while (!(i = it.next()).done)
+        if (!b.has(i.value[0]))
+          return false;
+      return true;
+    }
+    if (hasArrayBuffer && ArrayBuffer.isView(a) && ArrayBuffer.isView(b)) {
+      length = a.length;
+      if (length != b.length)
+        return false;
+      for (i = length;i-- !== 0; )
+        if (a[i] !== b[i])
+          return false;
+      return true;
+    }
+    if (a.constructor === RegExp)
+      return a.source === b.source && a.flags === b.flags;
+    if (a.valueOf !== Object.prototype.valueOf && typeof a.valueOf === "function" && typeof b.valueOf === "function")
+      return a.valueOf() === b.valueOf();
+    if (a.toString !== Object.prototype.toString && typeof a.toString === "function" && typeof b.toString === "function")
+      return a.toString() === b.toString();
+    keys = Object.keys(a);
+    length = keys.length;
+    if (length !== Object.keys(b).length)
+      return false;
+    for (i = length;i-- !== 0; )
+      if (!Object.prototype.hasOwnProperty.call(b, keys[i]))
+        return false;
+    if (hasElementType && a instanceof Element)
+      return false;
+    for (i = length;i-- !== 0; ) {
+      if ((keys[i] === "_owner" || keys[i] === "__v" || keys[i] === "__o") && a.$$typeof) {
+        continue;
+      }
+      if (!deepEqualFn(a[keys[i]], b[keys[i]]))
+        return false;
+    }
+    return true;
+  }
+  return a !== a && b !== b;
+};
+var equal = (a, b) => {
+  try {
+    return deepEqualFn(a, b);
+  } catch (error) {
+    if ((error.message || "").match(/stack|recursion/i)) {
+      console.warn("react-fast-compare cannot handle circular refs");
+      return false;
+    }
+    throw error;
+  }
 };
 
+// src/utils/isAtom.ts
+var isAtom = (state) => Object.hasOwn(state, "defaultValue");
+
+// src/utils/isFamilyState.ts
+var isFamilyState = (state) => state && Object.hasOwn(state, "family");
+
+// src/utils/isFamilyAtom.ts
+var isFamilyAtom = (state) => isFamilyState(state) && isAtom(state);
+
 // src/lib/updateStateSubscribers.ts
 var updateStateSubscribers = (state, data) => {
   const subscribtions = data.subscriptions.get(state);
@@ -14,7 +109,7 @@ var updateStateSubscribers = (state, data) => {
       subscribtion.callback();
     }
   }
-  if (state.family) {
+  if (isFamilyState(state)) {
     const familySubscriptions = data.subscriptions.get(state.family);
     if (familySubscriptions?.size) {
       for (const subscribtion of familySubscriptions) {
@@ -24,14 +119,42 @@ var updateStateSubscribers = (state, data) => {
   }
 };
 
-// src/lib/updateSelectorSubscribers.ts
-import equal3 from "fast-deep-equal";
+// src/utils/isPromiseLike.ts
+var isPromiseLike = (object) => {
+  return object && object.then && typeof object.then === "function";
+};
 
-// src/lib/initSelector.ts
-import equal2 from "fast-deep-equal";
+// src/utils/isAtomFamily.ts
+var isAtomFamily = (state) => state && Object.hasOwn(state, "__valdresAtomFamilyMap");
 
-// src/lib/getState.ts
-import equal from "fast-deep-equal";
+// src/utils/isSelector.ts
+var isSelector = (state) => state && Object.hasOwn(state, "get");
+
+// src/utils/isSelectorFamily.ts
+var isSelectorFamily = (state) => state && Object.hasOwn(state, "__valdresSelectorFamilyMap");
+
+// src/lib/isFunction.ts
+var isFunction = (value) => typeof value === "function";
+
+// src/lib/setAtom.ts
+var setAtom = (atom, newValue, data, skipOnSet = false) => {
+  const currentValue = getState(atom, data);
+  if (isFunction(newValue)) {
+    newValue = newValue(currentValue);
+    if (isPromiseLike(newValue) || isPromiseLike(currentValue))
+      throw new Error("Todo, how should we handle this?");
+  }
+  if (atom.equal(currentValue, newValue))
+    return newValue;
+  data.values.set(atom, newValue);
+  if (atom.onSet && !skipOnSet)
+    atom.onSet(newValue, data);
+  if (currentValue?.__isEmptyAtomPromise__) {
+    currentValue.__resolveEmptyAtomPromise__(newValue);
+  }
+  propagateUpdatedAtoms([atom], data);
+  return newValue;
+};
 
 // src/lib/initAtom.ts
 var getAtomInitValue = (atom, data) => {
@@ -52,6 +175,8 @@ var getAtomInitValue = (atom, data) => {
       });
     }
     return value;
+  } else if (isSelector(atom.defaultValue)) {
+    return getState(atom.defaultValue, data);
   } else {
     return atom.defaultValue;
   }
@@ -59,6 +184,14 @@ var getAtomInitValue = (atom, data) => {
 var initAtom = (atom, data) => {
   let value = getAtomInitValue(atom, data);
   data.values.set(atom, value);
+  if (isFamilyAtom(atom)) {
+    const currentKeySet = getState(atom.family.__keysAtom, data);
+    if (!currentKeySet.has(atom.familyKey)) {
+      const newSet = new Set(currentKeySet);
+      newSet.add(atom.familyKey);
+      setAtom(atom.family.__keysAtom, newSet, data);
+    }
+  }
   if (atom.onInit)
     atom.onInit((newVal) => {
       value = newVal;
@@ -67,25 +200,26 @@ var initAtom = (atom, data) => {
   return value;
 };
 
-// src/utils/isAtom.ts
-var isAtom = (state) => Object.hasOwn(state, "defaultValue");
-
-// src/utils/isSelector.ts
-var isSelector = (state) => Object.hasOwn(state, "get");
-
-// src/utils/isFamily.ts
-var isFamily = (state) => Object.hasOwn(state, "_map");
-
 // src/lib/getState.ts
-function getState(state, data) {
+function getState(state, data, circularDependencySet) {
   if (data.values.has(state))
     return data.values.get(state);
-  if (isAtom(state))
+  if (isAtom(state)) {
+    if ("parent" in data)
+      return getState(state, data.parent, circularDependencySet);
     return initAtom(state, data);
+  }
   if (isSelector(state))
-    return initSelector(state, data);
-  if (isFamily(state)) {
-    const array = Array.from(state._map.keys());
+    return initSelector(state, data, circularDependencySet);
+  if (isAtomFamily(state)) {
+    if ("parent" in data) {
+      const closestData = findClosestStoreWithAtomInitialized(state.__keysAtom, data);
+      return getState(state.__keysSelector, closestData, circularDependencySet);
+    }
+    return getState(state.__keysSelector, data, circularDependencySet);
+  }
+  if (isSelectorFamily(state)) {
+    const array = Array.from(state.__valdresSelectorFamilyMap.keys());
     if (equal(array, state._keyArray))
       return state._keyArray;
     state._keyArray = array;
@@ -93,6 +227,13 @@ function getState(state, data) {
   }
   throw new Error("Invalid object passed to get");
 }
+var findClosestStoreWithAtomInitialized = (atom, data) => {
+  if ("parent" in data === false)
+    return data;
+  if (data.values.has(atom))
+    return data;
+  return findClosestStoreWithAtomInitialized(atom, data.parent);
+};
 
 // src/lib/initSelector.ts
 class SuspendAndWaitForResolveError extends Error {
@@ -102,6 +243,36 @@ class SuspendAndWaitForResolveError extends Error {
     this.promise = promise;
   }
 }
+var generateSelectorTrace = (selectors) => {
+  const lastIndex = selectors.length - 1;
+  return [...selectors].reverse().map((selector, index) => {
+    const name = selector.name ?? "Anonymous Selector";
+    if (index === 0) {
+      return `[START] ${name}`;
+    } else if (index === lastIndex) {
+      return `[CRASH] ${name}`;
+    } else {
+      return `        ${" ".repeat(index)}${name}`;
+    }
+  }).join(`
+`);
+};
+
+class CircularDependencyError extends Error {
+  selectors;
+  constructor() {
+    super();
+    this.selectors = [];
+  }
+  track(selector) {
+    this.selectors.push(selector);
+  }
+  get message() {
+    const firstSelectorName = this.selectors[0].name ?? "Anonymous Selector";
+    return `Circular dependency detected in '${firstSelectorName}'
+${generateSelectorTrace(this.selectors)}`;
+  }
+}
 var getOrInitConsumersSet = (state, data) => {
   const set = data.stateConsumers.get(state);
   if (set)
@@ -110,12 +281,16 @@ var getOrInitConsumersSet = (state, data) => {
   data.stateConsumers.set(state, newSet);
   return newSet;
 };
-var evaluateSelector = (selector, data) => {
+var evaluateSelector = (selector, data, circularDependencyMap = new WeakSet) => {
   const updatedDependencies = new Set;
+  if (circularDependencyMap.has(selector)) {
+    throw new CircularDependencyError;
+  }
+  circularDependencyMap.add(selector);
   let result;
   try {
     result = selector.get((state) => {
-      const value = getState(state, data);
+      const value = getState(state, data, circularDependencyMap);
       updatedDependencies.add(state);
       if (isPromiseLike(value))
         throw new SuspendAndWaitForResolveError(value);
@@ -157,12 +332,19 @@ var handleSelectorResult = (value, selector, data) => {
     return value;
   }
 };
-var initSelector = (selector, data) => {
-  const tmpValue = evaluateSelector(selector, data);
+var initSelector = (selector, data, circularDependencySet = new WeakSet) => {
+  let tmpValue;
+  try {
+    tmpValue = evaluateSelector(selector, data, circularDependencySet);
+  } catch (e) {
+    if (e instanceof CircularDependencyError)
+      e.track(selector);
+    throw e;
+  }
   const value = handleSelectorResult(tmpValue, selector, data);
   if (data.expiredValues.has(selector)) {
     const expiredValue = data.expiredValues.get(selector);
-    if (equal2(expiredValue, value)) {
+    if (selector.equal(expiredValue, value)) {
       data.values.set(selector, expiredValue);
       return expiredValue;
     }
@@ -181,7 +363,7 @@ var updateSelectorSubscribers = (selector, data) => {
     try {
       const oldValue = data.expiredValues.get(selector);
       const newValue = initSelector(selector, data);
-      if (equal3(newValue, oldValue))
+      if (selector.equal(newValue, oldValue))
         return;
     } catch (e) {
     }
@@ -219,7 +401,7 @@ var propagateUpdatedAtoms = (atoms, data) => {
     if (consumers && consumers.size) {
       recursivlyResetSelectorTree(consumers, data, clearedSelectors);
     }
-    if (atom.family) {
+    if (isFamilyAtom(atom)) {
       const consumersFamily = data.stateConsumers.get(atom.family);
       if (consumersFamily?.size) {
         recursivlyResetSelectorTree(consumersFamily, data, clearedSelectors);
@@ -234,158 +416,47 @@ var propagateUpdatedAtoms = (atoms, data) => {
   }
 };
 
-// src/lib/setAtom.ts
-var setAtom = (atom, newValue, data, skipOnSet = false) => {
-  const currentValue = getState(atom, data);
-  if (typeof newValue === "function") {
-    newValue = newValue(currentValue);
-    if (isPromiseLike(newValue) || isPromiseLike(currentValue))
-      throw new Error("Todo, how should we handle this?");
-  }
-  if (equal4(currentValue, newValue))
-    return;
-  data.values.set(atom, newValue);
-  if (atom.onSet && !skipOnSet)
-    atom.onSet(newValue, data);
-  if (currentValue?.__isEmptyAtomPromise__) {
-    currentValue.__resolveEmptyAtomPromise__(newValue);
-  }
-  propagateUpdatedAtoms([atom], data);
-};
-
-// src/atom.ts
-var globalAtom = (defaultValue, options) => {
-  const stores = new Set;
-  let value = defaultValue;
-  const onSet = (newValue, currentStore) => {
-    value = newValue;
-    if (stores.size > 1) {
-      for (const store of stores) {
-        if (store.id !== currentStore.id) {
-          setAtom(newAtom, value, store, true);
-        }
-      }
-    }
-  };
-  const newAtom = {
-    defaultValue,
-    ...options,
-    onInit: (setSelf, store) => {
-      setSelf(value);
-      stores.add(store);
-    },
-    onSet,
-    label: options?.label
-  };
-  return newAtom;
-};
-var atom = (defaultValue, options) => {
-  if (!options)
-    return { defaultValue };
-  if (options.global)
-    return globalAtom(defaultValue, options);
+// src/lib/createStoreData.ts
+var generateId = () => (Math.random() + 1).toString(36).substring(7);
+var generateStoreData = (id = generateId()) => {
   return {
-    defaultValue,
-    ...options
+    id,
+    values: new WeakMap,
+    expiredValues: new WeakMap,
+    subscriptions: new WeakMap,
+    subscriptionsRequireEqualCheck: new WeakMap,
+    stateConsumers: new WeakMap,
+    stateDependencies: new WeakMap,
+    scopes: {}
   };
 };
-// src/lib/stableStringify.ts
-var stableStringifyRecurse = (x, key) => {
-  if (typeof x === "string" && !x.includes('"') && !x.includes("\\")) {
-    return `"${x}"`;
-  }
-  switch (typeof x) {
-    case "undefined":
-      return "";
-    case "boolean":
-      return x ? "true" : "false";
-    case "number":
-    case "symbol":
-      return String(x);
-    case "string":
-      return JSON.stringify(x);
-    case "function":
-      return `__FUNCTION(${x.toString()})__`;
-  }
-  if (x === null) {
-    return "null";
-  }
-  if (typeof x !== "object") {
-    return JSON.stringify(x) ?? "";
-  }
-  if (isPromiseLike(x)) {
-    return "__PROMISE__";
-  }
-  if (Array.isArray(x)) {
-    return `[${x.map((v, i) => stableStringifyRecurse(v, i.toString()))}]`;
-  }
-  if (typeof x.toJSON === "function") {
-    return stableStringifyRecurse(x.toJSON(key), key);
-  }
-  if (x instanceof Map) {
-    const obj = {};
-    for (const [k, v] of x) {
-      obj[typeof k === "string" ? k : stringify(k, opt)] = v;
-    }
-    return stableStringifyRecurse(obj, key);
-  }
-  if (x instanceof Set) {
-    return stableStringifyRecurse(Array.from(x).sort((a, b) => stableStringifyRecurse(a).localeCompare(stableStringifyRecurse(b))), key);
-  }
-  if (Symbol !== undefined && x[Symbol.iterator] != null && typeof x[Symbol.iterator] === "function") {
-    return stableStringifyRecurse(Array.from(x), key);
+function createStoreData(id, parent) {
+  if (parent) {
+    return {
+      ...generateStoreData(id),
+      parent,
+      scopeConsumers: parent ? new Set : undefined
+    };
+  } else {
+    return generateStoreData(id);
   }
-  return `{${Object.keys(x).filter((k) => x[k] !== undefined).sort().map((k) => `${stableStringifyRecurse(k)}:${stableStringifyRecurse(x[k], k)}`).join(",")}}`;
-};
-var stableStringify = (x) => {
-  if (typeof x === "string" || typeof x === "boolean" || typeof x === "number")
-    return x;
-  return stableStringifyRecurse(x);
-};
-
-// src/atomFamily.ts
-var atomFamily = (defaultValue, debugLabel) => {
-  const map = new Map;
-  const atomFamily2 = (key, defaultOverride) => {
-    const keyStringified = stableStringify(key);
-    if (map.has(keyStringified)) {
-      return map.get(keyStringified);
-    }
-    const atomDebugLabel = debugLabel && debugLabel + "_" + keyStringified;
-    const newAtom = atom(typeof defaultValue === "function" ? () => defaultValue(key) : defaultValue, {
-      label: atomDebugLabel
-    });
-    newAtom.family = atomFamily2;
-    newAtom.familyKey = Object.freeze(key);
-    map.set(keyStringified, newAtom);
-    return newAtom;
-  };
-  atomFamily2._map = map;
-  return atomFamily2;
-};
-// src/lib/createStoreData.ts
-var generateId = () => (Math.random() + 1).toString(36).substring(7);
-var createStoreData = (id = generateId()) => ({
-  id,
-  values: new WeakMap,
-  expiredValues: new WeakMap,
-  subscriptions: new WeakMap,
-  subscriptionsRequireEqualCheck: new WeakMap,
-  stateConsumers: new WeakMap,
-  stateDependencies: new WeakMap
-});
+}
 
 // src/lib/resetAtom.ts
-var resetAtom = (atom2, data) => {
-  const res = initAtom(atom2, data);
-  if (!isPromiseLike(res)) {
-    propagateUpdatedAtoms([atom2], data);
+var resetAtom = (atom, data) => {
+  let value = getAtomInitValue(atom, data);
+  data.values.set(atom, value);
+  if (!isPromiseLike(value)) {
+    propagateUpdatedAtoms([atom], data);
   }
-  return res;
+  return value;
 };
 
+// src/utils/isFamily.ts
+var isFamily = (state) => isAtomFamily(state) || isSelectorFamily(state);
+
 // src/lib/unsubscribe.ts
-var unsubscribe = (state, subscription, data, mount) => {
+var unsubscribe = (state, subscription, data, mount, maxAgeCleanup) => {
   const subscribers = data.subscriptions.get(state);
   if (subscribers) {
     subscribers.delete(subscription);
@@ -401,6 +472,11 @@ var unsubscribe = (state, subscription, data, mount) => {
         data.subscriptionsRequireEqualCheck.delete(state);
       }
     }
+    if (subscribers.size === 0) {
+      if (maxAgeCleanup)
+        maxAgeCleanup();
+      data.subscriptions.delete(state);
+    }
     if (mount) {
       if (subscribers.size === mount.mountSubscriptions.size) {
         if (typeof mount.onUnmount === "function") {
@@ -418,10 +494,24 @@ var initSubscribers = (state, data) => {
   return set;
 };
 var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) => {
-  const subscribers = data.subscriptions.get(state) || initSubscribers(state, data);
+  let parentUnsubscribe;
+  if ("parent" in data && (!data.values.has(state) && isAtom(state) || isAtomFamily(state))) {
+    const originalCallback = callback;
+    parentUnsubscribe = subscribe(state, originalCallback, requireDeepEqualCheckBeforeCallback, data.parent);
+    callback = (arg) => {
+      if (parentUnsubscribe) {
+        parentUnsubscribe();
+        parentUnsubscribe = undefined;
+      }
+      originalCallback(arg);
+    };
+  } else if (!data.values.has(state) && isAtom(state)) {
+    initAtom(state, data);
+  }
   if (isSelector(state) && !data.values.has(state)) {
     initSelector(state, data);
   }
+  const subscribers = data.subscriptions.get(state) || initSubscribers(state, data);
   let subscription;
   if (isFamily(state)) {
     subscription = {
@@ -437,34 +527,67 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
   }
   subscribers.add(subscription);
   let mount;
-  if (subscribers.size === 1 && state.onMount) {
-    const store = storeFromStoreData(data);
-    const mountSubscriptions = new Set;
-    const originalSub = store.sub;
-    store.sub = (state2, callback2) => {
-      mountSubscriptions.add(callback2);
-      return originalSub(state2, callback2);
-    };
-    mount = {
-      onUnmount: state.onMount(store, state),
-      mountSubscriptions
-    };
+  let maxAgeCleanup;
+  if (subscribers.size === 1) {
+    if (isAtom(state) && state.maxAge) {
+      let timeout;
+      const interval = setInterval(() => {
+        let value = getAtomInitValue(state, data);
+        if (isPromiseLike(value)) {
+          if (state.staleWhileRevalidate) {
+            const oldValue = data.values.get(state);
+            timeout = setTimeout(() => {
+              const nowValue = data.values.get(state);
+              console.log("todo", oldValue);
+            }, state.staleWhileRevalidate);
+            value.then((res) => clearTimeout(timeout));
+          }
+        } else {
+          data.values.set(state, value);
+          propagateUpdatedAtoms([state], data);
+        }
+      }, state.maxAge);
+      maxAgeCleanup = () => {
+        clearInterval(interval);
+        if (timeout)
+          clearTimeout(timeout);
+      };
+    }
+    if (state.onMount) {
+      const store = storeFromStoreData(data);
+      const mountSubscriptions = new Set;
+      const originalSub = store.sub;
+      store.sub = (state2, callback2) => {
+        mountSubscriptions.add(callback2);
+        return originalSub(state2, callback2);
+      };
+      mount = {
+        onUnmount: state.onMount(store, state),
+        mountSubscriptions
+      };
+    }
   }
   if (requireDeepEqualCheckBeforeCallback && data.subscriptionsRequireEqualCheck.get(state) !== true) {
     data.subscriptionsRequireEqualCheck.set(state, true);
   }
-  return () => unsubscribe(state, subscription, data, mount);
+  return () => {
+    if (parentUnsubscribe) {
+      parentUnsubscribe();
+    }
+    unsubscribe(state, subscription, data, mount, maxAgeCleanup);
+  };
 };
 
 // src/lib/setAtoms.ts
-import equal5 from "fast-deep-equal";
 var setAtoms = (pairs, data) => {
   const updatedAtoms = [];
-  for (let [atom2, value] of pairs) {
-    const currentValue = getState(atom2, data);
-    if (!equal5(currentValue, value)) {
-      updatedAtoms.push(atom2);
-      data.values.set(atom2, value);
+  for (let [atom, value] of pairs) {
+    const currentValue = getState(atom, data);
+    if (!atom.equal(currentValue, value)) {
+      updatedAtoms.push(atom);
+      if (atom.onSet)
+        atom.onSet(value, data);
+      data.values.set(atom, value);
     }
   }
   propagateUpdatedAtoms(updatedAtoms, data);
@@ -491,11 +614,19 @@ var recursivlyResetTxnSelectorCache = (state, txnSubscribers, txnSelectorCache)
     }
   }
 };
-var transaction = (callback, data) => {
+var captureScopedTransaction = (scopedData) => {
+  let txn;
+  transaction((scopedTxn) => {
+    txn = scopedTxn;
+  }, scopedData, false);
+  return txn;
+};
+var transaction = (callback, data, autoCommit = true) => {
   let txnAtomMap = new Map;
   let txnSelectorCache = new Map;
   let txnSubscribers = new Map;
   let dirtySelectors = new Set;
+  let scopedTransactions;
   const txnGet = (state) => {
     if (isAtom(state)) {
       return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState(state, data);
@@ -516,127 +647,427 @@ var transaction = (callback, data) => {
       }
       txnSelectorCache.set(state, res);
       return res;
+    } else if (isFamily(state)) {
+      return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState(state.__keysSelector, data);
     } else {
       throw new Error("Unsupported state");
     }
   };
-  const txnSet = (atom2, value) => {
-    if (!isAtom(atom2))
+  const txnSet = (atom, value) => {
+    if (!isAtom(atom))
       throw new Error("Not an atom");
-    if (typeof value === "function") {
-      const currentValue = txnGet(atom2);
+    if (isFunction(value)) {
+      const currentValue = txnGet(atom);
       value = value(currentValue);
     }
-    for (const selector of findDependencies(atom2, data)) {
+    for (const selector of findDependencies(atom, data)) {
       dirtySelectors.add(selector);
       txnSelectorCache.delete(selector);
     }
-    if (txnSubscribers.get(atom2)?.size) {
-      recursivlyResetTxnSelectorCache(atom2, txnSubscribers, txnSelectorCache);
+    if (txnSubscribers.get(atom)?.size) {
+      recursivlyResetTxnSelectorCache(atom, txnSubscribers, txnSelectorCache);
     }
-    txnAtomMap.set(atom2, value);
+    txnAtomMap.set(atom, value);
+    return value;
   };
-  const txnReset = (atom2) => {
-    const value = getAtomInitValue(atom2, data);
-    txnAtomMap.set(atom2, value);
+  const txnReset = (atom) => {
+    const value = getAtomInitValue(atom, data);
+    txnAtomMap.set(atom, value);
     return value;
   };
   const commit = () => {
     setAtoms(txnAtomMap, data);
     dirtySelectors.clear();
+    if (scopedTransactions) {
+      for (const scopedTxn of Object.values(scopedTransactions)) {
+        scopedTxn.commit();
+      }
+    }
   };
-  const result = callback(txnSet, txnGet, txnReset, commit);
-  commit();
+  const result = callback({
+    set: txnSet,
+    get: txnGet,
+    reset: txnReset,
+    commit,
+    scope: (scopeId, callback2) => {
+      if (scopeId in data.scopes) {
+        const scopedData = data.scopes[scopeId];
+        if (scopedTransactions === undefined) {
+          scopedTransactions = {};
+        }
+        if (scopedTransactions[scopeId] === undefined) {
+          scopedTransactions[scopeId] = captureScopedTransaction(scopedData);
+        }
+        return callback2(scopedTransactions[scopeId]);
+      } else {
+        throw new Error(`Scope '${scopeId}' not found. Registered scopes: ${Object.keys(data.scopes).join(", ")}`);
+      }
+    },
+    data
+  });
+  if (autoCommit)
+    commit();
   return result;
 };
 
 // src/lib/storeFromStoreData.ts
-var storeFromStoreData = (data) => {
+var SelectorProvidedToSetError = `Invalid state object passed to set().
+You provided a \`selector\`.
+Only \`atom\` cam be set.
+`;
+var InvalidStateSetError = `Invalid state object passed to set().
+Only \`atom\` can be set.
+`;
+function storeFromStoreData(data, detach) {
   const get = (state) => getState(state, data);
   const set = (state, value) => {
-    if (!isAtom(state))
-      throw new Error("Invalid state object");
-    return setAtom(state, value, data);
+    if (isAtom(state))
+      return setAtom(state, value, data);
+    if (isSelector(state))
+      throw new Error(SelectorProvidedToSetError);
+    throw new Error(InvalidStateSetError);
   };
-  const reset = (atom2) => resetAtom(atom2, data);
+  const reset = (atom) => resetAtom(atom, data);
   const sub = (state, callback, deepEqualCheckBeforeCallback = true) => subscribe(state, callback, deepEqualCheckBeforeCallback, data);
   const txn = (callback) => transaction(callback, data);
-  return {
-    get,
-    set,
-    sub,
-    txn,
-    reset,
-    data
+  const scope = (scopeId) => {
+    let scopedStoreData;
+    if (scopeId in data.scopes) {
+      scopedStoreData = data.scopes[scopeId];
+    } else {
+      scopedStoreData = createStoreData(scopeId, data);
+      data.scopes[scopeId] = scopedStoreData;
+    }
+    const detach2 = () => {
+      scopedStoreData.scopeConsumers.delete(detach2);
+      if (scopedStoreData.scopeConsumers.size === 0) {
+        delete data.scopes[scopeId];
+      }
+    };
+    scopedStoreData.scopeConsumers.add(detach2);
+    const newStore = storeFromStoreData(data.scopes[scopeId], detach2);
+    return newStore;
   };
-};
+  if (detach) {
+    return {
+      get,
+      set,
+      sub,
+      txn,
+      reset,
+      data,
+      scope,
+      detach
+    };
+  } else {
+    return {
+      get,
+      set,
+      sub,
+      txn,
+      reset,
+      data,
+      scope
+    };
+  }
+}
 
-// src/createStore.ts
-var createStore = (id) => {
+// src/store.ts
+var store = (id) => {
   const data = createStoreData(id);
   return storeFromStoreData(data);
 };
+
+// src/globalStore.ts
+var globalStore = Object.assign(store("valdres-global-store"), {
+  atoms: new Map,
+  atomFamilies: new Map
+});
+
+// src/lib/globalAtom.ts
+var globalAtom = (defaultValue, options) => {
+  const stores = new Set;
+  let value;
+  let initialized = false;
+  let onReset;
+  if (options.onSet)
+    throw new Error("onSet on globalAtom is currently not supported");
+  const onInit = (setSelf2, data) => {
+    setSelf2(globalStore.get(atom));
+    if (!initialized && options.onInit) {
+      onReset = options.onInit((newVal) => {
+        setSelf2(newVal);
+        value = newVal;
+      }, data);
+      initialized = true;
+    }
+    stores.add(data);
+  };
+  const onSet = (newValue, currentStore) => {
+    value = newValue;
+    if (stores.size > 1) {
+      for (const store2 of stores) {
+        if (store2.id !== currentStore.id) {
+          setAtom(atom, value, store2, true);
+        }
+      }
+    }
+  };
+  const getSelf = () => globalStore.get(atom);
+  const setSelf = (newValue) => globalStore.set(atom, newValue);
+  const resetSelf = () => {
+    value = undefined;
+    initialized = false;
+    for (const store2 of stores) {
+      if (store2.stateDependencies.has(atom)) {
+        throw new Error("TODO: Reset support for stateDependencies");
+      }
+      store2.values.delete(atom);
+      store2.expiredValues.delete(atom);
+      propagateUpdatedAtoms([atom], store2);
+      stores.delete(store2);
+      onReset?.();
+    }
+  };
+  const atom = {
+    equal,
+    ...options,
+    defaultValue,
+    name: options?.name,
+    onInit,
+    onSet,
+    setSelf,
+    getSelf,
+    resetSelf,
+    get stores() {
+      return stores;
+    }
+  };
+  return atom;
+};
+
+// src/atom.ts
+function atom(defaultValue, options) {
+  if (!options)
+    return { equal, defaultValue };
+  if (options.global) {
+    return globalAtom(defaultValue, options);
+  }
+  return {
+    equal,
+    defaultValue,
+    ...options
+  };
+}
+// src/lib/atomFamilyAtom.ts
+function atomFamilyAtom(defaultValue, options) {
+  if (options.global) {
+    return globalAtom(defaultValue, options);
+  }
+  return {
+    ...options,
+    defaultValue
+  };
+}
+
+// src/lib/stableStringify.ts
+var stableStringifyRecurse = (x, key) => {
+  if (typeof x === "string" && !x.includes('"') && !x.includes("\\")) {
+    return `"${x}"`;
+  }
+  switch (typeof x) {
+    case "undefined":
+      return "";
+    case "boolean":
+      return x ? "true" : "false";
+    case "number":
+    case "symbol":
+      return String(x);
+    case "string":
+      return JSON.stringify(x);
+    case "function":
+      return `__FUNCTION(${x.toString()})__`;
+  }
+  if (x === null) {
+    return "null";
+  }
+  if (typeof x !== "object") {
+    return JSON.stringify(x) ?? "";
+  }
+  if (isPromiseLike(x)) {
+    return "__PROMISE__";
+  }
+  if (Array.isArray(x)) {
+    return `[${x.map((v, i) => stableStringifyRecurse(v, i.toString()))}]`;
+  }
+  if (typeof x.toJSON === "function") {
+    return stableStringifyRecurse(x.toJSON(key), key);
+  }
+  if (x instanceof Map) {
+    const obj = {};
+    for (const [k, v] of x) {
+      obj[typeof k === "string" ? k : stringify(k, opt)] = v;
+    }
+    return stableStringifyRecurse(obj, key);
+  }
+  if (x instanceof Set) {
+    return stableStringifyRecurse(Array.from(x).sort((a, b) => stableStringifyRecurse(a).localeCompare(stableStringifyRecurse(b))), key);
+  }
+  if (Symbol !== undefined && x[Symbol.iterator] != null && typeof x[Symbol.iterator] === "function") {
+    return stableStringifyRecurse(Array.from(x), key);
+  }
+  return `{${Object.keys(x).filter((k) => x[k] !== undefined).sort().map((k) => `${stableStringifyRecurse(k)}:${stableStringifyRecurse(x[k], k)}`).join(",")}}`;
+};
+var stableStringify = (x) => {
+  if (typeof x === "string" || typeof x === "boolean" || typeof x === "number")
+    return x;
+  return stableStringifyRecurse(x);
+};
+
+// src/selector.ts
+var selector = (get, options) => {
+  if (!options)
+    return { equal, get };
+  return { equal, ...options, get };
+};
+
+// src/lib/createAtomFamily.ts
+var createOptions = (options = {}, family, familyKey, keyStringified) => {
+  if (options.name) {
+    return {
+      equal,
+      ...options,
+      name: options?.name + "_" + keyStringified,
+      family,
+      familyKey
+    };
+  } else {
+    return { equal, ...options, family, familyKey };
+  }
+};
+var handleDefaultValue = (defaultValue, key) => {
+  if (isSelectorFamily(defaultValue))
+    return defaultValue(key);
+  if (typeof defaultValue === "function")
+    return () => defaultValue(key);
+  return defaultValue;
+};
+var createAtomFamily = (defaultValue, options) => {
+  const map = new Map;
+  const keysAtom = atom(new Set);
+  const atomFamily = Object.assign((key) => {
+    const keyStringified = stableStringify(key);
+    if (map.has(keyStringified)) {
+      return map.get(keyStringified);
+    }
+    const familyAtom = atomFamilyAtom(handleDefaultValue(defaultValue, key), createOptions(options, atomFamily, Object.freeze(key), keyStringified));
+    map.set(keyStringified, familyAtom);
+    return familyAtom;
+  }, {
+    __valdresAtomFamilyMap: map,
+    release: (key) => map.delete(key),
+    __keysAtom: keysAtom,
+    __keysSelector: selector((get) => Array.from(get(keysAtom)))
+  });
+  if (options?.name)
+    Object.defineProperty(atomFamily, "name", {
+      value: options.name,
+      writable: false
+    });
+  return atomFamily;
+};
+
+// src/lib/createGlobalAtomFamily.ts
+var createGlobalAtomFamily = (defaultValue, options) => {
+  if (!options.name)
+    throw new Error(`Missing name for global atomFamiliy`);
+  if (globalStore.atomFamilies.has(options.name)) {
+    return globalStore.atomFamilies.get(options.name);
+  }
+  const family = createAtomFamily(defaultValue, options);
+  globalStore.atomFamilies.set(options.name, family);
+  return family;
+};
+
+// src/atomFamily.ts
+function atomFamily(defaultValue, options) {
+  if (options?.global)
+    return createGlobalAtomFamily(defaultValue, options);
+  return createAtomFamily(defaultValue, options);
+}
 // src/createStoreWithSelectorSet.ts
-var setSelector = (selector, values, store) => {
-  return selector.set(store.set, store.get, store.reset, ...values);
+var setSelector = (selector2, values, store2) => {
+  return selector2.set(store2.set, store2.get, store2.reset, ...values);
 };
 var createStoreWithSelectorSet = (id) => {
   const data = createStoreData(id);
-  const store = storeFromStoreData(data);
-  store.set = (state, value, ...rest) => {
+  const store2 = storeFromStoreData(data);
+  store2.set = (state, value, ...rest) => {
     if (isAtom(state))
       return setAtom(state, value, data);
     if (isSelector(state))
-      return setSelector(state, [value, ...rest], store);
+      return setSelector(state, [value, ...rest], store2);
     throw new Error("Invalid state object");
   };
-  store.kind = "storeWithSelectorSet";
-  return store;
+  store2.kind = "storeWithSelectorSet";
+  return store2;
 };
-// src/getDefaultStore.ts
-if (!globalThis._valdresStore) {
-  globalThis._valdresStore = createStore("default");
-}
-var getDefaultStore = () => globalThis._valdresStore;
-var resetDefaultStore = () => globalThis._valdresStore = createStore();
-// src/selector.ts
-var selector = (get, debugLabel) => ({
-  get,
-  debugLabel
-});
 // src/selectorFamily.ts
-var selectorFamily = (get, debugLabel) => {
+var createOptions2 = (options = {}, family, familyKey, keyStringified) => {
+  if (options.name) {
+    return {
+      equal,
+      ...options,
+      name: options?.name + "_" + keyStringified,
+      family,
+      familyKey
+    };
+  } else {
+    return { equal, ...options, family, familyKey };
+  }
+};
+var selectorFamily = (get, options) => {
   const map = new Map;
   const selectorFamily2 = (key) => {
-    let keyStringified;
-    try {
-      keyStringified = stableStringify(key);
-    } catch (e) {
-      console.log(`errro`, { key, debugLabel, e });
-      throw e;
-    }
+    const keyStringified = stableStringify(key);
     if (map.has(keyStringified))
       return map.get(keyStringified);
-    const selectorDebugLabel = debugLabel ? debugLabel + "_" + keyStringified : undefined;
-    const newSelector = selector((selectorArgs) => get(key)(selectorArgs), selectorDebugLabel);
-    newSelector.family = selectorFamily2;
+    const newSelector = selector((selectorArgs) => get(key)(selectorArgs), createOptions2(options, selectorFamily2, key, keyStringified));
     map.set(keyStringified, newSelector);
     return newSelector;
   };
-  selectorFamily2._map = map;
+  selectorFamily2.__valdresSelectorFamilyMap = map;
+  if (options?.name)
+    Object.defineProperty(selectorFamily2, "name", {
+      value: options.name,
+      writable: false
+    });
   return selectorFamily2;
 };
+// src/utils/isFamilySelector.ts
+var isFamilySelector = (state) => isFamilyState(state) && isSelector(state);
+
+// src/index.ts
+if (globalThis.__valdres__) {
+  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${version}`);
+} else {
+  globalThis.__valdres__ = version;
+}
 export {
+  store,
   selectorFamily,
   selector,
-  resetDefaultStore,
+  isSelectorFamily,
   isSelector,
   isPromiseLike,
+  isFamilyState,
+  isFamilySelector,
+  isFamilyAtom,
   isFamily,
+  isAtomFamily,
   isAtom,
-  getDefaultStore,
+  globalStore,
   createStoreWithSelectorSet,
-  createStore,
   atomFamily,
   atom
 };