@redocly/cli 1.0.0-beta.100 → 1.0.0-beta.103

package/lib/__mocks__/@redocly/openapi-core.d.ts

@@ -24,9 +24,12 @@ export declare const RedoclyClient: jest.Mock<{
 export declare const loadConfig: jest.Mock<{
     configFile: null;
     lint: {
+        addIgnore: jest.Mock<any, any>;
         skipRules: jest.Mock<any, any>;
         skipPreprocessors: jest.Mock<any, any>;
+        saveIgnore: jest.Mock<any, any>;
         skipDecorators: jest.Mock<any, any>;
+        ignore: null;
     };
 }, []>;
 export declare const getMergedConfig: jest.Mock<any, any>;
@@ -42,3 +45,4 @@ export declare const getTotals: jest.Mock<{
 }, []>;
 export declare const formatProblems: jest.Mock<any, any>;
 export declare const slash: jest.Mock<any, any>;
+export declare const findConfig: jest.Mock<any, any>;

package/lib/__mocks__/@redocly/openapi-core.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.slash = exports.formatProblems = exports.getTotals = exports.bundle = exports.lint = exports.getMergedConfig = exports.loadConfig = exports.RedoclyClient = exports.__redoclyClient = void 0;
+exports.findConfig = exports.slash = exports.formatProblems = exports.getTotals = exports.bundle = exports.lint = exports.getMergedConfig = exports.loadConfig = exports.RedoclyClient = exports.__redoclyClient = void 0;
+const config_1 = require("./../../__tests__/fixtures/config");
 exports.__redoclyClient = {
     isAuthorizedWithRedocly: jest.fn().mockResolvedValue(true),
     isAuthorizedWithRedoclyByRegion: jest.fn().mockResolvedValue(true),
@@ -16,13 +17,11 @@ exports.__redoclyClient = {
     },
 };
 exports.RedoclyClient = jest.fn(() => exports.__redoclyClient);
-exports.loadConfig = jest.fn(() => ({
-    configFile: null,
-    lint: { skipRules: jest.fn(), skipPreprocessors: jest.fn(), skipDecorators: jest.fn() },
-}));
+exports.loadConfig = jest.fn(() => config_1.ConfigFixture);
 exports.getMergedConfig = jest.fn();
 exports.lint = jest.fn();
 exports.bundle = jest.fn(() => ({ bundle: { parsed: null }, problems: null }));
 exports.getTotals = jest.fn(() => ({ errors: 0 }));
 exports.formatProblems = jest.fn();
 exports.slash = jest.fn();
+exports.findConfig = jest.fn();

package/lib/__mocks__/perf_hooks.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="jest" />
+export declare const performance: {
+    now: jest.Mock<any, any>;
+};

package/lib/__mocks__/perf_hooks.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.performance = void 0;
+exports.performance = {
+    now: jest.fn()
+};

package/lib/__mocks__/utils.d.ts

@@ -1,8 +1,5 @@
 /// <reference types="jest" />
 export declare const getFallbackEntryPointsOrExit: jest.Mock<any, [entrypoints: any]>;
-export declare const getTotals: jest.Mock<{
-    errors: number;
-}, []>;
 export declare const dumpBundle: jest.Mock<string, []>;
 export declare const slash: jest.Mock<any, any>;
 export declare const pluralize: jest.Mock<any, any>;
@@ -15,3 +12,4 @@ export declare const getOutputFileName: jest.Mock<{
     ext: string;
 }, []>;
 export declare const handleError: jest.Mock<any, any>;
+export declare const exitWithError: jest.Mock<any, any>;

package/lib/__mocks__/utils.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleError = exports.getOutputFileName = exports.printLintTotals = exports.printUnusedWarnings = exports.printExecutionTime = exports.getExecutionTime = exports.pluralize = exports.slash = exports.dumpBundle = exports.getTotals = exports.getFallbackEntryPointsOrExit = void 0;
+exports.exitWithError = exports.handleError = exports.getOutputFileName = exports.printLintTotals = exports.printUnusedWarnings = exports.printExecutionTime = exports.getExecutionTime = exports.pluralize = exports.slash = exports.dumpBundle = exports.getFallbackEntryPointsOrExit = void 0;
 exports.getFallbackEntryPointsOrExit = jest.fn((entrypoints) => entrypoints.map(() => ({ path: '' })));
-exports.getTotals = jest.fn(() => ({ errors: 0 }));
 exports.dumpBundle = jest.fn(() => '');
 exports.slash = jest.fn();
 exports.pluralize = jest.fn();
@@ -12,3 +11,4 @@ exports.printUnusedWarnings = jest.fn();
 exports.printLintTotals = jest.fn();
 exports.getOutputFileName = jest.fn(() => ({ outputFile: 'test.yaml', ext: 'yaml' }));
 exports.handleError = jest.fn();
+exports.exitWithError = jest.fn();

package/lib/__tests__/commands/join.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/__tests__/commands/join.test.js

@@ -0,0 +1,41 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const join_1 = require("../../commands/join");
+const utils_1 = require("../../utils");
+const colorette_1 = require("colorette");
+jest.mock('../../utils');
+jest.mock('colorette');
+describe('handleJoin fails', () => {
+    const colloreteYellowMock = colorette_1.yellow;
+    colloreteYellowMock.mockImplementation((string) => string);
+    it('should call exitWithError because only one entrypoint', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield join_1.handleJoin({ entrypoints: ['first.yaml'] }, 'cli-version');
+        expect(utils_1.exitWithError).toHaveBeenCalledWith(`At least 2 entrypoints should be provided. \n\n`);
+    }));
+    it('should call exitWithError because passed all 3 options for tags', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield join_1.handleJoin({
+            entrypoints: ['first.yaml', 'second.yaml'],
+            'prefix-tags-with-info-prop': 'something',
+            'without-x-tag-groups': true,
+            'prefix-tags-with-filename': true,
+        }, 'cli-version');
+        expect(utils_1.exitWithError).toHaveBeenCalledWith(`You use prefix-tags-with-filename, prefix-tags-with-info-prop, without-x-tag-groups together.\nPlease choose only one! \n\n`);
+    }));
+    it('should call exitWithError because passed all 2 options for tags', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield join_1.handleJoin({
+            entrypoints: ['first.yaml', 'second.yaml'],
+            'without-x-tag-groups': true,
+            'prefix-tags-with-filename': true,
+        }, 'cli-version');
+        expect(utils_1.exitWithError).toHaveBeenCalledWith(`You use prefix-tags-with-filename, without-x-tag-groups together.\nPlease choose only one! \n\n`);
+    }));
+});

