Skip to content
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

[tslint] lint typescript code #19105

Merged
merged 6 commits into from
May 22, 2018
Merged
Show file tree
Hide file tree
Changes from 5 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
14 changes: 11 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
"debug-break": "node --nolazy --inspect-brk scripts/kibana --dev",
"precommit": "node scripts/precommit_hook",
"karma": "karma start",
"lint": "echo 'use `node scripts/eslint`' && false",
"lintroller": "echo 'use `node scripts/eslint --fix`' && false",
"lint": "echo 'use `node scripts/eslint` and/or `node scripts/tslint`' && false",
"lintroller": "echo 'use `node scripts/eslint --fix` and/or `node scripts/tslint --fix`' && false",
"makelogs": "echo 'use `node scripts/makelogs`' && false",
"mocha": "echo 'use `node scripts/mocha`' && false",
"sterilize": "grunt sterilize",
Expand Down Expand Up @@ -226,7 +226,11 @@
"@kbn/eslint-plugin-license-header": "link:packages/kbn-eslint-plugin-license-header",
"@kbn/plugin-generator": "link:packages/kbn-plugin-generator",
"@kbn/test": "link:packages/kbn-test",
"@types/globby": "^6.1.0",
"@types/eslint": "^4.16.2",
"@types/execa": "^0.9.0",
"@types/getopts": "^2.0.0",
"@types/glob": "^5.0.35",
"@types/listr": "^0.13.0",
"@types/minimatch": "^2.0.29",
"angular-mocks": "1.4.7",
"babel-eslint": "8.1.2",
Expand Down Expand Up @@ -283,6 +287,7 @@
"karma-safari-launcher": "1.0.0",
"leadfoot": "1.7.5",
"license-checker": "^16.0.0",
"listr": "^0.14.1",
"load-grunt-config": "0.19.2",
"makelogs": "^4.0.5",
"marked-text-renderer": "0.1.0",
Expand All @@ -305,6 +310,9 @@
"ts-jest": "^22.4.6",
"ts-loader": "^3.5.0",
"ts-node": "^6.0.3",
"tslint": "^5.10.0",
"tslint-config-prettier": "^1.12.0",
"tslint-plugin-prettier": "^1.3.0",
"typescript": "^2.8.3",
"vinyl-fs": "^3.0.2",
"xml2js": "^0.4.19",
Expand Down
18 changes: 18 additions & 0 deletions packages/kbn-dev-utils/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { Readable } from 'stream';

type LogLevel = 'silent' | 'error' | 'warning' | 'info' | 'debug' | 'verbose';

export class ToolingLog extends Readable {
public verbose(...args: any[]): void;
public debug(...args: any[]): void;
public info(...args: any[]): void;
public success(...args: any[]): void;
public warning(...args: any[]): void;
public error(errOrMsg: string | Error): void;
public write(...args: any[]): void;
public indent(spaces: number): void;
public getLevel(): LogLevel;
public setLevel(level: LogLevel): void;
}

export function createToolingLog(level?: LogLevel): ToolingLog;
6 changes: 6 additions & 0 deletions packages/kbn-dev-utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "../../tsconfig.json",
"include": [
"index.d.ts"
],
}
19 changes: 19 additions & 0 deletions packages/kbn-pm/tslint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
extends: ../../tslint.yaml

rules:
max-classes-per-file: false
interface-name: false
variable-name: false
no-empty: false
object-literal-sort-keys: false
member-ordering: false
no-console: false
only-arrow-functions: false
no-shadowed-variable: false
no-empty-interface: false
ordered-imports: false
interface-over-type-literal: false
prettier: false
prefer-const: false
member-access: false
no-unused-variable: false
14 changes: 14 additions & 0 deletions packages/kbn-system-loader/tslint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
extends: ../../tslint.yaml

