Merge branch 'main' into feat/signals/extend-resource

Author: markostanimirovic

modules/component-store/spec/component-store.spec.ts

@@ -1366,7 +1366,7 @@ describe('Component Store', () => {
     );
 
     it('complete when componentStore is destroyed', () =>
-      new Promise((doneFn) => {
+      new Promise<void>((doneFn) => {
         const selector = componentStore.select(() => ({}), { debounce: true });
 
         selector.subscribe({

modules/component-store/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./tsconfig.build.json" },
+    { "path": "./tsconfig.schematics.json" },
+    { "path": "./tsconfig.spec.json" }
+  ]
+}

modules/component/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./tsconfig.build.json" },
+    { "path": "./tsconfig.schematics.json" },
+    { "path": "./tsconfig.spec.json" }
+  ]
+}

modules/data/spec/effects/entity-effects.marbles.spec.ts

@@ -1,28 +1,28 @@
 // Using marble testing
 import { TestBed } from '@angular/core/testing';
 
-import { cold, hot, getTestScheduler } from './marbles';
 import { Observable } from 'rxjs';
+import { cold, getTestScheduler, hot } from './marbles';
 
 import { Actions } from '@ngrx/effects';
-import { Update } from '@ngrx/entity';
 import { provideMockActions } from '@ngrx/effects/testing';
+import { Update } from '@ngrx/entity';
+import { Mock, vi } from 'vitest';
 import {
-  EntityEffects,
+  DataServiceError,
+  DefaultPersistenceResultHandler,
+  EntityAction,
+  EntityActionDataServiceError,
   EntityActionFactory,
   EntityDataService,
-  PersistenceResultHandler,
-  DefaultPersistenceResultHandler,
+  EntityEffects,
   EntityOp,
   HttpMethods,
-  DataServiceError,
-  EntityAction,
-  makeErrorOp,
-  EntityActionDataServiceError,
   Logger,
+  makeErrorOp,
+  PersistenceResultHandler,
 } from '../..';
 import { ENTITY_EFFECTS_SCHEDULER } from '../../src/effects/entity-effects-scheduler';
-import { Mock, vi } from 'vitest';
 
 //////// Tests begin ////////
 describe('EntityEffects (marble testing)', () => {
@@ -448,7 +448,7 @@ describe('EntityEffects (marble testing)', () => {
     const action = entityActionFactory.create('Hero', EntityOp.REMOVE_ALL);
 
     actions = hot('-a---', { a: action });
-    const expected = cold('---');
+    const expected = cold<never>('---');
 
     expect(effects.persist$).toBeObservable(expected);
   });

modules/data/spec/effects/marbles.ts

@@ -18,16 +18,24 @@ export function cold<T = unknown>(
   marbles: string,
   values?: Record<string, T>,
   error?: unknown
-): Observable<T> {
-  return scheduler.createColdObservable(marbles, values, error);
+): MarbleObservable<T> {
+  return scheduler.createColdObservable(
+    marbles,
+    values,
+    error
+  ) as MarbleObservable<T>;
 }
 
 export function hot<T = unknown>(
   marbles: string,
   values?: Record<string, T>,
   error?: unknown
-): Observable<T> {
-  return scheduler.createHotObservable(marbles, values, error);
+): MarbleObservable<T> {
+  return scheduler.createHotObservable(
+    marbles,
+    values,
+    error
+  ) as MarbleObservable<T>;
 }
 
 expect.extend({
@@ -79,6 +87,8 @@ expect.extend({
 
 declare module 'vitest' {
   interface Assertion<T = unknown> {
-    toBeObservable(expected: MarbleObservable<T>): T;
+    toBeObservable(
+      expected: MarbleObservable<T extends Observable<infer V> ? V : T>
+    ): void;
   }
 }

modules/data/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./tsconfig.build.json" },
+    { "path": "./tsconfig.schematics.json" },
+    { "path": "./tsconfig.spec.json" }
+  ]
+}

modules/effects/spec/effect_sources.spec.ts

@@ -419,13 +419,14 @@ describe('EffectSources', () => {
         testScheduler.run(({ hot, expectObservable }) => {
           const sources$ = of(
             new (class {
-              b$ = createEffect(() =>
-                hot('a--e--b--e--c--e--d').pipe(
-                  map((v) => {
-                    if (v == 'e') throw new Error('An Error');
-                    return v;
-                  })
-                )
+              b$ = createEffect(
+                () =>
+                  hot('a--e--b--e--c--e--d').pipe(
+                    map((v) => {
+                      if (v == 'e') throw new Error('An Error');
+                      return v;
+                    })
+                  ) as any
               );
             })()
           );
@@ -493,11 +494,11 @@ describe('EffectSources', () => {
       });
 
       it('should not complete the group if just one effect completes', () => {
-        testScheduler.run(({ cold, expectObservable, scheduler }) => {
+        testScheduler.run(({ cold, expectObservable }) => {
           class SourceH {
             empty = createEffect(() => of('value') as any);
             never = createEffect(
-              () => timer(5, scheduler).pipe(map(() => 'update')) as any
+              () => timer(5, testScheduler).pipe(map(() => 'update')) as any
             );
           }
 

modules/effects/spec/effects_error_handler.spec.ts

@@ -36,9 +36,9 @@ describe('Effects Error Handler', () => {
     });
 
     globalErrorHandler = TestBed.inject(ErrorHandler)
-      .handleError as MockInstance;
+      .handleError as unknown as MockInstance;
     const store = TestBed.inject(Store);
-    storeNext = store.next as MockInstance;
+    storeNext = store.next as unknown as MockInstance;
   }
 
   it('should retry on infinite error up to 10 times', () => {

modules/effects/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./tsconfig.build.json" },
+    { "path": "./tsconfig.schematics.json" },
+    { "path": "./tsconfig.spec.json" }
+  ]
+}

modules/entity/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./tsconfig.build.json" },
+    { "path": "./tsconfig.schematics.json" },
+    { "path": "./tsconfig.spec.json" }
+  ]
+}