chore: use getOwn check instead of Object.create(null

Author: RomanHotsiy

packages/core/src/resolve.ts

@@ -10,7 +10,7 @@ import {
   isExternalValue,
 } from './ref-utils.js';
 import { isNamedType, SpecExtension } from './types/index.js';
-import { readFileFromUrl, parseYaml, nextTick } from './utils.js';
+import { readFileFromUrl, parseYaml, nextTick, getOwn } from './utils.js';
 
 import type { YAMLNode, LoadOptions } from 'yaml-ast-parser';
 import type { NormalizedNodeType } from './types/index.js';
@@ -299,7 +299,7 @@ export async function resolveDocument(opts: {
 
       for (const propName of Object.keys(node)) {
         let propValue = node[propName];
-        let propType = type.properties[propName];
+        let propType = getOwn(type.properties, propName);
         if (propType === undefined) propType = type.additionalProperties;
         if (typeof propType === 'function') propType = propType(propValue, propName);
         if (propType === undefined) propType = unknownType;

packages/core/src/rules/common/no-required-schema-properties-undefined.ts

@@ -4,6 +4,7 @@ import type { Oas2Rule, Oas3Rule } from '../../visitors.js';
 import type { Oas3Schema, Oas3_1Schema } from '../../typings/openapi.js';
 import type { Oas2Schema } from '../../typings/swagger.js';
 import type { UserContext } from '../../walk.js';
+import { getOwn } from '../../utils.js';
 
 export const NoRequiredSchemaPropertiesUndefined: Oas3Rule | Oas2Rule = () => {
   return {
@@ -41,7 +42,7 @@ export const NoRequiredSchemaPropertiesUndefined: Oas3Rule | Oas2Rule = () => {
         const allProperties = elevateProperties(schema);
 
         for (const [i, requiredProperty] of schema.required.entries()) {
-          if (!allProperties || allProperties[requiredProperty] === undefined) {
+          if (!allProperties || getOwn(allProperties, requiredProperty) === undefined) {
             report({
               message: `Required property '${requiredProperty}' is undefined.`,
               location: location.child(['required', i]),

packages/core/src/rules/common/scalar-property-missing-example.ts

@@ -1,4 +1,5 @@
 import { SpecVersion } from '../../oas-types.js';
+import { getOwn } from '../../utils.js';
 
 import type { Oas2Rule, Oas3Rule } from '../../visitors.js';
 import type { UserContext } from '../../walk.js';
@@ -14,7 +15,7 @@ export const ScalarPropertyMissingExample: Oas3Rule | Oas2Rule = () => {
       { report, location, oasVersion, resolve }: UserContext
     ) {
       for (const propName of Object.keys(properties)) {
-        const propSchema = resolve(properties[propName]).node;
+        const propSchema = resolve(getOwn(properties, propName)).node;
 
         if (!propSchema || !isScalarSchema(propSchema)) {
           continue;

packages/core/src/rules/common/struct.ts

@@ -1,7 +1,7 @@
 import { isNamedType, SpecExtension } from '../../types/index.js';
 import { oasTypeOf, matchesJsonSchemaType, getSuggest, validateSchemaEnumType } from '../utils.js';
 import { isRef } from '../../ref-utils.js';
-import { isPlainObject } from '../../utils.js';
+import { getOwn, isPlainObject } from '../../utils.js';
 
 import type { UserContext } from '../../walk.js';
 import type {
@@ -102,7 +102,7 @@ export const Struct:
         const propLocation = location.child([propName]);
         let propValue = node[propName];
 
-        let propType = type.properties[propName];
+        let propType = getOwn(type.properties, propName);
         if (propType === undefined) propType = type.additionalProperties;
         if (typeof propType === 'function') propType = propType(propValue, propName);
 

packages/core/src/types/index.ts

@@ -47,22 +47,22 @@ type NormalizedResolveTypeFn = (value: any, key: string) => NormalizedPropType;
 export function listOf(typeName: string) {
   return {
     name: `${typeName}List`,
-    properties: Object.create(null),
+    properties: {},
     items: typeName,
   };
 }
 
 export function mapOf(typeName: string) {
   return {
     name: `${typeName}Map`,
-    properties: Object.create(null),
+    properties: {},
     additionalProperties: () => typeName,
   };
 }
 
 export const SpecExtension: NormalizedNodeType = {
   name: 'SpecExtension',
-  properties: Object.create(null),
+  properties: {},
   // skip validation of additional properties for unknown extensions
   additionalProperties: { resolvable: true },
 };
@@ -98,9 +98,7 @@ export function normalizeTypes(
     }
 
     if (type.properties) {
-      // make sure to create a object without prototype so we don't need to check for hasOwnProperty
-      // see https://github.com/Redocly/redocly-cli/issues/2104
-      const mappedProps: Record<string, any> = Object.create(null);
+      const mappedProps: Record<string, any> = {};
       for (const [propName, prop] of Object.entries(type.properties)) {
         mappedProps[propName] = resolveType(prop);
 

packages/core/src/utils.ts

@@ -296,6 +296,10 @@ export function dequal(foo: any, bar: any): boolean {
   return foo !== foo && bar !== bar;
 }
 
+export function getOwn(obj: Record<string, any>, key: string) {
+  return obj.hasOwnProperty(key) ? obj[key] : undefined;
+}
+
 export type CollectFn = (value: unknown) => void;
 
 export type StrictObject<T extends object> = T & { [key: string]: undefined };

packages/core/src/walk.ts

@@ -1,5 +1,5 @@
 import { Location, isRef } from './ref-utils.js';
-import { pushStack, popStack } from './utils.js';
+import { pushStack, popStack, getOwn } from './utils.js';
 import { YamlParseError, makeRefId } from './resolve.js';
 import { isNamedType, SpecExtension } from './types/index.js';
 
@@ -308,7 +308,7 @@ export function walkDocument<T extends BaseVisitor>(opts: {
               loc = location; // properties on the same level as $ref should resolve against original location, not target
             }
 
-            let propType = type.properties[propName];
+            let propType = getOwn(type.properties, propName);
             if (propType === undefined) propType = type.additionalProperties;
             if (typeof propType === 'function') propType = propType(value, propName);