fix: Refactoring

Author: makeev-pavel

src/openapi/openapi3.schema.ts

@@ -16,26 +16,28 @@ import {
   transformCompareRules,
 } from '../core'
 import type { OpenApi3SchemaRulesOptions } from './openapi3.types'
-import { CompareRules, AdapterResolver } from '../types'
+import { AdapterResolver, CompareRules } from '../types'
 import {
+  JSON_SCHEMA_NODE_TYPE_NULL,
+  JSON_SCHEMA_PROPERTY_ANY_OF,
+  JSON_SCHEMA_PROPERTY_NULLABLE,
+  JSON_SCHEMA_PROPERTY_ONE_OF,
+  JSON_SCHEMA_PROPERTY_TITLE,
+  JSON_SCHEMA_PROPERTY_TYPE,
   JsonSchemaSpecVersion,
   normalize,
   type OpenApiSpecVersion,
   OriginsMetaRecord,
+  setOrigins,
   SPEC_TYPE_JSON_SCHEMA_04,
   SPEC_TYPE_JSON_SCHEMA_07,
   SPEC_TYPE_OPEN_API_30,
   SPEC_TYPE_OPEN_API_31,
-  JSON_SCHEMA_PROPERTY_NULLABLE,
-  JSON_SCHEMA_PROPERTY_ANY_OF,
-  JSON_SCHEMA_PROPERTY_ONE_OF,
-  JSON_SCHEMA_PROPERTY_TYPE,
-  JSON_SCHEMA_NODE_TYPE_NULL,
-  setOrigins,
 } from '@netcracker/qubership-apihub-api-unifier'
 import { schemaParamsCalculator } from './openapi3.description.schema'
-import { isObject, isArray } from '../utils'
+import { isArray, isObject } from '../utils'
 
+const NULL_TYPE_COMBINERS = [JSON_SCHEMA_PROPERTY_ANY_OF, JSON_SCHEMA_PROPERTY_ONE_OF] as const
 const SPEC_TYPE_TO_VERSION: Record<OpenApiSpecVersion, string> = {
   [SPEC_TYPE_OPEN_API_30]: '3.0.0',
   [SPEC_TYPE_OPEN_API_31]: '3.1.0',
@@ -69,96 +71,68 @@ const openApiJsonSchemaAnyFactory: (version: OpenApiSpecVersion) => NativeAnySch
   return normalizedSpec.components.schemas.empty as Record<PropertyKey, unknown>
 }
 
