Fixup TS Organization (#35169)

NickGerleman · facebook-github-bot · commit 5d26ceaa2366 · 2022-11-02T14:58:37.000-07:00
Summary: Pull Request resolved: #35169 This reorganizes typing structure a bit. `Utilities.d.ts` was originally added for utilitiy types but I ended up leaving it a grab bag of types that didn't belong to any individual bit of code. Out of what is in it right now, `Insets` was actually public, and seems to have been imported. We also run into files around the renderer which are [currently overwritten](https://github.com/facebook/react-native/commits/e286da25fc83324363486eb668806aca179f74b3/Libraries/Renderer/implementations/ReactNativeRenderer.d.ts) by the React sync script. Finally, all of the top-level imports of `Utilities` were auto-generated by VS Code, but fail in real apps. I think this is because our tsconfig sets a `baseUrl` to allow resolution from the types folder, so the tooling in the RN repo will use that, but it breaks in real apps that don't have that mapping. This splits all these up into a couple separate directories that are hopefully easier to reason about, and removes `Omit` which has been a builtin type for quite some time (we were actually already using built-in `Omit`). Changelog: [General][Fixed] - Fixup TS Organization Reviewed By: cipolleschi Differential Revision: D40932319 fbshipit-source-id: 0b6e3e3eda603885b4dc01dcb9f5233aa546d128
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts
@@ -8,7 +8,7 @@
  */
 
 import type * as React from 'react';
-import {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import {HostComponent} from '../../../types/public/ReactNativeTypes';
 import {EmitterSubscription} from '../../vendor/emitter/EventEmitter';
 
 type AccessibilityChangeEventName =
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts b/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts
@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {LayoutChangeEvent} from '../../Types/CoreEventTypes';
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.d.ts b/Libraries/Components/DatePicker/DatePickerIOS.d.ts
@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ViewProps} from '../View/ViewPropTypes';
 
 export interface DatePickerIOSProps extends ViewProps {
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts
@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ColorValue} from '../../StyleSheet/StyleSheet';
 import {
   NativeSyntheticEvent,
diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts b/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts
@@ -8,7 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor, TimerMixin} from 'Utilities';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
 import {StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {ViewProps} from '../View/ViewPropTypes';
diff --git a/Libraries/Components/Pressable/Pressable.d.ts b/Libraries/Components/Pressable/Pressable.d.ts
@@ -8,7 +8,7 @@
  */
 
 import type * as React from 'react';
-import {Insets} from 'Utilities';
+import {Insets} from '../../../types/public/Insets';
 import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts
@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ColorValue} from '../../StyleSheet/StyleSheet';
 import {ViewProps} from '../View/ViewPropTypes';
 
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.d.ts b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.d.ts
@@ -8,9 +8,9 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
+import {Constructor} from '../../../types/private/Utilities';
 import {ImageURISource} from '../../Image/ImageSource';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ColorValue} from '../../StyleSheet/StyleSheet';
 import {ViewProps} from '../View/ViewPropTypes';
 
diff --git a/Libraries/Components/RefreshControl/RefreshControl.d.ts b/Libraries/Components/RefreshControl/RefreshControl.d.ts
@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ColorValue} from '../../StyleSheet/StyleSheet';
 import {ViewProps} from '../View/ViewPropTypes';
 
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.d.ts b/Libraries/Components/SafeAreaView/SafeAreaView.d.ts
@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ViewProps} from '../View/ViewPropTypes';
 
 /**
diff --git a/Libraries/Components/ScrollView/ScrollView.d.ts b/Libraries/Components/ScrollView/ScrollView.d.ts
@@ -8,7 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor, Insets} from 'Utilities';
+import {Constructor} from '../../../types/private/Utilities';
+import {Insets} from '../../../types/public/Insets';
 import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {
diff --git a/Libraries/Components/Slider/Slider.d.ts b/Libraries/Components/Slider/Slider.d.ts
@@ -8,9 +8,9 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
+import {Constructor} from '../../../types/private/Utilities';
 import {ImageURISource} from '../../Image/ImageSource';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {ViewProps} from '../View/ViewPropTypes';
diff --git a/Libraries/Components/Switch/Switch.d.ts b/Libraries/Components/Switch/Switch.d.ts
@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {ViewProps} from '../View/ViewPropTypes';
diff --git a/Libraries/Components/TextInput/TextInput.d.ts b/Libraries/Components/TextInput/TextInput.d.ts
@@ -8,11 +8,12 @@
  */
 
 import type * as React from 'react';
