Skip to content
Draft
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
225 changes: 135 additions & 90 deletions src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,15 @@ const formatErrorDiagnostics = (diagnostics: ts.Diagnostic[]) =>
});
const cwd = process.cwd();
const fileParsingDiagnostics: ts.Diagnostic[] = [];
const result = ts.getParsedCommandLineOfConfigFile(
values.project ?? "./tsconfig.json",
undefined,
{

const programs: {
program: ts.Program;
host: { getNewLine: () => string };
configFile: string;
}[] = [];

function addProject(configFile: string) {
const result = ts.getParsedCommandLineOfConfigFile(configFile, undefined, {
onUnRecoverableConfigFileDiagnostic: (diag) => {
fileParsingDiagnostics.push(diag);
},
Expand All @@ -51,118 +56,158 @@ const result = ts.getParsedCommandLineOfConfigFile(
readDirectory: ts.sys.readDirectory,
readFile: (file) => fs.readFileSync(file, "utf-8"),
useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
},
);
if (!result) {
console.log(formatErrorDiagnostics(fileParsingDiagnostics));
process.exit(1);
}
if (result.errors.length) {
console.log(formatErrorDiagnostics(result.errors));
process.exit(1);
});
if (!result) {
console.log(formatErrorDiagnostics(fileParsingDiagnostics));
process.exit(1);
}
if (result.errors.length) {
console.log(formatErrorDiagnostics(result.errors));
process.exit(1);
}
const host = ts.createCompilerHost(result.options, true);
programs.push({
program: ts.createProgram({
rootNames: result.fileNames,
options: result.options,
projectReferences: result.projectReferences,
host,
}),
host,
configFile,
});
if (result.projectReferences !== undefined) {
for (const projectReference of result.projectReferences) {
addProject(projectReference.path);
}
}
}

const host = ts.createCompilerHost(result.options, true);
const program = ts.createProgram({
rootNames: result.fileNames,
options: result.options,
projectReferences: result.projectReferences,
host,
});
addProject(values.project ?? "./tsconfig.json");

const configStart = performance.now();
const { config } = await loadConfig(program);
const { lint, allRules, timingMaps } = await initRules(
() => program,
config ?? { rules: core.all() },
values.timing,
);
if (values.timing) {
console.log(
`Config with ${allRules.size} ${
allRules.size === 1 ? "rule" : "rules"
} loaded in ${displayTiming(performance.now() - configStart)}`,
);
}
let unsued = 1;
let unsued2 = 1;

let diagnostics: TSLDiagnostic[] = [];
if (!values["lint-only"]) {
diagnostics = ts.getPreEmitDiagnostics(program).map((d): TSLDiagnostic => {
const message = ts.flattenDiagnosticMessageText(
d.messageText,
host.getNewLine(),
);
const name = `TS${d.code}`;
if (!d.file) {
return { file: undefined, name, message };
}
return {
file: d.file,
name,
message,
start: d.start!,
length: d.length!,
};
});
let allTimingMaps:
| { Rule: Record<string, number>; File: Record<string, number> }
| undefined;

for (const { program, configFile, host } of programs) {
if (values.timing && programs.length > 1) {
console.log(`Linting ${configFile}`);
}
const configStart = performance.now();
const { config } = await loadConfig(program);
const { lint, allRules, timingMaps } = await initRules(
() => program,
config ?? { rules: core.all() },
values.timing,
);
if (values.timing) {
console.log(`Typecheck: ${displayTiming(performance.now() - start)}`);
console.log(
`Config with ${allRules.size} ${
allRules.size === 1 ? "rule" : "rules"
} loaded in ${displayTiming(performance.now() - configStart)}`,
);
}
}

const lintStart = performance.now();
if (!values["lint-only"]) {
diagnostics = diagnostics.concat(
ts.getPreEmitDiagnostics(program).map((d): TSLDiagnostic => {
const message = ts.flattenDiagnosticMessageText(
d.messageText,
host.getNewLine(),
);
const name = `TS${d.code}`;
if (!d.file) {
return { file: undefined, name, message };
}
return {
file: d.file,
name,
message,
start: d.start!,
length: d.length!,
};
}),
);

const files = program.getSourceFiles();
if (values.timing) {
console.log(`Typecheck: ${displayTiming(performance.now() - start)}`);
}
}

for (const it of files) {
let currentIdx: number | undefined = undefined;
lint(it as unknown as SourceFile, (r) => {
if (currentIdx === undefined) {
const lastTsDiagnostic = diagnostics.findLastIndex((d) => d.file === it);
if (lastTsDiagnostic !== -1) {
currentIdx = lastTsDiagnostic + 1;
const lintStart = performance.now();

const files = program.getSourceFiles();

for (const it of files) {
let currentIdx: number | undefined = undefined;
lint(it as unknown as SourceFile, (r) => {
if (currentIdx === undefined) {
const lastTsDiagnostic = diagnostics.findLastIndex(
(d) => d.file === it,
);
if (lastTsDiagnostic !== -1) {
currentIdx = lastTsDiagnostic + 1;
} else {
const sortIdx = diagnostics.findIndex((d, i) => {
const previousFile = i === 0 ? undefined : diagnostics[i - 1].file;
return (
d.file !== undefined
&& it.fileName < d.file.fileName
&& (previousFile === undefined
|| it.fileName > previousFile.fileName)
);
});
currentIdx = sortIdx === -1 ? diagnostics.length : sortIdx;
}
} else {
const sortIdx = diagnostics.findIndex((d, i) => {
const previousFile = i === 0 ? undefined : diagnostics[i - 1].file;
return (
d.file !== undefined
&& it.fileName < d.file.fileName
&& (previousFile === undefined
|| it.fileName > previousFile.fileName)
);
});
currentIdx = sortIdx === -1 ? diagnostics.length : sortIdx;
currentIdx++;
}
} else {
currentIdx++;
}
diagnostics.splice(currentIdx, 0, {
file: it,
name: r.type === "rule" ? r.rule.name : "tsl-unused-ignore",
message: r.message,
start: "node" in r ? r.node.getStart() : r.start,
length:
"node" in r ? r.node.getEnd() - r.node.getStart() : r.end - r.start,
diagnostics.splice(currentIdx, 0, {
file: it,
name: r.type === "rule" ? r.rule.name : "tsl-unused-ignore",
message: r.message,
start: "node" in r ? r.node.getStart() : r.start,
length:
"node" in r ? r.node.getEnd() - r.node.getStart() : r.end - r.start,
});
});
});
}
}

if (values.timing) {
const lintTime = performance.now() - lintStart;
console.log(`Lint ran in ${displayTiming(lintTime)}`);
if (values.timing) {
const lintTime = performance.now() - lintStart;
console.log(`Lint ran in ${displayTiming(lintTime)}`);
}
if (timingMaps) {
if (!allTimingMaps) {
allTimingMaps = timingMaps;
} else {
for (const key in timingMaps.Rule) {
allTimingMaps.Rule[key] =
(allTimingMaps.Rule[key] ?? 0) + timingMaps.Rule[key];
}
for (const key in timingMaps.File) {
allTimingMaps.File[key] =
(allTimingMaps.File[key] ?? 0) + timingMaps.File[key];
}
}
}
}

if (diagnostics.length > 0) {
console.log(formatDiagnostics(diagnostics));
}

if (timingMaps) {
if (allTimingMaps) {
console.log(
`Total time: ${displayTiming(
performance.now() - globalThis.__type_lint_start,
)}`,
);
for (const [timingName, map] of Object.entries(timingMaps)) {
for (const [timingName, map] of Object.entries(allTimingMaps)) {
const rulesEntries = Object.entries(map)
.map(([key, time]) => ({ key, time }))
.sort((a, b) => b.time - a.time);
Expand Down
2 changes: 2 additions & 0 deletions src/formatDiagnostic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import ts, {
type SourceFile,
} from "typescript";

const a = 2;

export type TSLDiagnostic = {
name: string;
message: string;
Expand Down
1 change: 1 addition & 0 deletions tsconfig.dist.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"include": ["dist"],
"compilerOptions": {
"tsBuildInfoFile": "./node_modules/.cache/tsconfig.dist.tsbuildinfo",
"target": "ES2023",
"module": "nodeNext",
"lib": ["ES2023"],
Expand Down
5 changes: 2 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"include": ["**/*.ts"],
"exclude": ["dist"],
"compilerOptions": {
"tsBuildInfoFile": "./node_modules/.cache/tsconfig.tsbuildinfo",
"target": "ES2022",
"module": "ESNext",
"moduleDetection": "force",
Expand All @@ -22,8 +23,6 @@
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"useUnknownInCatchVariables": true,
"noPropertyAccessFromIndexSignature": true,

"plugins": [{ "name": "dev-plugin" }]
"noPropertyAccessFromIndexSignature": true
}
}
10 changes: 10 additions & 0 deletions tsconfig.solution.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"files": [],
"references": [
{ "path": "./tsconfig.json" },
{ "path": "./tsconfig.dist.json" }
],
"compilerOptions": {
"plugins": [{ "name": "dev-plugin" }]
}
}
Loading