@redocly/cli 1.0.0-beta.106 → 1.0.0-beta.109

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

@@ -1,4 +1,5 @@
 /// <reference types="jest" />
+import { Document, ResolveError } from '@redocly/openapi-core';
 export declare const __redoclyClient: {
     isAuthorizedWithRedocly: jest.Mock<any, any>;
     isAuthorizedWithRedoclyByRegion: jest.Mock<any, any>;
@@ -47,3 +48,30 @@ 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>;
+export declare const bundleDocument: jest.Mock<Promise<{
+    problems: {};
+}>, []>;
+export declare const detectOpenAPI: jest.Mock<any, any>;
+export declare class BaseResolver {
+    cache: Map<string, Promise<ResolveError | Document>>;
+    getFiles: jest.Mock<any, any>;
+    resolveExternalRef: jest.Mock<any, any>;
+    loadExternalRef: typeof jest.fn;
+    parseDocument: jest.Mock<any, any>;
+    resolveDocument: jest.Mock<any, any>;
+}
+export declare enum OasVersion {
+    Version2 = "oas2",
+    Version3_0 = "oas3_0",
+    Version3_1 = "oas3_1"
+}
+export declare enum Oas3Operations {
+    get = "get",
+    put = "put",
+    post = "post",
+    delete = "delete",
+    options = "options",
+    head = "head",
+    patch = "patch",
+    trace = "trace"
+}

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doesYamlFileExist = exports.findConfig = exports.slash = exports.formatProblems = exports.getTotals = exports.bundle = exports.lint = exports.getMergedConfig = exports.loadConfig = exports.RedoclyClient = exports.__redoclyClient = void 0;
+exports.Oas3Operations = exports.OasVersion = exports.BaseResolver = exports.detectOpenAPI = exports.bundleDocument = 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");
+const documents_1 = require("../documents");
 exports.__redoclyClient = {
     isAuthorizedWithRedocly: jest.fn().mockResolvedValue(true),
     isAuthorizedWithRedoclyByRegion: jest.fn().mockResolvedValue(true),
@@ -26,3 +27,36 @@ exports.formatProblems = jest.fn();
 exports.slash = jest.fn();
 exports.findConfig = jest.fn();
 exports.doesYamlFileExist = jest.fn();
+exports.bundleDocument = jest.fn(() => Promise.resolve({ problems: {} }));
+exports.detectOpenAPI = jest.fn();
+class BaseResolver {
+    constructor() {
+        this.cache = new Map();
+        this.getFiles = jest.fn();
+        this.resolveExternalRef = jest.fn();
+        this.loadExternalRef = jest.fn;
+        this.parseDocument = jest.fn();
+        this.resolveDocument = jest
+            .fn()
+            .mockImplementationOnce(() => Promise.resolve({ source: { absoluteRef: 'ref' }, parsed: documents_1.firstDocument }))
+            .mockImplementationOnce(() => Promise.resolve({ source: { absoluteRef: 'ref' }, parsed: documents_1.secondDocument }));
+    }
+}
+exports.BaseResolver = BaseResolver;
+var OasVersion;
+(function (OasVersion) {
+    OasVersion["Version2"] = "oas2";
+    OasVersion["Version3_0"] = "oas3_0";
+    OasVersion["Version3_1"] = "oas3_1";
+})(OasVersion = exports.OasVersion || (exports.OasVersion = {}));
+var Oas3Operations;
+(function (Oas3Operations) {
+    Oas3Operations["get"] = "get";
+    Oas3Operations["put"] = "put";
+    Oas3Operations["post"] = "post";
+    Oas3Operations["delete"] = "delete";
+    Oas3Operations["options"] = "options";
+    Oas3Operations["head"] = "head";
+    Oas3Operations["patch"] = "patch";
+    Oas3Operations["trace"] = "trace";
+})(Oas3Operations = exports.Oas3Operations || (exports.Oas3Operations = {}));

package/lib/__mocks__/documents.d.ts

@@ -0,0 +1,92 @@
+export declare const firstDocument: {
+    openapi: string;
+    servers: {
+        url: string;
+    }[];
+    info: {
+        description: string;
+        version: string;
+        title: string;
+        termsOfService: string;
+        license: {
+            name: string;
+            url: string;
+        };
+    };
+    paths: {
+        '/GETUser/{userId}': {
+            summary: string;
+            description: string;
+            servers: ({
+                url: string;
+                description?: undefined;
+            } | {
+                url: string;
+                description: string;
+            })[];
+            get: {
+                tags: string[];
+                summary: string;
+                description: string;
+                operationId: string;
+                servers: {
+                    url: string;
+                }[];
+            };
+            parameters: {
+                name: string;
+                in: string;
+                schema: {
+                    description: string;
+                };
+            }[];
+        };
+    };
+    components: {};
+};
+export declare const secondDocument: {
+    openapi: string;
+    servers: {
+        url: string;
+    }[];
+    info: {
+        description: string;
+        version: string;
+        title: string;
+        termsOfService: string;
+        license: {
+            name: string;
+            url: string;
+        };
+    };
+    post: {
+        '/GETUser/{userId}': {
+            summary: string;
+            description: string;
+            servers: ({
+                url: string;
+                description?: undefined;
+            } | {
+                url: string;
+                description: string;
+            })[];
+            get: {
+                tags: string[];
+                summary: string;
+                description: string;
+                operationId: string;
+                servers: {
+                    url: string;
+                }[];
+            };
+            parameters: {
+                name: string;
+                in: string;
+                schema: {
+                    description: string;
+                };
+            }[];
+        };
+    };
+    components: {};
+};

package/lib/__mocks__/documents.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.secondDocument = exports.firstDocument = void 0;
+exports.firstDocument = {
+    openapi: '3.0.0',
+    servers: [{ url: 'http://localhost:8080' }],
+    info: {
+        description: 'example test',
+        version: '1.0.0',
+        title: 'Swagger Petstore',
+        termsOfService: 'http://swagger.io/terms/',
+        license: {
+            name: 'Apache 2.0',
+            url: 'http://www.apache.org/licenses/LICENSE-2.0.html',
+        },
+    },
+    paths: {
+        '/GETUser/{userId}': {
+            summary: 'get user by id',
+            description: 'user info',
+            servers: [{ url: '/user' }, { url: '/pet', description: 'pet server' }],
+            get: {
+                tags: ['pet'],
+                summary: 'Find pet by ID',
+                description: 'Returns a single pet',
+                operationId: 'getPetById',
+                servers: [{ url: '/pet' }],
+            },
+            parameters: [{ name: 'param1', in: 'header', schema: { description: 'string' } }],
+        },
+    },
+    components: {},
+};
+exports.secondDocument = {
+    openapi: '3.0.0',
+    servers: [{ url: 'http://localhost:8080' }],
+    info: {
+        description: 'example test',
+        version: '1.0.0',
+        title: 'Swagger Petstore',
+        termsOfService: 'http://swagger.io/terms/',
+        license: {
+            name: 'Apache 2.0',
+            url: 'http://www.apache.org/licenses/LICENSE-2.0.html',
+        },
+    },
+    post: {
+        '/GETUser/{userId}': {
+            summary: 'get user',
+            description: 'user information',
+            servers: [{ url: '/user' }, { url: '/pet', description: '' }],
+            get: {
+                tags: ['pet'],
+                summary: 'Find pet by ID',
+                description: 'Returns a single pet',
+                operationId: 'getPetById',
+                servers: [{ url: '/pet' }],
+            },
+            parameters: [{ name: 'param1', in: 'header', schema: { description: 'string' } }],
+        },
+    },
+    components: {},
+};

package/lib/__mocks__/utils.d.ts

@@ -13,3 +13,4 @@ export declare const getOutputFileName: jest.Mock<{
 }, []>;
 export declare const handleError: jest.Mock<any, any>;
 export declare const exitWithError: jest.Mock<any, any>;
+export declare const writeYaml: jest.Mock<any, any>;

package/lib/__mocks__/utils.js

@@ -1,6 +1,6 @@
 "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.getFallbackApisOrExit = void 0;
+exports.writeYaml = 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();
@@ -12,3 +12,4 @@ exports.printLintTotals = jest.fn();
 exports.getOutputFileName = jest.fn(() => ({ outputFile: 'test.yaml', ext: 'yaml' }));
 exports.handleError = jest.fn();
 exports.exitWithError = jest.fn();
+exports.writeYaml = jest.fn();

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const join_1 = require("../../commands/join");
 const utils_1 = require("../../utils");
 const colorette_1 = require("colorette");
+const openapi_core_1 = require("@redocly/openapi-core");
 jest.mock('../../utils');
 jest.mock('colorette');
 describe('handleJoin fails', () => {
@@ -38,4 +39,17 @@ describe('handleJoin fails', () => {
         }, 'cli-version');
         expect(utils_1.exitWithError).toHaveBeenCalledWith(`You use prefix-tags-with-filename, without-x-tag-groups together.\nPlease choose only one! \n\n`);
     }));
+    it('should call exitWithError because Only OpenAPI 3 is supported', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield join_1.handleJoin({
+            apis: ['first.yaml', 'second.yaml'],
+        }, 'cli-version');
+        expect(utils_1.exitWithError).toHaveBeenCalledWith('Only OpenAPI 3 is supported: undefined \n\n');
+    }));
+    it('should call writeYaml function', () => __awaiter(void 0, void 0, void 0, function* () {
+        openapi_core_1.detectOpenAPI.mockReturnValue('oas3_0');
+        yield join_1.handleJoin({
+            apis: ['first.yaml', 'second.yaml'],
+        }, 'cli-version');
+        expect(utils_1.writeYaml).toHaveBeenCalled();
+    }));
 });

