Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-21 14:02:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use standard node resolution and use async/await instead of rxjs

Browse Source
This commit is contained in:
Alan Agius 2019-05-30 08:39:49 +02:00 committed by Alex Eagle
parent 7ef64dbe46
commit bebd8b6c09
1 changed files with 90 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
View File

@ -5,25 +5,16 @@
* Use of this source code is governed by an MIT-style license that can be * 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 * found in the LICENSE file at https://angular.io/license
*/ */
import { resolve } from '@angular-devkit/core/node';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { Observable } from 'rxjs'; import * as tsLint from 'tslint'; // tslint:disable-line:no-implicit-dependencies
import {
Configuration as ConfigurationNS,
Linter as LinterNS,
} from 'tslint'; // tslint:disable-line:no-implicit-dependencies
import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
import { SchematicContext, TaskExecutor } from '../../src'; import { SchematicContext, TaskExecutor } from '../../src';
import { TslintFixTaskOptions } from './options'; import { TslintFixTaskOptions } from './options';
type ConfigurationT = typeof ConfigurationNS;
type LinterT = typeof LinterNS;
function _loadConfiguration( function _loadConfiguration(
Configuration: ConfigurationT, Configuration: typeof tsLint.Configuration,
options: TslintFixTaskOptions, options: TslintFixTaskOptions,
root: string, root: string,
file?: string, file?: string,
@ -90,14 +81,10 @@ function _listAllFiles(root: string): string[] {
export default function (): TaskExecutor<TslintFixTaskOptions> { export default function (): TaskExecutor<TslintFixTaskOptions> {
return (options: TslintFixTaskOptions, context: SchematicContext) => { return async (options: TslintFixTaskOptions, context: SchematicContext) => {
return new Observable(obs => {
const root = process.cwd(); const root = process.cwd();
const tslint = require(resolve('tslint', { const tslint = await import('tslint'); // tslint:disable-line:no-implicit-dependencies
basedir: root,
checkGlobal: true,
checkLocal: true,
}));
const includes = ( const includes = (
Array.isArray(options.includes) Array.isArray(options.includes)
? options.includes ? options.includes
@ -109,8 +96,8 @@ export default function(): TaskExecutor<TslintFixTaskOptions> {
: (options.files ? [options.files] : []) : (options.files ? [options.files] : [])
); );
const Linter = tslint.Linter as LinterT; const Linter = tslint.Linter;
const Configuration = tslint.Configuration as ConfigurationT; const Configuration = tslint.Configuration;
let program: ts.Program | undefined = undefined; let program: ts.Program | undefined = undefined;
let filesToLint: string[] = files; let filesToLint: string[] = files;
@ -118,10 +105,9 @@ export default function(): TaskExecutor<TslintFixTaskOptions> {
const tsConfigPath = path.join(process.cwd(), options.tsConfigPath); const tsConfigPath = path.join(process.cwd(), options.tsConfigPath);
if (!fs.existsSync(tsConfigPath)) { if (!fs.existsSync(tsConfigPath)) {
obs.error(new Error('Could not find tsconfig.')); throw new Error('Could not find tsconfig.');
return;
} }
program = Linter.createProgram(tsConfigPath); program = Linter.createProgram(tsConfigPath);
filesToLint = Linter.getFileNames(program); filesToLint = Linter.getFileNames(program);
} }
@ -192,11 +178,7 @@ export default function(): TaskExecutor<TslintFixTaskOptions> {
} }
if (!options.ignoreErrors && result.errorCount > 0) { if (!options.ignoreErrors && result.errorCount > 0) {
obs.error(new Error('Lint errors were found.')); throw new Error('Lint errors were found.');
} else {
obs.next();
obs.complete();
} }
});
}; };
} }