refactor(@dataflow): interface rename 'FlowInNode' 'FlowOutNode'

replace 'BareFlowInNode' as 'FlowInNode' replace 'BareFlowOutNode' as 'FlowOutNode' BREAKING CHANGE: replace 'BareFlowInNode' as 'FlowInNode', replace 'BareFlowOutNode' as 'FlowOutNode'
ElonH · May 17, 2020 · b552309 · b552309
1 parent 217700a
commit b552309
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/src/app/@dataflow/core/ajax-flow.ts b/src/app/@dataflow/core/ajax-flow.ts
@@ -1,5 +1,5 @@
 import { CacheFlow } from './cache-flow';
-import { DataFlowNode, BareFlowInNode, BareFlowOutNode, CombErr } from './bare-flow';
+import { DataFlowNode, FlowInNode, FlowOutNode, CombErr } from './bare-flow';
 import { Observable, of } from 'rxjs';
 import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { catchError, map } from 'rxjs/operators';
@@ -8,8 +8,8 @@ import { FlowSupNode } from './superset-flow';
 export type AjaxFlowNode = [AjaxResponse | object, Error[]];
 
 export abstract class AjaxFlow<
-	Tin extends BareFlowInNode,
-	Tout extends BareFlowOutNode,
+	Tin extends FlowInNode,
+	Tout extends FlowOutNode,
 	Tsup extends FlowSupNode = Tin & Tout
 > extends CacheFlow<Tin, Tout, Tsup> {
 	// protected cacheSupport: boolean;

diff --git a/src/app/@dataflow/core/bare-flow.spec.ts b/src/app/@dataflow/core/bare-flow.spec.ts
@@ -1,4 +1,4 @@
-import { BareFlow, DataFlowNode, BareFlowInNode, BareFlowOutNode, CombErr } from './bare-flow';
+import { BareFlow, DataFlowNode, FlowInNode, FlowOutNode, CombErr } from './bare-flow';
 import { TestScheduler } from 'rxjs/testing';
 import { Observable, of } from 'rxjs';
 
@@ -19,7 +19,7 @@ describe('BareFlow', () => {
 			const pre = cold('a----', values);
 			const expected = 'a----';
 
-			const rst = new (class extends BareFlow<BareFlowInNode, BareFlowOutNode> {
+			const rst = new (class extends BareFlow<FlowInNode, FlowOutNode> {
 				public prerequest$ = pre;
 				protected request(pre: DataFlowNode): Observable<DataFlowNode> {
 					throw new Error('Method not implemented.');

diff --git a/src/app/@dataflow/core/bare-flow.ts b/src/app/@dataflow/core/bare-flow.ts
@@ -1,12 +1,12 @@
 import { Observable, of } from 'rxjs';
 import { switchMap, take, tap, startWith, distinctUntilChanged, skipWhile } from 'rxjs/operators';
 
-export interface BareFlowInNode {}
-export interface BareFlowOutNode {}
-export type DataFlowNode = [BareFlowInNode, Error[]]; // TODO: drop support
+export interface FlowInNode {}
+export interface FlowOutNode {}
+export type DataFlowNode = [FlowInNode, Error[]]; // TODO: drop support
 export type CombErr<T> = [T, Error[]];
 
-export abstract class BareFlow<Tin extends BareFlowInNode, Tout extends BareFlowOutNode> {
+export abstract class BareFlow<Tin extends FlowInNode, Tout extends FlowOutNode> {
 	public abstract prerequest$: Observable<CombErr<Tin>>;
 	protected abstract request(pre: CombErr<Tin>): Observable<CombErr<Tout>>;
 	private bareData$: Observable<CombErr<Tout>>;

diff --git a/src/app/@dataflow/core/cache-flow.spec.ts b/src/app/@dataflow/core/cache-flow.spec.ts
@@ -1,6 +1,6 @@
 import { CacheFlow } from './cache-flow';
 import { TestScheduler } from 'rxjs/testing';
-import { DataFlowNode, BareFlowInNode, CombErr, BareFlowOutNode } from './bare-flow';
+import { DataFlowNode, FlowInNode, CombErr, FlowOutNode } from './bare-flow';
 import { Observable, of } from 'rxjs';
 
 describe('CacheFlow', () => {
@@ -17,10 +17,10 @@ describe('CacheFlow', () => {
 	it('prerequest twice(different value), request same value, only output onece', () => {
 		scheduler.run((helpers) => {
 			const { cold, hot, expectObservable, expectSubscriptions, flush } = helpers;
-			interface TestIn extends BareFlowInNode {
+			interface TestIn extends FlowInNode {
 				ab: number;
 			}
-			interface TestOut extends BareFlowOutNode {
+			interface TestOut extends FlowOutNode {
 				k: number;
 			}
 			interface TestSup extends TestOut, TestIn {}
@@ -51,10 +51,10 @@ describe('CacheFlow', () => {
 	it('check cache validation', () => {
 		scheduler.run((helpers) => {
 			const { cold, hot, expectObservable, expectSubscriptions, flush } = helpers;
-			interface TestIn extends BareFlowInNode {
+			interface TestIn extends FlowInNode {
 				ab: number;
 			}
-			interface TestOut extends BareFlowOutNode {
+			interface TestOut extends FlowOutNode {
 				k: number;
 			}
 			interface TestSup extends TestOut, TestIn {}
@@ -97,10 +97,10 @@ describe('CacheFlow', () => {
 	it('disable cache', () => {
 		scheduler.run((helpers) => {
 			const { cold, hot, expectObservable, expectSubscriptions, flush } = helpers;
-			interface TestIn extends BareFlowInNode {
+			interface TestIn extends FlowInNode {
 				ab: number;
 			}
-			interface TestOut extends BareFlowOutNode {
+			interface TestOut extends FlowOutNode {
 				cd: number;
 			}
 			interface TestSup extends TestOut, TestIn {}

diff --git a/src/app/@dataflow/core/cache-flow.ts b/src/app/@dataflow/core/cache-flow.ts
@@ -1,11 +1,11 @@
-import { DataFlowNode, BareFlowInNode, BareFlowOutNode, CombErr } from './bare-flow';
+import { DataFlowNode, FlowInNode, FlowOutNode, CombErr } from './bare-flow';
 import { Observable, iif, of } from 'rxjs';
 import { SupersetFlow, FlowSupNode } from './superset-flow';
 import { tap, take, map } from 'rxjs/operators';
 
 export abstract class CacheFlow<
-	Tin extends BareFlowInNode,
-	Tout extends BareFlowOutNode,
+	Tin extends FlowInNode,
+	Tout extends FlowOutNode,
 	Tsup extends FlowSupNode = Tin & Tout
 > extends SupersetFlow<Tin, Tout, Tsup> {
 	protected abstract requestCache(pre: CombErr<Tin>): Observable<CombErr<Tout>>;

diff --git a/src/app/@dataflow/core/superset-flow.spec.ts b/src/app/@dataflow/core/superset-flow.spec.ts
@@ -1,6 +1,6 @@
 import { SupersetFlow } from './superset-flow';
 import { TestScheduler } from 'rxjs/testing';
-import { DataFlowNode, BareFlowInNode, BareFlowOutNode } from './bare-flow';
+import { DataFlowNode, FlowInNode, FlowOutNode } from './bare-flow';
 import { Observable, of } from 'rxjs';
 
 describe('SupersetFlow', () => {
@@ -23,7 +23,7 @@ describe('SupersetFlow', () => {
 			const pre = cold('a--b-', values);
 			const expected = 'c--d-';
 
-			const rst = new (class extends SupersetFlow<BareFlowInNode, BareFlowOutNode> {
+			const rst = new (class extends SupersetFlow<FlowInNode, FlowOutNode> {
 				public prerequest$ = pre;
 				protected request(pre: DataFlowNode): Observable<DataFlowNode> {
 					return of([{ cd: pre[0]['ab'] + 1 }, []]);

diff --git a/src/app/@dataflow/core/superset-flow.ts b/src/app/@dataflow/core/superset-flow.ts
@@ -1,4 +1,4 @@
-import { BareFlow, BareFlowInNode, BareFlowOutNode, CombErr } from './bare-flow';
+import { BareFlow, FlowInNode, FlowOutNode, CombErr } from './bare-flow';
 import { Observable } from 'rxjs';
 import {
 	tap,
@@ -13,8 +13,8 @@ import {
 export interface FlowSupNode {}
 
 export abstract class SupersetFlow<
-	Tin extends BareFlowInNode,
-	Tout extends BareFlowOutNode,
+	Tin extends FlowInNode,
+	Tout extends FlowOutNode,
 	Tsup extends FlowSupNode = Tin & Tout
 > extends BareFlow<Tin, Tout> {
 	private boostrapPrerequest$: Observable<CombErr<Tin>>;

diff --git a/src/app/@dataflow/extra/name-validation.ts b/src/app/@dataflow/extra/name-validation.ts
@@ -1,12 +1,12 @@
-import { SupersetFlow, DataFlowNode, BareFlowInNode, CombErr } from '../core';
+import { SupersetFlow, DataFlowNode, FlowInNode, CombErr } from '../core';
 import { Observable, of } from 'rxjs';
 import { IUser, UsersFlowNode } from './users-flow';
 
 export interface NameValidationPreNode extends UsersFlowNode {
 	currentName: string;
 }
 
-export interface NameValidationNode extends BareFlowInNode {
+export interface NameValidationNode extends FlowInNode {
 	nameValid: boolean;
 }
 

diff --git a/src/app/@dataflow/extra/users-flow.ts b/src/app/@dataflow/extra/users-flow.ts
@@ -1,5 +1,5 @@
 import { Observable, of } from 'rxjs';
-import { BareFlow, DataFlowNode, BareFlowInNode, CombErr } from '../core';
+import { BareFlow, DataFlowNode, FlowInNode, CombErr } from '../core';
 
 export interface IRcloneServer {
 	url: string;
@@ -11,15 +11,15 @@ export interface IUser extends IRcloneServer {
 	name: string;
 }
 
-export interface UsersFlowNode extends BareFlowInNode {
+export interface UsersFlowNode extends FlowInNode {
 	users: IUser[];
 }
 
-export abstract class UsersFlow extends BareFlow<BareFlowInNode, UsersFlowNode> {
+export abstract class UsersFlow extends BareFlow<FlowInNode, UsersFlowNode> {
 	public static readonly defaultUser: IUser[] = [
 		{ name: 'localhost', url: 'http://localhost:5572' },
 	];
-	protected request(pre: CombErr<BareFlowInNode>): Observable<CombErr<UsersFlowNode>> {
+	protected request(pre: CombErr<FlowInNode>): Observable<CombErr<UsersFlowNode>> {
 		const dataRaw = localStorage.getItem('users');
 		if (dataRaw) return of([{ users: JSON.parse(dataRaw) }, []]);
 		localStorage.setItem('users', JSON.stringify(UsersFlow.defaultUser));