|
5 | 5 | * Use of this source code is governed by an MIT-style license that can be
|
6 | 6 | * found in the LICENSE file at https://angular.io/license
|
7 | 7 | */
|
8 |
| -import { Observable, concat, from, of as observableOf } from 'rxjs'; |
| 8 | +import { Observable, concat, from, isObservable, of as observableOf } from 'rxjs'; |
9 | 9 | import { concatMap, ignoreElements, mergeMap, tap } from 'rxjs/operators';
|
10 |
| -import { isObservable } from '../../utils'; |
11 | 10 | import { JsonArray, JsonObject, JsonValue } from '../interface';
|
12 | 11 | import { JsonPointer, JsonSchemaVisitor, JsonVisitor } from './interface';
|
13 | 12 | import { buildJsonPointer, joinJsonPointer } from './pointer';
|
14 | 13 | import { JsonSchema } from './schema';
|
15 | 14 |
|
16 |
| - |
17 | 15 | export interface ReferenceResolver<ContextT> {
|
18 | 16 | (ref: string, context?: ContextT): { context?: ContextT, schema?: JsonObject };
|
19 | 17 | }
|
@@ -70,11 +68,8 @@ function _visitJsonRecursive<ContextT>(
|
70 | 68 |
|
71 | 69 | const value = visitor(json, ptr, schema, root);
|
72 | 70 |
|
73 |
| - return (isObservable(value) |
74 |
| - ? value as Observable<JsonValue> |
75 |
| - : observableOf(value as JsonValue) |
76 |
| - ).pipe( |
77 |
| - concatMap((value: JsonValue) => { |
| 71 | + return (isObservable<JsonValue>(value) ? value : observableOf(value)).pipe( |
| 72 | + concatMap(value => { |
78 | 73 | if (Array.isArray(value)) {
|
79 | 74 | return concat(
|
80 | 75 | from(value).pipe(
|
|
0 commit comments