diff --git a/lodash/lodash-3.10-tests.ts b/lodash/lodash-3.10-tests.ts index 8d19f394a1..e780cf0880 100644 --- a/lodash/lodash-3.10-tests.ts +++ b/lodash/lodash-3.10-tests.ts @@ -10270,12 +10270,23 @@ namespace TestMixin { } // _.noConflict -{ - let result: typeof _; - result = _.noConflict(); - result = _(42).noConflict(); - result = _([]).noConflict(); - result = _({}).noConflict(); +namespace TestNoConflict { + { + let result: typeof _; + + result = _.noConflict(); + result = _(42).noConflict(); + result = _([]).noConflict(); + result = _({}).noConflict(); + } + + { + let result: _.LoDashExplicitObjectWrapper; + + result = _(42).chain().noConflict(); + result = _([]).chain().noConflict(); + result = _({}).chain().noConflict(); + } } // _.noop diff --git a/lodash/lodash-3.10.d.ts b/lodash/lodash-3.10.d.ts index c2fb9f726b..47bc4e0c9a 100644 --- a/lodash/lodash-3.10.d.ts +++ b/lodash/lodash-3.10.d.ts @@ -15430,6 +15430,13 @@ declare module _ { noConflict(): typeof _; } + interface LoDashExplicitWrapperBase { + /** + * @see _.noConflict + */ + noConflict(): LoDashExplicitObjectWrapper; + } + //_.noop interface LoDashStatic { /** diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts index c8c824bd79..8435ff8e9c 100644 --- a/lodash/lodash-tests.ts +++ b/lodash/lodash-tests.ts @@ -11506,12 +11506,23 @@ namespace TestMixin { } // _.noConflict -{ - let result: typeof _; - result = _.noConflict(); - result = _(42).noConflict(); - result = _([]).noConflict(); - result = _({}).noConflict(); +namespace TestNoConflict { + { + let result: typeof _; + + result = _.noConflict(); + result = _(42).noConflict(); + result = _([]).noConflict(); + result = _({}).noConflict(); + } + + { + let result: _.LoDashExplicitObjectWrapper; + + result = _(42).chain().noConflict(); + result = _([]).chain().noConflict(); + result = _({}).chain().noConflict(); + } } // _.noop diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts index 790107369d..d0544bc4c9 100644 --- a/lodash/lodash.d.ts +++ b/lodash/lodash.d.ts @@ -18614,6 +18614,13 @@ declare module _ { noConflict(): typeof _; } + interface LoDashExplicitWrapperBase { + /** + * @see _.noConflict + */ + noConflict(): LoDashExplicitObjectWrapper; + } + //_.noop interface LoDashStatic { /**