package/lib/__tests__/commands/lint.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/__tests__/commands/lint.test.js

@@ -0,0 +1,106 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lint_1 = require("../../commands/lint");
+const openapi_core_1 = require("@redocly/openapi-core");
+const utils_1 = require("../../utils");
+const config_1 = require("../fixtures/config");
+const perf_hooks_1 = require("perf_hooks");
+jest.mock('@redocly/openapi-core');
+jest.mock('../../utils');
+jest.mock('perf_hooks');
+const argvMock = {
+    entrypoints: ['openapi.yaml'],
+    'lint-config': 'off',
+    format: 'codeframe',
+};
+const versionMock = '1.0.0';
+describe('handleLint', () => {
+    let processExitMock;
+    let exitCb;
+    const getMergedConfigMock = openapi_core_1.getMergedConfig;
+    beforeEach(() => {
+        jest.spyOn(process.stderr, 'write').mockImplementation(() => true);
+        perf_hooks_1.performance.now.mockImplementation(() => 42);
+        processExitMock = jest.spyOn(process, 'exit').mockImplementation();
+        jest.spyOn(process, 'once').mockImplementation((_e, cb) => {
+            exitCb = cb;
+            return process.on(_e, cb);
+        });
+        getMergedConfigMock.mockReturnValue(config_1.ConfigFixture);
+    });
+    afterEach(() => {
+        getMergedConfigMock.mockReset();
+    });
+    describe('loadConfig and getEnrtypoints stage', () => {
+        it('shoul call loadConfig and getFallbackEntryPointsOrExit', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield lint_1.handleLint(argvMock, versionMock);
+            expect(openapi_core_1.loadConfig).toHaveBeenCalledWith(undefined, undefined, undefined);
+            expect(utils_1.getFallbackEntryPointsOrExit).toHaveBeenCalled();
+        }));
+        it('should call loadConfig with args if such exist', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { config: '/path/redocly.yaml', extends: ['some/path'] }), versionMock);
+            expect(openapi_core_1.loadConfig).toHaveBeenCalledWith('/path/redocly.yaml', ['some/path'], undefined);
+        }));
+        it('should call mergedConfig with clear ignore if `generate-ignore-file` argv', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { 'generate-ignore-file': true }), versionMock);
+            expect(getMergedConfigMock).toHaveBeenCalled();
+        }));
+    });
+    describe('loop through entrypints and lint stage', () => {
+        it('should call getMergedConfig and lint ', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield lint_1.handleLint(argvMock, versionMock);
+            expect(perf_hooks_1.performance.now).toHaveBeenCalled();
+            expect(getMergedConfigMock).toHaveBeenCalled();
+            expect(openapi_core_1.lint).toHaveBeenCalled();
+        }));
+        it('should call skipRules,skipPreprocessors and addIgnore with argv', () => __awaiter(void 0, void 0, void 0, function* () {
+            openapi_core_1.lint.mockResolvedValueOnce(['problem']);
+            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { 'skip-preprocessor': ['preprocessor'], 'skip-rule': ['rule'], 'generate-ignore-file': true }), versionMock);
+            expect(config_1.ConfigFixture.lint.skipRules).toHaveBeenCalledWith(['rule']);
+            expect(config_1.ConfigFixture.lint.skipPreprocessors).toHaveBeenCalledWith(['preprocessor']);
+        }));
+        it('should call formatProblems and getExecutionTime with argv', () => __awaiter(void 0, void 0, void 0, function* () {
+            openapi_core_1.lint.mockResolvedValueOnce(['problem']);
+            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { 'max-problems': 2, format: 'stylish' }), versionMock);
+            expect(openapi_core_1.getTotals).toHaveBeenCalledWith(['problem']);
+            expect(openapi_core_1.formatProblems).toHaveBeenCalledWith(['problem'], {
+                format: 'stylish',
+                maxProblems: 2,
+                totals: { errors: 0 },
+                version: versionMock,
+            });
+            expect(utils_1.getExecutionTime).toHaveBeenCalledWith(42);
+        }));
+        it('should catch error in handleError if something fails', () => __awaiter(void 0, void 0, void 0, function* () {
+            openapi_core_1.lint.mockRejectedValueOnce('error');
+            yield lint_1.handleLint(argvMock, versionMock);
+            expect(utils_1.handleError).toHaveBeenCalledWith('error', '');
+        }));
+    });
+    describe('erros and warning handle after lint stage', () => {
+        it('should call printLintTotals and printLintTotals', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield lint_1.handleLint(argvMock, versionMock);
+            expect(utils_1.printUnusedWarnings).toHaveBeenCalled();
+        }));
+        it('should call exit with 0 if no errors', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield lint_1.handleLint(argvMock, versionMock);
+            exitCb === null || exitCb === void 0 ? void 0 : exitCb();
+            expect(processExitMock).toHaveBeenCalledWith(0);
+        }));
+        it('should exit with 1 if tootals error > 0', () => __awaiter(void 0, void 0, void 0, function* () {
+            openapi_core_1.getTotals.mockReturnValueOnce({ errors: 1 });
+            yield lint_1.handleLint(argvMock, versionMock);
+            exitCb === null || exitCb === void 0 ? void 0 : exitCb();
+            expect(processExitMock).toHaveBeenCalledWith(1);
+        }));
+    });
+});