-// Helper function to check if a schema has null type
 const hasNullType = (schema: unknown): boolean => {
-  if (!isObject(schema)) return false
-  
-  // Check direct type property
+  if (!isObject(schema)) {
+    return false
+  }
+
   const type = schema[JSON_SCHEMA_PROPERTY_TYPE]
-  if (type === JSON_SCHEMA_NODE_TYPE_NULL) return true
-  if (isArray(type) && type.includes(JSON_SCHEMA_NODE_TYPE_NULL)) return true
-  
-  // Check in combiners (anyOf, oneOf)
-  for (const combiner of [JSON_SCHEMA_PROPERTY_ANY_OF, JSON_SCHEMA_PROPERTY_ONE_OF] as const) {
-    const combinerArray = schema[combiner]
-    if (isArray(combinerArray)) {
-      for (const item of combinerArray) {
-        if (hasNullType(item)) return true
-      }
-    }
+  if (type === JSON_SCHEMA_NODE_TYPE_NULL) {
+    return true
+  }
+
+  if (isArray(type) && type.includes(JSON_SCHEMA_NODE_TYPE_NULL)) {
+    return true
   }
-  
-  return false
-}
 
-// Builds a "null" type schema carrying over relevant origins from source
-// const buildNullTypeWithOrigins = (
-//   valueWithoutNullable: Record<PropertyKey, unknown>,
-//   originsFlag: PropertyKey,
-// ): Record<PropertyKey, unknown> => {
-//   const nullTypeObject: Record<PropertyKey, unknown> = {
-//     [JSON_SCHEMA_PROPERTY_TYPE]: JSON_SCHEMA_NODE_TYPE_NULL,
-//   }
-//   const valueOrigins = valueWithoutNullable[originsFlag] as Record<PropertyKey, unknown> | undefined
-//
-//   if (valueWithoutNullable.title) {
-//     nullTypeObject.title = valueWithoutNullable.title
-//     const titleOrigin = valueOrigins && (valueOrigins as Record<PropertyKey, unknown>).title
-//     if (titleOrigin !== undefined) {
-//       nullTypeObject[originsFlag] = { title: titleOrigin }
-//     }
-//   }
-//
-//   const nullableOrigin = valueOrigins && (valueOrigins as Record<PropertyKey, unknown>).nullable
-//   if (nullableOrigin !== undefined) {
-//     const existing = (nullTypeObject[originsFlag] as Record<PropertyKey, unknown>) || {}
-//     nullTypeObject[originsFlag] = { ...existing, nullable: nullableOrigin }
-//   }
-//
-//   return nullTypeObject
-// }
+  return NULL_TYPE_COMBINERS.some((combiner) => {
+    const variants = schema[combiner]
+    return isArray(variants) && variants.some(hasNullType)
+  })
+}
 
 const buildNullTypeWithOrigins = (
   valueWithoutNullable: Record<PropertyKey, unknown>,
   originsFlag: PropertyKey,
-  syntheticTitleFlag: PropertyKey
+  syntheticTitleFlag: symbol | undefined,
 ): Record<PropertyKey, unknown> => {
-  const nullTypeObject: Record<PropertyKey, unknown> = {
+  const nullableObject: Record<PropertyKey, unknown> = {
     [JSON_SCHEMA_PROPERTY_TYPE]: JSON_SCHEMA_NODE_TYPE_NULL,
   }
 
-  const valueOrigins = valueWithoutNullable[originsFlag] as Record<PropertyKey, unknown> | undefined
   const origins: Record<PropertyKey, unknown> = {}
+  const valueOrigins = valueWithoutNullable[originsFlag] as Record<PropertyKey, unknown> | undefined
 
-  if (valueWithoutNullable.title) {
-    nullTypeObject.title = valueWithoutNullable.title
-    if (valueOrigins?.title !== undefined) {
-      origins.title = valueOrigins.title
+  const valueTitle = valueWithoutNullable[JSON_SCHEMA_PROPERTY_TITLE]
+  if (valueTitle) {
+    nullableObject[JSON_SCHEMA_PROPERTY_TITLE] = valueTitle
+    if (valueOrigins && valueOrigins[JSON_SCHEMA_PROPERTY_TITLE] !== undefined) {
+      origins[JSON_SCHEMA_PROPERTY_TITLE] = valueOrigins[JSON_SCHEMA_PROPERTY_TITLE]
     }
   }
 
-  if (valueOrigins?.nullable !== undefined) {
-
-    // origins.nullable = valueOrigins.nullable
+  if (syntheticTitleFlag && valueWithoutNullable[syntheticTitleFlag]) {
+    nullableObject[syntheticTitleFlag] = true
+  }
 
+  if (valueOrigins && valueOrigins[JSON_SCHEMA_PROPERTY_NULLABLE] !== undefined) {
     const getOriginParent = (item: unknown) => ({
       value: JSON_SCHEMA_PROPERTY_TYPE,
       parent: (item as any)?.parent,
     })
 
-    origins[JSON_SCHEMA_PROPERTY_TYPE] = Array.isArray(valueOrigins.nullable)
+    origins[JSON_SCHEMA_PROPERTY_TYPE] = isArray(valueOrigins.nullable)
       ? valueOrigins.nullable.map(getOriginParent)
       : getOriginParent(valueOrigins.nullable)
   }
 
   if (Object.keys(origins).length > 0) {
-    nullTypeObject[originsFlag] = origins
+    nullableObject[originsFlag] = origins
   }
 
-  return nullTypeObject
+  return nullableObject
 }
 
-// Adapter to transform JSON Schemas used in OpenAPI 3.0 schemas to JSON Schemas used in OpenAPI 3.1 for comparison
 const jsonSchemaOas30to31Adapter: AdapterResolver = (value, reference, ctx) => {
   if (!isObject(value) || !isObject(reference)) {
     return value
@@ -172,12 +146,13 @@ const jsonSchemaOas30to31Adapter: AdapterResolver = (value, reference, ctx) => {
     return value
   }
 
-  const originsFlag: PropertyKey = ctx.options.originsFlag
-  // @ts-ignore
-  const syntheticTitleFlag: PropertyKey = ctx.options.syntheticTitleFlag
+  const { originsFlag, syntheticTitleFlag } = ctx.options
 
   return ctx.transformer(value, 'nullable-to-anyof', (current) => {
-    const { [JSON_SCHEMA_PROPERTY_NULLABLE]: _nullable, ...valueWithoutNullable } = current as Record<PropertyKey, unknown>
+    const {
+      [JSON_SCHEMA_PROPERTY_NULLABLE]: _nullable,
+      ...valueWithoutNullable
+    } = current as Record<PropertyKey, unknown>
 
     const nullTypeObject = buildNullTypeWithOrigins(valueWithoutNullable, originsFlag, syntheticTitleFlag)