@gaddario98/react-core 2.0.5 → 2.0.8

package/dist/auth/index.d.ts

@@ -1,9 +1,5 @@
 import * as _gaddario98_react_state from '@gaddario98/react-state';
 
-declare const authAtom: _gaddario98_react_state.PrimitiveAtom<AuthState | null>;
-declare const useAuthValue: () => AuthState | null;
-declare const useAuthState: () => [AuthState | null, (value: AuthState | null) => void];
-
 type AuthState = {
     id: string;
     accountVerified?: boolean;
@@ -13,5 +9,9 @@ type AuthState = {
     email?: string;
 };
 
+declare const authAtom: _gaddario98_react_state.PrimitiveAtom<AuthState | null>;
+declare const useAuthValue: () => AuthState | null;
+declare const useAuthState: () => [AuthState | null, (value: AuthState | null) => void];
+
 export { authAtom, useAuthState, useAuthValue };
 export type { AuthState };

package/dist/auth/index.js

@@ -4,6 +4,6 @@
   useState: useAuthState
 } = reactState.atomStateGenerator({
   defaultValue: null,
-  key: 'reactAuthStore',
+  key: "reactAuthStore",
   persist: true
 });exports.authAtom=authAtom;exports.useAuthState=useAuthState;exports.useAuthValue=useAuthValue;//# sourceMappingURL=index.js.map

package/dist/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../auth/state.ts"],"sourcesContent":["import { atomStateGenerator } from '@gaddario98/react-state'\nimport type { AuthState } from '.'\n\nconst {\n  atom: authAtom,\n  useValue: useAuthValue,\n  useState: useAuthState,\n} = atomStateGenerator<AuthState | null>({\n  defaultValue: null,\n  key: 'reactAuthStore',\n  persist: true,\n})\nexport { authAtom, useAuthValue, useAuthState }\n"],"names":["atom","authAtom","useValue","useAuthValue","useState","useAuthState","atomStateGenerator","defaultValue","key","persist"],"mappings":"+DAGA,MAAM;AACJA,EAAAA,IAAI,EAAEC,QAAQ;AACdC,EAAAA,QAAQ,EAAEC,YAAY;AACtBC,EAAAA,QAAQ,EAAEC;AAAY,CACvB,GAAGC,6BAAkB,CAAmB;AACvCC,EAAAA,YAAY,EAAE,IAAI;AAClBC,EAAAA,GAAG,EAAE,gBAAgB;AACrBC,EAAAA,OAAO,EAAE;AACV,CAAA"}
+{"version":3,"file":"index.js","sources":["../../auth/state.ts"],"sourcesContent":["import { atomStateGenerator } from \"@gaddario98/react-state\";\nimport type { AuthState } from \"./types\";\n\nconst {\n  atom: authAtom,\n  useValue: useAuthValue,\n  useState: useAuthState,\n} = atomStateGenerator<AuthState | null>({\n  defaultValue: null,\n  key: \"reactAuthStore\",\n  persist: true,\n});\nexport { authAtom, useAuthValue, useAuthState };\n"],"names":["atom","authAtom","useValue","useAuthValue","useState","useAuthState","atomStateGenerator","defaultValue","key","persist"],"mappings":"+DAGA,MAAM;AACJA,EAAAA,IAAI,EAAEC,QAAQ;AACdC,EAAAA,QAAQ,EAAEC,YAAY;AACtBC,EAAAA,QAAQ,EAAEC;AAAY,CACvB,GAAGC,6BAAkB,CAAmB;AACvCC,EAAAA,YAAY,EAAE,IAAI;AAClBC,EAAAA,GAAG,EAAE,gBAAgB;AACrBC,EAAAA,OAAO,EAAE;AACV,CAAA"}

package/dist/auth/index.mjs

@@ -4,6 +4,6 @@ import {atomStateGenerator}from'@gaddario98/react-state';const {
   useState: useAuthState
 } = atomStateGenerator({
   defaultValue: null,
-  key: 'reactAuthStore',
+  key: "reactAuthStore",
   persist: true
 });export{authAtom,useAuthState,useAuthValue};//# sourceMappingURL=index.mjs.map

