From 0f4dafc681352e90b7881df3f2aa08f190456b2a Mon Sep 17 00:00:00 2001 From: Mattias Holmlund Date: Wed, 23 May 2018 09:13:07 +0200 Subject: [PATCH 1/2] fix(typings): allow bufferCreationInterval null for bufferTime The tests for bufferTime verifies that it is possible to set bufferCreationInterval to null, but the typings did not allow it when strictNullChecks were set to true. Fixes #3728 --- compat/operator/bufferTime.ts | 4 ++-- src/internal/operators/bufferTime.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compat/operator/bufferTime.ts b/compat/operator/bufferTime.ts index c980ef627f..268b9fab53 100644 --- a/compat/operator/bufferTime.ts +++ b/compat/operator/bufferTime.ts @@ -4,8 +4,8 @@ import { bufferTime as higherOrder } from 'rxjs/operators'; /* tslint:disable:max-line-length */ export function bufferTime(this: Observable, bufferTimeSpan: number, scheduler?: SchedulerLike): Observable; -export function bufferTime(this: Observable, bufferTimeSpan: number, bufferCreationInterval: number, scheduler?: SchedulerLike): Observable; -export function bufferTime(this: Observable, bufferTimeSpan: number, bufferCreationInterval: number, maxBufferSize: number, scheduler?: SchedulerLike): Observable; +export function bufferTime(this: Observable, bufferTimeSpan: number, bufferCreationInterval: number | null, scheduler?: SchedulerLike): Observable; +export function bufferTime(this: Observable, bufferTimeSpan: number, bufferCreationInterval: number | null, maxBufferSize: number, scheduler?: SchedulerLike): Observable; /* tslint:enable:max-line-length */ /** diff --git a/src/internal/operators/bufferTime.ts b/src/internal/operators/bufferTime.ts index 11f9205cc3..8f95b7cfed 100644 --- a/src/internal/operators/bufferTime.ts +++ b/src/internal/operators/bufferTime.ts @@ -8,8 +8,8 @@ import { OperatorFunction, SchedulerAction, SchedulerLike } from '../types'; /* tslint:disable:max-line-length */ export function bufferTime(bufferTimeSpan: number, scheduler?: SchedulerLike): OperatorFunction; -export function bufferTime(bufferTimeSpan: number, bufferCreationInterval: number, scheduler?: SchedulerLike): OperatorFunction; -export function bufferTime(bufferTimeSpan: number, bufferCreationInterval: number, maxBufferSize: number, scheduler?: SchedulerLike): OperatorFunction; +export function bufferTime(bufferTimeSpan: number, bufferCreationInterval: number | null, scheduler?: SchedulerLike): OperatorFunction; +export function bufferTime(bufferTimeSpan: number, bufferCreationInterval: number | null, maxBufferSize: number, scheduler?: SchedulerLike): OperatorFunction; /* tslint:enable:max-line-length */ /** From ada645c1e1c0a8ba73238b6bd755226e82887f8b Mon Sep 17 00:00:00 2001 From: Mattias Holmlund Date: Thu, 24 May 2018 20:50:03 +0200 Subject: [PATCH 2/2] fix(typings): allow bufferCreationInterval undefined for bufferTime --- compat/operator/bufferTime.ts | 4 ++-- src/internal/operators/bufferTime.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compat/operator/bufferTime.ts b/compat/operator/bufferTime.ts index 268b9fab53..44662e7c00 100644 --- a/compat/operator/bufferTime.ts +++ b/compat/operator/bufferTime.ts @@ -4,8 +4,8 @@ import { bufferTime as higherOrder } from 'rxjs/operators'; /* tslint:disable:max-line-length */ export function bufferTime(this: Observable, bufferTimeSpan: number, scheduler?: SchedulerLike): Observable; -export function bufferTime(this: Observable, bufferTimeSpan: number, bufferCreationInterval: number | null, scheduler?: SchedulerLike): Observable; -export function bufferTime(this: Observable, bufferTimeSpan: number, bufferCreationInterval: number | null, maxBufferSize: number, scheduler?: SchedulerLike): Observable; +export function bufferTime(this: Observable, bufferTimeSpan: number, bufferCreationInterval: number | null | undefined, scheduler?: SchedulerLike): Observable; +export function bufferTime(this: Observable, bufferTimeSpan: number, bufferCreationInterval: number | null | undefined, maxBufferSize: number, scheduler?: SchedulerLike): Observable; /* tslint:enable:max-line-length */ /** diff --git a/src/internal/operators/bufferTime.ts b/src/internal/operators/bufferTime.ts index 8f95b7cfed..1012862ee3 100644 --- a/src/internal/operators/bufferTime.ts +++ b/src/internal/operators/bufferTime.ts @@ -8,8 +8,8 @@ import { OperatorFunction, SchedulerAction, SchedulerLike } from '../types'; /* tslint:disable:max-line-length */ export function bufferTime(bufferTimeSpan: number, scheduler?: SchedulerLike): OperatorFunction; -export function bufferTime(bufferTimeSpan: number, bufferCreationInterval: number | null, scheduler?: SchedulerLike): OperatorFunction; -export function bufferTime(bufferTimeSpan: number, bufferCreationInterval: number | null, maxBufferSize: number, scheduler?: SchedulerLike): OperatorFunction; +export function bufferTime(bufferTimeSpan: number, bufferCreationInterval: number | null | undefined, scheduler?: SchedulerLike): OperatorFunction; +export function bufferTime(bufferTimeSpan: number, bufferCreationInterval: number | null | undefined, maxBufferSize: number, scheduler?: SchedulerLike): OperatorFunction; /* tslint:enable:max-line-length */ /**