@@ -589,7 +589,7 @@ import b = require("./moduleB.ts");
589589 const file1 : File = { name : "/root/folder1/file1.ts" } ;
590590 const file2 : File = { name : "/root/generated/folder1/file2.ts" } ; // load remapped file as module
591591 const file3 : File = { name : "/root/generated/folder2/file3/index.d.ts" } ; // load folder a module
592- const file4Typings : File = { name : "/root/generated/folder2/file4/package.json" , content : JSON . stringify ( { typings : "dist/types.d.ts" } ) } ;
592+ const file4Typings : File = { name : "/root/generated/folder2/file4/package.json" , content : JSON . stringify ( { typings : "dist/types.d.ts" } ) } ;
593593 const file4 : File = { name : "/root/generated/folder2/file4/dist/types.d.ts" } ; // load file pointed by typings
594594 const file5 : File = { name : "/root/someanotherfolder/file5/index.d.ts" } ; // load remapped module from folder
595595 const file6 : File = { name : "/root/node_modules/file6.ts" } ; // fallback to node
@@ -957,7 +957,7 @@ import b = require("./moduleB.ts");
957957 describe ( "Type reference directive resolution: " , ( ) => {
958958 function test ( typesRoot : string , typeDirective : string , primary : boolean , initialFile : File , targetFile : File , ...otherFiles : File [ ] ) {
959959 const host = createModuleResolutionHost ( /*hasDirectoryExists*/ false , ...[ initialFile , targetFile ] . concat ( ...otherFiles ) ) ;
960- const result = resolveTypeReferenceDirective ( typeDirective , initialFile . name , { typeRoots : [ typesRoot ] } , host ) ;
960+ const result = resolveTypeReferenceDirective ( typeDirective , initialFile . name , { typeRoots : [ typesRoot ] } , host ) ;
961961 assert ( result . resolvedTypeReferenceDirective . resolvedFileName !== undefined , "expected type directive to be resolved" ) ;
962962 assert . equal ( result . resolvedTypeReferenceDirective . resolvedFileName , targetFile . name , "unexpected result of type reference resolution" ) ;
963963 assert . equal ( result . resolvedTypeReferenceDirective . primary , primary , "unexpected 'primary' value" ) ;
@@ -972,7 +972,7 @@ import b = require("./moduleB.ts");
972972 {
973973 const f1 = { name : "/root/src/app.ts" } ;
974974 const f2 = { name : "/root/src/types/lib/typings/lib.d.ts" } ;
975- const package = { name : "/root/src/types/lib/package.json" , content : JSON . stringify ( { types : "typings/lib.d.ts" } ) } ;
975+ const package = { name : "/root/src/types/lib/package.json" , content : JSON . stringify ( { types : "typings/lib.d.ts" } ) } ;
976976 test ( /*typesRoot*/ "/root/src/types" , /* typeDirective */ "lib" , /*primary*/ true , f1 , f2 , package ) ;
977977 }
978978 {
@@ -983,7 +983,7 @@ import b = require("./moduleB.ts");
983983 {
984984 const f1 = { name : "/root/src/app.ts" } ;
985985 const f2 = { name : "/root/src/node_modules/lib/typings/lib.d.ts" } ;
986- const package = { name : "/root/src/node_modules/lib/package.json" , content : JSON . stringify ( { types : "typings/lib.d.ts" } ) } ;
986+ const package = { name : "/root/src/node_modules/lib/package.json" , content : JSON . stringify ( { types : "typings/lib.d.ts" } ) } ;
987987 test ( /*typesRoot*/ "/root/src/types" , /* typeDirective */ "lib" , /*primary*/ false , f1 , f2 , package ) ;
988988 }
989989 {
@@ -994,7 +994,7 @@ import b = require("./moduleB.ts");
994994 {
995995 const f1 = { name : "/root/src/app.ts" } ;
996996 const f2 = { name : "/root/src/node_modules/@types/lib/typings/lib.d.ts" } ;
997- const package = { name : "/root/src/node_modules/@types/lib/package.json" , content : JSON . stringify ( { types : "typings/lib.d.ts" } ) } ;
997+ const package = { name : "/root/src/node_modules/@types/lib/package.json" , content : JSON . stringify ( { types : "typings/lib.d.ts" } ) } ;
998998 test ( /*typesRoot*/ "/root/src/types" , /* typeDirective */ "lib" , /*primary*/ false , f1 , f2 , package ) ;
999999 }
10001000 } ) ;
@@ -1012,7 +1012,7 @@ import b = require("./moduleB.ts");
10121012 {
10131013 const f1 = { name : "/root/src/app.ts" } ;
10141014 const f2 = { name : "/root/node_modules/lib/typings/lib.d.ts" } ;
1015- const package = { name : "/root/node_modules/lib/package.json" , content : JSON . stringify ( { typings : "typings/lib.d.ts" } ) } ;
1015+ const package = { name : "/root/node_modules/lib/package.json" , content : JSON . stringify ( { typings : "typings/lib.d.ts" } ) } ;
10161016 test ( /*typesRoot*/ "/root/src/types" , /* typeDirective */ "lib" , /*primary*/ false , f1 , f2 , package ) ;
10171017 }
10181018 {
@@ -1023,7 +1023,7 @@ import b = require("./moduleB.ts");
10231023 {
10241024 const f1 = { name : "/root/src/app.ts" } ;
10251025 const f2 = { name : "/root/node_modules/@types/lib/typings/lib.d.ts" } ;
1026- const package = { name : "/root/node_modules/@types/lib/package.json" , content : JSON . stringify ( { typings : "typings/lib.d.ts" } ) } ;
1026+ const package = { name : "/root/node_modules/@types/lib/package.json" , content : JSON . stringify ( { typings : "typings/lib.d.ts" } ) } ;
10271027 test ( /*typesRoot*/ "/root/src/types" , /* typeDirective */ "lib" , /*primary*/ false , f1 , f2 , package ) ;
10281028 }
10291029 } ) ;
0 commit comments