rules:
max-classes-per-file: false
interface-name: false
variable-name: false
no-empty: false
object-literal-sort-keys: false
member-ordering: false
member-access: false
ordered-imports: false
interface-over-type-literal: false
array-type: false
prefer-const: false
2 changes: 2 additions & 0 deletions scripts/tslint.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require('../src/babel-register');
require('../src/dev/tslint').runTslintCli();
4 changes: 2 additions & 2 deletions src/dev/eslint/lint_files.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ export function lintFiles(log, files) {
if (report.warningCount > 0) failTypes.push('warning');

if (!failTypes.length) {
log.success('%d files linted successfully', files.length);
log.success('[eslint] %d files linted successfully', files.length);
return;
}

log.error(cli.getFormatter()(report.results));
throw createFailError(`eslint ${failTypes.join(' & ')}`, 1);
throw createFailError(`[eslint] ${failTypes.join(' & ')}`, 1);
}
4 changes: 2 additions & 2 deletions src/dev/eslint/pick_files_to_lint.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ export function pickFilesToLint(log, files) {
const path = file.getRelativePath();

if (cli.isPathIgnored(path)) {
log.warning(`%j ignored by .eslintignore`, file);
log.warning(`[eslint] %j ignored by .eslintignore`, file);
return false;
}

log.debug('linting %j', file);
log.debug('[eslint] linting %j', file);
return true;
});
}
19 changes: 14 additions & 5 deletions src/dev/jest/ts_transform.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { getCacheKey, install, process } from 'ts-jest';
import { JestConfig, TransformOptions } from 'ts-jest/dist/jest-types';

import { transform } from 'typescript';
import { findProjectForAbsolutePath } from '../typescript';
import { getTsProjectForAbsolutePath } from '../typescript';

function extendJestConfigJSON(jestConfigJSON: string, filePath: string) {
const jestConfig = JSON.parse(jestConfigJSON) as JestConfig;
Expand All @@ -15,20 +14,30 @@ function extendJestConfig(jestConfig: JestConfig, filePath: string) {
globals: {
...(jestConfig.globals || {}),
'ts-jest': {
tsConfigFile: findProjectForAbsolutePath(filePath).getTsConfigPath(),
skipBabel: true,
tsConfigFile: getTsProjectForAbsolutePath(filePath).tsConfigPath,
},
},
};
}

