@redocly/cli 1.0.0-beta.99 → 1.0.0-rc.2

package/lib/commands/push.js

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getApiEntrypoint = exports.transformPush = exports.getDestinationProps = exports.handlePush = void 0;
+exports.getApiRoot = exports.transformPush = exports.getDestinationProps = exports.handlePush = exports.DESTINATION_REGEX = void 0;
 const fs = require("fs");
 const path = require("path");
 const node_fetch_1 = require("node-fetch");
@@ -31,11 +31,10 @@ const openapi_core_1 = require("@redocly/openapi-core");
 const utils_1 = require("../utils");
 const login_1 = require("./login");
 const DEFAULT_VERSION = 'latest';
-function handlePush(argv) {
+exports.DESTINATION_REGEX = /^(@(?<organizationId>[\w\-\s]+)\/)?(?<name>[^@]*)@(?<version>[\w\.\-]+)$/;
+function handlePush(argv, config) {
     return __awaiter(this, void 0, void 0, function* () {
-        const config = yield openapi_core_1.loadConfig();
-        const region = argv.region || config.region;
-        const client = new openapi_core_1.RedoclyClient(region);
+        const client = new openapi_core_1.RedoclyClient(config.region);
         const isAuthorized = yield client.isAuthorizedWithRedoclyByRegion();
         if (!isAuthorized) {
             const clientToken = yield login_1.promptClientToken(client.domain);
@@ -43,34 +42,51 @@ function handlePush(argv) {
         }
         const startedAt = perf_hooks_1.performance.now();
         const { destination, branchName, upsert } = argv;
-        if (destination &&
-            !(validateDestination(destination) || validateDestinationWithoutOrganization(destination))) {
-            utils_1.exitWithError(`Destination argument value is not valid, please use the right format: ${colorette_1.yellow('<@organization-id/api-name@api-version>')}`);
+        const jobId = argv['job-id'];
+        const batchSize = argv['batch-size'];
+        if (destination && !exports.DESTINATION_REGEX.test(destination)) {
+            utils_1.exitWithError(`Destination argument value is not valid, please use the right format: ${colorette_1.yellow('<api-name@api-version>')}`);
         }
-        const [organizationId, name, version] = getDestinationProps(destination, config.organization);
+        const destinationProps = getDestinationProps(destination, config.organization);
+        const organizationId = argv.organization || destinationProps.organizationId;
+        const { name, version } = destinationProps;
         if (!organizationId) {
-            return utils_1.exitWithError(`No organization provided, please use the right format: ${colorette_1.yellow('<@organization-id/api-name@api-version>')} or specify the 'organization' field in the config file.`);
+            return utils_1.exitWithError(`No organization provided, please use --organization option or specify the 'organization' field in the config file.`);
         }
-        const entrypoint = argv.entrypoint || (name && version && getApiEntrypoint({ name, version, config }));
-        if (name && version && !entrypoint) {
-            utils_1.exitWithError(`No entrypoint found that matches ${colorette_1.blue(`${name}@${version}`)}. Please make sure you have provided the correct data in the config file.`);
+        const api = argv.api || (name && version && getApiRoot({ name, version, config }));
+        if (name && version && !api) {
+            utils_1.exitWithError(`No api found that matches ${colorette_1.blue(`${name}@${version}`)}. Please make sure you have provided the correct data in the config file.`);
         }
-        const apis = entrypoint ? { [`${name}@${version}`]: { root: entrypoint } } : config.apis;
-        for (const [apiNameAndVersion, { root: entrypoint }] of Object.entries(apis)) {
+        // Ensure that a destination for the api is provided.
+        if (!name && api) {
+            return utils_1.exitWithError(`No destination provided, please use --destination option to provide destination.`);
+        }
+        if (jobId && !jobId.trim()) {
+            utils_1.exitWithError(`The ${colorette_1.blue(`job-id`)} option value is not valid, please avoid using an empty string.`);
+        }
+        if (batchSize && batchSize < 2) {
+            utils_1.exitWithError(`The ${colorette_1.blue(`batch-size`)} option value is not valid, please use the integer bigger than 1.`);
+        }
+        const apis = api ? { [`${name}@${version}`]: { root: api } } : config.apis;
+        if (!Object.keys(apis).length) {
+            utils_1.exitWithError(`Api not found. Please make sure you have provided the correct data in the config file.`);
+        }
+        for (const [apiNameAndVersion, { root: api }] of Object.entries(apis)) {
             const resolvedConfig = openapi_core_1.getMergedConfig(config, apiNameAndVersion);
-            resolvedConfig.lint.skipDecorators(argv['skip-decorator']);
+            resolvedConfig.styleguide.skipDecorators(argv['skip-decorator']);
             const [name, version = DEFAULT_VERSION] = apiNameAndVersion.split('@');
+            const encodedName = encodeURIComponent(name);
             try {
                 let rootFilePath = '';
                 const filePaths = [];
-                const filesToUpload = yield collectFilesToUpload(entrypoint, resolvedConfig);
+                const filesToUpload = yield collectFilesToUpload(api, resolvedConfig);
                 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,
+                        name: encodedName,
                         version,
                         filesHash,
                         filename: file.keyOnS3,
@@ -91,13 +107,15 @@ function handlePush(argv) {
                 process.stdout.write('\n');
                 yield client.registryApi.pushApi({
                     organizationId,
-                    name,
+                    name: encodedName,
                     version,
                     rootFilePath,
                     filePaths,
                     branch: branchName,
                     isUpsert: upsert,
-                    isPublic: argv['public']
+                    isPublic: argv['public'],
+                    batchId: jobId,
+                    batchSize: batchSize,
                 });
             }
             catch (error) {
@@ -105,14 +123,13 @@ function handlePush(argv) {
                     utils_1.exitWithError(`Organization ${colorette_1.blue(organizationId)} not found`);
                 }
                 if (error.message === 'API_VERSION_NOT_FOUND') {
-                    utils_1.exitWithError(`The definition version ${colorette_1.blue(name)}/${colorette_1.blue(version)} does not exist in organization ${colorette_1.blue(organizationId)}!\n${colorette_1.yellow('Suggestion:')} please use ${colorette_1.blue('-u')} or ${colorette_1.blue('--upsert')} to create definition.
-        `);
+                    utils_1.exitWithError(`The definition version ${colorette_1.blue(`${name}@${version}`)} does not exist in organization ${colorette_1.blue(organizationId)}!\n${colorette_1.yellow('Suggestion:')} please use ${colorette_1.blue('-u')} or ${colorette_1.blue('--upsert')} to create definition.\n\n`);
                 }
                 throw error;
             }
-            process.stdout.write(`Definition: ${colorette_1.blue(entrypoint)} is successfully pushed to Redocly API Registry \n`);
+            process.stdout.write(`Definition: ${colorette_1.blue(api)} is successfully pushed to Redocly API Registry \n`);
         }
-        utils_1.printExecutionTime('push', startedAt, entrypoint || `apis in organization ${organizationId}`);
+        utils_1.printExecutionTime('push', startedAt, api || `apis in organization ${organizationId}`);
     });
 }
 exports.handlePush = handlePush;
@@ -130,25 +147,26 @@ function getFilesList(dir, files) {
     }
     return files;
 }
-function collectFilesToUpload(entrypoint, config) {
+function collectFilesToUpload(api, config) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        let files = [];
-        const [{ path: entrypointPath }] = yield utils_1.getFallbackEntryPointsOrExit([entrypoint], config);
+        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({
             config,
-            ref: entrypointPath,
+            ref: apiPath,
             skipRedoclyRegistryRefs: true,
         });
         const fileTotals = openapi_core_1.getTotals(problems);
         if (fileTotals.errors === 0) {
-            process.stdout.write(`Created a bundle for ${colorette_1.blue(entrypoint)} ${fileTotals.warnings > 0 ? 'with warnings' : ''}\n`);
+            process.stdout.write(`Created a bundle for ${colorette_1.blue(api)} ${fileTotals.warnings > 0 ? 'with warnings' : ''}\n`);
         }
         else {
-            utils_1.exitWithError(`Failed to create a bundle for ${colorette_1.blue(entrypoint)}\n`);
+            utils_1.exitWithError(`Failed to create a bundle for ${colorette_1.blue(api)}\n`);
         }
-        const fileExt = path.extname(entrypointPath).split('.').pop();
-        files.push(getFileEntry(entrypointPath, utils_1.dumpBundle(openapiBundle.parsed, fileExt)));
+        const fileExt = path.extname(apiPath).split('.').pop();
+        files.push(getFileEntry(apiPath, utils_1.dumpBundle(openapiBundle.parsed, fileExt)));
         if (fs.existsSync('package.json')) {
             files.push(getFileEntry('package.json'));
         }
@@ -157,14 +175,14 @@ function collectFilesToUpload(entrypoint, config) {
         }
         if (config.configFile) {
             // All config file paths including the root one
-            files.push(...[...new Set(config.lint.extendPaths)].map((f) => getFileEntry(f)));
-            if (config['features.openapi'].htmlTemplate) {
-                const dir = getFolder(config['features.openapi'].htmlTemplate);
+            files.push(...[...new Set(config.styleguide.extendPaths)].map((f) => getFileEntry(f)));
+            if ((_b = (_a = config.theme) === null || _a === void 0 ? void 0 : _a.openapi) === null || _b === void 0 ? void 0 : _b.htmlTemplate) {
+                const dir = getFolder(config.theme.openapi.htmlTemplate);
                 const fileList = getFilesList(dir, []);
                 files.push(...fileList.map((f) => getFileEntry(f)));
             }
-            let pluginFiles = new Set();
-            for (const plugin of config.lint.pluginPaths) {
+            const pluginFiles = new Set();
+            for (const plugin of config.styleguide.pluginPaths) {
                 if (typeof plugin !== 'string')
                     continue;
                 const fileList = getFilesList(getFolder(plugin), []);
@@ -172,9 +190,22 @@ function collectFilesToUpload(entrypoint, config) {
             }
             files.push(...filterPluginFilesByExt(Array.from(pluginFiles)).map((f) => getFileEntry(f)));
         }
+        if (config.files) {
+            const otherFiles = new Set();
+            for (const file of config.files) {
+                if (fs.statSync(file).isDirectory()) {
+                    const fileList = getFilesList(file, []);
+                    fileList.forEach((f) => otherFiles.add(f));
+                }
+                else {
+                    otherFiles.add(file);
+                }
+            }
+            files.push(...Array.from(otherFiles).map((f) => getFileEntry(f)));
+        }
         return {
             files,
-            root: path.resolve(entrypointPath),
+            root: path.resolve(apiPath),
         };
         function filterPluginFilesByExt(files) {
             return files.filter((file) => {
@@ -197,47 +228,63 @@ 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');
 }
-function validateDestination(destination) {
-    const regexp = /^@+([a-zA-Z0-9-_.& ]+)\/+([^@\/]+)@([^@\/]+)$/;
-    return regexp.test(destination);
-}
-function validateDestinationWithoutOrganization(destination) {
-    const regexp = /^()([^@\/]+)@([^@\/]+)$/;
-    return regexp.test(destination);
+function parseDestination(destination) {
+    var _a;
+    return (_a = destination === null || destination === void 0 ? void 0 : destination.match(exports.DESTINATION_REGEX)) === null || _a === void 0 ? void 0 : _a.groups;
 }
 function getDestinationProps(destination, organization) {
-    return destination && validateDestination(destination)
-        ? destination.substring(1).split(/[@\/]/)
-        : destination && validateDestinationWithoutOrganization(destination)
-            ? [organization, ...destination.split('@')]
-            : [organization];
+    const groups = destination && parseDestination(destination);
+    if (groups) {
+        return {
+            organizationId: groups.organizationId || organization,
+            name: groups.name,
+            version: groups.version,
+        };
+    }
+    else {
+        return { organizationId: organization, name: undefined, version: undefined };
+    }
 }
 exports.getDestinationProps = getDestinationProps;
-const transformPush = (callback) => (_a) => {
-    var { maybeEntrypointOrAliasOrDestination, maybeDestination, maybeBranchName, branch } = _a, rest = __rest(_a, ["maybeEntrypointOrAliasOrDestination", "maybeDestination", "maybeBranchName", "branch"]);
-    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 transformPush = (callback) => (_a, config) => {
+    var { api: maybeApiOrDestination, maybeDestination, maybeBranchName, branch, 'batch-id': batchId, 'job-id': jobId } = _a, rest = __rest(_a, ["api", "maybeDestination", "maybeBranchName", "branch", 'batch-id', 'job-id']);
+    if (batchId) {
+        process.stderr.write(colorette_1.yellow(`The ${colorette_1.red('batch-id')} option is deprecated. Please use ${colorette_1.green('job-id')} instead.\n\n`));
+    }
+    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.\n\n'));
+    }
+    let apiFile, destination;
+    if (maybeDestination) {
+        process.stderr.write(colorette_1.yellow('Deprecation warning: Do not use the second parameter as a destination. Please use a separate --destination and --organization instead.\n\n'));
+        apiFile = maybeApiOrDestination;
+        destination = maybeDestination;
+    }
+    else if (maybeApiOrDestination && exports.DESTINATION_REGEX.test(maybeApiOrDestination)) {
+        process.stderr.write(colorette_1.yellow('Deprecation warning: Do not use the first parameter as a destination. Please use a separate --destination and --organization options instead.\n\n'));
+        destination = maybeApiOrDestination;
+    }
+    else if (maybeApiOrDestination && !exports.DESTINATION_REGEX.test(maybeApiOrDestination)) {
+        apiFile = maybeApiOrDestination;
     }
-    const entrypoint = maybeDestination ? maybeEntrypointOrAliasOrDestination : undefined;
-    const destination = maybeDestination || maybeEntrypointOrAliasOrDestination;
-    return callback(Object.assign(Object.assign({}, rest), { destination,
-        entrypoint, branchName: branch !== null && branch !== void 0 ? branch : maybeBranchName }));
+    destination = rest.destination || destination;
+    return callback(Object.assign(Object.assign({}, rest), { destination, api: apiFile, branchName: branch !== null && branch !== void 0 ? branch : maybeBranchName, 'job-id': jobId || batchId }), config);
 };
 exports.transformPush = transformPush;
-function getApiEntrypoint({ name, version, config: { apis }, }) {
+function getApiRoot({ name, version, config: { apis }, }) {
     const api = (apis === null || apis === void 0 ? void 0 : apis[`${name}@${version}`]) || (version === DEFAULT_VERSION && (apis === null || apis === void 0 ? void 0 : apis[name]));
     return api === null || api === void 0 ? void 0 : api.root;
 }
-exports.getApiEntrypoint = getApiEntrypoint;
+exports.getApiRoot = getApiRoot;
 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: {

package/lib/commands/split/__tests__/index.test.js

@@ -20,10 +20,10 @@ describe('#split', () => {
     const openapiDir = 'test';
     const componentsFiles = {};
     it('should split the file and show the success message', () => __awaiter(void 0, void 0, void 0, function* () {
-        const filePath = "packages/cli/src/commands/split/__tests__/fixtures/spec.json";
+        const filePath = 'packages/cli/src/commands/split/__tests__/fixtures/spec.json';
         jest.spyOn(process.stderr, 'write').mockImplementation(() => true);
         yield index_1.handleSplit({
-            entrypoint: filePath,
+            api: filePath,
             outDir: openapiDir,
             separator: '_',
         });
@@ -33,10 +33,10 @@ describe('#split', () => {
         expect(process.stderr.write.mock.calls[1][0]).toContain(`${filePath}: split processed in <test>ms`);
     }));
     it('should use the correct separator', () => __awaiter(void 0, void 0, void 0, function* () {
-        const filePath = "packages/cli/src/commands/split/__tests__/fixtures/spec.json";
+        const filePath = 'packages/cli/src/commands/split/__tests__/fixtures/spec.json';
         jest.spyOn(utils, 'pathToFilename').mockImplementation(() => 'newFilePath');
         yield index_1.handleSplit({
-            entrypoint: filePath,
+            api: filePath,
             outDir: openapiDir,
             separator: '_',
         });
@@ -44,7 +44,7 @@ describe('#split', () => {
         utils.pathToFilename.mockRestore();
     }));
     it('should have correct path with paths', () => {
-        const openapi = require("./fixtures/spec.json");
+        const openapi = require('./fixtures/spec.json');
         jest.spyOn(openapiCore, 'slash').mockImplementation(() => 'paths/test.yaml');
         jest.spyOn(path, 'relative').mockImplementation(() => 'paths/test.yaml');
         index_1.iteratePathItems(openapi.paths, openapiDir, path.join(openapiDir, 'paths'), componentsFiles, '_');
@@ -52,7 +52,7 @@ describe('#split', () => {
         expect(path.relative).toHaveBeenCalledWith('test', 'test/paths/test.yaml');
     });
     it('should have correct path with webhooks', () => {
-        const openapi = require("./fixtures/webhooks.json");
+        const openapi = require('./fixtures/webhooks.json');
         jest.spyOn(openapiCore, 'slash').mockImplementation(() => 'webhooks/test.yaml');
         jest.spyOn(path, 'relative').mockImplementation(() => 'webhooks/test.yaml');
         index_1.iteratePathItems(openapi.webhooks, openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, 'webhook_');
@@ -60,7 +60,7 @@ describe('#split', () => {
         expect(path.relative).toHaveBeenCalledWith('test', 'test/webhooks/test.yaml');
     });
     it('should have correct path with x-webhooks', () => {
-        const openapi = require("./fixtures/spec.json");
+        const openapi = require('./fixtures/spec.json');
         jest.spyOn(openapiCore, 'slash').mockImplementation(() => 'webhooks/test.yaml');
         jest.spyOn(path, 'relative').mockImplementation(() => 'webhooks/test.yaml');
         index_1.iteratePathItems(openapi['x-webhooks'], openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, 'webhook_');
@@ -68,7 +68,9 @@ describe('#split', () => {
         expect(path.relative).toHaveBeenCalledWith('test', 'test/webhooks/test.yaml');
     });
     it('should create correct folder name for code samples', () => __awaiter(void 0, void 0, void 0, function* () {
-        const openapi = require("./fixtures/samples.json");
+        const openapi = require('./fixtures/samples.json');
+        const fs = require('fs');
+        jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { });
         jest.spyOn(utils, 'escapeLanguageName');
         index_1.iteratePathItems(openapi.paths, openapiDir, path.join(openapiDir, 'paths'), componentsFiles, '_');
         expect(utils.escapeLanguageName).nthCalledWith(1, 'C#');

package/lib/commands/split/index.d.ts

@@ -1,8 +1,10 @@
 import { Oas3PathItem, Referenced } from './types';
-export declare function handleSplit(argv: {
-    entrypoint: string;
+export declare type SplitOptions = {
+    api: string;
     outDir: string;
     separator: string;
-}): Promise<void>;
+    config?: string;
+};
+export declare function handleSplit(argv: SplitOptions): Promise<void>;
 declare function iteratePathItems(pathItems: Record<string, Referenced<Oas3PathItem>> | undefined, openapiDir: string, outDir: string, componentsFiles: object, pathSeparator: string, codeSamplesPathPrefix?: string): void;
 export { iteratePathItems };

package/lib/commands/split/index.js

@@ -22,13 +22,13 @@ const types_1 = require("./types");
 function handleSplit(argv) {
     return __awaiter(this, void 0, void 0, function* () {
         const startedAt = perf_hooks_1.performance.now();
-        const { entrypoint, outDir, separator } = argv;
-        validateDefinitionFileName(entrypoint);
-        const openapi = utils_1.readYaml(entrypoint);
+        const { api, outDir, separator } = argv;
+        validateDefinitionFileName(api);
+        const openapi = utils_1.readYaml(api);
         splitDefinition(openapi, outDir, separator);
-        process.stderr.write(`🪓 Document: ${colorette_1.blue(entrypoint)} ${colorette_1.green('is successfully split')}
+        process.stderr.write(`🪓 Document: ${colorette_1.blue(api)} ${colorette_1.green('is successfully split')}
     and all related files are saved to the directory: ${colorette_1.blue(outDir)} \n`);
-        utils_1.printExecutionTime('split', startedAt, entrypoint);
+        utils_1.printExecutionTime('split', startedAt, api);
     });
 }
 exports.handleSplit = handleSplit;
@@ -67,19 +67,6 @@ function validateDefinitionFileName(fileName) {
         utils_1.exitWithError('File does not conform to the OpenAPI Specification. OpenAPI version is not specified');
     return true;
 }
-function langToExt(lang) {
-    const langObj = {
-        php: '.php',
-        'c#': '.cs',
-        shell: '.sh',
-        curl: '.sh',
-        bash: '.sh',
-        javascript: '.js',
-        js: '.js',
-        python: '.py'
-    };
-    return langObj[lang];
-}
 function traverseDirectoryDeep(directory, callback, componentsFiles) {
     if (!fs.existsSync(directory) || !fs.statSync(directory).isDirectory())
         return;
@@ -169,8 +156,7 @@ function isNotSecurityComponentType(componentType) {
     return componentType !== types_1.OPENAPI3_COMPONENT.SecuritySchemes;
 }
 function findComponentTypes(components) {
-    return types_1.OPENAPI3_COMPONENT_NAMES
-        .filter(item => isNotSecurityComponentType(item) && Object.keys(components).includes(item));
+    return types_1.OPENAPI3_COMPONENT_NAMES.filter((item) => isNotSecurityComponentType(item) && Object.keys(components).includes(item));
 }
 function doesFileDiffer(filename, componentData) {
     return fs.existsSync(filename) && !isEqual(utils_1.readYaml(filename), componentData);
@@ -198,7 +184,9 @@ function gatherComponentsFiles(components, componentsFiles, componentType, compo
     var _a, _b;
     let inherits = [];
     if (componentType === types_1.OPENAPI3_COMPONENT.Schemas) {
-        inherits = (((_b = (_a = components === null || components === void 0 ? void 0 : components[componentType]) === null || _a === void 0 ? void 0 : _a[componentName]) === null || _b === void 0 ? void 0 : _b.allOf) || []).map((s) => s.$ref).filter(Boolean);
+        inherits = (((_b = (_a = components === null || components === void 0 ? void 0 : components[componentType]) === null || _a === void 0 ? void 0 : _a[componentName]) === null || _b === void 0 ? void 0 : _b.allOf) || [])
+            .map(({ $ref }) => $ref)
+            .filter(openapi_core_1.isTruthy);
     }
     componentsFiles[componentType] = componentsFiles[componentType] || {};
     componentsFiles[componentType][componentName] = { inherits, filename };
@@ -221,18 +209,19 @@ function iteratePathItems(pathItems, openapiDir, outDir, componentsFiles, pathSe
             for (const sample of methodDataXCode) {
                 if (sample.source && sample.source.$ref)
                     continue;
-                const sampleFileName = path.join(openapiDir, 'code_samples', utils_1.escapeLanguageName(sample.lang), codeSamplesPathPrefix + utils_1.pathToFilename(pathName, pathSeparator), method + langToExt(sample.lang));
+                const sampleFileName = path.join(openapiDir, 'code_samples', utils_1.escapeLanguageName(sample.lang), codeSamplesPathPrefix + utils_1.pathToFilename(pathName, pathSeparator), method + utils_1.langToExt(sample.lang));
                 fs.mkdirSync(path.dirname(sampleFileName), { recursive: true });
                 fs.writeFileSync(sampleFileName, sample.source);
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 sample.source = {
-                    $ref: openapi_core_1.slash(path.relative(outDir, sampleFileName))
+                    $ref: openapi_core_1.slash(path.relative(outDir, sampleFileName)),
                 };
             }
         }
         utils_1.writeYaml(pathData, pathFile);
         pathItems[pathName] = {
-            $ref: openapi_core_1.slash(path.relative(openapiDir, pathFile))
+            $ref: openapi_core_1.slash(path.relative(openapiDir, pathFile)),
         };
         traverseDirectoryDeep(outDir, traverseDirectoryDeepCallback, componentsFiles);
     }
@@ -246,6 +235,7 @@ function iterateComponents(openapi, openapiDir, componentsFiles) {
         const componentTypes = findComponentTypes(components);
         componentTypes.forEach(iterateAndGatherComponentsFiles);
         componentTypes.forEach(iterateComponentTypes);
+        // eslint-disable-next-line no-inner-declarations
         function iterateAndGatherComponentsFiles(componentType) {
             const componentDirPath = path.join(componentsDir, componentType);
             for (const componentName of Object.keys((components === null || components === void 0 ? void 0 : components[componentType]) || {})) {
@@ -253,6 +243,7 @@ function iterateComponents(openapi, openapiDir, componentsFiles) {
                 gatherComponentsFiles(components, componentsFiles, componentType, componentName, filename);
             }
         }
+        // eslint-disable-next-line no-inner-declarations
         function iterateComponentTypes(componentType) {
             var _a, _b, _c;
             const componentDirPath = path.join(componentsDir, componentType);

package/lib/commands/split/types.d.ts

@@ -1,5 +1,5 @@
-import { Oas3Schema, Oas3_1Schema, Oas3Definition, Oas3_1Definition, Oas3Components, Oas3PathItem, Oas3Paths, Oas3ComponentName, Oas3_1Webhooks, Oas2Definition, Referenced } from "@redocly/openapi-core";
-export { Oas3_1Definition, Oas3Definition, Oas2Definition, Oas3Components, Oas3Paths, Oas3PathItem, Oas3ComponentName, Oas3_1Schema, Oas3Schema, Oas3_1Webhooks, Referenced };
+import { Oas3Schema, Oas3_1Schema, Oas3Definition, Oas3_1Definition, Oas3Components, Oas3PathItem, Oas3Paths, Oas3ComponentName, Oas3_1Webhooks, Oas2Definition, Referenced } from '@redocly/openapi-core';
+export { Oas3_1Definition, Oas3Definition, Oas2Definition, Oas3Components, Oas3Paths, Oas3PathItem, Oas3ComponentName, Oas3_1Schema, Oas3Schema, Oas3_1Webhooks, Referenced, };
 export declare type Definition = Oas3_1Definition | Oas3Definition | Oas2Definition;
 export interface ComponentsFiles {
     [schemas: string]: any;
@@ -12,15 +12,15 @@ export declare const PATHS = "paths";
 export declare const WEBHOOKS = "webhooks";
 export declare const xWEBHOOKS = "x-webhooks";
 export declare const componentsPath: string;
-declare enum OPENAPI3_METHOD {
-    Get = "get",
-    Put = "put",
-    Post = "post",
-    Delete = "delete",
-    Options = "options",
-    Head = "head",
-    Patch = "patch",
-    Trace = "trace"
+export declare enum OPENAPI3_METHOD {
+    get = "get",
+    put = "put",
+    post = "post",
+    delete = "delete",
+    options = "options",
+    head = "head",
+    patch = "patch",
+    trace = "trace"
 }
 export declare const OPENAPI3_METHOD_NAMES: OPENAPI3_METHOD[];
 export declare enum OPENAPI3_COMPONENT {

package/lib/commands/split/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPENAPI3_COMPONENT_NAMES = exports.OPENAPI3_COMPONENT = exports.OPENAPI3_METHOD_NAMES = exports.componentsPath = exports.xWEBHOOKS = exports.WEBHOOKS = exports.PATHS = exports.COMPONENTS = void 0;
+exports.OPENAPI3_COMPONENT_NAMES = exports.OPENAPI3_COMPONENT = exports.OPENAPI3_METHOD_NAMES = exports.OPENAPI3_METHOD = exports.componentsPath = exports.xWEBHOOKS = exports.WEBHOOKS = exports.PATHS = exports.COMPONENTS = void 0;
 exports.COMPONENTS = 'components';
 exports.PATHS = 'paths';
 exports.WEBHOOKS = 'webhooks';
@@ -8,24 +8,24 @@ exports.xWEBHOOKS = 'x-webhooks';
 exports.componentsPath = `#/${exports.COMPONENTS}/`;
 var OPENAPI3_METHOD;
 (function (OPENAPI3_METHOD) {
-    OPENAPI3_METHOD["Get"] = "get";
-    OPENAPI3_METHOD["Put"] = "put";
-    OPENAPI3_METHOD["Post"] = "post";
-    OPENAPI3_METHOD["Delete"] = "delete";
-    OPENAPI3_METHOD["Options"] = "options";
-    OPENAPI3_METHOD["Head"] = "head";
-    OPENAPI3_METHOD["Patch"] = "patch";
-    OPENAPI3_METHOD["Trace"] = "trace";
-})(OPENAPI3_METHOD || (OPENAPI3_METHOD = {}));
+    OPENAPI3_METHOD["get"] = "get";
+    OPENAPI3_METHOD["put"] = "put";
+    OPENAPI3_METHOD["post"] = "post";
+    OPENAPI3_METHOD["delete"] = "delete";
+    OPENAPI3_METHOD["options"] = "options";
+    OPENAPI3_METHOD["head"] = "head";
+    OPENAPI3_METHOD["patch"] = "patch";
+    OPENAPI3_METHOD["trace"] = "trace";
+})(OPENAPI3_METHOD = exports.OPENAPI3_METHOD || (exports.OPENAPI3_METHOD = {}));
 exports.OPENAPI3_METHOD_NAMES = [
-    OPENAPI3_METHOD.Get,
-    OPENAPI3_METHOD.Put,
-    OPENAPI3_METHOD.Post,
-    OPENAPI3_METHOD.Delete,
-    OPENAPI3_METHOD.Options,
-    OPENAPI3_METHOD.Head,
-    OPENAPI3_METHOD.Patch,
-    OPENAPI3_METHOD.Trace
+    OPENAPI3_METHOD.get,
+    OPENAPI3_METHOD.put,
+    OPENAPI3_METHOD.post,
+    OPENAPI3_METHOD.delete,
+    OPENAPI3_METHOD.options,
+    OPENAPI3_METHOD.head,
+    OPENAPI3_METHOD.patch,
+    OPENAPI3_METHOD.trace,
 ];
 var OPENAPI3_COMPONENT;
 (function (OPENAPI3_COMPONENT) {
@@ -48,5 +48,5 @@ exports.OPENAPI3_COMPONENT_NAMES = [
     OPENAPI3_COMPONENT.Headers,
     OPENAPI3_COMPONENT.Links,
     OPENAPI3_COMPONENT.Callbacks,
-    OPENAPI3_COMPONENT.SecuritySchemes
+    OPENAPI3_COMPONENT.SecuritySchemes,
 ];

package/lib/commands/stats.d.ts

@@ -1,5 +1,8 @@
-export declare function handleStats(argv: {
+import { Config } from '@redocly/openapi-core';
+import type { OutputFormat } from '@redocly/openapi-core';
+export declare type StatsOptions = {
+    api?: string;
+    format: OutputFormat;
     config?: string;
-    entrypoint?: string;
-    format: string;
-}): Promise<void>;
+};
+export declare function handleStats(argv: StatsOptions, config: Config): Promise<void>;

package/lib/commands/stats.js

@@ -21,7 +21,7 @@ const statsAccumulator = {
     schemas: { metric: '📈 Schemas', total: 0, color: 'white' },
     parameters: { metric: '👉 Parameters', total: 0, color: 'yellow', items: new Set() },
     links: { metric: '🔗 Links', total: 0, color: 'cyan', items: new Set() },
-    pathItems: { metric: '➡️ Path Items', total: 0, color: 'green' },
+    pathItems: { metric: '➡️  Path Items', total: 0, color: 'green' },
     operations: { metric: '👷 Operations', total: 0, color: 'yellow' },
     tags: { metric: '🔖 Tags', total: 0, color: 'white', items: new Set() },
 };
@@ -41,8 +41,8 @@ function printStatsJson(statsAccumulator) {
     }
     process.stdout.write(JSON.stringify(json, null, 2));
 }
-function printStats(statsAccumulator, entrypoint, format) {
-    process.stderr.write(`Document: ${colors.magenta(entrypoint)} stats:\n\n`);
+function printStats(statsAccumulator, api, format) {
+    process.stderr.write(`Document: ${colors.magenta(api)} stats:\n\n`);
     switch (format) {
         case 'stylish':
             printStatsStylish(statsAccumulator);
@@ -52,13 +52,12 @@ function printStats(statsAccumulator, entrypoint, format) {
             break;
     }
 }
-function handleStats(argv) {
+function handleStats(argv, config) {
     return __awaiter(this, void 0, void 0, function* () {
-        const config = yield openapi_core_1.loadConfig(argv.config);
-        const [{ path }] = yield utils_1.getFallbackEntryPointsOrExit(argv.entrypoint ? [argv.entrypoint] : [], config);
+        const [{ path }] = yield utils_1.getFallbackApisOrExit(argv.api ? [argv.api] : [], config);
         const externalRefResolver = new openapi_core_1.BaseResolver(config.resolve);
         const { bundle: document } = yield openapi_core_1.bundle({ config, ref: path });
-        const lintConfig = config.lint;
+        const lintConfig = config.styleguide;
         const oasVersion = openapi_core_1.detectOpenAPI(document.parsed);
         const oasMajorVersion = openapi_core_1.openAPIMajor(oasVersion);
         const types = openapi_core_1.normalizeTypes(lintConfig.extendTypes(oasMajorVersion === openapi_core_1.OasMajorVersion.Version3 ? openapi_core_1.Oas3Types : openapi_core_1.Oas2Types, oasVersion), lintConfig);
@@ -70,17 +69,19 @@ function handleStats(argv) {
         };
         const resolvedRefMap = yield openapi_core_1.resolveDocument({
             rootDocument: document,
-            rootType: types.DefinitionRoot,
+            rootType: types.Root,
             externalRefResolver,
         });
-        const statsVisitor = openapi_core_1.normalizeVisitors([{
+        const statsVisitor = openapi_core_1.normalizeVisitors([
+            {
                 severity: 'warn',
                 ruleId: 'stats',
-                visitor: openapi_core_1.Stats(statsAccumulator)
-            }], types);
+                visitor: openapi_core_1.Stats(statsAccumulator),
+            },
+        ], types);
         openapi_core_1.walkDocument({
             document,
-            rootType: types.DefinitionRoot,
+            rootType: types.Root,
             normalizedVisitors: statsVisitor,
             resolvedRefMap,
             ctx,

package/lib/fetch-with-timeout.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (url: string, options?: {}) => Promise<import("node-fetch").Response | undefined>;
+export default _default;