feat: support single type comparison

Author: glowcloud

Diff for: src/core/plugins/json-schema-2020-12/fn.js

@@ -505,18 +505,21 @@ export const makeGetExtensionKeywords = (fnAccessor) => {
   return getExtensionKeywords
 }
 
-export const schemaHasType = (schema, types) => {
+export const hasSchemaType = (schema, type) => {
   const isSchemaImmutable = Map.isMap(schema)
 
   if (!isSchemaImmutable && !isPlainObject(schema)) {
     return false
   }
 
-  const type = isSchemaImmutable ? schema.get("type") : schema.type
+  const hasType = (schemaType) =>
+    type === schemaType || (Array.isArray(type) && type.includes(schemaType))
 
-  if (List.isList(type) || Array.isArray(type)) {
-    return type.some((t) => types.includes(t))
+  const schemaType = isSchemaImmutable ? schema.get("type") : schema.type
+
+  if (List.isList(schemaType) || Array.isArray(schemaType)) {
+    return schemaType.some((t) => hasType(t))
   }
 
-  return types.includes(type)
+  return hasType(schemaType)
 }

Diff for: src/core/plugins/json-schema-2020-12/index.js

@@ -55,7 +55,7 @@ import {
   isBooleanJSONSchema,
   getSchemaKeywords,
   makeGetExtensionKeywords,
-  schemaHasType,
+  hasSchemaType,
 } from "./fn"
 import { JSONSchemaPathContext, JSONSchemaLevelContext } from "./context"
 import {
@@ -144,7 +144,7 @@ const JSONSchema202012Plugin = ({ getSystem, fn }) => {
         useLevel,
         getSchemaKeywords,
         getExtensionKeywords: makeGetExtensionKeywords(fnAccessor),
-        schemaHasType,
+        hasSchemaType,
       },
     },
   }

Diff for: src/core/plugins/json-schema-5/fn.js

@@ -4,14 +4,16 @@
 import { Map } from "immutable"
 import isPlainObject from "lodash/isPlainObject"
 
-export const schemaHasType = (schema, types) => {
+export const hasSchemaType = (schema, type) => {
   const isSchemaImmutable = Map.isMap(schema)
 
   if (!isSchemaImmutable && !isPlainObject(schema)) {
     return false
   }
 
-  const type = isSchemaImmutable ? schema.get("type") : schema.type
+  const schemaType = isSchemaImmutable ? schema.get("type") : schema.type
 
-  return types.includes(type)
+  return (
+    type === schemaType || (Array.isArray(type) && type.includes(schemaType))
+  )
 }

Diff for: src/core/plugins/json-schema-5/index.js

@@ -14,7 +14,7 @@ import Schemes from "./components/schemes"
 import SchemesContainer from "./containers/schemes"
 import * as JSONSchemaComponents from "./components/json-schema-components"
 import { ModelExtensions } from "./components/model-extensions"
-import { schemaHasType } from "./fn"
+import { hasSchemaType } from "./fn"
 
 const JSONSchema5Plugin = () => ({
   components: {
@@ -33,7 +33,7 @@ const JSONSchema5Plugin = () => ({
     ...JSONSchemaComponents,
   },
   fn: {
-    schemaHasType,
+    hasSchemaType,
   },
 })
 

Diff for: src/core/plugins/oas3/components/request-body.jsx

@@ -129,7 +129,7 @@ const RequestBody = ({
     return null
   }
 
-  const isObjectContent = fn.schemaHasType(mediaTypeValue.get("schema"), ["object"])
+  const isObjectContent = fn.hasSchemaType(mediaTypeValue.get("schema"), "object")
 
   if (
     isObjectContent &&

Diff for: src/core/plugins/oas3/fn.js

@@ -27,8 +27,7 @@ export const makeIsFileUploadIntended = (getSystem) => {
     const format = isSchemaImmutable ? schema.get("format") : schema.format
 
     return (
-      fn.schemaHasType(schema, ["string"]) &&
-      ["binary", "byte"].includes(format)
+      fn.hasSchemaType(schema, "string") && ["binary", "byte"].includes(format)
     )
   }
 

Diff for: src/core/plugins/oas31/after-load.js

@@ -42,20 +42,26 @@ function afterLoad({ fn, getSystem }) {
 
   // overrides behavior in OpenAPI 3.1.x, recognizes more intentions
   const isFileUploadIntended = makeIsFileUploadIntended(getSystem)
-  const { isFileUploadIntended: isFileUploadIntendedWrap, schemaHasType } =
-    wrapOAS31Fn(
+  const { isFileUploadIntended: isFileUploadIntendedWrap } = wrapOAS31Fn(
+    {
+      isFileUploadIntended,
+    },
+    getSystem()
+  )
+
+  this.fn.isFileUploadIntended = isFileUploadIntendedWrap
+  this.fn.isFileUploadIntendedOAS31 = isFileUploadIntended
+
+  if (fn.jsonSchema202012) {
+    const { hasSchemaType } = wrapOAS31Fn(
       {
-        isFileUploadIntended,
-        ...(fn.jsonSchema202012 && {
-          schemaHasType: fn.jsonSchema202012.schemaHasType,
-        }),
+        hasSchemaType: fn.jsonSchema202012.hasSchemaType,
       },
       getSystem()
     )
 
-  this.fn.isFileUploadIntended = isFileUploadIntendedWrap
-  this.fn.isFileUploadIntendedOAS31 = isFileUploadIntended
-  this.fn.schemaHasType = schemaHasType
+    this.fn.hasSchemaType = hasSchemaType
+  }
 }
 
 export default afterLoad

Diff for: test/unit/core/plugins/json-schema-5/components/json-schema-form.jsx

@@ -19,7 +19,7 @@ const getSystemStub = () => ({
     fileUploadMediaTypes: [],
   }),
   fn: {
-    schemaHasType: () => {},
+    hasSchemaType: () => {},
     isFileUploadIntendedOAS30: () => {},
   },
 })