@e280/strata 0.0.0-3 → 0.0.0-4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@e280/strata",
-	"version": "0.0.0-3",
+	"version": "0.0.0-4",
 	"description": "state management",
 	"license": "MIT",
 	"author": "Chase Moskal <chasemoskal@gmail.com>",

package/s/parts/chronstrata.ts

@@ -2,13 +2,13 @@
 import {Substrata} from "./substrata.js"
 import {Chronicle, Mutator, Options, Selector, Stratum, Substate} from "./types.js"
 
-export class Chronstrata<ParentState extends Substate, S extends Substate> implements Stratum<S> {
-	#substrata: Substrata<ParentState, Chronicle<S>>
+export class Chronstrata<S extends Substate, ParentState extends Substate = any> implements Stratum<S> {
+	#substrata: Substrata<Chronicle<S>, ParentState>
 
 	constructor(
 			public limit: number,
 			public parent: Stratum<ParentState>,
-			public selector: Selector<ParentState, Chronicle<S>>,
+			public selector: Selector<Chronicle<S>, ParentState>,
 			public options: Options,
 		) {
 		this.#substrata = parent.substrata(selector)
@@ -77,7 +77,7 @@ export class Chronstrata<ParentState extends Substate, S extends Substate> imple
 		})
 	}
 
-	substrata<Sub extends Substate>(selector: Selector<S, Sub>): Substrata<S, Sub> {
+	substrata<Sub extends Substate>(selector: Selector<Sub, S>): Substrata<Sub, S> {
 		return new Substrata(this, selector, this.options)
 	}
 }

package/s/parts/strata.ts

@@ -51,13 +51,13 @@ export class Strata<S extends State> implements Stratum<S> {
 		await this.#dispatchMutation()
 	}
 
