Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6249,7 +6249,7 @@ namespace ts {
}

function getImplicitIndexTypeOfType(type: Type, kind: IndexKind): Type {
if (isObjectLiteralType(type)) {
if (isObjectTypeWithInferableIndex(type)) {
const propTypes: Type[] = [];
for (const prop of getPropertiesOfType(type)) {
if (kind === IndexKind.String || isNumericLiteralName(prop.escapedName)) {
Expand Down Expand Up @@ -9800,7 +9800,7 @@ namespace ts {
// if T is related to U.
return kind === IndexKind.String && isRelatedTo(getTemplateTypeFromMappedType(<MappedType>source), targetInfo.type, reportErrors);
}
if (isObjectLiteralType(source)) {
if (isObjectTypeWithInferableIndex(source)) {
let related = Ternary.True;
if (kind === IndexKind.String) {
const sourceNumberInfo = getIndexInfoOfType(source, IndexKind.Number);
Expand Down Expand Up @@ -10313,11 +10313,11 @@ namespace ts {
}

/**
* Return true if type was inferred from an object literal or written as an object type literal
* Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module
* with no call or construct signatures.
*/
function isObjectLiteralType(type: Type) {
return type.symbol && (type.symbol.flags & (SymbolFlags.ObjectLiteral | SymbolFlags.TypeLiteral)) !== 0 &&
function isObjectTypeWithInferableIndex(type: Type) {
return type.symbol && (type.symbol.flags & (SymbolFlags.ObjectLiteral | SymbolFlags.TypeLiteral | SymbolFlags.ValueModule)) !== 0 &&
getSignaturesOfType(type, SignatureKind.Call).length === 0 &&
getSignaturesOfType(type, SignatureKind.Construct).length === 0;
}
Expand Down
28 changes: 28 additions & 0 deletions tests/baselines/reference/inferredIndexerOnNamespaceImport.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//// [tests/cases/compiler/inferredIndexerOnNamespaceImport.ts] ////

//// [foo.ts]
export const x = 3;
export const y = 5;

//// [bar.ts]
import * as foo from "./foo";

function f(map: { [k: string]: number }) {
// ...
}

f(foo);

//// [foo.js]
"use strict";
exports.__esModule = true;
exports.x = 3;
exports.y = 5;
//// [bar.js]
"use strict";
exports.__esModule = true;
var foo = require("./foo");
function f(map) {
// ...
}
f(foo);
23 changes: 23 additions & 0 deletions tests/baselines/reference/inferredIndexerOnNamespaceImport.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
=== tests/cases/compiler/foo.ts ===
export const x = 3;
>x : Symbol(x, Decl(foo.ts, 0, 12))

export const y = 5;
>y : Symbol(y, Decl(foo.ts, 1, 12))

=== tests/cases/compiler/bar.ts ===
import * as foo from "./foo";
>foo : Symbol(foo, Decl(bar.ts, 0, 6))

function f(map: { [k: string]: number }) {
>f : Symbol(f, Decl(bar.ts, 0, 29))
>map : Symbol(map, Decl(bar.ts, 2, 11))
>k : Symbol(k, Decl(bar.ts, 2, 19))

// ...
}

f(foo);
>f : Symbol(f, Decl(bar.ts, 0, 29))
>foo : Symbol(foo, Decl(bar.ts, 0, 6))

26 changes: 26 additions & 0 deletions tests/baselines/reference/inferredIndexerOnNamespaceImport.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
=== tests/cases/compiler/foo.ts ===
export const x = 3;
>x : 3
>3 : 3

export const y = 5;
>y : 5
>5 : 5

=== tests/cases/compiler/bar.ts ===
import * as foo from "./foo";
>foo : typeof foo

function f(map: { [k: string]: number }) {
>f : (map: { [k: string]: number; }) => void
>map : { [k: string]: number; }
>k : string

// ...
}

f(foo);
>f(foo) : void
>f : (map: { [k: string]: number; }) => void
>foo : typeof foo

12 changes: 12 additions & 0 deletions tests/cases/compiler/inferredIndexerOnNamespaceImport.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// @filename: foo.ts
export const x = 3;
export const y = 5;

// @filename: bar.ts
import * as foo from "./foo";

function f(map: { [k: string]: number }) {
// ...
}

f(foo);