valdres 0.2.0-alpha.31 → 0.2.0-alpha.32

package/dist/index.js

@@ -611,15 +611,18 @@ var store = (id) => {
   return storeFromStoreData(data);
 };
 // package.json
-var version = "0.2.0-alpha.31";
+var version = "0.2.0-alpha.32";
 
-// src/lib/globalStore.ts
+// src/globalStore.ts
 if (globalThis.__valdres__) {
   throw new Error(`Error! An instance of valdres is already loaded`);
 } else {
   globalThis.__valdres__ = version;
 }
-var globalStore = store("global");
+var globalStore = Object.assign(store("valdres-global-store"), {
+  atoms: new Map,
+  atomFamilies: new Map
+});
 
 // src/lib/globalAtom.ts
 var globalAtom = (defaultValue, options) => {
@@ -670,7 +673,7 @@ var globalAtom = (defaultValue, options) => {
     equal: equal2,
     ...options,
     defaultValue,
-    label: options?.label,
+    name: options?.name,
     onInit,
     onSet,
     setSelf,
@@ -696,7 +699,7 @@ function atom(defaultValue, options) {
     ...options
   };
 }
-// src/atomFamily.ts
+// src/lib/createAtomFamily.ts
 import equal5 from "fast-deep-equal/es6";
 
 // src/lib/atomFamilyAtom.ts
@@ -772,13 +775,13 @@ var selector = (get, options) => {
   return { equal: equal4, ...options, get };
 };
 
-// src/atomFamily.ts
+// src/lib/createAtomFamily.ts
 var createOptions = (options = {}, family, familyKey, keyStringified) => {
-  if (options.label) {
+  if (options.name) {
     return {
       equal: equal5,
       ...options,
-      label: options?.label + "_" + keyStringified,
+      name: options?.name + "_" + keyStringified,
       family,
       familyKey
     };
@@ -793,25 +796,46 @@ var handleDefaultValue = (defaultValue, key) => {
     return () => defaultValue(key);
   return defaultValue;
 };
-function atomFamily(defaultValue, options) {
+var createAtomFamily = (defaultValue, options) => {
   const map = new Map;
-  const atomFamily2 = (key) => {
+  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, atomFamily2, Object.freeze(key), keyStringified));
+    const familyAtom = atomFamilyAtom(handleDefaultValue(defaultValue, key), createOptions(options, atomFamily, Object.freeze(key), keyStringified));
     map.set(keyStringified, familyAtom);
     return familyAtom;
-  };
-  atomFamily2.__valdresAtomFamilyMap = map;
-  atomFamily2.release = (key) => map.delete(key);
-  const keysAtom = atom(new Set);
-  atomFamily2.__keysAtom = keysAtom;
-  atomFamily2.__keysSelector = selector((get) => Array.from(get(keysAtom)));
-  if (options?.label)
-    atomFamily2.label = options.label;
-  return atomFamily2;
+  }, {
+    __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 (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 = (selector2, values, store2) => {
@@ -833,11 +857,11 @@ var createStoreWithSelectorSet = (id) => {
 // src/selectorFamily.ts
 import equal6 from "fast-deep-equal/es6";
 var createOptions2 = (options = {}, family, familyKey, keyStringified) => {
-  if (options.label) {
+  if (options.name) {
     return {
       equal: equal6,
       ...options,
-      label: options?.label + "_" + keyStringified,
+      name: options?.name + "_" + keyStringified,
       family,
       familyKey
     };
@@ -856,8 +880,11 @@ var selectorFamily = (get, options) => {
     return newSelector;
   };
   selectorFamily2.__valdresSelectorFamilyMap = map;
-  if (options?.label)
-    selectorFamily2.label = options.label;
+  if (options?.name)
+    Object.defineProperty(selectorFamily2, "name", {
+      value: options.name,
+      writable: false
+    });
   return selectorFamily2;
 };
 // src/utils/isFamilySelector.ts

package/dist/types/src/atom.d.ts

@@ -7,7 +7,7 @@ import type { GlobalAtom } from "./types/GlobalAtom";
  *
  * @example
  *
- * const user = atom<string>("Default Value", { label: "userAtom"})
+ * const user = atom<string>("Default Value", { name: "userAtom"})
  *
  */
 export declare function atom<V>(defaultValue: AtomDefaultValue<V>, options: AtomOptions<V> & {

package/dist/types/src/atomFamily.d.ts

@@ -1,10 +1,4 @@
-import type { AtomFamily } from "./types/AtomFamily";
 import type { AtomOptions } from "./types/AtomOptions";
 import type { FamilyKey } from "./types/FamilyKey";
-import type { Selector } from "./types/Selector";
-import type { SelectorFamily } from "./types/SelectorFamily";
-type DefaultValueCallback<Key, Value> = (arg: Key) => Value | Promise<Value>;
-type AtomFamilyDefaultValue<Key, Value> = undefined | Value | DefaultValueCallback<Key, Value> | Selector<Value> | SelectorFamily<Key, Value>;
-/** [Docs Reference](https://valdres.dev/valdres/api/atomFamily) */
-export declare function atomFamily<Key = FamilyKey, Value = unknown>(defaultValue?: AtomFamilyDefaultValue<Key, Value>, options?: AtomOptions<Value>): AtomFamily<Key, Value>;
-export {};
+import type { AtomFamilyDefaultValue } from "./types/AtomFamilyDefaultValue";
+export declare function atomFamily<Key = FamilyKey, Value = unknown>(defaultValue?: AtomFamilyDefaultValue<Key, Value>, options?: AtomOptions<Value>): import("..").AtomFamily<Key, Value>;

package/dist/types/src/globalStore.d.ts

@@ -0,0 +1,4 @@
+export declare const globalStore: import("..").Store & {
+    atoms: Map<any, any>;
+    atomFamilies: Map<any, any>;
+};

package/dist/types/src/lib/createAtomFamily.d.ts

@@ -0,0 +1,4 @@
+import type { AtomFamily } from "../types/AtomFamily";
+import type { AtomOptions } from "../types/AtomOptions";
+import type { AtomFamilyDefaultValue } from "../types/AtomFamilyDefaultValue";
+export declare const createAtomFamily: <Key, Value>(defaultValue: AtomFamilyDefaultValue<Key, Value>, options?: AtomOptions<Value>) => AtomFamily<Key, Value>;

package/dist/types/src/lib/createGlobalAtomFamily.d.ts

@@ -0,0 +1,5 @@
+import type { AtomOptions } from "../types/AtomOptions";
+import type { FamilyKey } from "../types/FamilyKey";
+import type { AtomFamilyDefaultValue } from "../types/AtomFamilyDefaultValue";
+import type { AtomFamily } from "../types/AtomFamily";
+export declare const createGlobalAtomFamily: <Key = FamilyKey, Value = unknown>(defaultValue: AtomFamilyDefaultValue<Key, Value>, options: AtomOptions<Value>) => AtomFamily<Key, Value>;

package/dist/types/src/types/Atom.d.ts

@@ -5,7 +5,7 @@ import type { EqualFunc } from "./EqualFunc";
 export type Atom<Value = unknown> = {
     equal: EqualFunc<Value>;
     defaultValue?: AtomDefaultValue<Value>;
-    label?: string;
+    name?: string;
     onInit?: AtomOnInit<Value>;
     onSet?: AtomOnSet<Value>;
     onMount?: () => void | (() => void);

package/dist/types/src/types/AtomFamily.d.ts

@@ -5,7 +5,7 @@ import type { Selector } from "./Selector";
 export type AtomFamily<Key = FamilyKey, Value = unknown> = {
     (key: Key): AtomFamilyAtom<Key, Value>;
     release: (key: Key) => void;
-    label?: string;
+    name?: string;
     __valdresAtomFamilyMap: Map<Key, AtomFamilyAtom<Key, Value>>;
     __keysAtom: Atom<Set<Key>>;
     __keysSelector: Selector<Key[]>;

package/dist/types/src/types/AtomFamilyDefaultValue.d.ts

@@ -0,0 +1,5 @@
+import type { Selector } from "./Selector";
+import type { SelectorFamily } from "./SelectorFamily";
+type DefaultValueCallback<Key, Value> = (arg: Key) => Value | Promise<Value>;
+export type AtomFamilyDefaultValue<Key, Value> = undefined | Value | DefaultValueCallback<Key, Value> | Selector<Value> | SelectorFamily<Key, Value>;
+export {};

package/dist/types/src/types/AtomOptions.d.ts

@@ -3,7 +3,7 @@ import type { EqualFunc } from "./EqualFunc";
 import type { StoreData } from "./StoreData";
 export type AtomOptions<Value = unknown> = {
     global?: boolean;
-    label?: string;
+    name?: string;
     onInit?: (setSelf: (value: Value) => void, store: StoreData) => (() => void) | void;
     onSet?: AtomOnSet<Value>;
     onMount?: () => () => void;

package/dist/types/src/types/Selector.d.ts

@@ -4,7 +4,7 @@ import type { SelectorFamily } from "./SelectorFamily";
 export type Selector<Value = unknown, FamilyKey = undefined> = {
     get: (get: GetValue, storeId: string) => Value;
     equal: EqualFunc<Value>;
-    label?: string;
+    name?: string;
     family?: SelectorFamily<FamilyKey, Value>;
     familyKey?: FamilyKey;
     onMount?: () => void | (() => void);

package/dist/types/src/types/SelectorOptions.d.ts

@@ -1,5 +1,5 @@
 import type { EqualFunc } from "./EqualFunc";
 export type SelectorOptions<Value> = {
-    label?: string;
+    name?: string;
     equal?: EqualFunc<Value>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.31",
+    "version": "0.2.0-alpha.32",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -39,5 +39,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "7196fb6f087130428b9b0c2ea76b9d1690b45fb4"
+    "gitHead": "27342cf65a13e2ec86f5f400d814385d0c8de2cd"
 }

package/dist/types/src/lib/globalStore.d.ts

@@ -1 +0,0 @@
-export declare const globalStore: import("../..").Store;