package/lib/__tests__/commands/push.test.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const openapi_core_1 = require("@redocly/openapi-core");
+const utils_1 = require("../../utils");
 const push_1 = require("../../commands/push");
 jest.mock('fs');
 jest.mock('node-fetch', () => ({
@@ -32,7 +33,9 @@ describe('push', () => {
             entrypoint: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
-            'public': true
+            'public': true,
+            'batch-id': '123',
+            'batch-size': 2,
         });
         expect(redoclyClient.registryApi.prepareFileUpload).toBeCalledTimes(1);
         expect(redoclyClient.registryApi.pushApi).toBeCalledTimes(1);
@@ -45,8 +48,34 @@ describe('push', () => {
             organizationId: 'org',
             rootFilePath: 'filePath',
             version: '1.0.0',
+            batchId: '123',
+            batchSize: 2,
         });
     }));
+    it('fails if batchId value is an empty string', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield push_1.handlePush({
+            upsert: true,
+            entrypoint: 'spec.json',
+            destination: '@org/my-api@1.0.0',
+            branchName: 'test',
+            'public': true,
+            'batch-id': ' ',
+            'batch-size': 2,
+        });
+        expect(utils_1.exitWithError).toBeCalledTimes(1);
+    }));
+    it('fails if batchSize value is less than 2', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield push_1.handlePush({
+            upsert: true,
+            entrypoint: 'spec.json',
+            destination: '@org/my-api@1.0.0',
+            branchName: 'test',
+            'public': true,
+            'batch-id': '123',
+            'batch-size': 1,
+        });
+        expect(utils_1.exitWithError).toBeCalledTimes(1);
+    }));
 });
 describe('transformPush', () => {
     it('should adapt the existing syntax', () => {

package/lib/__tests__/fixtures/config.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="jest" />
+export declare const ConfigFixture: {
+    configFile: null;
+    lint: {
+        addIgnore: jest.Mock<any, any>;
+        skipRules: jest.Mock<any, any>;
+        skipPreprocessors: jest.Mock<any, any>;
+        saveIgnore: jest.Mock<any, any>;
+        skipDecorators: jest.Mock<any, any>;
+        ignore: null;
+    };
+};

package/lib/__tests__/fixtures/config.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigFixture = void 0;
+exports.ConfigFixture = {
+    configFile: null,
+    lint: {
+        addIgnore: jest.fn(),
+        skipRules: jest.fn(),
+        skipPreprocessors: jest.fn(),
+        saveIgnore: jest.fn(),
+        skipDecorators: jest.fn(),
+        ignore: null,
+    },
+};

package/lib/__tests__/utils.test.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
-jest.mock("os");
+const colorette_1 = require("colorette");
+jest.mock('os');
+jest.mock('colorette');
 describe('isSubdir', () => {
     it('can correctly determine if subdir', () => {
         [
@@ -39,3 +41,39 @@ describe('pathToFilename', () => {
         expect(processedPath).toEqual('user_createWithList');
     });
 });
+describe('printConfigLintTotals', () => {
+    const totalProblemsMock = {
+        errors: 1,
+        warnings: 0,
+        ignored: 0,
+    };
+    const redColoretteMocks = colorette_1.red;
+    const yellowColoretteMocks = colorette_1.yellow;
+    beforeEach(() => {
+        yellowColoretteMocks.mockImplementation((text) => text);
+        redColoretteMocks.mockImplementation((text) => text);
+        jest.spyOn(process.stderr, 'write').mockImplementation(() => true);
+    });
+    it('should print errors if such exist', () => {
+        utils_1.printConfigLintTotals(totalProblemsMock);
+        expect(process.stderr.write).toHaveBeenCalledWith('❌ Your config has 1 error.\n');
+        expect(redColoretteMocks).toHaveBeenCalledWith('❌ Your config has 1 error.\n');
+    });
+    it('should print warnign and error', () => {
+        utils_1.printConfigLintTotals(Object.assign(Object.assign({}, totalProblemsMock), { warnings: 2 }));
+        expect(process.stderr.write).toHaveBeenCalledWith('❌ Your config has 1 error and 2 warnings.\n');
+        expect(redColoretteMocks).toHaveBeenCalledWith('❌ Your config has 1 error and 2 warnings.\n');
+    });
+    it('should print warnign if no error', () => {
+        utils_1.printConfigLintTotals(Object.assign(Object.assign({}, totalProblemsMock), { errors: 0, warnings: 2 }));
+        expect(process.stderr.write).toHaveBeenCalledWith('You have 2 warnings.\n');
+        expect(yellowColoretteMocks).toHaveBeenCalledWith('You have 2 warnings.\n');
+    });
+    it('should print nothing if no error and no warnings', () => {
+        const result = utils_1.printConfigLintTotals(Object.assign(Object.assign({}, totalProblemsMock), { errors: 0 }));
+        expect(result).toBeUndefined();
+        expect(process.stderr.write).toHaveBeenCalledTimes(0);
+        expect(yellowColoretteMocks).toHaveBeenCalledTimes(0);
+        expect(redColoretteMocks).toHaveBeenCalledTimes(0);
+    });
+});

package/lib/commands/join.d.ts

@@ -1,7 +1,10 @@
-export declare function handleJoin(argv: {
+declare type JoinArgv = {
     entrypoints: string[];
     lint?: boolean;
     'prefix-tags-with-info-prop'?: string;
     'prefix-tags-with-filename'?: boolean;
     'prefix-components-with-info-prop'?: string;
-}, packageVersion: string): Promise<void>;
+    'without-x-tag-groups'?: boolean;
+};
+export declare function handleJoin(argv: JoinArgv, packageVersion: string): Promise<void>;
+export {};

package/lib/commands/join.js

@@ -18,6 +18,8 @@ const openapi_core_1 = require("@redocly/openapi-core");
 const utils_1 = require("../utils");
 const js_utils_1 = require("../js-utils");
 const COMPONENTS = 'components';
+const Tags = 'tags';
+const xTagGroups = 'x-tagGroups';
 let potentialConflictsTotal = 0;
 function handleJoin(argv, packageVersion) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -25,6 +27,15 @@ function handleJoin(argv, packageVersion) {
         if (argv.entrypoints.length < 2) {
             return utils_1.exitWithError(`At least 2 entrypoints should be provided. \n\n`);
         }
+        const { 'prefix-components-with-info-prop': prefixComponentsWithInfoProp, 'prefix-tags-with-filename': prefixTagsWithFilename, 'prefix-tags-with-info-prop': prefixTagsWithInfoProp, 'without-x-tag-groups': withoutXTagGroups, } = argv;
+        const usedTagsOptions = [
+            prefixTagsWithFilename && 'prefix-tags-with-filename',
+            prefixTagsWithInfoProp && 'prefix-tags-with-info-prop',
+            withoutXTagGroups && 'without-x-tag-groups',
+        ].filter(Boolean);
+        if (usedTagsOptions.length > 1) {
+            return utils_1.exitWithError(`You use ${colorette_1.yellow(usedTagsOptions.join(', '))} together.\nPlease choose only one! \n\n`);
+        }
         const config = yield openapi_core_1.loadConfig();
         const entrypoints = yield utils_1.getFallbackEntryPointsOrExit(argv.entrypoints, config);
         const externalRefResolver = new openapi_core_1.BaseResolver(config.resolve);
@@ -67,14 +78,8 @@ function handleJoin(argv, packageVersion) {
             tags: {},
             paths: {},
             components: {},
-            xWebhooks: {}
+            xWebhooks: {},
         };
-        const prefixComponentsWithInfoProp = argv['prefix-components-with-info-prop'];
-        const prefixTagsWithFilename = argv['prefix-tags-with-filename'];
-        const prefixTagsWithInfoProp = argv['prefix-tags-with-info-prop'];
-        if (prefixTagsWithFilename && prefixTagsWithInfoProp) {
-            return utils_1.exitWithError(`You used ${colorette_1.yellow('prefix-tags-with-filename')} and ${colorette_1.yellow('prefix-tags-with-info-prop')} that do not go together.\nPlease choose only one! \n\n`);
-        }
         addInfoSectionAndSpecVersion(documents, prefixComponentsWithInfoProp);
         for (const document of documents) {
             const openapi = document.parsed;
@@ -100,52 +105,78 @@ function handleJoin(argv, packageVersion) {
                 replace$Refs(openapi, componentsPrefix);
             }
         }
-        iteratePotentialConflicts(potentialConflicts);
+        iteratePotentialConflicts(potentialConflicts, withoutXTagGroups);
         const specFilename = 'openapi.yaml';
         const noRefs = true;
-        if (!potentialConflictsTotal) {
-            utils_1.writeYaml(joinedDef, specFilename, noRefs);
+        if (potentialConflictsTotal) {
+            return utils_1.exitWithError(`Please fix conflicts before running ${colorette_1.yellow('join')}.`);
         }
+        utils_1.writeYaml(joinedDef, specFilename, noRefs);
         utils_1.printExecutionTime('join', startedAt, specFilename);
-        function populateTags({ entrypoint, entrypointFilename, tags, potentialConflicts, tagsPrefix, componentsPrefix }) {
-            const xTagGroups = 'x-tagGroups';
-            const Tags = 'tags';
+        function populateTags({ entrypoint, entrypointFilename, tags, potentialConflicts, tagsPrefix, componentsPrefix, }) {
             if (!joinedDef.hasOwnProperty(Tags)) {
                 joinedDef[Tags] = [];
             }
-            if (!joinedDef.hasOwnProperty(xTagGroups)) {
-                joinedDef[xTagGroups] = [];
-            }
             if (!potentialConflicts.tags.hasOwnProperty('all')) {
                 potentialConflicts.tags['all'] = {};
             }
-            if (!joinedDef[xTagGroups].some((g) => g.name === entrypointFilename)) {
-                joinedDef[xTagGroups].push({ name: entrypointFilename, tags: [] });
-            }
-            const indexGroup = joinedDef[xTagGroups].findIndex((item) => item.name === entrypointFilename);
-            if (!joinedDef[xTagGroups][indexGroup].hasOwnProperty(Tags)) {
-                joinedDef[xTagGroups][indexGroup][Tags] = [];
+            if (withoutXTagGroups && !potentialConflicts.tags.hasOwnProperty('description')) {
+                potentialConflicts.tags['description'] = {};
             }
             for (const tag of tags) {
                 const entrypointTagName = addPrefix(tag.name, tagsPrefix);
                 if (tag.description) {
                     tag.description = addComponentsPrefix(tag.description, componentsPrefix);
                 }
-                if (!joinedDef.tags.find((t) => t.name === entrypointTagName)) {
+                const tagDuplicate = joinedDef.tags.find((t) => t.name === entrypointTagName);
+                if (tagDuplicate && withoutXTagGroups) {
+                    // If tag already exist and `without-x-tag-groups` option;
+                    // check if description are different for potential conflicts warning;
+                    const isTagDescriptionNotEqual = tag.hasOwnProperty('description') && tagDuplicate.description !== tag.description;
+                    potentialConflicts.tags.description[entrypointTagName].push(...(isTagDescriptionNotEqual ? [entrypoint] : []));
+                }
+                else {
+                    // Instead add tag to joinedDef;
                     tag['x-displayName'] = tag['x-displayName'] || tag.name;
                     tag.name = entrypointTagName;
                     joinedDef.tags.push(tag);
+                    if (withoutXTagGroups) {
+                        potentialConflicts.tags.description[entrypointTagName] = [entrypoint];
+                    }
                 }
-                if (!joinedDef[xTagGroups][indexGroup][Tags].find((t) => t === entrypointTagName)) {
-                    joinedDef[xTagGroups][indexGroup][Tags].push(entrypointTagName);
+                if (!withoutXTagGroups) {
+                    createXTagGroups(entrypointFilename);
+                    populateXTagGroups(entrypointTagName, getIndexGroup(entrypointFilename));
                 }
-                const doesEntrypointExist = !potentialConflicts.tags.all[entrypointTagName] || (potentialConflicts.tags.all[entrypointTagName] &&
-                    !potentialConflicts.tags.all[entrypointTagName].includes(entrypoint));
+                const doesEntrypointExist = !potentialConflicts.tags.all[entrypointTagName] ||
+                    (potentialConflicts.tags.all[entrypointTagName] &&
+                        !potentialConflicts.tags.all[entrypointTagName].includes(entrypoint));
                 potentialConflicts.tags.all[entrypointTagName] = [
-                    ...(potentialConflicts.tags.all[entrypointTagName] || []), ...(doesEntrypointExist ? [entrypoint] : [])
+                    ...(potentialConflicts.tags.all[entrypointTagName] || []),
+                    ...(!withoutXTagGroups && doesEntrypointExist ? [entrypoint] : []),
                 ];
             }
         }
+        function getIndexGroup(entrypointFilename) {
+            return joinedDef[xTagGroups].findIndex((item) => item.name === entrypointFilename);
+        }
+        function createXTagGroups(entrypointFilename) {
+            if (!joinedDef.hasOwnProperty(xTagGroups)) {
+                joinedDef[xTagGroups] = [];
+            }
+            if (!joinedDef[xTagGroups].some((g) => g.name === entrypointFilename)) {
+                joinedDef[xTagGroups].push({ name: entrypointFilename, tags: [] });
+            }
+            const indexGroup = getIndexGroup(entrypointFilename);
+            if (!joinedDef[xTagGroups][indexGroup].hasOwnProperty(Tags)) {
+                joinedDef[xTagGroups][indexGroup][Tags] = [];
+            }
+        }
+        function populateXTagGroups(entrypointTagName, indexGroup) {
+            if (!joinedDef[xTagGroups][indexGroup][Tags].find((t) => t.name === entrypointTagName)) {
+                joinedDef[xTagGroups][indexGroup][Tags].push(entrypointTagName);
+            }
+        }
         function collectServers(openapi) {
             const { servers } = openapi;
             if (servers) {
@@ -162,8 +193,7 @@ function handleJoin(argv, packageVersion) {
         function collectInfoDescriptions(openapi, { entrypointFilename, componentsPrefix }) {
             const { info } = openapi;
             if (info === null || info === void 0 ? void 0 : info.description) {
-                const xTagGroups = 'x-tagGroups';
-                const groupIndex = joinedDef[xTagGroups] ? joinedDef[xTagGroups].findIndex((item) => item.name === entrypointFilename) : -1;
+                const groupIndex = joinedDef[xTagGroups] ? getIndexGroup(entrypointFilename) : -1;
                 if (joinedDef.hasOwnProperty(xTagGroups) &&
                     groupIndex !== -1 &&
                     joinedDef[xTagGroups][groupIndex]['tags'] &&
@@ -306,7 +336,7 @@ function validateComponentsDifference(files) {
     }
     return isDiffer;
 }
-function iteratePotentialConflicts(potentialConflicts) {
+function iteratePotentialConflicts(potentialConflicts, withoutXTagGroups) {
     for (const group of Object.keys(potentialConflicts)) {
         for (const [key, value] of Object.entries(potentialConflicts[group])) {
             const conflicts = filterConflicts(value);
@@ -321,20 +351,28 @@ function iteratePotentialConflicts(potentialConflicts) {
                     }
                 }
                 else {
-                    showConflicts(colorette_1.green(group) + ' => ' + key, conflicts);
-                    potentialConflictsTotal += conflicts.length;
+                    if (withoutXTagGroups && group === 'tags') {
+                        duplicateTagDescriptionWarning(conflicts);
+                    }
+                    else {
+                        potentialConflictsTotal += conflicts.length;
+                        showConflicts(colorette_1.green(group) + ' => ' + key, conflicts);
+                    }
+                }
+                if (group === 'tags' && !withoutXTagGroups) {
+                    prefixTagSuggestion(conflicts.length);
                 }
-                prefixTagSuggestion(group, conflicts.length);
             }
         }
     }
 }
-function prefixTagSuggestion(group, conflictsLength) {
-    if (group === 'tags') {
-        process.stderr.write(colorette_1.green(`
-    ${conflictsLength} conflict(s) on tags.
-    Suggestion: please use ${colorette_1.blue('prefix-tags-with-filename')} or ${colorette_1.blue('prefix-tags-with-info-prop')} to prevent naming conflicts. \n\n`));
-    }
+function duplicateTagDescriptionWarning(conflicts) {
+    const tagsKeys = conflicts.map(([tagName]) => `\`${tagName}\``);
+    const joinString = colorette_1.yellow(', ');
+    process.stderr.write(colorette_1.yellow(`\nwarning: ${tagsKeys.length} conflict(s) on the ${colorette_1.red(tagsKeys.join(joinString))} tags description.\n`));
+}
+function prefixTagSuggestion(conflictsLength) {
+    process.stderr.write(colorette_1.green(`\n${conflictsLength} conflict(s) on tags.\nSuggestion: please use ${colorette_1.blue('prefix-tags-with-filename')}, ${colorette_1.blue('prefix-tags-with-info-prop')} or ${colorette_1.blue('without-x-tag-groups')} to prevent naming conflicts.\n\n`));
 }
 function showConflicts(key, conflicts) {
     for (const [path, files] of conflicts) {

package/lib/commands/lint.d.ts

@@ -1,11 +1,13 @@
-import { OutputFormat } from '@redocly/openapi-core';
-export declare function handleLint(argv: {
+import { OutputFormat, RuleSeverity } from '@redocly/openapi-core';
+export declare type LintOptions = {
     entrypoints: string[];
     'max-problems'?: number;
     'generate-ignore-file'?: boolean;
     'skip-rule'?: string[];
     'skip-preprocessor'?: string[];
+    'lint-config': RuleSeverity;
     extends?: string[];
     config?: string;
     format: OutputFormat;
-}, version: string): Promise<void>;
+};
+export declare function handleLint(argv: LintOptions, version: string): Promise<void>;

package/lib/commands/lint.js

@@ -16,7 +16,7 @@ const colorette_1 = require("colorette");
 const perf_hooks_1 = require("perf_hooks");
 function handleLint(argv, version) {
     return __awaiter(this, void 0, void 0, function* () {
-        const config = yield openapi_core_1.loadConfig(argv.config, argv.extends);
+        const config = yield openapi_core_1.loadConfig(argv.config, argv.extends, lintConfigCallback(argv, version));
         const entrypoints = yield utils_1.getFallbackEntryPointsOrExit(argv.entrypoints, config);
         if (argv['generate-ignore-file']) {
             config.lint.ignore = {}; // clear ignore
@@ -78,3 +78,26 @@ function handleLint(argv, version) {
     });
 }
 exports.handleLint = handleLint;
+function lintConfigCallback(argv, version) {
+    if (argv['lint-config'] === 'off') {
+        return;
+    }
+    return (config) => __awaiter(this, void 0, void 0, function* () {
+        const { 'max-problems': maxProblems, format } = argv;
+        const configPath = openapi_core_1.findConfig(argv.config) || '';
+        const stringYaml = openapi_core_1.stringifyYaml(config);
+        const configContent = openapi_core_1.makeDocumentFromString(stringYaml, configPath);
+        const problems = yield openapi_core_1.lintConfig({
+            document: configContent,
+            severity: argv['lint-config'],
+        });
+        const fileTotals = openapi_core_1.getTotals(problems);
+        openapi_core_1.formatProblems(problems, {
+            format,
+            maxProblems,
+            totals: fileTotals,
+            version,
+        });
+        utils_1.printConfigLintTotals(fileTotals);
+    });
+}