remove the need for validPlexusTypes

Author: Pckool

packages/plexus-core/src/scope.ts

@@ -11,7 +11,6 @@ import {
 } from './instance/instance'
 import { PlexusPreActionConfig, _preaction } from './preaction'
 import { _state } from './state'
-import { Fetcher, PlexusValidStateTypes } from './types'
 
 export interface PlexusScopeConfig {}
 
@@ -50,10 +49,7 @@ export class Scope {
 	 * @param item The default value to use when we generate the state
 	 * @returns A Plexus State Instance
 	 */
-	state<
-		Override extends PlexusValidStateTypes = never,
-		Value = Override extends AlmostAnything ? Override : any
-	>(item: Value) {
+	state<Override = never, Value = Override>(item: Value) {
 		return _state(this.instance, item)
 	}
 
@@ -62,12 +58,7 @@ export class Scope {
 	 * @param item The default value to use when we generate the state
 	 * @returns A Plexus State Instance
 	 */
-	computed<
-		Override extends PlexusValidStateTypes = never,
-		Value extends PlexusValidStateTypes = Override extends AlmostAnything
-			? Override
-			: any
-	>(
+	computed<Override = never, Value = Override>(
 		item: (value?: Value) => Value,
 		dependencies: Array<Watchable<any>> | Watchable<any>
 	) {

packages/plexus-core/src/state.ts

@@ -1,18 +1,15 @@
 import {
-	AlmostAnything,
 	PlexusWatchableValueInterpreter,
 	deepClone,
 	deepMerge,
-	isEqual,
 	isObject,
 } from '@plexusjs/utils'
 import { PlexusInstance, instance } from './instance/instance'
-import { Fetcher, PlexusInternalWatcher, PlexusValidStateTypes } from './types'
+import { PlexusInternalWatcher } from './types'
 
 import { WatchableMutable } from './watchable'
-// import { PlexusInstance, PlexStateInternalStore, PlexusStateType, PlexusStateInstance, PlexusWatcher } from "./interfaces"
 
-export type PlexusState = <Value extends PlexusValidStateTypes = any>(
+export type PlexusState = <Value = any>(
 	instance: () => PlexusInstance,
 	input: Value
 ) => StateInstance<Value>
@@ -24,8 +21,7 @@ export interface StateStore {
 	_ready: boolean
 	_isSetting: boolean
 }
-export type PlexusStateInstance<Value extends PlexusValidStateTypes = any> =
-	StateInstance<Value>
+export type PlexusStateInstance<Value = any> = StateInstance<Value>
 /**
  * A trackable State
  */
@@ -308,20 +304,6 @@ export function _state<StateValue>(
 	return new StateInstance(instance, _init)
 }
 
-// export function state<
-// 	Literal extends PlexusStateType = any,
-// 	Value extends PlexusStateType = Literal extends AlmostAnything
-// 		? Literal
-// 		: TypeOrReturnType<Literal>
-// >(item: Fetcher<Value>): TypeOrReturnType<Value>
-
-// export function state<
-// 	Literal extends PlexusStateType = any,
-// 	Value extends PlexusStateType = Literal extends AlmostAnything
-// 		? Literal
-// 		: TypeOrReturnType<Literal>
-// >(item: Value): StateInstance<Value>
-
 /**
  * Generate a Plexus State
  * @param item The default value to use when we generate the state

packages/plexus-core/src/watchable.ts

@@ -4,7 +4,7 @@ import {
 	isEqual,
 	PlexusWatchableValueInterpreter,
 } from '@plexusjs/utils'
-import { Fetcher, PlexusValidStateTypes, PlexusWatcher } from './types'
+import { Fetcher, PlexusWatcher } from './types'
 
 const getFetcher = function <ValueType>(
 	subject: ValueType | (() => ValueType)

tests/scope.test.ts

@@ -1,5 +1,4 @@
 import { beforeEach, afterEach, describe, test, expect } from 'vitest'
-// import { collection, PlexusCollectionInstance } from '@plexusjs/core'
 import { appointments, UserLite, usersLite } from './test-utils'
 
 import { randFirstName, randUuid } from '@ngneat/falso'