Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 33 additions & 31 deletions modules/signals/src/signal-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import {
} from './signal-store-models';
import { OmitPrivate, Prettify } from './ts-helpers';

type SignalStoreConfig = { providedIn?: 'root'; protectedState?: boolean };
type ProvidedInConfig = { providedIn?: 'root' | 'platform' };

type SignalStoreConfig = ProvidedInConfig & { protectedState?: boolean };

type SignalStoreMembers<FeatureResult extends SignalStoreFeatureResult> =
Prettify<
Expand Down Expand Up @@ -440,7 +442,7 @@ export function signalStore<
): Type<SignalStoreMembers<R> & StateSource<Prettify<OmitPrivate<R['state']>>>>;

export function signalStore<F1 extends SignalStoreFeatureResult>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>
): Type<
SignalStoreMembers<F1> & StateSource<Prettify<OmitPrivate<F1['state']>>>
Expand All @@ -450,7 +452,7 @@ export function signalStore<
F2 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>
): Type<SignalStoreMembers<R> & StateSource<Prettify<OmitPrivate<R['state']>>>>;
Expand All @@ -460,7 +462,7 @@ export function signalStore<
F3 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>
Expand All @@ -472,7 +474,7 @@ export function signalStore<
F4 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand All @@ -486,7 +488,7 @@ export function signalStore<
F5 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4 & F5,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand All @@ -502,7 +504,7 @@ export function signalStore<
F6 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4 & F5 & F6,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand All @@ -520,7 +522,7 @@ export function signalStore<
F7 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4 & F5 & F6 & F7,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand All @@ -540,7 +542,7 @@ export function signalStore<
F8 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -570,7 +572,7 @@ export function signalStore<
F8 &
F9,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -603,7 +605,7 @@ export function signalStore<
F9 &
F10,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -639,7 +641,7 @@ export function signalStore<
F10 &
F11,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -678,7 +680,7 @@ export function signalStore<
F11 &
F12,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -726,7 +728,7 @@ export function signalStore<
F12 &
F13,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -780,7 +782,7 @@ export function signalStore<
F13 &
F14,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -840,7 +842,7 @@ export function signalStore<
F14 &
F15,
>(
config: { providedIn?: 'root'; protectedState?: true },
config: ProvidedInConfig & { protectedState?: true },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -874,7 +876,7 @@ export function signalStore<
): Type<SignalStoreMembers<R> & StateSource<Prettify<OmitPrivate<R['state']>>>>;

export function signalStore<F1 extends SignalStoreFeatureResult>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>
): Type<
SignalStoreMembers<F1> &
Expand All @@ -885,7 +887,7 @@ export function signalStore<
F2 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>
): Type<
Expand All @@ -897,7 +899,7 @@ export function signalStore<
F3 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>
Expand All @@ -911,7 +913,7 @@ export function signalStore<
F4 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand All @@ -927,7 +929,7 @@ export function signalStore<
F5 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4 & F5,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand All @@ -945,7 +947,7 @@ export function signalStore<
F6 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4 & F5 & F6,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand All @@ -965,7 +967,7 @@ export function signalStore<
F7 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4 & F5 & F6 & F7,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand All @@ -987,7 +989,7 @@ export function signalStore<
F8 extends SignalStoreFeatureResult,
R extends SignalStoreFeatureResult = F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -1019,7 +1021,7 @@ export function signalStore<
F8 &
F9,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -1054,7 +1056,7 @@ export function signalStore<
F9 &
F10,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -1092,7 +1094,7 @@ export function signalStore<
F10 &
F11,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -1133,7 +1135,7 @@ export function signalStore<
F11 &
F12,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -1183,7 +1185,7 @@ export function signalStore<
F12 &
F13,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -1239,7 +1241,7 @@ export function signalStore<
F13 &
F14,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down Expand Up @@ -1301,7 +1303,7 @@ export function signalStore<
F14 &
F15,
>(
config: { providedIn?: 'root'; protectedState: false },
config: ProvidedInConfig & { protectedState: false },
f1: SignalStoreFeature<EmptyFeatureResult, F1>,
f2: SignalStoreFeature<{} & F1, F2>,
f3: SignalStoreFeature<F1 & F2, F3>,
Expand Down