refactor: address tatomyr review feedback (round 4)

- Remove as any casts from normalizeVisitors — types infer correctly
- Remove redundant propertyCount (always equals totalSchemaProperties)
- Fix constraintCount mixing across media types — keep all three
  correlated metrics from the same schema walk
- Consolidate CurrentOperationContext with OperationMetrics field names,
  simplify buildOperationMetrics to destructuring spread
- Export Oas3MediaType from openapi-core, use in hasExample signature
- Remove any type on MediaType.enter — visitor infers type by default
- Move collectDocumentMetrics to __tests__/collect-metrics-helper.ts
  since it is test-only code

Made-with: Cursor

Author: adamaltman

packages/cli/src/commands/score/__tests__/collect-metrics-helper.ts

@@ -0,0 +1,41 @@
+import {
+  normalizeTypes,
+  getTypes,
+  resolveDocument,
+  BaseResolver,
+  Source,
+  type Document,
+  type SpecVersion,
+  type WalkContext,
+} from '@redocly/openapi-core';
+
+import { collectMetrics, type CollectMetricsResult } from '../collect-metrics.js';
+
+/**
+ * Convenience wrapper that resolves a parsed OpenAPI document and collects metrics.
+ * Useful in tests where you don't already have resolved types.
+ */
+export async function collectDocumentMetrics(
+  parsed: Record<string, unknown>,
+  options?: { specVersion?: SpecVersion; debugOperationId?: string }
+): Promise<CollectMetricsResult> {
+  const specVersion: SpecVersion = options?.specVersion ?? 'oas3_0';
+  const types = normalizeTypes(getTypes(specVersion), {});
+  const source = new Source('score.yaml', JSON.stringify(parsed));
+  const document: Document = { source, parsed };
+  const externalRefResolver = new BaseResolver();
+  const resolvedRefMap = await resolveDocument({
+    rootDocument: document,
+    rootType: types.Root,
+    externalRefResolver,
+  });
+  const ctx: WalkContext = { problems: [], specVersion, visitorsData: {} };
+
+  return collectMetrics({
+    document,
+    types,
+    resolvedRefMap,
+    ctx,
+    debugOperationId: options?.debugOperationId,
+  });
+}

packages/cli/src/commands/score/__tests__/dependency-graph.test.ts

@@ -15,7 +15,6 @@ function makeOp(path: string, method: string, refs: string[]): OperationMetrics
     polymorphismCount: 0,
     anyOfCount: 0,
     hasDiscriminator: false,
-    propertyCount: 0,
     operationDescriptionPresent: false,
     schemaPropertiesWithDescription: 0,
     totalSchemaProperties: 0,

packages/cli/src/commands/score/__tests__/document-metrics.test.ts

@@ -1,7 +1,7 @@
 import { parseYaml } from '@redocly/openapi-core';
 import { outdent } from 'outdent';
 
-import { collectDocumentMetrics } from '../collect-metrics.js';
+import { collectDocumentMetrics } from './collect-metrics-helper.js';
 
 const yaml = (source: string) => parseYaml(source) as Record<string, unknown>;
 
@@ -131,7 +131,7 @@ describe('collectDocumentMetrics', () => {
     const op = metrics.operations.get('createItem')!;
     expect(op.requestBodyPresent).toBe(true);
     expect(op.requestExamplePresent).toBe(true);
-    expect(op.propertyCount).toBe(2);
+    expect(op.totalSchemaProperties).toBe(2);
     expect(op.constraintCount).toBe(2);
     expect(op.schemaPropertiesWithDescription).toBe(1);
   });

packages/cli/src/commands/score/__tests__/example-coverage.test.ts

@@ -1,5 +1,5 @@
-import { collectDocumentMetrics } from '../collect-metrics.js';
 import { computeOperationSubscores, computeAgentReadiness } from '../scoring.js';
