From 878a9a29e77bcaedd4242618ccf57d1be7dfd7d8 Mon Sep 17 00:00:00 2001 From: Axetroy Date: Thu, 12 Sep 2019 11:31:23 +0800 Subject: bump prettier to 1.18.2 (denoland/deno_std#592) Original: https://github.com/denoland/deno_std/commit/06958a4ada960665a48ac34f919423e0d8d16951 --- util/async.ts | 17 +++++++---------- util/deep_assign.ts | 36 +++++++++++++++++------------------- 2 files changed, 24 insertions(+), 29 deletions(-) (limited to 'util') diff --git a/util/async.ts b/util/async.ts index 01df39cc8..eaf97dd7b 100644 --- a/util/async.ts +++ b/util/async.ts @@ -20,11 +20,9 @@ export interface Deferred extends Promise { */ export function deferred(): Deferred { let methods; - const promise = new Promise( - (resolve, reject): void => { - methods = { resolve, reject }; - } - ); + const promise = new Promise((resolve, reject): void => { + methods = { resolve, reject }; + }); return Object.assign(promise, methods)! as Deferred; } @@ -111,10 +109,9 @@ export async function collectUint8Arrays( // Delays the given milliseconds and resolves. export function delay(ms: number): Promise { - return new Promise( - (res): number => - setTimeout((): void => { - res(); - }, ms) + return new Promise((res): number => + setTimeout((): void => { + res(); + }, ms) ); } diff --git a/util/deep_assign.ts b/util/deep_assign.ts index 1dfc00a5b..b1c9f9ac9 100644 --- a/util/deep_assign.ts +++ b/util/deep_assign.ts @@ -8,26 +8,24 @@ export function deepAssign( if (!source || typeof source !== `object`) { return; } - Object.entries(source).forEach( - ([key, value]: [string, unknown]): void => { - if (value instanceof Date) { - target[key] = new Date(value); - return; - } - if (!value || typeof value !== `object`) { - target[key] = value; - return; - } - if (Array.isArray(value)) { - target[key] = []; - } - // value is an Object - if (typeof target[key] !== `object` || !target[key]) { - target[key] = {}; - } - deepAssign(target[key] as Record, value!); + Object.entries(source).forEach(([key, value]: [string, unknown]): void => { + if (value instanceof Date) { + target[key] = new Date(value); + return; } - ); + if (!value || typeof value !== `object`) { + target[key] = value; + return; + } + if (Array.isArray(value)) { + target[key] = []; + } + // value is an Object + if (typeof target[key] !== `object` || !target[key]) { + target[key] = {}; + } + deepAssign(target[key] as Record, value!); + }); } return target; } -- cgit v1.2.3