@redocly/cli 1.8.2 → 1.9.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @redocly/cli
 
+## 1.9.1
+
+### Patch Changes
+
+- Adds support for using logical AND for the security schema so that the `join` command generates the correct schema.
+- Fixed a bug with resolving $refs to file names that contain the hash symbol.
+- Fixed a problem where the `join` command did not process schemas containing `null` values when the `--prefix-components-with-info-prop` option was used.'
+- Updated @redocly/openapi-core to v1.9.1.
+
+## 1.9.0
+
+### Minor Changes
+
+- - Removed descriptions adding for x-tagGroups for the `join` command. Descriptions in x-tagGroups are not supported and cause errors on linting.
+  - Updated `info.title` to be used as a name in x-tagGroups instead of a file name for the `join` command, so you can now join files with the same names.
+- Added new `no-required-schema-properties-undefined` rule to check if each required schema property is defined.
+
+### Patch Changes
+
+- Fixed an issue where using the `--prefix-components-with-info-prop` option with the `join` command caused `$refs` to include duplicated prefixes.
+- Fixed an issue where `$ref`s ending in `#` (instead of `#/`) would break the application.
+- Updated @redocly/openapi-core to v1.9.0.
+
 ## 1.8.2
 
 ### Patch Changes

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

@@ -41,7 +41,8 @@ class BaseResolver {
         this.resolveDocument = jest
             .fn()
             .mockImplementationOnce(() => Promise.resolve({ source: { absoluteRef: 'ref' }, parsed: documents_1.firstDocument }))
-            .mockImplementationOnce(() => Promise.resolve({ source: { absoluteRef: 'ref' }, parsed: documents_1.secondDocument }));
+            .mockImplementationOnce(() => Promise.resolve({ source: { absoluteRef: 'ref' }, parsed: documents_1.secondDocument }))
+            .mockImplementationOnce(() => Promise.resolve({ source: { absoluteRef: 'ref' }, parsed: documents_1.thirdDocument }));
     }
 }
 exports.BaseResolver = BaseResolver;

package/lib/__mocks__/documents.d.ts

@@ -90,3 +90,61 @@ export declare const secondDocument: {
     };
     components: {};
 };
+export declare const thirdDocument: {
+    openapi: string;
+    info: {
+        title: string;
+        version: string;
+    };
+    servers: {
+        url: string;
+    }[];
+    paths: {};
+    components: {
+        schemas: {
+            SchemaWithNull: {
+                type: string;
+                default: null;
+                nullable: boolean;
+            };
+            SchemaWithRef: {
+                type: string;
+                properties: {
+                    schemaType: {
+                        type: string;
+                        enum: string[];
+                    };
+                    foo: {
+                        $ref: string;
+                    };
+                };
+            };
+            SchemaWithDiscriminator: {
+                discriminator: {
+                    propertyName: string;
+                    mapping: {
+                        foo: string;
+                        bar: string;
+                    };
+                };
+                oneOf: ({
+                    $ref: string;
+                    type?: undefined;
+                    properties?: undefined;
+                } | {
+                    type: string;
+                    properties: {
+                        schemaType: {
+                            type: string;
+                            enum: string[];
+                        };
+                        bar: {
+                            type: string;
+                        };
+                    };
+                    $ref?: undefined;
+                })[];
+            };
+        };
+    };
+};

