From e6ca97a0aa5cb933ee87ade1fb6fba3269cba8c3 Mon Sep 17 00:00:00 2001 From: Ilya Mochalov Date: Sat, 18 Jul 2015 09:02:27 +0500 Subject: [PATCH 1/3] lodash: added _.valuesIn() method --- lodash/lodash-tests.ts | 12 ++++++++++++ lodash/lodash.d.ts | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts index 3a1c51f183..5536e2d328 100644 --- a/lodash/lodash-tests.ts +++ b/lodash/lodash-tests.ts @@ -1091,6 +1091,18 @@ result = <{ a: number; b: number; c: number; }>_.transform(<{ [index: string]: n result = _.values({ 'one': 1, 'two': 2, 'three': 3 }); +// _.valueIn +class TestValueIn { + public a = 1; + public b = 2; + public c: number; +} +TestValueIn.prototype.c = 3; +result = _.valuesIn(new TestValueIn()); +// → [1, 2, 3] +result = _(new TestValueIn()).valuesIn().value(); +// → [1, 2, 3] + /********** * Utilities * ***********/ diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts index fcf4685770..66d5bbd4fb 100644 --- a/lodash/lodash.d.ts +++ b/lodash/lodash.d.ts @@ -6291,6 +6291,23 @@ declare module _ { values(object?: any): any[]; } + //_.valuesIn + interface LoDashStatic { + /** + * Creates an array of the own and inherited enumerable property values of object. + * @param object The object to query. + * @return Returns the array of property values. + **/ + valuesIn(object?: any): T[]; + } + + interface LoDashObjectWrapper { + /** + * @see _.valuesIn + **/ + valuesIn(): LoDashObjectWrapper; + } + /********** * String * **********/ From 3b1a6a34244739c5c0bf603ff30e5455fa58ef9c Mon Sep 17 00:00:00 2001 From: vvakame Date: Sun, 19 Jul 2015 16:47:20 +0900 Subject: [PATCH 2/3] fix jsdom/jsdom-tests.ts --- jsdom/jsdom-tests.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jsdom/jsdom-tests.ts b/jsdom/jsdom-tests.ts index cb6992b49a..504f1f0641 100644 --- a/jsdom/jsdom-tests.ts +++ b/jsdom/jsdom-tests.ts @@ -47,5 +47,4 @@ jsdom.env({ } }); -var window: Window = jsdom.jsdom("
foobar
").parentWindow; -var document: Document = jsdom.jsdom(""); \ No newline at end of file +var document: Document = jsdom.jsdom(""); From ace0ad087d1d75ce59537deb775f687dafe98b88 Mon Sep 17 00:00:00 2001 From: vvakame Date: Sun, 19 Jul 2015 17:30:33 +0900 Subject: [PATCH 3/3] fix react-router/react-router.d.ts --- react-router/react-router.d.ts | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts index 9d0f63b96e..d8dd12c97a 100644 --- a/react-router/react-router.d.ts +++ b/react-router/react-router.d.ts @@ -7,6 +7,8 @@ /// declare module ReactRouter { + import React = __React; + // // Transition // ---------------------------------------------------------------------- @@ -276,42 +278,43 @@ declare module "react-router" { export = ReactRouter; } -declare module React { +declare module __React { + // for DefaultRoute function createElement( type: ReactRouter.DefaultRouteClass, props: ReactRouter.DefaultRouteProp, - ...children: React.ReactNode[]): ReactRouter.DefaultRoute; + ...children: __React.ReactNode[]): ReactRouter.DefaultRoute; // for Link function createElement( type: ReactRouter.LinkClass, props: ReactRouter.LinkProp, - ...children: React.ReactNode[]): ReactRouter.Link; + ...children: __React.ReactNode[]): ReactRouter.Link; // for NotFoundRoute function createElement( type: ReactRouter.NotFoundRouteClass, props: ReactRouter.NotFoundRouteProp, - ...children: React.ReactNode[]): ReactRouter.NotFoundRoute; + ...children: __React.ReactNode[]): ReactRouter.NotFoundRoute; // for Redirect function createElement( type: ReactRouter.RedirectClass, props: ReactRouter.RedirectProp, - ...children: React.ReactNode[]): ReactRouter.Redirect; + ...children: __React.ReactNode[]): ReactRouter.Redirect; // for Route function createElement( type: ReactRouter.RouteClass, props: ReactRouter.RouteProp, - ...children: React.ReactNode[]): ReactRouter.Route; + ...children: __React.ReactNode[]): ReactRouter.Route; // for RouteHandler function createElement( type: ReactRouter.RouteHandlerClass, props: ReactRouter.RouteHandlerProp, - ...children: React.ReactNode[]): ReactRouter.RouteHandler; + ...children: __React.ReactNode[]): ReactRouter.RouteHandler; } declare module "react/addons" { @@ -319,35 +322,35 @@ declare module "react/addons" { function createElement( type: ReactRouter.DefaultRouteClass, props: ReactRouter.DefaultRouteProp, - ...children: React.ReactNode[]): ReactRouter.DefaultRoute; + ...children: __React.ReactNode[]): ReactRouter.DefaultRoute; // for Link function createElement( type: ReactRouter.LinkClass, props: ReactRouter.LinkProp, - ...children: React.ReactNode[]): ReactRouter.Link; + ...children: __React.ReactNode[]): ReactRouter.Link; // for NotFoundRoute function createElement( type: ReactRouter.NotFoundRouteClass, props: ReactRouter.NotFoundRouteProp, - ...children: React.ReactNode[]): ReactRouter.NotFoundRoute; + ...children: __React.ReactNode[]): ReactRouter.NotFoundRoute; // for Redirect function createElement( type: ReactRouter.RedirectClass, props: ReactRouter.RedirectProp, - ...children: React.ReactNode[]): ReactRouter.Redirect; + ...children: __React.ReactNode[]): ReactRouter.Redirect; // for Route function createElement( type: ReactRouter.RouteClass, props: ReactRouter.RouteProp, - ...children: React.ReactNode[]): ReactRouter.Route; + ...children: __React.ReactNode[]): ReactRouter.Route; // for RouteHandler function createElement( type: ReactRouter.RouteHandlerClass, props: ReactRouter.RouteHandlerProp, - ...children: React.ReactNode[]): ReactRouter.RouteHandler; + ...children: __React.ReactNode[]): ReactRouter.RouteHandler; }