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: add support for diff markdown output #295

Merged
merged 21 commits into from Jun 28, 2023
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
1 change: 1 addition & 0 deletions .sonarcloud.properties
@@ -0,0 +1 @@
sonar.exclusions=test/**/*
1 change: 0 additions & 1 deletion sonar-project.properties

This file was deleted.

76 changes: 60 additions & 16 deletions src/commands/diff.ts
Expand Up @@ -3,6 +3,7 @@ import { Flags } from '@oclif/core';
import * as diff from '@asyncapi/diff';
import AsyncAPIDiff from '@asyncapi/diff/lib/asyncapidiff';
import { promises as fs } from 'fs';
import chalk from 'chalk';
import { load, Specification } from '../models/SpecificationFile';
import Command from '../base';
import { ValidationError } from '../errors/validation-error';
Expand All @@ -29,14 +30,19 @@ export default class Diff extends Command {
char: 'f',
description: 'format of the output',
default: 'yaml',
options: ['json', 'yaml', 'yml'],
options: ['json', 'yaml', 'yml', 'md'],
}),
type: Flags.string({
char: 't',
description: 'type of the output',
default: 'all',
options: ['breaking', 'non-breaking', 'unclassified', 'all'],
}),
markdownSubtype: Flags.string({
description: 'the format of changes made to AsyncAPI document. It works only when diff is generated using md type. For example, when you specify subtype as json, then diff information in markdown is dumped as json structure.',
default: undefined,
options: ['json', 'yaml', 'yml']
}),
overrides: Flags.string({
char: 'o',
description: 'path to JSON file containing the override properties',
Expand Down Expand Up @@ -70,10 +76,14 @@ export default class Diff extends Command {
const outputFormat = flags['format'];
const outputType = flags['type'];
const overrideFilePath = flags['overrides'];
let markdownSubtype = flags['markdownSubtype'];
const watchMode = flags['watch'];
const noError = flags['no-error'];
let firstDocument: Specification, secondDocument: Specification;

checkAndWarnFalseFlag(outputFormat, markdownSubtype);
markdownSubtype = setDefaultMarkdownSubtype(outputFormat, markdownSubtype);

try {
firstDocument = await load(firstDocumentPath);
enableWatch(watchMode, {
Expand Down Expand Up @@ -137,13 +147,16 @@ export default class Diff extends Command {
{
override: overrides,
outputType: outputFormat as diff.OutputType, // NOSONAR
markdownSubtype: markdownSubtype as diff.MarkdownSubtype
derberg marked this conversation as resolved.
Show resolved Hide resolved
}
);

if (outputFormat === 'json') {
this.outputJSON(diffOutput, outputType);
} else if (outputFormat === 'yaml' || outputFormat === 'yml') {
this.outputYAML(diffOutput, outputType);
} else if (outputFormat === 'md') {
this.outputMarkdown(diffOutput, outputType);
} else {
this.log(
`The output format ${outputFormat} is not supported at the moment.`
Expand All @@ -155,7 +168,7 @@ export default class Diff extends Command {
} catch (error) {
if (error instanceof DiffBreakingChangeError) {
this.error(error);
}
}
throw new ValidationError({
type: 'parser-error',
err: error,
Expand All @@ -178,17 +191,27 @@ export default class Diff extends Command {
}

outputYAML(diffOutput: AsyncAPIDiff, outputType: string) {
if (outputType === 'breaking') {
this.log(diffOutput.breaking() as string);
} else if (outputType === 'non-breaking') {
this.log(diffOutput.nonBreaking() as string);
} else if (outputType === 'unclassified') {
this.log(diffOutput.unclassified() as string);
} else if (outputType === 'all') {
this.log(diffOutput.getOutput() as string);
} else {
this.log(`The output type ${outputType} is not supported at the moment.`);
}
this.log(genericOutput(diffOutput, outputType) as string);
}

outputMarkdown(diffOutput: AsyncAPIDiff, outputType: string) {
this.log(genericOutput(diffOutput, outputType) as string);
}
}

/**
* A generic output function for diff output
* @param diffOutput The diff output data
* @param outputType The output format requested by the user
* @returns The output(if the format exists) or a message indicating the format doesn't exist
*/
function genericOutput(diffOutput: AsyncAPIDiff, outputType: string) {
switch (outputType) {
case 'breaking': return diffOutput.breaking();
case 'non-breaking': return diffOutput.nonBreaking();
case 'unclassified': return diffOutput.unclassified();
case 'all': return diffOutput.getOutput();
default: return `The output type ${outputType} is not supported at the moment.`;
}
}

Expand Down Expand Up @@ -241,9 +264,30 @@ const enableWatch = (status: boolean, watcher: SpecWatcherParams) => {
function throwOnBreakingChange(diffOutput: AsyncAPIDiff, outputFormat: string) {
const breakingChanges = diffOutput.breaking();
if (
(outputFormat === 'json' && breakingChanges.length !== 0) ||
((outputFormat === 'yaml' || outputFormat === 'yml') && breakingChanges !== '[]\n')
(outputFormat === 'json' && breakingChanges.length !== 0) ||
((outputFormat === 'yaml' || outputFormat === 'yml') && breakingChanges !== '[]\n') ||
(outputFormat === 'md' && breakingChanges.length !== 0)
) {
throw new DiffBreakingChangeError();
}
}
}

/**
* Checks and warns user about providing unnecessary markdownSubtype option.
*/
function checkAndWarnFalseFlag(format: string, markdownSubtype: string | undefined) {
if (format !== 'md' && typeof (markdownSubtype) !== 'undefined') {
const warningMessage = chalk.yellowBright(`Warning: The given markdownSubtype flag will not work with the given format.\nProvided flag markdownSubtype: ${markdownSubtype}`);
console.log(warningMessage);
}
}

/**
* Sets the default markdownSubtype option in case user doesn't provide one.
*/
function setDefaultMarkdownSubtype(format: string, markdownSubtype: string | undefined) {
if (format === 'md' && typeof (markdownSubtype) === 'undefined') {
return 'yaml';
}
return markdownSubtype;
}