From 5bf49a706830a9737ad7970afc0453201a950a1c Mon Sep 17 00:00:00 2001 From: Dan Maglasang Date: Wed, 14 Nov 2018 20:46:11 -0500 Subject: [PATCH] [ember] Polyfill: allow assign to take in more than 4 args (#30424) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [ember] Polyfill: allow assign to take in more than 4 args * Return type should be object * Adjust tests in response to modified return type Co-Authored-By: dorilla * Change return type back to “any” In order to facilitate direct property access * Change return type back to “any” In order to facilitate direct property access --- types/ember__polyfills/ember__polyfills-tests.ts | 1 + types/ember__polyfills/index.d.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/types/ember__polyfills/ember__polyfills-tests.ts b/types/ember__polyfills/ember__polyfills-tests.ts index 68a6588a69..533fbd86e4 100644 --- a/types/ember__polyfills/ember__polyfills-tests.ts +++ b/types/ember__polyfills/ember__polyfills-tests.ts @@ -11,6 +11,7 @@ import { assign, merge } from '@ember/polyfills'; assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean assign({ a: 'hello' }, '', { a: true }).a; // $ExpectError assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[] + assign({}, { a: 0 }, { b: 1 }, { c: 2 }, { d: 3 }).a; // $ExpectType any })(); (() => { /* merge */ diff --git a/types/ember__polyfills/index.d.ts b/types/ember__polyfills/index.d.ts index 3c408229dc..697a6c596b 100644 --- a/types/ember__polyfills/index.d.ts +++ b/types/ember__polyfills/index.d.ts @@ -13,6 +13,7 @@ import { Mix, Mix3, Mix4 } from './types'; export function assign(target: T, source: U): Mix; export function assign(target: T, source1: U, source2: V): Mix3; export function assign(target: T, source1: U, source2: V, source3: W): Mix4; +export function assign(target: object, ...sources: object[]): any; /** * Merge the contents of two objects together into the first object.