Skip to content

Commit

Permalink
style(): run prettier (format script)
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Nov 4, 2020
1 parent 9c8f69e commit 57be6ed
Show file tree
Hide file tree
Showing 28 changed files with 164 additions and 148 deletions.
6 changes: 3 additions & 3 deletions actions/add.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class AddAction extends AbstractAction {
const configuration = await loadConfiguration();
const configurationProjects = configuration.projects;

const appName = inputs.find(option => option.name === 'project')!
const appName = inputs.find((option) => option.name === 'project')!
.value as string;

let sourceRoot = appName
Expand Down Expand Up @@ -122,7 +122,7 @@ export class AddAction extends AbstractAction {
schematicOptions.push(
new SchematicOption(
'sourceRoot',
options.find(option => option.name === 'sourceRoot')!.value as string,
options.find((option) => option.name === 'sourceRoot')!.value as string,
),
);
const extraFlagsString = extraFlags ? extraFlags.join(' ') : undefined;
Expand All @@ -146,7 +146,7 @@ export class AddAction extends AbstractAction {

private getLibraryName(inputs: Input[]): string {
const libraryInput: Input = inputs.find(
input => input.name === 'library',
(input) => input.name === 'library',
) as Input;

if (!libraryInput) {
Expand Down
11 changes: 6 additions & 5 deletions actions/build.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ export class BuildAction extends AbstractAction {

public async handle(inputs: Input[], options: Input[]) {
try {
const watchModeOption = options.find(option => option.name === 'watch');
const watchModeOption = options.find((option) => option.name === 'watch');
const watchMode = !!(watchModeOption && watchModeOption.value);

const watchAssetsModeOption = options.find(
option => option.name === 'watchAssets',
(option) => option.name === 'watchAssets',
);
const watchAssetsMode = !!(
watchAssetsModeOption && watchAssetsModeOption.value
Expand All @@ -73,10 +73,11 @@ export class BuildAction extends AbstractAction {
isDebugEnabled = false,
onSuccess?: () => void,
) {
const configFileName = options.find(option => option.name === 'config')!
const configFileName = options.find((option) => option.name === 'config')!
.value as string;
const configuration = await this.loader.load(configFileName);
const appName = inputs.find(input => input.name === 'app')!.value as string;
const appName = inputs.find((input) => input.name === 'app')!
.value as string;

const pathToTsconfig = getValueOrDefault<string>(
configuration,
Expand Down Expand Up @@ -136,7 +137,7 @@ export class BuildAction extends AbstractAction {
if (watchMode) {
const tsCompilerOptions: CompilerOptions = {};
const isPreserveWatchOutputEnabled = options.find(
option =>
(option) =>
option.name === 'preserveWatchOutput' && option.value === true,
);
if (isPreserveWatchOutputEnabled) {
Expand Down
15 changes: 8 additions & 7 deletions actions/generate.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ export class GenerateAction extends AbstractAction {

const generateFiles = async (inputs: Input[]) => {
const configuration = await loadConfiguration();
const collectionOption = inputs.find(option => option.name === 'collection')!
const collectionOption = inputs.find(
(option) => option.name === 'collection',
)!.value as string;
const schematic = inputs.find((option) => option.name === 'schematic')!
.value as string;
const schematic = inputs.find(option => option.name === 'schematic')!
const appName = inputs.find((option) => option.name === 'project')!
.value as string;
const appName = inputs.find(option => option.name === 'project')!
.value as string;
const spec = inputs.find(option => option.name === 'spec');
const spec = inputs.find((option) => option.name === 'spec');

const collection: AbstractCollection = CollectionFactory.create(
collectionOption || configuration.collection,
Expand Down Expand Up @@ -102,7 +103,7 @@ const generateFiles = async (inputs: Input[]) => {
schematicOptions.push(new SchematicOption('sourceRoot', sourceRoot));
schematicOptions.push(new SchematicOption('spec', generateSpec));
try {
const schematicInput = inputs.find(input => input.name === 'schematic');
const schematicInput = inputs.find((input) => input.name === 'schematic');
if (!schematicInput) {
throw new Error('Unable to find a schematic for this configuration');
}
Expand All @@ -117,7 +118,7 @@ const generateFiles = async (inputs: Input[]) => {
const mapSchematicOptions = (inputs: Input[]): SchematicOption[] => {
const excludedInputNames = ['schematic', 'spec'];
const options: SchematicOption[] = [];
inputs.forEach(input => {
inputs.forEach((input) => {
if (!excludedInputNames.includes(input.name) && input.value !== undefined) {
options.push(new SchematicOption(input.name, input.value));
}
Expand Down
10 changes: 6 additions & 4 deletions actions/info.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ const displayCliVersion = () => {
);
};

const readProjectPackageJsonDependencies = async (): Promise<PackageJsonDependencies> => {
const readProjectPackageJsonDependencies = async (): Promise<
PackageJsonDependencies
> => {
return new Promise<PackageJsonDependencies>((resolve, reject) => {
readFile(
join(process.cwd(), 'package.json'),
Expand All @@ -84,7 +86,7 @@ const readProjectPackageJsonDependencies = async (): Promise<PackageJsonDependen
};

const displayNestVersions = (dependencies: PackageJsonDependencies) => {
buildNestVersionsMessage(dependencies).forEach(dependency =>
buildNestVersionsMessage(dependencies).forEach((dependency) =>
console.info(dependency.name, chalk.blue(dependency.value)),
);
};
Expand All @@ -100,7 +102,7 @@ const collectNestDependencies = (
dependencies: PackageJsonDependencies,
): NestDependency[] => {
const nestDependencies: NestDependency[] = [];
Object.keys(dependencies).forEach(key => {
Object.keys(dependencies).forEach((key) => {
if (key.indexOf('@nestjs') > -1) {
nestDependencies.push({
name: `${key.replace(/@nestjs\//, '')} version`,
Expand All @@ -117,7 +119,7 @@ const format = (dependencies: NestDependency[]): NestDependency[] => {
dependencyB.name.length - dependencyA.name.length,
);
const length = sorted[0].name.length;
sorted.forEach(dependency => {
sorted.forEach((dependency) => {
if (dependency.name.length < length) {
dependency.name = rightPad(dependency.name, length);
}
Expand Down
18 changes: 10 additions & 8 deletions actions/new.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,20 @@ import { AbstractAction } from './abstract.action';

export class NewAction extends AbstractAction {
public async handle(inputs: Input[], options: Input[]) {
const directoryOption = options.find(option => option.name === 'directory');
const dryRunOption = options.find(option => option.name === 'dry-run');
const directoryOption = options.find(
(option) => option.name === 'directory',
);
const dryRunOption = options.find((option) => option.name === 'dry-run');
const isDryRunEnabled = dryRunOption && dryRunOption.value;

await askForMissingInformation(inputs);
await generateApplicationFiles(inputs, options).catch(exit);

const shouldSkipInstall = options.some(
option => option.name === 'skip-install' && option.value === true,
(option) => option.name === 'skip-install' && option.value === true,
);
const shouldSkipGit = options.some(
option => option.name === 'skip-git' && option.value === true,
(option) => option.name === 'skip-git' && option.value === true,
);
const projectDirectory = getProjectDirectory(
getApplicationNameInput(inputs)!,
Expand All @@ -64,7 +66,7 @@ export class NewAction extends AbstractAction {
}

const getApplicationNameInput = (inputs: Input[]) =>
inputs.find(input => input.name === 'name');
inputs.find((input) => input.name === 'name');

const getProjectDirectory = (
applicationName: Input,
Expand Down Expand Up @@ -95,15 +97,15 @@ const replaceInputMissingInformation = (
answers: Answers,
): Input[] => {
return inputs.map(
input =>
(input) =>
(input.value =
input.value !== undefined ? input.value : answers[input.name]),
);
};

const generateApplicationFiles = async (args: Input[], options: Input[]) => {
const collectionName = options.find(
option => option.name === 'collection' && option.value != null,
(option) => option.name === 'collection' && option.value != null,
)!.value;
const collection: AbstractCollection = CollectionFactory.create(
(collectionName as Collection) || Collection.NESTJS,
Expand Down Expand Up @@ -136,7 +138,7 @@ const installPackages = async (
installDirectory: string,
) => {
const inputPackageManager: string = options.find(
option => option.name === 'package-manager',
(option) => option.name === 'package-manager',
)!.value as string;

let packageManager: AbstractPackageManager;
Expand Down
14 changes: 8 additions & 6 deletions actions/start.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import { BuildAction } from './build.action';
export class StartAction extends BuildAction {
public async handle(inputs: Input[], options: Input[]) {
try {
const configFileName = options.find(option => option.name === 'config')!
const configFileName = options.find((option) => option.name === 'config')!
.value as string;
const configuration = await this.loader.load(configFileName);
const appName = inputs.find(input => input.name === 'app')!
const appName = inputs.find((input) => input.name === 'app')!
.value as string;

const pathToTsconfig = getValueOrDefault<string>(
Expand All @@ -27,12 +27,14 @@ export class StartAction extends BuildAction {
options,
);

const binaryToRunOption = options.find(option => option.name === 'exec');
const debugModeOption = options.find(option => option.name === 'debug');
const watchModeOption = options.find(option => option.name === 'watch');
const binaryToRunOption = options.find(
(option) => option.name === 'exec',
);
const debugModeOption = options.find((option) => option.name === 'debug');
const watchModeOption = options.find((option) => option.name === 'watch');
const isWatchEnabled = !!(watchModeOption && watchModeOption.value);
const watchAssetsModeOption = options.find(
option => option.name === 'watchAssets',
(option) => option.name === 'watchAssets',
);
const isWatchAssetsEnabled = !!(
watchAssetsModeOption && watchAssetsModeOption.value
Expand Down
4 changes: 2 additions & 2 deletions actions/update.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { AbstractAction } from './abstract.action';

export class UpdateAction extends AbstractAction {
public async handle(inputs: Input[], options: Input[]) {
const force = options.find(option => option.name === 'force') as Input;
const tag = options.find(option => option.name === 'tag') as Input;
const force = options.find((option) => option.name === 'force') as Input;
const tag = options.find((option) => option.name === 'tag') as Input;

const manager = new NestDependencyManager(
await PackageManagerFactory.find(),
Expand Down
6 changes: 5 additions & 1 deletion commands/generate.command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ export class GenerateCommand extends AbstractCommand {
};
const table: any = new Table(tableConfig);
for (const schematic of NestCollection.getSchematics()) {
table.push([chalk.green(schematic.name), chalk.cyan(schematic.alias), schematic.description]);
table.push([
chalk.green(schematic.name),
chalk.cyan(schematic.alias),
schematic.description,
]);
}
return table.toString();
}
Expand Down
4 changes: 2 additions & 2 deletions lib/compiler/assets-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class AssetsManager {
*/
public closeWatchers() {
const timeoutMs = 300;
const closeFn = () => this.watchers.forEach(watcher => watcher.close());
const closeFn = () => this.watchers.forEach((watcher) => watcher.close());

setTimeout(closeFn, timeoutMs);
}
Expand All @@ -45,7 +45,7 @@ export class AssetsManager {
let sourceRoot = getValueOrDefault(configuration, 'sourceRoot', appName);
sourceRoot = join(process.cwd(), sourceRoot);

const filesToCopy = assets.map<AssetEntry>(item => {
const filesToCopy = assets.map<AssetEntry>((item) => {
if (typeof item === 'string') {
return {
glob: join(sourceRoot, item),
Expand Down
6 changes: 3 additions & 3 deletions lib/compiler/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class Compiler {
) {
const tsBinary = this.typescriptLoader.load();
const formatHost: ts.FormatDiagnosticsHost = {
getCanonicalFileName: path => path,
getCanonicalFileName: (path) => path,
getCurrentDirectory: tsBinary.sys.getCurrentDirectory,
getNewLine: () => tsBinary.sys.newLine,
};
Expand Down Expand Up @@ -50,8 +50,8 @@ export class Compiler {
const programRef = program.getProgram
? program.getProgram()
: ((program as any) as ts.Program);
const before = plugins.beforeHooks.map(hook => hook(programRef));
const after = plugins.afterHooks.map(hook => hook(programRef));
const before = plugins.beforeHooks.map((hook) => hook(programRef));
const after = plugins.afterHooks.map((hook) => hook(programRef));
const emitResult = program.emit(
undefined,
undefined,
Expand Down
11 changes: 3 additions & 8 deletions lib/compiler/helpers/copy-path-resolve.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as path from 'path';

/**
* Helper function for returning a copy destination filename
*
* Helper function for returning a copy destination filename
*
* @description used in `assets-manager.ts` (copy from `copyfiles`)
* @see https://github.com/calvinmetcalf/copyfiles/blob/master/index.js#L22
*/
Expand All @@ -19,12 +19,7 @@ function dealWith(inPath: string, up: number) {
throw new Error('cant go up that far');
}

return path.join(
...path
.normalize(inPath)
.split(path.sep)
.slice(up),
);
return path.join(...path.normalize(inPath).split(path.sep).slice(up));
}

function depth(string: string) {
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/helpers/get-value-or-default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function getValueOrDefault<T = any>(
options: Input[] = [],
defaultValue?: T,
): T {
const item = options.find(option => option.name === key);
const item = options.find((option) => option.name === key);
const origValue = item && ((item.value as unknown) as T);
if (origValue !== undefined && origValue !== null) {
return origValue as T;
Expand Down
8 changes: 4 additions & 4 deletions lib/compiler/watch-compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ export class WatchCompiler {
let transforms = customTransformers;
transforms = typeof transforms !== 'object' ? {} : transforms;

const before = plugins.beforeHooks.map(hook =>
const before = plugins.beforeHooks.map((hook) =>
hook(program.getProgram()),
);
const after = plugins.afterHooks.map(hook =>
const after = plugins.afterHooks.map((hook) =>
hook(program.getProgram()),
);
before.unshift(tsconfigPathsPlugin);
Expand All @@ -114,7 +114,7 @@ export class WatchCompiler {
private createDiagnosticReporter(
diagnosticReporter: (diagnostic: ts.Diagnostic, ...args: any[]) => any,
) {
return function(this: any, diagnostic: ts.Diagnostic, ...args: any[]) {
return function (this: any, diagnostic: ts.Diagnostic, ...args: any[]) {
return diagnosticReporter.call(this, diagnostic, ...args);
};
}
Expand All @@ -123,7 +123,7 @@ export class WatchCompiler {
watchStatusReporter: (diagnostic: ts.Diagnostic, ...args: any[]) => any,
onSuccess?: () => void,
) {
return function(this: any, diagnostic: ts.Diagnostic, ...args: any[]) {
return function (this: any, diagnostic: ts.Diagnostic, ...args: any[]) {
const messageText = diagnostic && diagnostic.messageText;
const noErrorsMessage = '0 errors';
if (
Expand Down
6 changes: 4 additions & 2 deletions lib/compiler/webpack-compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { getValueOrDefault } from './helpers/get-value-or-default';
import { PluginsLoader } from './plugins-loader';
import webpack = require('webpack');


export class WebpackCompiler {
constructor(private readonly pluginsLoader: PluginsLoader) {}

Expand Down Expand Up @@ -74,7 +73,10 @@ export class WebpackCompiler {
};
const compiler = webpack(webpackConfiguration);

const afterCallback = (err: Error | undefined, stats: webpack.Stats | undefined) => {
const afterCallback = (
err: Error | undefined,
stats: webpack.Stats | undefined,
) => {
if (err && stats === undefined) {
// Could not complete the compilation
// The error caught is most likely thrown by underlying tasks
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/workspace-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class WorkspaceUtils {
return;
}
await new Promise((resolve, reject) =>
rimraf(dirPath, err => (err ? reject(err) : resolve())),
rimraf(dirPath, (err) => (err ? reject(err) : resolve())),
);
}
}
4 changes: 2 additions & 2 deletions lib/dependency-managers/nest.dependency-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export class NestDependencyManager {
public async read(): Promise<string[]> {
const production: ProjectDependency[] = await this.packageManager.getProduction();
return production
.filter(dependency => dependency.name.indexOf('@nestjs') > -1)
.map(dependency => dependency.name);
.filter((dependency) => dependency.name.indexOf('@nestjs') > -1)
.map((dependency) => dependency.name);
}

public async update(force: boolean, tag = 'latest') {
Expand Down
Loading

0 comments on commit 57be6ed

Please sign in to comment.