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: implemented logic to output diagnostics log by adding additional output flag to validate cli command. #1563

Merged
merged 5 commits into from
Nov 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 84 additions & 16 deletions src/core/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,29 @@ import { red, yellow, green, cyan } from 'chalk';
import type { Diagnostic } from '@asyncapi/parser/cjs';
import type Command from './base';
import type { Specification } from './models/SpecificationFile';
import { promises } from 'fs';
import path from 'path';

type DiagnosticsFormat = 'stylish' | 'json' | 'junit' | 'html' | 'text' | 'teamcity' | 'pretty';

export type SeverityKind = 'error' | 'warn' | 'info' | 'hint';

export { convertToOldAPI };

const { writeFile } = promises;

const formatExtensions: Record<DiagnosticsFormat, string> = {
stylish: '.txt',
json: '.json',
junit: '.xml',
html: '.html',
text: '.txt',
teamcity: '.txt',
pretty: '.txt',
};

const validFormats = ['stylish', 'json', 'junit', 'html', 'text', 'teamcity', 'pretty'];

const parser = new Parser({
__unstable: {
resolver: {
Expand Down Expand Up @@ -56,13 +74,18 @@ export function validationFlags({ logDiagnostics = true }: ValidationFlagsOption
options: ['error', 'warn', 'info', 'hint'] as const,
default: 'error',
})(),
output: Flags.string({
description: 'The output file name. Omitting this flag the result will be printed in the console.',
char: 'o'
})
};
}

export interface ValidateOptions {
'log-diagnostics'?: boolean;
'diagnostics-format'?: `${OutputFormat}`;
'fail-severity'?: SeverityKind;
'output'?: string;
}

export async function validate(command: Command, specFile: Specification, options: ValidateOptions = {}) {
Expand All @@ -76,30 +99,56 @@ export async function parse(command: Command, specFile: Specification, options:
return { document, diagnostics, status };
}

function logDiagnostics(diagnostics: Diagnostic[], command: Command, specFile: Specification, options: ValidateOptions = {}): 'valid' | 'invalid' {
function logDiagnostics(
diagnostics: Diagnostic[],
command: Command,
specFile: Specification,
options: ValidateOptions = {}
): 'valid' | 'invalid' {
const logDiagnostics = options['log-diagnostics'];
const failSeverity = options['fail-severity'] ?? 'error';
const diagnosticsFormat = options['diagnostics-format'] ?? 'stylish';

const sourceString = specFile.toSourceString();
if (diagnostics.length) {
if (hasFailSeverity(diagnostics, failSeverity)) {
if (logDiagnostics) {
command.logToStderr(`\n${sourceString} and/or referenced documents have governance issues.`);
command.logToStderr(formatOutput(diagnostics, diagnosticsFormat, failSeverity));
}
return ValidationStatus.INVALID;
}

if (logDiagnostics) {
command.log(`\n${sourceString} is valid but has (itself and/or referenced documents) governance issues.`);
command.log(formatOutput(diagnostics, diagnosticsFormat, failSeverity));
}
} else if (logDiagnostics) {
const hasIssues = diagnostics.length > 0;
const isFailSeverity = hasIssues && hasFailSeverity(diagnostics, failSeverity);

if (logDiagnostics) {
logGovernanceMessage(command, sourceString, hasIssues, isFailSeverity);
outputDiagnostics(command, diagnostics, diagnosticsFormat, failSeverity, options);
}

return isFailSeverity ? ValidationStatus.INVALID : ValidationStatus.VALID;
}

function logGovernanceMessage(
command: Command,
sourceString: string,
hasIssues: boolean,
isFailSeverity: boolean
) {
if (!hasIssues) {
command.log(`\n${sourceString} is valid! ${sourceString} and referenced documents don't have governance issues.`);
} else if (isFailSeverity) {
command.logToStderr(`\n${sourceString} and/or referenced documents have governance issues.`);
} else {
command.log(`\n${sourceString} is valid but has (itself and/or referenced documents) governance issues.`);
}
}

return ValidationStatus.VALID;
function outputDiagnostics(
command: Command,
diagnostics: Diagnostic[],
diagnosticsFormat: DiagnosticsFormat,
failSeverity: SeverityKind,
options: ValidateOptions
) {
const diagnosticsOutput = formatOutput(diagnostics, diagnosticsFormat, failSeverity);
if (options.output) {
writeValidationDiagnostic(options.output, command, diagnosticsFormat, diagnosticsOutput);
} else {
command.log(diagnosticsOutput);
}
}

export function formatOutput(diagnostics: Diagnostic[], format: `${OutputFormat}`, failSeverity: SeverityKind) {
Expand Down Expand Up @@ -145,3 +194,22 @@ function hasFailSeverity(diagnostics: Diagnostic[], failSeverity: SeverityKind)
const diagnosticSeverity = getDiagnosticSeverity(failSeverity);
return diagnostics.some(diagnostic => diagnostic.severity <= diagnosticSeverity);
}

async function writeValidationDiagnostic(outputPath: string, command: Command, format: DiagnosticsFormat, formatOutput: string) {
if (!validFormats.includes(format)) {
command.logToStderr(`Invalid diagnostics format: "${format}"`);
return;
}

const expectedExtension = formatExtensions[format as keyof typeof formatExtensions];
const actualExtension = path.extname(outputPath);

// Validate file extension against diagnostics format
if (expectedExtension && (actualExtension !== expectedExtension)) {
command.logToStderr(`Invalid file extension for format "${format}". Expected extension: "${expectedExtension}"`);
} else {
await writeFile(path.resolve(process.cwd(), outputPath), formatOutput, {
encoding: 'utf-8',
}).catch(err => console.log(err));
}
}
Loading