export ConditionalSimplify and ConditionalSimplifyDeep

index.d.ts

@@ -171,6 +171,8 @@ export type {StringRepeat} from './source/string-repeat.d.ts';
 export type {Includes} from './source/includes.d.ts';
 export type {Get} from './source/get.d.ts';
 export type {LastArrayElement} from './source/last-array-element.d.ts';
+export type {ConditionalSimplify} from './source/conditional-simplify.d.ts';
+export type {ConditionalSimplifyDeep} from './source/conditional-simplify-deep.d.ts';
 
 // Miscellaneous
 export type {GlobalThis} from './source/global-this.d.ts';

readme.md

@@ -206,6 +206,8 @@ Click the type names for complete docs.
 - [`NonEmptyString`](source/non-empty-string.d.ts) - Matches any non-empty string.
 - [`FindGlobalType`](source/find-global-type.d.ts) - Tries to find the type of a global with the given name.
 - [`FindGlobalInstanceType`](source/find-global-type.d.ts) - Tries to find one or more types from their globally-defined constructors.
+- [`ConditionalSimplify`](source/conditional-simplify.d.ts) - Simplifies a type while including and/or excluding certain types from being simplified.
+- [`ConditionalSimplifyDeep`](source/conditional-simplify-deep.d.ts) - Recursively simplifies a type while including and/or excluding certain types from being simplified.
 
 ### Type Guard
 

source/conditional-pick-deep.d.ts

@@ -1,6 +1,6 @@
 import type {IsEqual} from './is-equal.d.ts';
 import type {ConditionalExcept} from './conditional-except.d.ts';
-import type {ConditionalSimplifyDeep} from './conditional-simplify.d.ts';
+import type {ConditionalSimplifyDeep} from './conditional-simplify-deep.d.ts';
 import type {UnknownRecord} from './unknown-record.d.ts';
 import type {EmptyObject} from './empty-object.d.ts';
 import type {ApplyDefaultOptions, IsPlainObject} from './internal/index.d.ts';

source/conditional-simplify-deep.d.ts

@@ -0,0 +1,73 @@
+/**
+Recursively simplifies a type while including and/or excluding certain types from being simplified.
+
+@example
+```
+import type {ConditionalSimplifyDeep} from 'type-fest';
+
+type TypeA = {
+	foo: {
+		a: string
+	}
+};
+
+type TypeB = {
+	foo: {
+		b: string
+	}
+};
+
+type SimplifyDeepTypeAB = ConditionalSimplifyDeep<TypeA & TypeB, never, object>;
+//=> {foo: {a: string, b: string}}
+```
+
+@example
+```
+import type {ConditionalSimplifyDeep} from 'type-fest';
+
+type SomeComplexType1 = {
+	a1: string
+	b1: number
+	c1: boolean
+	// …
+};
+
+type SomeComplexType2 = {
+	a2: string
+	b2: number
+	c2: boolean
+	// …
+};
+
+type TypeA = {
+	foo: {
+		a: string
+		complexType: SomeComplexType1
+	}
+};
+
+type TypeB = {
+	foo: {
+		b: string
+		complexType: SomeComplexType2
+	}
+};
+
+type SimplifyDeepTypeAB = ConditionalSimplifyDeep<TypeA & TypeB, SomeComplexType1 | SomeComplexType2, object>;
+//=> {
+//	foo: {
+// 		a: string,
+// 		b: string,
+// 		complexType: SomeComplexType1 | SomeComplexType2
+//	}
+// }
+```
+
+@see SimplifyDeep
+@category Object
+*/
+export type ConditionalSimplifyDeep<Type, ExcludeType = never, IncludeType = unknown> = Type extends ExcludeType
+	? Type
+	: Type extends IncludeType
+		? {[TypeKey in keyof Type]: ConditionalSimplifyDeep<Type[TypeKey], ExcludeType, IncludeType>}
+		: Type;

source/conditional-simplify.d.ts

