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

feat(@angular/cli): update tslint on updating prefix #5908

Merged
merged 2 commits into from
May 4, 2017
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/@angular/cli/blueprints/component/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as chalk from 'chalk';
import * as fs from 'fs';
import * as path from 'path';
import { oneLine } from 'common-tags';
import { NodeHost } from '../../lib/ast-tools';
import { CliConfig } from '../../models/config';
import { getAppFromConfig } from '../../utilities/app-utils';
Expand Down Expand Up @@ -218,6 +219,12 @@ export default Blueprint.extend({
},

afterInstall: function (options: any) {
const appConfig = getAppFromConfig(this.options.app);
if (options.prefix && appConfig.prefix && appConfig.prefix !== options.prefix) {
console.log(chalk.yellow(oneLine`You are using different prefix from app,
you might get lint errors. Please update "tslint.json" accordingly.`));
}

const returns: Array<any> = [];
const className = stringUtils.classify(`${options.entity.name}Component`);
const fileName = stringUtils.dasherize(`${options.entity.name}.component`);
Expand Down
7 changes: 7 additions & 0 deletions packages/@angular/cli/blueprints/directive/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as chalk from 'chalk';
import * as path from 'path';
import { oneLine } from 'common-tags';
import { NodeHost } from '../../lib/ast-tools';
import { CliConfig } from '../../models/config';
import { getAppFromConfig } from '../../utilities/app-utils';
Expand Down Expand Up @@ -130,6 +131,12 @@ export default Blueprint.extend({
},

afterInstall: function (options: any) {
const appConfig = getAppFromConfig(this.options.app);
if (options.prefix && appConfig.prefix && appConfig.prefix !== options.prefix) {
console.log(chalk.yellow(oneLine`You are using different prefix from app,
you might get lint errors. Please update "tslint.json" accordingly.`));
}

const returns: Array<any> = [];
const className = stringUtils.classify(`${options.entity.name}Directive`);
const fileName = stringUtils.dasherize(`${options.entity.name}.directive`);
Expand Down
31 changes: 29 additions & 2 deletions packages/@angular/cli/commands/set.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import {CliConfig} from '../models/config';
import * as fs from 'fs';
import { CliConfig } from '../models/config';
import { oneLine } from 'common-tags';

const SilentError = require('silent-error');
const chalk = require('chalk');
const Command = require('../ember-cli/lib/models/command');


export interface SetOptions {
global?: boolean;
}
Expand Down Expand Up @@ -67,13 +69,38 @@ const SetCommand = Command.extend({
default: value = parseValue(rawValue, jsonPath);
}

if (jsonPath.indexOf('prefix') > 0) {
// update tslint if prefix is updated
updateLintForPrefix(this.project.root + '/tslint.json', value);
}

config.set(jsonPath, value);
config.save();
resolve();
});
}
});

function updateLintForPrefix(filePath: string, prefix: string): void {
const tsLint = JSON.parse(fs.readFileSync(filePath, 'utf8'));
const componentLint = tsLint.rules['component-selector'][2];
if (componentLint instanceof Array) {
tsLint.rules['component-selector'][2].push(prefix);
} else {
tsLint.rules['component-selector'][2] = prefix;
}

const directiveLint = tsLint.rules['directive-selector'][2];
if (directiveLint instanceof Array) {
tsLint.rules['directive-selector'][2].push(prefix);
} else {
tsLint.rules['directive-selector'][2] = prefix;
}
fs.writeFileSync(filePath, JSON.stringify(tsLint, null, 2));
console.log(chalk.yellow(oneLine`we have updated tslint to match prefix,
you may want to fix linting errors.`));
}

function parseValue(rawValue: string, path: string) {
try {
return JSON.parse(rawValue);
Expand Down
21 changes: 21 additions & 0 deletions tests/e2e/tests/commands/set/set-prefix.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import {ng} from '../../../utils/process';
import {expectToFail} from '../../../utils/utils';
import * as fs from 'fs';

export default function() {
return Promise.resolve()
.then(() => expectToFail(() => ng('set', 'apps.zzz.prefix')))
.then(() => ng('set', 'apps.0.prefix' , 'new-prefix'))
.then(() => ng('get', 'apps.0.prefix'))
.then(({ stdout }) => {
if (!stdout.match(/new-prefix/)) {
throw new Error(`Expected "new-prefix", received "${JSON.stringify(stdout)}".`);
}
})
.then(() => {
const tsLint = JSON.parse(fs.readFileSync(process.cwd() + '/tslint.json', 'utf8'));
if (tsLint.rules['component-selector'][2] !== 'new-prefix') {
throw new Error(`Expected "new-prefix" Found: ${tsLint.rules['component-selector'][2]}.`);
}
});
}