8000 use import types in nodebuilder for typeof module symbols · microsoft/TypeScript@73075dd · GitHub
[go: up one dir, main page]

Skip to content

Commit 73075dd

Browse files
committed
use import types in nodebuilder for typeof module symbols
1 parent 0be6ce4 commit 73075dd

File tree

226 files changed

+982
-982
lines changed
  • cases/fourslash
  • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    226 files changed

    +982
    -982
    lines changed

    src/compiler/checker.ts

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -25107,7 +25107,7 @@ namespace ts {
    2510725107
    return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
    2510825108
    }
    2510925109

    25110-
    if (isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
    25110+
    while (isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
    2511125111
    entityName = <QualifiedName | PropertyAccessEntityNameExpression>entityName.parent;
    2511225112
    }
    2511325113

    tests/baselines/reference/aliasAssignments.errors.txt

    Lines changed: 4 additions & 4 deletions
    F438
    Original file line numberDiff line numberDiff line change
    @@ -1,17 +1,17 @@
    1-
    tests/cases/compiler/aliasAssignments_1.ts(3,1): error TS2322: Type '1' is not assignable to type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"'.
    2-
    tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"' is not assignable to type 'number'.
    1+
    tests/cases/compiler/aliasAssignments_1.ts(3,1): error TS2322: Type '1' is not assignable to type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")'.
    2+
    tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")' is not assignable to type 'number'.
    33

    44

    55
    ==== tests/cases/compiler/aliasAssignments_1.ts (2 errors) ====
    66
    import moduleA = require("./aliasAssignments_moduleA");
    77
    var x = moduleA;
    88
    x = 1; // Should be error
    99
    ~
    10-
    !!! error TS2322: Type '1' is not assignable to type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"'.
    10+
    !!! error TS2322: Type '1' is not assignable to type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")'.
    1111
    var y = 1;
    1212
    y = moduleA; // should be error
    1313
    ~
    14-
    !!! error TS2322: Type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"' is not assignable to type 'number'.
    14+
    !!! error TS2322: Type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")' is not assignable to type 'number'.
    1515

    1616
    ==== tests/cases/compiler/aliasAssignments_moduleA.ts (0 errors) ====
    1717
    export class someClass {

    tests/baselines/reference/aliasOnMergedModuleInterface.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -26,7 +26,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
    2626

    2727
    === tests/cases/compiler/aliasOnMergedModuleInterface_0.ts ===
    2828
    declare module "foo"
    29-
    >"foo" : typeof "foo"
    29+
    >"foo" : typeof import("foo")
    3030
    {
    3131
    module B {
    3232
    >B : any

    tests/baselines/reference/allowSyntheticDefaultImports10.errors.txt

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,15 +1,15 @@
    1-
    tests/cases/compiler/a.ts(2,5): error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
    2-
    tests/cases/compiler/a.ts(3,5): error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
    1+
    tests/cases/compiler/a.ts(2,5): error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
    2+
    tests/cases/compiler/a.ts(3,5): error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
    33

    44

    55
    ==== tests/cases/compiler/a.ts (2 errors) ====
    66
    import Foo = require("./b");
    77
    Foo.default.bar();
    88
    ~~~~~~~
    9-
    !!! error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
    9+
    !!! error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
    1010
    Foo.default.default.foo();
    1111
    ~~~~~~~
    12-
    !!! error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
    12+
    !!! error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
    1313
    ==== tests/cases/compiler/b.d.ts (0 errors) ====
    1414
    export function foo();
    1515

    tests/baselines/reference/ambientDeclarationsPatterns.types

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -28,30 +28,30 @@ foo(fileText);
    2828

    2929
    === tests/cases/conformance/ambient/declarations.d.ts ===
    3030
    declare module "foo*baz" {
    31-
    >"foo*baz" : typeof "foo*baz"
    31+
    >"foo*baz" : typeof import("foo*baz")
    3232

    3333
    export function foo(s: string): void;
    3434
    >foo : (s: string) => void
    3535
    >s : string
    3636
    }
    3737
    // Augmentations still work
    3838
    declare module "foo*baz" {
    39-
    >"foo*baz" : typeof "foo*baz"
    39+
    >"foo*baz" : typeof import("foo*baz")
    4040

    4141
    export const baz: string;
    4242
    >baz : string
    4343
    }
    4444

    4545
    // Longest prefix wins
    4646
    declare module "foos*" {
    47-
    >"foos*" : typeof "foos*"
    47+
    >"foos*" : typeof import("foos*")
    4848

    4949
    export const foos: string;
    5050
    >foos : string
    5151
    }
    5252

    5353
    declare module "*!text" {
    54-
    >"*!text" : typeof "*!text"
    54+
    >"*!text" : typeof import("*!text")
    5555

    5656
    const x: string;
    5757
    >x : string
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    11
    === tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts ===
    22
    declare module "too*many*asterisks" { }
    3-
    >"too*many*asterisks" : typeof "too*many*asterisks"
    3+
    >"too*many*asterisks" : typeof import("too*many*asterisks")
    44

    tests/baselines/reference/ambientExportDefaultErrors.types

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,7 +12,7 @@ export default 2 + 2;
    1212
    >2 : 2
    1313

    1414
    export as namespace Foo;
    15-
    >Foo : typeof "tests/cases/compiler/foo"
    15+
    >Foo : typeof import("tests/cases/compiler/foo")
    1616

    1717
    === tests/cases/compiler/foo2.d.ts ===
    1818
    export = 2 + 2;
    @@ -26,7 +26,7 @@ export as namespace Foo2;
    2626
    === tests/cases/compiler/indirection.d.ts ===
    2727
    /// <reference path="./foo.d.ts" />
    2828
    declare module "indirect" {
    29-
    >"indirect" : typeof "indirect"
    29+
    >"indirect" : typeof import("indirect")
    3030

    3131
    export default typeof Foo.default;
    3232
    >typeof Foo.default : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
    @@ -38,7 +38,7 @@ declare module "indirect" {
    3838
    === tests/cases/compiler/indirection2.d.ts ===
    3939
    /// <reference path="./foo2.d.ts" />
    4040
    declare module "indirect2" {
    41-
    >"indirect2" : typeof "indirect2"
    41+
    >"indirect2" : typeof import("indirect2")
    4242

    4343
    export = typeof Foo2;
    4444
    >typeof Foo2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"

    tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@ export = D;
    66
    >D : D
    77

    88
    declare module "ext" {
    9-
    >"ext" : typeof "ext"
    9+
    >"ext" : typeof import("ext")
    1010

    1111
    export class C { }
    1212
    >C : C

    tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -3,5 +3,5 @@ module M {
    33
    >M : any
    44

    55
    export declare module "M" { }
    6-
    >"M" : typeof "M"
    6+
    >"M" : typeof import("M")
    77
    }

    tests/baselines/reference/ambientExternalModuleMerging.types

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,15 +17,15 @@ var y = M.y;
    1717

    1818
    === tests/cases/conformance/ambient/ambientExternalModuleMerging_declare.ts ===
    1919
    declare module "M" {
    20-
    >"M" : typeof "M"
    20+
    >"M" : typeof import("M")
    2121

    2222
    export var x: string;
    2323
    >x : string
    2424
    }
    2525

    2626
    // Merge
    2727
    declare module "M" {
    28-
    >"M" : typeof "M"
    28+
    >"M" : typeof import("M")
    2929

    3030
    export var y: string;
    3131
    >y : string

    tests/baselines/reference/ambientExternalModuleReopen.types

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,12 +1,12 @@
    11
    === tests/cases/compiler/ambientExternalModuleReopen.ts ===
    22
    declare module "fs" {
    3-
    >"fs" : typeof "fs"
    3+
    >"fs" : typeof import("fs")
    44

    55
    var x: string;
    66
    >x : string
    77
    }
    88
    declare module 'fs' {
    9-
    >'fs' : typeof "fs"
    9+
    >'fs' : typeof import("fs")
    1010

    1111
    var y: number;
    1212
    >y : number

    tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    === tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts ===
    22
    declare module "OuterModule" {
    3-
    >"OuterModule" : typeof "OuterModule"
    3+
    >"OuterModule" : typeof import("OuterModule")
    44

    55
    import m2 = require("./SubModule");
    66
    >m2 : any

    tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,13 +1,13 @@
    11
    === tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts ===
    22
    declare module "./relativeModule" {
    3-
    >"./relativeModule" : typeof "./relativeModule"
    3+
    >"./relativeModule" : typeof import("./relativeModule")
    44

    55
    var x: string;
    66
    >x : string
    77
    }
    88

    99
    declare module ".\\relativeModule" {
    10-
    >".\\relativeModule" : typeof ".\\relativeModule"
    10+
    >".\\relativeModule" : typeof import(".\\\\relativeModule")
    1111

    1212
    var x: string;
    1313
    >x : string

    tests/baselines/reference/ambientRequireFunction.types

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -2,16 +2,16 @@
    22
    /// <reference path="node.d.ts"/>
    33

    44
    const fs = require("fs");
    5-
    >fs : typeof "fs"
    6-
    >require("fs") : typeof "fs"
    5+
    >fs : typeof import("fs")
    6+
    >require("fs") : typeof import("fs")
    77
    >require : (moduleName: string) => any
    88
    >"fs" : "fs"
    99

    1010
    const text = fs.readFileSync("/a/b/c");
    1111
    >text : string
    1212
    >fs.readFileSync("/a/b/c") : string
    1313
    >fs.readFileSync : (s: string) => string
    14-
    >fs : typeof "fs"
    14+
    >fs : typeof import("fs")
    1515
    >readFileSync : (s: string) => string
    1616
    >"/a/b/c" : "/a/b/c"
    1717

    @@ -21,7 +21,7 @@ declare function require(moduleName: string): any;
    2121
    >moduleName : string
    2222

    2323
    declare module "fs" {
    24-
    >"fs" : typeof "fs"
    24+
    >"fs" : typeof import("fs")
    2525

    2626
    export function readFileSync(s: string): string;
    2727
    >readFileSync : (s: string) => string

    tests/baselines/reference/augmentExportEquals1_1.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -10,7 +10,7 @@ let a: x.A; // should not work
    1010

    1111
    === tests/cases/compiler/file1.d.ts ===
    1212
    declare module "file1" {
    13-
    >"file1" : typeof "file1"
    13+
    >"file1" : typeof import("file1")
    1414

    1515
    var x: number;
    1616
    >x : number

    tests/baselines/reference/augmentExportEquals2_1.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -10,7 +10,7 @@ let a: x.A; // should not work
    1010

    1111
    === tests/cases/compiler/file1.d.ts ===
    1212
    declare module "file1" {
    13-
    >"file1" : typeof "file1"
    13+
    >"file1" : typeof import("file1")
    1414

    1515
    function foo(): void;
    1616
    >foo : () => void

    tests/baselines/reference/augmentExportEquals3_1.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    === tests/cases/compiler/file1.d.ts ===
    22
    declare module "file1" {
    3-
    >"file1" : typeof "file1"
    3+
    >"file1" : typeof import("file1")
    44

    55
    function foo(): void;
    66
    >foo : typeof foo

    tests/baselines/reference/augmentExportEquals4_1.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    === tests/cases/compiler/file1.d.ts ===
    22
    declare module "file1" {
    3-
    >"file1" : typeof "file1"
    3+
    >"file1" : typeof import("file1")
    44

    55
    class foo {}
    66
    >foo : foo

    tests/baselines/reference/augmentExportEquals5.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -13,7 +13,7 @@ declare module Express {
    1313
    }
    1414

    1515
    declare module "express" {
    16-
    >"express" : typeof "express"
    16+
    >"express" : typeof import("express")
    1717

    1818
    function e(): e.Express;
    1919
    >e : typeof e

    tests/baselines/reference/augmentExportEquals6_1.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    === tests/cases/compiler/file1.d.ts ===
    22
    declare module "file1" {
    3-
    >"file1" : typeof "file1"
    3+
    >"file1" : typeof import("file1")
    44

    55
    class foo {}
    66
    >foo : foo

    tests/baselines/reference/augmentExportEquals7.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -13,7 +13,7 @@ import * as lib from "lib";
    1313
    >lib : () => void
    1414

    1515
    declare module "lib" {
    16-
    >"lib" : typeof "lib"
    16+
    >"lib" : typeof import("lib")
    1717

    1818
    export function fn(): void;
    1919
    >fn : () => void

    tests/baselines/reference/bangInModuleName.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@ import * as http from 'intern/dojo/node!http';
    66

    77
    === tests/cases/compiler/a.d.ts ===
    88
    declare module "http" {
    9-
    >"http" : typeof "http"
    9+
    >"http" : typeof import("http")
    1010
    }
    1111

    1212
    declare module 'intern/dojo/node!http' {

    tests/baselines/reference/commonJsUnusedLocals.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@ const x = 0;
    66
    exports.y = 1;
    77
    >exports.y = 1 : 1
    88
    >exports.y : number
    9-
    >exports : typeof "/a"
    9+
    >exports : typeof import("/a")
    1010
    >y : number
    1111
    >1 : 1
    1212

    tests/baselines/reference/commonSourceDirectory.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -20,7 +20,7 @@ export const x = 0;
    2020

    2121
    === /types/bar.d.ts ===
    2222
    declare module "bar" {
    23-
    >"bar" : typeof "bar"
    23+
    >"bar" : typeof import("bar")
    2424

    2525
    export const y = 0;
    2626
    >y : 0

    tests/baselines/reference/commonjsAccessExports.types

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -2,13 +2,13 @@
    22
    exports.x = 0;
    33
    >exports.x = 0 : 0
    44
    >exports.x : number
    5-
    >exports : typeof "/a"
    5+
    >exports : typeof import("/a")
    66
    >x : number
    77
    >0 : 0
    88

    99
    exports.x;
    1010
    >exports.x : number
    11-
    >exports : typeof "/a"
    11+
    >exports : typeof import("/a")
    1212
    >x : number
    1313

    1414
    // Works nested
    @@ -17,7 +17,7 @@ exports.x;
    1717
    exports.Cls = function() {
    1818
    >exports.Cls = function() { this.x = 0; } : () => void
    1919
    >exports.Cls : () => void
    20-
    >exports : typeof "/a"
    20+
    >exports : typeof import("/a")
    2121
    >Cls : () => void
    2222
    >function() { this.x = 0; } : () => void
    2323

    @@ -34,6 +34,6 @@ const instance = new exports.Cls();
    3434
    >instance : { x: number; }
    3535
    >new exports.Cls() : { x: number; }
    3636
    >exports.Cls : () => void
    37-
    >exports : typeof "/a"
    37+
    >exports : typeof import("/a")
    3838
    >Cls : () => void
    3939

    tests/baselines/reference/complexRecursiveCollections.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -3804,7 +3804,7 @@ declare module Immutable {
    38043804
    }
    38053805
    }
    38063806
    declare module "immutable" {
    3807-
    >"immutable" : typeof "immutable"
    3807+
    >"immutable" : typeof import("immutable")
    38083808

    38093809
    export = Immutable
    38103810
    >Immutable : typeof Immutable

    tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    === tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts ===
    22
    declare module "fs" {
    3-
    >"fs" : typeof "fs"
    3+
    >"fs" : typeof import("fs")
    44

    55
    export class File {
    66
    >File : File

    tests/baselines/reference/cyclicModuleImport.types

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    === tests/cases/compiler/cyclicModuleImport.ts ===
    22
    declare module "SubModule" {
    3-
    >"SubModule" : typeof "SubModule"
    3+
    >"SubModule" : typeof import("SubModule")
    44

    55
    import MainModule = require('MainModule');
    66
    >MainModule : typeof MainModule
    @@ -24,7 +24,7 @@ declare module "SubModule" {
    2424
    >SubModule : SubModule
    2525
    }
    2626
    declare module "MainModule" {
    27-
    >"MainModule" : typeof "MainModule"
    27+
    >"MainModule" : typeof import("MainModule")
    2828

    2929
    import SubModule = require('SubModule');
    3030
    >SubModule : typeof SubModule

    tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    === tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts ===
    22
    declare module "test" {
    3-
    >"test" : typeof "test"
    3+
    >"test" : typeof import("test")
    44

    55
    module A {
    66
    >A : typeof A

    0 commit comments

    Comments
     (0)
    0