@@ -1,32 +1,48 @@
 /**
-Simplifies a type while including and/or excluding certain types from being simplified. Useful to improve type hints shown in editors. And also to transform an interface into a type to aide with assignability.
+Simplifies a type while including and/or excluding certain types from being simplified.
 
-This type is **experimental** and was introduced as a result of this {@link https://github.com/sindresorhus/type-fest/issues/436 issue}. It should be used with caution.
+Useful to improve type hints shown in editors. And also to transform an interface into a type to aide with assignability.
 
-@internal
-@experimental
-@see Simplify
-@category Object
-*/
-export type ConditionalSimplify<Type, ExcludeType = never, IncludeType = unknown> = Type extends ExcludeType
-	? Type
-	: Type extends IncludeType
-		? {[TypeKey in keyof Type]: Type[TypeKey]}
-		: Type;
+@example
+```
+import type {ConditionalSimplify} from 'type-fest';
 
-/**
-Recursively simplifies a type while including and/or excluding certain types from being simplified.
+type TypeA = {
+	a: string
+};
 
-This type is **experimental** and was introduced as a result of this {@link https://github.com/sindresorhus/type-fest/issues/436 issue}. It should be used with caution.
+type TypeB = {
+	b: string
+};
 
-See {@link ConditionalSimplify} for usages and examples.
+type TypeAB = TypeA & TypeB;
+//=> {a: string} & {b: string}
 
-@internal
-@experimental
+type SimplifyTypeAB = ConditionalSimplify<TypeAB, never, object>;
+//=> {a: string, b: string}
+```
+
+@example
+```
+import type {ConditionalSimplify} from 'type-fest';
+
+type Simplify<T> = ConditionalSimplify<T, Set<unknown> | Map<unknown, unknown> | unknown[], object>;
+
+type A = Simplify<Set<number> & Set<string>>;
+//=> Set<number> & Set<string>
+
+type B = Simplify<Map<number, number> & Map<string, string>>;
+//=> Map<number, number> & Map<string, string>
+
+type C = Simplify<{a: number} & {b: string}>;
+//=> {a: number, b: string}
+```
+
+@see ConditionalSimplifyDeep
 @category Object
 */
-export type ConditionalSimplifyDeep<Type, ExcludeType = never, IncludeType = unknown> = Type extends ExcludeType
+export type ConditionalSimplify<Type, ExcludeType = never, IncludeType = unknown> = Type extends ExcludeType
 	? Type
 	: Type extends IncludeType
-		? {[TypeKey in keyof Type]: ConditionalSimplifyDeep<Type[TypeKey], ExcludeType, IncludeType>}
+		? {[TypeKey in keyof Type]: Type[TypeKey]}
 		: Type;

source/merge-deep.d.ts

@@ -1,4 +1,4 @@
-import type {ConditionalSimplifyDeep} from './conditional-simplify.d.ts';
+import type {ConditionalSimplifyDeep} from './conditional-simplify-deep.d.ts';
 import type {OmitIndexSignature} from './omit-index-signature.d.ts';
 import type {PickIndexSignature} from './pick-index-signature.d.ts';
 import type {Merge} from './merge.d.ts';

source/simplify-deep.d.ts