package/dist/auth/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../auth/state.ts"],"sourcesContent":["import { atomStateGenerator } from '@gaddario98/react-state'\nimport type { AuthState } from '.'\n\nconst {\n  atom: authAtom,\n  useValue: useAuthValue,\n  useState: useAuthState,\n} = atomStateGenerator<AuthState | null>({\n  defaultValue: null,\n  key: 'reactAuthStore',\n  persist: true,\n})\nexport { authAtom, useAuthValue, useAuthState }\n"],"names":["atom","authAtom","useValue","useAuthValue","useState","useAuthState","atomStateGenerator","defaultValue","key","persist"],"mappings":"yDAGA,MAAM;AACJA,EAAAA,IAAI,EAAEC,QAAQ;AACdC,EAAAA,QAAQ,EAAEC,YAAY;AACtBC,EAAAA,QAAQ,EAAEC;AAAY,CACvB,GAAGC,kBAAkB,CAAmB;AACvCC,EAAAA,YAAY,EAAE,IAAI;AAClBC,EAAAA,GAAG,EAAE,gBAAgB;AACrBC,EAAAA,OAAO,EAAE;AACV,CAAA"}
+{"version":3,"file":"index.mjs","sources":["../../auth/state.ts"],"sourcesContent":["import { atomStateGenerator } from \"@gaddario98/react-state\";\nimport type { AuthState } from \"./types\";\n\nconst {\n  atom: authAtom,\n  useValue: useAuthValue,\n  useState: useAuthState,\n} = atomStateGenerator<AuthState | null>({\n  defaultValue: null,\n  key: \"reactAuthStore\",\n  persist: true,\n});\nexport { authAtom, useAuthValue, useAuthState };\n"],"names":["atom","authAtom","useValue","useAuthValue","useState","useAuthState","atomStateGenerator","defaultValue","key","persist"],"mappings":"yDAGA,MAAM;AACJA,EAAAA,IAAI,EAAEC,QAAQ;AACdC,EAAAA,QAAQ,EAAEC,YAAY;AACtBC,EAAAA,QAAQ,EAAEC;AAAY,CACvB,GAAGC,kBAAkB,CAAmB;AACvCC,EAAAA,YAAY,EAAE,IAAI;AAClBC,EAAAA,GAAG,EAAE,gBAAgB;AACrBC,EAAAA,OAAO,EAAE;AACV,CAAA"}

package/dist/form/index.js

