@redocly/openapi-core 1.0.0-beta.95 → 1.0.0-beta.98

package/README.md

@@ -1,6 +1,6 @@
 # openapi-core
 
-See https://github.com/Redocly/openapi-cli
+See https://github.com/Redocly/redocly-cli
 
 ## Basic usage
 

package/lib/config/config-resolvers.d.ts

@@ -8,7 +8,7 @@ export declare function resolveApis({ rawConfig, configPath, resolver, }: {
     configPath?: string;
     resolver?: BaseResolver;
 }): Promise<Record<string, ResolvedApi>>;
-export declare function resolveLint({ lintConfig, configPath, resolver, }: {
+export declare function resolveLint(lintOpts: {
     lintConfig?: LintRawConfig;
     configPath?: string;
     resolver?: BaseResolver;

package/lib/config/config-resolvers.js

@@ -141,7 +141,7 @@ function resolveApis({ rawConfig, configPath = '', resolver, }) {
     });
 }
 exports.resolveApis = resolveApis;
-function resolveLint({ lintConfig, configPath = '', resolver = new resolve_1.BaseResolver(), }, parentConfigPaths = [], extendPaths = []) {
+function resolveAndMergeNestedLint({ lintConfig, configPath = '', resolver = new resolve_1.BaseResolver(), }, parentConfigPaths = [], extendPaths = []) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         if (parentConfigPaths.includes(configPath)) {
@@ -162,7 +162,7 @@ function resolveLint({ lintConfig, configPath = '', resolver = new resolve_1.Bas
                     ? new URL(presetItem, configPath).href
                     : path.resolve(path.dirname(configPath), presetItem);
             const extendedLintConfig = yield loadExtendLintConfig(pathItem, resolver);
-            return yield resolveLint({
+            return yield resolveAndMergeNestedLint({
                 lintConfig: extendedLintConfig,
                 configPath: pathItem,
                 resolver: resolver,
@@ -175,6 +175,12 @@ function resolveLint({ lintConfig, configPath = '', resolver = new resolve_1.Bas
         return Object.assign(Object.assign({}, lint), { extendPaths: (_c = lint.extendPaths) === null || _c === void 0 ? void 0 : _c.filter((path) => path && !ref_utils_1.isAbsoluteUrl(path)), plugins: utils_1.getUniquePlugins(mergedPlugins), recommendedFallback: lintConfig === null || lintConfig === void 0 ? void 0 : lintConfig.recommendedFallback, doNotResolveExamples: lintConfig === null || lintConfig === void 0 ? void 0 : lintConfig.doNotResolveExamples });
     });
 }
+function resolveLint(lintOpts, parentConfigPaths = [], extendPaths = []) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const resolvedLint = yield resolveAndMergeNestedLint(lintOpts, parentConfigPaths, extendPaths);
+        return Object.assign(Object.assign({}, resolvedLint), { rules: resolvedLint.rules && groupLintAssertionRules(resolvedLint.rules) });
+    });
+}
 exports.resolveLint = resolveLint;
 function resolvePreset(presetName, plugins) {
     var _a;
@@ -211,3 +217,26 @@ function getMergedLintRawConfig(configLint, apiLint) {
     const resultLint = Object.assign(Object.assign(Object.assign({}, configLint), apiLint), { rules: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.rules), apiLint === null || apiLint === void 0 ? void 0 : apiLint.rules), oas2Rules: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas2Rules), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas2Rules), oas3_0Rules: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas3_0Rules), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas3_0Rules), oas3_1Rules: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas3_1Rules), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas3_1Rules), preprocessors: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.preprocessors), apiLint === null || apiLint === void 0 ? void 0 : apiLint.preprocessors), oas2Preprocessors: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas2Preprocessors), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas2Preprocessors), oas3_0Preprocessors: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas3_0Preprocessors), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas3_0Preprocessors), oas3_1Preprocessors: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas3_1Preprocessors), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas3_1Preprocessors), decorators: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.decorators), apiLint === null || apiLint === void 0 ? void 0 : apiLint.decorators), oas2Decorators: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas2Decorators), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas2Decorators), oas3_0Decorators: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas3_0Decorators), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas3_0Decorators), oas3_1Decorators: Object.assign(Object.assign({}, configLint === null || configLint === void 0 ? void 0 : configLint.oas3_1Decorators), apiLint === null || apiLint === void 0 ? void 0 : apiLint.oas3_1Decorators), recommendedFallback: (apiLint === null || apiLint === void 0 ? void 0 : apiLint.extends) ? false : configLint.recommendedFallback });
     return resultLint;
 }
