Codemod $ElementType/$PropertyType to Indexed Access Types

Reviewed By: yungsters

Differential Revision: D32339302

fbshipit-source-id: 3728a75d41c15403512b4fac2d2025445feaf5a6

Author: gkz

packages/react-relay/ReactRelayTestMocker.js

@@ -65,7 +65,7 @@ let nextId = 0;
 
 class ReactRelayTestMocker {
   _environment: IEnvironment;
-  _defaults: {[string]: $PropertyType<NetworkWriteConfig, 'payload'>, ...} = {};
+  _defaults: {[string]: NetworkWriteConfig['payload'], ...} = {};
   _pendingFetches: Array<PendingFetch> = [];
 
   constructor(env: IEnvironment) {

packages/react-relay/ReactRelayTypes.js

@@ -94,7 +94,7 @@ export type RefetchOptions = {|
  *
  */
 export type $FragmentRef<T> = {
-  +$fragmentRefs: $PropertyType<T, '$refType'>,
+  +$fragmentRefs: T['$refType'],
   ...
 };
 

packages/react-relay/relay-hooks/EntryPointTypes.flow.js

@@ -75,7 +75,7 @@ export type PreloadedQueryInner_DEPRECATED<
   +id: ?string,
   +name: string,
   +source: ?Observable<GraphQLResponse>,
-  +variables: $ElementType<TQuery, 'variables'>,
+  +variables: TQuery['variables'],
   +status: PreloadQueryStatus,
 |};
 
@@ -100,7 +100,7 @@ export type PreloadedQueryInner<
   +networkCacheConfig: ?CacheConfig,
   +source: ?Observable<GraphQLResponse>,
   +kind: 'PreloadedQuery',
-  +variables: $ElementType<TQuery, 'variables'>,
+  +variables: TQuery['variables'],
 |};
 
 export type PreloadQueryStatus = {|
@@ -203,14 +203,11 @@ export type PreloadProps<
 // Return type of `loadEntryPoint(...)`
 export type PreloadedEntryPoint<TEntryPointComponent> = $ReadOnly<{|
   dispose: () => void,
-  entryPoints: $PropertyType<
-    ElementConfig<TEntryPointComponent>,
-    'entryPoints',
-  >,
-  extraProps: $PropertyType<ElementConfig<TEntryPointComponent>, 'extraProps'>,
+  entryPoints: ElementConfig<TEntryPointComponent>['entryPoints'],
+  extraProps: ElementConfig<TEntryPointComponent>['extraProps'],
   getComponent: () => TEntryPointComponent,
   isDisposed: boolean,
-  queries: $PropertyType<ElementConfig<TEntryPointComponent>, 'queries'>,
+  queries: ElementConfig<TEntryPointComponent>['queries'],
   rootModuleID: string,
 |}>;
 
@@ -227,10 +224,9 @@ type ComponentFromEntryPoint<+TEntryPoint> = $Call<
   TEntryPoint,
 >;
 
-export type EntryPointElementConfig<+TEntryPoint> = $PropertyType<
-  ElementConfig<ComponentFromEntryPoint<TEntryPoint>>,
-  'props',
->;
+export type EntryPointElementConfig<+TEntryPoint> = ElementConfig<
+  ComponentFromEntryPoint<TEntryPoint>,
+>['props'];
 
 export type ThinQueryParams<
   TQuery: OperationType,
@@ -239,7 +235,7 @@ export type ThinQueryParams<
   environmentProviderOptions?: ?TEnvironmentProviderOptions,
   options?: ?PreloadOptions,
   parameters: PreloadableConcreteRequest<TQuery>,
-  variables: $ElementType<TQuery, 'variables'>,
+  variables: TQuery['variables'],
 |}>;
 
 type ThinNestedEntryPointParams<TEntryPointParams, TEntryPoint> = $ReadOnly<{|
@@ -264,14 +260,14 @@ export type ExtractEntryPointTypeHelper = <
 export type EntryPoint<TEntryPointParams, +TEntryPointComponent> =
   InternalEntryPointRepresentation<
     TEntryPointParams,
-    $PropertyType<ElementConfig<TEntryPointComponent>, 'queries'>,
-    $PropertyType<ElementConfig<TEntryPointComponent>, 'entryPoints'>,
-    $PropertyType<ElementConfig<TEntryPointComponent>, 'props'>,
-    $PropertyType<ElementConfig<TEntryPointComponent>, 'extraProps'>,
+    ElementConfig<TEntryPointComponent>['queries'],
+    ElementConfig<TEntryPointComponent>['entryPoints'],
+    ElementConfig<TEntryPointComponent>['props'],
+    ElementConfig<TEntryPointComponent>['extraProps'],
   >;
 
 type ExtractFirstParam = <P, R>((P) => R) => P;
-type GetPreloadPropsType<T> = $ElementType<T, 'getPreloadProps'>;
+type GetPreloadPropsType<T> = T['getPreloadProps'];
 export type PreloadParamsOf<T> = $Call<
   ExtractFirstParam,
   GetPreloadPropsType<T>,

packages/react-relay/relay-hooks/LazyLoadEntryPointContainer_DEPRECATED.react.js

@@ -28,16 +28,10 @@ const {useContext, useEffect, useMemo} = require('react');
 const {stableCopy} = require('relay-runtime');
 
 type PreloadedEntryPoint<TEntryPointComponent> = $ReadOnly<{|
-  entryPoints: $PropertyType<
-    React.ElementConfig<TEntryPointComponent>,
-    'entryPoints',
-  >,
-  extraProps: $PropertyType<
-    React.ElementConfig<TEntryPointComponent>,
-    'extraProps',
-  >,
+  entryPoints: React.ElementConfig<TEntryPointComponent>['entryPoints'],
+  extraProps: React.ElementConfig<TEntryPointComponent>['extraProps'],
   getComponent: () => TEntryPointComponent,
-  queries: $PropertyType<React.ElementConfig<TEntryPointComponent>, 'queries'>,
+  queries: React.ElementConfig<TEntryPointComponent>['queries'],
   rootModuleID: string,
 |}>;
 

packages/react-relay/relay-hooks/__flowtests__/EntryPointTypes/EntryPointElementConfig-flowtest.js

@@ -34,7 +34,7 @@ type MyComponentEntryPointProps =
   EntryPointElementConfig<MyComponentEntryPointType>;
 
 // This gets the "other props" directly from the component's prop typings
-type OtherProps = $PropertyType<MyComponentProps, 'props'>;
+type OtherProps = MyComponentProps['props'];
 
 // We want to make sure that `OtherProps` and `MyComponentEntryPointProps` are exactly the same.
 opaque type __SUBTYPE_CHECK_1__: OtherProps = MyComponentEntryPointProps;

packages/react-relay/relay-hooks/loadQuery.js

@@ -57,7 +57,7 @@ function useTrackLoadQueryInRender() {
 function loadQuery<TQuery: OperationType, TEnvironmentProviderOptions>(
   environment: IEnvironment,
   preloadableRequest: GraphQLTaggedNode | PreloadableConcreteRequest<TQuery>,
-  variables: $ElementType<TQuery, 'variables'>,
+  variables: TQuery['variables'],
   options?: ?LoadQueryOptions,
   environmentProviderOptions?: ?TEnvironmentProviderOptions,
 ): PreloadedQueryInner<TQuery, TEnvironmentProviderOptions> {

packages/react-relay/relay-hooks/useLazyLoadQuery.js

@@ -39,7 +39,7 @@ function useLazyLoadQuery<TQuery: OperationType>(
     networkCacheConfig?: CacheConfig,
     UNSTABLE_renderPolicy?: RenderPolicy,
   |},
-): $ElementType<TQuery, 'response'> {
+): TQuery['response'] {
   // We need to use this hook in order to be able to track if
   // loadQuery was called during render
   useTrackLoadQueryInRender();

packages/react-relay/relay-hooks/useLazyLoadQueryNode.js

@@ -48,7 +48,7 @@ function useLazyLoadQueryNode<TQuery: OperationType>({
   fetchPolicy?: ?FetchPolicy,
   fetchKey?: ?string | ?number,
   renderPolicy?: ?RenderPolicy,
-|}): $ElementType<TQuery, 'response'> {
+|}): TQuery['response'] {
   const environment = useRelayEnvironment();
   const profilerContext = useContext(ProfilerContext);
   const QueryResource = getQueryResourceForEnvironment(environment);

packages/react-relay/relay-hooks/useMutation.js

@@ -36,25 +36,20 @@ export type UseMutationConfig<TMutation: MutationParameters> = {|
   configs?: Array<DeclarativeMutationConfig>,
   onError?: ?(error: Error) => void,
   onCompleted?: ?(
-    response: $ElementType<TMutation, 'response'>,
+    response: TMutation['response'],
     errors: ?Array<PayloadError>,
   ) => void,
   onNext?: ?() => void,
   onUnsubscribe?: ?() => void,
-  optimisticResponse?: $ElementType<
-    {
-      +rawResponse?: {...},
-      ...TMutation,
-      ...
-    },
-    'rawResponse',
-  >,
-  optimisticUpdater?: ?SelectorStoreUpdater<
-    $ElementType<TMutation, 'response'>,
-  >,
-  updater?: ?SelectorStoreUpdater<$ElementType<TMutation, 'response'>>,
+  optimisticResponse?: {
+    +rawResponse?: {...},
+    ...TMutation,
+    ...
+  }['rawResponse'],
+  optimisticUpdater?: ?SelectorStoreUpdater<TMutation['response']>,
+  updater?: ?SelectorStoreUpdater<TMutation['response']>,
   uploadables?: UploadableMap,
-  variables: $ElementType<TMutation, 'variables'>,
+  variables: TMutation['variables'],
 |};
 
 function useMutation<TMutation: MutationParameters>(

packages/react-relay/relay-hooks/usePreloadedQuery.js

@@ -37,7 +37,7 @@ function usePreloadedQuery<TQuery: OperationType>(
   options?: {|
     UNSTABLE_renderPolicy?: RenderPolicy,
   |},
-): $ElementType<TQuery, 'response'> {
+): TQuery['response'] {
   // We need to use this hook in order to be able to track if
   // loadQuery was called during render
   useTrackLoadQueryInRender();