Skip to content

🤖 Pick PR #60083 (Don't issue implicit any when obtai...) into release-5.6 #60086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2024
Merged

🤖 Pick PR #60083 (Don't issue implicit any when obtai...) into release-5.6 #60086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acce039
Merge 1c25b1a91ad1d4070238684dbad0d330ddd865e0 into 52c59dbcbee274e52…
ahejlsberg Sep 27, 2024
3ef0f8d
Update Baselines and/or Applied Lint Fixes
typescript-bot Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11906,7 +11906,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// contextual type or, if the element itself is a binding pattern, with the type implied by that binding
// pattern.
const contextualType = isBindingPattern(element.name) ? getTypeFromBindingPattern(element.name, /*includePatternInType*/ true, /*reportErrors*/ false) : unknownType;
return addOptionality(widenTypeInferredFromInitializer(element, checkDeclarationInitializer(element, CheckMode.Normal, contextualType)));
return addOptionality(getWidenedLiteralTypeForInitializer(element, checkDeclarationInitializer(element, CheckMode.Normal, contextualType)));
}
if (isBindingPattern(element.name)) {
return getTypeFromBindingPattern(element.name, includePatternInType, reportErrors);
Expand Down Expand Up @@ -40500,7 +40500,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function widenTypeInferredFromInitializer(declaration: HasExpressionInitializer, type: Type) {
const widened = getCombinedNodeFlagsCached(declaration) & NodeFlags.Constant || isDeclarationReadonly(declaration) ? type : getWidenedLiteralType(type);
const widened = getWidenedLiteralTypeForInitializer(declaration, type);
if (isInJSFile(declaration)) {
if (isEmptyLiteralType(widened)) {
reportImplicitAny(declaration, anyType);
Expand All @@ -40514,6 +40514,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return widened;
}

function getWidenedLiteralTypeForInitializer(declaration: HasExpressionInitializer, type: Type) {
return getCombinedNodeFlagsCached(declaration) & NodeFlags.Constant || isDeclarationReadonly(declaration) ? type : getWidenedLiteralType(type);
}

function isLiteralOfContextualType(candidateType: Type, contextualType: Type | undefined): boolean {
if (contextualType) {
if (contextualType.flags & TypeFlags.UnionOrIntersection) {
Expand Down
61 changes: 61 additions & 0 deletions tests/baselines/reference/destructuringParameterDeclaration10(strict=false).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
//// [tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration10.ts] ////

=== destructuringParameterDeclaration10.ts ===
export function prepareConfig({
>prepareConfig : Symbol(prepareConfig, Decl(destructuringParameterDeclaration10.ts, 0, 0))

additionalFiles: {
>additionalFiles : Symbol(additionalFiles, Decl(destructuringParameterDeclaration10.ts, 4, 4))

json = []
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 1, 22))

} = {}
}: {
additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>;
>additionalFiles : Symbol(additionalFiles, Decl(destructuringParameterDeclaration10.ts, 4, 4))
>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))

} = {}) {
json // string[]
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 1, 22))
}

export function prepareConfigWithoutAnnotation({
>prepareConfigWithoutAnnotation : Symbol(prepareConfigWithoutAnnotation, Decl(destructuringParameterDeclaration10.ts, 8, 1))

additionalFiles: {
>additionalFiles : Symbol(additionalFiles)

json = []
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 11, 22))

} = {}
} = {}) {
json
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 11, 22))
}

export const prepareConfigWithContextualSignature: (param:{
>prepareConfigWithContextualSignature : Symbol(prepareConfigWithContextualSignature, Decl(destructuringParameterDeclaration10.ts, 18, 12))
>param : Symbol(param, Decl(destructuringParameterDeclaration10.ts, 18, 52))

additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>;
>additionalFiles : Symbol(additionalFiles, Decl(destructuringParameterDeclaration10.ts, 18, 59))
>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))

}) => void = ({
additionalFiles: {
>additionalFiles : Symbol(additionalFiles, Decl(destructuringParameterDeclaration10.ts, 18, 59))

json = []
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 21, 22))

} = {}
} = {}) => {
json // string[]
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 21, 22))
}

99 changes: 99 additions & 0 deletions tests/baselines/reference/destructuringParameterDeclaration10(strict=false).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
//// [tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration10.ts] ////

=== destructuringParameterDeclaration10.ts ===
export function prepareConfig({
>prepareConfig : ({ additionalFiles: { json } }?: { additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>; }) => void
> : ^ ^^^ ^^^^^^^^^

additionalFiles: {
>additionalFiles : any
> : ^^^

json = []
>json : string[]
> : ^^^^^^^^
>[] : undefined[]
> : ^^^^^^^^^^^

} = {}
>{} : {}
> : ^^

}: {
additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>;
>additionalFiles : Partial<Record<"json" | "jsonc" | "json5", string[]>>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

} = {}) {
>{} : {}
> : ^^

json // string[]
>json : string[]
> : ^^^^^^^^
}

export function prepareConfigWithoutAnnotation({
>prepareConfigWithoutAnnotation : ({ additionalFiles: { json } }?: { additionalFiles?: { json?: any[]; }; }) => void
> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

additionalFiles: {
>additionalFiles : any
> : ^^^

json = []
>json : any[]
> : ^^^^^
>[] : undefined[]
> : ^^^^^^^^^^^

} = {}
>{} : {}
> : ^^

} = {}) {
>{} : {}
> : ^^

json
>json : any[]
> : ^^^^^
}

