fix: resolve unresolved schemas

src/core/components/model.jsx

@@ -2,6 +2,7 @@ import React from "react"
 import ImmutablePureComponent from "react-immutable-pure-component"
 import ImPropTypes from "react-immutable-proptypes"
 import PropTypes from "prop-types"
+import { OrderedMap } from "immutable"
 
 import RollingLoadSVG from "core/assets/rolling-load.svg"
 
@@ -54,15 +55,26 @@ export default class Model extends ImmutablePureComponent {
     const ArrayModel = getComponent("ArrayModel")
     const PrimitiveModel = getComponent("PrimitiveModel")
     let type = "object"
-    let $$ref = schema && schema.get("$$ref")
+    let $ref = schema && schema.get("$ref")
+    let allOf = schema && schema.get("allOf")
 
-    // If we weren't passed a `name` but have a ref, grab the name from the ref
-    if ( !name && $$ref ) {
-      name = this.getModelName( $$ref )
+    // If we have a ref, get the schema and name from the ref
+    if ($ref) {
+      name = this.getModelName($ref)
+      schema = this.getRefSchema(name)
     }
-    // If we weren't passed a `schema` but have a ref, grab the schema from the ref
-    if ( !schema && $$ref ) {
-      schema = this.getRefSchema( name )
+
+    // If we have allOf with refs, get the schemas and merge them
+    if (allOf) {
+      schema = allOf.reduce((acc, schema) => {
+        if (schema.get("$ref")) {
+          const refName = this.getModelName(schema.get("$ref"))
+          let refSchema = this.getRefSchema(refName)
+          refSchema = refSchema.delete("title")
+          return acc.mergeDeep(refSchema)
+        }
+        return acc.mergeDeep(schema)
+      }, new OrderedMap())
     }
 
     if(!schema) {
@@ -73,7 +85,7 @@ export default class Model extends ImmutablePureComponent {
     }
 
     const deprecated = specSelectors.isOAS3() && schema.get("deprecated")
-    isRef = isRef !== undefined ? isRef : !!$$ref
+    isRef = isRef !== undefined ? isRef : !!$ref
     type = schema && schema.get("type") || type
 
     switch(type) {

src/core/plugins/oas3/spec-extensions/selectors.js

@@ -47,6 +47,16 @@ export const servers = onlyOAS3(() => (system) => {
   return spec.get("servers", map)
 })
 
+export const findSchema = (state, doubledState, schemaName) => {
+  const resolvedSchema = state.getIn(
+    ["resolvedSubtrees", "components", "schemas", schemaName],
+    null
+  )
+  const unresolvedSchema = state.getIn(["json", "components", "schemas", schemaName], null)
+
+  return resolvedSchema || unresolvedSchema || null
+}
+
 export const callbacksOperations = onlyOAS3(
   (state, { callbacks, specPath }) =>
     (system) => {

src/core/plugins/oas3/spec-extensions/wrap-selectors.js

@@ -32,6 +32,10 @@ const OAS3NullSelector = onlyOAS3(nullSelector)
  * Wrappers
  */
 
+export const findDefinition = onlyOAS3((state, doubledState, schemaName) => (system) => {
+  return system.getSystem().specSelectors.findSchema(state, doubledState, schemaName)
+})
+
 export const definitions = onlyOAS3(() => (system) => {
   const spec = system.getSystem().specSelectors.specJson()
   const schemas = spec.getIn(["components", "schemas"])

test/unit/core/plugins/oas3/selectors.js

@@ -0,0 +1,62 @@
+/**
+ * @prettier
+ */
+import { fromJS } from "immutable"
+import { findSchema } from "core/plugins/oas3/spec-extensions/selectors"
+
+describe("findSchema", function () {
+  const state = fromJS({
+    resolvedSubtrees: {
+      components: {
+        schemas: {
+          resolvedSchema: {
+            type: "object",
+            properties: {
+              name: {
+                type: "string",
+              },
+            },
+          },
+        },
+      },
+    },
+    json: {
+      components: {
+        schemas: {
+          unresolvedSchema: {
+            $ref: "#/components/schemas/resolvedSchema",
+          },
+          resolvedSchema: {
+            type: "object",
+            properties: {
+              name: {
+                type: "string",
+              },
+            },
+          },
+        },
+      },
+    },
+  })
+
+  it("should get an unresolved schema", function () {
+    const result = findSchema(state, null, "unresolvedSchema")
+
+    expect(result).toEqual(
+      state.getIn(["json", "components", "schemas", "unresolvedSchema"])
+    )
+  })
+
+  it("should get a resolved schema", function () {
+    const result = findSchema(state, null, "resolvedSchema")
+
+    expect(result).toEqual(
+      state.getIn([
+        "resolvedSubtrees",
+        "components",
+        "schemas",
+        "resolvedSchema",
+      ])
+    )
+  })
+})