From d440495b6bc20eb8008397f3c744d8fa1ab578f5 Mon Sep 17 00:00:00 2001 From: uki00a Date: Tue, 28 Apr 2020 02:39:39 +0900 Subject: fix(console): don't throw RangeError when an invalid date is passed (#4929) --- cli/js/web/console.ts | 5 ++--- cli/js/web/util.ts | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'cli/js/web') diff --git a/cli/js/web/console.ts b/cli/js/web/console.ts index 5544ded3c..4709697d2 100644 --- a/cli/js/web/console.ts +++ b/cli/js/web/console.ts @@ -1,5 +1,5 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { isTypedArray, TypedArray } from "./util.ts"; +import { isInvalidDate, isTypedArray, TypedArray } from "./util.ts"; import { cliTable } from "./console_table.ts"; import { exposeForTest } from "../internals.ts"; import { PromiseState } from "./promise.ts"; @@ -409,8 +409,7 @@ function createWeakMapString(): string { } function createDateString(value: Date): string { - // without quotes, ISO format - return value.toISOString(); + return isInvalidDate(value) ? "Invalid Date" : value.toISOString(); // without quotes, ISO format } function createRegExpString(value: RegExp): string { diff --git a/cli/js/web/util.ts b/cli/js/web/util.ts index 824d00d4b..0ab367554 100644 --- a/cli/js/web/util.ts +++ b/cli/js/web/util.ts @@ -18,6 +18,11 @@ export function isTypedArray(x: unknown): x is TypedArray { return ArrayBuffer.isView(x) && !(x instanceof DataView); } +// @internal +export function isInvalidDate(x: Date): boolean { + return isNaN(x.getTime()); +} + // @internal export function requiredArguments( name: string, -- cgit v1.2.3