Merge pull request #47 from rokoroku/issue-45

rokoroku · web-flow · commit 9a3722a8c34a · 2018-07-22T18:02:05.000+09:00
Fix Typescript compilation issue
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "postcss-url": "^7.3.2",
     "prettier": "^1.13.5",
     "react-hot-loader": "^4.3.1",
-    "redux-devtools-extension": "^2.13.2",
+    "redux-devtools-extension": "^2.13.5",
     "style-loader": "^0.21.0",
     "ts-loader": "^4.4.1",
     "typescript": "^2.9.1",
diff --git a/types/global.d.ts b/types/global.d.ts
@@ -7,7 +7,8 @@ declare module '*.css' {
 }
 
 // Omit type https://github.com/Microsoft/TypeScript/issues/12215
+type SimpleKeyOf<T> = Extract<keyof T, 'number' | 'string'>;
 type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
-type Omit<T, K extends keyof T> = { [P in Diff<keyof T, K>]: T[P] };
+type Omit<T, K extends SimpleKeyOf<T>> = { [P in Diff<SimpleKeyOf<T>, K>]: T[P] };
 
 type PartialPick<T, K extends keyof T> = Partial<T> & Pick<T, K>;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ declare module '*.css' {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`// Omit type https://github.com/Microsoft/TypeScript/issues/12215`
	`10`	`+type SimpleKeyOf<T> = Extract<keyof T, 'number' \| 'string'>;`
`10`	`11`	`type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];`
`11`		`-type Omit<T, K extends keyof T> = { [P in Diff<keyof T, K>]: T[P] };`
	`12`	`+type Omit<T, K extends SimpleKeyOf<T>> = { [P in Diff<SimpleKeyOf<T>, K>]: T[P] };`
`12`	`13`
`13`	`14`	`type PartialPick<T, K extends keyof T> = Partial<T> & Pick<T, K>;`