@redocly/openapi-core 1.0.0-beta.108 → 1.0.0-beta.110

package/src/config/config.ts

@@ -306,6 +306,7 @@ export class Config {
   'features.openapi': Record<string, any>;
   'features.mockServer'?: Record<string, any>;
   organization?: string;
+  files: string[];
   constructor(public rawConfig: ResolvedConfig, public configFile?: string) {
     this.apis = rawConfig.apis || {};
     this.styleguide = new StyleguideConfig(rawConfig.styleguide || {}, configFile);
@@ -314,5 +315,6 @@ export class Config {
     this.resolve = getResolveConfig(rawConfig?.resolve);
     this.region = rawConfig.region;
     this.organization = rawConfig.organization;
+    this.files = rawConfig.files || [];
   }
 }

package/src/config/load.ts

@@ -7,7 +7,7 @@ import { Config, DOMAINS } from './config';
 import { transformConfig } from './utils';
 import { resolveConfig } from './config-resolvers';
 
-import type { DeprecatedInRawConfig, RawConfig, Region } from './types';
+import type { DeprecatedInRawConfig, FlatRawConfig, RawConfig, Region } from './types';
 import { RegionalTokenWithValidity } from '../redocly/redocly-client-types';
 
 async function addConfigMetadata({
@@ -62,11 +62,17 @@ async function addConfigMetadata({
 }
 
 export async function loadConfig(
-  configPath: string | undefined = findConfig(),
-  customExtends?: string[],
-  processRawConfig?: (rawConfig: RawConfig) => void | Promise<void>
+  options: {
+    configPath?: string;
+    customExtends?: string[];
+    processRawConfig?: (rawConfig: RawConfig) => void | Promise<void>;
+    files?: string[];
+    region?: Region;
+  } = {}
 ): Promise<Config> {
-  const rawConfig = await getConfig(configPath);
+  const { configPath = findConfig(), customExtends, processRawConfig, files, region } = options;
+  const config = await getConfig(configPath);
+  const rawConfig = { ...config, files: files ?? config.files, region: region ?? config.region };
   if (typeof processRawConfig === 'function') {
     await processRawConfig(rawConfig);
   }
@@ -102,7 +108,8 @@ export function findConfig(dir?: string): string | undefined {
 export async function getConfig(configPath: string | undefined = findConfig()): Promise<RawConfig> {
   if (!configPath || !doesYamlFileExist(configPath)) return {};
   try {
-    const rawConfig = (await loadYaml<RawConfig & DeprecatedInRawConfig>(configPath)) || {};
+    const rawConfig =
+      (await loadYaml<RawConfig & DeprecatedInRawConfig & FlatRawConfig>(configPath)) || {};
     return transformConfig(rawConfig);
   } catch (e) {
     throw new Error(`Error parsing config file at '${configPath}': ${e.message}`);

package/src/config/minimal.ts

@@ -24,7 +24,7 @@ export default {
     'operation-operationId-unique': 'warn',
     'operation-parameters-unique': 'warn',
     'operation-tag-defined': 'off',
-    'operation-security-defined': 'warn',
+    'security-defined': 'warn',
     'operation-operationId-url-safe': 'warn',
     'operation-singular-tag': 'off',
     'no-unresolved-refs': 'error',
@@ -45,6 +45,7 @@ export default {
     'no-unused-components': 'warn',
     'no-undefined-server-variable': 'warn',
     'no-server-variables-empty-enum': 'error',
+    'spec-components-invalid-map-name': 'warn',
   },
   oas3_1Rules: {
     'no-invalid-media-type-examples': 'warn',
@@ -55,5 +56,6 @@ export default {
     'no-unused-components': 'warn',
     'no-undefined-server-variable': 'warn',
     'no-server-variables-empty-enum': 'error',
+    'spec-components-invalid-map-name': 'warn',
   },
 } as PluginStyleguideConfig;

package/src/config/recommended.ts

@@ -25,7 +25,7 @@ export default {
     'operation-operationId-url-safe': 'error',
     'operation-parameters-unique': 'error',
     'operation-tag-defined': 'off',
-    'operation-security-defined': 'error',
+    'security-defined': 'error',
     'operation-singular-tag': 'off',
     'no-unresolved-refs': 'error',
     'no-enum-type-mismatch': 'error',
@@ -45,6 +45,7 @@ export default {
     'no-unused-components': 'warn',
     'no-undefined-server-variable': 'error',
     'no-server-variables-empty-enum': 'error',
+    'spec-components-invalid-map-name': 'error',
   },
   oas3_1Rules: {
     'no-invalid-media-type-examples': 'warn',
@@ -55,5 +56,6 @@ export default {
     'no-unused-components': 'warn',
     'no-undefined-server-variable': 'error',
     'no-server-variables-empty-enum': 'error',
+    'spec-components-invalid-map-name': 'error',
   },
 } as PluginStyleguideConfig;

package/src/config/rules.ts

@@ -1,6 +1,6 @@
 import { RuleSet, OasVersion } from '../oas-types';
 import { StyleguideConfig } from './config';
-import { notUndefined } from '../utils';
+import { isDefined } from '../utils';
 
 export function initRules<T extends Function, P extends RuleSet<T>>(
   rules: P[],
@@ -42,5 +42,5 @@ export function initRules<T extends Function, P extends RuleSet<T>>(
       })
     )
     .flatMap((visitor) => visitor)
-    .filter(notUndefined);
+    .filter(isDefined);
 }

package/src/config/types.ts

@@ -10,6 +10,7 @@ import type {
   OasVersion,
 } from '../oas-types';
 import type { NodeType } from '../types';
+import { Location } from '../ref-utils';
 
 export type RuleSeverity = ProblemSeverity | 'off';
 
@@ -83,6 +84,15 @@ export type CustomRulesConfig = {
   oas2?: Oas2RuleSet;
 };
 
+export type AssertResult = { message?: string; location?: Location };
+export type CustomFunction = (
+  value: any,
+  options: unknown,
+  baseLocation: Location
+) => AssertResult[];
+
+export type AssertionsConfig = Record<string, CustomFunction>;
+
 export type Plugin = {
   id: string;
   configs?: Record<string, PluginStyleguideConfig>;
@@ -90,6 +100,7 @@ export type Plugin = {
   preprocessors?: PreprocessorsConfig;
   decorators?: DecoratorsConfig;
   typeExtension?: TypeExtensionsConfig;
+  assertions?: AssertionsConfig;
 };
 
 export type PluginStyleguideConfig = Omit<StyleguideRawConfig, 'plugins' | 'extends'>;
@@ -110,6 +121,7 @@ export type ResolveHeader =
 
 export type RawResolveConfig = {
   http?: Partial<HttpResolveConfig>;
+  doNotResolveExamples?: boolean;
 };
 
 export type HttpResolveConfig = {
@@ -128,6 +140,7 @@ export type AccessTokens = { [region in Region]?: string };
 export type DeprecatedInRawConfig = {
   apiDefinitions?: Record<string, string>;
   lint?: StyleguideRawConfig;
+  styleguide?: StyleguideRawConfig;
   referenceDocs?: Record<string, any>;
   apis?: Record<string, Api & DeprecatedInApi>;
 };
@@ -143,6 +156,7 @@ export type DeprecatedInApi = {
 
 export type ResolvedApi = Omit<Api, 'styleguide'> & {
   styleguide: ResolvedStyleguideConfig;
+  files?: string[];
 };
 
 export type RawConfig = {
@@ -151,8 +165,18 @@ export type RawConfig = {
   resolve?: RawResolveConfig;
   region?: Region;
   organization?: string;
+  files?: string[];
 } & FeaturesConfig;
 
+export type FlatApi = Omit<Api, 'styleguide'> &
+  Omit<ApiStyleguideRawConfig, 'doNotResolveExamples'>;
+
+export type FlatRawConfig = Omit<RawConfig, 'styleguide' | 'resolve' | 'apis'> &
+  Omit<StyleguideRawConfig, 'doNotResolveExamples'> & {
+    resolve?: RawResolveConfig;
+    apis?: Record<string, FlatApi>;
+  };
+
 export type ResolvedConfig = Omit<RawConfig, 'apis' | 'styleguide'> & {
   apis: Record<string, ResolvedApi>;
   styleguide: ResolvedStyleguideConfig;

package/src/config/utils.ts

@@ -1,21 +1,24 @@
 import {
   assignExisting,
+  isDefined,
   isTruthy,
   showErrorForDeprecatedField,
   showWarningForDeprecatedField,
 } from '../utils';
 import { Config } from './config';
-
 import type {
   Api,
   DeprecatedInApi,
   DeprecatedInRawConfig,
+  FlatApi,
+  FlatRawConfig,
   Plugin,
   RawConfig,
   RawResolveConfig,
   ResolveConfig,
   ResolvedStyleguideConfig,
   RulesFields,
+  StyleguideRawConfig,
 } from './types';
 import { logger, colorize } from '../logger';
 
@@ -39,13 +42,86 @@ export function transformApiDefinitionsToApis(
   return apis;
 }
 
+function extractFlatConfig<
+  T extends Partial<
+    (Api & DeprecatedInApi & FlatApi) & (DeprecatedInRawConfig & RawConfig & FlatRawConfig)
+  >
+>({
+  plugins,
+  extends: _extends,
+
+  rules,
+  oas2Rules,
+  oas3_0Rules,
+  oas3_1Rules,
+
+  preprocessors,
+  oas2Preprocessors,
+  oas3_0Preprocessors,
+  oas3_1Preprocessors,
+
+  decorators,
+  oas2Decorators,
+  oas3_0Decorators,
+  oas3_1Decorators,
+
+  ...rawConfigRest
+}: T): {
+  styleguideConfig?: StyleguideRawConfig;
+  rawConfigRest: Omit<T, 'plugins' | 'extends' | RulesFields>;
+} {
+  const styleguideConfig = {
+    plugins,
+    extends: _extends,
+
+    rules,
+    oas2Rules,
+    oas3_0Rules,
+    oas3_1Rules,
+
+    preprocessors,
+    oas2Preprocessors,
+    oas3_0Preprocessors,
+    oas3_1Preprocessors,
+
+    decorators,
+    oas2Decorators,
+    oas3_0Decorators,
+    oas3_1Decorators,
+
+    doNotResolveExamples: (rawConfigRest as FlatRawConfig).resolve?.doNotResolveExamples,
+  };
+
+  if (
+    (rawConfigRest.lint && rawConfigRest.styleguide) ||
+    (Object.values(styleguideConfig).some(isDefined) &&
+      (rawConfigRest.lint || rawConfigRest.styleguide))
+  ) {
+    throw new Error(
+      `Do not use 'lint', 'styleguide' and flat syntax together. \nSee more about the configuration in the docs: https://redocly.com/docs/cli/configuration/ \n`
+    );
+  }
+
+  return {
+    styleguideConfig: Object.values(styleguideConfig).some(isDefined)
+      ? styleguideConfig
+      : undefined,
+
+    rawConfigRest,
+  };
+}
+
 function transformApis(
-  legacyApis?: Record<string, Api & DeprecatedInApi>
+  legacyApis?: Record<string, Api & DeprecatedInApi & FlatApi>
 ): Record<string, Api> | undefined {
   if (!legacyApis) return undefined;
   const apis: Record<string, Api> = {};
   for (const [apiName, { lint, ...apiContent }] of Object.entries(legacyApis)) {
-    apis[apiName] = { styleguide: lint, ...apiContent };
+    const { styleguideConfig, rawConfigRest } = extractFlatConfig(apiContent);
+    apis[apiName] = {
+      styleguide: styleguideConfig || lint,
+      ...rawConfigRest,
+    };
   }
   return apis;
 }
@@ -157,6 +233,7 @@ export function getMergedConfig(config: Config, apiName?: string): Config {
             ...config['features.mockServer'],
             ...config.apis[apiName]?.['features.mockServer'],
           },
+          files: [...config.files, ...(config.apis?.[apiName]?.files ?? [])],
           // TODO: merge everything else here
         },
         config.configFile
@@ -165,17 +242,22 @@ export function getMergedConfig(config: Config, apiName?: string): Config {
 }
 
 function checkForDeprecatedFields(
-  deprecatedField: keyof DeprecatedInRawConfig,
-  updatedField: keyof RawConfig,
-  rawConfig: DeprecatedInRawConfig & RawConfig
+  deprecatedField: keyof (DeprecatedInRawConfig & RawConfig),
+  updatedField: keyof FlatRawConfig | undefined,
+  rawConfig: DeprecatedInRawConfig & RawConfig & FlatRawConfig
 ): void {
   const isDeprecatedFieldInApis =
     rawConfig.apis &&
     Object.values(rawConfig.apis).some(
-      (api: Api & DeprecatedInApi & DeprecatedInRawConfig) => api[deprecatedField]
+      (api: Api & FlatApi & DeprecatedInApi & DeprecatedInRawConfig & RawConfig & FlatRawConfig) =>
+        api[deprecatedField]
     );
 
-  if (rawConfig[deprecatedField] && rawConfig[updatedField]) {
+  if (rawConfig[deprecatedField] && updatedField === null) {
+    showWarningForDeprecatedField(deprecatedField);
+  }
+
+  if (rawConfig[deprecatedField] && updatedField && rawConfig[updatedField]) {
     showErrorForDeprecatedField(deprecatedField, updatedField);
   }
 
@@ -184,11 +266,17 @@ function checkForDeprecatedFields(
   }
 }
 
-export function transformConfig(rawConfig: DeprecatedInRawConfig & RawConfig): RawConfig {
-  const migratedFields: [keyof DeprecatedInRawConfig, keyof RawConfig][] = [
+export function transformConfig(
+  rawConfig: DeprecatedInRawConfig & RawConfig & FlatRawConfig
+): RawConfig {
+  const migratedFields: [
+    keyof (DeprecatedInRawConfig & RawConfig),
+    keyof FlatRawConfig | undefined
+  ][] = [
     ['apiDefinitions', 'apis'],
     ['referenceDocs', 'features.openapi'],
-    ['lint', 'styleguide'], // TODO: update docs
+    ['lint', undefined],
+    ['styleguide', undefined],
   ];
 
   for (const [deprecatedField, updatedField] of migratedFields) {
@@ -197,11 +285,13 @@ export function transformConfig(rawConfig: DeprecatedInRawConfig & RawConfig): R
 
   const { apis, apiDefinitions, referenceDocs, lint, ...rest } = rawConfig;
 
+  const { styleguideConfig, rawConfigRest } = extractFlatConfig(rest);
+
   return {
     'features.openapi': referenceDocs,
     apis: transformApis(apis) || transformApiDefinitionsToApis(apiDefinitions),
-    styleguide: lint,
-    ...rest,
+    styleguide: styleguideConfig || lint,
+    ...rawConfigRest,
   };
 }
 

package/src/decorators/common/registry-dependencies.ts

@@ -7,7 +7,7 @@ export const RegistryDependencies: Oas3Decorator | Oas2Decorator = () => {
   const registryDependencies = new Set<string>();
 
   return {
-    DefinitionRoot: {
+    Root: {
       leave(_: any, ctx: UserContext) {
         const data = ctx.getVisitorData();
         data.links = Array.from(registryDependencies);

package/src/format/format.ts

@@ -44,7 +44,13 @@ function severityToNumber(severity: ProblemSeverity) {
   return severity === 'error' ? 1 : 2;
 }
 
-export type OutputFormat = 'codeframe' | 'stylish' | 'json' | 'checkstyle' | 'codeclimate';
+export type OutputFormat =
+  | 'codeframe'
+  | 'stylish'
+  | 'json'
+  | 'checkstyle'
+  | 'codeclimate'
+  | 'summary';
 
 export function getTotals(problems: (NormalizedProblem & { ignored?: boolean })[]): Totals {
   let errors = 0;
@@ -143,6 +149,9 @@ export function formatProblems(
     case 'codeclimate':
       outputForCodeClimate();
       break;
+    case 'summary':
+      formatSummary(problems);
+      break;
   }
 
   if (totalProblems - ignoredProblems > maxProblems) {
@@ -257,13 +266,34 @@ export function formatProblems(
   }
 }
 
+function formatSummary(problems: NormalizedProblem[]): void {
+  const counts: Record<string, { count: number; severity: ProblemSeverity }> = {};
+  for (const problem of problems) {
+    counts[problem.ruleId] = counts[problem.ruleId] || { count: 0, severity: problem.severity };
+    counts[problem.ruleId].count++;
+  }
+  const sorted = Object.entries(counts).sort(([, a], [, b]) => {
+    const severityDiff = severityToNumber(a.severity) - severityToNumber(b.severity);
+    return severityDiff || b.count - a.count;
+  });
+
+  for (const [ruleId, info] of sorted) {
+    const color = COLORS[info.severity];
+    const severityName = color(SEVERITY_NAMES[info.severity].toLowerCase().padEnd(7));
+    logger.info(`${severityName} ${ruleId}: ${info.count}\n`);
+  }
+
+  logger.info('\n');
+}
+
 function formatFrom(cwd: string, location?: LocationObject) {
   if (!location) return '';
   const relativePath = path.relative(cwd, location.source.absoluteRef);
   const loc = getLineColLocation(location);
   const fileWithLoc = `${relativePath}:${loc.start.line}:${loc.start.col}`;
+  const atPointer = location.pointer ? colorize.gray(`at ${location.pointer}`) : '';
 
-  return `referenced from ${colorize.blue(fileWithLoc)}\n\n`;
+  return `referenced from ${colorize.blue(fileWithLoc)} ${atPointer} \n\n`;
 }
 
 function formatDidYouMean(problem: NormalizedProblem) {

package/src/lint.ts

@@ -80,13 +80,13 @@ export async function lintDocument(opts: {
   const normalizedVisitors = normalizeVisitors([...preprocessors, ...regularRules] as any, types);
   const resolvedRefMap = await resolveDocument({
     rootDocument: document,
-    rootType: types.DefinitionRoot,
+    rootType: types.Root,
     externalRefResolver,
   });
 
   walkDocument({
     document,
-    rootType: types.DefinitionRoot,
+    rootType: types.Root,
     normalizedVisitors,
     resolvedRefMap,
     ctx,

package/src/redocly/registry-api.ts

@@ -10,9 +10,6 @@ import { DEFAULT_REGION, DOMAINS } from '../config/config';
 import { isNotEmptyObject } from '../utils';
 const version = require('../../package.json').version;
 
-export const currentCommand =
-  typeof process !== 'undefined' ? process.env?.REDOCLY_CLI_COMMAND || '' : '';
-
 export class RegistryApi {
   constructor(private accessTokens: AccessTokens, private region: Region) {}
 
@@ -30,9 +27,13 @@ export class RegistryApi {
   }
 
   private async request(path = '', options: RequestInit = {}, region?: Region) {
+    const currentCommand =
+      typeof process !== 'undefined' ? process.env?.REDOCLY_CLI_COMMAND || '' : '';
+    const redoclyEnv = typeof process !== 'undefined' ? process.env?.REDOCLY_ENVIRONMENT || '' : '';
+
     const headers = Object.assign({}, options.headers || {}, {
       'x-redocly-cli-version': version,
-      'user-agent': `redocly-cli / ${version} ${currentCommand}`,
+      'user-agent': `redocly-cli / ${version} ${currentCommand} ${redoclyEnv}`,
     });
 
     if (!headers.hasOwnProperty('authorization')) {

package/src/resolve.ts

@@ -115,7 +115,9 @@ export class BaseResolver {
         const { body, mimeType } = await readFileFromUrl(absoluteRef, this.config.http);
         return new Source(absoluteRef, body, mimeType);
       } else {
-        return new Source(absoluteRef, await fs.promises.readFile(absoluteRef, 'utf-8'));
+        const content = await fs.promises.readFile(absoluteRef, 'utf-8');
+        // In some cases file have \r\n line delimeters like on windows, we should skip it.
+        return new Source(absoluteRef, content.replace(/\r\n/g, '\n'));
       }
     } catch (error) {
       throw new ResolveError(error);

package/src/rules/__tests__/utils.test.ts

@@ -153,7 +153,7 @@ describe('get-additional-properties-option', () => {
     } catch (error) {
       expect(error).toBeInstanceOf(Error);
       expect(error.message).toEqual(
-        "Do not use 'disallowAdditionalProperties' field. Use 'allowAdditionalProperties' instead.\n"
+        "Do not use 'disallowAdditionalProperties' field. Use 'allowAdditionalProperties' instead. \n"
       );
     }
   });

package/src/rules/ajv.ts

@@ -1,4 +1,4 @@
-import Ajv, { ValidateFunction, ErrorObject } from '@redocly/ajv';
+import Ajv, { ValidateFunction, ErrorObject } from '@redocly/ajv/dist/2020';
 import { Location, escapePointer } from '../ref-utils';
 import { ResolveFn } from '../walk';
 
@@ -20,7 +20,7 @@ function getAjv(resolve: ResolveFn, allowAdditionalProperties: boolean) {
       discriminator: true,
       allowUnionTypes: true,
       validateFormats: false, // TODO: fix it
-      defaultAdditionalProperties: allowAdditionalProperties,
+      defaultUnevaluatedProperties: allowAdditionalProperties,
       loadSchemaSync(base: string, $ref: string) {
         const resolvedRef = resolve({ $ref }, base.split('#')[0]);
         if (!resolvedRef || !resolvedRef.location) return false;
@@ -87,8 +87,8 @@ export function validateJsonSchema(
     if (propName) {
       message = `\`${propName}\` property ${message}`;
     }
-    if (error.keyword === 'additionalProperties') {
-      const property = error.params.additionalProperty;
+    if (error.keyword === 'additionalProperties' || error.keyword === 'unevaluatedProperties') {
+      const property = error.params.additionalProperty || error.params.unevaluatedProperty;
       message = `${message} \`${property}\``;
       error.instancePath += '/' + escapePointer(property);
     }

package/src/rules/common/__tests__/no-enum-type-mismatch.test.ts

@@ -191,6 +191,7 @@ describe('Oas3 typed enum', () => {
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
       Array [
         Object {
+          "from": undefined,
           "location": Array [
             Object {
               "pointer": "#/paths/~1some/get/responses/200/content/application~1json/schema",

package/src/rules/common/__tests__/operation-2xx-response.test.ts

@@ -34,7 +34,7 @@ describe('Oas3 operation-2xx-response', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Operation must have at least one \`2xx\` response.",
+          "message": "Operation must have at least one \`2XX\` response.",
           "ruleId": "operation-2xx-response",
           "severity": "error",
           "suggest": Array [],

package/src/rules/common/__tests__/operation-4xx-response.test.ts

@@ -34,7 +34,7 @@ describe('Oas3 operation-4xx-response', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Operation must have at least one \`4xx\` response.",
+          "message": "Operation must have at least one \`4XX\` response.",
           "ruleId": "operation-4xx-response",
           "severity": "error",
           "suggest": Array [],
@@ -43,7 +43,7 @@ describe('Oas3 operation-4xx-response', () => {
     `);
   });
 
-  it('should not report for present 4xx response', async () => {
+  it('should not report for present 400 response', async () => {
     const document = parseYamlToDocument(
       outdent`
           openapi: 3.0.0
@@ -66,6 +66,29 @@ describe('Oas3 operation-4xx-response', () => {
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
   });
 
+  it('should not report for present 4XX response', async () => {
+    const document = parseYamlToDocument(
+      outdent`
+          openapi: 3.0.0
+          paths:
+            '/test/':
+              put:
+                responses:
+                  4XX:
+                    description: error response
+        `,
+      'foobar.yaml'
+    );
+
+    const results = await lintDocument({
+      externalRefResolver: new BaseResolver(),
+      document,
+      config: await makeConfig({ 'operation-4xx-response': 'error' }),
+    });
+
+    expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
+  });
+
   it('should report if default is present but missing 4xx response', async () => {
     const document = parseYamlToDocument(
       outdent`
@@ -96,7 +119,7 @@ describe('Oas3 operation-4xx-response', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Operation must have at least one \`4xx\` response.",
+          "message": "Operation must have at least one \`4XX\` response.",
           "ruleId": "operation-4xx-response",
           "severity": "error",
           "suggest": Array [],