Skip to content

Commit

Permalink
chore(): run format script
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Mar 9, 2022
1 parent 5f1cec4 commit 604aa0a
Show file tree
Hide file tree
Showing 16 changed files with 60 additions and 37 deletions.
5 changes: 2 additions & 3 deletions actions/add.action.ts
Expand Up @@ -128,9 +128,8 @@ export class AddAction extends AbstractAction {
const extraFlagsString = extraFlags ? extraFlags.join(' ') : undefined;

try {
const collection: AbstractCollection = CollectionFactory.create(
collectionName,
);
const collection: AbstractCollection =
CollectionFactory.create(collectionName);
await collection.execute(
schematicName,
schematicOptions,
Expand Down
5 changes: 2 additions & 3 deletions actions/build.action.ts
Expand Up @@ -86,9 +86,8 @@ export class BuildAction extends AbstractAction {
'path',
options,
);
const { options: tsOptions } = this.tsConfigProvider.getByConfigFilename(
pathToTsconfig,
);
const { options: tsOptions } =
this.tsConfigProvider.getByConfigFilename(pathToTsconfig);
const outDir = tsOptions.outDir || defaultOutDir;
const isWebpackEnabled = getValueOrDefault<boolean>(
configuration,
Expand Down
28 changes: 21 additions & 7 deletions actions/info.action.ts
Expand Up @@ -47,9 +47,17 @@ export class InfoAction extends AbstractAction {
async displayPackageManagerVersion() {
try {
const version: string = await this.manager.version();
console.info(`${this.manager.name} Version :`, chalk.blue(version), '\n');
console.info(
`${this.manager.name} Version :`,
chalk.blue(version),
'\n',
);
} catch {
console.error(`${this.manager.name} Version :`, chalk.red('Unknown'), '\n');
console.error(
`${this.manager.name} Version :`,
chalk.red('Unknown'),
'\n',
);
}
}

Expand All @@ -61,7 +69,8 @@ export class InfoAction extends AbstractAction {

async displayNestInformationFromPackage(): Promise<void> {
try {
const dependencies: PackageJsonDependencies = this.readProjectPackageDependencies();
const dependencies: PackageJsonDependencies =
this.readProjectPackageDependencies();
this.displayNestVersions(dependencies);
} catch (err) {
console.error(
Expand All @@ -74,7 +83,10 @@ export class InfoAction extends AbstractAction {
console.info(chalk.green('[Nest CLI]'));
console.info(
'Nest CLI Version :',
chalk.blue(JSON.parse(readFileSync(join(__dirname, '../package.json')).toString()).version),
chalk.blue(
JSON.parse(readFileSync(join(__dirname, '../package.json')).toString())
.version,
),
'\n',
);
}
Expand All @@ -85,8 +97,8 @@ export class InfoAction extends AbstractAction {
const dependencies = { ...pack.dependencies, ...pack.devDependencies };
Object.keys(dependencies).forEach((key) => {
dependencies[key] = {
version: dependencies[key]
}
version: dependencies[key],
};
});
return dependencies;
}
Expand All @@ -110,7 +122,9 @@ export class InfoAction extends AbstractAction {
const nestDependencies: NestDependency[] = [];
Object.keys(dependencies).forEach((key) => {
if (key.indexOf('@nestjs') > -1) {
const depPackagePath = require.resolve(key + '/package.json', { paths: [process.cwd()]});
const depPackagePath = require.resolve(key + '/package.json', {
paths: [process.cwd()],
});
const depPackage = readFileSync(depPackagePath).toString();
const value = JSON.parse(depPackage).version;
nestDependencies.push({
Expand Down
4 changes: 2 additions & 2 deletions actions/new.action.ts
Expand Up @@ -10,15 +10,15 @@ import { defaultGitIgnore } from '../lib/configuration/defaults';
import {
AbstractPackageManager,
PackageManager,
PackageManagerFactory
PackageManagerFactory,
} from '../lib/package-managers';
import { generateInput, generateSelect } from '../lib/questions/questions';
import { GitRunner } from '../lib/runners/git.runner';
import {
AbstractCollection,
Collection,
CollectionFactory,
SchematicOption
SchematicOption,
} from '../lib/schematics';
import { EMOJIS, MESSAGES } from '../lib/ui';
import { normalizeToKebabOrSnakeCase } from '../lib/utils/formatting';
Expand Down
16 changes: 13 additions & 3 deletions commands/generate.command.ts
Expand Up @@ -16,8 +16,16 @@ export class GenerateCommand extends AbstractCommand {
'Report actions that would be taken without writing out results.',
)
.option('-p, --project [project]', 'Project in which to generate files.')
.option('--flat', 'Enforce flat structure of generated element.', () => true)
.option( '--no-flat', 'Enforce that directories are generated.', () => false)
.option(
'--flat',
'Enforce flat structure of generated element.',
() => true,
)
.option(
'--no-flat',
'Enforce that directories are generated.',
() => false,
)
.option(
'--spec',
'Enforce spec files generation.',
Expand All @@ -42,9 +50,11 @@ export class GenerateCommand extends AbstractCommand {
) => {
const options: Input[] = [];
options.push({ name: 'dry-run', value: !!command.dryRun });
if(command.flat !== undefined) {

if (command.flat !== undefined) {
options.push({ name: 'flat', value: command.flat });
}

options.push({
name: 'spec',
value:
Expand Down
11 changes: 4 additions & 7 deletions lib/compiler/compiler.ts
Expand Up @@ -26,11 +26,8 @@ export class Compiler {
getNewLine: () => tsBinary.sys.newLine,
};

const {
options,
fileNames,
projectReferences,
} = this.tsConfigProvider.getByConfigFilename(configFilename);
const { options, fileNames, projectReferences } =
this.tsConfigProvider.getByConfigFilename(configFilename);

const createProgram =
tsBinary.createIncrementalProgram || tsBinary.createProgram;
Expand All @@ -49,7 +46,7 @@ export class Compiler {
const tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(options);
const programRef = program.getProgram
? program.getProgram()
: ((program as any) as ts.Program);
: (program as any as ts.Program);
const before = plugins.beforeHooks.map((hook) => hook(programRef));
const after = plugins.afterHooks.map((hook) => hook(programRef));
const afterDeclarations = plugins.afterDeclarationsHooks.map((hook) =>
Expand Down Expand Up @@ -87,7 +84,7 @@ export class Compiler {
formatHost: ts.FormatDiagnosticsHost,
): number {
const diagnostics = tsBinary
.getPreEmitDiagnostics((program as unknown) as ts.Program)
.getPreEmitDiagnostics(program as unknown as ts.Program)
.concat(emitResult.diagnostics);

if (diagnostics.length > 0) {
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/helpers/get-value-or-default.ts
Expand Up @@ -10,7 +10,7 @@ export function getValueOrDefault<T = any>(
defaultValue?: T,
): T {
const item = options.find((option) => option.name === key);
const origValue = item && ((item.value as unknown) as T);
const origValue = item && (item.value as unknown as T);
if (origValue !== undefined && origValue !== null) {
return origValue as T;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/helpers/tsconfig-provider.ts
Expand Up @@ -16,7 +16,7 @@ export class TsConfigProvider {
const parsedCmd = tsBinary.getParsedCommandLineOfConfigFile(
configPath,
undefined!,
(tsBinary.sys as unknown) as ts.ParseConfigFileHost,
tsBinary.sys as unknown as ts.ParseConfigFileHost,
);
const { options, fileNames, projectReferences } = parsedCmd!;
return { options, fileNames, projectReferences };
Expand Down
4 changes: 3 additions & 1 deletion lib/compiler/hooks/tsconfig-paths.hook.ts
Expand Up @@ -35,7 +35,9 @@ export function tsconfigPathsBeforeHookFactory(
return node;
}
(newNode as any).moduleSpecifier = tsBinary.createLiteral(result);
(newNode as any).moduleSpecifier.parent = (node as any).moduleSpecifier.parent;
(newNode as any).moduleSpecifier.parent = (
node as any
).moduleSpecifier.parent;
(newNode as any).flags = node.flags;
return newNode;
} catch {
Expand Down
3 changes: 2 additions & 1 deletion lib/compiler/plugins-loader.ts
Expand Up @@ -57,7 +57,8 @@ export class PluginsLoader {
});
const beforeHooks: MultiNestCompilerPlugins['afterHooks'] = [];
const afterHooks: MultiNestCompilerPlugins['beforeHooks'] = [];
const afterDeclarationsHooks: MultiNestCompilerPlugins['afterDeclarationsHooks'] = [];
const afterDeclarationsHooks: MultiNestCompilerPlugins['afterDeclarationsHooks'] =
[];
pluginRefs.forEach((plugin, index) => {
if (!plugin.before && !plugin.after && !plugin.afterDeclarations) {
throw new Error(CLI_ERRORS.WRONG_PLUGIN(pluginNames[index]));
Expand Down
5 changes: 2 additions & 3 deletions lib/compiler/watch-compiler.ts
Expand Up @@ -30,9 +30,8 @@ export class WatchCompiler {
if (!configPath) {
throw new Error(CLI_ERRORS.MISSING_TYPESCRIPT(configFilename));
}
const { projectReferences } = this.tsConfigProvider.getByConfigFilename(
configFilename,
);
const { projectReferences } =
this.tsConfigProvider.getByConfigFilename(configFilename);

const createProgram = tsBin.createEmitAndSemanticDiagnosticsBuilderProgram;
const origDiagnosticReporter = (tsBin as any).createDiagnosticReporter(
Expand Down
3 changes: 2 additions & 1 deletion lib/dependency-managers/nest.dependency-manager.ts
Expand Up @@ -6,7 +6,8 @@ export class NestDependencyManager {
constructor(private packageManager: AbstractPackageManager) {}

public async read(): Promise<string[]> {
const production: ProjectDependency[] = await this.packageManager.getProduction();
const production: ProjectDependency[] =
await this.packageManager.getProduction();
return production
.filter((dependency) => dependency.name.indexOf('@nestjs') > -1)
.map((dependency) => dependency.name);
Expand Down
2 changes: 1 addition & 1 deletion lib/package-managers/package-manager.factory.ts
Expand Up @@ -28,7 +28,7 @@ export class PackageManagerFactory {
if (files.findIndex((filename) => filename === 'yarn.lock') > -1) {
resolve(this.create(PackageManager.YARN));
} else if (
files.findIndex((filename) => filename === 'pnpm-lock.yaml') > -1
files.findIndex((filename) => filename === 'pnpm-lock.yaml') > -1
) {
resolve(this.create(PackageManager.PNPM));
} else {
Expand Down
2 changes: 1 addition & 1 deletion lib/package-managers/package-manager.ts
@@ -1,5 +1,5 @@
export enum PackageManager {
NPM = 'npm',
YARN = 'yarn',
PNPM = 'pnpm'
PNPM = 'pnpm',
}
2 changes: 1 addition & 1 deletion lib/runners/runner.ts
Expand Up @@ -2,5 +2,5 @@ export enum Runner {
SCHEMATIC,
NPM,
YARN,
PNPM
PNPM,
}
3 changes: 2 additions & 1 deletion lib/utils/project-utils.ts
Expand Up @@ -83,7 +83,8 @@ export function moveDefaultProjectToStart(
defaultProjectName: string,
defaultLabel: string,
) {
let projects: string[] = configuration.projects != null ? Object.keys(configuration.projects) : [];
let projects: string[] =
configuration.projects != null ? Object.keys(configuration.projects) : [];
if (configuration.sourceRoot !== 'src') {
projects = projects.filter(
(p) => p !== defaultProjectName.replace(defaultLabel, ''),
Expand Down

0 comments on commit 604aa0a

Please sign in to comment.