diff --git a/types/mangopay2-nodejs-sdk/index.d.ts b/types/mangopay2-nodejs-sdk/index.d.ts index 78629b7232..40363a5e04 100644 --- a/types/mangopay2-nodejs-sdk/index.d.ts +++ b/types/mangopay2-nodejs-sdk/index.d.ts @@ -1158,7 +1158,7 @@ declare namespace MangoPay { type OtherData = BaseData & OtherDetails; type Data = OtherData | CAData | GBData | IBANData | USData; - type DataIntersection = OtherData & CAData & GBData & IBANData & USData; + type DataIntersection = OtherData & CAData & GBData & IBANData & USData & { Type: never }; type CreationDetails = | OtherDetails | CADetails diff --git a/types/mocha-sugar-free/index.d.ts b/types/mocha-sugar-free/index.d.ts index 7c5a865776..f18c65973c 100644 --- a/types/mocha-sugar-free/index.d.ts +++ b/types/mocha-sugar-free/index.d.ts @@ -267,7 +267,7 @@ declare namespace Mocha { test: TestFunction; } - type AnyInterface = Omit & BaseInterface; + type AnyInterface = Omit & Omit & Omit & BaseInterface; // #endregion // #region Test context diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts index 07874cf1d5..3b12e1fc3a 100644 --- a/types/mysql/index.d.ts +++ b/types/mysql/index.d.ts @@ -353,7 +353,7 @@ export interface GeometryType extends Array<{ x: number, y: number } | GeometryT } export type TypeCast = boolean | ( - (field: FieldInfo + (field: UntypedFieldInfo & { type: string, length: number, string(): string, buffer(): Buffer, geometry(): null | GeometryType }, next: () => void) => any); @@ -701,7 +701,7 @@ export const enum Types { GEOMETRY = 0xff, // aka GEOMETRY } -export interface FieldInfo { +export interface UntypedFieldInfo { catalog: string; db: string; table: string; @@ -710,10 +710,13 @@ export interface FieldInfo { orgName: string; charsetNr: number; length: number; - type: Types; flags: number; decimals: number; default?: string; zeroFill: boolean; protocol41: boolean; } + +export interface FieldInfo extends UntypedFieldInfo { + type: Types; +} diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts index 1d37d765bc..a237906512 100644 --- a/types/styled-components/index.d.ts +++ b/types/styled-components/index.d.ts @@ -270,21 +270,18 @@ type ThemedStyledComponentFactories = { export type StyledComponentInnerComponent< C extends React.ComponentType -> = C extends - | StyledComponent - | StyledComponent - ? I - : C; +> = C extends StyledComponent ? I : + C extends StyledComponent ? I : + C; export type StyledComponentPropsWithRef< C extends keyof JSX.IntrinsicElements | React.ComponentType > = C extends AnyStyledComponent ? React.ComponentPropsWithRef> : React.ComponentPropsWithRef; -export type StyledComponentInnerOtherProps = C extends - | StyledComponent - | StyledComponent - ? O - : never; +export type StyledComponentInnerOtherProps = + C extends StyledComponent ? O : + C extends StyledComponent ? O : + never; export type StyledComponentInnerAttrs< C extends AnyStyledComponent > = C extends StyledComponent ? A : never; diff --git a/types/styled-components/ts3.7/index.d.ts b/types/styled-components/ts3.7/index.d.ts index 6d1a5fe929..c877b5431a 100644 --- a/types/styled-components/ts3.7/index.d.ts +++ b/types/styled-components/ts3.7/index.d.ts @@ -236,21 +236,18 @@ type ThemedStyledComponentFactories = { export type StyledComponentInnerComponent< C extends React.ComponentType -> = C extends - | StyledComponent - | StyledComponent - ? I - : C; +> = C extends StyledComponent ? I : + C extends StyledComponent ? I : + C; export type StyledComponentPropsWithRef< C extends keyof JSX.IntrinsicElements | React.ComponentType > = C extends AnyStyledComponent ? React.ComponentPropsWithRef> : React.ComponentPropsWithRef; -export type StyledComponentInnerOtherProps = C extends - | StyledComponent - | StyledComponent - ? O - : never; +export type StyledComponentInnerOtherProps = + C extends StyledComponent ? O : + C extends StyledComponent ? O : + never; export type StyledComponentInnerAttrs< C extends AnyStyledComponent > = C extends StyledComponent ? A : never; diff --git a/types/tablesorter/test/Methods.ts b/types/tablesorter/test/Methods.ts index ac18a4ebb6..90951e8e46 100644 --- a/types/tablesorter/test/Methods.ts +++ b/types/tablesorter/test/Methods.ts @@ -161,9 +161,9 @@ export class TestMethods { $.tablesorter.getData($(), config.headers[0], "sorter"); // $ExpectType string | boolean | undefined $.tablesorter.getData($()[0], config.headers[0], "sorter"); - // $ExpectType "top" | "bottom" | "zero" | "min" | "max" | undefined + // $ExpectType "top" | "bottom" | "zero" | "min" | "max" | undefined || "top" | "bottom" | "min" | "max" | "zero" | undefined $.tablesorter.getData($(), config.headers[0], "string"); - // $ExpectType "top" | "bottom" | "zero" | "min" | "max" | undefined + // $ExpectType "top" | "bottom" | "zero" | "min" | "max" | undefined || "top" | "bottom" | "min" | "max" | "zero" | undefined $.tablesorter.getData($()[0], config.headers[0], "string"); // $ExpectType string[] diff --git a/types/vuelidate/vue.d.ts b/types/vuelidate/vue.d.ts index eadd30ea77..cfeaabbdee 100644 --- a/types/vuelidate/vue.d.ts +++ b/types/vuelidate/vue.d.ts @@ -6,7 +6,7 @@ import { Validation } from './vuelidate' declare module 'vue/types/vue' { type ValidationProperties = { - [P in keyof V]?: Validation & ValidationProperties & ValidationEvaluation + [P in Exclude]?: Validation & ValidationProperties & ValidationEvaluation } interface ValidationGroups {