r-state-tree 0.3.1 → 0.4.1

package/dist/store/Store.d.ts

@@ -1,16 +1,14 @@
-import { Props, Context, StoreConfiguration } from "../types";
+import { Props, StoreConfiguration } from "../types";
 export declare function allowNewStore<T>(fn: () => T): T;
 export declare function createStore<K extends Store<T>, T extends Props>(Type: new (props: T) => K, props?: T): K;
 export declare function updateStore<K extends Store<T>, T extends Props>(store: K, props: T): K;
 export declare function types<T extends Store>(config: Partial<StoreConfiguration<T>>): Partial<StoreConfiguration<T>>;
-export default class Store<PropsType extends Props = Props, ContextType extends Context = Context> {
-    static types: unknown;
+export default class Store<PropsType extends Props = Props> {
+    static get types(): StoreConfiguration<unknown>;
     props: PropsType;
     constructor(props: PropsType);
     get key(): string | number | undefined;
-    get context(): ContextType;
-    createReaction<T>(track: () => T, callback: (a: T) => void): () => void;
-    provideContext(): null | Record<string, unknown>;
+    reaction<T>(track: () => T, callback: (a: T) => void): () => void;
     storeDidMount(): void;
     storeWillUnmount(): void;
 }

package/dist/store/StoreAdministration.d.ts

@@ -1,31 +1,30 @@
 import { PreactObjectAdministration as ObjectAdministration } from "../observables";
 import Store from "./Store";
-import { StoreConfiguration, Props, Context } from "../types";
+import { StoreConfiguration, Props } from "../types";
 export declare function updateProps(props: Props, newProps: Props): void;
 export declare function getStoreAdm(store: Store): StoreAdministration;
 export declare class StoreAdministration<StoreType extends Store = Store> extends ObjectAdministration<Store> {
     static proxyTraps: ProxyHandler<object>;
-    configuration: StoreConfiguration<StoreType>;
     parent: StoreAdministration | null;
     mounted: boolean;
-    computedContext: Context;
-    private contextReactionUnsub;
+    private contextCache;
     private childStoreDataMap;
     private reactionsUnsub;
-    setConfiguration(configuration: StoreConfiguration<StoreType>): void;
+    private configurationGetter?;
+    setConfiguration(configurationGetter: () => StoreConfiguration<StoreType>): void;
+    private get configuration();
     private createChildStore;
     private setStoreList;
     private setSingleStore;
     private updateStore;
-    private updateStores;
     private getComputedGetter;
     private initializeStore;
-    private initializeStores;
     private getStore;
-    private getStores;
     private getModelRef;
     isRoot(): boolean;
-    createReaction<T>(track: () => T, callback: (a: T) => void): () => void;
+    getContextValue<T>(contextId: symbol, provideSymbol: symbol, defaultValue: T | undefined, hasDefault: boolean): T;
+    private lookupContextValue;
+    reaction<T>(track: () => T, callback: (a: T) => void): () => void;
     mount(parent?: StoreAdministration | null): void;
     unmount(): void;
 }

package/dist/types.d.ts

@@ -23,19 +23,21 @@ export type StoreCtor<S extends Store = Store> = (new (...args: ConstructorParam
 export type ChildModel = Model | Model[] | null;
 export type IdType = string | number;
 export declare enum CommonCfgTypes {
-    child = "child",
-    children = "children"
+    child = "child"
 }
 export declare enum ModelCfgTypes {
     state = "state",
     id = "id",
-    modelRef = "modelRef",
-    modelRefs = "modelRefs"
+    modelRef = "modelRef"
 }
 export declare enum StoreCfgTypes {
     model = "model"
 }
-export type ConfigurationTypes = CommonCfgTypes | ModelCfgTypes | StoreCfgTypes;
+export declare enum ObservableCfgTypes {
+    observable = "observable",
+    computed = "computed"
+}
+export type ConfigurationTypes = CommonCfgTypes | ModelCfgTypes | StoreCfgTypes | ObservableCfgTypes;
 export type ConfigurationType = {
     type: ConfigurationTypes;
     childType?: Function;
@@ -44,16 +46,10 @@ export type ConfigurationType = {
 export type ModelConfiguration<T> = Record<PropertyKey, ConfigurationType>;
 export type StoreConfiguration<T> = Record<PropertyKey, ConfigurationType>;
 export type Configuration<T> = ModelConfiguration<T> | StoreConfiguration<T>;
-type NonFunctionPropertyNames<T> = {
-    [K in keyof T]: T[K] extends Function ? never : K;
-}[keyof T];
-type ChildrenToSnapshot<T> = {
-    [K in keyof T]: T[K] extends Model ? Snapshot<T[K]> : T[K] extends Array<infer R> ? R extends Model ? Array<Snapshot<R>> : T[K] : T[K];
-};
-type Nullable<T> = {
-    [K in keyof T]: T[K] | null;
+type SnapshotValue<T> = T extends Model ? Snapshot<T> : T extends Array<infer R> ? R extends Model ? Array<Snapshot<R>> : T : T;
+export type Snapshot<T extends Model = Model> = {
+    [K in keyof T]?: T[K] extends infer U ? U extends Model | Model[] ? SnapshotValue<U> | null : U extends null | undefined ? null : SnapshotValue<Exclude<U, null | undefined>> | null : never;
 };
-export type Snapshot<T extends Model = Model> = Nullable<Partial<ChildrenToSnapshot<Pick<T, NonFunctionPropertyNames<T>>>>>;
 export type SnapshotDiff<T extends Model = Model> = {
     undo: Snapshot<T>;
     redo: Snapshot<T>;
@@ -66,12 +62,12 @@ export type RefSnapshot = {
 export declare const childType: ((childType: Function) => ConfigurationType) & {
     type: CommonCfgTypes;
 };
-export declare const childrenType: ((childType: Function) => ConfigurationType) & {
-    type: CommonCfgTypes;
-};
 export declare const stateType: ConfigurationType;
-export declare const modelRefType: ConfigurationType;
-export declare const modelRefsType: ConfigurationType;
+export declare const modelRefType: ((childType: Function) => ConfigurationType) & {
+    type: ModelCfgTypes;
+};
 export declare const idType: ConfigurationType;
 export declare const modelType: ConfigurationType;
+export declare const observableType: ConfigurationType;
+export declare const computedType: ConfigurationType;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "r-state-tree",
-	"version": "0.3.1",
+	"version": "0.4.1",
 	"description": "reactive state management library",
 	"main": "dist/r-state-tree.cjs",
 	"module": "dist/r-state-tree.js",
@@ -38,6 +38,7 @@
 	},
 	"homepage": "https://github.com/melnikov-s/r-state-tree#readme",
 	"devDependencies": {
+		"@tsmetadata/polyfill": "^1.1.3",
 		"@typescript-eslint/eslint-plugin": "^5.8.1",
 		"@typescript-eslint/parser": "^5.8.1",
 		"eslint": "^8.5.0",