package/lib/commands/join.js

@@ -17,6 +17,7 @@ const isEqual = require('lodash.isequal');
 const openapi_core_1 = require("@redocly/openapi-core");
 const utils_1 = require("../utils");
 const js_utils_1 = require("../js-utils");
+const types_1 = require("./split/types");
 const COMPONENTS = 'components';
 const Tags = 'tags';
 const xTagGroups = 'x-tagGroups';
@@ -73,8 +74,8 @@ function handleJoin(argv, packageVersion) {
                 yield validateApi(document, config.styleguide, externalRefResolver, packageVersion);
             }
         }
-        let joinedDef = {};
-        let potentialConflicts = {
+        const joinedDef = {};
+        const potentialConflicts = {
             tags: {},
             paths: {},
             components: {},
@@ -225,69 +226,144 @@ function handleJoin(argv, packageVersion) {
         }
         function collectPaths(openapi, { apiFilename, api, potentialConflicts, tagsPrefix, componentsPrefix }) {
             const { paths } = openapi;
+            const operationsSet = new Set(js_utils_1.keysOf(types_1.OPENAPI3_METHOD));
             if (paths) {
                 if (!joinedDef.hasOwnProperty('paths')) {
                     joinedDef['paths'] = {};
                 }
-                for (const path of Object.keys(paths)) {
+                for (const path of js_utils_1.keysOf(paths)) {
                     if (!joinedDef.paths.hasOwnProperty(path)) {
                         joinedDef.paths[path] = {};
                     }
                     if (!potentialConflicts.paths.hasOwnProperty(path)) {
                         potentialConflicts.paths[path] = {};
                     }
-                    for (const operation of Object.keys(paths[path])) {
-                        // @ts-ignore
-                        const pathOperation = paths[path][operation];
-                        joinedDef.paths[path][operation] = pathOperation;
-                        potentialConflicts.paths[path][operation] = [
-                            ...(potentialConflicts.paths[path][operation] || []),
-                            api,
-                        ];
-                        const { operationId } = pathOperation;
-                        if (operationId) {
-                            if (!potentialConflicts.paths.hasOwnProperty('operationIds')) {
-                                potentialConflicts.paths['operationIds'] = {};
-                            }
-                            potentialConflicts.paths.operationIds[operationId] = [
-                                ...(potentialConflicts.paths.operationIds[operationId] || []),
-                                api,
-                            ];
+                    const pathItem = paths[path];
+                    for (const field of js_utils_1.keysOf(pathItem)) {
+                        if (operationsSet.has(field)) {
+                            collectPathOperation(pathItem, path, field);
                         }
-                        let { tags, security } = joinedDef.paths[path][operation];
-                        if (tags) {
-                            joinedDef.paths[path][operation].tags = tags.map((tag) => addPrefix(tag, tagsPrefix));
-                            populateTags({
-                                api,
-                                apiFilename,
-                                tags: formatTags(tags),
-                                potentialConflicts,
-                                tagsPrefix,
-                                componentsPrefix,
-                            });
+                        if (field === 'servers') {
+                            collectPathServers(pathItem, path);
                         }
-                        else {
-                            joinedDef.paths[path][operation]['tags'] = [
-                                addPrefix('other', tagsPrefix || apiFilename),
-                            ];
-                            populateTags({
-                                api,
-                                apiFilename,
-                                tags: formatTags(['other']),
-                                potentialConflicts,
-                                tagsPrefix: tagsPrefix || apiFilename,
-                                componentsPrefix,
-                            });
+                        if (field === 'parameters') {
+                            collectPathParameters(pathItem, path);
+                        }
+                        if (typeof pathItem[field] === 'string') {
+                            collectPathStringFields(pathItem, path, field);
                         }
-                        if (!security && openapi.hasOwnProperty('security')) {
-                            joinedDef.paths[path][operation]['security'] = addSecurityPrefix(openapi.security, componentsPrefix);
+                    }
+                }
+            }
+            function collectPathStringFields(pathItem, path, field) {
+                const fieldValue = pathItem[field];
+                if (joinedDef.paths[path].hasOwnProperty(field) &&
+                    joinedDef.paths[path][field] !== fieldValue) {
+                    process.stderr.write(colorette_1.yellow(`warning: different ${field} values in ${path}\n`));
+                    return;
+                }
+                joinedDef.paths[path][field] = fieldValue;
+            }
+            function collectPathServers(pathItem, path) {
+                if (!pathItem.servers) {
+                    return;
+                }
+                if (!joinedDef.paths[path].hasOwnProperty('servers')) {
+                    joinedDef.paths[path].servers = [];
+                }
+                for (const server of pathItem.servers) {
+                    let isFoundServer = false;
+                    for (const pathServer of joinedDef.paths[path].servers) {
+                        if (pathServer.url === server.url) {
+                            if (!isServersEqual(pathServer, server)) {
+                                utils_1.exitWithError(`Different server values for (${server.url}) in ${path}`);
+                            }
+                            isFoundServer = true;
                         }
-                        else if (pathOperation.security) {
-                            joinedDef.paths[path][operation].security = addSecurityPrefix(pathOperation.security, componentsPrefix);
+                    }
+                    if (!isFoundServer) {
+                        joinedDef.paths[path].servers.push(server);
+                    }
+                }
+            }
+            function collectPathParameters(pathItem, path) {
+                if (!pathItem.parameters) {
+                    return;
+                }
+                if (!joinedDef.paths[path].hasOwnProperty('parameters')) {
+                    joinedDef.paths[path].parameters = [];
+                }
+                for (const parameter of pathItem.parameters) {
+                    let isFoundParameter = false;
+                    for (const pathParameter of joinedDef.paths[path].parameters) {
+                        if (pathParameter.name === parameter.name && pathParameter.in === parameter.in) {
+                            if (!isEqual(pathParameter.schema, parameter.schema)) {
+                                utils_1.exitWithError(`Different parameter schemas for (${parameter.name}) in ${path}`);
+                            }
+                            isFoundParameter = true;
                         }
                     }
+                    if (!isFoundParameter) {
+                        joinedDef.paths[path].parameters.push(parameter);
+                    }
                 }
             }
+            function collectPathOperation(pathItem, path, operation) {
+                const pathOperation = pathItem[operation];
+                if (!pathOperation) {
+                    return;
+                }
+                joinedDef.paths[path][operation] = pathOperation;
+                potentialConflicts.paths[path][operation] = [
+                    ...(potentialConflicts.paths[path][operation] || []),
+                    api,
+                ];
+                const { operationId } = pathOperation;
+                if (operationId) {
+                    if (!potentialConflicts.paths.hasOwnProperty('operationIds')) {
+                        potentialConflicts.paths['operationIds'] = {};
+                    }
+                    potentialConflicts.paths.operationIds[operationId] = [
+                        ...(potentialConflicts.paths.operationIds[operationId] || []),
+                        api,
+                    ];
+                }
+                const { tags, security } = joinedDef.paths[path][operation];
+                if (tags) {
+                    joinedDef.paths[path][operation].tags = tags.map((tag) => addPrefix(tag, tagsPrefix));
+                    populateTags({
+                        api,
+                        apiFilename,
+                        tags: formatTags(tags),
+                        potentialConflicts,
+                        tagsPrefix,
+                        componentsPrefix,
+                    });
+                }
+                else {
+                    joinedDef.paths[path][operation]['tags'] = [addPrefix('other', tagsPrefix || apiFilename)];
+                    populateTags({
+                        api,
+                        apiFilename,
+                        tags: formatTags(['other']),
+                        potentialConflicts,
+                        tagsPrefix: tagsPrefix || apiFilename,
+                        componentsPrefix,
+                    });
+                }
+                if (!security && openapi.hasOwnProperty('security')) {
+                    joinedDef.paths[path][operation]['security'] = addSecurityPrefix(openapi.security, componentsPrefix);
+                }
+                else if (pathOperation.security) {
+                    joinedDef.paths[path][operation].security = addSecurityPrefix(pathOperation.security, componentsPrefix);
+                }
+            }
+        }
+        function isServersEqual(serverOne, serverTwo) {
+            if (serverOne.description === serverTwo.description) {
+                return isEqual(serverOne.variables, serverTwo.variables);
+            }
+            return false;
         }
         function collectComponents(openapi, { api, potentialConflicts, componentsPrefix }) {
             const { components } = openapi;
@@ -295,13 +371,11 @@ function handleJoin(argv, packageVersion) {
                 if (!joinedDef.hasOwnProperty(COMPONENTS)) {
                     joinedDef[COMPONENTS] = {};
                 }
-                for (const component of Object.keys(components)) {
+                for (const [component, componentObj] of Object.entries(components)) {
                     if (!potentialConflicts[COMPONENTS].hasOwnProperty(component)) {
                         potentialConflicts[COMPONENTS][component] = {};
                         joinedDef[COMPONENTS][component] = {};
                     }
-                    // @ts-ignore
-                    const componentObj = components[component];
                     for (const item of Object.keys(componentObj)) {
                         const componentPrefix = addPrefix(item, componentsPrefix);
                         potentialConflicts.components[component][componentPrefix] = [
@@ -315,7 +389,6 @@ function handleJoin(argv, packageVersion) {
         }
         function collectXWebhooks(openapi, { apiFilename, api, potentialConflicts, tagsPrefix, componentsPrefix }) {
             const xWebhooks = 'x-webhooks';
-            // @ts-ignore
             const openapiXWebhooks = openapi[xWebhooks];
             if (openapiXWebhooks) {
                 if (!joinedDef.hasOwnProperty(xWebhooks)) {
@@ -333,7 +406,7 @@ function handleJoin(argv, packageVersion) {
                         ];
                     }
                     for (const operationKey of Object.keys(joinedDef[xWebhooks][webhook])) {
-                        let { tags } = joinedDef[xWebhooks][webhook][operationKey];
+                        const { tags } = joinedDef[xWebhooks][webhook][operationKey];
                         if (tags) {
                             joinedDef[xWebhooks][webhook][operationKey].tags = tags.map((tag) => addPrefix(tag, tagsPrefix));
                             populateTags({
@@ -373,7 +446,7 @@ function doesComponentsDiffer(curr, next) {
 function validateComponentsDifference(files) {
     let isDiffer = false;
     for (let i = 0, len = files.length; i < len; i++) {
-        let next = files[i + 1];
+        const next = files[i + 1];
         if (next && doesComponentsDiffer(files[i], next)) {
             isDiffer = true;
         }

package/lib/commands/lint.js

@@ -47,7 +47,7 @@ function handleLint(argv, version) {
                 totals.warnings += fileTotals.warnings;
                 totals.ignored += fileTotals.ignored;
                 if (argv['generate-ignore-file']) {
-                    for (let m of results) {
+                    for (const m of results) {
                         config.styleguide.addIgnore(m);
                         totalIgnored++;
                     }
@@ -85,6 +85,10 @@ function lintConfigCallback(argv, version) {
     if (argv['lint-config'] === 'off') {
         return;
     }
+    if (argv.format === 'json') {
+        // we can't print config lint results as it will break json output
+        return;
+    }
     return (config) => __awaiter(this, void 0, void 0, function* () {
         const { 'max-problems': maxProblems, format } = argv;
         const configPath = openapi_core_1.findConfig(argv.config) || '';

package/lib/commands/preview-docs/index.js

@@ -94,7 +94,7 @@ function previewDocs(argv) {
         });
         function reloadConfig() {
             return __awaiter(this, void 0, void 0, function* () {
-                let config = yield openapi_core_1.loadConfig(argv.config);
+                const config = yield openapi_core_1.loadConfig(argv.config);
                 const redoclyClient = new openapi_core_1.RedoclyClient();
                 isAuthorizedWithRedocly = yield redoclyClient.isAuthorizedWithRedocly();
                 const resolvedConfig = openapi_core_1.getMergedConfig(config, argv.api);
@@ -112,7 +112,9 @@ exports.previewDocs = previewDocs;
 function debounce(func, wait, immediate) {
     let timeout;
     return function executedFunction(...args) {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
         const context = this;
         const later = () => {
             timeout = null;

package/lib/commands/preview-docs/preview-server/preview-server.js

@@ -79,6 +79,7 @@ function startPreviewServer(port, host, { getBundle, getOptions, useRedocPro, })
             }
             else {
                 let filePath = 
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 {
                     '/hot.js': path.join(__dirname, 'hot.js'),
@@ -112,7 +113,7 @@ function startPreviewServer(port, host, { getBundle, getOptions, useRedocPro, })
             }
             console.timeEnd(colorette.dim(`GET ${request.url}`));
         });
-        let wsPort = yield portfinder.getPortPromise({ port: 32201 });
+        const wsPort = yield portfinder.getPortPromise({ port: 32201 });
         const server = server_1.startHttpServer(port, host, handler);
         server.on('listening', () => {
             process.stdout.write(`\n  🔎  Preview server running at ${colorette.blue(`http://${host}:${port}\n`)}`);

package/lib/commands/push.js

@@ -75,7 +75,7 @@ function handlePush(argv) {
                 const filesHash = hashFiles(filesToUpload.files);
                 process.stdout.write(`Uploading ${filesToUpload.files.length} ${utils_1.pluralize('file', filesToUpload.files.length)}:\n`);
                 let uploaded = 0;
-                for (let file of filesToUpload.files) {
+                for (const file of filesToUpload.files) {
                     const { signedUploadUrl, filePath } = yield client.registryApi.prepareFileUpload({
                         organizationId,
                         name,
@@ -142,7 +142,7 @@ function getFilesList(dir, files) {
 }
 function collectFilesToUpload(api, config) {
     return __awaiter(this, void 0, void 0, function* () {
-        let files = [];
+        const files = [];
         const [{ path: apiPath }] = yield utils_1.getFallbackApisOrExit([api], config);
         process.stdout.write('Bundling definition\n');
         const { bundle: openapiBundle, problems } = yield openapi_core_1.bundle({
@@ -173,7 +173,7 @@ function collectFilesToUpload(api, config) {
                 const fileList = getFilesList(dir, []);
                 files.push(...fileList.map((f) => getFileEntry(f)));
             }
-            let pluginFiles = new Set();
+            const pluginFiles = new Set();
             for (const plugin of config.styleguide.pluginPaths) {
                 if (typeof plugin !== 'string')
                     continue;
@@ -207,7 +207,7 @@ function getFolder(filePath) {
     return path.resolve(path.dirname(filePath));
 }
 function hashFiles(filePaths) {
-    let sum = crypto_1.createHash('sha256');
+    const sum = crypto_1.createHash('sha256');
     filePaths.forEach((file) => sum.update(fs.readFileSync(file.filePath)));
     return sum.digest('hex');
 }
@@ -229,7 +229,7 @@ function getDestinationProps(destination, organization) {
 exports.getDestinationProps = getDestinationProps;
 const transformPush = (callback) => (_a) => {
     var { maybeApiOrDestination, maybeDestination, maybeBranchName, branch } = _a, rest = __rest(_a, ["maybeApiOrDestination", "maybeDestination", "maybeBranchName", "branch"]);
-    if (!!maybeBranchName) {
+    if (maybeBranchName) {
         process.stderr.write(colorette_1.yellow('Deprecation warning: Do not use the third parameter as a branch name. Please use a separate --branch option instead.'));
     }
     const api = maybeDestination ? maybeApiOrDestination : undefined;
@@ -247,7 +247,7 @@ function uploadFileToS3(url, filePathOrBuffer) {
     const fileSizeInBytes = typeof filePathOrBuffer === 'string'
         ? fs.statSync(filePathOrBuffer).size
         : filePathOrBuffer.byteLength;
-    let readStream = typeof filePathOrBuffer === 'string' ? fs.createReadStream(filePathOrBuffer) : filePathOrBuffer;
+    const readStream = typeof filePathOrBuffer === 'string' ? fs.createReadStream(filePathOrBuffer) : filePathOrBuffer;
     return node_fetch_1.default(url, {
         method: 'PUT',
         headers: {