export const prepareConfigWithContextualSignature: (param:{
>prepareConfigWithContextualSignature : (param: { additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>; }) => void
> : ^ ^^ ^^^^^
>param : { additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>; }
> : ^^^^^^^^^^^^^^^^^^^^ ^^^

additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>;
>additionalFiles : Partial<Record<"json" | "jsonc" | "json5", string[]>>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

}) => void = ({
>({ additionalFiles: { json = [] } = {}} = {}) => { json // string[]} : ({ additionalFiles: { json } }?: { additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>; }) => void
> : ^ ^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^

additionalFiles: {
>additionalFiles : any
> : ^^^

json = []
>json : string[]
> : ^^^^^^^^
>[] : undefined[]
> : ^^^^^^^^^^^

} = {}
>{} : {}
> : ^^

} = {}) => {
>{} : {}
> : ^^

json // string[]
>json : string[]
> : ^^^^^^^^
}

61 changes: 61 additions & 0 deletions tests/baselines/reference/destructuringParameterDeclaration10(strict=true).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
//// [tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration10.ts] ////

=== destructuringParameterDeclaration10.ts ===
export function prepareConfig({
>prepareConfig : Symbol(prepareConfig, Decl(destructuringParameterDeclaration10.ts, 0, 0))

additionalFiles: {
>additionalFiles : Symbol(additionalFiles, Decl(destructuringParameterDeclaration10.ts, 4, 4))

json = []
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 1, 22))

} = {}
}: {
additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>;
>additionalFiles : Symbol(additionalFiles, Decl(destructuringParameterDeclaration10.ts, 4, 4))
>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))

} = {}) {
json // string[]
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 1, 22))
}

export function prepareConfigWithoutAnnotation({
>prepareConfigWithoutAnnotation : Symbol(prepareConfigWithoutAnnotation, Decl(destructuringParameterDeclaration10.ts, 8, 1))

additionalFiles: {
>additionalFiles : Symbol(additionalFiles)

json = []
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 11, 22))

} = {}
} = {}) {
json
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 11, 22))
}

export const prepareConfigWithContextualSignature: (param:{
>prepareConfigWithContextualSignature : Symbol(prepareConfigWithContextualSignature, Decl(destructuringParameterDeclaration10.ts, 18, 12))
>param : Symbol(param, Decl(destructuringParameterDeclaration10.ts, 18, 52))

additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>;
>additionalFiles : Symbol(additionalFiles, Decl(destructuringParameterDeclaration10.ts, 18, 59))
>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))

}) => void = ({
additionalFiles: {
>additionalFiles : Symbol(additionalFiles, Decl(destructuringParameterDeclaration10.ts, 18, 59))

json = []
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 21, 22))

} = {}
} = {}) => {
json // string[]
>json : Symbol(json, Decl(destructuringParameterDeclaration10.ts, 21, 22))
}

99 changes: 99 additions & 0 deletions tests/baselines/reference/destructuringParameterDeclaration10(strict=true).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
//// [tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration10.ts] ////

=== destructuringParameterDeclaration10.ts ===
export function prepareConfig({
>prepareConfig : ({ additionalFiles: { json } }?: { additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>; }) => void
> : ^ ^^^ ^^^^^^^^^

additionalFiles: {
>additionalFiles : any
> : ^^^

json = []
>json : string[]
> : ^^^^^^^^
>[] : never[]
> : ^^^^^^^

} = {}
>{} : {}
> : ^^

}: {
additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>;
>additionalFiles : Partial<Record<"json" | "jsonc" | "json5", string[]>> | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

} = {}) {
>{} : {}
> : ^^

json // string[]
>json : string[]
> : ^^^^^^^^
}

export function prepareConfigWithoutAnnotation({
>prepareConfigWithoutAnnotation : ({ additionalFiles: { json } }?: { additionalFiles?: { json?: never[] | undefined; } | undefined; }) => void
> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

additionalFiles: {
>additionalFiles : any
> : ^^^

json = []
>json : never[]
> : ^^^^^^^
>[] : never[]
> : ^^^^^^^

} = {}
>{} : {}
> : ^^

} = {}) {
>{} : {}
> : ^^

json
>json : never[]
> : ^^^^^^^
}

export const prepareConfigWithContextualSignature: (param:{
>prepareConfigWithContextualSignature : (param: { additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>; }) => void
> : ^ ^^ ^^^^^
>param : { additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>; }
> : ^^^^^^^^^^^^^^^^^^^^ ^^^

additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>;
>additionalFiles : Partial<Record<"json" | "jsonc" | "json5", string[]>> | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

}) => void = ({
>({ additionalFiles: { json = [] } = {}} = {}) => { json // string[]} : ({ additionalFiles: { json } }?: { additionalFiles?: Partial<Record<"json" | "jsonc" | "json5", string[]>>; }) => void
> : ^ ^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^

additionalFiles: {
>additionalFiles : any
> : ^^^

json = []
>json : string[]
> : ^^^^^^^^
>[] : never[]
> : ^^^^^^^

} = {}
>{} : {}
> : ^^

} = {}) => {
>{} : {}
> : ^^

json // string[]
>json : string[]
> : ^^^^^^^^
}

Loading