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

package/src/rules/oas3/__tests__/no-invalid-media-type-examples.test.ts

@@ -33,7 +33,7 @@ describe('no-invalid-media-type-examples', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-invalid-media-type-examples': 'error' }),
+      config: await makeConfig({ 'no-invalid-media-type-examples': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -106,7 +106,7 @@ describe('no-invalid-media-type-examples', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({
+      config: await makeConfig({
         'no-invalid-media-type-examples': {
           severity: 'error',
           disallowAdditionalProperties: true,
@@ -166,7 +166,7 @@ describe('no-invalid-media-type-examples', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({
+      config: await makeConfig({
         'no-invalid-media-type-examples': {
           severity: 'error',
           disallowAdditionalProperties: true,
@@ -216,7 +216,7 @@ describe('no-invalid-media-type-examples', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({
+      config: await makeConfig({
         'no-invalid-media-type-examples': {
           severity: 'error',
           disallowAdditionalProperties: true,
@@ -269,7 +269,7 @@ describe('no-invalid-media-type-examples', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-invalid-media-type-examples': 'error' }),
+      config: await makeConfig({ 'no-invalid-media-type-examples': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -301,7 +301,7 @@ describe('no-invalid-media-type-examples', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-invalid-media-type-examples': 'error' }),
+      config: await makeConfig({ 'no-invalid-media-type-examples': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -336,7 +336,7 @@ describe('no-invalid-media-type-examples', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-invalid-media-type-examples': 'error' }),
+      config: await makeConfig({ 'no-invalid-media-type-examples': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -364,7 +364,7 @@ describe('no-invalid-media-type-examples', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-invalid-media-type-examples': 'error' }),
+      config: await makeConfig({ 'no-invalid-media-type-examples': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`

package/src/rules/oas3/__tests__/no-server-example.com.test.ts

@@ -17,7 +17,7 @@ describe('Oas3 oas3-no-server-example.com', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-server-example.com': 'error' }),
+      config: await makeConfig({ 'no-server-example.com': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -52,7 +52,7 @@ describe('Oas3 oas3-no-server-example.com', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-server-example.com': 'error' }),
+      config: await makeConfig({ 'no-server-example.com': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);

package/src/rules/oas3/__tests__/no-server-trailing-slash.test.ts

@@ -17,7 +17,7 @@ describe('Oas3 oas3-no-server-trailing-slash', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-server-trailing-slash': 'error' }),
+      config: await makeConfig({ 'no-server-trailing-slash': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -52,7 +52,7 @@ describe('Oas3 oas3-no-server-trailing-slash', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-server-trailing-slash': 'error' }),
+      config: await makeConfig({ 'no-server-trailing-slash': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -71,7 +71,7 @@ describe('Oas3 oas3-no-server-trailing-slash', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-server-trailing-slash': 'error' }),
+      config: await makeConfig({ 'no-server-trailing-slash': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);

package/src/rules/oas3/__tests__/no-unused-components.test.ts

@@ -42,7 +42,7 @@ describe('Oas3 no-unused-components', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: makeConfig({ 'no-unused-components': 'error' }),
+      config: await makeConfig({ 'no-unused-components': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`

package/src/rules/oas3/__tests__/spec/referenceableScalars.test.ts

@@ -3,6 +3,7 @@ import { parseYamlToDocument, replaceSourceWithRef } from '../../../../../__test
 import { lintDocument } from '../../../../lint';
 import { LintConfig } from '../../../..';
 import { BaseResolver } from '../../../../resolve';
+import { resolveLint } from '../../../../config';
 
 describe('Referenceable scalars', () => {
   it('should not report $ref description', async () => {
@@ -22,13 +23,17 @@ describe('Referenceable scalars', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          spec: 'error',
-          'no-unresolved-refs': 'error',
-        },
-      }),
+      config: new LintConfig(
+        await resolveLint({
+          lintConfig: {
+            extends: [],
+            rules: {
+              spec: 'error',
+              'no-unresolved-refs': 'error',
+            },
+          },
+        }),
+      ),
     });
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
   });
@@ -55,13 +60,17 @@ describe('Referenceable scalars', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          'no-unresolved-refs': 'error',
-        },
-        doNotResolveExamples: true,
-      }),
+      config: new LintConfig(
+        await resolveLint({
+          lintConfig: {
+            extends: [],
+            rules: {
+              'no-unresolved-refs': 'error',
+            },
+            doNotResolveExamples: true,
+          },
+        }),
+      ),
     });
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
   });

package/src/rules/oas3/__tests__/spec/servers.test.ts

@@ -176,7 +176,7 @@ describe('OpenAPI Schema', () => {
       Array [
         Object {
           "location": "#/servers",
-          "message": "Expected type \`Server_List\` (array) but got \`object\`",
+          "message": "Expected type \`ServerList\` (array) but got \`object\`",
         },
       ]
     `);

package/src/rules/oas3/__tests__/spec/spec.test.ts

@@ -1,13 +1,13 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../../__tests__/utils';
-import { LintConfig } from '../../../../config/config';
-import { defaultPlugin } from '../../../../config/builtIn';
+import { LintConfig, defaultPlugin, resolvePlugins, resolvePreset } from '../../../../config';
 
 import { BaseResolver } from '../../../../resolve';
 
-const allConfig = new LintConfig({ plugins: [defaultPlugin], extends: ['all'] });
-
+const plugins = resolvePlugins([defaultPlugin]);
+const pressets = resolvePreset('all', plugins);
+const allConfig = new LintConfig({ ...pressets, plugins });
 describe('Oas3 Structural visitor basic', () => {
   it('should report wrong types', async () => {
     const document = parseYamlToDocument(

package/src/rules/oas3/__tests__/spec/utils.ts

@@ -1,8 +1,7 @@
-import { LintConfig, RuleConfig } from '../../../../config/config';
+import { LintConfig, RuleConfig, resolveLint } from '../../../../config';
 import { parseYamlToDocument } from '../../../../../__tests__/utils';
 import { lintDocument } from '../../../../lint';
 import { BaseResolver } from '../../../../resolve';
-import { defaultPlugin } from '../../../../config/builtIn';
 
 export async function validateDoc(
   source: string,
@@ -13,11 +12,15 @@ export async function validateDoc(
   const results = await lintDocument({
     externalRefResolver: new BaseResolver(),
     document,
-    config: new LintConfig({
-      plugins: [defaultPlugin],
-      extends: [],
-      rules,
-    }),
+    config: new LintConfig(
+      await resolveLint({
+        lintConfig: {
+          plugins: [],
+          extends: [],
+          rules,
+        },
+      }),
+    ),
   });
 
   return results.map((res) => {

package/src/types/index.ts

@@ -49,7 +49,7 @@ type NormalizedResolveTypeFn = (
 
 export function listOf(typeName: string) {
   return {
-    name: typeName + '_List',
+    name: `${typeName}List`,
     properties: {},
     items: typeName,
   };
@@ -57,7 +57,7 @@ export function listOf(typeName: string) {
 
 export function mapOf(typeName: string) {
   return {
-    name: typeName + '_Map',
+    name: `${typeName}Map`,
     properties: {},
     additionalProperties: () => typeName,
   };

package/src/types/oas3_1.ts

@@ -1,5 +1,5 @@
 import { NodeType, listOf, mapOf } from '.';
-import { Oas3Types } from './oas3'
+import { Oas3Types } from './oas3';
 
 const DefinitionRoot: NodeType = {
   properties: {
@@ -15,7 +15,7 @@ const DefinitionRoot: NodeType = {
     jsonSchemaDialect: { type: 'string' },
   },
   required: ['openapi', 'info'],
-  requiredOneOf: ['paths', 'components', 'webhooks']
+  requiredOneOf: ['paths', 'components', 'webhooks'],
 };
 
 const License: NodeType = {
@@ -106,11 +106,14 @@ const Schema: NodeType = {
     enum: { type: 'array' },
     type: (value: any) => {
       if (Array.isArray(value)) {
-        return { type: 'array', items: { enum: ['object', 'array', 'string', 'number', 'integer', 'boolean', 'null'] } }
+        return {
+          type: 'array',
+          items: { enum: ['object', 'array', 'string', 'number', 'integer', 'boolean', 'null'] },
+        };
       } else {
         return {
           enum: ['object', 'array', 'string', 'number', 'integer', 'boolean', 'null'],
-        }
+        };
       }
     },
     allOf: listOf('Schema'),
@@ -126,7 +129,13 @@ const Schema: NodeType = {
     patternProperties: { type: 'object' },
     propertyNames: 'Schema',
     unevaluatedItems: 'Schema',
-    unevaluatedProperties: 'Schema',
+    unevaluatedProperties: (value: unknown) => {
+      if (typeof value === 'boolean') {
+        return { type: 'boolean' };
+      } else {
+        return 'Schema';
+      }
+    },
     summary: { type: 'string' },
     properties: 'SchemaProperties',
     items: (value: any) => {
@@ -196,9 +205,25 @@ const SecurityScheme: NodeType = {
           case 'clientCredentials':
             return ['type', 'flows', 'tokenUrl', 'refreshUrl', 'description', 'scopes'];
           case 'authorizationCode':
-            return ['type', 'flows', 'authorizationUrl', 'refreshUrl', 'tokenUrl', 'description', 'scopes'];
+            return [
+              'type',
+              'flows',
+              'authorizationUrl',
+              'refreshUrl',
+              'tokenUrl',
+              'description',
+              'scopes',
+            ];
           default:
-            return ['type', 'flows', 'authorizationUrl', 'refreshUrl', 'tokenUrl', 'description', 'scopes'];
+            return [
+              'type',
+              'flows',
+              'authorizationUrl',
+              'refreshUrl',
+              'tokenUrl',
+              'description',
+              'scopes',
+            ];
         }
       case 'openIdConnect':
         return ['type', 'openIdConnectUrl', 'description'];

package/src/utils.ts

@@ -2,10 +2,9 @@ import * as fs from 'fs';
 import * as minimatch from 'minimatch';
 import fetch from 'node-fetch';
 import * as pluralize from 'pluralize';
-
 import { parseYaml } from './js-yaml';
-import { HttpResolveConfig } from './config/config';
 import { UserContext } from './walk';
+import type { HttpResolveConfig } from './config';
 
 export { parseYaml, stringifyYaml } from './js-yaml';
 
@@ -171,3 +170,20 @@ export function isPathParameter(pathSegment: string) {
 export function isNotEmptyObject(obj: any) {
   return !!obj && Object.keys(obj).length > 0;
 }
+
+// TODO: use it everywhere
+export function isString(value: unknown): value is string {
+  return typeof value === 'string';
+}
+
+export function isNotString<T>(value: string | T): value is T {
+  return !isString(value);
+}
+
+export function assignExisting<T>(target: Record<string, T>, obj: Record<string, T>) {
+  for (let k of Object.keys(obj)) {
+    if (target.hasOwnProperty(k)) {
+      target[k] = obj[k];
+    }
+  }
+}