+function groupLintAssertionRules(rules) {
+    if (!rules) {
+        return rules;
+    }
+    // Create a new record to avoid mutating original
+    const transformedRules = {};
+    // Collect assertion rules
+    const assertions = [];
+    for (const [ruleKey, rule] of Object.entries(rules)) {
+        if (ruleKey.startsWith('assert/') && typeof rule === 'object' && rule !== null) {
+            const assertion = rule;
+            assertions.push(Object.assign(Object.assign({}, assertion), { assertionId: ruleKey.replace('assert/', '') }));
+        }
+        else {
+            // If it's not an assertion, keep it as is
+            transformedRules[ruleKey] = rule;
+        }
+    }
+    if (assertions.length > 0) {
+        transformedRules.assertions = assertions;
+    }
+    return transformedRules;
+}

package/lib/config/config.d.ts

@@ -1,11 +1,14 @@
+/// <reference types="node" />
 import { NormalizedProblem } from '../walk';
 import { OasVersion, OasMajorVersion, Oas2RuleSet, Oas3RuleSet } from '../oas-types';
 import type { NodeType } from '../types';
 import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedLintConfig, RuleConfig } from './types';
+export declare const env: NodeJS.ProcessEnv;
 export declare const IGNORE_FILE = ".redocly.lint-ignore.yaml";
 export declare const DEFAULT_REGION = "us";
 export declare const DOMAINS: {
-    [region in Region]: string;
+    us: string;
+    eu: string;
 };
 export declare const AVAILABLE_REGIONS: Region[];
 export declare class LintConfig {

package/lib/config/config.js

@@ -1,28 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Config = exports.LintConfig = exports.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = exports.IGNORE_FILE = void 0;
+exports.Config = exports.LintConfig = exports.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = exports.IGNORE_FILE = exports.env = void 0;
 const fs = require("fs");
 const path = require("path");
 const js_yaml_1 = require("../js-yaml");
 const utils_1 = require("../utils");
 const oas_types_1 = require("../oas-types");
 const utils_2 = require("./utils");
+// Alias environment here so this file can work in browser environments too.
+exports.env = typeof process !== 'undefined' ? process.env || {} : {};
 exports.IGNORE_FILE = '.redocly.lint-ignore.yaml';
 const IGNORE_BANNER = `# This file instructs Redocly's linter to ignore the rules contained for specific parts of your API.\n` +
     `# See https://redoc.ly/docs/cli/ for more information.\n`;
 exports.DEFAULT_REGION = 'us';
-const REDOCLY_DOMAIN = process.env.REDOCLY_DOMAIN;
-exports.DOMAINS = {
-    us: 'redocly.com',
-    eu: 'eu.redocly.com',
-};
-// FIXME: temporary fix for our lab environments
-if (REDOCLY_DOMAIN === null || REDOCLY_DOMAIN === void 0 ? void 0 : REDOCLY_DOMAIN.endsWith('.redocly.host')) {
-    exports.DOMAINS[REDOCLY_DOMAIN.split('.')[0]] = REDOCLY_DOMAIN;
-}
-if (REDOCLY_DOMAIN === 'redoc.online') {
-    exports.DOMAINS[REDOCLY_DOMAIN] = REDOCLY_DOMAIN;
+function getDomains() {
+    const domains = {
+        us: 'redocly.com',
+        eu: 'eu.redocly.com',
+    };
+    // FIXME: temporary fix for our lab environments
+    const domain = exports.env.REDOCLY_DOMAIN;
+    if (domain === null || domain === void 0 ? void 0 : domain.endsWith('.redocly.host')) {
+        domains[domain.split('.')[0]] = domain;
+    }
+    if (domain === 'redoc.online') {
+        domains[domain] = domain;
+    }
+    return domains;
 }
+exports.DOMAINS = getDomains();
 exports.AVAILABLE_REGIONS = Object.keys(exports.DOMAINS);
 class LintConfig {
     constructor(rawConfig, configFile) {

package/lib/format/format.js

@@ -5,6 +5,7 @@ const path = require("path");
 const colorette_1 = require("colorette");
 const coreVersion = require('../../package.json').version;
 const codeframes_1 = require("./codeframes");
+const config_1 = require("../config");
 const ERROR_MESSAGE = {
     INVALID_SEVERITY_LEVEL: 'Invalid severity level; accepted values: error or warn',
 };
@@ -131,7 +132,7 @@ function formatProblems(problems, opts) {
                         ? Object.assign(Object.assign({}, p.from), { source: {
                                 ref: path.relative(cwd, ((_a = p.from) === null || _a === void 0 ? void 0 : _a.source.absoluteRef) || cwd),
                             } }) : undefined });
-                if (process.env.FORMAT_JSON_WITH_CODEFRAMES) {
+                if (config_1.env.FORMAT_JSON_WITH_CODEFRAMES) {
                     const location = p.location[0]; // TODO: support multiple locations
                     const loc = codeframes_1.getLineColLocation(location);
                     problem.codeframe = codeframes_1.getCodeframe(loc, color);

package/lib/redocly/index.js

@@ -18,27 +18,21 @@ const registry_api_1 = require("./registry-api");
 const config_1 = require("../config/config");
 const utils_1 = require("../utils");
 const TOKEN_FILENAME = '.redocly-config.json';
-let REDOCLY_DOMAIN; // workaround for the isRedoclyRegistryURL, see more below
 class RedoclyClient {
     constructor(region) {
         this.accessTokens = {};
         this.region = this.loadRegion(region);
         this.loadTokens();
-        this.domain = region ? config_1.DOMAINS[region] : process.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.DEFAULT_REGION];
-        /*
-         * We can't use process.env here because it is replaced by a const in some client-side bundles,
-         * which breaks assignment.
-         */
-        REDOCLY_DOMAIN = this.domain; // isRedoclyRegistryURL depends on the value to be set
+        this.domain = region ? config_1.DOMAINS[region] : config_1.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.DEFAULT_REGION];
+        config_1.env.REDOCLY_DOMAIN = this.domain; // isRedoclyRegistryURL depends on the value to be set
         this.registryApi = new registry_api_1.RegistryApi(this.accessTokens, this.region);
     }
     loadRegion(region) {
         if (region && !config_1.DOMAINS[region]) {
-            process.stdout.write(colorette_1.red(`Invalid argument: region in config file.\nGiven: ${colorette_1.green(region)}, choices: "us", "eu".\n`));
-            process.exit(1);
+            throw new Error(`Invalid argument: region in config file.\nGiven: ${colorette_1.green(region)}, choices: "us", "eu".`);
         }
-        if (process.env.REDOCLY_DOMAIN) {
-            return (config_1.AVAILABLE_REGIONS.find((region) => config_1.DOMAINS[region] === process.env.REDOCLY_DOMAIN) || config_1.DEFAULT_REGION);
+        if (config_1.env.REDOCLY_DOMAIN) {
+            return (config_1.AVAILABLE_REGIONS.find((region) => config_1.DOMAINS[region] === config_1.env.REDOCLY_DOMAIN) || config_1.DEFAULT_REGION);
         }
         return region || config_1.DEFAULT_REGION;
     }
@@ -54,13 +48,7 @@ class RedoclyClient {
     }
     getAuthorizationHeader() {
         return __awaiter(this, void 0, void 0, function* () {
-            const token = this.accessTokens[this.region];
-            // print this only if there is token but invalid
-            if (token && !this.isAuthorizedWithRedoclyByRegion()) {
-                process.stderr.write(`${colorette_1.yellow('Warning:')} invalid Redocly API key. Use "npx @redocly/openapi-cli login" to provide your API key\n`);
-                return undefined;
-            }
-            return token;
+            return this.accessTokens[this.region];
         });
     }
     // </backward compatibility: portal>
@@ -76,8 +64,8 @@ class RedoclyClient {
                 [this.region]: credentials.token,
             })));
         }
-        if (process.env.REDOCLY_AUTHORIZATION) {
-            this.setAccessTokens(Object.assign(Object.assign({}, this.accessTokens), { [this.region]: process.env.REDOCLY_AUTHORIZATION }));
+        if (config_1.env.REDOCLY_AUTHORIZATION) {
+            this.setAccessTokens(Object.assign(Object.assign({}, this.accessTokens), { [this.region]: config_1.env.REDOCLY_AUTHORIZATION }));
         }
     }
     getAllTokens() {
@@ -133,19 +121,16 @@ class RedoclyClient {
     login(accessToken, verbose = false) {
         return __awaiter(this, void 0, void 0, function* () {
             const credentialsPath = path_1.resolve(os_1.homedir(), TOKEN_FILENAME);
-            process.stdout.write(colorette_1.gray('\n  Logging in...\n'));
             try {
                 yield this.verifyToken(accessToken, this.region, verbose);
             }
             catch (err) {
-                process.stdout.write(colorette_1.red('Authorization failed. Please check if you entered a valid API key.\n'));
-                process.exit(1);
+                throw new Error('Authorization failed. Please check if you entered a valid API key.');
             }
             const credentials = Object.assign(Object.assign({}, this.readCredentialsFile(credentialsPath)), { [this.region]: accessToken, token: accessToken });
             this.accessTokens = credentials;
             this.registryApi.setAccessTokens(credentials);
             fs_1.writeFileSync(credentialsPath, JSON.stringify(credentials, null, 2));
-            process.stdout.write(colorette_1.green('  Authorization confirmed. ✅\n\n'));
         });
     }
     logout() {
@@ -153,12 +138,11 @@ class RedoclyClient {
         if (fs_1.existsSync(credentialsPath)) {
             fs_1.unlinkSync(credentialsPath);
         }
-        process.stdout.write('Logged out from the Redocly account. ✋\n');
     }
 }
 exports.RedoclyClient = RedoclyClient;
 function isRedoclyRegistryURL(link) {
-    const domain = REDOCLY_DOMAIN || process.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.DEFAULT_REGION];
+    const domain = config_1.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.DEFAULT_REGION];
     const legacyDomain = domain === 'redocly.com' ? 'redoc.ly' : domain;
     if (!link.startsWith(`https://api.${domain}/registry/`) &&
         !link.startsWith(`https://api.${legacyDomain}/registry/`)) {

package/lib/redocly/registry-api-types.d.ts

@@ -14,6 +14,7 @@ export declare namespace RegistryApiTypes {
         filePaths: string[];
         branch?: string;
         isUpsert?: boolean;
+        isPublic?: boolean;
     }
     export interface PrepareFileuploadOKResponse {
         filePath: string;

package/lib/redocly/registry-api.d.ts

@@ -13,5 +13,5 @@ export declare class RegistryApi {
         organizations: string[];
     }>;
     prepareFileUpload({ organizationId, name, version, filesHash, filename, isUpsert, }: RegistryApiTypes.PrepareFileuploadParams): Promise<RegistryApiTypes.PrepareFileuploadOKResponse>;
-    pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, }: RegistryApiTypes.PushApiParams): Promise<void>;
+    pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, isPublic, }: RegistryApiTypes.PushApiParams): Promise<void>;
 }

