@redocly/cli 1.0.0-beta.104 → 1.0.0-beta.107

package/bin/cli.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("../lib/index");
+require('../lib/index');

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

@@ -23,7 +23,7 @@ export declare const RedoclyClient: jest.Mock<{
 }, []>;
 export declare const loadConfig: jest.Mock<{
     configFile: null;
-    lint: {
+    styleguide: {
         addIgnore: jest.Mock<any, any>;
         skipRules: jest.Mock<any, any>;
         skipPreprocessors: jest.Mock<any, any>;
@@ -46,3 +46,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>;
+export declare const doesYamlFileExist: jest.Mock<any, any>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfig = exports.slash = exports.formatProblems = exports.getTotals = exports.bundle = exports.lint = exports.getMergedConfig = exports.loadConfig = exports.RedoclyClient = exports.__redoclyClient = void 0;
+exports.doesYamlFileExist = 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),
@@ -25,3 +25,4 @@ exports.getTotals = jest.fn(() => ({ errors: 0 }));
 exports.formatProblems = jest.fn();
 exports.slash = jest.fn();
 exports.findConfig = jest.fn();
+exports.doesYamlFileExist = jest.fn();

package/lib/__mocks__/perf_hooks.js

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

package/lib/__mocks__/utils.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="jest" />
-export declare const getFallbackEntryPointsOrExit: jest.Mock<any, [entrypoints: any]>;
+export declare const getFallbackApisOrExit: jest.Mock<any, [entrypoints: any]>;
 export declare const dumpBundle: jest.Mock<string, []>;
 export declare const slash: jest.Mock<any, any>;
 export declare const pluralize: jest.Mock<any, any>;

package/lib/__mocks__/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.exitWithError = exports.handleError = exports.getOutputFileName = exports.printLintTotals = exports.printUnusedWarnings = exports.printExecutionTime = exports.getExecutionTime = exports.pluralize = exports.slash = exports.dumpBundle = exports.getFallbackApisOrExit = void 0;
+exports.getFallbackApisOrExit = jest.fn((entrypoints) => entrypoints.map((path) => ({ path })));
 exports.dumpBundle = jest.fn(() => '');
 exports.slash = jest.fn();
 exports.pluralize = jest.fn();

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

@@ -11,9 +11,10 @@ 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 bundle_1 = require("../../commands/bundle");
+const utils_1 = require("../../utils");
 jest.mock('@redocly/openapi-core');
 jest.mock('../../utils');
-openapi_core_1.getMergedConfig.mockImplementation(config => config);
+openapi_core_1.getMergedConfig.mockImplementation((config) => config);
 describe('bundle', () => {
     let processExitMock;
     let exitCb;
@@ -28,22 +29,22 @@ describe('bundle', () => {
     afterEach(() => {
         openapi_core_1.lint.mockClear();
         openapi_core_1.bundle.mockClear();
-        openapi_core_1.getTotals.mockClear();
+        openapi_core_1.getTotals.mockReset();
     });
     it('bundles definitions w/o linting', () => __awaiter(void 0, void 0, void 0, function* () {
-        const entrypoints = ['foo.yaml', 'bar.yaml'];
+        const apis = ['foo.yaml', 'bar.yaml'];
         yield bundle_1.handleBundle({
-            entrypoints,
+            apis,
             ext: 'yaml',
             format: 'codeframe',
         }, '1.0.0');
         expect(openapi_core_1.lint).toBeCalledTimes(0);
-        expect(openapi_core_1.bundle).toBeCalledTimes(entrypoints.length);
+        expect(openapi_core_1.bundle).toBeCalledTimes(apis.length);
     }));
     it('exits with code 0 when bundles definitions', () => __awaiter(void 0, void 0, void 0, function* () {
-        const entrypoints = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
+        const apis = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
         yield bundle_1.handleBundle({
-            entrypoints,
+            apis,
             ext: 'yaml',
             format: 'codeframe',
         }, '1.0.0');
@@ -51,20 +52,25 @@ describe('bundle', () => {
         expect(processExitMock).toHaveBeenCalledWith(0);
     }));
     it('bundles definitions w/ linting', () => __awaiter(void 0, void 0, void 0, function* () {
-        const entrypoints = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
+        const apis = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
+        openapi_core_1.getTotals.mockReturnValue({
+            errors: 0,
+            warnings: 0,
+            ignored: 0,
+        });
         yield bundle_1.handleBundle({
-            entrypoints,
+            apis,
             ext: 'yaml',
             format: 'codeframe',
             lint: true,
         }, '1.0.0');
-        expect(openapi_core_1.lint).toBeCalledTimes(entrypoints.length);
-        expect(openapi_core_1.bundle).toBeCalledTimes(entrypoints.length);
+        expect(openapi_core_1.lint).toBeCalledTimes(apis.length);
+        expect(openapi_core_1.bundle).toBeCalledTimes(apis.length);
     }));
     it('exits with code 0 when bundles definitions w/linting w/o errors', () => __awaiter(void 0, void 0, void 0, function* () {
-        const entrypoints = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
+        const apis = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
         yield bundle_1.handleBundle({
-            entrypoints,
+            apis,
             ext: 'yaml',
             format: 'codeframe',
             lint: true,
@@ -73,20 +79,49 @@ describe('bundle', () => {
         expect(processExitMock).toHaveBeenCalledWith(0);
     }));
     it('exits with code 1 when bundles definitions w/linting w/errors', () => __awaiter(void 0, void 0, void 0, function* () {
-        const entrypoints = ['foo.yaml'];
+        const apis = ['foo.yaml'];
         openapi_core_1.getTotals.mockReturnValue({
             errors: 1,
             warnings: 0,
-            ignored: 0
+            ignored: 0,
         });
         yield bundle_1.handleBundle({
-            entrypoints,
+            apis,
             ext: 'yaml',
             format: 'codeframe',
             lint: true,
         }, '1.0.0');
-        expect(openapi_core_1.lint).toBeCalledTimes(entrypoints.length);
+        expect(openapi_core_1.lint).toBeCalledTimes(apis.length);
         exitCb === null || exitCb === void 0 ? void 0 : exitCb();
         expect(processExitMock).toHaveBeenCalledWith(1);
     }));
+    it('handleError is called when bundles an invalid definition', () => __awaiter(void 0, void 0, void 0, function* () {
+        const apis = ['invalid.json'];
+        openapi_core_1.bundle.mockImplementationOnce(() => {
+            throw new Error('Invalid definition');
+        });
+        yield bundle_1.handleBundle({
+            apis,
+            ext: 'json',
+            format: 'codeframe',
+            lint: false,
+        }, '1.0.0');
+        expect(utils_1.handleError).toHaveBeenCalledTimes(1);
+        expect(utils_1.handleError).toHaveBeenCalledWith(new Error('Invalid definition'), 'invalid.json');
+    }));
+    it("handleError isn't called when bundles a valid definition", () => __awaiter(void 0, void 0, void 0, function* () {
+        const apis = ['foo.yaml'];
+        openapi_core_1.getTotals.mockReturnValue({
+            errors: 0,
+            warnings: 0,
+            ignored: 0,
+        });
+        yield bundle_1.handleBundle({
+            apis,
+            ext: 'yaml',
+            format: 'codeframe',
+            lint: false,
+        }, '1.0.0');
+        expect(utils_1.handleError).toHaveBeenCalledTimes(0);
+    }));
 });

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

@@ -18,12 +18,12 @@ 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`);
+        yield join_1.handleJoin({ apis: ['first.yaml'] }, 'cli-version');
+        expect(utils_1.exitWithError).toHaveBeenCalledWith(`At least 2 apis 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'],
+            apis: ['first.yaml', 'second.yaml'],
             'prefix-tags-with-info-prop': 'something',
             'without-x-tag-groups': true,
             'prefix-tags-with-filename': true,
@@ -32,7 +32,7 @@ describe('handleJoin fails', () => {
     }));
     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'],
+            apis: ['first.yaml', 'second.yaml'],
             'without-x-tag-groups': true,
             'prefix-tags-with-filename': true,
         }, 'cli-version');

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

@@ -18,7 +18,7 @@ jest.mock('@redocly/openapi-core');
 jest.mock('../../utils');
 jest.mock('perf_hooks');
 const argvMock = {
-    entrypoints: ['openapi.yaml'],
+    apis: ['openapi.yaml'],
     'lint-config': 'off',
     format: 'codeframe',
 };
@@ -36,19 +36,25 @@ describe('handleLint', () => {
             return process.on(_e, cb);
         });
         getMergedConfigMock.mockReturnValue(config_1.ConfigFixture);
+        openapi_core_1.doesYamlFileExist.mockImplementation((path) => path === 'redocly.yaml');
     });
     afterEach(() => {
         getMergedConfigMock.mockReset();
     });
     describe('loadConfig and getEnrtypoints stage', () => {
-        it('shoul call loadConfig and getFallbackEntryPointsOrExit', () => __awaiter(void 0, void 0, void 0, function* () {
+        it('should fail if config file does not exist', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { config: 'config.yaml' }), versionMock);
+            expect(utils_1.exitWithError).toHaveBeenCalledWith('Please, provide valid path to the configuration file');
+            expect(openapi_core_1.loadConfig).toHaveBeenCalledTimes(0);
+        }));
+        it('should call loadConfig and getFallbackApisOrExit', () => __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();
+            expect(utils_1.getFallbackApisOrExit).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);
+            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { config: 'redocly.yaml', extends: ['some/path'] }), versionMock);
+            expect(openapi_core_1.loadConfig).toHaveBeenCalledWith('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);
@@ -65,8 +71,8 @@ describe('handleLint', () => {
         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']);
+            expect(config_1.ConfigFixture.styleguide.skipRules).toHaveBeenCalledWith(['rule']);
+            expect(config_1.ConfigFixture.styleguide.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']);
@@ -83,7 +89,7 @@ describe('handleLint', () => {
         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', '');
+            expect(utils_1.handleError).toHaveBeenCalledWith('error', 'openapi.yaml');
         }));
     });
     describe('erros and warning handle after lint stage', () => {

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

@@ -34,7 +34,7 @@ describe('push-with-region', () => {
         redoclyClient.domain = 'redoc.ly';
         yield push_1.handlePush({
             upsert: true,
-            entrypoint: 'spec.json',
+            api: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
         });
@@ -45,7 +45,7 @@ describe('push-with-region', () => {
         redoclyClient.domain = 'eu.redocly.com';
         yield push_1.handlePush({
             upsert: true,
-            entrypoint: 'spec.json',
+            api: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
         });

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

@@ -30,10 +30,10 @@ describe('push', () => {
     it('pushes definition', () => __awaiter(void 0, void 0, void 0, function* () {
         yield push_1.handlePush({
             upsert: true,
-            entrypoint: 'spec.json',
+            api: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
-            'public': true,
+            public: true,
             'batch-id': '123',
             'batch-size': 2,
         });
@@ -55,10 +55,10 @@ describe('push', () => {
     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',
+            api: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
-            'public': true,
+            public: true,
             'batch-id': ' ',
             'batch-size': 2,
         });
@@ -67,10 +67,10 @@ describe('push', () => {
     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',
+            api: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
-            'public': true,
+            public: true,
             'batch-id': '123',
             'batch-size': 1,
         });
@@ -81,23 +81,23 @@ describe('transformPush', () => {
     it('should adapt the existing syntax', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeEntrypointOrAliasOrDestination: 'openapi.yaml',
+            maybeApiOrDestination: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
         });
         expect(cb).toBeCalledWith({
-            entrypoint: 'openapi.yaml',
+            api: 'openapi.yaml',
             destination: '@testing_org/main@v1',
         });
     });
     it('should adapt the existing syntax (including branchName)', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeEntrypointOrAliasOrDestination: 'openapi.yaml',
+            maybeApiOrDestination: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
             maybeBranchName: 'other',
         });
         expect(cb).toBeCalledWith({
-            entrypoint: 'openapi.yaml',
+            api: 'openapi.yaml',
             destination: '@testing_org/main@v1',
             branchName: 'other',
         });
@@ -105,13 +105,13 @@ describe('transformPush', () => {
     it('should use --branch option firstly', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeEntrypointOrAliasOrDestination: 'openapi.yaml',
+            maybeApiOrDestination: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
             maybeBranchName: 'other',
             branch: 'priority-branch',
         });
         expect(cb).toBeCalledWith({
-            entrypoint: 'openapi.yaml',
+            api: 'openapi.yaml',
             destination: '@testing_org/main@v1',
             branchName: 'priority-branch',
         });
@@ -119,7 +119,7 @@ describe('transformPush', () => {
     it('should work for a destination only', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeEntrypointOrAliasOrDestination: '@testing_org/main@v1',
+            maybeApiOrDestination: '@testing_org/main@v1',
         });
         expect(cb).toBeCalledWith({
             destination: '@testing_org/main@v1',
@@ -128,12 +128,12 @@ describe('transformPush', () => {
     it('should accept aliases for the old syntax', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeEntrypointOrAliasOrDestination: 'alias',
+            maybeApiOrDestination: 'alias',
             maybeDestination: '@testing_org/main@v1',
         });
         expect(cb).toBeCalledWith({
             destination: '@testing_org/main@v1',
-            entrypoint: 'alias',
+            api: 'alias',
         });
     });
     it('should accept no arguments at all', () => {
@@ -164,7 +164,7 @@ describe('getDestinationProps', () => {
         expect(push_1.getDestinationProps('main@v1', undefined)).toEqual([, 'main', 'v1']);
     });
 });
-describe('getApiEntrypoint', () => {
+describe('getApiRoot', () => {
     let config = {
         apis: {
             'main@v1': {
@@ -176,9 +176,9 @@ describe('getApiEntrypoint', () => {
         },
     };
     it('should resolve the correct api for a valid name & version', () => {
-        expect(push_1.getApiEntrypoint({ name: 'main', version: 'v1', config })).toEqual('openapi.yaml');
+        expect(push_1.getApiRoot({ name: 'main', version: 'v1', config })).toEqual('openapi.yaml');
     });
     it('should resolve the latest version of api if there is no matching version', () => {
-        expect(push_1.getApiEntrypoint({ name: 'main', version: 'latest', config })).toEqual('latest.yaml');
+        expect(push_1.getApiRoot({ name: 'main', version: 'latest', config })).toEqual('latest.yaml');
     });
 });

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

@@ -1,7 +1,7 @@
 /// <reference types="jest" />
 export declare const ConfigFixture: {
     configFile: null;
-    lint: {
+    styleguide: {
         addIgnore: jest.Mock<any, any>;
         skipRules: jest.Mock<any, any>;
         skipPreprocessors: jest.Mock<any, any>;

package/lib/__tests__/fixtures/config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigFixture = void 0;
 exports.ConfigFixture = {
     configFile: null,
-    lint: {
+    styleguide: {
         addIgnore: jest.fn(),
         skipRules: jest.fn(),
         skipPreprocessors: jest.fn(),

package/lib/commands/bundle.d.ts

@@ -1,20 +1,12 @@
-import { OutputFormat } from '@redocly/openapi-core';
-import { OutputExtensions } from '../types';
-export declare function handleBundle(argv: {
-    entrypoints: string[];
+import type { CommonOptions, OutputExtensions, Skips } from '../types';
+export declare type BundleOptions = CommonOptions & Skips & {
     output?: string;
     ext: OutputExtensions;
-    'max-problems'?: number;
-    'skip-rule'?: string[];
-    'skip-preprocessor'?: string[];
-    'skip-decorator'?: string[];
     dereferenced?: boolean;
     force?: boolean;
-    config?: string;
     lint?: boolean;
-    format: OutputFormat;
     metafile?: string;
-    extends?: string[];
     'remove-unused-components'?: boolean;
     'keep-url-references'?: boolean;
-}, version: string): Promise<void>;
+};
+export declare function handleBundle(argv: BundleOptions, version: string): Promise<void>;

package/lib/commands/bundle.js

@@ -31,19 +31,20 @@ function handleBundle(argv, version) {
     return __awaiter(this, void 0, void 0, function* () {
         const config = yield openapi_core_1.loadConfig(argv.config, argv.extends);
         const removeUnusedComponents = argv['remove-unused-components'] &&
-            !((_b = (_a = config.rawConfig.lint) === null || _a === void 0 ? void 0 : _a.decorators) === null || _b === void 0 ? void 0 : _b.hasOwnProperty('remove-unused-components'));
-        const entrypoints = yield utils_1.getFallbackEntryPointsOrExit(argv.entrypoints, config);
+            !((_b = (_a = config.rawConfig.styleguide) === null || _a === void 0 ? void 0 : _a.decorators) === null || _b === void 0 ? void 0 : _b.hasOwnProperty('remove-unused-components'));
+        const apis = yield utils_1.getFallbackApisOrExit(argv.apis, config);
         const totals = { errors: 0, warnings: 0, ignored: 0 };
         const maxProblems = argv['max-problems'];
-        for (const { path, alias } of entrypoints) {
+        for (const { path, alias } of apis) {
             try {
                 const startedAt = perf_hooks_1.performance.now();
                 const resolvedConfig = openapi_core_1.getMergedConfig(config, alias);
-                resolvedConfig.lint.skipRules(argv['skip-rule']);
-                resolvedConfig.lint.skipPreprocessors(argv['skip-preprocessor']);
-                resolvedConfig.lint.skipDecorators(argv['skip-decorator']);
+                const { styleguide } = resolvedConfig;
+                styleguide.skipRules(argv['skip-rule']);
+                styleguide.skipPreprocessors(argv['skip-preprocessor']);
+                styleguide.skipDecorators(argv['skip-decorator']);
                 if (argv.lint) {
-                    if (config.lint.recommendedFallback) {
+                    if (config.styleguide.recommendedFallback) {
                         process.stderr.write(`No configurations were defined in extends -- using built in ${colorette_1.blue('recommended')} configuration by default.\n${colorette_1.red('Warning! This default behavior is going to be deprecated soon.')}\n\n`);
                     }
                     const results = yield openapi_core_1.lint({
@@ -71,7 +72,7 @@ function handleBundle(argv, version) {
                     keepUrlRefs: argv['keep-url-references'],
                 }), { bundle: result, problems } = _e, meta = __rest(_e, ["bundle", "problems"]);
                 const fileTotals = openapi_core_1.getTotals(problems);
-                const { outputFile, ext } = utils_1.getOutputFileName(path, entrypoints.length, argv.output, argv.ext);
+                const { outputFile, ext } = utils_1.getOutputFileName(path, apis.length, argv.output, argv.ext);
                 if (fileTotals.errors === 0 || argv.force) {
                     if (!argv.output) {
                         const output = utils_1.dumpBundle(result.parsed, argv.ext || 'yaml', argv.dereferenced);
@@ -92,8 +93,8 @@ function handleBundle(argv, version) {
                     version,
                 });
                 if (argv.metafile) {
-                    if (entrypoints.length > 1) {
-                        process.stderr.write(colorette_1.yellow(`[WARNING] "--metafile" cannot be used with multiple entrypoints. Skipping...`));
+                    if (apis.length > 1) {
+                        process.stderr.write(colorette_1.yellow(`[WARNING] "--metafile" cannot be used with multiple apis. Skipping...`));
                     }
                     {
                         fs_1.writeFileSync(argv.metafile, JSON.stringify(meta), 'utf-8');
@@ -120,7 +121,7 @@ function handleBundle(argv, version) {
                 utils_1.handleError(e, path);
             }
         }
-        utils_1.printUnusedWarnings(config.lint);
+        utils_1.printUnusedWarnings(config.styleguide);
         // defer process exit to allow STDOUT pipe to flush
         // see https://github.com/nodejs/node-v0.x-archive/issues/3737#issuecomment-19156072
         process.once('exit', () => process.exit(totals.errors === 0 || argv.force ? 0 : 1));

package/lib/commands/join.d.ts

@@ -1,5 +1,5 @@
 declare type JoinArgv = {
-    entrypoints: string[];
+    apis: string[];
     lint?: boolean;
     'prefix-tags-with-info-prop'?: string;
     'prefix-tags-with-filename'?: boolean;