use import types in nodebuilder for typeof module symbols

microsoft · Mar 23, 2018 · 850bbe0 · 850bbe0
1 parent 0be6ce4
commit 850bbe0
Show file tree

Hide file tree

Showing 224 changed files with 980 additions and 980 deletions.
diff --git a/tests/baselines/reference/aliasAssignments.errors.txt b/tests/baselines/reference/aliasAssignments.errors.txt
@@ -1,17 +1,17 @@
-tests/cases/compiler/aliasAssignments_1.ts(3,1): error TS2322: Type '1' is not assignable to type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"'.
-tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"' is not assignable to type 'number'.
+tests/cases/compiler/aliasAssignments_1.ts(3,1): error TS2322: Type '1' is not assignable to type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")'.
+tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/aliasAssignments_1.ts (2 errors) ====
     import moduleA = require("./aliasAssignments_moduleA");
     var x = moduleA;
     x = 1; // Should be error
     ~
-!!! error TS2322: Type '1' is not assignable to type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"'.
+!!! error TS2322: Type '1' is not assignable to type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")'.
     var y = 1;
     y = moduleA; // should be error
     ~
-!!! error TS2322: Type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"' is not assignable to type 'number'.
+!!! error TS2322: Type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")' is not assignable to type 'number'.
 
 ==== tests/cases/compiler/aliasAssignments_moduleA.ts (0 errors) ====
     export class someClass {

diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.types b/tests/baselines/reference/aliasOnMergedModuleInterface.types
@@ -26,7 +26,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 
 === tests/cases/compiler/aliasOnMergedModuleInterface_0.ts ===
 declare module "foo"
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 {
     module B {
 >B : any

diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports10.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/a.ts(2,5): error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
-tests/cases/compiler/a.ts(3,5): error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
+tests/cases/compiler/a.ts(2,5): error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
+tests/cases/compiler/a.ts(3,5): error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
 
 
 ==== tests/cases/compiler/a.ts (2 errors) ====
     import Foo = require("./b");
     Foo.default.bar();
         ~~~~~~~
-!!! error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
+!!! error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
     Foo.default.default.foo();
         ~~~~~~~
-!!! error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
+!!! error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
 ==== tests/cases/compiler/b.d.ts (0 errors) ====
     export function foo();
 

diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.types b/tests/baselines/reference/ambientDeclarationsPatterns.types
@@ -28,30 +28,30 @@ foo(fileText);
 
 === tests/cases/conformance/ambient/declarations.d.ts ===
 declare module "foo*baz" {
->"foo*baz" : typeof "foo*baz"
+>"foo*baz" : typeof import("foo*baz")
 
     export function foo(s: string): void;
 >foo : (s: string) => void
 >s : string
 }
 // Augmentations still work
 declare module "foo*baz" {
->"foo*baz" : typeof "foo*baz"
+>"foo*baz" : typeof import("foo*baz")
 
     export const baz: string;
 >baz : string
 }
 
 // Longest prefix wins
 declare module "foos*" {
->"foos*" : typeof "foos*"
+>"foos*" : typeof import("foos*")
 
     export const foos: string;
 >foos : string
 }
 
 declare module "*!text" {
->"*!text" : typeof "*!text"
+>"*!text" : typeof import("*!text")
 
     const x: string;
 >x : string

diff --git a/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types b/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts ===
 declare module "too*many*asterisks" { }
->"too*many*asterisks" : typeof "too*many*asterisks"
+>"too*many*asterisks" : typeof import("too*many*asterisks")
 
diff --git a/tests/baselines/reference/ambientExportDefaultErrors.types b/tests/baselines/reference/ambientExportDefaultErrors.types
@@ -12,7 +12,7 @@ export default 2 + 2;
 >2 : 2
 
 export as namespace Foo;
->Foo : typeof "tests/cases/compiler/foo"
+>Foo : typeof import("tests/cases/compiler/foo")
 
 === tests/cases/compiler/foo2.d.ts ===
 export = 2 + 2;
@@ -26,7 +26,7 @@ export as namespace Foo2;
 === tests/cases/compiler/indirection.d.ts ===
 /// <reference path="./foo.d.ts" />
 declare module "indirect" {
->"indirect" : typeof "indirect"
+>"indirect" : typeof import("indirect")
 
     export default typeof Foo.default;
 >typeof Foo.default : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
@@ -38,7 +38,7 @@ declare module "indirect" {
 === tests/cases/compiler/indirection2.d.ts ===
 /// <reference path="./foo2.d.ts" />
 declare module "indirect2" {
->"indirect2" : typeof "indirect2"
+>"indirect2" : typeof import("indirect2")
 
     export = typeof Foo2;
 >typeof Foo2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"

diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types
@@ -6,7 +6,7 @@ export = D;
 >D : D
 
 declare module "ext" {
->"ext" : typeof "ext"
+>"ext" : typeof import("ext")
 
     export class C { }
 >C : C

diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
@@ -3,5 +3,5 @@ module M {
 >M : any
 
     export declare module "M" { }
->"M" : typeof "M"
+>"M" : typeof import("M")
 }
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.types b/tests/baselines/reference/ambientExternalModuleMerging.types
@@ -17,15 +17,15 @@ var y = M.y;
 
 === tests/cases/conformance/ambient/ambientExternalModuleMerging_declare.ts ===
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     export var x: string;
 >x : string
 }
 
 // Merge
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     export var y: string;
 >y : string

diff --git a/tests/baselines/reference/ambientExternalModuleReopen.types b/tests/baselines/reference/ambientExternalModuleReopen.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/ambientExternalModuleReopen.ts ===
 declare module "fs" {
->"fs" : typeof "fs"
+>"fs" : typeof import("fs")
 
     var x: string;
 >x : string
 }
 declare module 'fs' {
->'fs' : typeof "fs"
+>'fs' : typeof import("fs")
 
     var y: number;
 >y : number

diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts ===
 declare module "OuterModule" {
->"OuterModule" : typeof "OuterModule"
+>"OuterModule" : typeof import("OuterModule")
 
     import m2 = require("./SubModule");
 >m2 : any

diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts ===
 declare module "./relativeModule" {
->"./relativeModule" : typeof "./relativeModule"
+>"./relativeModule" : typeof import("./relativeModule")
 
     var x: string;
 >x : string
 }
 
 declare module ".\\relativeModule" {
->".\\relativeModule" : typeof ".\\relativeModule"
+>".\\relativeModule" : typeof import(".\\\\relativeModule")
 
     var x: string;
 >x : string

diff --git a/tests/baselines/reference/ambientRequireFunction.types b/tests/baselines/reference/ambientRequireFunction.types
@@ -2,16 +2,16 @@
 /// <reference path="node.d.ts"/>
 
 const fs = require("fs");
->fs : typeof "fs"
->require("fs") : typeof "fs"
+>fs : typeof import("fs")
+>require("fs") : typeof import("fs")
 >require : (moduleName: string) => any
 >"fs" : "fs"
 
 const text = fs.readFileSync("/a/b/c");
 >text : string
 >fs.readFileSync("/a/b/c") : string
 >fs.readFileSync : (s: string) => string
->fs : typeof "fs"
+>fs : typeof import("fs")
 >readFileSync : (s: string) => string
 >"/a/b/c" : "/a/b/c"
 
@@ -21,7 +21,7 @@ declare function require(moduleName: string): any;
 >moduleName : string
 
 declare module "fs" {
->"fs" : typeof "fs"
+>"fs" : typeof import("fs")
 
     export function readFileSync(s: string): string;
 >readFileSync : (s: string) => string

diff --git a/tests/baselines/reference/augmentExportEquals1_1.types b/tests/baselines/reference/augmentExportEquals1_1.types
@@ -10,7 +10,7 @@ let a: x.A; // should not work
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     var x: number;
 >x : number

diff --git a/tests/baselines/reference/augmentExportEquals2_1.types b/tests/baselines/reference/augmentExportEquals2_1.types
@@ -10,7 +10,7 @@ let a: x.A; // should not work
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     function foo(): void;
 >foo : () => void

diff --git a/tests/baselines/reference/augmentExportEquals3_1.types b/tests/baselines/reference/augmentExportEquals3_1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     function foo(): void;
 >foo : typeof foo

diff --git a/tests/baselines/reference/augmentExportEquals4_1.types b/tests/baselines/reference/augmentExportEquals4_1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     class foo {}
 >foo : foo

diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types
@@ -13,7 +13,7 @@ declare module Express {
 }
 
 declare module "express" {
->"express" : typeof "express"
+>"express" : typeof import("express")
 
     function e(): e.Express;
 >e : typeof e

diff --git a/tests/baselines/reference/augmentExportEquals6_1.types b/tests/baselines/reference/augmentExportEquals6_1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     class foo {}
 >foo : foo

diff --git a/tests/baselines/reference/augmentExportEquals7.types b/tests/baselines/reference/augmentExportEquals7.types
@@ -13,7 +13,7 @@ import * as lib from "lib";
 >lib : () => void
 
 declare module "lib" {
->"lib" : typeof "lib"
+>"lib" : typeof import("lib")
 
     export function fn(): void;
 >fn : () => void

diff --git a/tests/baselines/reference/bangInModuleName.types b/tests/baselines/reference/bangInModuleName.types
@@ -6,7 +6,7 @@ import * as http from 'intern/dojo/node!http';
 
 === tests/cases/compiler/a.d.ts ===
 declare module "http" {
->"http" : typeof "http"
+>"http" : typeof import("http")
 }
 
 declare module 'intern/dojo/node!http' {

diff --git a/tests/baselines/reference/commonJsUnusedLocals.types b/tests/baselines/reference/commonJsUnusedLocals.types
@@ -6,7 +6,7 @@ const x = 0;
 exports.y = 1;
 >exports.y = 1 : 1
 >exports.y : number
->exports : typeof "/a"
+>exports : typeof import("/a")
 >y : number
 >1 : 1
 
diff --git a/tests/baselines/reference/commonSourceDirectory.types b/tests/baselines/reference/commonSourceDirectory.types
@@ -20,7 +20,7 @@ export const x = 0;
 
 === /types/bar.d.ts ===
 declare module "bar" {
->"bar" : typeof "bar"
+>"bar" : typeof import("bar")
 
     export const y = 0;
 >y : 0

diff --git a/tests/baselines/reference/commonjsAccessExports.types b/tests/baselines/reference/commonjsAccessExports.types
@@ -2,13 +2,13 @@
 exports.x = 0;
 >exports.x = 0 : 0
 >exports.x : number
->exports : typeof "/a"
+>exports : typeof import("/a")
 >x : number
 >0 : 0
 
 exports.x;
 >exports.x : number
->exports : typeof "/a"
+>exports : typeof import("/a")
 >x : number
 
 // Works nested
@@ -17,7 +17,7 @@ exports.x;
     exports.Cls = function() {
 >exports.Cls = function() {        this.x = 0;    } : () => void
 >exports.Cls : () => void
->exports : typeof "/a"
+>exports : typeof import("/a")
 >Cls : () => void
 >function() {        this.x = 0;    } : () => void
 
@@ -34,6 +34,6 @@ const instance = new exports.Cls();
 >instance : { x: number; }
 >new exports.Cls() : { x: number; }
 >exports.Cls : () => void
->exports : typeof "/a"
+>exports : typeof import("/a")
 >Cls : () => void
 
diff --git a/tests/baselines/reference/complexRecursiveCollections.types b/tests/baselines/reference/complexRecursiveCollections.types
@@ -3804,7 +3804,7 @@ declare module Immutable {
   }
 }
 declare module "immutable" {
->"immutable" : typeof "immutable"
+>"immutable" : typeof import("immutable")
 
   export = Immutable
 >Immutable : typeof Immutable

diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts ===
 declare module "fs" {
->"fs" : typeof "fs"
+>"fs" : typeof import("fs")
 
     export class File {
 >File : File

diff --git a/tests/baselines/reference/cyclicModuleImport.types b/tests/baselines/reference/cyclicModuleImport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/cyclicModuleImport.ts ===
 declare module "SubModule" {
->"SubModule" : typeof "SubModule"
+>"SubModule" : typeof import("SubModule")
 
     import MainModule = require('MainModule');
 >MainModule : typeof MainModule
@@ -24,7 +24,7 @@ declare module "SubModule" {
 >SubModule : SubModule
 }
 declare module "MainModule" {
->"MainModule" : typeof "MainModule"
+>"MainModule" : typeof import("MainModule")
 
     import SubModule = require('SubModule');
 >SubModule : typeof SubModule

diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts ===
 declare module "test" {
->"test" : typeof "test"
+>"test" : typeof import("test")
 
     module A {
 >A : typeof A

diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
@@ -13,7 +13,7 @@ export var x: SubModule.m.m3.c;
 
 === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.ts ===
 declare module "SubModule" {
->"SubModule" : typeof "SubModule"
+>"SubModule" : typeof import("SubModule")
 
     export module m {
 >m : any