chore: apply review suggestions

Author: kamil1094

packages/core/src/__tests__/entity-yaml.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { createEntityTypes } from '../types/entity-yaml.js';
-import { normalizeTypes, ResolveTypeFn } from '../types/index.js';
+import { NormalizedNodeType, normalizeTypes, ResolveTypeFn } from '../types/index.js';
 import { entityFileSchema, entityFileDefaultSchema } from '@redocly/config';
 describe('entity-yaml', () => {
   it('should create entity types with discriminator', () => {
@@ -24,12 +24,13 @@ describe('entity-yaml', () => {
     const entityFileArrayNode = normalizedTypes['EntityFileArray'];
 
     const unknownEntity = { key: 'unknown', title: 'Unknown' };
-    const resolvedType = (entityFileArrayNode.items as ResolveTypeFn)(unknownEntity, 'root');
+    const resolvedType = (entityFileArrayNode.items as ResolveTypeFn)(
+      unknownEntity,
+      'root'
+    ) as NormalizedNodeType;
 
     expect(resolvedType).toBeTruthy();
-    if (resolvedType && typeof resolvedType === 'object' && 'name' in resolvedType) {
-      expect(resolvedType.name).toBe('EntityFileDefault');
-    }
+    expect(resolvedType.name).toBe('EntityFileDefault');
   });
 
   it('should resolve entity type based on discriminator for array items', () => {
@@ -43,33 +44,28 @@ describe('entity-yaml', () => {
       title: 'John Doe',
       metadata: { email: '[email protected]' },
     };
-    const resolvedType = (entityFileArrayNode.items as ResolveTypeFn)(userEntity, 'root');
+    const resolvedType = (entityFileArrayNode.items as ResolveTypeFn)(
+      userEntity,
+      'root'
+    ) as NormalizedNodeType;
 
     expect(resolvedType).toBeTruthy();
-    if (resolvedType && typeof resolvedType === 'object' && 'name' in resolvedType) {
-      expect(resolvedType.name).toBe('user');
-      if ('properties' in resolvedType) {
-        expect(resolvedType.properties).toHaveProperty('metadata');
-      }
-    }
+    expect(resolvedType.name).toBe('user');
+    expect(resolvedType.properties).toHaveProperty('metadata');
   });
 
   it('should have correct required fields for entity types', () => {
     const entityTypes = createEntityTypes(entityFileSchema, entityFileDefaultSchema);
     const normalizedTypes = normalizeTypes(entityTypes);
 
     const userNode = normalizedTypes['user'];
-    if (userNode && Array.isArray(userNode.required)) {
-      expect(userNode.required).toContain('key');
-      expect(userNode.required).toContain('title');
-      expect(userNode.required).toContain('type');
-    }
+    expect(userNode.required).toContain('key');
+    expect(userNode.required).toContain('title');
+    expect(userNode.required).toContain('type');
 
     const defaultNode = normalizedTypes['EntityFileDefault'];
-    if (defaultNode && Array.isArray(defaultNode.required)) {
-      expect(defaultNode.required).toContain('type');
-      expect(defaultNode.required).toContain('key');
-      expect(defaultNode.required).toContain('title');
-    }
+    expect(defaultNode.required).toContain('type');
+    expect(defaultNode.required).toContain('key');
+    expect(defaultNode.required).toContain('title');
   });
 });

packages/core/src/__tests__/lint.test.ts

@@ -2015,25 +2015,25 @@ describe('lint', () => {
     });
 
     it('should lint array of entities', async () => {
-      const entitiesYaml = `
-  - type: user
-    key: john-doe
-    title: John Doe
-    metadata:
-      email: [email protected]
-  
-  - type: service
-    key: api-service
-    title: API Service
-    summary: Core API service
-  
-  - type: api-description
-    key: users-api
-    title: Users API
-    metadata:
-      specType: openapi
-      descriptionFile: users-api.yaml
-  `;
+      const entitiesYaml = outdent`
+        - type: user
+          key: john-doe
+          title: John Doe
+          metadata:
+            email: [email protected]
+        
+        - type: service
+          key: api-service
+          title: API Service
+          summary: Core API service
+        
+        - type: api-description
+          key: users-api
+          title: Users API
+          metadata:
+            specType: openapi
+            descriptionFile: users-api.yaml
+      `;
 
       const document = makeDocumentFromString(entitiesYaml, '/entities.yaml');
 
@@ -2220,13 +2220,13 @@ describe('lint', () => {
     });
 
     it('should validate type-specific metadata fields correctly', async () => {
-      const apiOperationYaml = `
-  type: api-operation
-  key: test-operation
-  title: Test Operation
-  metadata:
-    wrongField: value
-  `;
+      const apiOperationYaml = outdent`
+        type: api-operation
+        key: test-operation
+        title: Test Operation
+        metadata:
+          wrongField: value
+      `;
 
       const document = makeDocumentFromString(apiOperationYaml, '/entity.yaml');
 
@@ -2247,28 +2247,28 @@ describe('lint', () => {
     });
 
     it('should validate different metadata schemas in array of mixed entity types', async () => {
-      const mixedEntitiesYaml = `
-  - type: api-description
-    key: my-api
-    title: My API
-    metadata:
-      specType: openapi
-      # Missing descriptionFile
-  
-  - type: api-operation
-    key: my-operation
-    title: My Operation
-    metadata:
-      wrongField: value
-      # Missing method and path
-  
-  - type: data-schema
-    key: my-schema
-    title: My Schema
-    metadata:
-      wrongField: value
-      # Missing specType
-  `;
+      const mixedEntitiesYaml = outdent`
+        - type: api-description
+          key: my-api
+          title: My API
+          metadata:
+            specType: openapi
+            # Missing descriptionFile
+        
+        - type: api-operation
+          key: my-operation
+          title: My Operation
+          metadata:
+            wrongField: value
+            # Missing method and path
+        
+        - type: data-schema
+          key: my-schema
+          title: My Schema
+          metadata:
+            wrongField: value
+            # Missing specType
+      `;
 
       const document = makeDocumentFromString(mixedEntitiesYaml, '/entities.yaml');
 
@@ -2298,22 +2298,22 @@ describe('lint', () => {
     });
 
     it('should handle entity without type in array using default schema', async () => {
-      const mixedEntitiesYaml = `
-  - type: user
-    key: valid-user
-    title: Valid User
-    metadata:
-      email: [email protected]
-  
-  - key: no-type-entity
-    title: Entity Without Type
-    summary: This entity is missing the type field
-    # Missing type - should use EntityFileDefault schema
-  
-  - type: service
-    key: valid-service
-    title: Valid Service
-  `;
+      const mixedEntitiesYaml = outdent`
+        - type: user
+          key: valid-user
+          title: Valid User
+          metadata:
+            email: [email protected]
+        
+        - key: no-type-entity
+          title: Entity Without Type
+          summary: This entity is missing the type field
+          # Missing type - should use EntityFileDefault schema
+        
+        - type: service
+          key: valid-service
+          title: Valid Service
+      `;
 
       const document = makeDocumentFromString(mixedEntitiesYaml, '/entities.yaml');