-import {Constructor, TimerMixin} from 'Utilities';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
 import {
   HostComponent,
   NativeMethods,
-} from '../../Renderer/shims/ReactNativeTypes';
+} from '../../../types/public/ReactNativeTypes';
 import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
 import {TextStyle} from '../../StyleSheet/StyleSheetTypes';
 import {
diff --git a/Libraries/Components/Touchable/Touchable.d.ts b/Libraries/Components/Touchable/Touchable.d.ts
@@ -8,7 +8,7 @@
  */
 
 import type * as React from 'react';
-import {Insets} from 'Utilities';
+import {Insets} from '../../../types/public/Insets';
 import {GestureResponderEvent} from '../../Types/CoreEventTypes';
 
 /**
diff --git a/Libraries/Components/Touchable/TouchableHighlight.d.ts b/Libraries/Components/Touchable/TouchableHighlight.d.ts
@@ -8,8 +8,9 @@
  */
 
 import type * as React from 'react';
-import {Constructor, TimerMixin} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {TouchableMixin} from './Touchable';
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts b/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts
@@ -8,7 +8,7 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
+import {Constructor} from '../../../types/private/Utilities';
 import {ColorValue} from '../../StyleSheet/StyleSheet';
 import {TouchableMixin} from './Touchable';
 
diff --git a/Libraries/Components/Touchable/TouchableOpacity.d.ts b/Libraries/Components/Touchable/TouchableOpacity.d.ts
@@ -8,8 +8,9 @@
  */
 
 import type * as React from 'react';
-import {Constructor, TimerMixin} from 'Utilities';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {TVParallaxProperties} from '../View/ViewPropTypes';
 import {TouchableMixin} from './Touchable';
 import {TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback';
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts b/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts
@@ -8,7 +8,9 @@
  */
 
 import type * as React from 'react';
-import {Constructor, Insets, TimerMixin} from 'Utilities';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
+import {Insets} from '../../../types/public/Insets';
 import {StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {
diff --git a/Libraries/Components/View/View.d.ts b/Libraries/Components/View/View.d.ts
@@ -8,9 +8,9 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
+import {Constructor} from '../../../types/private/Utilities';
 import {ViewProps} from './ViewPropTypes';
-import {NativeMethods} from '../../Renderer/shims/ReactNativeTypes';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 
 /**
  * The most fundamental component for building UI, View is a container that supports layout with flexbox, style, some touch handling,
diff --git a/Libraries/Components/View/ViewPropTypes.d.ts b/Libraries/Components/View/ViewPropTypes.d.ts
@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import {Insets} from '../../../types/Utilities';
-import {GestureResponderHandlers} from '../../Renderer/implementations/ReactNativeRenderer';
+import {Insets} from '../../../types/public/Insets';
+import {GestureResponderHandlers} from '../../../types/public/ReactNativeRenderer';
 import {StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {LayoutChangeEvent, PointerEvents} from '../../Types/CoreEventTypes';
diff --git a/Libraries/Image/Image.d.ts b/Libraries/Image/Image.d.ts
@@ -8,9 +8,10 @@
  */
 
 import * as React from 'react';
-import {Constructor, Insets} from 'Utilities';
+import {Constructor} from '../../types/private/Utilities';
 import {AccessibilityProps} from '../Components/View/ViewAccessibility';
-import {NativeMethods} from '../Renderer/shims/ReactNativeTypes';
+import {Insets} from '../../types/public/Insets';
+import {NativeMethods} from '../../types/public/ReactNativeTypes';
 import {StyleProp} from '../StyleSheet/StyleSheet';
 import {ImageStyle, ViewStyle} from '../StyleSheet/StyleSheetTypes';
 import {LayoutChangeEvent, NativeSyntheticEvent} from '../Types/CoreEventTypes';
diff --git a/Libraries/Interaction/PanResponder.d.ts b/Libraries/Interaction/PanResponder.d.ts
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {GestureResponderHandlers} from '../Renderer/implementations/ReactNativeRenderer';
+import {GestureResponderHandlers} from '../../types/public/ReactNativeRenderer';
 import {GestureResponderEvent} from '../Types/CoreEventTypes';
 
 export interface PanResponderGestureState {
diff --git a/Libraries/ReactNative/UIManager.d.ts b/Libraries/ReactNative/UIManager.d.ts
@@ -12,7 +12,7 @@ import {
   MeasureInWindowOnSuccessCallback,
   MeasureLayoutOnSuccessCallback,
   MeasureOnSuccessCallback,
-} from '../Renderer/shims/ReactNativeTypes';
+} from '../../types/public/ReactNativeTypes';
 
 export interface UIManagerStatic {
   /**
diff --git a/Libraries/ReactNative/requireNativeComponent.d.ts b/Libraries/ReactNative/requireNativeComponent.d.ts
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import {HostComponent} from '../../types/public//ReactNativeTypes';
 
 /**
  * Creates values that can be used like React components which represent native
diff --git a/Libraries/Text/Text.d.ts b/Libraries/Text/Text.d.ts
@@ -8,9 +8,9 @@
  */
 
 import type * as React from 'react';
-import {Constructor} from 'Utilities';
+import {Constructor} from '../../types/private/Utilities';
 import {AccessibilityProps} from '../Components/View/ViewAccessibility';
-import {NativeMethods} from '../Renderer/shims/ReactNativeTypes';
+import {NativeMethods} from '../../types/public/ReactNativeTypes';
 import {ColorValue, StyleProp} from '../StyleSheet/StyleSheet';
 import {TextStyle} from '../StyleSheet/StyleSheetTypes';
 import {
diff --git a/Libraries/Types/CoreEventTypes.d.ts b/Libraries/Types/CoreEventTypes.d.ts
@@ -9,7 +9,7 @@
 
 import type * as React from 'react';
 import {NodeHandle} from '../ReactNative/RendererProxy';
-import {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import {HostComponent} from '../../types/public/ReactNativeTypes';
 
 export interface LayoutRectangle {
   x: number;
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -65,12 +65,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/// <reference path="globals.d.ts" />
-/// <reference path="legacy-properties.d.ts" />
-/// <reference path="BatchedBridge.d.ts" />
-/// <reference path="Codegen.d.ts" />
-/// <reference path="Devtools.d.ts" />
-/// <reference path="LaunchScreen.d.ts" />
+/// <reference path="modules/BatchedBridge.d.ts" />
+/// <reference path="modules/Codegen.d.ts" />
+/// <reference path="modules/Devtools.d.ts" />
+/// <reference path="modules/globals.d.ts" />
+/// <reference path="modules/LaunchScreen.d.ts" />
 
 export * from '../Libraries/ActionSheetIOS/ActionSheetIOS';
 export * from '../Libraries/Alert/Alert';
@@ -131,8 +130,6 @@ export * from '../Libraries/ReactNative/I18nManager';
 export * from '../Libraries/ReactNative/RendererProxy';
 export * from '../Libraries/ReactNative/UIManager';
 export * from '../Libraries/ReactNative/requireNativeComponent';
-export * from '../Libraries/Renderer/implementations/ReactNativeRenderer';
-export * from '../Libraries/Renderer/shims/ReactNativeTypes';
 export * from '../Libraries/Settings/Settings';
 export * from '../Libraries/Share/Share';
 export * from '../Libraries/StyleSheet/PlatformColorValueTypesIOS';
@@ -155,6 +152,11 @@ export * from '../Libraries/YellowBox/YellowBoxDeprecated';
 export * from '../Libraries/vendor/core/ErrorUtils';
 export * from '../Libraries/vendor/emitter/EventEmitter';
 
+export * from './public/DeprecatedPropertiesAlias';
+export * from './public/Insets';
+export * from './public/ReactNativeRenderer';
+export * from './public/ReactNativeTypes';
+
 import type {ErrorUtils} from '../Libraries/vendor/core/ErrorUtils';
 
 declare global {
diff --git a/types/legacy-properties.d.ts b/types/legacy-properties.d.ts
diff --git a/types/modules/BatchedBridge.d.ts b/types/modules/BatchedBridge.d.ts
diff --git a/types/modules/Codegen.d.ts b/types/modules/Codegen.d.ts
diff --git a/types/modules/Devtools.d.ts b/types/modules/Devtools.d.ts
diff --git a/types/modules/LaunchScreen.d.ts b/types/modules/LaunchScreen.d.ts
diff --git a/types/modules/globals.d.ts b/types/modules/globals.d.ts
diff --git a/types/private/TimerMixin.d.ts b/types/private/TimerMixin.d.ts
diff --git a/types/private/Utilities.d.ts b/types/private/Utilities.d.ts
diff --git a/types/public/DeprecatedPropertiesAlias.d.ts b/types/public/DeprecatedPropertiesAlias.d.ts
diff --git a/types/public/Insets.d.ts b/types/public/Insets.d.ts
diff --git a/types/public/ReactNativeRenderer.d.ts b/types/public/ReactNativeRenderer.d.ts
diff --git a/types/public/ReactNativeTypes.d.ts b/types/public/ReactNativeTypes.d.ts
diff --git a/types/tsconfig.json b/types/tsconfig.json
