review comments

ajafff · ajafff · commit 3469b62be613 · 2018-08-10T22:25:27.000+02:00
diff --git a/src/testRunner/unittests/moduleResolution.ts b/src/testRunner/unittests/moduleResolution.ts
@@ -337,13 +337,11 @@ namespace ts {
             const compilerOptions: CompilerOptions = { moduleResolution: ModuleResolutionKind.NodeJs };
             const cache = createModuleResolutionCache("/", (f) => f);
             let resolution = resolveModuleName("a", "/sub/dir/foo.ts", compilerOptions, host, cache);
-            checkResolvedModule(resolution.resolvedModule, {
-                extension: Extension.Ts,
-                isExternalLibraryImport: true,
-                originalPath: "/sub/node_modules/a/index.ts",
-                packageId: undefined,
-                resolvedFileName: "/modules/a.ts",
-            });
+            checkResolvedModule(resolution.resolvedModule, createResolvedModule("/modules/a.ts", /*isExternalLibraryImport*/ true));
+
+            resolution = resolveModuleName("a", "/sub/foo.ts", compilerOptions, host, cache);
+            checkResolvedModule(resolution.resolvedModule, createResolvedModule("/modules/a.ts", /*isExternalLibraryImport*/ true));
+
             resolution = resolveModuleName("a", "/foo.ts", compilerOptions, host, cache);
             assert.isUndefined(resolution.resolvedModule, "lookup in parent directory doesn't hit the cache");
         });
diff --git a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.errors.txt b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.errors.txt
diff --git a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.types b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.types
@@ -15,9 +15,9 @@ import { BindingKey } from '@loopback/context';
 export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any); // line in question
 >CONTROLLER_CLASS : BindingKey<import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>>
 >BindingKey.create<ControllerClass>(null as any) : BindingKey<import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>>
->BindingKey.create : <T extends any>(ctor: T) => BindingKey<T>
+>BindingKey.create : <T extends import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>>(ctor: T) => BindingKey<T>
 >BindingKey : typeof BindingKey
->create : <T extends any>(ctor: T) => BindingKey<T>
+>create : <T extends import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>>(ctor: T) => BindingKey<T>
 >null as any : any
 >null : null
 
@@ -37,7 +37,7 @@ export class BindingKey<T> {
 >__type : T
 
   static create<T extends Constructor<any>>(ctor: T) {
->create : <T extends any>(ctor: T) => BindingKey<T>
+>create : <T extends Constructor<any>>(ctor: T) => BindingKey<T>
 >ctor : T
 
     return new BindingKey<T>();
diff --git a/tests/cases/compiler/symbolLinkDeclarationEmitModuleNames.ts b/tests/cases/compiler/symbolLinkDeclarationEmitModuleNames.ts
@@ -22,4 +22,4 @@ export class BindingKey<T> {
 export * from "./src/value-promise";
 export * from "./src/bindingkey";
 
-// @link: tests/cases/compiler/monorepo/context -> tests/cases/compiler/monorepo/core/node_modules/@loopback/context
+// @link: tests/cases/compiler/monorepo/context -> tests/cases/compiler/monorepo/node_modules/@loopback/context
