Skip to content

Commit

Permalink
refactor: use standard node resolution and use async/await instead of…
Browse files Browse the repository at this point in the history 
… rxjs
  • Loading branch information
@alexeagle
Alan Agius authored and alexeagle committed Jun 6, 2019
1 parent 7ef64db commit bebd8b6
Showing 1 changed file with 92 additions and 110 deletions.
202 changes: 92 additions & 110 deletions packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,16 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import { resolve } from '@angular-devkit/core/node';
import * as fs from 'fs';
import * as path from 'path';
import { Observable } from 'rxjs';
import {
Configuration as ConfigurationNS,
Linter as LinterNS,
} from 'tslint'; // tslint:disable-line:no-implicit-dependencies
import * as tsLint from 'tslint'; // tslint:disable-line:no-implicit-dependencies
import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
import { SchematicContext, TaskExecutor } from '../../src';
import { TslintFixTaskOptions } from './options';


type ConfigurationT = typeof ConfigurationNS;
type LinterT = typeof LinterNS;


function _loadConfiguration(
Configuration: ConfigurationT,
Configuration: typeof tsLint.Configuration,
options: TslintFixTaskOptions,
root: string,
file?: string,
Expand Down Expand Up @@ -89,114 +80,105 @@ function _listAllFiles(root: string): string[] {
}


export default function(): TaskExecutor<TslintFixTaskOptions> {
return (options: TslintFixTaskOptions, context: SchematicContext) => {
return new Observable(obs => {
const root = process.cwd();
const tslint = require(resolve('tslint', {
basedir: root,
checkGlobal: true,
checkLocal: true,
}));
const includes = (
Array.isArray(options.includes)
? options.includes
: (options.includes ? [options.includes] : [])
);
const files = (
Array.isArray(options.files)
? options.files
: (options.files ? [options.files] : [])
);

const Linter = tslint.Linter as LinterT;
const Configuration = tslint.Configuration as ConfigurationT;
let program: ts.Program | undefined = undefined;
let filesToLint: string[] = files;
export default function (): TaskExecutor<TslintFixTaskOptions> {
return async (options: TslintFixTaskOptions, context: SchematicContext) => {
const root = process.cwd();
const tslint = await import('tslint'); // tslint:disable-line:no-implicit-dependencies

const includes = (
Array.isArray(options.includes)
? options.includes
: (options.includes ? [options.includes] : [])
);
const files = (
Array.isArray(options.files)
? options.files
: (options.files ? [options.files] : [])
);

const Linter = tslint.Linter;
const Configuration = tslint.Configuration;
let program: ts.Program | undefined = undefined;
let filesToLint: string[] = files;

if (options.tsConfigPath && files.length == 0) {
const tsConfigPath = path.join(process.cwd(), options.tsConfigPath);

if (!fs.existsSync(tsConfigPath)) {
throw new Error('Could not find tsconfig.');
}

if (options.tsConfigPath && files.length == 0) {
const tsConfigPath = path.join(process.cwd(), options.tsConfigPath);
program = Linter.createProgram(tsConfigPath);
filesToLint = Linter.getFileNames(program);
}

if (!fs.existsSync(tsConfigPath)) {
obs.error(new Error('Could not find tsconfig.'));
if (includes.length > 0) {
const allFilesRel = _listAllFiles(root);
const pattern = '^('
+ (includes as string[])
.map(ex => '('
+ ex.split(/[\/\\]/g).map(f => f
.replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
.replace(/^\*\*/g, '(.+?)?')
.replace(/\*/g, '[^/\\\\]*'))
.join('[\/\\\\]')
+ ')')
.join('|')
+ ')($|/|\\\\)';
const re = new RegExp(pattern);

filesToLint.push(...allFilesRel
.filter(x => re.test(x))
.map(x => path.join(root, x)),
);
}

return;
}
program = Linter.createProgram(tsConfigPath);
filesToLint = Linter.getFileNames(program);
const lintOptions = {
fix: true,
formatter: options.format || 'prose',
};

const linter = new Linter(lintOptions, program);
// If directory doesn't change, we
let lastDirectory: string | null = null;
let config;

for (const file of filesToLint) {
const dir = path.dirname(file);
if (lastDirectory !== dir) {
lastDirectory = dir;
config = _loadConfiguration(Configuration, options, root, file);
}
const content = _getFileContent(file, options, program);

if (includes.length > 0) {
const allFilesRel = _listAllFiles(root);
const pattern = '^('
+ (includes as string[])
.map(ex => '('
+ ex.split(/[\/\\]/g).map(f => f
.replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
.replace(/^\*\*/g, '(.+?)?')
.replace(/\*/g, '[^/\\\\]*'))
.join('[\/\\\\]')
+ ')')
.join('|')
+ ')($|/|\\\\)';
const re = new RegExp(pattern);

filesToLint.push(...allFilesRel
.filter(x => re.test(x))
.map(x => path.join(root, x)),
);
if (!content) {
continue;
}

const lintOptions = {
fix: true,
formatter: options.format || 'prose',
};

const linter = new Linter(lintOptions, program);
// If directory doesn't change, we
let lastDirectory: string | null = null;
let config;

for (const file of filesToLint) {
const dir = path.dirname(file);
if (lastDirectory !== dir) {
lastDirectory = dir;
config = _loadConfiguration(Configuration, options, root, file);
}
const content = _getFileContent(file, options, program);

if (!content) {
continue;
}

linter.lint(file, content, config);
}
linter.lint(file, content, config);
}

const result = linter.getResult();

// Format and show the results.
if (!options.silent) {
const Formatter = tslint.findFormatter(options.format || 'prose');
if (!Formatter) {
throw new Error(`Invalid lint format "${options.format}".`);
}
const formatter = new Formatter();

// Certain tslint formatters outputs '\n' when there are no failures.
// This will bloat the console when having schematics running refactor tasks.
// see https://github.com/palantir/tslint/issues/4244
const output = (formatter.format(result.failures, result.fixes) || '').trim();
if (output) {
context.logger.info(output);
}
}
const result = linter.getResult();

if (!options.ignoreErrors && result.errorCount > 0) {
obs.error(new Error('Lint errors were found.'));
} else {
obs.next();
obs.complete();
// Format and show the results.
if (!options.silent) {
const Formatter = tslint.findFormatter(options.format || 'prose');
if (!Formatter) {
throw new Error(`Invalid lint format "${options.format}".`);
}
});
const formatter = new Formatter();

// Certain tslint formatters outputs '\n' when there are no failures.
// This will bloat the console when having schematics running refactor tasks.
// see https://github.com/palantir/tslint/issues/4244
const output = (formatter.format(result.failures, result.fixes) || '').trim();
if (output) {
context.logger.info(output);
}
}

if (!options.ignoreErrors && result.errorCount > 0) {
throw new Error('Lint errors were found.');
}
};
}

0 comments on commit bebd8b6

Please sign in to comment.