[polyfill] $TEMPORARY$module$exports$assign for TS2304

microsoft · Nov 20, 2020 · 75ead21 · 75ead21
1 parent 942b63c
commit 75ead21
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 5 deletions.
diff --git a/packages/flow2dts-flow-types-polyfill/index.d.ts b/packages/flow2dts-flow-types-polyfill/index.d.ts
@@ -13,6 +13,11 @@ export type Stringish = string
  * Flow types
  *****************************************************************************/
 
+/**
+ * @see https://github.com/facebook/flow/blob/34465eb6f528fc61de1b3a53db4c1a682b33de03/src/typing/__tests__/signature_generator_test.ml#L728-L756
+ */
+export type $TEMPORARY$module$exports$assign<T1, T2> = T1 & T2
+
 /**
  * @see https://github.com/facebook/flow/blob/41b0eab99cdc5199421f7cccad9e0c4950f8b2f9/tests/any/flowfixme.js
  */

diff --git a/packages/flow2dts-flow-types-polyfill/index.test-d.ts b/packages/flow2dts-flow-types-polyfill/index.test-d.ts
@@ -1,5 +1,5 @@
 import { expectType } from "tsd"
-import { $TypeOf } from "./index"
+import { $TypeOf, $TEMPORARY$module$exports$assign } from "./index"
 
 declare const ANY: any
 
@@ -9,3 +9,6 @@ expectType<{ foo: boolean }>(ANY as $TypeOf<typeof SomeValue>)
 // $TypeOf: with a class returns the class
 declare class SomeClass {}
 expectType<SomeClass>(ANY as $TypeOf<typeof SomeClass>)
+
+declare const Exports: $TEMPORARY$module$exports$assign<typeof SomeValue, { bar: number }>
+expectType<typeof SomeValue & { bar: number }>(Exports)
diff --git a/packages/flow2dts/src/transform/__tests__/__fixtures__/polyfill-flow-utility-types/code.js b/packages/flow2dts/src/transform/__tests__/__fixtures__/polyfill-flow-utility-types/code.js
@@ -17,3 +17,4 @@ type _OMTWithSingle = () => boolean
 type OMTWithSingle = $ObjMapi<T, _OMTWithSingle>
 type _OMTWithUnion = () => true | 42 | "42" | any | void | unknown | null | undefined
 type OMTWithUnion = $ObjMap<T, _OMTWithUnion>
+declare module.exports: $TEMPORARY$module$exports$assign<_OMTWithSingle, { foo: string }>
diff --git a/...ges/flow2dts/src/transform/__tests__/__fixtures__/polyfill-flow-utility-types/output.d.ts b/...ges/flow2dts/src/transform/__tests__/__fixtures__/polyfill-flow-utility-types/output.d.ts
@@ -1,3 +1,4 @@
+import { $TEMPORARY$module$exports$assign } from "flow2dts-flow-types-polyfill"
 import { $Diff, $ElementType, $Keys, $NonMaybeType, $PropertyType, $Shape, Class } from "utility-types"
 declare type T = {
   foo: string
@@ -31,3 +32,10 @@ declare type _OMTWithUnion = () => true | 42 | "42" | any | void | unknown | nul
 declare type OMTWithUnion =
   /*[FLOW2DTS - Warning] This type was a $ObjMap type in the original Flow source.*/
   { [K in keyof T]: ReturnType<_OMTWithUnion> }
+declare const $f2tExportDefault: $TEMPORARY$module$exports$assign<
+  _OMTWithSingle,
+  {
+    foo: string
+  }
+>
+export default $f2tExportDefault
diff --git a/packages/flow2dts/src/transform/polyfillPackagesAndTypes.ts b/packages/flow2dts/src/transform/polyfillPackagesAndTypes.ts
@@ -1,6 +1,7 @@
 export const polyfillPackagesAndTypes: Record<string, string[]> = {
   "flow2dts-flow-types-polyfill": [
     "$TypeOf",
+    "$TEMPORARY$module$exports$assign",
     "$ArrayBufferView",
     "$FlowFixMe",
     "$FlowFixMeProps",

diff --git a/workbench/outputs/android/Libraries/Image/resolveAssetSource.d.ts b/workbench/outputs/android/Libraries/Image/resolveAssetSource.d.ts
@@ -1,4 +1,4 @@
-import { $TypeOf } from "flow2dts-flow-types-polyfill";
+import { $TEMPORARY$module$exports$assign, $TypeOf } from "flow2dts-flow-types-polyfill";
 import $1 from "./AssetSourceResolver";
 import { ResolvedAssetSource } from "./AssetSourceResolver";
 declare function setCustomSourceTransformer(transformer: (resolver: $TypeOf<typeof $1>) => ResolvedAssetSource): void;

diff --git a/workbench/outputs/android/Libraries/Utilities/differ/deepDiffer.d.ts b/workbench/outputs/android/Libraries/Utilities/differ/deepDiffer.d.ts
@@ -1,4 +1,4 @@
-import { $TypeOf } from "flow2dts-flow-types-polyfill";
+import { $TEMPORARY$module$exports$assign, $TypeOf } from "flow2dts-flow-types-polyfill";
 // @flow
 declare type LogListeners =
 /*[FLOW2DTS - Warning] This type was an exact object type in the original Flow source.*/

diff --git a/workbench/outputs/ios/Libraries/Image/resolveAssetSource.d.ts b/workbench/outputs/ios/Libraries/Image/resolveAssetSource.d.ts
@@ -1,4 +1,4 @@
-import { $TypeOf } from "flow2dts-flow-types-polyfill";
+import { $TEMPORARY$module$exports$assign, $TypeOf } from "flow2dts-flow-types-polyfill";
 import $1 from "./AssetSourceResolver";
 import { ResolvedAssetSource } from "./AssetSourceResolver";
 declare function setCustomSourceTransformer(transformer: (resolver: $TypeOf<typeof $1>) => ResolvedAssetSource): void;

diff --git a/workbench/outputs/ios/Libraries/Utilities/differ/deepDiffer.d.ts b/workbench/outputs/ios/Libraries/Utilities/differ/deepDiffer.d.ts
@@ -1,4 +1,4 @@
-import { $TypeOf } from "flow2dts-flow-types-polyfill";
+import { $TEMPORARY$module$exports$assign, $TypeOf } from "flow2dts-flow-types-polyfill";
 // @flow
 declare type LogListeners =
 /*[FLOW2DTS - Warning] This type was an exact object type in the original Flow source.*/