fix(schematics): assert empty as action observable (#3005)

Closes #2931
ngrx · Apr 29, 2021 · 61b1ac7 · 61b1ac7
1 parent d673048
commit 61b1ac7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/...matics/src/effect/files/__name@dasherize@if-flat__/__name@dasherize__.effects.ts.template b/...matics/src/effect/files/__name@dasherize@if-flat__/__name@dasherize__.effects.ts.template
@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { Actions, <%= effectMethod %><% if (feature) { %>, ofType<% } %> } from '@ngrx/effects';
 <% if (feature && api) { %>import { catchError, map, concatMap } from 'rxjs/operators';
-import { EMPTY, of } from 'rxjs';
+import { Observable, EMPTY, of } from 'rxjs';
 <% if (!creators) {%>import { Load<%= classify(name) %>sFailure, Load<%= classify(name) %>sSuccess, <%= classify(name) %>ActionTypes, <%= classify(name) %>Actions } from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
 <% if (creators) {%>import * as <%= classify(name) %>Actions from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
 <% } %>
 <% if (feature && !api) { %>import { concatMap } from 'rxjs/operators';
-import { EMPTY } from 'rxjs';
+import { Observable, EMPTY } from 'rxjs';
 <% if (!creators) {%>import { <%= classify(name) %>ActionTypes, <%= classify(name) %>Actions } from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
 <% if (creators) {%>import * as <%= classify(name) %>Actions from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
 <% } %>
@@ -38,13 +38,13 @@ export class <%= classify(name) %>Effects {
  <%= effectStart %>
  ofType(<%= classify(name) %>ActionTypes.Load<%= classify(name) %>s),
  /** An EMPTY observable only emits completion. Replace with your own observable API request */
- concatMap(() => EMPTY)
+ concatMap(() => EMPTY as Observable<{ type: string }>)
  <%= effectEnd %>
 <% } else if (feature && !api && creators) { %>
  <%= effectStart %>
  ofType(<%= classify(name) %>Actions.load<%= classify(name) %>s),
  /** An EMPTY observable only emits completion. Replace with your own observable API request */
- concatMap(() => EMPTY)
+ concatMap(() => EMPTY as Observable<{ type: string }>)
  <%= effectEnd %>
 <% } %>
 <% if (feature && !creators) { %>

diff --git a/modules/schematics/src/effect/index.spec.ts b/modules/schematics/src/effect/index.spec.ts
@@ -321,14 +321,16 @@ describe('Effect Schematic', () => {
  /import { Actions, Effect, ofType } from '@ngrx\/effects';/
  );
  expect(content).toMatch(/import { concatMap } from 'rxjs\/operators';/);
- expect(content).toMatch(/import { EMPTY } from 'rxjs';/);
+ expect(content).toMatch(/import { Observable, EMPTY } from 'rxjs';/);
  expect(content).toMatch(
  /import { FooActionTypes, FooActions } from '\.\/foo.actions';/
  );
  expect(content).toMatch(/export class FooEffects/);
  expect(content).toMatch(/loadFoos\$ = this\.actions\$.pipe\(/);
  expect(content).toMatch(/ofType\(FooActionTypes\.LoadFoos\)/);
- expect(content).toMatch(/concatMap\(\(\) => EMPTY\)/);
+ expect(content).toMatch(
+ /concatMap\(\(\) => EMPTY as Observable<\{ type: string \}>\)/
+ );
 
  expect(content).toMatch(
  /constructor\(private actions\$: Actions<FooActions>\) {}/
@@ -371,7 +373,7 @@ describe('Effect Schematic', () => {
  expect(content).toMatch(
  /import { catchError, map, concatMap } from 'rxjs\/operators';/
  );
- expect(content).toMatch(/import { EMPTY, of } from 'rxjs';/);
+ expect(content).toMatch(/import { Observable, EMPTY, of } from 'rxjs';/);
  expect(content).toMatch(
  /import { LoadFoosFailure, LoadFoosSuccess, FooActionTypes, FooActions } from '\.\/foo.actions';/
  );

diff --git a/modules/schematics/src/feature/index.spec.ts b/modules/schematics/src/feature/index.spec.ts
@@ -229,7 +229,9 @@ describe('Feature Schematic', () => {
  expect(fileContent).toMatch(
  /import { catchError, map, concatMap } from 'rxjs\/operators';/
  );
- expect(fileContent).toMatch(/import { EMPTY, of } from 'rxjs';/);
+ expect(fileContent).toMatch(
+ /import { Observable, EMPTY, of } from 'rxjs';/
+ );
  expect(fileContent).toMatch(
  /import \* as FooActions from '.\/foo.actions';/
  );