fix(json-schema-2020-12): avoid accessing properties of null schemas (#10397)

Author: glowcloud

src/core/plugins/json-schema-2020-12/components/JSONSchema/JSONSchema.jsx

@@ -35,7 +35,7 @@ const JSONSchema = forwardRef(
 ) => {
 const fn = useFn()
 // this implementation assumes that $id is always non-relative URI
-const pathToken = identifier || schema.$id || name
+const pathToken = identifier || schema?.$id || name
 const { path } = usePath(pathToken)
 const { isExpanded, setExpanded, setCollapsed } = useIsExpanded(pathToken)
 const [level, nextLevel] = useLevel()

src/core/plugins/json-schema-2020-12/components/keywords/AdditionalProperties.jsx

@@ -8,7 +8,6 @@ import { useFn, useComponent } from "../../hooks"
 
 const AdditionalProperties = ({ schema }) => {
 const fn = useFn()
-const { additionalProperties } = schema
 const JSONSchema = useComponent("JSONSchema")
 
 if (!fn.hasKeyword(schema, "additionalProperties")) return null
@@ -24,14 +23,14 @@ const AdditionalProperties = ({ schema }) => {
 
 return (
 <div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--additionalProperties">
-{additionalProperties === true ? (
+{schema.additionalProperties === true ? (
 <>
 {name}
 <span className="json-schema-2020-12__attribute json-schema-2020-12__attribute--primary">
 allowed
 </span>
 </>
-) : additionalProperties === false ? (
+) : schema.additionalProperties === false ? (
 <>
 {name}
 <span className="json-schema-2020-12__attribute json-schema-2020-12__attribute--primary">
@@ -41,7 +40,7 @@ const AdditionalProperties = ({ schema }) => {
 ) : (
 <JSONSchema
 name={name}
-schema={additionalProperties}
+schema={schema.additionalProperties}
 identifier="additionalProperties"
 />
 )}

src/core/plugins/json-schema-2020-12/components/keywords/Constraint/Constraint.jsx

@@ -4,17 +4,29 @@
 import React from "react"
 import PropTypes from "prop-types"
 
+import { isPlainObject } from "../../../fn"
+
 /**
 * This component represents various constraint keywords
 * from JSON Schema 2020-12 validation vocabulary.
 */
-const Constraint = ({ constraint }) => (
-<span
-className={`json-schema-2020-12__constraint json-schema-2020-12__constraint--${constraint.scope}`}
->
-{constraint.value}
-</span>
-)
+const Constraint = ({ constraint }) => {
+if (
+!isPlainObject(constraint) ||
+typeof constraint.scope !== "string" ||
+typeof constraint.value !== "string"
+) {
+return null
+}
+
+return (
+<span
+className={`json-schema-2020-12__constraint json-schema-2020-12__constraint--${constraint.scope}`}
+>
+{constraint.value}
+</span>
+)
+}
 
 Constraint.propTypes = {
 constraint: PropTypes.shape({

src/core/plugins/json-schema-2020-12/components/keywords/DependentRequired/DependentRequired.jsx

@@ -7,7 +7,9 @@ import PropTypes from "prop-types"
 import * as propTypes from "../../../prop-types"
 
 const DependentRequired = ({ dependentRequired }) => {
-if (dependentRequired.length === 0) return null
+if (!Array.isArray(dependentRequired) || dependentRequired.length === 0) {
+return null
+}
 
 return (
 <div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--dependentRequired">

src/core/plugins/json-schema-2020-12/components/keywords/PropertyNames.jsx

@@ -8,7 +8,6 @@ import { useFn, useComponent } from "../../hooks"
 
 const PropertyNames = ({ schema }) => {
 const fn = useFn()
-const { propertyNames } = schema
 const JSONSchema = useComponent("JSONSchema")
 const name = (
 <span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--primary">
@@ -25,7 +24,7 @@ const PropertyNames = ({ schema }) => {
 <div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--propertyNames">
 <JSONSchema
 name={name}
-schema={propertyNames}
+schema={schema.propertyNames}
 identifier="propertyNames"
 />
 </div>

src/core/plugins/json-schema-2020-12/components/keywords/UnevaluatedItems.jsx

@@ -8,7 +8,6 @@ import { useFn, useComponent } from "../../hooks"
 
 const UnevaluatedItems = ({ schema }) => {
 const fn = useFn()
-const { unevaluatedItems } = schema
 const JSONSchema = useComponent("JSONSchema")
 
 /**
@@ -26,7 +25,7 @@ const UnevaluatedItems = ({ schema }) => {
 <div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--unevaluatedItems">
 <JSONSchema
 name={name}
-schema={unevaluatedItems}
+schema={schema.unevaluatedItems}
 identifier="unevaluatedItems"
 />
 </div>

src/core/plugins/json-schema-2020-12/components/keywords/UnevaluatedProperties.jsx

@@ -8,7 +8,6 @@ import { useFn, useComponent } from "../../hooks"
 
 const UnevaluatedProperties = ({ schema }) => {
 const fn = useFn()
-const { unevaluatedProperties } = schema
 const JSONSchema = useComponent("JSONSchema")
 
 /**
@@ -26,7 +25,7 @@ const UnevaluatedProperties = ({ schema }) => {
 <div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--unevaluatedProperties">
 <JSONSchema
 name={name}
-schema={unevaluatedProperties}
+schema={schema.unevaluatedProperties}
 identifier="unevaluatedProperties"
 />
 </div>

test/e2e-cypress/e2e/features/plugins/json-schema-2020-12/empty-schema.cy.js

@@ -0,0 +1,12 @@
+/**
+* @prettier
+*/
+
+describe("Empty JSON Schema 2020-12", () => {
+it("should render as schema of type `any`", () => {
+cy.visit("/?url=/documents/features/json-schema-2020-12-empty-schema.yaml")
+
+cy.get(".json-schema-2020-12__title").should("contain", "Test")
+cy.get(".json-schema-2020-12__attribute").should("contain", "any")
+})
+})

test/e2e-cypress/static/documents/features/json-schema-2020-12-empty-schema.yaml

@@ -0,0 +1,4 @@
+openapi: 3.1.0
+components:
+schemas:
+Test: