Merge pull request #30552 from Microsoft/omit

DanielRosenwasser · web-flow · commit 586ecbf1d7d7 · 2019-04-04T13:37:33.000-04:00
Add the Omit helper type
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -4507,6 +4507,7 @@ namespace FourSlashInterface {
             typeEntry("Record"),
             typeEntry("Exclude"),
             typeEntry("Extract"),
+            typeEntry("Omit"),
             typeEntry("NonNullable"),
             typeEntry("Parameters"),
             typeEntry("ConstructorParameters"),
diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
@@ -1443,6 +1443,11 @@ type Exclude<T, U> = T extends U ? never : T;
  */
 type Extract<T, U> = T extends U ? T : never;
 
+/**
+ * Construct a type with the properties of T except for those in type K.
+ */
+type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>;
+
 /**
  * Exclude null and undefined from T
  */
diff --git a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.js b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.js
@@ -45,10 +45,14 @@ const myStoreConnect: Connect = function(
         mergeProps,
         options,
     );
-};
+};
+
+export {};
+
 
 //// [circularlySimplifyingConditionalTypesNoCrash.js]
 "use strict";
+exports.__esModule = true;
 var myStoreConnect = function (mapStateToProps, mapDispatchToProps, mergeProps, options) {
     if (options === void 0) { options = {}; }
     return connect(mapStateToProps, mapDispatchToProps, mergeProps, options);
diff --git a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.symbols b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.symbols
@@ -152,3 +152,6 @@ const myStoreConnect: Connect = function(
 
     );
 };
+
+export {};
+
diff --git a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.types b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.types
@@ -90,3 +90,6 @@ const myStoreConnect: Connect = function(
 
     );
 };
+
+export {};
+
diff --git a/tests/baselines/reference/indexedAccessRetainsIndexSignature.js b/tests/baselines/reference/indexedAccessRetainsIndexSignature.js
@@ -8,8 +8,10 @@ type Omit1<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>;
 type Omit2<T, K extends keyof T> = {[P in Diff<keyof T, K>]: T[P]};
 
 type O = Omit<{ a: number, b: string }, 'a'>
-const o: O = { b: '' }
+export const o: O = { b: '' }
 
 
 //// [indexedAccessRetainsIndexSignature.js]
-var o = { b: '' };
+"use strict";
+exports.__esModule = true;
+exports.o = { b: '' };
diff --git a/tests/baselines/reference/indexedAccessRetainsIndexSignature.symbols b/tests/baselines/reference/indexedAccessRetainsIndexSignature.symbols
@@ -55,8 +55,8 @@ type O = Omit<{ a: number, b: string }, 'a'>
 >a : Symbol(a, Decl(indexedAccessRetainsIndexSignature.ts, 8, 15))
 >b : Symbol(b, Decl(indexedAccessRetainsIndexSignature.ts, 8, 26))
 
-const o: O = { b: '' }
->o : Symbol(o, Decl(indexedAccessRetainsIndexSignature.ts, 9, 5))
+export const o: O = { b: '' }
+>o : Symbol(o, Decl(indexedAccessRetainsIndexSignature.ts, 9, 12))
 >O : Symbol(O, Decl(indexedAccessRetainsIndexSignature.ts, 6, 67))
->b : Symbol(b, Decl(indexedAccessRetainsIndexSignature.ts, 9, 14))
+>b : Symbol(b, Decl(indexedAccessRetainsIndexSignature.ts, 9, 21))
 
diff --git a/tests/baselines/reference/indexedAccessRetainsIndexSignature.types b/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
@@ -21,7 +21,7 @@ type O = Omit<{ a: number, b: string }, 'a'>
 >a : number
 >b : string
 
-const o: O = { b: '' }
+export const o: O = { b: '' }
 >o : Pick<{ a: number; b: string; }, "b">
 >{ b: '' } : { b: string; }
 >b : string
diff --git a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
@@ -143,6 +143,8 @@ const Test1 = connect(
   null,
   mapDispatchToProps
 )(TestComponent);
+
+export {};
 
 
 //// [reactReduxLikeDeferredInferenceAllowsAssignment.js]
@@ -196,6 +198,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 var _this = this;
+exports.__esModule = true;
 var simpleAction = function (payload) { return ({
     type: "SIMPLE_ACTION",
     payload: payload
diff --git a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.symbols b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.symbols
@@ -469,3 +469,5 @@ const Test1 = connect(
 )(TestComponent);
 >TestComponent : Symbol(TestComponent, Decl(reactReduxLikeDeferredInferenceAllowsAssignment.ts, 134, 1))
 
+export {};
+
diff --git a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.types b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.types
@@ -286,3 +286,5 @@ const Test1 = connect(
 )(TestComponent);
 >TestComponent : typeof TestComponent
 
+export {};
+
diff --git a/tests/cases/compiler/circularlySimplifyingConditionalTypesNoCrash.ts b/tests/cases/compiler/circularlySimplifyingConditionalTypesNoCrash.ts
@@ -45,4 +45,6 @@ const myStoreConnect: Connect = function(
         mergeProps,
         options,
     );
-};
+};
+
+export {};
diff --git a/tests/cases/compiler/indexedAccessRetainsIndexSignature.ts b/tests/cases/compiler/indexedAccessRetainsIndexSignature.ts
@@ -7,4 +7,4 @@ type Omit1<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>;
 type Omit2<T, K extends keyof T> = {[P in Diff<keyof T, K>]: T[P]};
 
 type O = Omit<{ a: number, b: string }, 'a'>
-const o: O = { b: '' }
+export const o: O = { b: '' }
diff --git a/tests/cases/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.ts b/tests/cases/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.ts
@@ -143,3 +143,5 @@ const Test1 = connect(
   null,
   mapDispatchToProps
 )(TestComponent);
+
+export {};

-Original file line number
+Diff line change
     );
 };
++
 +export {};
++