@reactables/core 1.3.0-alpha.2 → 1.3.0-beta-1

package/dist/Helpers/RxBuilder.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { SliceConfig, Cases } from './createSlice';
-import { Reactable } from '../Models/Reactable';
+import { Reactable, ActionCreatorTypeFromReducer } from '../Models/Reactable';
 import { Effect } from '../Models/Effect';
 import { Action } from '../Models/Action';
 export interface EffectsAndSources {
@@ -11,7 +11,7 @@ export interface EffectsAndSources {
 }
 export interface RxConfig<T, S extends Cases<T>> extends SliceConfig<T, S>, EffectsAndSources {
     debug?: boolean;
-    /**@deprecated Use storeValue decorator instead to add store value behaviour to reactable */
+    /**@deprecated Use storeValue modifier instead to add store value behaviour to reactable */
     storeValue?: boolean;
 }
-export declare const RxBuilder: <T, S extends Cases<T>>({ effects, sources, debug, storeValue, ...sliceConfig }: RxConfig<T, S>) => Reactable<T, { [K in keyof S]: (payload?: unknown) => void; }>;
+export declare const RxBuilder: <T, S extends Cases<T>>({ effects, sources, debug, storeValue, ...sliceConfig }: RxConfig<T, S>) => Reactable<T, { [K in keyof S]: ActionCreatorTypeFromReducer<S[K]>; }, { [K_2 in keyof S]: import("../Models/Action").ActionCreator<unknown>; } extends infer T_1 extends Record<string, unknown> ? { [K_1 in keyof T_1 as `${string & K_1}`]: `${string & K_1}`; } : never>;

package/dist/Helpers/RxBuilder.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/Helpers/combine.d.ts

@@ -1,3 +1,4 @@
 import { Observable, ObservedValueOf } from 'rxjs';
-import { Action, Reactable } from '../Models';
-export declare const combine: <T extends Record<string, Reactable<unknown, unknown>>>(sourceReactables: T) => [Observable<{ [K in keyof T]: ObservedValueOf<T[K][0]>; }>, { [K_1 in keyof T]: T[K_1][1]; }, Observable<Action<unknown>>];
+import { Reactable } from '../Models';
+import { ActionObservableWithTypes } from '../Models/Reactable';
+export declare const combine: <T extends Record<string, Reactable<unknown, unknown, Record<string, string>>>>(sourceReactables: T) => [Observable<{ [K in keyof T]: ObservedValueOf<T[K][0]>; }>, { [K_1 in keyof T]: T[K_1][1]; }, ActionObservableWithTypes<{ [K_4 in ({ [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; } extends infer T_1 ? { [K_2 in keyof T_1]: { [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; }[K_2] extends Record<string, any> ? { [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; }[K_2] : never; } : never)[keyof T] extends infer T_2 ? T_2 extends ({ [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; } extends infer T_1 ? { [K_2 in keyof T_1]: { [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; }[K_2] extends Record<string, any> ? { [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; }[K_2] : never; } : never)[keyof T] ? T_2 extends any ? keyof T_2 : never : never : never]: ({ [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; } extends infer T_1 ? { [K_2 in keyof T_1]: { [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; }[K_2] extends Record<string, any> ? { [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; }[K_2] : never; } : never)[keyof T] extends infer T_3 ? T_3 extends ({ [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; } extends infer T_1 ? { [K_2 in keyof T_1]: { [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; }[K_2] extends Record<string, any> ? { [K_3 in keyof T]: T[K_3] extends Reactable<unknown, unknown, infer P extends Record<string, string>> ? { [Pkey in keyof P as `[${K_3 & string}] - ${Pkey & string}`]: `[${K_3 & string}] - ${Pkey & string}`; } : never; }[K_2] : never; } : never)[keyof T] ? T_3 extends { [k in K_4]?: any; } ? T_3[K_4] : never : never : never; }>];

package/dist/Helpers/createActionTypeStringMap.d.ts

@@ -0,0 +1,30 @@
+import { Reactable } from '../Models';
+type ExpandedMap<T extends Record<string, Reactable<unknown, unknown>>> = {
+    [K in keyof T]: T[K] extends Reactable<unknown, unknown, infer P> ? {
+        [Pkey in keyof P as `[${K & string}] - ${Pkey & string}`]: `[${K & string}] - ${Pkey & string}`;
+    } : never;
+};
+type Merge<U> = {
+    [K in U extends any ? keyof U : never]: U extends {
+        [k in K]?: any;
+    } ? U[K] : never;
+};
+type FlattenedEntries<T> = Merge<{
+    [K in keyof T]: T[K] extends Record<string, any> ? T[K] : never;
+}[keyof T]>;
+type CombinedActionStringMap<T extends Record<string, Reactable<unknown, unknown>>> = FlattenedEntries<ExpandedMap<T>>;
+/**
+ * @description helper method to create an action type string map for a combined reacatable
+ */
+export declare const combineActionTypeStringMaps: <T extends Record<string, Reactable<unknown, unknown, Record<string, string>>>>(sourceReactables: T) => CombinedActionStringMap<T>;
+export type ActionTypeString<S extends Record<string, unknown>, Z extends string> = Z extends undefined ? {
+    [K in keyof S as `${string & K}`]: `${string & K}`;
+} : {
+    [K in keyof S as `[${Z}] - ${string & K}`]: `[${Z}] - ${string & K}`;
+};
+/**
+ * @description creates an action type string map from existing string maps or an ActionMap,
+ * if given a parent key it will append a prefix to the resulting strings
+ */
+export declare const createActionTypeStringMap: <S extends Record<string, unknown>, Z extends string = undefined>(types: S, parentKey?: Z) => ActionTypeString<S, Z>;
+export {};

package/dist/Helpers/storeValue.d.ts

@@ -2,6 +2,4 @@ import { Reactable } from '../Models';
 export interface DestroyAction {
     destroy: () => void;
 }
-export declare const storeValue: <T, S>(reactable: Reactable<T, S & {
-    destroy?: () => void;
-}>) => Reactable<T, S & DestroyAction>;
+export declare const storeValue: <T, S, U extends Record<string, string> = Record<string, string>>(reactable: Reactable<T, S, U>) => Reactable<T, S & DestroyAction, U>;

package/dist/Models/Reactable.d.ts

@@ -1,6 +1,15 @@
 import { Observable } from 'rxjs';
 import { Action } from './Action';
-export type Reactable<T, S = ActionMap> = [Observable<T>, S, Observable<Action<unknown>>?];
+export type ActionCreatorTypeFromReducer<T> = T extends (state: any) => unknown ? () => void : T extends (state: any, action: Action<infer P>) => unknown ? (payload: P) => void : T extends {
+    reducer: (state: any) => unknown;
+} ? () => void : T extends {
+    reducer: (state: any, action: Action<infer P>) => unknown;
+} ? (payload: P) => void : never;
+export type ActionObservableWithTypes<T extends Record<string, string>> = Observable<Action<unknown>> & {
+    types?: T;
+    ofTypes?: (types: Array<keyof T>) => Observable<Action<unknown>>;
+};
+export type Reactable<T, S = ActionMap, U extends Record<string, string> = Record<string, string>> = [Observable<T>, S, ActionObservableWithTypes<U>?];
 export interface ActionMap {
     [key: string | number]: (payload?: unknown) => void | ActionMap;
 }

package/dist/Models/index.d.ts

@@ -1,4 +1,4 @@
 export { Action, ScopedEffects } from './Action';
 export { Effect } from './Effect';
 export { Hub, Reducer, HubConfig, StoreConfig, Dispatcher } from './Hub';
-export { Reactable, ActionMap } from './Reactable';
+export { Reactable, ActionMap, ActionObservableWithTypes } from './Reactable';

package/dist/index.js

@@ -252,6 +252,28 @@ var HubFactory = function (_a) {
     };
 };
 
+/**
+ * @description helper method to create an action type string map for a combined reacatable
+ */
+var combineActionTypeStringMaps = function (sourceReactables) {
+    var result = Object.entries(sourceReactables).reduce(function (acc, _a) {
+        var key = _a[0], _b = _a[1], actions$ = _b[2];
+        return __assign(__assign({}, acc), createActionTypeStringMap(actions$.types, key));
+    }, {});
+    return result;
+};
+/**
+ * @description creates an action type string map from existing string maps or an ActionMap,
+ * if given a parent key it will append a prefix to the resulting strings
+ */
+var createActionTypeStringMap = function (types, parentKey) {
+    return Object.keys(types).reduce(function (acc, childKey) {
+        var _a;
+        var newKey = parentKey ? "[".concat(parentKey, "] - ").concat(childKey) : childKey;
+        return __assign(__assign({}, acc), (_a = {}, _a[newKey] = newKey, _a));
+    }, {});
+};
+
 var RxBuilder = function (_a) {
     var effects = _a.effects, _b = _a.sources, sources = _b === void 0 ? [] : _b, _c = _a.debug, debug = _c === void 0 ? false : _c, _d = _a.storeValue, storeValue = _d === void 0 ? false : _d, sliceConfig = __rest(_a, ["effects", "sources", "debug", "storeValue"]);
     var _e = createSlice(sliceConfig), reducer = _e.reducer, actions = _e.actions;
@@ -284,23 +306,23 @@ var RxBuilder = function (_a) {
             },
         ];
     }));
-    return [
+    createActionTypeStringMap(actions);
+    var actions$ = hub.messages$;
+    actions$.types = createActionTypeStringMap(actions);
+    actions$.ofTypes = function (types) { return actions$.pipe(ofTypes(types)); };
+    var rx = [
         hub.store({ reducer: reducer, debug: debug, storeValue: storeValue, name: sliceConfig.name }),
         actionsResult,
-        hub.messages$,
+        actions$,
     ];
+    return rx;
 };
 
 var storeValue = function (reactable) {
     var replaySubject$ = new rxjs.ReplaySubject(1);
     var state$ = reactable[0], actions = reactable[1], actions$ = reactable[2];
     var subscription = state$.subscribe(function (state) { return replaySubject$.next(state); });
-    var destroy = function () {
-        var _a;
-        // If destroy action already exists (i.e from a web worker), invoke it
-        (_a = actions.destroy) === null || _a === void 0 ? void 0 : _a.call(actions);
-        subscription.unsubscribe();
-    };
+    var destroy = function () { return subscription.unsubscribe(); };
     return [replaySubject$, __assign(__assign({}, actions), { destroy: destroy }), actions$];
 };
 
@@ -321,7 +343,11 @@ var combine = function (sourceReactables) {
         actions$: []
     }), states = _a.states, actions = _a.actions, actions$ = _a.actions$;
     var states$ = rxjs.combineLatest(states);
-    return [states$, actions, rxjs.merge.apply(void 0, actions$)];
+    var actionTypes = combineActionTypeStringMaps(sourceReactables);
+    var mergedActions$ = rxjs.merge.apply(void 0, actions$);
+    mergedActions$.types = actionTypes;
+    mergedActions$.ofTypes = function (types) { return mergedActions$.pipe(ofTypes(types)); };
+    return [states$, actions, mergedActions$];
 };
 
 exports.RxBuilder = RxBuilder;

package/package.json

@@ -16,5 +16,5 @@
   "peerDependencies": {
     "rxjs": "^6.0.0 || ^7.0.0"
   },
-  "version": "1.3.0-alpha.2"
+  "version": "1.3.0-beta-1"
 }