@yaasl/core 0.14.0 → 0.15.0-alpha.1

package/dist/@types/base/create-selector.d.ts

@@ -1,34 +1,13 @@
-import { Prettify } from "@yaasl/utils";
+import { InferValues } from "@yaasl/utils";
 import { Stateful } from "./stateful";
-type PathableValue = Record<string | number, unknown>;
-export type ObjPath<Obj> = Prettify<Obj> extends PathableValue ? {
-    [K in keyof Obj]: `${Exclude<K, symbol>}${"" | `.${ObjPath<Obj[K]>}`}`;
-}[keyof Obj] : never;
-type ObjPathValue<State, Path> = State extends PathableValue ? Path extends `${infer Current}.${infer Next}` ? ObjPathValue<State[Current], Next> : State[Path & string] : never;
-export declare class PathSelector<ParentValue, Path extends ObjPath<ParentValue>> extends Stateful<ObjPathValue<ParentValue, Path>> {
-    constructor(atom: Stateful<ParentValue>, path: Path);
+export declare class CombinerSelector<ParentAtoms extends Stateful<any> | [Stateful<any>, ...Stateful<any>[]], CombinedValue> extends Stateful<CombinedValue> {
+    constructor(atoms: ParentAtoms, combiner: (...states: InferValues<ParentAtoms>) => CombinedValue);
 }
-type InferValuesFromAtoms<ParentAtoms extends readonly unknown[], ParentValues extends unknown[] = []> = ParentAtoms extends [Stateful<infer Value>, ...infer Rest] ? InferValuesFromAtoms<Rest, [...ParentValues, Value]> : ParentValues;
-export declare class CombinerSelector<ParentAtoms extends [Stateful<any>, ...Stateful<any>[]], CombinedValue> extends Stateful<CombinedValue> {
-    constructor(atoms: ParentAtoms, combiner: (...res: InferValuesFromAtoms<ParentAtoms>) => CombinedValue);
-}
-interface CreateSelectorOverloads {
-    /** Creates a value, selected from one atom with an object value by using a key path.
-     *
-     *  @param atom The atom to select a value from. The internal state must be an object.
-     *  @param path The path to the value you want to select.
-     *
-     *  @returns A PathSelector instance.
-     **/
-    <ParentValue, Path extends ObjPath<ParentValue>>(atom: Stateful<ParentValue>, path: Path): PathSelector<ParentValue, Path>;
-    /** Creates a value, selected from one atom with an object value by using a key path.
-     *
-     *  @param atoms Atoms you need to combine to receive the new value.
-     *  @param combiner Combiner function to use the atom values and create a new value.
-     *
-     *  @returns A CombinerSelector instance.
-     **/
-    <ParentAtoms extends [Stateful<any>, ...Stateful<any>[]], CombinedValue>(states: ParentAtoms, combiner: (...res: InferValuesFromAtoms<ParentAtoms>) => CombinedValue): CombinerSelector<ParentAtoms, CombinedValue>;
-}
-export declare const createSelector: CreateSelectorOverloads;
-export {};
+/** Creates a value, selected from one or more atoms by using a combiner function.
+ *
+ *  @param atoms One or more atoms you need to combine to receive the new value.
+ *  @param combiner Combiner function to use the atom values and create a new value.
+ *
+ *  @returns A CombinerSelector instance.
+ **/
+export declare const createSelector: <ParentAtoms extends Stateful<any> | [Stateful<any>, ...Stateful<any>[]], CombinedValue>(atoms: ParentAtoms, combiner: (...states: InferValues<ParentAtoms>) => CombinedValue) => CombinerSelector<ParentAtoms, CombinedValue>;

package/dist/@types/base/create-slice.d.ts

@@ -1,11 +1,12 @@
 import { Actions, Reducers } from "./create-actions";
 import { Atom, AtomConfig } from "./create-atom";
-import { CombinerSelector, ObjPath, PathSelector } from "./create-selector";
+import { CombinerSelector } from "./create-selector";
+import { Stateful } from "./stateful";
 interface ReducersProp<State, R extends Reducers<State> | undefined> {
     /** Reducers for custom actions to set the atom's value. */
     reducers?: R;
 }
-type Selectors<State> = Record<string, ObjPath<State> | ((state: State) => any)>;
+type Selectors<State> = Record<string, (state: State) => any>;
 type ConditionalActions<State, R> = keyof R extends never ? {} : R extends Reducers<State> ? {
     /** Actions that can be used to set the atom's value. */
     actions: Actions<State, R>;
@@ -14,11 +15,10 @@ interface SelectorsProp<State, S extends Selectors<State> | undefined> {
     /** Selectors to create values from the atom. */
     selectors?: S;
 }
-type GetSelector<State, S extends ObjPath<State> | ((state: State) => any)> = S extends ObjPath<State> ? PathSelector<State, S> : S extends (state: State) => any ? CombinerSelector<[Atom<State>], ReturnType<S>> : never;
 type ConditionalSelectors<State, S> = keyof S extends never ? {} : S extends Selectors<State> ? {
     /** Selectors to create new values based on the atom's value. */
     selectors: {
-        [K in keyof S]: GetSelector<State, S[K]>;
+        [K in keyof S]: CombinerSelector<Stateful<State>, ReturnType<S[K]>>;
     };
 } : {};
 /** Creates a slice with actions and selectors.
@@ -27,7 +27,7 @@ type ConditionalSelectors<State, S> = keyof S extends never ? {} : S extends Sel
  * @param config.name Name of the atom.
  * @param config.effects Effects that will be applied on the atom.
  * @param config.reducers Reducers for custom actions to set the atom's value.
- * @param config.selectors Path or combiner selectors to use the atom's values to create new ones.
+ * @param config.selectors Combiner selectors to use the atom's values to create new ones.
  *
  * @returns An atom instance with actions and selectors.
  **/

package/dist/@types/base/stateful.d.ts

@@ -1,6 +1,5 @@
-import { Destroyable } from "./destroyable";
-export type Callback<Value> = (value: Value, previous: Value) => void;
-export declare class Stateful<Value = unknown> extends Destroyable {
+import { type Subscribable, type SubscriberCallback } from "@yaasl/utils";
+export declare class Stateful<Value = unknown> implements Subscribable<Value> {
     protected value: Value;
     /** Promise that resolves when the states initialization was finished. */
     didInit: PromiseLike<void> | boolean;
@@ -17,10 +16,7 @@ export declare class Stateful<Value = unknown> extends Destroyable {
      *
      *  @returns A callback to unsubscribe the passed callback.
      */
-    subscribe(callback: Callback<Value>): () => boolean;
-    /** Make this atom unusable and remove all references.
-     **/
-    destroy(): void;
+    subscribe(callback: SubscriberCallback<Value>): () => boolean;
     private emit;
     protected update(value: Value): void;
     protected setDidInit(didInit: boolean | PromiseLike<void>): void;

package/dist/cjs/base/create-derived.js

@@ -20,7 +20,7 @@ class Derive extends stateful_1.Stateful {
     }
     addGetDependency(dependency) {
         if (!this.getterDependencies.has(dependency)) {
-            this.subscribeTo(dependency, () => this.deriveUpdate());
+            dependency.subscribe(() => this.deriveUpdate());
             this.getterDependencies.add(dependency);
         }
         return dependency.get();

package/dist/cjs/base/create-selector.js

@@ -1,20 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSelector = exports.CombinerSelector = exports.PathSelector = void 0;
+exports.createSelector = exports.CombinerSelector = void 0;
 const utils_1 = require("@yaasl/utils");
 const stateful_1 = require("./stateful");
-const selectPath = (state, path) => path
-    .split(".")
-    .reduce((result, key) => result[key], state);
-class PathSelector extends stateful_1.Stateful {
-    constructor(atom, path) {
-        super(selectPath(atom.get(), path));
-        this.subscribeTo(atom, state => this.update(selectPath(state, path)));
-        this.setDidInit(atom.didInit);
-    }
-}
-exports.PathSelector = PathSelector;
-// -- Combiner selector
 const allDidInit = (atoms) => {
     const inits = atoms
         .map(atom => atom.didInit)
@@ -23,24 +11,23 @@ const allDidInit = (atoms) => {
 };
 class CombinerSelector extends stateful_1.Stateful {
     constructor(atoms, combiner) {
+        const atomArray = (0, utils_1.toArray)(atoms);
         const selectState = () => {
-            const values = atoms.map(atom => atom.get());
+            const values = atomArray.map(atom => atom.get());
             return combiner(...values);
         };
         super(selectState());
-        atoms.forEach(atom => this.subscribeTo(atom, () => this.update(selectState())));
-        this.setDidInit(allDidInit(atoms));
+        atomArray.forEach(atom => atom.subscribe(() => this.update(selectState())));
+        this.setDidInit(allDidInit(atomArray));
     }
 }
 exports.CombinerSelector = CombinerSelector;
-const createSelector = (atoms, selector) => {
-    if (atoms instanceof stateful_1.Stateful && typeof selector === "string") {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        return new PathSelector(atoms, selector);
-    }
-    if (Array.isArray(atoms) && typeof selector === "function") {
-        return new CombinerSelector(atoms, selector);
-    }
-    throw new Error("Selector args do not match any overload");
-};
+/** Creates a value, selected from one or more atoms by using a combiner function.
+ *
+ *  @param atoms One or more atoms you need to combine to receive the new value.
+ *  @param combiner Combiner function to use the atom values and create a new value.
+ *
+ *  @returns A CombinerSelector instance.
+ **/
+const createSelector = (atoms, combiner) => new CombinerSelector(atoms, combiner);
 exports.createSelector = createSelector;

package/dist/cjs/base/create-slice.js

@@ -7,9 +7,7 @@ const create_selector_1 = require("./create-selector");
 const isEmpty = (obj) => !obj || Object.keys(obj).length === 0;
 const createSelectors = (atom, selectors) => Object.fromEntries(Object.entries(selectors).map(([key, selector]) => [
     key,
-    typeof selector === "string"
-        ? (0, create_selector_1.createSelector)(atom, selector)
-        : (0, create_selector_1.createSelector)([atom], selector),
+    (0, create_selector_1.createSelector)(atom, selector),
 ]));
 /** Creates a slice with actions and selectors.
  *
@@ -17,7 +15,7 @@ const createSelectors = (atom, selectors) => Object.fromEntries(Object.entries(s
  * @param config.name Name of the atom.
  * @param config.effects Effects that will be applied on the atom.
  * @param config.reducers Reducers for custom actions to set the atom's value.
- * @param config.selectors Path or combiner selectors to use the atom's values to create new ones.
+ * @param config.selectors Combiner selectors to use the atom's values to create new ones.
  *
  * @returns An atom instance with actions and selectors.
  **/

package/dist/cjs/base/stateful.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Stateful = void 0;
-const destroyable_1 = require("./destroyable");
-class Stateful extends destroyable_1.Destroyable {
+class Stateful {
     constructor(value) {
-        super();
         this.value = value;
         /** Promise that resolves when the states initialization was finished. */
         this.didInit = false;
@@ -27,13 +25,6 @@ class Stateful extends destroyable_1.Destroyable {
         this.listeners.add(callback);
         return () => this.listeners.delete(callback);
     }
-    /** Make this atom unusable and remove all references.
-     **/
-    destroy() {
-        super.destroy();
-        this.value = null;
-        this.listeners = new Set();
-    }
     emit(value, previous) {
         this.listeners.forEach(listener => listener(value, previous));
     }

package/dist/cjs/effects/sync.js

@@ -8,27 +8,24 @@ const getId = () => { var _a, _b; return (_b = (_a = (0, utils_1.getWindow)()) =
 const getChannelName = (key) => ["yaasl", "sync-channel", base_1.CONFIG.name, key].filter(Boolean).join("/");
 class SyncChannel {
     constructor(key) {
+        this.id = getId();
         this.listeners = new Set();
         this.channel = new BroadcastChannel(getChannelName(key));
-        this.channel.onmessage = event => {
+        this.channel.addEventListener("message", event => {
             const { id, data } = event.data;
-            if (id === SyncChannel.id)
+            if (id === this.id)
                 return;
             this.listeners.forEach(listener => listener(data));
-        };
+        });
     }
     push(data) {
-        this.channel.postMessage({
-            id: SyncChannel.id,
-            data,
-        });
+        this.channel.postMessage({ id: this.id, data });
     }
     subscribe(listener) {
         this.listeners.add(listener);
         return () => this.listeners.delete(listener);
     }
 }
-SyncChannel.id = getId();
 /** Effect to synchronize the atoms value over tabs.
  *
  * @returns The effect to be used on atoms.
@@ -38,9 +35,9 @@ exports.sync = (0, create_effect_1.createEffect)(({ atom }) => {
     let skip = false;
     return {
         didInit: () => {
-            channel.subscribe(data => {
-                atom.set(data);
+            channel.subscribe(value => {
                 skip = true;
+                atom.set(value);
             });
         },
         set: ({ value }) => {

package/dist/esm/base/create-derived.js

@@ -17,7 +17,7 @@ export class Derive extends Stateful {
     }
     addGetDependency(dependency) {
         if (!this.getterDependencies.has(dependency)) {
-            this.subscribeTo(dependency, () => this.deriveUpdate());
+            dependency.subscribe(() => this.deriveUpdate());
             this.getterDependencies.add(dependency);
         }
         return dependency.get();

package/dist/esm/base/create-selector.js

@@ -1,16 +1,5 @@
-import { toVoid } from "@yaasl/utils";
+import { toArray, toVoid } from "@yaasl/utils";
 import { Stateful } from "./stateful";
-const selectPath = (state, path) => path
-    .split(".")
-    .reduce((result, key) => result[key], state);
-export class PathSelector extends Stateful {
-    constructor(atom, path) {
-        super(selectPath(atom.get(), path));
-        this.subscribeTo(atom, state => this.update(selectPath(state, path)));
-        this.setDidInit(atom.didInit);
-    }
-}
-// -- Combiner selector
 const allDidInit = (atoms) => {
     const inits = atoms
         .map(atom => atom.didInit)
@@ -19,22 +8,21 @@ const allDidInit = (atoms) => {
 };
 export class CombinerSelector extends Stateful {
     constructor(atoms, combiner) {
+        const atomArray = toArray(atoms);
         const selectState = () => {
-            const values = atoms.map(atom => atom.get());
+            const values = atomArray.map(atom => atom.get());
             return combiner(...values);
         };
         super(selectState());
-        atoms.forEach(atom => this.subscribeTo(atom, () => this.update(selectState())));
-        this.setDidInit(allDidInit(atoms));
+        atomArray.forEach(atom => atom.subscribe(() => this.update(selectState())));
+        this.setDidInit(allDidInit(atomArray));
     }
 }
-export const createSelector = (atoms, selector) => {
-    if (atoms instanceof Stateful && typeof selector === "string") {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        return new PathSelector(atoms, selector);
-    }
-    if (Array.isArray(atoms) && typeof selector === "function") {
-        return new CombinerSelector(atoms, selector);
-    }
-    throw new Error("Selector args do not match any overload");
-};
+/** Creates a value, selected from one or more atoms by using a combiner function.
+ *
+ *  @param atoms One or more atoms you need to combine to receive the new value.
+ *  @param combiner Combiner function to use the atom values and create a new value.
+ *
+ *  @returns A CombinerSelector instance.
+ **/
+export const createSelector = (atoms, combiner) => new CombinerSelector(atoms, combiner);

package/dist/esm/base/create-slice.js

@@ -1,12 +1,10 @@
 import { createActions } from "./create-actions";
 import { Atom } from "./create-atom";
-import { createSelector, } from "./create-selector";
+import { createSelector } from "./create-selector";
 const isEmpty = (obj) => !obj || Object.keys(obj).length === 0;
 const createSelectors = (atom, selectors) => Object.fromEntries(Object.entries(selectors).map(([key, selector]) => [
     key,
-    typeof selector === "string"
-        ? createSelector(atom, selector)
-        : createSelector([atom], selector),
+    createSelector(atom, selector),
 ]));
 /** Creates a slice with actions and selectors.
  *
@@ -14,7 +12,7 @@ const createSelectors = (atom, selectors) => Object.fromEntries(Object.entries(s
  * @param config.name Name of the atom.
  * @param config.effects Effects that will be applied on the atom.
  * @param config.reducers Reducers for custom actions to set the atom's value.
- * @param config.selectors Path or combiner selectors to use the atom's values to create new ones.
+ * @param config.selectors Combiner selectors to use the atom's values to create new ones.
  *
  * @returns An atom instance with actions and selectors.
  **/

package/dist/esm/base/stateful.js

@@ -1,11 +1,9 @@
-import { Destroyable } from "./destroyable";
-export class Stateful extends Destroyable {
+export class Stateful {
     value;
     /** Promise that resolves when the states initialization was finished. */
     didInit = false;
     listeners = new Set();
     constructor(value) {
-        super();
         this.value = value;
     }
     /** Read the value of state.
@@ -25,13 +23,6 @@ export class Stateful extends Destroyable {
         this.listeners.add(callback);
         return () => this.listeners.delete(callback);
     }
-    /** Make this atom unusable and remove all references.
-     **/
-    destroy() {
-        super.destroy();
-        this.value = null;
-        this.listeners = new Set();
-    }
     emit(value, previous) {
         this.listeners.forEach(listener => listener(value, previous));
     }

package/dist/esm/effects/sync.js

@@ -4,23 +4,20 @@ import { CONFIG } from "../base";
 const getId = () => getWindow()?.crypto.randomUUID() ?? Math.random().toString(36).slice(2, 10);
 const getChannelName = (key) => ["yaasl", "sync-channel", CONFIG.name, key].filter(Boolean).join("/");
 class SyncChannel {
-    static id = getId();
+    id = getId();
     channel;
     listeners = new Set();
     constructor(key) {
         this.channel = new BroadcastChannel(getChannelName(key));
-        this.channel.onmessage = event => {
+        this.channel.addEventListener("message", event => {
             const { id, data } = event.data;
-            if (id === SyncChannel.id)
+            if (id === this.id)
                 return;
             this.listeners.forEach(listener => listener(data));
-        };
+        });
     }
     push(data) {
-        this.channel.postMessage({
-            id: SyncChannel.id,
-            data,
-        });
+        this.channel.postMessage({ id: this.id, data });
     }
     subscribe(listener) {
         this.listeners.add(listener);
@@ -36,9 +33,9 @@ export const sync = createEffect(({ atom }) => {
     let skip = false;
     return {
         didInit: () => {
-            channel.subscribe(data => {
-                atom.set(data);
+            channel.subscribe(value => {
                 skip = true;
+                atom.set(value);
             });
         },
         set: ({ value }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaasl/core",
-  "version": "0.14.0",
+  "version": "0.15.0-alpha.1",
   "description": "yet another atomic store library (vanilla-js)",
   "author": "PrettyCoffee",
   "license": "MIT",
@@ -40,10 +40,10 @@
     "validate": "run-s lint test build"
   },
   "peerDependencies": {
-    "@yaasl/utils": "^0.14.0"
+    "@yaasl/utils": "^0.15.0-alpha.1"
   },
   "devDependencies": {
-    "@yaasl/utils": "^0.14.0"
+    "@yaasl/utils": "^0.15.0-alpha.1"
   },
   "lint-staged": {
     "*.{ts,tsx}": [

package/dist/@types/base/destroyable.d.ts

@@ -1,13 +0,0 @@
-import type { Callback, Stateful } from "./stateful";
-export declare class Destroyable {
-    isDestroyed: boolean;
-    private dependents;
-    private unsubscribers;
-    /** Make this atom unusable and remove all references.
-     **/
-    destroy(): void;
-    /** Subscribe to another atom and automatically destroy the atom instance, if the parent is destroyed */
-    protected subscribeTo<T>(parent: Stateful<T>, callback: Callback<T>): void;
-    protected addDependent(dependent: Destroyable): void;
-    protected removeDependent(dependent: Destroyable): void;
-}

package/dist/cjs/base/destroyable.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Destroyable = void 0;
-const utils_1 = require("@yaasl/utils");
-class Destroyable {
-    constructor() {
-        this.isDestroyed = false;
-        this.dependents = new Set();
-        this.unsubscribers = new Set();
-    }
-    /** Make this atom unusable and remove all references.
-     **/
-    destroy() {
-        this.dependents.forEach(dependent => dependent.destroy());
-        this.unsubscribers.forEach(unsubscribe => unsubscribe());
-        this.dependents.clear();
-        this.unsubscribers.clear();
-        this.isDestroyed = true;
-        // eslint-disable-next-line unicorn/consistent-function-scoping
-        const throwOnCall = () => {
-            const name = "name" in this ? this.name : undefined;
-            throw new Error((0, utils_1.consoleMessage)("The methods of a destroyed atom cannot be called.", {
-                scope: name,
-            }));
-        };
-        Object.assign(this, {
-            set: throwOnCall,
-            get: throwOnCall,
-            subscribe: throwOnCall,
-        });
-    }
-    /** Subscribe to another atom and automatically destroy the atom instance, if the parent is destroyed */
-    subscribeTo(parent, callback) {
-        parent.addDependent(this);
-        const unsubscribe = parent.subscribe(callback);
-        this.unsubscribers.add(() => {
-            unsubscribe();
-            parent.removeDependent(this);
-        });
-    }
-    addDependent(dependent) {
-        this.dependents.add(dependent);
-    }
-    removeDependent(dependent) {
-        this.dependents.delete(dependent);
-    }
-}
-exports.Destroyable = Destroyable;

package/dist/esm/base/destroyable.js

@@ -1,42 +0,0 @@
-import { consoleMessage } from "@yaasl/utils";
-export class Destroyable {
-    isDestroyed = false;
-    dependents = new Set();
-    unsubscribers = new Set();
-    /** Make this atom unusable and remove all references.
-     **/
-    destroy() {
-        this.dependents.forEach(dependent => dependent.destroy());
-        this.unsubscribers.forEach(unsubscribe => unsubscribe());
-        this.dependents.clear();
-        this.unsubscribers.clear();
-        this.isDestroyed = true;
-        // eslint-disable-next-line unicorn/consistent-function-scoping
-        const throwOnCall = () => {
-            const name = "name" in this ? this.name : undefined;
-            throw new Error(consoleMessage("The methods of a destroyed atom cannot be called.", {
-                scope: name,
-            }));
-        };
-        Object.assign(this, {
-            set: throwOnCall,
-            get: throwOnCall,
-            subscribe: throwOnCall,
-        });
-    }
-    /** Subscribe to another atom and automatically destroy the atom instance, if the parent is destroyed */
-    subscribeTo(parent, callback) {
-        parent.addDependent(this);
-        const unsubscribe = parent.subscribe(callback);
-        this.unsubscribers.add(() => {
-            unsubscribe();
-            parent.removeDependent(this);
-        });
-    }
-    addDependent(dependent) {
-        this.dependents.add(dependent);
-    }
-    removeDependent(dependent) {
-        this.dependents.delete(dependent);
-    }
-}