chore: refactor types

packages/core/src/types/index.ts

@@ -14,7 +14,7 @@ export type ScalarSchema = {
 export type NormalizedScalarSchema = {
   name?: never;
   type?: 'string' | 'boolean' | 'number' | 'integer' | 'object' | 'array';
-  items?: ScalarSchema;
+  items?: NormalizedScalarSchema;
   enum?: string[];
   directResolveAs?: NormalizedNodeType;
   resolvable: boolean;
@@ -46,7 +46,7 @@ export type NormalizedNodeType = {
   requiredOneOf?: string[];
   allowed?: (value: any) => string[] | undefined;
   extensionsPrefix?: string;
-  directResolveAs?: NormalizedPropType;
+  directResolveAs?: NormalizedNodeType;
   description?: string;
   documentationLink?: string;
 };
@@ -122,7 +122,7 @@ export function normalizeTypes(
 
         if (options.doNotResolveExamples && prop && (prop as ScalarSchema).isExample) {
           mappedProps[propName] = {
-            ...(prop as object),
+            ...prop,
             resolvable: false,
           };
         }
@@ -132,24 +132,25 @@ export function normalizeTypes(
   }
 
   // typings are painful here...
-  function resolveType(type?: any): any {
+  function resolveType(
+    type: NormalizedPropType | NormalizedResolveTypeFn | string
+  ): NormalizedPropType | NormalizedResolveTypeFn {
     if (typeof type === 'string') {
       if (!normalizedTypes[type]) {
         throw new Error(`Unknown type name found: ${type}`);
       }
       return normalizedTypes[type];
     } else if (typeof type === 'function') {
-      return (value: any, key: string) => {
-        return resolveType(type(value, key));
-      };
-    } else if (type && type.name) {
+      return (value: unknown, key: string) =>
+        resolveType((type as NormalizedResolveTypeFn)(value, key)) as NormalizedPropType;
+    } else if (isNamedType(type)) {
       type = { ...type };
       normalizeType(type);
       return type;
-    } else if (type && type.directResolveAs) {
+    } else if (type?.directResolveAs !== undefined) {
       return {
         ...type,
-        directResolveAs: resolveType(type.directResolveAs),
+        directResolveAs: (resolveType(type.directResolveAs) ?? undefined) as NormalizedNodeType,
       };
     } else {
       return type;

packages/core/src/types/redocly-yaml.ts

@@ -231,7 +231,7 @@ const configGovernanceProperties: Record<
       return {
         ...ConfigGovernance,
         directResolveAs: { name: 'ConfigGovernance', ...ConfigGovernance },
-      } as PropType;
+      };
     },
     description: 'Use extends to inherit rules and their configurations from other rulesets.',
     documentationLink: 'https://redocly.com/docs/cli/configuration/reference/extends#extends',

packages/core/src/typings/openapi.ts

@@ -223,8 +223,8 @@ export interface Oas3Discriminator {
 export interface Oas3MediaType<T extends Oas3Schema | Oas3_1Schema = Oas3Schema | Oas3_1Schema> {
   schema?: Referenced<T>;
   example?: unknown;
-  examples?: { [name: string]: Referenced<Oas3Example> };
-  encoding?: { [field: string]: Oas3Encoding<T> };
+  examples?: Record<string, Referenced<Oas3Example>>;
+  encoding?: Record<string, Oas3Encoding<T>>;
   itemSchema?: Referenced<T>; // added in OAS 3.2
   prefixEncoding?: Oas3Encoding<T>[]; // added in OAS 3.2
   itemEncoding?: Referenced<Oas3Encoding<T>>; // added in OAS 3.2

packages/core/src/typings/swagger.ts

@@ -194,7 +194,7 @@ export type Oas2Header = Oas2Items & { description?: 'string' };
 export interface Oas2Response {
   description?: string;
   schema: Referenced<Schema>;
-  examples?: Record<string, any>;
+  examples?: Record<string, unknown>;
   headers?: Record<string, Oas2Header>;
 }
 

packages/core/src/utils/is-not-empty-array.ts

@@ -1,3 +1,3 @@
 export function isNotEmptyArray<T>(args?: T[]): args is [T, ...T[]] {
-  return Array.isArray(args) && !!args.length;
+  return Array.isArray(args) && args.length > 0;
 }

vitest.config.ts

@@ -20,10 +20,10 @@ const configExtension: { [key: string]: ViteUserConfig } = {
           'packages/cli/src/utils/assert-node-version.ts',
         ],
         thresholds: {
-          lines: 79,
-          functions: 82,
-          statements: 78,
-          branches: 70,
+          lines: 80,
+          functions: 83,
+          statements: 79,
+          branches: 71,
         },
       },
     },