fix(signals): allow generic template literals as state keys (#4871)

Closes #4638

Author: markostanimirovic

modules/signals/entities/spec/types/with-entities.types.spec.ts

@@ -0,0 +1,51 @@
+import { expecter } from 'ts-snippet';
+import { compilerOptions } from './helpers';
+
+describe('withEntities', () => {
+  const expectSnippet = expecter(
+    (code) => `
+        import {
+          patchState,
+          signalStoreFeature,
+          type,
+          withMethods,
+        } from '@ngrx/signals';
+        import {
+          addEntity,
+          entityConfig,
+          EntityId,
+          withEntities,
+        } from '@ngrx/signals/entities';
+
+        ${code}
+      `,
+    compilerOptions()
+  );
+
+  it('succeeds when creating a custom feature with named collection', () => {
+    const snippet = `
+      function withAddEntities<
+        Entity extends { id: EntityId },
+        Collection extends string
+      >(
+        collection: Collection
+      ) {
+        const config = entityConfig({
+          entity: type<Entity>(),
+          collection,
+        });
+
+        return signalStoreFeature(
+          withEntities(config),
+          withMethods((store) => ({
+            addEntity(entity: Entity): void {
+              patchState(store, addEntity(entity, { collection }));
+            },
+          }))
+        );
+      }
+    `;
+
+    expectSnippet(snippet).toSucceed();
+  });
+});

modules/signals/spec/types/patch-state.types.spec.ts

@@ -36,19 +36,19 @@ describe('patchState', () => {
 
   it('fails with wrong partial state object', () => {
     expectSnippet('patchState(state, { x: 1 })').toFail(
-      /'x' does not exist in type 'Partial<{ count: number; foo: string; }>/
+      /'x' does not exist in type 'Partial<NoInfer<{ count: number; foo: string; }>>/
     );
     expectSnippet("patchState(state, { foo: 'baz' }, { x: 1 })").toFail(
-      /'x' does not exist in type 'Partial<{ count: number; foo: string; }>/
+      /'x' does not exist in type 'Partial<NoInfer<{ count: number; foo: string; }>>/
     );
     expectSnippet('patchState(state, { x: 1 }, { count: 0 })').toFail(
-      /'x' does not exist in type 'Partial<{ count: number; foo: string; }>/
+      /'x' does not exist in type 'Partial<NoInfer<{ count: number; foo: string; }>>/
     );
     expectSnippet('patchState(state, increment(), { x: 1 })').toFail(
-      /'x' does not exist in type 'Partial<{ count: number; foo: string; }>/
+      /'x' does not exist in type 'Partial<NoInfer<{ count: number; foo: string; }>>/
     );
     expectSnippet('patchState(state, { x: 1 }, increment())').toFail(
-      /'x' does not exist in type 'Partial<{ count: number; foo: string; }>/
+      /'x' does not exist in type 'Partial<NoInfer<{ count: number; foo: string; }>>/
     );
   });
 

modules/signals/src/state-source.ts

@@ -8,7 +8,6 @@ import {
   untracked,
   WritableSignal,
 } from '@angular/core';
-import { Prettify } from './ts-helpers';
 
 declare const ngDevMode: unknown;
 
@@ -64,8 +63,7 @@ export function isWritableStateSource<State extends object>(
 export function patchState<State extends object>(
   stateSource: WritableStateSource<State>,
   ...updaters: Array<
-    | Partial<Prettify<NoInfer<State>>>
-    | PartialStateUpdater<Prettify<NoInfer<State>>>
+    Partial<NoInfer<State>> | PartialStateUpdater<NoInfer<State>>
   >
 ): void {
   const currentState = untracked(() => getState(stateSource));

modules/signals/src/with-feature.ts

@@ -37,7 +37,7 @@ export function withFeature<
       StateSignals<Input['state']> &
         Input['props'] &
         Input['methods'] &
-        WritableStateSource<Prettify<Input['state']>>
+        WritableStateSource<Input['state']>
     >
   ) => SignalStoreFeature<Input, Output>
 ): SignalStoreFeature<Input, Output> {

modules/signals/src/with-hooks.ts

@@ -12,7 +12,7 @@ type HookFn<Input extends SignalStoreFeatureResult> = (
     StateSignals<Input['state']> &
       Input['props'] &
       Input['methods'] &
-      WritableStateSource<Prettify<Input['state']>>
+      WritableStateSource<Input['state']>
   >
 ) => void;
 
@@ -21,7 +21,7 @@ type HooksFactory<Input extends SignalStoreFeatureResult> = (
     StateSignals<Input['state']> &
       Input['props'] &
       Input['methods'] &
-      WritableStateSource<Prettify<Input['state']>>
+      WritableStateSource<Input['state']>
   >
 ) => {
   onInit?: () => void;

modules/signals/src/with-methods.ts

@@ -19,7 +19,7 @@ export function withMethods<
       StateSignals<Input['state']> &
         Input['props'] &
         Input['methods'] &
-        WritableStateSource<Prettify<Input['state']>>
+        WritableStateSource<Input['state']>
     >
   ) => Methods
 ): SignalStoreFeature<Input, { state: {}; props: {}; methods: Methods }> {

modules/signals/src/with-props.ts

@@ -17,7 +17,7 @@ export function withProps<
       StateSignals<Input['state']> &
         Input['props'] &
         Input['methods'] &
-        WritableStateSource<Prettify<Input['state']>>
+        WritableStateSource<Input['state']>
     >
   ) => Props
 ): SignalStoreFeature<Input, { state: {}; props: Props; methods: {} }> {