valdres 0.2.0-alpha.40 → 0.2.0-alpha.42

package/dist/index.js

@@ -132,7 +132,7 @@ var isSelectorFamily = (state) => state && Object.hasOwn(state, "__valdresSelect
 
 // src/lib/setAtom.ts
 var setAtom = (atom, newValue, data, skipOnSet = false) => {
-  const currentValue = getState2(atom, data);
+  const currentValue = getState(atom, data);
   if (typeof newValue === "function") {
     newValue = newValue(currentValue);
     if (isPromiseLike(newValue) || isPromiseLike(currentValue))
@@ -146,7 +146,7 @@ var setAtom = (atom, newValue, data, skipOnSet = false) => {
   if (currentValue?.__isEmptyAtomPromise__) {
     currentValue.__resolveEmptyAtomPromise__(newValue);
   }
-  propagateUpdatedAtoms2([atom], data);
+  propagateUpdatedAtoms([atom], data);
 };
 
 // src/lib/initAtom.ts
@@ -164,12 +164,12 @@ var getAtomInitValue = (atom, data) => {
     if (isPromiseLike(value)) {
       value.then((resolvedValue) => {
         data.values.set(atom, resolvedValue);
-        propagateUpdatedAtoms2([atom], data);
+        propagateUpdatedAtoms([atom], data);
       });
     }
     return value;
   } else if (isSelector(atom.defaultValue)) {
-    return getState2(atom.defaultValue, data);
+    return getState(atom.defaultValue, data);
   } else {
     return atom.defaultValue;
   }
@@ -178,7 +178,7 @@ var initAtom = (atom, data) => {
   let value = getAtomInitValue(atom, data);
   data.values.set(atom, value);
   if (isFamilyAtom(atom)) {
-    const currentKeySet = getState2(atom.family.__keysAtom, data);
+    const currentKeySet = getState(atom.family.__keysAtom, data);
     if (!currentKeySet.has(atom.familyKey)) {
       const newSet = new Set(currentKeySet);
       newSet.add(atom.familyKey);
@@ -194,22 +194,22 @@ var initAtom = (atom, data) => {
 };
 
 // src/lib/getState.ts
-function getState2(state, data) {
+function getState(state, data) {
   if (data.values.has(state))
     return data.values.get(state);
   if (isAtom(state)) {
     if ("parent" in data)
-      return getState2(state, data.parent);
+      return getState(state, data.parent);
     return initAtom(state, data);
   }
   if (isSelector(state))
-    return initSelector2(state, data);
+    return initSelector(state, data);
   if (isAtomFamily(state)) {
     if ("parent" in data) {
       const closestData = findClosestStoreWithAtomInitialized(state.__keysAtom, data);
-      return getState2(state.__keysSelector, closestData);
+      return getState(state.__keysSelector, closestData);
     }
-    return getState2(state.__keysSelector, data);
+    return getState(state.__keysSelector, data);
   }
   if (isSelectorFamily(state)) {
     const array = Array.from(state.__valdresSelectorFamilyMap.keys());
@@ -249,7 +249,7 @@ var evaluateSelector = (selector, data) => {
   let result;
   try {
     result = selector.get((state) => {
-      const value = getState2(state, data);
+      const value = getState(state, data);
       updatedDependencies.add(state);
       if (isPromiseLike(value))
         throw new SuspendAndWaitForResolveError(value);
@@ -278,7 +278,7 @@ var evaluateSelector = (selector, data) => {
 };
 var handleSelectorResult = (value, selector, data) => {
   if (value instanceof SuspendAndWaitForResolveError) {
-    value.promise.then(() => initSelector2(selector, data));
+    value.promise.then(() => initSelector(selector, data));
     return value.promise;
   } else if (isPromiseLike(value)) {
     value.then((resolved) => {
@@ -291,7 +291,7 @@ var handleSelectorResult = (value, selector, data) => {
     return value;
   }
 };
-var initSelector2 = (selector, data) => {
+var initSelector = (selector, data) => {
   const tmpValue = evaluateSelector(selector, data);
   const value = handleSelectorResult(tmpValue, selector, data);
   if (data.expiredValues.has(selector)) {
@@ -314,7 +314,7 @@ var updateSelectorSubscribers = (selector, data) => {
   if (subscribtions?.size && data.subscriptionsRequireEqualCheck.get(selector) || familySubscriptions?.size && selector.family && data.subscriptionsRequireEqualCheck.get(selector.family)) {
     try {
       const oldValue = data.expiredValues.get(selector);
-      const newValue = initSelector2(selector, data);
+      const newValue = initSelector(selector, data);
       if (selector.equal(newValue, oldValue))
         return;
     } catch (e) {
@@ -346,7 +346,7 @@ var recursivlyResetSelectorTree = (selectors, data, clearedSelectors) => {
     }
   }
 };
-var propagateUpdatedAtoms2 = (atoms, data) => {
+var propagateUpdatedAtoms = (atoms, data) => {
   const clearedSelectors = new Set;
   for (const atom of atoms) {
     const consumers = data.stateConsumers.get(atom);
@@ -369,17 +369,6 @@ var propagateUpdatedAtoms2 = (atoms, data) => {
 };
 
 // src/lib/createStoreData.ts
-function createStoreData(id, parent) {
-  if (parent) {
-    return {
-      ...generateStoreData(id),
-      parent,
-      scopeConsumers: parent ? new Set : undefined
-    };
-  } else {
-    return generateStoreData(id);
-  }
-}
 var generateId = () => (Math.random() + 1).toString(36).substring(7);
 var generateStoreData = (id = generateId()) => {
   return {
@@ -393,13 +382,24 @@ var generateStoreData = (id = generateId()) => {
     scopes: {}
   };
 };
+function createStoreData(id, parent) {
+  if (parent) {
+    return {
+      ...generateStoreData(id),
+      parent,
+      scopeConsumers: parent ? new Set : undefined
+    };
+  } else {
+    return generateStoreData(id);
+  }
+}
 
 // src/lib/resetAtom.ts
 var resetAtom = (atom, data) => {
   let value = getAtomInitValue(atom, data);
   data.values.set(atom, value);
   if (!isPromiseLike(value)) {
-    propagateUpdatedAtoms2([atom], data);
+    propagateUpdatedAtoms([atom], data);
   }
   return value;
 };
@@ -461,7 +461,7 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
     initAtom(state, data);
   }
   if (isSelector(state) && !data.values.has(state)) {
-    initSelector2(state, data);
+    initSelector(state, data);
   }
   const subscribers = data.subscriptions.get(state) || initSubscribers(state, data);
   let subscription;
@@ -496,7 +496,7 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
           }
         } else {
           data.values.set(state, value);
-          propagateUpdatedAtoms2([state], data);
+          propagateUpdatedAtoms([state], data);
         }
       }, state.maxAge);
       maxAgeCleanup = () => {
@@ -506,7 +506,7 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
       };
     }
     if (state.onMount) {
-      const store = storeFromStoreData2(data);
+      const store = storeFromStoreData(data);
       const mountSubscriptions = new Set;
       const originalSub = store.sub;
       store.sub = (state2, callback2) => {
@@ -534,7 +534,7 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
 var setAtoms = (pairs, data) => {
   const updatedAtoms = [];
   for (let [atom, value] of pairs) {
-    const currentValue = getState2(atom, data);
+    const currentValue = getState(atom, data);
     if (!atom.equal(currentValue, value)) {
       updatedAtoms.push(atom);
       if (atom.onSet)
@@ -542,7 +542,7 @@ var setAtoms = (pairs, data) => {
       data.values.set(atom, value);
     }
   }
-  propagateUpdatedAtoms2(updatedAtoms, data);
+  propagateUpdatedAtoms(updatedAtoms, data);
 };
 
 // src/lib/transaction.ts
@@ -573,7 +573,7 @@ var transaction = (callback, data) => {
   let dirtySelectors = new Set;
   const txnGet = (state) => {
     if (isAtom(state)) {
-      return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState2(state, data);
+      return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState(state, data);
     } else if (isSelector(state)) {
       if (txnSelectorCache.has(state)) {
         return txnSelectorCache.get(state);
@@ -626,8 +626,15 @@ var transaction = (callback, data) => {
 };
 
 // src/lib/storeFromStoreData.ts
-function storeFromStoreData2(data, detach) {
-  const get = (state) => getState2(state, 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))
       return setAtom(state, value, data);
@@ -653,7 +660,7 @@ function storeFromStoreData2(data, detach) {
       }
     };
     scopedStoreData.scopeConsumers.add(detach2);
-    const newStore = storeFromStoreData2(data.scopes[scopeId], detach2);
+    const newStore = storeFromStoreData(data.scopes[scopeId], detach2);
     return newStore;
   };
   if (detach) {
@@ -679,21 +686,14 @@ function storeFromStoreData2(data, detach) {
     };
   }
 }
-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.
-`;
 
 // src/store.ts
 var store = (id) => {
   const data = createStoreData(id);
-  return storeFromStoreData2(data);
+  return storeFromStoreData(data);
 };
 // package.json
-var version = "0.2.0-alpha.39";
+var version = "0.2.0-alpha.42";
 
 // src/globalStore.ts
 if (globalThis.__valdres__) {
@@ -728,9 +728,9 @@ var globalAtom = (defaultValue, options) => {
   const onSet = (newValue, currentStore) => {
     value = newValue;
     if (stores.size > 1) {
-      for (const store3 of stores) {
-        if (store3.id !== currentStore.id) {
-          setAtom(atom, value, store3, true);
+      for (const store2 of stores) {
+        if (store2.id !== currentStore.id) {
+          setAtom(atom, value, store2, true);
         }
       }
     }
@@ -740,14 +740,14 @@ var globalAtom = (defaultValue, options) => {
   const resetSelf = () => {
     value = undefined;
     initialized = false;
-    for (const store3 of stores) {
-      if (store3.stateDependencies.has(atom)) {
+    for (const store2 of stores) {
+      if (store2.stateDependencies.has(atom)) {
         throw new Error("TODO: Reset support for stateDependencies");
       }
-      store3.values.delete(atom);
-      store3.expiredValues.delete(atom);
-      propagateUpdatedAtoms2([atom], store3);
-      stores.delete(store3);
+      store2.values.delete(atom);
+      store2.expiredValues.delete(atom);
+      propagateUpdatedAtoms([atom], store2);
+      stores.delete(store2);
       onReset?.();
     }
   };
@@ -918,21 +918,21 @@ function atomFamily(defaultValue, options) {
   return createAtomFamily(defaultValue, options);
 }
 // src/createStoreWithSelectorSet.ts
-var setSelector = (selector3, values, store3) => {
-  return selector3.set(store3.set, store3.get, store3.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 store3 = storeFromStoreData2(data);
-  store3.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], store3);
+      return setSelector(state, [value, ...rest], store2);
     throw new Error("Invalid state object");
   };
-  store3.kind = "storeWithSelectorSet";
-  return store3;
+  store2.kind = "storeWithSelectorSet";
+  return store2;
 };
 // src/selectorFamily.ts
 var createOptions2 = (options = {}, family, familyKey, keyStringified) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.40",
+    "version": "0.2.0-alpha.42",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -36,5 +36,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "d0770d611cc9d4a64c08f7235672f3702fe31422"
+    "gitHead": "b4c3c333ef7903df31f8ef7cedd40b23e56e5dc4"
 }