@@ -1,11 +1,11 @@
-'use strict';var reactState=require('@gaddario98/react-state'),compilerRuntime=require('react/compiler-runtime'),jsxRuntime=require('react/jsx-runtime'),React=require('react'),equal=require('fast-deep-equal'),withSelector_js=require('use-sync-external-store/shim/with-selector.js');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var React__namespace=/*#__PURE__*/_interopNamespaceDefault(React);const DefaultContainer = ({
+'use strict';var reactState=require('@gaddario98/react-state'),compilerRuntime=require('react/compiler-runtime'),jsxRuntime=require('react/jsx-runtime'),React=require('react'),equal=require('fast-deep-equal'),withSelector_js=require('use-sync-external-store/shim/with-selector.js');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var React__namespace=/*#__PURE__*/_interopNamespaceDefault(React);const DefaultContainer$1 = ({
   children
 }) => {
   return children;
 };
 // Lazy initialization to avoid side effects at module load time
 const _formConfig = {
-  formFieldContainer: DefaultContainer
+  formFieldContainer: DefaultContainer$1
 };
 const {
   atom: formConfigAtom,
@@ -1343,7 +1343,17 @@ class FormApi {
     };
     this.validateField = (field, cause) => {
       const fieldInstance = this.fieldInfo[field]?.instance;
-      if (!fieldInstance) return [];
+      if (!fieldInstance) {
+        const {
+          hasErrored
+        } = this.validateSync(cause);
+        if (hasErrored && !this.options.asyncAlways) {
+          return this.getFieldMeta(field)?.errors ?? [];
+        }
+        return this.validateAsync(cause).then(() => {
+          return this.getFieldMeta(field)?.errors ?? [];
+        });
+      }
       if (!fieldInstance.state.meta.isTouched) {
         fieldInstance.setMeta(prev => ({
           ...prev,
@@ -2030,7 +2040,7 @@ class FormApi {
           if (!prevBaseMeta || currBaseMeta.errorMap !== prevBaseMeta.errorMap) {
             fieldErrors = Object.values(currBaseMeta.errorMap ?? {}).filter(val => val !== void 0);
             const fieldInstance = this.getFieldInfo(fieldName)?.instance;
-            if (fieldInstance && !fieldInstance.options.disableErrorFlat) {
+            if (!fieldInstance || !fieldInstance.options.disableErrorFlat) {
               fieldErrors = fieldErrors.flat(1);
             }
           }
@@ -3109,29 +3119,22 @@ function getMountedOrPendingDependents(atom, atomState, mountedMap) {
   }
   return dependents;
 }
-const atomRead = (_store, atom, ...params) => atom.read(...params);
-const atomWrite = (_store, atom, ...params) => atom.write(...params);
-const atomOnInit = (store, atom) => {
-  if (atom.INTERNAL_onInit) {
-    return atom.INTERNAL_onInit(store);
-  }
-  if (atom.unstable_onInit) {
-    console.warn(
-      "[DEPRECATED] atom.unstable_onInit is renamed to atom.INTERNAL_onInit."
-    );
-    return atom.unstable_onInit(store);
-  }
+const BUILDING_BLOCK_atomRead = (_store, atom, ...params) => atom.read(...params);
+const BUILDING_BLOCK_atomWrite = (_store, atom, ...params) => atom.write(...params);
+const BUILDING_BLOCK_atomOnInit = (store, atom) => {
+  var _a;
+  return (_a = atom.INTERNAL_onInit) == null ? void 0 : _a.call(atom, store);
 };
-const atomOnMount = (_store, atom, setAtom) => {
+const BUILDING_BLOCK_atomOnMount = (_store, atom, setAtom) => {
   var _a;
   return (_a = atom.onMount) == null ? void 0 : _a.call(atom, setAtom);
 };
-const ensureAtomState = (store, atom) => {
+const BUILDING_BLOCK_ensureAtomState = (store, atom) => {
   var _a;
   const buildingBlocks = getInternalBuildingBlocks(store);
   const atomStateMap = buildingBlocks[0];
   const storeHooks = buildingBlocks[6];
-  const atomOnInit2 = buildingBlocks[9];
+  const atomOnInit = buildingBlocks[9];
   if ((undefined ? undefined.MODE : void 0) !== "production" && !atom) {
     throw new Error("Atom is undefined or null");
   }
@@ -3140,18 +3143,18 @@ const ensureAtomState = (store, atom) => {
     atomState = { d: /* @__PURE__ */ new Map(), p: /* @__PURE__ */ new Set(), n: 0 };
     atomStateMap.set(atom, atomState);
     (_a = storeHooks.i) == null ? void 0 : _a.call(storeHooks, atom);
-    atomOnInit2 == null ? void 0 : atomOnInit2(store, atom);
+    atomOnInit == null ? void 0 : atomOnInit(store, atom);
   }
   return atomState;
 };
-const flushCallbacks = (store) => {
+const BUILDING_BLOCK_flushCallbacks = (store) => {
   const buildingBlocks = getInternalBuildingBlocks(store);
   const mountedMap = buildingBlocks[1];
   const changedAtoms = buildingBlocks[3];
   const mountCallbacks = buildingBlocks[4];
   const unmountCallbacks = buildingBlocks[5];
   const storeHooks = buildingBlocks[6];
-  const recomputeInvalidatedAtoms2 = buildingBlocks[13];
+  const recomputeInvalidatedAtoms = buildingBlocks[13];
   const errors = [];
   const call = (fn) => {
     try {
@@ -3177,28 +3180,28 @@ const flushCallbacks = (store) => {
     mountCallbacks.clear();
     callbacks.forEach(call);
     if (changedAtoms.size) {
-      recomputeInvalidatedAtoms2(store);
+      recomputeInvalidatedAtoms(store);
     }
   } while (changedAtoms.size || unmountCallbacks.size || mountCallbacks.size);
   if (errors.length) {
     throw new AggregateError(errors);
   }
 };
-const recomputeInvalidatedAtoms = (store) => {
+const BUILDING_BLOCK_recomputeInvalidatedAtoms = (store) => {
   const buildingBlocks = getInternalBuildingBlocks(store);
   const mountedMap = buildingBlocks[1];
   const invalidatedAtoms = buildingBlocks[2];
   const changedAtoms = buildingBlocks[3];
-  const ensureAtomState2 = buildingBlocks[11];
-  const readAtomState2 = buildingBlocks[14];
-  const mountDependencies2 = buildingBlocks[17];
+  const ensureAtomState = buildingBlocks[11];
+  const readAtomState = buildingBlocks[14];
+  const mountDependencies = buildingBlocks[17];
   const topSortedReversed = [];
   const visiting = /* @__PURE__ */ new WeakSet();
   const visited = /* @__PURE__ */ new WeakSet();
   const stack = Array.from(changedAtoms);
   while (stack.length) {
     const a = stack[stack.length - 1];
-    const aState = ensureAtomState2(store, a);
+    const aState = ensureAtomState(store, a);
     if (visited.has(a)) {
       stack.pop();
       continue;
@@ -3230,35 +3233,36 @@ const recomputeInvalidatedAtoms = (store) => {
       }
     }
     if (hasChangedDeps) {
-      readAtomState2(store, a);
-      mountDependencies2(store, a);
+      readAtomState(store, a);
+      mountDependencies(store, a);
     }
     invalidatedAtoms.delete(a);
   }
 };
 const storeMutationSet = /* @__PURE__ */ new WeakSet();
-const readAtomState = (store, atom) => {
+const BUILDING_BLOCK_readAtomState = (store, atom) => {
   var _a, _b;
   const buildingBlocks = getInternalBuildingBlocks(store);
   const mountedMap = buildingBlocks[1];
   const invalidatedAtoms = buildingBlocks[2];
   const changedAtoms = buildingBlocks[3];
   const storeHooks = buildingBlocks[6];
-  const atomRead2 = buildingBlocks[7];
-  const ensureAtomState2 = buildingBlocks[11];
-  const flushCallbacks2 = buildingBlocks[12];
-  const recomputeInvalidatedAtoms2 = buildingBlocks[13];
-  const readAtomState2 = buildingBlocks[14];
-  const writeAtomState2 = buildingBlocks[16];
-  const mountDependencies2 = buildingBlocks[17];
-  const atomState = ensureAtomState2(store, atom);
+  const atomRead = buildingBlocks[7];
+  const ensureAtomState = buildingBlocks[11];
+  const flushCallbacks = buildingBlocks[12];
+  const recomputeInvalidatedAtoms = buildingBlocks[13];
+  const readAtomState = buildingBlocks[14];
+  const writeAtomState = buildingBlocks[16];
+  const mountDependencies = buildingBlocks[17];
+  const setAtomStateValueOrPromise = buildingBlocks[20];
+  const atomState = ensureAtomState(store, atom);
   if (isAtomStateInitialized(atomState)) {
     if (mountedMap.has(atom) && invalidatedAtoms.get(atom) !== atomState.n) {
       return atomState;
     }
     let hasChangedDeps = false;
     for (const [a, n] of atomState.d) {
-      if (readAtomState2(store, a).n !== n) {
+      if (readAtomState(store, a).n !== n) {
         hasChangedDeps = true;
         break;
       }
@@ -3271,15 +3275,15 @@ const readAtomState = (store, atom) => {
   let isSync = true;
   function mountDependenciesIfAsync() {
     if (mountedMap.has(atom)) {
-      mountDependencies2(store, atom);
-      recomputeInvalidatedAtoms2(store);
-      flushCallbacks2(store);
+      mountDependencies(store, atom);
+      recomputeInvalidatedAtoms(store);
+      flushCallbacks(store);
     }
   }
   function getter(a) {
     var _a2;
     if (a === atom) {
-      const aState2 = ensureAtomState2(store, a);
+      const aState2 = ensureAtomState(store, a);
       if (!isAtomStateInitialized(aState2)) {
         if (hasInitialValue(a)) {
           setAtomStateValueOrPromise(store, a, a.init);
@@ -3289,7 +3293,7 @@ const readAtomState = (store, atom) => {
       }
       return returnAtomValue(aState2);
     }
-    const aState = readAtomState2(store, a);
+    const aState = readAtomState(store, a);
     try {
       return returnAtomValue(aState);
     } finally {
@@ -3315,6 +3319,11 @@ const readAtomState = (store, atom) => {
       return controller.signal;
     },
     get setSelf() {
+      if ((undefined ? undefined.MODE : void 0) !== "production") {
+        console.warn(
+          "[DEPRECATED] setSelf is deprecated and will be removed in v3."
+        );
+      }
       if ((undefined ? undefined.MODE : void 0) !== "production" && !isActuallyWritableAtom(atom)) {
         console.warn("setSelf function cannot be used with read-only atom");
       }
@@ -3325,10 +3334,10 @@ const readAtomState = (store, atom) => {
           }
           if (!isSync) {
             try {
-              return writeAtomState2(store, atom, ...args);
+              return writeAtomState(store, atom, ...args);
             } finally {
-              recomputeInvalidatedAtoms2(store);
-              flushCallbacks2(store);
+              recomputeInvalidatedAtoms(store);
+              flushCallbacks(store);
             }
           }
         };
@@ -3341,7 +3350,7 @@ const readAtomState = (store, atom) => {
     if ((undefined ? undefined.MODE : void 0) !== "production") {
       storeMutationSet.delete(store);
     }
-    const valueOrPromise = atomRead2(store, atom, getter, options);
+    const valueOrPromise = atomRead(store, atom, getter, options);
     if ((undefined ? undefined.MODE : void 0) !== "production" && storeMutationSet.has(store)) {
       console.warn(
         "Detected store mutation during atom read. This is not supported."
@@ -3368,38 +3377,40 @@ const readAtomState = (store, atom) => {
     }
   }
 };
-const invalidateDependents = (store, atom) => {
+const BUILDING_BLOCK_invalidateDependents = (store, atom) => {
   const buildingBlocks = getInternalBuildingBlocks(store);
   const mountedMap = buildingBlocks[1];
   const invalidatedAtoms = buildingBlocks[2];
-  const ensureAtomState2 = buildingBlocks[11];
+  const ensureAtomState = buildingBlocks[11];
   const stack = [atom];
   while (stack.length) {
     const a = stack.pop();
-    const aState = ensureAtomState2(store, a);
+    const aState = ensureAtomState(store, a);
     for (const d of getMountedOrPendingDependents(a, aState, mountedMap)) {
-      const dState = ensureAtomState2(store, d);
+      const dState = ensureAtomState(store, d);
       invalidatedAtoms.set(d, dState.n);
       stack.push(d);
     }
   }
 };
-const writeAtomState = (store, atom, ...args) => {
+const BUILDING_BLOCK_writeAtomState = (store, atom, ...args) => {
   const buildingBlocks = getInternalBuildingBlocks(store);
   const changedAtoms = buildingBlocks[3];
   const storeHooks = buildingBlocks[6];
-  const atomWrite2 = buildingBlocks[8];
-  const ensureAtomState2 = buildingBlocks[11];
-  const flushCallbacks2 = buildingBlocks[12];
-  const recomputeInvalidatedAtoms2 = buildingBlocks[13];
-  const readAtomState2 = buildingBlocks[14];
-  const invalidateDependents2 = buildingBlocks[15];
-  const mountDependencies2 = buildingBlocks[17];
+  const atomWrite = buildingBlocks[8];
+  const ensureAtomState = buildingBlocks[11];
+  const flushCallbacks = buildingBlocks[12];
+  const recomputeInvalidatedAtoms = buildingBlocks[13];
+  const readAtomState = buildingBlocks[14];
+  const invalidateDependents = buildingBlocks[15];
+  const writeAtomState = buildingBlocks[16];
+  const mountDependencies = buildingBlocks[17];
+  const setAtomStateValueOrPromise = buildingBlocks[20];
   let isSync = true;
-  const getter = (a) => returnAtomValue(readAtomState2(store, a));
+  const getter = (a) => returnAtomValue(readAtomState(store, a));
   const setter = (a, ...args2) => {
     var _a;
-    const aState = ensureAtomState2(store, a);
+    const aState = ensureAtomState(store, a);
     try {
       if (a === atom) {
         if (!hasInitialValue(a)) {
@@ -3411,10 +3422,10 @@ const writeAtomState = (store, atom, ...args) => {
         const prevEpochNumber = aState.n;
         const v = args2[0];
         setAtomStateValueOrPromise(store, a, v);
-        mountDependencies2(store, a);
+        mountDependencies(store, a);
         if (prevEpochNumber !== aState.n) {
           changedAtoms.add(a);
-          invalidateDependents2(store, a);
+          invalidateDependents(store, a);
           (_a = storeHooks.c) == null ? void 0 : _a.call(storeHooks, a);
         }
         return void 0;
@@ -3423,39 +3434,39 @@ const writeAtomState = (store, atom, ...args) => {
       }
     } finally {
       if (!isSync) {
-        recomputeInvalidatedAtoms2(store);
-        flushCallbacks2(store);
+        recomputeInvalidatedAtoms(store);
+        flushCallbacks(store);
       }
     }
   };
   try {
-    return atomWrite2(store, atom, getter, setter, ...args);
+    return atomWrite(store, atom, getter, setter, ...args);
   } finally {
     isSync = false;
   }
 };
-const mountDependencies = (store, atom) => {
+const BUILDING_BLOCK_mountDependencies = (store, atom) => {
   var _a;
   const buildingBlocks = getInternalBuildingBlocks(store);
   const mountedMap = buildingBlocks[1];
   const changedAtoms = buildingBlocks[3];
   const storeHooks = buildingBlocks[6];
-  const ensureAtomState2 = buildingBlocks[11];
-  const invalidateDependents2 = buildingBlocks[15];
-  const mountAtom2 = buildingBlocks[18];
-  const unmountAtom2 = buildingBlocks[19];
-  const atomState = ensureAtomState2(store, atom);
+  const ensureAtomState = buildingBlocks[11];
+  const invalidateDependents = buildingBlocks[15];
+  const mountAtom = buildingBlocks[18];
+  const unmountAtom = buildingBlocks[19];
+  const atomState = ensureAtomState(store, atom);
   const mounted = mountedMap.get(atom);
   if (mounted && !isPendingPromise(atomState.v)) {
     for (const [a, n] of atomState.d) {
       if (!mounted.d.has(a)) {
-        const aState = ensureAtomState2(store, a);
-        const aMounted = mountAtom2(store, a);
+        const aState = ensureAtomState(store, a);
+        const aMounted = mountAtom(store, a);
         aMounted.t.add(atom);
         mounted.d.add(a);
         if (n !== aState.n) {
           changedAtoms.add(a);
-          invalidateDependents2(store, a);
+          invalidateDependents(store, a);
           (_a = storeHooks.c) == null ? void 0 : _a.call(storeHooks, a);
         }
       }
@@ -3463,28 +3474,29 @@ const mountDependencies = (store, atom) => {
     for (const a of mounted.d) {
       if (!atomState.d.has(a)) {
         mounted.d.delete(a);
-        const aMounted = unmountAtom2(store, a);
+        const aMounted = unmountAtom(store, a);
         aMounted == null ? void 0 : aMounted.t.delete(atom);
       }
     }
   }
 };
-const mountAtom = (store, atom) => {
+const BUILDING_BLOCK_mountAtom = (store, atom) => {
   var _a;
   const buildingBlocks = getInternalBuildingBlocks(store);
   const mountedMap = buildingBlocks[1];
   const mountCallbacks = buildingBlocks[4];
   const storeHooks = buildingBlocks[6];
-  const atomOnMount2 = buildingBlocks[10];
-  const ensureAtomState2 = buildingBlocks[11];
-  const flushCallbacks2 = buildingBlocks[12];
-  const recomputeInvalidatedAtoms2 = buildingBlocks[13];
-  const readAtomState2 = buildingBlocks[14];
-  const writeAtomState2 = buildingBlocks[16];
-  const atomState = ensureAtomState2(store, atom);
+  const atomOnMount = buildingBlocks[10];
+  const ensureAtomState = buildingBlocks[11];
+  const flushCallbacks = buildingBlocks[12];
+  const recomputeInvalidatedAtoms = buildingBlocks[13];
+  const readAtomState = buildingBlocks[14];
+  const writeAtomState = buildingBlocks[16];
+  const mountAtom = buildingBlocks[18];
+  const atomState = ensureAtomState(store, atom);
   let mounted = mountedMap.get(atom);
   if (!mounted) {
-    readAtomState2(store, atom);
+    readAtomState(store, atom);
     for (const a of atomState.d.keys()) {
       const aMounted = mountAtom(store, a);
       aMounted.t.add(atom);
@@ -3500,16 +3512,16 @@ const mountAtom = (store, atom) => {
         let isSync = true;
         const setAtom = (...args) => {
           try {
-            return writeAtomState2(store, atom, ...args);
+            return writeAtomState(store, atom, ...args);
           } finally {
             if (!isSync) {
-              recomputeInvalidatedAtoms2(store);
-              flushCallbacks2(store);
+              recomputeInvalidatedAtoms(store);
+              flushCallbacks(store);
             }
           }
         };
         try {
-          const onUnmount = atomOnMount2(store, atom, setAtom);
+          const onUnmount = atomOnMount(store, atom, setAtom);
           if (onUnmount) {
             mounted.u = () => {
               isSync = true;
@@ -3530,15 +3542,15 @@ const mountAtom = (store, atom) => {
   }
   return mounted;
 };
-const unmountAtom = (store, atom) => {
+const BUILDING_BLOCK_unmountAtom = (store, atom) => {
   var _a, _b;
   const buildingBlocks = getInternalBuildingBlocks(store);
   const mountedMap = buildingBlocks[1];
   const unmountCallbacks = buildingBlocks[5];
   const storeHooks = buildingBlocks[6];
-  const ensureAtomState2 = buildingBlocks[11];
-  const unmountAtom2 = buildingBlocks[19];
-  const atomState = ensureAtomState2(store, atom);
+  const ensureAtomState = buildingBlocks[11];
+  const unmountAtom = buildingBlocks[19];
+  const atomState = ensureAtomState(store, atom);
   let mounted = mountedMap.get(atom);
   if (!mounted || mounted.l.size) {
     return mounted;
@@ -3557,7 +3569,7 @@ const unmountAtom = (store, atom) => {
     mounted = void 0;
     mountedMap.delete(atom);
     for (const a of atomState.d.keys()) {
-      const aMounted = unmountAtom2(store, a);
+      const aMounted = unmountAtom(store, a);
       aMounted == null ? void 0 : aMounted.t.delete(atom);
     }
     (_b = storeHooks.u) == null ? void 0 : _b.call(storeHooks, atom);
@@ -3565,9 +3577,9 @@ const unmountAtom = (store, atom) => {
   }
   return mounted;
 };
-const setAtomStateValueOrPromise = (store, atom, valueOrPromise) => {
-  const ensureAtomState2 = getInternalBuildingBlocks(store)[11];
-  const atomState = ensureAtomState2(store, atom);
+const BUILDING_BLOCK_setAtomStateValueOrPromise = (store, atom, valueOrPromise) => {
+  const ensureAtomState = getInternalBuildingBlocks(store)[11];
+  const atomState = ensureAtomState(store, atom);
   const hasPrevValue = "v" in atomState;
   const prevValue = atomState.v;
   if (isPromiseLike$1(valueOrPromise)) {
@@ -3575,7 +3587,7 @@ const setAtomStateValueOrPromise = (store, atom, valueOrPromise) => {
       addPendingPromiseToDependency(
         atom,
         valueOrPromise,
-        ensureAtomState2(store, a)
+        ensureAtomState(store, a)
       );
     }
   }
@@ -3588,35 +3600,35 @@ const setAtomStateValueOrPromise = (store, atom, valueOrPromise) => {
     }
   }
 };
-const storeGet = (store, atom) => {
-  const readAtomState2 = getInternalBuildingBlocks(store)[14];
-  return returnAtomValue(readAtomState2(store, atom));
+const BUILDING_BLOCK_storeGet = (store, atom) => {
+  const readAtomState = getInternalBuildingBlocks(store)[14];
+  return returnAtomValue(readAtomState(store, atom));
 };
-const storeSet = (store, atom, ...args) => {
+const BUILDING_BLOCK_storeSet = (store, atom, ...args) => {
   const buildingBlocks = getInternalBuildingBlocks(store);
-  const flushCallbacks2 = buildingBlocks[12];
-  const recomputeInvalidatedAtoms2 = buildingBlocks[13];
-  const writeAtomState2 = buildingBlocks[16];
+  const flushCallbacks = buildingBlocks[12];
+  const recomputeInvalidatedAtoms = buildingBlocks[13];
+  const writeAtomState = buildingBlocks[16];
   try {
-    return writeAtomState2(store, atom, ...args);
+    return writeAtomState(store, atom, ...args);
   } finally {
-    recomputeInvalidatedAtoms2(store);
-    flushCallbacks2(store);
+    recomputeInvalidatedAtoms(store);
+    flushCallbacks(store);
   }
 };
-const storeSub = (store, atom, listener) => {
+const BUILDING_BLOCK_storeSub = (store, atom, listener) => {
   const buildingBlocks = getInternalBuildingBlocks(store);
-  const flushCallbacks2 = buildingBlocks[12];
-  const mountAtom2 = buildingBlocks[18];
-  const unmountAtom2 = buildingBlocks[19];
-  const mounted = mountAtom2(store, atom);
+  const flushCallbacks = buildingBlocks[12];
+  const mountAtom = buildingBlocks[18];
+  const unmountAtom = buildingBlocks[19];
+  const mounted = mountAtom(store, atom);
   const listeners = mounted.l;
   listeners.add(listener);
-  flushCallbacks2(store);
+  flushCallbacks(store);
   return () => {
     listeners.delete(listener);
-    unmountAtom2(store, atom);
-    flushCallbacks2(store);
+    unmountAtom(store, atom);
+    flushCallbacks(store);
   };
 };
 const buildingBlockMap = /* @__PURE__ */ new WeakMap();
@@ -3632,16 +3644,16 @@ const getInternalBuildingBlocks = (store) => {
 function buildStore(...buildArgs) {
   const store = {
     get(atom) {
-      const storeGet2 = getInternalBuildingBlocks(store)[21];
-      return storeGet2(store, atom);
+      const storeGet = getInternalBuildingBlocks(store)[21];
+      return storeGet(store, atom);
     },
     set(atom, ...args) {
-      const storeSet2 = getInternalBuildingBlocks(store)[22];
-      return storeSet2(store, atom, ...args);
+      const storeSet = getInternalBuildingBlocks(store)[22];
+      return storeSet(store, atom, ...args);
     },
     sub(atom, listener) {
-      const storeSub2 = getInternalBuildingBlocks(store)[23];
-      return storeSub2(store, atom, listener);
+      const storeSub = getInternalBuildingBlocks(store)[23];
+      return storeSub(store, atom, listener);
     }
   };
   const buildingBlocks = [
@@ -3661,24 +3673,24 @@ function buildStore(...buildArgs) {
     {},
     // storeHooks
     // atom interceptors
-    atomRead,
-    atomWrite,
-    atomOnInit,
-    atomOnMount,
+    BUILDING_BLOCK_atomRead,
+    BUILDING_BLOCK_atomWrite,
+    BUILDING_BLOCK_atomOnInit,
+    BUILDING_BLOCK_atomOnMount,
     // building-block functions
-    ensureAtomState,
-    flushCallbacks,
-    recomputeInvalidatedAtoms,
-    readAtomState,
-    invalidateDependents,
-    writeAtomState,
-    mountDependencies,
-    mountAtom,
-    unmountAtom,
-    setAtomStateValueOrPromise,
-    storeGet,
-    storeSet,
-    storeSub,
+    BUILDING_BLOCK_ensureAtomState,
+    BUILDING_BLOCK_flushCallbacks,
+    BUILDING_BLOCK_recomputeInvalidatedAtoms,
+    BUILDING_BLOCK_readAtomState,
+    BUILDING_BLOCK_invalidateDependents,
+    BUILDING_BLOCK_writeAtomState,
+    BUILDING_BLOCK_mountDependencies,
+    BUILDING_BLOCK_mountAtom,
+    BUILDING_BLOCK_unmountAtom,
+    BUILDING_BLOCK_setAtomStateValueOrPromise,
+    BUILDING_BLOCK_storeGet,
+    BUILDING_BLOCK_storeSet,
+    BUILDING_BLOCK_storeSub,
     void 0
   ].map((fn, i) => buildArgs[i] || fn);
   buildingBlockMap.set(store, Object.freeze(buildingBlocks));
@@ -3908,7 +3920,7 @@ function selectAtom(anAtom, selector, equalityFn = Object.is) {
   );
 }
 
-const isPromiseLike$3 = (x) => typeof (x == null ? void 0 : x.then) === "function";
+const isPromiseLike$2 = (x) => typeof (x == null ? void 0 : x.then) === "function";
 function createJSONStorage(getStringStorage = () => {
   try {
     return window.localStorage;
@@ -3940,7 +3952,7 @@ function createJSONStorage(getStringStorage = () => {
         return lastValue;
       };
       const str = (_b = (_a2 = getStringStorage()) == null ? void 0 : _a2.getItem(key)) != null ? _b : null;
-      if (isPromiseLike$3(str)) {
+      if (isPromiseLike$2(str)) {
         return str.then(parse);
       }
       return parse(str);