cross-state 0.43.3 → 0.44.0

package/dist/types/react/form/formField.d.ts

@@ -1,5 +1,4 @@
-import { type PathAsString } from '../../index';
-import { type Value } from '../../lib/path';
+import { type PathAsString, type Value } from '../../lib/path';
 import { type Component, type ComponentPropsWithoutRef, type ReactNode } from 'react';
 import { type Field, type Form, type FormInstance } from './form';
 export interface FormFieldComponentProps<TValue, TPath> {
@@ -12,7 +11,7 @@ export interface FormFieldComponentProps<TValue, TPath> {
     } | TValue | undefined, ...args: any[]) => void;
     onBlur: (...args: any[]) => void;
 }
-export type FormFieldInfos<TDraft, TOriginal, TPath extends PathAsString<TDraft>> = Field<TDraft, TOriginal, TPath> & {
+export type FormFieldInfos<TDraft, TOriginal, TPath extends string> = Field<TDraft, TOriginal, TPath> & {
     hasTriggeredValidations: boolean;
 };
 type NativeInputType = 'input' | 'select' | 'textarea';
@@ -27,14 +26,12 @@ type FieldChangeValue<T extends FormFieldComponent> = ComponentPropsWithoutRef<T
     };
 } ? V : U : never;
 type MakeOptional<T, Keys extends string> = Omit<T, Keys> & Partial<Pick<T, Keys & keyof T>>;