@@ -1,4 +1,4 @@
-import type {ConditionalSimplifyDeep} from './conditional-simplify.d.ts';
+import type {ConditionalSimplifyDeep} from './conditional-simplify-deep.d.ts';
 import type {NonRecursiveType} from './internal/index.d.ts';
 
 /**

test-d/conditional-simplify-deep.ts

@@ -0,0 +1,70 @@
+import {expectNotAssignable, expectType} from 'tsd';
+import type {ConditionalSimplifyDeep} from '../index.d.ts';
+
+type Position = {top: number; left: number};
+type Size = {width: number; height: number};
+
+// In your editor, hovering over `PositionAndSizeSimplified` will show a simplified object with all the properties.
+type PositionAndSizeIntersection = Position & Size;
+
+const position = {top: 120, left: 240};
+const size = {width: 480, height: 600};
+const positionAndSize = {...position, ...size};
+
+// Should simplify interface deeply.
+type SomeNode = {
+	parent: PositionAndSizeIntersection;
+	childs: Array<{parent: PositionAndSizeIntersection}>;
+};
+
+// In your editor, hovering over `SomeNodeSimplified` will show a simplified object with all the properties.
+type SomeNodeSimplified = ConditionalSimplifyDeep<SomeNode>;
+
+const someNode = {parent: positionAndSize, childs: [{parent: positionAndSize}, {parent: positionAndSize}]};
+expectType<SomeNodeSimplified>(someNode);
+
+// Should simplify interface deeply excluding Function type.
+// TODO: Convert this to a `type`.
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+interface MovablePosition extends Position {
+	move(position: Position): Position;
+}
+
+type MovableCollection = {
+	position: MovablePosition;
+	top: {position: MovablePosition; size: Size};
+	left: {position: MovablePosition; size: Size};
+};
+
+type MovableNodeSimplifiedFail = ConditionalSimplifyDeep<MovableCollection>;
+type MovableNodeSimplifiedPass = ConditionalSimplifyDeep<MovableCollection, Function>;
+
+declare const movableNodeSimplifiedFail: MovableNodeSimplifiedFail;
+declare const movableNodeSimplifiedPass: MovableNodeSimplifiedPass;
+
+expectNotAssignable<MovableCollection>(movableNodeSimplifiedFail);
+expectType<MovableCollection>(movableNodeSimplifiedPass);
+
+const movablePosition = {
+	top: 42,
+	left: 42,
+	move(position: Position) {
+		return position;
+	},
+};
+
+const movableNode = {
+	position: movablePosition,
+	top: {position: movablePosition, size},
+	left: {position: movablePosition, size},
+};
+
+expectType<MovableNodeSimplifiedPass>(movableNode);
+
+// Should exclude `Function` and `Size` type (mainly visual, mouse over the statement).
+type ExcludeFunctionAndSize1 = ConditionalSimplifyDeep<MovableCollection, Function | Size>;
+expectType<ExcludeFunctionAndSize1>(movableNode);
+
+// Same as above but using `IncludeType` parameter (mainly visual, mouse over the statement).
+type ExcludeFunctionAndSize2 = ConditionalSimplifyDeep<MovableCollection, Function, MovableCollection | Position>;
+expectType<ExcludeFunctionAndSize2>(movableNode);

test-d/conditional-simplify.ts

@@ -1,5 +1,5 @@
 import {expectNotAssignable, expectType} from 'tsd';
-import type {ConditionalSimplify, ConditionalSimplifyDeep} from '../source/conditional-simplify.d.ts';
+import type {ConditionalSimplify} from '../index.d.ts';
 
 type Position = {top: number; left: number};
 type Size = {width: number; height: number};
@@ -23,61 +23,3 @@ declare const simplifiedFunctionPass: SimplifiedFunctionPass;
 
 expectNotAssignable<SomeFunction>(simplifiedFunctionFail);
 expectType<SomeFunction>(simplifiedFunctionPass);
-
-// Should simplify interface deeply.
-type SomeNode = {
-	parent: PositionAndSizeIntersection;
-	childs: Array<{parent: PositionAndSizeIntersection}>;
-};
-
-// In your editor, hovering over `SomeNodeSimplified` will show a simplified object with all the properties.
-type SomeNodeSimplified = ConditionalSimplifyDeep<SomeNode>;
-
-const someNode = {parent: positionAndSize, childs: [{parent: positionAndSize}, {parent: positionAndSize}]};
-expectType<SomeNodeSimplified>(someNode);
-
-// Should simplify interface deeply excluding Function type.
-// TODO: Convert this to a `type`.
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-interface MovablePosition extends Position {
-	move(position: Position): Position;
-}
-
-type MovableCollection = {
-	position: MovablePosition;
-	top: {position: MovablePosition; size: Size};
-	left: {position: MovablePosition; size: Size};
-};
-
-type MovableNodeSimplifiedFail = ConditionalSimplifyDeep<MovableCollection>;
-type MovableNodeSimplifiedPass = ConditionalSimplifyDeep<MovableCollection, Function>;
-
-declare const movableNodeSimplifiedFail: MovableNodeSimplifiedFail;
-declare const movableNodeSimplifiedPass: MovableNodeSimplifiedPass;
-
-expectNotAssignable<MovableCollection>(movableNodeSimplifiedFail);
-expectType<MovableCollection>(movableNodeSimplifiedPass);
-
-const movablePosition = {
-	top: 42,
-	left: 42,
-	move(position: Position) {
-		return position;
-	},
-};
-
-const movableNode = {
-	position: movablePosition,
-	top: {position: movablePosition, size},
-	left: {position: movablePosition, size},
-};
-
-expectType<MovableNodeSimplifiedPass>(movableNode);
-
-// Should exclude `Function` and `Size` type (mainly visual, mouse over the statement).
-type ExcludeFunctionAndSize1 = ConditionalSimplifyDeep<MovableCollection, Function | Size>;
-expectType<ExcludeFunctionAndSize1>(movableNode);
-
-// Same as above but using `IncludeType` parameter (mainly visual, mouse over the statement).
-type ExcludeFunctionAndSize2 = ConditionalSimplifyDeep<MovableCollection, Function, MovableCollection | Position>;
-expectType<ExcludeFunctionAndSize2>(movableNode);