package/lib/redocly/registry-api.js

@@ -80,7 +80,7 @@ class RegistryApi {
             throw new Error('Could not prepare file upload');
         });
     }
-    pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, }) {
+    pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, isPublic, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.request(`/${organizationId}/${name}/${version}`, {
                 method: 'PUT',
@@ -93,6 +93,7 @@ class RegistryApi {
                     filePaths,
                     branch,
                     isUpsert,
+                    isPublic,
                 }),
             }, this.region);
             if (response.ok) {

package/lib/rules/common/assertions/index.js

@@ -7,7 +7,7 @@ const Assertions = (opts) => {
     let visitors = [];
     // As 'Assertions' has an array of asserts,
     // that array spreads into an 'opts' object on init rules phase here
-    // https://github.com/Redocly/openapi-cli/blob/master/packages/core/src/config/config.ts#L311
+    // https://github.com/Redocly/redocly-cli/blob/master/packages/core/src/config/config.ts#L311
     // that is why we need to iterate through 'opts' values;
     // before - filter only object 'opts' values
     const assertions = Object.values(opts).filter((opt) => typeof opt === 'object' && opt !== null);

package/lib/types/oas2.js

@@ -80,7 +80,8 @@ const Operation = {
         deprecated: { type: 'boolean' },
         security: _1.listOf('SecurityRequirement'),
         'x-codeSamples': _1.listOf('XCodeSample'),
-        'x-code-samples': _1.listOf('XCodeSample'), // deprecated
+        'x-code-samples': _1.listOf('XCodeSample'),
+        'x-hideTryItPanel': { type: 'boolean' },
     },
     required: ['responses'],
 };
@@ -275,6 +276,7 @@ const Schema = {
         xml: 'Xml',
         externalDocs: 'ExternalDocs',
         example: { isExample: true },
+        'x-tags': { type: 'array', items: { type: 'string' } },
     },
 };
 const SchemaProperties = {

package/lib/types/oas3.js

@@ -149,7 +149,8 @@ const Operation = {
         deprecated: { type: 'boolean' },
         callbacks: _1.mapOf('Callback'),
         'x-codeSamples': _1.listOf('XCodeSample'),
-        'x-code-samples': _1.listOf('XCodeSample'), // deprecated
+        'x-code-samples': _1.listOf('XCodeSample'),
+        'x-hideTryItPanel': { type: 'boolean' },
     },
     required: ['responses'],
 };
