Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests for unresolved imports from multiple places

Browse Source
This commit is contained in:
Sheetal Nandi
2022-12-09 14:49:26 -08:00
parent 4d127faa25
commit feb3220299
17 changed files with 260633 additions and 11228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/testRunner/unittests/tsbuild/cacheResolutions.ts
+27
View File
@@ -156,6 +156,33 @@ describe("unittests:: tsbuild:: cacheResolutions::", () => {
caption: "modify e/ea/eaa/eaaa/x/y/z/randomFileForImport by adding import",
edit: fs => prependText(fs, "/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface0 } from "pkg0";\n`),
},
{
caption: "modify randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "modify b/randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/b/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "modify c/ca/caa/randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/c/ca/caa/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "modify d/da/daa/daaa/x/y/z/randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/d/da/daa/daaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "modify e/ea/eaa/eaaa/x/y/z/randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "add file for unresolved import",
edit: fs => {
fs.mkdirpSync("/src/project/node_modules/pkg1");
fs.writeFileSync("/src/project/node_modules/pkg1/index.d.ts", getPkgImportContent("Import", 1));
},
},
]
});
});
src/testRunner/unittests/tsbuild/cacheResolutionsHelper.ts
+12
View File
@@ -273,43 +273,55 @@ function getFsMapWithSameResolutionFromMultiplePlaces(): { [path: string]: strin
}),
"/src/project/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/randomFileForImport.ts": getRandomFileContent(),
"/src/project/a/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/b/ba/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/b/randomFileForImport.ts": getRandomFileContent(),
"/src/project/c/ca/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/c/ca/caa/randomFileForImport.ts": getRandomFileContent(),
"/src/project/c/ca/caa/caaa/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/c/cb/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/d/da/daa/daaa/x/y/z/randomFileForImport.ts": getRandomFileContent(),
"/src/project/d/da/daa/daaa/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/d/da/daa/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/d/da/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/e/ea/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/e/ea/eaa/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/e/ea/eaa/eaaa/fileWithImports.ts": Utils.dedent`
import type { ImportInterface0 } from "pkg0";
import type { ImportInterface1 } from "pkg1";
`,
"/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts": getRandomFileContent(),
"/src/project/node_modules/pkg0/index.d.ts": getPkgImportContent("Import", 0),
src/testRunner/unittests/tsbuildWatch/cacheResolutions.ts
+33
View File
@@ -202,6 +202,39 @@ describe("unittests:: tsbuildWatch:: watchMode:: cacheResolutions::", () => {
edit: sys => sys.prependFile("/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface0 } from "pkg0";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify b/randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/b/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify c/ca/caa/randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/c/ca/caa/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify d/da/daa/daaa/x/y/z/randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/d/da/daa/daaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify e/ea/eaa/eaaa/x/y/z/randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "add file for unresolved import and random edit",
edit: sys => {
sys.ensureFileOrFolder({ path: "/src/project/node_modules/pkg1/index.d.ts", content: getPkgImportContent("Import", 1) });
sys.appendFile("/src/project/randomFileForImport.ts", `export const y = 10;`);
},
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
]
});
}
src/testRunner/unittests/tsc/cacheResolutions.ts
+27
View File
@@ -252,6 +252,33 @@ describe("unittests:: tsc:: cacheResolutions::", () => {
caption: "modify e/ea/eaa/eaaa/x/y/z/randomFileForImport by adding import",
edit: fs => prependText(fs, "/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface0 } from "pkg0";\n`),
},
{
caption: "modify randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "modify b/randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/b/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "modify c/ca/caa/randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/c/ca/caa/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "modify d/da/daa/daaa/x/y/z/randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/d/da/daa/daaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "modify e/ea/eaa/eaaa/x/y/z/randomFileForImport by adding unresolved import",
edit: fs => prependText(fs, "/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
},
{
caption: "add file for unresolved import",
edit: fs => {
fs.mkdirpSync("/src/project/node_modules/pkg1");
fs.writeFileSync("/src/project/node_modules/pkg1/index.d.ts", getPkgImportContent("Import", 1));
},
},
]
});
});
src/testRunner/unittests/tscWatch/cacheResolutions.ts
+36
View File
@@ -212,6 +212,42 @@ describe("unittests:: tsc-watch:: cacheResolutions::", () => {
edit: sys => sys.prependFile("/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface0 } from "pkg0";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify b/randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/b/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify c/ca/caa/randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/c/ca/caa/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify d/da/daa/daaa/x/y/z/randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/d/da/daa/daaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "modify e/ea/eaa/eaaa/x/y/z/randomFileForImport by adding unresolved import",
edit: sys => sys.prependFile("/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts", `import type { ImportInterface1 } from "pkg1";\n`),
timeouts: sys => sys.runQueuedTimeoutCallbacks(),
},
{
caption: "add file for unresolved import and random edit",
edit: sys => {
sys.ensureFileOrFolder({ path: "/src/project/node_modules/pkg1/index.d.ts", content: getPkgImportContent("Import", 1) });
sys.appendFile("/src/project/randomFileForImport.ts", `export const y = 10;`);
},
timeouts: sys => {
sys.runQueuedTimeoutCallbacks(); // Failed lookups
sys.runQueuedTimeoutCallbacks(); // actual update
},
},
]
});
}
src/testRunner/unittests/tsserver/cacheResolutions.ts
+76
View File
@@ -292,6 +292,82 @@ describe("unittests:: tsserver:: cacheResolutions:: tsserverProjectSystem cachin
});
ts.server.updateProjectIfDirty(session.getProjectService().configuredProjects.get("/src/project/tsconfig.json")!);
session.logger.info("modify randomFileForImport by adding unresolved import");
session.executeCommandSeq<ts.server.protocol.ChangeRequest>({
command: ts.server.protocol.CommandTypes.Change,
arguments: {
file: "/src/project/randomFileForImport.ts",
line: 1,
offset: 1,
endLine: 1,
endOffset: 1,
insertString: `import type { ImportInterface1 } from "pkg1";\n`,
}
});
ts.server.updateProjectIfDirty(session.getProjectService().configuredProjects.get("/src/project/tsconfig.json")!);
session.logger.info("modify b/randomFileForImport by adding unresolved import");
session.executeCommandSeq<ts.server.protocol.ChangeRequest>({
command: ts.server.protocol.CommandTypes.Change,
arguments: {
file: "/src/project/b/randomFileForImport.ts",
line: 1,
offset: 1,
endLine: 1,
endOffset: 1,
insertString: `import type { ImportInterface1 } from "pkg1";\n`,
}
});
ts.server.updateProjectIfDirty(session.getProjectService().configuredProjects.get("/src/project/tsconfig.json")!);
session.logger.info("modify c/ca/caa/randomFileForImport by adding unresolved import");
session.executeCommandSeq<ts.server.protocol.ChangeRequest>({
command: ts.server.protocol.CommandTypes.Change,
arguments: {
file: "/src/project/c/ca/caa/randomFileForImport.ts",
line: 1,
offset: 1,
endLine: 1,
endOffset: 1,
insertString: `import type { ImportInterface1 } from "pkg1";\n`,
}
});
ts.server.updateProjectIfDirty(session.getProjectService().configuredProjects.get("/src/project/tsconfig.json")!);
session.logger.info("modify d/da/daa/daaa/x/y/z/randomFileForImport by adding unresolved import");
session.executeCommandSeq<ts.server.protocol.ChangeRequest>({
command: ts.server.protocol.CommandTypes.Change,
arguments: {
file: "/src/project/d/da/daa/daaa/x/y/z/randomFileForImport.ts",
line: 1,
offset: 1,
endLine: 1,
endOffset: 1,
insertString: `import type { ImportInterface1 } from "pkg1";\n`,
}
});
ts.server.updateProjectIfDirty(session.getProjectService().configuredProjects.get("/src/project/tsconfig.json")!);
session.logger.info("modify e/ea/eaa/eaaa/x/y/z/randomFileForImport by adding unresolved import");
session.executeCommandSeq<ts.server.protocol.ChangeRequest>({
command: ts.server.protocol.CommandTypes.Change,
arguments: {
file: "/src/project/e/ea/eaa/eaaa/x/y/z/randomFileForImport.ts",
line: 1,
offset: 1,
endLine: 1,
endOffset: 1,
insertString: `import type { ImportInterface1 } from "pkg1";\n`,
}
});
ts.server.updateProjectIfDirty(session.getProjectService().configuredProjects.get("/src/project/tsconfig.json")!);
session.logger.info("add file for unresolved import and random edit");
host.ensureFileOrFolder({ path: "/src/project/node_modules/pkg1/index.d.ts", content: getPkgImportContent("Import", 1) });
host.appendFile("/src/project/randomFileForImport.ts", `export const y = 10;`);
host.runQueuedTimeoutCallbacks(); // Failed lookups
host.runQueuedTimeoutCallbacks(); // actual update
baselineTsserverLogs("cacheResolutions", scenario, session);
});
}
tests/baselines/reference/tsbuild/cacheResolutions/multiple-places.js
+44156 -3231
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tsbuildWatch/cacheResolutions/multiple-places-already-built.js
+42558 -783
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tsbuildWatch/cacheResolutions/multiple-places-first-pass.js
+3443 -387
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tsbuildWatch/cacheResolutions/multiple-places.js
+45429 -3997
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tsc/cacheResolutions/multiple-places.js
+40557 -234
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tscWatch/cacheResolutions/multiple-places-already-built.js
+38599 -789
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tscWatch/cacheResolutions/multiple-places-first-pass.js
+3486 -318
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tscWatch/cacheResolutions/multiple-places.js
+37303 -234
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tsserver/cacheResolutions/multiple-places-first-pass.js
+496 -338
View File
File diff suppressed because one or more lines are too long
tests/baselines/reference/tsserver/cacheResolutions/multiple-places-not-built.js
+2057 -337
View File
File diff suppressed because it is too large Load Diff
tests/baselines/reference/tsserver/cacheResolutions/multiple-places.js
+2338 -580
View File
File diff suppressed because one or more lines are too long