module.exports = {
process(src: string, filePath: string, jestConfig: JestConfig, transformOptions: TransformOptions) {
process(
src: string,
filePath: string,
jestConfig: JestConfig,
transformOptions: TransformOptions
) {
const extendedConfig = extendJestConfig(jestConfig, filePath);
return process(src, filePath, extendedConfig, transformOptions);
},

getCacheKey(src: string, filePath: string, jestConfigJSON: string, transformOptions: TransformOptions) {
getCacheKey(
src: string,
filePath: string,
jestConfigJSON: string,
transformOptions: TransformOptions
) {
const extendedConfigJSON = extendJestConfigJSON(jestConfigJSON, filePath);
return getCacheKey(src, filePath, extendedConfigJSON, transformOptions);
},
Expand Down
1 change: 1 addition & 0 deletions src/dev/precommit_hook/casing_check_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const IGNORE_FILE_GLOBS = [
'**/.*',
'**/{webpackShims,__mocks__}/**/*',
'x-pack/docs/**/*',
'src/dev/tslint/rules/*',
];


Expand Down
1 change: 1 addition & 0 deletions src/dev/run/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export function createFailError(msg: string, exitCode: number): Error;
11 changes: 9 additions & 2 deletions src/dev/run_precommit_hook.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
import { run } from './run';

import { lintFiles, pickFilesToLint } from './eslint';
import * as Eslint from './eslint';
import * as Tslint from './tslint';
import { getFilesForCommit, checkFileCasing } from './precommit_hook';

run(async ({ log }) => {
const files = await getFilesForCommit();
await checkFileCasing(log, files);
await lintFiles(log, pickFilesToLint(log, files));

for (const Linter of [Eslint, Tslint]) {
const filesToLint = Linter.pickFilesToLint(log, files);
if (filesToLint.length > 0) {
await Linter.lintFiles(log, filesToLint);
Copy link
Contributor

Choose a reason for hiding this comment

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

This current implementation doesn't attempt to run tslint at all if there is an error from eslint, so if you have lint failures in both .js and .ts files, you won't know that until you attempt to commit again after fixing the .js files. It should probably run both commands and show the results from each.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, the same is true for file casing issues and eslint. If there are casing issues eslint is never run.

I'll put up a separate PR that updates the precommit hook to clearly log errors from multiple tasks and collect those errors into an appropriate exit code, but I personally think it's out of the scope of this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

Works for me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

}
}
});
3 changes: 3 additions & 0 deletions src/dev/tslint/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export { runTslintCli } from './run_tslint_cli';
export { lintFiles } from './lint_files';
export { pickFilesToLint } from './pick_files_to_lint';
63 changes: 63 additions & 0 deletions src/dev/tslint/lint_files.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { run } from 'tslint/lib/runner';

import { ToolingLog } from '@kbn/dev-utils';
import { File } from '../file';
import { createFailError } from '../run';
import { getTsProjectForAbsolutePath, Project } from '../typescript';

function groupFilesByProject(files: File[]) {
const filesByProject: Map<Project, File[]> = new Map();

files.forEach(file => {
const project = getTsProjectForAbsolutePath(file.getAbsolutePath());
const filesForProject = filesByProject.get(project);

if (!filesForProject) {
filesByProject.set(project, [file]);
} else {
filesForProject.push(file);
}
});

return filesByProject;
}

/**
* Lints a list of files with eslint. eslint reports are written to the log
* and a FailError is thrown when linting errors occur.
*
* @param {ToolingLog} log
* @param {Array<File>} files
* @return {undefined}
*/
export async function lintFiles(log: ToolingLog, files: File[]) {
for (const [project, filesInProject] of groupFilesByProject(files)) {
const exitCode = await run(
{
exclude: [],
files: filesInProject.map(f => f.getAbsolutePath()),
fix: false,
format: 'stylish',
project: project.tsConfigPath,
},
{
log(m: string) {
log.write(m);
},
error(m: string) {
log.error(m);
},
}
);

if (exitCode > 0) {
throw createFailError(`[tslint] failure`, 1);
} else {
log.success(
'[tslint/%s] %d files linted successfully',
project.name,
files.length
);
}
}
}
7 changes: 7 additions & 0 deletions src/dev/tslint/pick_files_to_lint.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { ToolingLog } from '@kbn/dev-utils';

import { File } from '../file';

export function pickFilesToLint(log: ToolingLog, files: File[]) {
return files.filter(file => file.isTypescript());
}
29 changes: 29 additions & 0 deletions src/dev/tslint/rules/requireLicenseHeaderRule.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const Lint = require('tslint');

const FAILURE_STRING = 'File must start with a license header';
const RULE_NAME = 'require-license-header';

exports.Rule = class extends Lint.Rules.AbstractRule {
apply(sourceFile) {
const [headerText] = this.getOptions().ruleArguments;

if (!headerText) {
throw new Error(`${RULE_NAME} requires a single argument containing the header text`);
}

if (sourceFile.text.startsWith(headerText)) {
return [];
}

return [
new Lint.RuleFailure(
sourceFile,
0,
0,
FAILURE_STRING,
RULE_NAME,
new Lint.Replacement(0, 0, `${headerText}\n\n`)
)
];
}
};
69 changes: 69 additions & 0 deletions src/dev/tslint/run_tslint_cli.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { resolve } from 'path';

import { createToolingLog } from '@kbn/dev-utils';
import chalk from 'chalk';
import execa from 'execa';
import getopts from 'getopts';
import Listr from 'listr';

import { Project, PROJECTS } from '../typescript';

class LintFailure {
constructor(public project: Project, public error: execa.ExecaError) {}
}

export function runTslintCli() {
const log = createToolingLog('info');
log.pipe(process.stdout);

const opts = getopts(process.argv.slice(2));

if (!opts.format) {
process.argv.push('--format', 'stylish');
}

const list = new Listr(
PROJECTS.filter(project => {
if (!opts.project) {
return true;
}

return resolve(opts.project) === project.tsConfigPath;
}).map(project => ({
task: () =>
execa(
'tslint',
[...process.argv.slice(2), '--project', project.tsConfigPath],
{
cwd: project.directory,
env: chalk.enabled ? { FORCE_COLOR: 'true' } : {},
stdio: ['ignore', 'pipe', 'pipe'],
}
).catch(error => {
throw new LintFailure(project, error);
}),
title: project.name,
})),
{
concurrent: true,
exitOnError: false,
}
);

list.run().catch((error: any) => {
if (!error.errors) {
log.error('Unhandled execption!');
log.error(error);
process.exit(1);
}

for (const e of error.errors) {
if (e instanceof LintFailure) {
log.write('');
log.error(`${e.project.name} failed\n${e.error.stdout}`);
} else {
log.error(e);
}
}
});
}
Loading