@@ -292,6 +293,7 @@ const Schema = {
         xml: 'Xml',
         example: { isExample: true },
         deprecated: { type: 'boolean' },
+        'x-tags': { type: 'array', items: { type: 'string' } },
     },
 };
 const Xml = {
@@ -344,7 +346,7 @@ const ImplicitFlow = {
         scopes: { type: 'object', additionalProperties: { type: 'string' } },
         authorizationUrl: { type: 'string' },
     },
-    required: ['authorizationUrl', 'scopes']
+    required: ['authorizationUrl', 'scopes'],
 };
 const PasswordFlow = {
     properties: {

package/lib/types/oas3_1.js

@@ -71,7 +71,8 @@ const Operation = {
         deprecated: { type: 'boolean' },
         callbacks: _1.mapOf('Callback'),
         'x-codeSamples': _1.listOf('XCodeSample'),
-        'x-code-samples': _1.listOf('XCodeSample'), // deprecated
+        'x-code-samples': _1.listOf('XCodeSample'),
+        'x-hideTryItPanel': { type: 'boolean' },
     },
 };
 const Schema = {
@@ -164,6 +165,7 @@ const Schema = {
         deprecated: { type: 'boolean' },
         const: null,
         $comment: { type: 'string' },
+        'x-tags': { type: 'array', items: { type: 'string' } },
     },
 };
 const SecurityScheme = {

package/lib/types/redocly-yaml.js

@@ -414,6 +414,7 @@ const ConfigReferenceDocs = {
         hideSchemaPattern: { type: 'boolean' },
         hideSchemaTitles: { type: 'boolean' },
         hideSingleRequestSampleTab: { type: 'boolean' },
+        hideTryItPanel: { type: 'boolean' },
         htmlTemplate: { type: 'string' },
         jsonSampleExpandLevel: { type: 'string' },
         labels: 'ConfigLabels',
@@ -433,6 +434,7 @@ const ConfigReferenceDocs = {
         routingBasePath: { type: 'string' },
         samplesTabsMaxCount: { type: 'number' },
         schemaExpansionLevel: { type: 'string' },
+        schemaDefinitionsTagName: { type: 'string' },
         scrollYOffset: { type: 'string' },
         searchAutoExpand: { type: 'boolean' },
         searchFieldLevelBoost: { type: 'number' },

package/lib/typings/openapi.d.ts

@@ -72,6 +72,7 @@ export interface Oas3Operation {
     servers?: Oas3Server[];
     'x-codeSamples'?: Oas3XCodeSample[];
     'x-code-samples'?: Oas3XCodeSample[];
+    'x-hideTryItPanel'?: boolean;
 }
 export interface Oas3Parameter {
     name: string;
@@ -144,6 +145,7 @@ export interface Oas3Schema {
     enum?: any[];
     example?: any;
     xml?: Oas3Xml;
+    'x-tags'?: string[];
 }
 export interface Oas3_1Schema extends Oas3Schema {
     examples?: any[];

package/lib/typings/swagger.d.ts

@@ -71,6 +71,7 @@ export interface Oas2Operation {
     security?: Oas2SecurityRequirement[];
     'x-codeSamples'?: Oas2XCodeSample[];
     'x-code-samples'?: Oas2XCodeSample[];
+    'x-hideTryItPanel'?: boolean;
 }
 export declare type Oas2Parameter = Oas2BodyParameter | Oas2SimpleParameter;
 export interface Oas2BodyParameter {
@@ -166,6 +167,7 @@ export interface Oas2Schema {
     enum?: any[];
     example?: any;
     xml?: Oas2Xml;
+    'x-tags'?: string[];
 }
 export declare type Oas2ParameterLocation = 'query' | 'header' | 'path' | 'formData';
 export interface Oas2Responses {

package/lib/utils.d.ts

@@ -22,7 +22,6 @@ export declare function readFileFromUrl(url: string, config: HttpResolveConfig):
     body: any;
     mimeType: any;
 }>;
-export declare function match(url: string, pattern: string): boolean;
 export declare function pickObjectProps<T extends Record<string, unknown>>(object: T, keys: Array<string>): T;
 export declare function omitObjectProps<T extends Record<string, unknown>>(object: T, keys: Array<string>): T;
 export declare function splitCamelCaseIntoWords(str: string): Set<string>;

package/lib/utils.js

@@ -9,12 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignExisting = exports.isNotString = exports.isString = exports.isNotEmptyObject = exports.slash = exports.isPathParameter = exports.readFileAsStringSync = exports.isSingular = exports.validateMimeTypeOAS3 = exports.validateMimeType = exports.splitCamelCaseIntoWords = exports.omitObjectProps = exports.pickObjectProps = exports.match = exports.readFileFromUrl = exports.isEmptyArray = exports.isEmptyObject = exports.isPlainObject = exports.notUndefined = exports.loadYaml = exports.popStack = exports.pushStack = exports.stringifyYaml = exports.parseYaml = void 0;
+exports.assignExisting = exports.isNotString = exports.isString = exports.isNotEmptyObject = exports.slash = exports.isPathParameter = exports.readFileAsStringSync = exports.isSingular = exports.validateMimeTypeOAS3 = exports.validateMimeType = exports.splitCamelCaseIntoWords = exports.omitObjectProps = exports.pickObjectProps = exports.readFileFromUrl = exports.isEmptyArray = exports.isEmptyObject = exports.isPlainObject = exports.notUndefined = exports.loadYaml = exports.popStack = exports.pushStack = exports.stringifyYaml = exports.parseYaml = void 0;
 const fs = require("fs");
 const minimatch = require("minimatch");
 const node_fetch_1 = require("node-fetch");
 const pluralize = require("pluralize");
 const js_yaml_1 = require("./js-yaml");
+const config_1 = require("./config");
 var js_yaml_2 = require("./js-yaml");
 Object.defineProperty(exports, "parseYaml", { enumerable: true, get: function () { return js_yaml_2.parseYaml; } });
 Object.defineProperty(exports, "stringifyYaml", { enumerable: true, get: function () { return js_yaml_2.stringifyYaml; } });
@@ -56,7 +57,7 @@ function readFileFromUrl(url, config) {
         for (const header of config.headers) {
             if (match(url, header.matches)) {
                 headers[header.name] =
-                    header.envVariable !== undefined ? process.env[header.envVariable] || '' : header.value;
+                    header.envVariable !== undefined ? config_1.env[header.envVariable] || '' : header.value;
             }
         }
         const req = yield (config.customFetch || node_fetch_1.default)(url, {
@@ -76,7 +77,6 @@ function match(url, pattern) {
     }
     return minimatch(url, pattern);
 }
-exports.match = match;
 function pickObjectProps(object, keys) {
     return Object.fromEntries(keys.filter((key) => key in object).map((key) => [key, object[key]]));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "1.0.0-beta.95",
+  "version": "1.0.0-beta.98",
   "description": "",
   "main": "lib/index.js",
   "engines": {
@@ -10,7 +10,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Redocly/openapi-cli.git"
+    "url": "https://github.com/Redocly/redocly-cli.git"
   },
   "browser": {
     "fs": false,
@@ -18,7 +18,7 @@
     "os": false,
     "node-fetch": false
   },
-  "homepage": "https://github.com/Redocly/openapi-cli",
+  "homepage": "https://github.com/Redocly/redocly-cli",
   "keywords": [
     "linter",
     "OpenAPI",
@@ -39,7 +39,7 @@
     "js-levenshtein": "^1.1.6",
     "js-yaml": "^4.1.0",
     "lodash.isequal": "^4.5.0",
-    "minimatch": "^3.0.4",
+    "minimatch": "^5.0.1",
     "node-fetch": "^2.6.1",
     "pluralize": "^8.0.0",
     "yaml-ast-parser": "0.0.43"
@@ -48,7 +48,7 @@
     "@types/js-levenshtein": "^1.1.0",
     "@types/js-yaml": "^4.0.3",
     "@types/lodash.isequal": "^4.5.5",
-    "@types/minimatch": "^3.0.3",
+    "@types/minimatch": "^3.0.5",
     "@types/node-fetch": "^2.5.7",
     "@types/pluralize": "^0.0.29",
     "typescript": "^4.0.5"

package/src/benchmark/benchmark.js

@@ -29,7 +29,7 @@ function prepareRevision(revision) {
 
   // Returns the complete git hash for a given git revision reference.
   const hash = exec(`git rev-parse "${revision}"`);
-  const dir = path.join(os.tmpdir(), 'openapi-cli-benchmark', hash);
+  const dir = path.join(os.tmpdir(), 'redocly-cli-benchmark', hash);
   if (fs.existsSync(dir)) {
     fs.rmdirSync(dir, { recursive: true});
   }

package/src/config/__tests__/__snapshots__/config-resolvers.test.ts.snap

@@ -103,7 +103,24 @@ Object {
   "preprocessors": Object {},
   "recommendedFallback": undefined,
   "rules": Object {
-    "assertions": "warn",
+    "assertions": Array [
+      Object {
+        "assertionId": "path-item-get-defined",
+        "defined": true,
+        "message": "Every path item must have a GET operation.",
+        "property": "get",
+        "subject": "PathItem",
+      },
+      Object {
+        "assertionId": "tag-description",
+        "message": "Tag description must be at least 13 characters and end with a full stop.",
+        "minLength": 13,
+        "pattern": "/\\\\.$/",
+        "property": "description",
+        "severity": "error",
+        "subject": "Tag",
+      },
+    ],
     "boolean-parameter-prefixes": "error",
     "info-contact": "off",
     "info-description": "warn",

package/src/config/__tests__/config-resolvers.test.ts

@@ -130,6 +130,37 @@ describe('resolveLint', () => {
     expect(lint).toMatchSnapshot();
   });
 
+  it('should correctly merge assertions from nested config', async () => {
+    const lintConfig = {
+      extends: ['local-config-with-file.yaml'],
+    };
+
+    const lint = await resolveLint({
+      lintConfig,
+      configPath,
+    });
+
+    expect(Array.isArray(lint.rules?.assertions)).toEqual(true);
+    expect(lint.rules?.assertions).toMatchObject( [
+      {
+        subject: 'PathItem',
+        property: 'get',
+        message: 'Every path item must have a GET operation.',
+        defined: true,
+        assertionId: 'path-item-get-defined'
+      },
+      {
+        subject: 'Tag',
+        property: 'description',
+        message: 'Tag description must be at least 13 characters and end with a full stop.',
+        severity: 'error',
+        minLength: 13,
+        pattern: '/\\.$/',
+        assertionId: 'tag-description'
+      }
+    ])
+  });
+
   it('should resolve extends with url file config witch contains path to nested config', async () => {
     const lintConfig = {
       // This points to ./fixtures/resolve-remote-configs/remote-config.yaml

package/src/config/__tests__/fixtures/resolve-config/api/nested-config.yaml

@@ -3,5 +3,10 @@ lint:
     - plugin.js
   rules:
     operation-2xx-response: error
+    assert/path-item-get-defined:
+      subject: PathItem
+      property: get
+      message: Every path item must have a GET operation.
+      defined: true
   extends:
     - test-plugin-nested/all

package/src/config/__tests__/fixtures/resolve-config/local-config-with-file.yaml

@@ -2,6 +2,13 @@ lint:
   rules:
     no-invalid-media-type-examples: warn
     operation-4xx-response: off
+    assert/tag-description:
+      subject: Tag
+      property: description
+      message: Tag description must be at least 13 characters and end with a full stop.
+      severity: error
+      minLength: 13
+      pattern: /\.$/
   plugins:
     - plugin.js
     - api/plugin.js