+import { collectDocumentMetrics } from './collect-metrics-helper.js';
 
 async function collect(doc: Record<string, unknown>) {
   return (await collectDocumentMetrics(doc)).metrics;

packages/cli/src/commands/score/__tests__/hotspots.test.ts

@@ -16,7 +16,6 @@ function makeMetrics(overrides: Partial<OperationMetrics> = {}): OperationMetric
     polymorphismCount: 0,
     anyOfCount: 0,
     hasDiscriminator: false,
-    propertyCount: 0,
     operationDescriptionPresent: true,
     schemaPropertiesWithDescription: 0,
     totalSchemaProperties: 0,

packages/cli/src/commands/score/__tests__/index.test.ts

@@ -51,7 +51,6 @@ function makeTestMetrics(overrides: Partial<OperationMetrics> = {}): OperationMe
     polymorphismCount: 0,
     anyOfCount: 0,
     hasDiscriminator: false,
-    propertyCount: 1,
     operationDescriptionPresent: true,
     schemaPropertiesWithDescription: 0,
     totalSchemaProperties: 1,

packages/cli/src/commands/score/__tests__/scoring.test.ts

@@ -23,7 +23,6 @@ function makeBaseMetrics(overrides: Partial<OperationMetrics> = {}): OperationMe
     polymorphismCount: 0,
     anyOfCount: 0,
     hasDiscriminator: false,
-    propertyCount: 0,
     operationDescriptionPresent: true,
     schemaPropertiesWithDescription: 0,
     totalSchemaProperties: 0,
@@ -132,7 +131,6 @@ describe('scoring', () => {
               parameterCount: 1,
               requiredParameterCount: 1,
               paramsWithDescription: 0,
-              propertyCount: 1,
               totalSchemaProperties: 1,
               maxResponseSchemaDepth: 1,
             }),
@@ -146,7 +144,6 @@ describe('scoring', () => {
               requestBodyPresent: true,
               requestExamplePresent: true,
               constraintCount: 1,
-              propertyCount: 2,
               totalSchemaProperties: 2,
               maxRequestSchemaDepth: 1,
               maxResponseSchemaDepth: 1,

packages/cli/src/commands/score/collect-metrics.ts

@@ -1,17 +1,13 @@
 import {
-  normalizeTypes,
-  getTypes,
+  type normalizeTypes,
   normalizeVisitors,
   walkDocument,
-  resolveDocument,
-  BaseResolver,
-  Source,
+  type resolveDocument,
   isPlainObject,
   isRef,
   isMappingRef,
   unescapePointerFragment,
   type Document,
-  type SpecVersion,
   type WalkContext,
 } from '@redocly/openapi-core';
 
@@ -57,7 +53,7 @@ export function collectMetrics({
   const schemaWalkState = createSchemaWalkState();
   const schemaVisitor = createSchemaMetricVisitor(schemaWalkState);
   const normalizedSchemaVisitors = normalizeVisitors(
-    [{ severity: 'warn', ruleId: 'score-schema', visitor: schemaVisitor as any }],
+    [{ severity: 'warn', ruleId: 'score-schema', visitor: schemaVisitor }],
     types
   );
 
@@ -87,7 +83,6 @@ export function collectMetrics({
     polymorphismCount: 0,
     anyOfCount: 0,
     hasDiscriminator: false,
-    propertyCount: 0,
     totalSchemaProperties: 0,
     schemaPropertiesWithDescription: 0,
     constraintCount: 0,
@@ -102,7 +97,6 @@ export function collectMetrics({
       polymorphismCount: a.polymorphismCount + b.polymorphismCount,
       anyOfCount: a.anyOfCount + b.anyOfCount,
       hasDiscriminator: a.hasDiscriminator || b.hasDiscriminator,
-      propertyCount: a.propertyCount + b.propertyCount,
       totalSchemaProperties: a.totalSchemaProperties + b.totalSchemaProperties,
       schemaPropertiesWithDescription:
         a.schemaPropertiesWithDescription + b.schemaPropertiesWithDescription,
@@ -172,7 +166,7 @@ export function collectMetrics({
         let maxBranch = walkSchema(polyBranches[0], debug);
         for (let i = 1; i < polyBranches.length; i++) {
           const branchStats = walkSchema(polyBranches[i], debug);
-          if (branchStats.propertyCount > maxBranch.propertyCount) {
+          if (branchStats.totalSchemaProperties > maxBranch.totalSchemaProperties) {
             maxBranch = branchStats;
           }
         }
@@ -191,7 +185,7 @@ export function collectMetrics({
         let maxBranch = walkSchema(discriminatorRefs[0], debug);
         for (let i = 1; i < discriminatorRefs.length; i++) {
           const branchStats = walkSchema(discriminatorRefs[i], debug);
-          if (branchStats.propertyCount > maxBranch.propertyCount) {
+          if (branchStats.totalSchemaProperties > maxBranch.totalSchemaProperties) {
             maxBranch = branchStats;
           }
         }
@@ -235,7 +229,7 @@ export function collectMetrics({
   const scoreVisitor = createScoreVisitor(accumulator);
 
   const normalizedVisitors = normalizeVisitors(
-    [{ severity: 'warn', ruleId: 'score', visitor: scoreVisitor as any }],
+    [{ severity: 'warn', ruleId: 'score', visitor: scoreVisitor }],
     types
   );
 
@@ -252,32 +246,3 @@ export function collectMetrics({
     debugLogs: accumulator.debugLogs,
   };
 }
-
-/**
- * Convenience wrapper that resolves a parsed OpenAPI document and collects metrics.
- * Useful in tests and standalone usage where you don't already have resolved types.
- */
-export async function collectDocumentMetrics(
-  parsed: Record<string, unknown>,
-  options?: { specVersion?: SpecVersion; debugOperationId?: string }
-): Promise<CollectMetricsResult> {
-  const specVersion: SpecVersion = options?.specVersion ?? 'oas3_0';
-  const types = normalizeTypes(getTypes(specVersion), {});
-  const source = new Source('score.yaml', JSON.stringify(parsed));
-  const document: Document = { source, parsed };
-  const externalRefResolver = new BaseResolver();
-  const resolvedRefMap = await resolveDocument({
-    rootDocument: document,
-    rootType: types.Root,
-    externalRefResolver,
-  });
-  const ctx: WalkContext = { problems: [], specVersion, visitorsData: {} };
-
-  return collectMetrics({
-    document,
-    types,
-    resolvedRefMap,
-    ctx,
-    debugOperationId: options?.debugOperationId,
-  });
-}

packages/cli/src/commands/score/collectors/document-metrics.ts

@@ -1,6 +1,7 @@
 import {
   isNotEmptyObject,
   isPlainObject,
+  type Oas3MediaType,
   type Oas3Visitor,
   type UserContext,
   type Oas3PathItem,
@@ -49,7 +50,6 @@ export interface SchemaWalkState {
   polymorphismCount: number;
   anyOfCount: number;
   hasDiscriminator: boolean;
-  propertyCount: number;
   totalSchemaProperties: number;
   schemaPropertiesWithDescription: number;
   constraintCount: number;
@@ -68,7 +68,6 @@ export function createSchemaWalkState(): SchemaWalkState {
     polymorphismCount: 0,
     anyOfCount: 0,
     hasDiscriminator: false,
-    propertyCount: 0,
     totalSchemaProperties: 0,
     schemaPropertiesWithDescription: 0,
     constraintCount: 0,
@@ -122,7 +121,6 @@ export function createSchemaMetricVisitor(state: SchemaWalkState): Oas3Visitor {
         if (isPlainObject(schema.properties)) {
           const props = Object.entries(schema.properties) as [string, any][];
           state.totalSchemaProperties += props.length;
-          state.propertyCount += props.length;
 
           for (const [name, prop] of props) {
             localPropertyNames.push(name);
@@ -166,15 +164,14 @@ interface CurrentOperationContext {
 
   maxRequestSchemaDepth: number;
   maxResponseSchemaDepth: number;
-  propertyCount: number;
   totalSchemaProperties: number;
   schemaPropertiesWithDescription: number;
   constraintCount: number;
   polymorphismCount: number;
   anyOfCount: number;
   hasDiscriminator: boolean;
 
-  writableTopLevelFieldCount: number;
+  topLevelWritableFieldCount: number;
 
   requestBodyPresent: boolean;
   requestExamplePresent: boolean;
@@ -233,15 +230,14 @@ function createOperationContext(
 
     maxRequestSchemaDepth: 0,
     maxResponseSchemaDepth: 0,
-    propertyCount: 0,
     totalSchemaProperties: 0,
     schemaPropertiesWithDescription: 0,
     constraintCount: 0,
     polymorphismCount: 0,
     anyOfCount: 0,
     hasDiscriminator: false,
 
-    writableTopLevelFieldCount: 0,
+    topLevelWritableFieldCount: 0,
 
     requestBodyPresent: false,
     requestExamplePresent: false,
@@ -259,32 +255,14 @@ function createOperationContext(
 }
 
 function buildOperationMetrics(ctx: CurrentOperationContext): OperationMetrics {
-  return {
-    path: ctx.path,
-    method: ctx.method,
-    operationId: ctx.operationId,
-    parameterCount: ctx.parameterCount,
-    requiredParameterCount: ctx.requiredParameterCount,
-    paramsWithDescription: ctx.paramsWithDescription,
-    requestBodyPresent: ctx.requestBodyPresent,
-    topLevelWritableFieldCount: ctx.writableTopLevelFieldCount,
-    maxRequestSchemaDepth: ctx.maxRequestSchemaDepth,
-    maxResponseSchemaDepth: ctx.maxResponseSchemaDepth,
-    polymorphismCount: ctx.polymorphismCount,
-    anyOfCount: ctx.anyOfCount,
-    hasDiscriminator: ctx.hasDiscriminator,
-    propertyCount: ctx.propertyCount,
-    operationDescriptionPresent: ctx.operationDescriptionPresent,
-    schemaPropertiesWithDescription: ctx.schemaPropertiesWithDescription,
-    totalSchemaProperties: ctx.totalSchemaProperties,
-    constraintCount: ctx.constraintCount,
-    requestExamplePresent: ctx.requestExamplePresent,
-    responseExamplePresent: ctx.responseExamplePresent,
-    structuredErrorResponseCount: ctx.structuredErrorResponseCount,
-    totalErrorResponses: ctx.totalErrorResponses,
-    ambiguousIdentifierCount: ctx.ambiguousIdentifierCount,
-    refsUsed: ctx.refsUsed,
-  };
+  const {
+    inRequestBody: _1,
+    inResponse: _2,
+    currentResponseCode: _3,
+    errorStructuredCounted: _4,
+    ...metrics
+  } = ctx;
+  return metrics;
 }
 
 export function createScoreVisitor(accumulator: ScoreAccumulator): Oas3Visitor {
@@ -324,7 +302,7 @@ export function createScoreVisitor(accumulator: ScoreAccumulator): Oas3Visitor {
       },
     },
     MediaType: {
-      enter(mediaType: any) {
+      enter(mediaType) {
         const current = accumulator.current;
         if (!current) return;
 
@@ -350,12 +328,11 @@ export function createScoreVisitor(accumulator: ScoreAccumulator): Oas3Visitor {
 
           const stats = accumulator.walkSchema(mediaType.schema, isDebugTarget);
 
-          current.propertyCount = Math.max(current.propertyCount, stats.propertyCount);
           if (stats.totalSchemaProperties > current.totalSchemaProperties) {
             current.totalSchemaProperties = stats.totalSchemaProperties;
             current.schemaPropertiesWithDescription = stats.schemaPropertiesWithDescription;
+            current.constraintCount = stats.constraintCount;
           }
-          current.constraintCount = Math.max(current.constraintCount, stats.constraintCount);
           current.polymorphismCount = Math.max(current.polymorphismCount, stats.polymorphismCount);
           current.anyOfCount = Math.max(current.anyOfCount, stats.anyOfCount);
           if (stats.hasDiscriminator) current.hasDiscriminator = true;
@@ -369,8 +346,8 @@ export function createScoreVisitor(accumulator: ScoreAccumulator): Oas3Visitor {
 
           if (current.inRequestBody) {
             current.maxRequestSchemaDepth = Math.max(current.maxRequestSchemaDepth, stats.maxDepth);
-            current.writableTopLevelFieldCount = Math.max(
-              current.writableTopLevelFieldCount,
+            current.topLevelWritableFieldCount = Math.max(
+              current.topLevelWritableFieldCount,
               stats.writableTopLevelFields
             );
           }
@@ -388,7 +365,7 @@ export function createScoreVisitor(accumulator: ScoreAccumulator): Oas3Visitor {
             accumulator.debugLogs.push({
               context,
               entries: stats.debugEntries,
-              totalProperties: stats.propertyCount,
+              totalProperties: stats.totalSchemaProperties,
               totalPolymorphism: stats.polymorphismCount,
               totalConstraints: stats.constraintCount,
               maxDepth: stats.maxDepth,
@@ -460,7 +437,7 @@ function mergeParameters(
   return merged;
 }
 
-function hasExample(mediaType: { example?: unknown; examples?: Record<string, unknown> }): boolean {
+function hasExample(mediaType: Oas3MediaType): boolean {
   return mediaType.example !== undefined || isNotEmptyObject(mediaType.examples);
 }