Skip to content

fix: Do not show Errors from reading directories #1717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/adapters/fileSystem.stub.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { FileSystem } from "../adapters/fileSystem";
import { fn } from "../fn";

export const createStubFileSystem = ({ data = {}, exists = true } = {}) => ({
export const createStubFileSystem = ({ data = {}, exists = true, isDir = false } = {}) => ({
fileExists: async () => exists,
directoryExists: async () => exists && isDir,
readFile: async () => data,
writeFile: fn<FileSystem["writeFile"]>(),
});
5 changes: 3 additions & 2 deletions src/adapters/fileSystem.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export type FileSystem = {
fileExists: (filePath: string) => Promise<boolean>;
readFile: (filePath: string) => Promise<Error | string>;
writeFile: (filePath: string, contents: string) => Promise<Error | undefined>;
directoryExists: (filePath: string) => Promise<boolean>;
readFile: (filePath: string) => Promise<NodeJS.ErrnoException | string>;
writeFile: (filePath: string, contents: string) => Promise<NodeJS.ErrnoException | undefined>;
};
8 changes: 8 additions & 0 deletions src/adapters/fsFileSystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ export const fsFileSystem: FileSystem = {
return false;
}
},
directoryExists: async (filePath: string) => {
try {
const stat = await fs.promises.stat(filePath);
return stat.isDirectory();
} catch (error) {
return false;
}
},
readFile: async (filePath: string) => {
try {
return (await fs.promises.readFile(filePath)).toString();
Expand Down
1 change: 1 addition & 0 deletions src/api/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export const findOriginalConfigurationsDependencies: FindOriginalConfigurationsD

export const collectCommentFileNamesDependencies: CollectCommentFileNamesDependencies = {
findTypeScriptConfiguration: bind(findTypeScriptConfiguration, findConfigurationDependencies),
fileSystem: fsFileSystem,
};

export const extractGlobPathsDependencies: ExtractGlobPathsDependencies = {
Expand Down
35 changes: 29 additions & 6 deletions src/comments/collectCommentFileNames.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { describe, expect, it } from "@jest/globals";

import { createStubFileSystem } from "../adapters/fileSystem.stub";
import { fsFileSystem as fileSystem } from "../adapters/fsFileSystem";
import { collectCommentFileNames } from "./collectCommentFileNames";

const stubFoundConfiguration = {
Expand All @@ -10,7 +12,10 @@ describe("collectCommentFileNames", () => {
it("returns an error result when filePathGlobs is true and typescriptConfiguration is undefined", async () => {
const findTypeScriptConfiguration = async () => stubFoundConfiguration;

const result = await collectCommentFileNames({ findTypeScriptConfiguration }, true);
const result = await collectCommentFileNames(
{ findTypeScriptConfiguration, fileSystem },
true,
);

expect(result).toEqual(expect.any(Error));
});
Expand All @@ -22,7 +27,7 @@ describe("collectCommentFileNames", () => {
};

const result = await collectCommentFileNames(
{ findTypeScriptConfiguration },
{ findTypeScriptConfiguration, fileSystem },
true,
typescriptConfiguration,
);
Expand All @@ -35,7 +40,7 @@ describe("collectCommentFileNames", () => {
const filePathGlobs = ["a.ts"];

const result = await collectCommentFileNames(
{ findTypeScriptConfiguration },
{ findTypeScriptConfiguration, fileSystem },
filePathGlobs,
);

Expand All @@ -51,7 +56,7 @@ describe("collectCommentFileNames", () => {
const filePathGlobs = "a.ts";

const result = await collectCommentFileNames(
{ findTypeScriptConfiguration },
{ findTypeScriptConfiguration, fileSystem },
filePathGlobs,
);

Expand All @@ -65,7 +70,7 @@ describe("collectCommentFileNames", () => {
const findTypeScriptConfiguration = async () => error;

const result = await collectCommentFileNames(
{ findTypeScriptConfiguration },
{ findTypeScriptConfiguration, fileSystem },
"tsconfig.json",
);

Expand All @@ -76,12 +81,30 @@ describe("collectCommentFileNames", () => {
const findTypeScriptConfiguration = async () => stubFoundConfiguration;

const result = await collectCommentFileNames(
{ findTypeScriptConfiguration },
{ findTypeScriptConfiguration, fileSystem },
"tsconfig.json",
);

expect(result).toEqual({
include: ["a.ts"],
});
});

it("returns only files when filePathGlobs includes directories", async () => {
const findTypeScriptConfiguration = async () => ({
include: ["directory"],
});

const result = await collectCommentFileNames(
{
findTypeScriptConfiguration,
fileSystem: createStubFileSystem({ isDir: true }),
},
"tsconfig.json",
);

expect(result).toEqual({
include: [],
});
});
});
25 changes: 21 additions & 4 deletions src/comments/collectCommentFileNames.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { FileSystem } from "../adapters/fileSystem";
import { SansDependencies } from "../binding";
import {
findTypeScriptConfiguration,
Expand All @@ -7,6 +8,7 @@ import { uniqueFromSources } from "../utils";

export type CollectCommentFileNamesDependencies = {
findTypeScriptConfiguration: SansDependencies<typeof findTypeScriptConfiguration>;
fileSystem: Pick<FileSystem, "directoryExists">;
};

export type CommentFileNames = {
Expand All @@ -26,12 +28,27 @@ export const collectCommentFileNames = async (
);
}

const includeList = uniqueFromSources(
typescriptConfiguration.files,
typescriptConfiguration.include,
);

// Remove directories specified in the include list. Ignore
// Errors as they'll be handled when reading the file.
const includeListFiles = (
await Promise.all(includeList.map(dependencies.fileSystem.directoryExists))
)
.map((isDirectory, i) => {
if (isDirectory) {
return null;
}
return includeList[i];
})
Comment on lines +41 to +46
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: could one-line this if you really wanted 😄

Suggested change
.map((isDirectory, i) => {
if (isDirectory) {
return null;
}
return includeList[i];
})
.map((isDirectory, i) => !isDirectory && includeList[i])

.filter((item): item is string => typeof item === "string");

return {
exclude: typescriptConfiguration.exclude,
include: uniqueFromSources(
typescriptConfiguration.files,
typescriptConfiguration.include,
),
include: includeListFiles,
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/converters/comments/convertFileComments.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { createStubConverter } from "../lintConfigs/rules/ruleConverter.stubs";
import { convertFileComments, ConvertFileCommentsDependencies } from "./convertFileComments";

const createStubDependencies = (
readFileResult: Error | string,
readFileResult: NodeJS.ErrnoException | string,
): ConvertFileCommentsDependencies => ({
converters: new Map([
["ts-a", createStubConverter(["es-a"])],
Expand Down