Page MenuHomePhorge
Files F32150821

D15110.1765033817.diff
No OneTemporary
Actions

Size
9 KB
Referenced Files
None
Subscribers
None

D15110.1765033817.diff
View Options

diff --git a/lib/components/base-auto-join-community-handler.react.js b/lib/components/base-auto-join-community-handler.react.js
--- a/lib/components/base-auto-join-community-handler.react.js
+++ b/lib/components/base-auto-join-community-handler.react.js
@@ -111,7 +111,7 @@
);
const promises: {
- [string]: Promise<?$Diff<CommunityToAutoJoin, { +batch: number }>>,
+ [string]: Promise<?Omit<CommunityToAutoJoin, 'batch'>>,
} = {};
for (const channelID of followedFarcasterChannelIDs) {
diff --git a/lib/keyserver-conn/keyserver-connections-handler.js b/lib/keyserver-conn/keyserver-connections-handler.js
--- a/lib/keyserver-conn/keyserver-connections-handler.js
+++ b/lib/keyserver-conn/keyserver-connections-handler.js
@@ -6,7 +6,7 @@
import { type BaseSocketProps } from '../socket/socket.react.js';
import { useSelector } from '../utils/redux-utils.js';
-type BaseProps = $ReadOnly<$Diff<BaseSocketProps, { +keyserverID: string }>>;
+type BaseProps = $ReadOnly<Omit<BaseSocketProps, 'keyserverID'>>;
type Props = {
...BaseProps,
diff --git a/lib/ops/keyserver-store-ops.js b/lib/ops/keyserver-store-ops.js
--- a/lib/ops/keyserver-store-ops.js
+++ b/lib/ops/keyserver-store-ops.js
@@ -80,9 +80,9 @@
let persistedKeyserverInfo: PersistedKeyserverInfo;
if (dbKeyserverInfo.keyserverInfo.length > 0) {
- const persistedNonSyncedKeyserverInfo: $Diff<
+ const persistedNonSyncedKeyserverInfo: Omit<
PersistedKeyserverInfo,
- SyncedKeyserverInfoData,
+ $Keys<SyncedKeyserverInfoData>,
> = JSON.parse(dbKeyserverInfo.keyserverInfo);
persistedKeyserverInfo = {
diff --git a/lib/shared/transforms/keyserver-store-transform.js b/lib/shared/transforms/keyserver-store-transform.js
--- a/lib/shared/transforms/keyserver-store-transform.js
+++ b/lib/shared/transforms/keyserver-store-transform.js
@@ -12,12 +12,9 @@
defaultConnectionInfo,
} from '../../types/socket-types.js';
-export type PersistedKeyserverInfo = $Diff<
+export type PersistedKeyserverInfo = Omit<
KeyserverInfo,
- {
- +connection: ConnectionInfo,
- +sessionID?: ?string,
- },
+ 'connection' | 'sessionID',
>;
export type PersistedKeyserverStore = {
+keyserverInfos: { +[key: string]: PersistedKeyserverInfo },
diff --git a/lib/tunnelbroker/tunnelbroker-context.js b/lib/tunnelbroker/tunnelbroker-context.js
--- a/lib/tunnelbroker/tunnelbroker-context.js
+++ b/lib/tunnelbroker/tunnelbroker-context.js
@@ -87,13 +87,9 @@
retryCount: 0,
};
-type SendFarcasterRequestPayload = $Diff<
+type SendFarcasterRequestPayload = Omit<
FarcasterAPIRequest,
- {
- +type: 'FarcasterAPIRequest',
- +requestID: string,
- +userID: string,
- },
+ 'type' | 'requestID' | 'userID',
>;
type TunnelbrokerContextType = {
diff --git a/lib/types/minimally-encoded-thread-permissions-types.js b/lib/types/minimally-encoded-thread-permissions-types.js
--- a/lib/types/minimally-encoded-thread-permissions-types.js
+++ b/lib/types/minimally-encoded-thread-permissions-types.js
@@ -109,9 +109,9 @@
+permissions: string,
}>;
-export type MemberInfoSansPermissions = $Diff<
+export type MemberInfoSansPermissions = Omit<
MemberInfoWithPermissions,
- { +permissions: string },
+ 'permissions',
>;
export type MinimallyEncodedThickMemberInfo = $ReadOnly<{
@@ -143,13 +143,7 @@
>(
minimallyEncodedMemberInfo: T,
): $ReadOnly<{
- ...$Diff<
- T,
- {
- +minimallyEncoded: true,
- +permissions: string,
- },
- >,
+ ...Omit<T, 'minimallyEncoded' | 'permissions'>,
+permissions: ThreadPermissionsInfo,
}> => {
const { minimallyEncoded, ...rest } = minimallyEncodedMemberInfo;
diff --git a/lib/types/socket-types.js b/lib/types/socket-types.js
--- a/lib/types/socket-types.js
+++ b/lib/types/socket-types.js
@@ -143,9 +143,9 @@
| PingClientSocketMessage
| AckUpdatesClientSocketMessage
| APIRequestClientSocketMessage;
-export type ClientSocketMessageWithoutID = $Diff<
+export type ClientSocketMessageWithoutID = Omit<
ClientClientSocketMessage,
- { id: number },
+ 'id',
>;
// The types of messages that the server sends across the socket
diff --git a/native/components/tag-input.react.js b/native/components/tag-input.react.js
--- a/native/components/tag-input.react.js
+++ b/native/components/tag-input.react.js
@@ -449,16 +449,11 @@
wrapper: {},
});
-type ReactConfigShim<Props, DP> = $ReadOnly<{
- ...$Diff<Props, DP>,
- ...Partial<DP>,
+type BaseConfig<T> = $ReadOnly<{
+ ...Omit<TagInputProps<T>, $Keys<typeof BaseTagInput.defaultProps>>,
+ ...Partial<typeof BaseTagInput.defaultProps>,
}>;
-type BaseConfig<T> = ReactConfigShim<
- TagInputProps<T>,
- typeof BaseTagInput.defaultProps,
->;
-
type TagInputComponentType<T> = component(
ref: React.RefSetter<BaseTagInput<T>>,
...BaseConfig<T>
diff --git a/native/flow-typed/npm/@react-navigation/core_v6.x.x.js b/native/flow-typed/npm/@react-navigation/core_v6.x.x.js
--- a/native/flow-typed/npm/@react-navigation/core_v6.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/core_v6.x.x.js
@@ -1214,16 +1214,16 @@
declare export type TransitionSpec =
| {|
animation: 'spring',
- config: $Diff<
+ config: Omit<
SpringAnimationConfigSingle,
- { toValue: number | AnimatedValue, ... },
+ 'toValue',
>,
|}
| {|
animation: 'timing',
- config: $Diff<
+ config: Omit<
TimingAnimationConfigSingle,
- { toValue: number | AnimatedValue, ... },
+ 'toValue',
>,
|};
@@ -1516,9 +1516,9 @@
*/
declare export type BottomTabBarButtonProps = {|
- ...$Diff<
+ ...Omit<
TouchableWithoutFeedbackProps,
- {| onPress?: ?(event: PressEvent) => mixed |},
+ 'onPress',
>,
+to?: string,
+children: React.Node,
@@ -1528,16 +1528,16 @@
declare export type TabBarVisibilityAnimationConfig =
| {|
+animation: 'spring',
- +config?: $Diff<
+ +config?: Omit<
SpringAnimationConfigSingle,
- { toValue: number | AnimatedValue, useNativeDriver: boolean, ... },
+ 'toValue' | 'useNativeDriver',
>,
|}
| {|
+animation: 'timing',
- +config?: $Diff<
+ +config?: Omit<
TimingAnimationConfigSingle,
- { toValue: number | AnimatedValue, useNativeDriver: boolean, ... },
+ 'toValue' | 'useNativeDriver',
>,
|};
diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -1399,10 +1399,7 @@
},
};
-type PersistedReportStore = $Diff<
- ReportStore,
- { +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> },
->;
+type PersistedReportStore = Omit<ReportStore, 'queuedReports'>;
const reportStoreTransform: Transform = createTransform(
(state: ReportStore): PersistedReportStore => {
return { enabledReports: state.enabledReports };
diff --git a/native/types/styles.js b/native/types/styles.js
--- a/native/types/styles.js
+++ b/native/types/styles.js
@@ -49,7 +49,7 @@
| AnimatedStyleObj
| $ReadOnlyArray<ViewStyle | AnimatedStyleObj>;
const AnimatedView: React.ComponentType<{
- ...$Diff<ViewProps, { style: ViewStyle }>,
+ ...Omit<ViewProps, 'style'>,
+style: AnimatedViewStyle,
+entering?: ReanimatedAnimationBuilder | EntryAnimationFunction | Keyframe,
+exiting?: ReanimatedAnimationBuilder | ExitAnimationFunction | Keyframe,
@@ -59,7 +59,7 @@
| AnimatedStyleObj
| $ReadOnlyArray<TextStyle | AnimatedStyleObj>;
const AnimatedText: React.ComponentType<{
- ...$Diff<TextProps, { style: TextStyle }>,
+ ...Omit<TextProps, 'style'>,
+style: AnimatedTextStyle,
}> = Animated.Text;
@@ -67,7 +67,7 @@
| AnimatedStyleObj
| $ReadOnlyArray<ImageStyle | AnimatedStyleObj>;
const AnimatedImage: React.ComponentType<{
- ...$Diff<ImageProps, { style: ImageStyle }>,
+ ...Omit<ImageProps, 'style'>,
+style: AnimatedImageStyle,
}> = Animated.Image;
diff --git a/web/flow-typed/npm/react-color_v2.x.x.js b/web/flow-typed/npm/react-color_v2.x.x.js
--- a/web/flow-typed/npm/react-color_v2.x.x.js
+++ b/web/flow-typed/npm/react-color_v2.x.x.js
@@ -171,7 +171,7 @@
Comp: ComponentType<Props>,
>(
Component: Comp
- ): ComponentType<$Diff<React$ElementConfig<Comp>, InjectedColorProps>>;
+ ): ComponentType<Omit<React$ElementConfig<Comp>, $Keys<InjectedColorProps>>>;
}
declare module "react-color/lib/components/common" {
diff --git a/web/flow-typed/npm/react-hot-loader_v4.6.x.js b/web/flow-typed/npm/react-hot-loader_v4.6.x.js
--- a/web/flow-typed/npm/react-hot-loader_v4.6.x.js
+++ b/web/flow-typed/npm/react-hot-loader_v4.6.x.js
@@ -21,7 +21,7 @@
declare export function hot(module: Module): <T: React.ComponentType<any>>(
Component: T,
- props?: $Diff<ContainerProps, { children: React$Element<any>, ... }>
+ props?: Omit<ContainerProps, 'children'>
) => T
declare export function cold<T: React.ComponentType<any>>(component: T): T
@@ -54,6 +54,6 @@
declare export function hot<T: React.ComponentType<any>>(
Component: T,
- props?: $Diff<ContainerProps, { children: React$Element<any>, ... }>
+ props?: Omit<ContainerProps, 'children'>
): T;
}
diff --git a/web/flow-typed/npm/react-router-dom_v5.x.x.js b/web/flow-typed/npm/react-router-dom_v5.x.x.js
--- a/web/flow-typed/npm/react-router-dom_v5.x.x.js
+++ b/web/flow-typed/npm/react-router-dom_v5.x.x.js
@@ -159,7 +159,7 @@
declare export function withRouter<Props: {...}, Component: React.ComponentType<Props>>(
WrappedComponent: Component
- ): React.ComponentType<$Diff<React$ElementConfig<Component>, ContextRouterVoid>>;
+ ): React.ComponentType<Omit<React$ElementConfig<Component>, $Keys<ContextRouterVoid>>>;
declare type MatchPathOptions = {
path?: string | string[],

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 3:10 PM (20 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5838910
Default Alt Text
D15110.1765033817.diff (9 KB)

Event Timeline