-export type FormFieldProps<TPath> = {
-    name?: TPath;
+export type FormFieldProps<TPath, TDraft> = {
+    name: TPath & PathAsString<TDraft>;
     commitOnBlur?: boolean;
     commitDebounce?: number;
-} & (TPath extends '' ? {} : {
-    name: TPath;
-});
-export type FormFieldPropsWithRender<TDraft, TOriginal, TPath extends PathAsString<TDraft>> = FormFieldProps<TPath> & NoInfer<{
+};
+export type FormFieldPropsWithRender<TDraft, TOriginal, TPath extends string> = FormFieldProps<TPath, TDraft> & NoInfer<{
     component?: undefined;
     render: (props: FormFieldComponentProps<Value<TDraft, TPath>, TPath>, info: FormFieldInfos<TDraft, TOriginal, TPath>) => ReactNode;
     inputFilter?: undefined;
@@ -46,7 +43,7 @@ export type FormFieldPropsWithRender<TDraft, TOriginal, TPath extends PathAsStri
 }>;
 type Serialize<TDraft, TOriginal, TPath, TComponent extends FormFieldComponent> = (value: Value<TDraft, TPath>, formState: FormInstance<TDraft, TOriginal>) => FieldValue<TComponent>;
 type Deserialize<TDraft, TOriginal, TPath, TComponent extends FormFieldComponent> = (value: FieldChangeValue<TComponent>, formState: FormInstance<TDraft, TOriginal>) => Value<TDraft, TPath>;
-export type FormFieldPropsWithComponent<TDraft, TOriginal, TPath extends PathAsString<TDraft>, TComponent extends FormFieldComponent> = FormFieldProps<TPath> & {
+export type FormFieldPropsWithComponent<TDraft, TOriginal, TPath extends string, TComponent extends FormFieldComponent> = FormFieldProps<TPath, TDraft> & {
     component?: TComponent;
     render?: undefined;
 } & NoInfer<{
@@ -67,5 +64,5 @@ export type FormFieldPropsWithComponent<TDraft, TOriginal, TPath extends PathAsS
 } : {
     deserialize: Deserialize<TDraft, TOriginal, TPath, TComponent>;
 })>;
-export declare function FormField<TDraft, TOriginal, TPath extends PathAsString<TDraft>, TComponent extends FormFieldComponent>(this: Form<TDraft, any>, { name, component, commitOnBlur, commitDebounce, render, inputFilter, defaultValue, serialize, deserialize, onChange, onBlur, ...restProps }: FormFieldPropsWithRender<TDraft, TOriginal, TPath> | FormFieldPropsWithComponent<TDraft, TOriginal, TPath, TComponent>): JSX.Element | null;
+export declare function FormField<TDraft, TOriginal, TPath extends string, TComponent extends FormFieldComponent>(this: Form<TDraft, any>, { name, component, commitOnBlur, commitDebounce, render, inputFilter, defaultValue, serialize, deserialize, onChange, onBlur, ...restProps }: FormFieldPropsWithRender<TDraft, TOriginal, TPath> | FormFieldPropsWithComponent<TDraft, TOriginal, TPath, TComponent>): JSX.Element | null;
 export {};

package/dist/types/react/form/formForEach.d.ts

@@ -1,10 +1,9 @@
 import { type GetKeys, type Join, type PathAsString, type Value } from '../../lib/path';
 import { type ReactNode } from 'react';
 import { type FieldHelperMethods, type Form } from './form';
-export type ForEachPath<T> = PathAsString<T>;
-export type ElementName<TDraft, TPath extends PathAsString<TDraft>> = Join<TPath, GetKeys<NonNullable<Value<TDraft, TPath>>> & (string | number)>;
-export interface FormForEachProps<TDraft, TPath extends ForEachPath<TDraft>> {
-    name: TPath;
+export type ElementName<TDraft, TPath extends string> = Join<TPath, GetKeys<NonNullable<Value<TDraft, TPath>>> & (string | number)>;
+export interface FormForEachProps<TDraft, TPath extends string> {
+    name: TPath & PathAsString<TDraft>;
     renderElement?: (props: {
         name: ElementName<TDraft, TPath>;
         key: `${GetKeys<NonNullable<Value<TDraft, TPath>>> & (string | number)}`;
@@ -15,4 +14,4 @@ export interface FormForEachProps<TDraft, TPath extends ForEachPath<TDraft>> {
         setValue: (value: Value<TDraft, TPath> | ((value: Value<TDraft, TPath>) => Value<TDraft, TPath>)) => void;
     } & FieldHelperMethods<TDraft, TPath>) => ReactNode;
 }
-export declare function FormForEach<TDraft, TPath extends ForEachPath<TDraft>>(this: Form<TDraft, any>, { name, renderElement, children }: FormForEachProps<TDraft, TPath>): JSX.Element;
+export declare function FormForEach<TDraft, TPath extends string>(this: Form<TDraft, any>, { name, renderElement, children }: FormForEachProps<TDraft, TPath>): JSX.Element;

package/dist/types/react/scope.d.ts

@@ -1,5 +1,6 @@
 import type { Scope, Selector, Update } from '../core';
 import { type Store } from '../core/store';
+import type { Constrain } from '../lib/constrain';
 import type { Path, Value } from '../lib/path';
 import { type Context, type ReactNode } from 'react';
 import { type UseStoreOptions } from './useStore';
@@ -16,8 +17,8 @@ declare module '../core' {
 export declare function ScopeProvider<T>({ scope, store: inputStore, children, }: ScopeProps<T>): JSX.Element;
 export declare function useScope<T>(scope: Scope<T>): Store<T>;
 export declare function useScopeStore<T, S>(scope: Scope<T>, selector: Selector<T, S>, option?: UseStoreOptions<S>): S;
-export declare function useScopeStore<T, P extends Path<T>>(scope: Scope<T>, selector: P, option?: UseStoreOptions<Value<T, P>>): Value<T, P>;
+export declare function useScopeStore<T, const P>(scope: Scope<T>, selector: Constrain<P, Path<T>>, option?: UseStoreOptions<Value<T, P>>): Value<T, P>;
 export declare function useScopeStore<T>(scope: Scope<T>, option?: UseStoreOptions<T>): T;
 export declare function useScopeProp<T, S>(scope: Scope<T>, selector: Selector<T, S>, updater: (value: S) => Update<T>, options?: UseStoreOptions<S>): [value: S, setValue: Store<S>['set']];
-export declare function useScopeProp<T, P extends Path<T>>(scope: Scope<T>, selector: P, options?: UseStoreOptions<Value<T, P>>): [value: Value<T, P>, setValue: Store<Value<T, P>>['set']];
+export declare function useScopeProp<T, const P>(scope: Scope<T>, selector: Constrain<P, Path<T>>, options?: UseStoreOptions<Value<T, P>>): [value: Value<T, P>, setValue: Store<Value<T, P>>['set']];
 export declare function useScopeProp<T>(scope: Scope<T>, options?: UseStoreOptions<T>): [value: T, setValue: Store<T>['set']];

package/dist/types/react/scopeMethods.d.ts

@@ -1,13 +1,14 @@
 import type { Scope, Selector, Store, Update } from '../core';
+import type { Constrain } from '../lib/constrain';
 import type { Path, Value } from '../lib/path';
 import { type ScopeProps } from '../react/scope';
 import type { UseStoreOptions } from '../react/useStore';
 declare function boundUseScope<T>(this: Scope<T>): Store<T>;
 declare function boundUseScopeStore<T, S>(this: Scope<T>, selector: Selector<T, S>, option?: UseStoreOptions<S>): S;
-declare function boundUseScopeStore<T, P extends Path<T>>(this: Scope<T>, selector: P, option?: UseStoreOptions<Value<T, P>>): Value<T, P>;
+declare function boundUseScopeStore<T, const P>(this: Scope<T>, selector: Constrain<P, Path<T>>, option?: UseStoreOptions<Value<T, P>>): Value<T, P>;
 declare function boundUseScopeStore<T>(this: Scope<T>, option?: UseStoreOptions<T>): T;
 declare function boundUseScopeProp<T, S>(this: Scope<T>, selector: Selector<T, S>, updater: (value: S) => Update<T>, options?: UseStoreOptions<S>): [value: S, setValue: Store<S>['set']];
-declare function boundUseScopeProp<T, P extends Path<T>>(this: Scope<T>, selector: P, options?: UseStoreOptions<Value<T, P>>): [value: Value<T, P>, setValue: Store<Value<T, P>>['set']];
+declare function boundUseScopeProp<T, const P>(this: Scope<T>, selector: Constrain<P, Path<T>>, options?: UseStoreOptions<Value<T, P>>): [value: Value<T, P>, setValue: Store<Value<T, P>>['set']];
 declare function boundUseScopeProp<T>(this: Scope<T>, options?: UseStoreOptions<T>): [value: T, setValue: Store<T>['set']];
 declare function Provider<T>(this: Scope<T>, props: Omit<ScopeProps<T>, 'scope'>): JSX.Element;
 export declare const scopeMethods: {

package/dist/types/react/storeMethods.d.ts

@@ -1,11 +1,12 @@
 import type { Selector, Store, Update } from '../core';
+import type { Constrain } from '../lib/constrain';
 import type { Path, Value } from '../lib/path';
 import { type UseStoreOptions } from '../react/useStore';
 declare function boundUseStore<T, S>(this: Store<T>, selector: Selector<T, S>, option?: UseStoreOptions<S>): S;
-declare function boundUseStore<T, P extends Path<T>>(this: Store<T>, selector: P, option?: UseStoreOptions<Value<T, P>>): Value<T, P>;
+declare function boundUseStore<T, const P>(this: Store<T>, selector: Constrain<P, Path<T>>, option?: UseStoreOptions<Value<T, P>>): Value<T, P>;
 declare function boundUseStore<T>(this: Store<T>, option?: UseStoreOptions<T>): T;
 declare function boundUseProp<T, S>(this: Store<T>, selector: Selector<T, S>, updater: (value: S) => Update<T>, options?: UseStoreOptions<S>): [value: S, setValue: Store<S>['set']];
-declare function boundUseProp<T, P extends Path<T>>(this: Store<T>, selector: P, options?: UseStoreOptions<Value<T, P>>): [value: Value<T, P>, setValue: Store<Value<T, P>>['set']];
+declare function boundUseProp<T, const P>(this: Store<T>, selector: Constrain<P, Path<T>>, options?: UseStoreOptions<Value<T, P>>): [value: Value<T, P>, setValue: Store<Value<T, P>>['set']];
 declare function boundUseProp<T>(this: Store<T>, options?: UseStoreOptions<T>): [value: T, setValue: Store<T>['set']];
 export declare const storeMethods: {
     useStore: typeof boundUseStore;

package/dist/types/react/useProp.d.ts

@@ -1,7 +1,8 @@
 import { type Selector, type Update } from '../core/commonTypes';
 import type { Store } from '../core/store';
+import type { Constrain } from '../lib/constrain';
 import { type Path, type Value } from '../lib/path';
 import { type UseStoreOptions } from './useStore';
 export declare function useProp<T, S>(store: Store<T>, selector: Selector<T, S>, updater: (value: S) => Update<T>, options?: UseStoreOptions<S>): [value: S, setValue: Store<S>['set']];
-export declare function useProp<T, P extends Path<T>>(store: Store<T>, selector: P, options?: UseStoreOptions<Value<T, P>>): [value: Value<T, P>, setValue: Store<Value<T, P>>['set']];
+export declare function useProp<T, const P>(store: Store<T>, selector: Constrain<P, Path<T>>, options?: UseStoreOptions<Value<T, P>>): [value: Value<T, P>, setValue: Store<Value<T, P>>['set']];
 export declare function useProp<T>(store: Store<T>, options?: UseStoreOptions<T>): [value: T, setValue: Store<T>['set']];

package/dist/types/react/useStore.d.ts

@@ -1,5 +1,6 @@
 import type { Selector, SubscribeOptions } from '../core/commonTypes';
 import type { Store } from '../core/store';
+import type { Constrain } from '../lib/constrain';
 import { type Path, type Value } from '../lib/path';
 export interface UseStoreOptions<S> extends Omit<SubscribeOptions, 'runNow' | 'passive'> {
     /**
@@ -11,5 +12,5 @@ export interface UseStoreOptions<S> extends Omit<SubscribeOptions, 'runNow' | 'p
     withViewTransition?: boolean | ((value: S) => unknown);
 }
 export declare function useStore<T, S>(store: Store<T>, selector: Selector<T, S>, option?: UseStoreOptions<S>): S;
-export declare function useStore<T, P extends Path<T>>(store: Store<T>, selector: P, option?: UseStoreOptions<Value<T, P>>): Value<T, P>;
+export declare function useStore<T, const P>(store: Store<T>, selector: Constrain<P, Path<T>>, option?: UseStoreOptions<Value<T, P>>): Value<T, P>;
 export declare function useStore<T>(store: Store<T>, option?: UseStoreOptions<T>): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cross-state",
-  "version": "0.43.3",
+  "version": "0.44.0",
   "description": "(React) state library",
   "license": "ISC",
   "repository": "schummar/cross-state",
@@ -131,8 +131,8 @@
   },
   "devDependencies": {
     "@emotion/styled": "11.13.0",
-    "@mantine/core": "7.13.2",
-    "@mantine/hooks": "^7.13.2",
+    "@mantine/core": "7.16.3",
+    "@mantine/hooks": "^7.16.3",
     "@mui/material": "6.1.2",
     "@schummar/eslint-config": "github:schummar/eslint-config",
     "@schummar/prettier-config": "github:schummar/prettier-config",
@@ -144,9 +144,9 @@
     "@types/seedrandom": "3.0.8",
     "@types/use-sync-external-store": "0.0.6",
     "@types/ws": "8.5.12",
-    "@vitejs/plugin-react": "4.3.2",
-    "@vitest/coverage-v8": "2.1.2",
-    "@vitest/ui": "^2.1.2",
+    "@vitejs/plugin-react": "4.3.4",
+    "@vitest/coverage-v8": "3.0.5",
+    "@vitest/ui": "^3.0.5",
     "esbuild": "0.24.0",
     "eslint": "8.57.0",
     "happy-dom": "15.7.4",
@@ -161,15 +161,15 @@
     "semantic-release": "24.1.2",
     "size-limit": "11.1.6",
     "tsc-alias": "1.8.10",
-    "typescript": "5.6.2",
+    "typescript": "5.7.3",
     "use-sync-external-store": "1.2.2",
-    "vite": "5.4.8",
-    "vite-tsconfig-paths": "5.0.1",
-    "vitest": "2.1.2"
+    "vite": "6.1.0",
+    "vite-tsconfig-paths": "5.1.4",
+    "vitest": "3.0.5"
   },
   "volta": {
-    "node": "20.15.0",
-    "pnpm": "9.4.0"
+    "node": "22.13.1",
+    "pnpm": "10.2.1"
   },
   "eslintConfig": {
     "extends": [