package/lib/__mocks__/documents.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.secondDocument = exports.firstDocument = void 0;
+exports.thirdDocument = 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',
+        title: 'First API',
         termsOfService: 'http://swagger.io/terms/',
         license: {
             name: 'Apache 2.0',
@@ -37,7 +37,7 @@ exports.secondDocument = {
     info: {
         description: 'example test',
         version: '1.0.0',
-        title: 'Swagger Petstore',
+        title: 'Second API',
         termsOfService: 'http://swagger.io/terms/',
         license: {
             name: 'Apache 2.0',
@@ -61,3 +61,63 @@ exports.secondDocument = {
     },
     components: {},
 };
+exports.thirdDocument = {
+    openapi: '3.0.0',
+    info: {
+        title: 'Third API',
+        version: '1.0',
+    },
+    servers: [
+        {
+            url: 'https://api.server.test/v1',
+        },
+    ],
+    paths: {},
+    components: {
+        schemas: {
+            SchemaWithNull: {
+                type: 'string',
+                default: null,
+                nullable: true,
+            },
+            SchemaWithRef: {
+                type: 'object',
+                properties: {
+                    schemaType: {
+                        type: 'string',
+                        enum: ['foo'],
+                    },
+                    foo: {
+                        $ref: '#/components/schemas/SchemaWithNull',
+                    },
+                },
+            },
+            SchemaWithDiscriminator: {
+                discriminator: {
+                    propertyName: 'schemaType',
+                    mapping: {
+                        foo: '#/components/schemas/SchemaWithRef',
+                        bar: '#/components/schemas/SchemaWithNull',
+                    },
+                },
+                oneOf: [
+                    {
+                        $ref: '#/components/schemas/SchemaWithRef',
+                    },
+                    {
+                        type: 'object',
+                        properties: {
+                            schemaType: {
+                                type: 'string',
+                                enum: ['bar'],
+                            },
+                            bar: {
+                                type: 'string',
+                            },
+                        },
+                    },
+                ],
+            },
+        },
+    },
+};

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

@@ -9,15 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const join_1 = require("../../commands/join");
-const miscellaneous_1 = require("../../utils/miscellaneous");
 const colorette_1 = require("colorette");
 const openapi_core_1 = require("@redocly/openapi-core");
+const join_1 = require("../../commands/join");
+const miscellaneous_1 = require("../../utils/miscellaneous");
 const openapi_core_2 = require("../../__mocks__/@redocly/openapi-core");
 const config_1 = require("../fixtures/config");
 jest.mock('../../utils/miscellaneous');
 jest.mock('colorette');
-describe('handleJoin fails', () => {
+describe('handleJoin', () => {
     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* () {
@@ -105,4 +105,127 @@ describe('handleJoin fails', () => {
         expect(config.styleguide.skipDecorators).not.toHaveBeenCalled();
         expect(config.styleguide.skipPreprocessors).not.toHaveBeenCalled();
     }));
+    it('should handle join with prefix-components-with-info-prop and null values', () => __awaiter(void 0, void 0, void 0, function* () {
+        openapi_core_1.detectSpec.mockReturnValue('oas3_0');
+        yield (0, join_1.handleJoin)({
+            apis: ['first.yaml', 'second.yaml', 'third.yaml'],
+            'prefix-components-with-info-prop': 'title',
+            output: 'join-result.yaml',
+        }, config_1.ConfigFixture, 'cli-version');
+        expect(miscellaneous_1.writeToFileByExtension).toHaveBeenCalledWith({
+            openapi: '3.0.0',
+            info: {
+                description: 'example test',
+                version: '1.0.0',
+                title: 'First API',
+                termsOfService: 'http://swagger.io/terms/',
+                license: {
+                    name: 'Apache 2.0',
+                    url: 'http://www.apache.org/licenses/LICENSE-2.0.html',
+                },
+            },
+            servers: [
+                {
+                    url: 'http://localhost:8080',
+                },
+                {
+                    url: 'https://api.server.test/v1',
+                },
+            ],
+            tags: [
+                {
+                    name: 'pet',
+                    'x-displayName': 'pet',
+                },
+            ],
+            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: {
+                schemas: {
+                    'Third API_SchemaWithNull': {
+                        type: 'string',
+                        default: null,
+                        nullable: true,
+                    },
+                    'Third API_SchemaWithRef': {
+                        type: 'object',
+                        properties: {
+                            schemaType: {
+                                type: 'string',
+                                enum: ['foo'],
+                            },
+                            foo: {
+                                $ref: '#/components/schemas/Third API_SchemaWithNull',
+                            },
+                        },
+                    },
+                    'Third API_SchemaWithDiscriminator': {
+                        discriminator: {
+                            propertyName: 'schemaType',
+                            mapping: {
+                                foo: '#/components/schemas/Third API_SchemaWithRef',
+                                bar: '#/components/schemas/Third API_SchemaWithNull',
+                            },
+                        },
+                        oneOf: [
+                            {
+                                $ref: '#/components/schemas/Third API_SchemaWithRef',
+                            },
+                            {
+                                type: 'object',
+                                properties: {
+                                    schemaType: {
+                                        type: 'string',
+                                        enum: ['bar'],
+                                    },
+                                    bar: {
+                                        type: 'string',
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                },
+            },
+            'x-tagGroups': [
+                {
+                    name: 'First API',
+                    tags: ['pet'],
+                },
+            ],
+        }, 'join-result.yaml', true);
+    }));
 });

package/lib/cms/commands/__tests__/push-status.test.js

@@ -76,7 +76,7 @@ describe('handlePushStatus()', () => {
             'max-execution-time': 1000,
         }, mockConfig);
         expect(process.stdout.write).toHaveBeenCalledTimes(1);
-        expect(process.stdout.write).toHaveBeenCalledWith('🚀 PREVIEW deployment succeeded.\nPreview URL: https://test-url\n');
+        expect(process.stdout.write).toHaveBeenCalledWith('🚀 Preview deploy success.\nPreview URL: https://test-url\n');
     }));
     it('should return success push status for preview and production builds', () => __awaiter(void 0, void 0, void 0, function* () {
         process.env.REDOCLY_AUTHORIZATION = 'test-api-key';
@@ -89,8 +89,8 @@ describe('handlePushStatus()', () => {
             'max-execution-time': 1000,
         }, mockConfig);
         expect(process.stdout.write).toHaveBeenCalledTimes(2);
-        expect(process.stdout.write).toHaveBeenCalledWith('🚀 PREVIEW deployment succeeded.\nPreview URL: https://test-url\n');
-        expect(process.stdout.write).toHaveBeenCalledWith('🚀 PRODUCTION deployment succeeded.\nPreview URL: https://test-url\n');
+        expect(process.stdout.write).toHaveBeenCalledWith('🚀 Preview deploy success.\nPreview URL: https://test-url\n');
+        expect(process.stdout.write).toHaveBeenCalledWith('🚀 Production deploy success.\nProduction URL: https://test-url\n');
     }));
     it('should return failed push status for preview build', () => __awaiter(void 0, void 0, void 0, function* () {
         process.env.REDOCLY_AUTHORIZATION = 'test-api-key';
@@ -108,7 +108,7 @@ describe('handlePushStatus()', () => {
             pushId: 'test-push-id',
             'max-execution-time': 1000,
         }, mockConfig);
-        expect(miscellaneous_1.exitWithError).toHaveBeenCalledWith('❌ PREVIEW deployment failed.\nPreview URL: https://test-url');
+        expect(miscellaneous_1.exitWithError).toHaveBeenCalledWith('❌ Preview deploy fail.\nPreview URL: https://test-url');
     }));
     it('should return success push status for preview build and print scorecards', () => __awaiter(void 0, void 0, void 0, function* () {
         process.env.REDOCLY_AUTHORIZATION = 'test-api-key';
@@ -137,7 +137,7 @@ describe('handlePushStatus()', () => {
             'max-execution-time': 1000,
         }, mockConfig);
         expect(process.stdout.write).toHaveBeenCalledTimes(4);
-        expect(process.stdout.write).toHaveBeenCalledWith('🚀 PREVIEW deployment succeeded.\nPreview URL: https://test-url\n');
+        expect(process.stdout.write).toHaveBeenCalledWith('🚀 Preview deploy success.\nPreview URL: https://test-url\n');
         expect(process.stdout.write).toHaveBeenCalledWith('\nScorecard:');
         expect(process.stdout.write).toHaveBeenCalledWith('\n    Name: test-name\n    Status: success\n    URL: test-url\n    Description: test-description\n');
         expect(process.stdout.write).toHaveBeenCalledWith('\n');

package/lib/cms/commands/push-status.js

@@ -16,6 +16,7 @@ const spinner_1 = require("../../utils/spinner");
 const utils_1 = require("../utils");
 const colorette_1 = require("colorette");
 const api_1 = require("../api");
+const js_utils_1 = require("../../utils/js-utils");
 const INTERVAL = 5000;
 function handlePushStatus(argv, config) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -131,10 +132,10 @@ function displayDeploymentAndBuildStatus({ status, previewUrl, spinner, buildTyp
     switch (status) {
         case 'success':
             spinner.stop();
-            return process.stdout.write(`${colors.green(`🚀 ${buildType.toLocaleUpperCase()} deployment succeeded.`)}\n${colors.magenta('Preview URL')}: ${colors.cyan(previewUrl)}\n`);
+            return process.stdout.write(`${colors.green(`🚀 ${(0, js_utils_1.capitalize)(buildType)} deploy success.`)}\n${colors.magenta(`${(0, js_utils_1.capitalize)(buildType)} URL`)}: ${colors.cyan(previewUrl)}\n`);
         case 'failed':
             spinner.stop();
-            throw new utils_1.DeploymentError(`${colors.red(`❌ ${buildType.toLocaleUpperCase()} deployment failed.`)}\n${colors.magenta('Preview URL')}: ${colors.cyan(previewUrl)}`);
+            throw new utils_1.DeploymentError(`${colors.red(`❌ ${(0, js_utils_1.capitalize)(buildType)} deploy fail.`)}\n${colors.magenta(`${(0, js_utils_1.capitalize)(buildType)} URL`)}: ${colors.cyan(previewUrl)}`);
         case 'pending':
             return wait
                 ? spinner.start(`${colors.yellow(`Pending ${buildType}`)}`)

package/lib/commands/join.d.ts

@@ -1,4 +1,5 @@
-import { Config, RuleSeverity } from '@redocly/openapi-core';
+import { Config } from '@redocly/openapi-core';
+import type { RuleSeverity } from '@redocly/openapi-core';
 export type JoinOptions = {
     apis: string[];
     lint?: boolean;

package/lib/commands/join.js

@@ -18,7 +18,7 @@ const openapi_core_1 = require("@redocly/openapi-core");
 const miscellaneous_1 = require("../utils/miscellaneous");
 const js_utils_1 = require("../utils/js-utils");
 const types_1 = require("./split/types");
-const COMPONENTS = 'components';
+const split_1 = require("./split");
 const Tags = 'tags';
 const xTagGroups = 'x-tagGroups';
 let potentialConflictsTotal = 0;
@@ -112,13 +112,14 @@ function handleJoin(argv, config, packageVersion) {
             const tagsPrefix = prefixTagsWithFilename
                 ? apiFilename
                 : getInfoPrefix(info, prefixTagsWithInfoProp, 'tags');
-            const componentsPrefix = getInfoPrefix(info, prefixComponentsWithInfoProp, COMPONENTS);
+            const componentsPrefix = getInfoPrefix(info, prefixComponentsWithInfoProp, types_1.COMPONENTS);
             if (openapi.hasOwnProperty('x-tagGroups')) {
                 process.stderr.write((0, colorette_1.yellow)(`warning: x-tagGroups at ${(0, colorette_1.blue)(api)} will be skipped \n`));
             }
             const context = {
                 api,
                 apiFilename,
+                apiTitle: info === null || info === void 0 ? void 0 : info.title,
                 tags,
                 potentialConflicts,
                 tagsPrefix,
@@ -128,7 +129,6 @@ function handleJoin(argv, config, packageVersion) {
                 populateTags(context);
             }
             collectServers(openapi);
-            collectInfoDescriptions(openapi, context);
             collectExternalDocs(openapi, context);
             collectPaths(openapi, context);
             collectComponents(openapi, context);
@@ -144,7 +144,7 @@ function handleJoin(argv, config, packageVersion) {
         }
         (0, miscellaneous_1.writeToFileByExtension)((0, miscellaneous_1.sortTopLevelKeysForOas)(joinedDef), specFilename, noRefs);
         (0, miscellaneous_1.printExecutionTime)('join', startedAt, specFilename);
-        function populateTags({ api, apiFilename, tags, potentialConflicts, tagsPrefix, componentsPrefix, }) {
+        function populateTags({ api, apiFilename, apiTitle, tags, potentialConflicts, tagsPrefix, componentsPrefix, }) {
             if (!joinedDef.hasOwnProperty(Tags)) {
                 joinedDef[Tags] = [];
             }
@@ -176,9 +176,10 @@ function handleJoin(argv, config, packageVersion) {
                     }
                 }
                 if (!withoutXTagGroups) {
-                    createXTagGroups(apiFilename);
+                    const groupName = apiTitle || apiFilename;
+                    createXTagGroups(groupName);
                     if (!tagDuplicate) {
-                        populateXTagGroups(entrypointTagName, getIndexGroup(apiFilename));
+                        populateXTagGroups(entrypointTagName, getIndexGroup(groupName));
                     }
                 }
                 const doesEntrypointExist = !potentialConflicts.tags.all[entrypointTagName] ||
@@ -190,17 +191,17 @@ function handleJoin(argv, config, packageVersion) {
                 ];
             }
         }
-        function getIndexGroup(apiFilename) {
-            return joinedDef[xTagGroups].findIndex((item) => item.name === apiFilename);
+        function getIndexGroup(name) {
+            return joinedDef[xTagGroups].findIndex((item) => item.name === name);
         }
-        function createXTagGroups(apiFilename) {
+        function createXTagGroups(name) {
             if (!joinedDef.hasOwnProperty(xTagGroups)) {
                 joinedDef[xTagGroups] = [];
             }
-            if (!joinedDef[xTagGroups].some((g) => g.name === apiFilename)) {
-                joinedDef[xTagGroups].push({ name: apiFilename, tags: [] });
+            if (!joinedDef[xTagGroups].some((g) => g.name === name)) {
+                joinedDef[xTagGroups].push({ name, tags: [] });
             }
-            const indexGroup = getIndexGroup(apiFilename);
+            const indexGroup = getIndexGroup(name);
             if (!joinedDef[xTagGroups][indexGroup].hasOwnProperty(Tags)) {
                 joinedDef[xTagGroups][indexGroup][Tags] = [];
             }
@@ -223,18 +224,6 @@ function handleJoin(argv, config, packageVersion) {
                 }
             }
         }
-        function collectInfoDescriptions(openapi, { apiFilename, componentsPrefix }) {
-            const { info } = openapi;
-            if (info === null || info === void 0 ? void 0 : info.description) {
-                const groupIndex = joinedDef[xTagGroups] ? getIndexGroup(apiFilename) : -1;
-                if (joinedDef.hasOwnProperty(xTagGroups) &&
-                    groupIndex !== -1 &&
-                    joinedDef[xTagGroups][groupIndex]['tags'] &&
-                    joinedDef[xTagGroups][groupIndex]['tags'].length) {
-                    joinedDef[xTagGroups][groupIndex]['description'] = addComponentsPrefix(info.description, componentsPrefix);
-                }
-            }
-        }
         function collectExternalDocs(openapi, { api }) {
             const { externalDocs } = openapi;
             if (externalDocs) {
@@ -245,7 +234,7 @@ function handleJoin(argv, config, packageVersion) {
                 joinedDef['externalDocs'] = externalDocs;
             }
         }
-        function collectPaths(openapi, { apiFilename, api, potentialConflicts, tagsPrefix, componentsPrefix }) {
+        function collectPaths(openapi, { apiFilename, apiTitle, api, potentialConflicts, tagsPrefix, componentsPrefix, }) {
             const { paths } = openapi;
             const operationsSet = new Set((0, js_utils_1.keysOf)(types_1.OPENAPI3_METHOD));
             if (paths) {
@@ -365,6 +354,7 @@ function handleJoin(argv, config, packageVersion) {
                     populateTags({
                         api,
                         apiFilename,
+                        apiTitle,
                         tags: formatTags(tags),
                         potentialConflicts,
                         tagsPrefix,
@@ -376,6 +366,7 @@ function handleJoin(argv, config, packageVersion) {
                     populateTags({
                         api,
                         apiFilename,
+                        apiTitle,
                         tags: formatTags(['other']),
                         potentialConflicts,
                         tagsPrefix: tagsPrefix || apiFilename,
@@ -399,13 +390,13 @@ function handleJoin(argv, config, packageVersion) {
         function collectComponents(openapi, { api, potentialConflicts, componentsPrefix }) {
             const { components } = openapi;
             if (components) {
-                if (!joinedDef.hasOwnProperty(COMPONENTS)) {
-                    joinedDef[COMPONENTS] = {};
+                if (!joinedDef.hasOwnProperty(types_1.COMPONENTS)) {
+                    joinedDef[types_1.COMPONENTS] = {};
                 }
                 for (const [component, componentObj] of Object.entries(components)) {
-                    if (!potentialConflicts[COMPONENTS].hasOwnProperty(component)) {
-                        potentialConflicts[COMPONENTS][component] = {};
-                        joinedDef[COMPONENTS][component] = {};
+                    if (!potentialConflicts[types_1.COMPONENTS].hasOwnProperty(component)) {
+                        potentialConflicts[types_1.COMPONENTS][component] = {};
+                        joinedDef[types_1.COMPONENTS][component] = {};
                     }
                     for (const item of Object.keys(componentObj)) {
                         const componentPrefix = addPrefix(item, componentsPrefix);
@@ -418,7 +409,7 @@ function handleJoin(argv, config, packageVersion) {
                 }
             }
         }
-        function collectWebhooks(oasVersion, openapi, { apiFilename, api, potentialConflicts, tagsPrefix, componentsPrefix }) {
+        function collectWebhooks(oasVersion, openapi, { apiFilename, apiTitle, api, potentialConflicts, tagsPrefix, componentsPrefix, }) {
             const webhooks = oasVersion === openapi_core_1.SpecVersion.OAS3_1 ? 'webhooks' : 'x-webhooks';
             const openapiWebhooks = openapi[webhooks];
             if (openapiWebhooks) {
@@ -443,6 +434,7 @@ function handleJoin(argv, config, packageVersion) {
                             populateTags({
                                 api,
                                 apiFilename,
+                                apiTitle,
                                 tags: formatTags(tags),
                                 potentialConflicts,
                                 tagsPrefix,
@@ -457,7 +449,7 @@ function handleJoin(argv, config, packageVersion) {
             var _a;
             const firstApi = documents[0];
             const openapi = firstApi.parsed;
-            const componentsPrefix = getInfoPrefix(openapi.info, prefixComponentsWithInfoProp, COMPONENTS);
+            const componentsPrefix = getInfoPrefix(openapi.info, prefixComponentsWithInfoProp, types_1.COMPONENTS);
             if (!openapi.openapi)
                 (0, miscellaneous_1.exitWithError)('Version of specification is not found in. \n');
             if (!openapi.info)
@@ -489,7 +481,7 @@ function iteratePotentialConflicts(potentialConflicts, withoutXTagGroups) {
         for (const [key, value] of Object.entries(potentialConflicts[group])) {
             const conflicts = filterConflicts(value);
             if (conflicts.length) {
-                if (group === COMPONENTS) {
+                if (group === types_1.COMPONENTS) {
                     for (const [_, conflict] of Object.entries(conflicts)) {
                         if (validateComponentsDifference(conflict[1])) {
                             conflict[1] = conflict[1].map((c) => Object.keys(c)[0]);
@@ -548,8 +540,11 @@ function addComponentsPrefix(description, componentsPrefix) {
 function addSecurityPrefix(security, componentsPrefix) {
     return componentsPrefix
         ? security === null || security === void 0 ? void 0 : security.map((s) => {
-            const key = Object.keys(s)[0];
-            return { [componentsPrefix + '_' + key]: s[key] };
+            const joinedSecuritySchema = {};
+            for (const [key, value] of Object.entries(s)) {
+                Object.assign(joinedSecuritySchema, { [componentsPrefix + '_' + key]: value });
+            }
+            return joinedSecuritySchema;
         })
         : security;
 }
@@ -579,27 +574,18 @@ function validateApi(document, config, externalRefResolver, packageVersion) {
         }
     });
 }
-function crawl(object, visitor) {
-    if (!(0, js_utils_1.isObject)(object))
-        return;
-    for (const key of Object.keys(object)) {
-        visitor(object, key);
-        crawl(object[key], visitor);
-    }
-}
 function replace$Refs(obj, componentsPrefix) {
-    crawl(obj, (node) => {
-        if (node.$ref && (0, js_utils_1.isString)(node.$ref) && node.$ref.startsWith(`#/${COMPONENTS}/`)) {
+    (0, split_1.crawl)(obj, (node) => {
+        if (node.$ref && typeof node.$ref === 'string' && (0, split_1.startsWithComponents)(node.$ref)) {
             const name = path.basename(node.$ref);
             node.$ref = node.$ref.replace(name, componentsPrefix + '_' + name);
         }
-        else if (node.discriminator &&
-            node.discriminator.mapping &&
-            (0, js_utils_1.isObject)(node.discriminator.mapping)) {
+        else if ((0, js_utils_1.isObject)(node.discriminator) && (0, js_utils_1.isObject)(node.discriminator.mapping)) {
             const { mapping } = node.discriminator;
             for (const name of Object.keys(mapping)) {
-                if ((0, js_utils_1.isString)(mapping[name]) && mapping[name].startsWith(`#/${COMPONENTS}/`)) {
-                    mapping[name] = mapping[name]
+                const mappingPointer = mapping[name];
+                if (typeof mappingPointer === 'string' && (0, split_1.startsWithComponents)(mappingPointer)) {
+                    mapping[name] = mappingPointer
                         .split('/')
                         .map((name, i, arr) => {
                         return arr.length - 1 === i && !name.includes(componentsPrefix)

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

@@ -1,4 +1,4 @@
-import { Oas3PathItem, Referenced } from './types';
+import type { Oas3PathItem, Referenced } from './types';
 export type SplitOptions = {
     api: string;
     outDir: string;
@@ -6,5 +6,7 @@ export type SplitOptions = {
     config?: string;
 };
 export declare function handleSplit(argv: SplitOptions): Promise<void>;
+export declare function startsWithComponents(node: string): boolean;
+export declare function crawl(object: unknown, visitor: (node: Record<string, unknown>) => void): void;
 declare function iteratePathItems(pathItems: Record<string, Referenced<Oas3PathItem>> | undefined, openapiDir: string, outDir: string, componentsFiles: object, pathSeparator: string, codeSamplesPathPrefix: string | undefined, ext: string): void;
 export { iteratePathItems };