-	substrata<Sub extends Substate>(selector: Selector<S, Sub>): Substrata<S, Sub> {
+	substrata<Sub extends Substate>(selector: Selector<Sub, S>): Substrata<Sub, S> {
 		return new Substrata(this, selector, this.options)
 	}
 
 	chronstrata<Sub extends Substate>(
 			limit: number,
-			selector: Selector<S, Chronicle<Sub>>,
+			selector: Selector<Chronicle<Sub>, S>,
 		) {
 		return new Chronstrata(limit, this, selector, this.options)
 	}

package/s/parts/substrata.ts

@@ -3,7 +3,7 @@ import {debounce, deep, sub} from "@e280/stz"
 import {Chronstrata} from "./chronstrata.js"
 import {Chronicle, Mutator, Options, Selector, Stratum, Substate} from "./types.js"
 
-export class Substrata<ParentState extends Substate, S extends Substate> implements Stratum<S> {
+export class Substrata<S extends Substate, ParentState extends Substate = any> implements Stratum<S> {
 	dispose: () => void
 	watch = sub<[state: S]>()
 
@@ -12,7 +12,7 @@ export class Substrata<ParentState extends Substate, S extends Substate> impleme
 
 	constructor(
 			private parent: Stratum<ParentState>,
-			private selector: Selector<ParentState, S>,
+			private selector: Selector<S, ParentState>,
 			private options: Options,
 		) {
 
@@ -44,13 +44,13 @@ export class Substrata<ParentState extends Substate, S extends Substate> impleme
 		return this.#immutable
 	}
 
-	substrata<Sub extends Substate>(selector: Selector<S, Sub>): Substrata<S, Sub> {
+	substrata<Sub extends Substate>(selector: Selector<Sub, S>): Substrata<Sub, S> {
 		return new Substrata(this, selector, this.options)
 	}
 
 	chronstrata<Sub extends Substate>(
 			limit: number,
-			selector: Selector<S, Chronicle<Sub>>,
+			selector: Selector<Chronicle<Sub>, S>,
 		) {
 		return new Chronstrata(limit, this, selector, this.options)
 	}

package/s/parts/types.ts

@@ -5,7 +5,7 @@ export type Options = {
 	clone: <X>(x: X) => X
 }
 
-export type Selector<S, Sub> = (state: S) => Sub
+export type Selector<Sub, S> = (state: S) => Sub
 export type Mutator<S> = (state: S) => void
 
 export type State = {}
@@ -20,7 +20,7 @@ export type Stratum<S extends Substate> = {
 	readonly state: S
 	watch(fn: (s: S) => void): () => void
 	mutate(mutator: Mutator<S>): Promise<S>
-	substrata<Sub extends Substate>(selector: Selector<S, Sub>): Substrata<S, Sub>
+	substrata<Sub extends Substate>(selector: Selector<Sub, S>): Substrata<Sub, S>
 }
 
 export type SetupOptions<S extends State> = {

package/s/parts/utils/process-options.ts

@@ -2,6 +2,6 @@
 import {Options} from "../types.js"
 
 export const processOptions = (options: Partial<Options>): Options => ({
-	clone: options.clone ?? structuredClone,
+	clone: options.clone ?? (<X>(x: X) => structuredClone(x)),
 })
 

package/x/parts/chronstrata.d.ts

@@ -1,12 +1,12 @@
 import { Substrata } from "./substrata.js";
 import { Chronicle, Mutator, Options, Selector, Stratum, Substate } from "./types.js";
-export declare class Chronstrata<ParentState extends Substate, S extends Substate> implements Stratum<S> {
+export declare class Chronstrata<S extends Substate, ParentState extends Substate = any> implements Stratum<S> {
     #private;
     limit: number;
     parent: Stratum<ParentState>;
-    selector: Selector<ParentState, Chronicle<S>>;
+    selector: Selector<Chronicle<S>, ParentState>;
     options: Options;
-    constructor(limit: number, parent: Stratum<ParentState>, selector: Selector<ParentState, Chronicle<S>>, options: Options);
+    constructor(limit: number, parent: Stratum<ParentState>, selector: Selector<Chronicle<S>, ParentState>, options: Options);
     get state(): S;
     get undoable(): number;
     get redoable(): number;
@@ -19,5 +19,5 @@ export declare class Chronstrata<ParentState extends Substate, S extends Substat
     redo(n?: number): Promise<void>;
     /** wipe past and future snapshots */
     wipe(): Promise<void>;
-    substrata<Sub extends Substate>(selector: Selector<S, Sub>): Substrata<S, Sub>;
+    substrata<Sub extends Substate>(selector: Selector<Sub, S>): Substrata<Sub, S>;
 }

package/x/parts/strata.d.ts

@@ -12,6 +12,6 @@ export declare class Strata<S extends State> implements Stratum<S> {
     get state(): S;
     mutate(mutator: Mutator<S>): Promise<S>;
     overwrite(state: S): Promise<void>;
-    substrata<Sub extends Substate>(selector: Selector<S, Sub>): Substrata<S, Sub>;
-    chronstrata<Sub extends Substate>(limit: number, selector: Selector<S, Chronicle<Sub>>): Chronstrata<S, Sub>;
+    substrata<Sub extends Substate>(selector: Selector<Sub, S>): Substrata<Sub, S>;
+    chronstrata<Sub extends Substate>(limit: number, selector: Selector<Chronicle<Sub>, S>): Chronstrata<Sub, S>;
 }

package/x/parts/substrata.d.ts

@@ -1,15 +1,15 @@
 import { Chronstrata } from "./chronstrata.js";
 import { Chronicle, Mutator, Options, Selector, Stratum, Substate } from "./types.js";
-export declare class Substrata<ParentState extends Substate, S extends Substate> implements Stratum<S> {
+export declare class Substrata<S extends Substate, ParentState extends Substate = any> implements Stratum<S> {
     #private;
     private parent;
     private selector;
     private options;
     dispose: () => void;
     watch: import("@e280/stz").Sub<[state: S]>;
-    constructor(parent: Stratum<ParentState>, selector: Selector<ParentState, S>, options: Options);
+    constructor(parent: Stratum<ParentState>, selector: Selector<S, ParentState>, options: Options);
     get state(): S;
     mutate(mutator: Mutator<S>): Promise<S>;
-    substrata<Sub extends Substate>(selector: Selector<S, Sub>): Substrata<S, Sub>;
-    chronstrata<Sub extends Substate>(limit: number, selector: Selector<S, Chronicle<Sub>>): Chronstrata<S, Sub>;
+    substrata<Sub extends Substate>(selector: Selector<Sub, S>): Substrata<Sub, S>;
+    chronstrata<Sub extends Substate>(limit: number, selector: Selector<Chronicle<Sub>, S>): Chronstrata<Sub, S>;
 }

package/x/parts/types.d.ts

@@ -2,7 +2,7 @@ import { Substrata } from "./substrata.js";
 export type Options = {
     clone: <X>(x: X) => X;
 };
-export type Selector<S, Sub> = (state: S) => Sub;
+export type Selector<Sub, S> = (state: S) => Sub;
 export type Mutator<S> = (state: S) => void;
 export type State = {};
 export type Substate = {} | null | undefined;
@@ -14,7 +14,7 @@ export type Stratum<S extends Substate> = {
     readonly state: S;
     watch(fn: (s: S) => void): () => void;
     mutate(mutator: Mutator<S>): Promise<S>;
-    substrata<Sub extends Substate>(selector: Selector<S, Sub>): Substrata<S, Sub>;
+    substrata<Sub extends Substate>(selector: Selector<Sub, S>): Substrata<Sub, S>;
 };
 export type SetupOptions<S extends State> = {
     version: number;

package/x/parts/utils/process-options.js

@@ -1,4 +1,4 @@
 export const processOptions = (options) => ({
-    clone: options.clone ?? structuredClone,
+    clone: options.clone ?? ((x) => structuredClone(x)),
 });
 //# sourceMappingURL=process-options.js.map

package/x/parts/utils/process-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-options.js","sourceRoot":"","sources":["../../../s/parts/utils/process-options.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAW,EAAE,CAAC,CAAC;IACtE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,eAAe;CACvC,CAAC,CAAA"}
+{"version":3,"file":"process-options.js","sourceRoot":"","sources":["../../../s/parts/utils/process-options.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAW,EAAE,CAAC,CAAC;IACtE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC,CAAI,CAAI,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;CACzD,CAAC,CAAA"}