feat: Refactoring

Author: makeev-pavel

src/apitypes/rest/rest.operation.ts

@@ -32,11 +32,11 @@ import {
   capitalize,
   getKeyValue,
   getSplittedVersionKey,
+  getValueByRefAndUpdate,
   isDeprecatedOperationItem,
   isOperationDeprecated,
   normalizePath,
   rawToApiKind,
-  getValueByRefAndUpdate,
   setValueByPath,
   takeIf,
   takeIfDefined,
@@ -310,11 +310,15 @@ const createSingleOperationSpec = (
     },
   }
 
-  if (pathData.$ref) {
-    const cleanedDocument = getValueByRefAndUpdate(pathData.$ref, document, (pathItemObject: OpenAPIV3.PathItemObject) => ({
-      ...extractCommonPathItemProperties(pathItemObject),
-      [method]: { ...pathItemObject[method] },
-    }))
+  const ref = pathData.$ref
+  if (ref) {
+    const cleanedDocument = getValueByRefAndUpdate(
+      ref,
+      document,
+      (pathItemObject: OpenAPIV3.PathItemObject) => ({
+        ...extractCommonPathItemProperties(pathItemObject),
+        [method]: { ...pathItemObject[method] },
+      }))
 
     return {
       ...baseSpec,
@@ -323,7 +327,7 @@ const createSingleOperationSpec = (
       },
       components: {
         ...baseSpec.components,
-        ...cleanedDocument?.components ?? {},
+        ...cleanedDocument.components ?? {},
       },
     }
   }

src/strategies/document-group.strategy.ts

@@ -190,18 +190,18 @@ function handleRefPathItem(
   const ref = pathData.$ref ?? ''
   const operationsFormResult = getParentValueByRef(ref, resultDocument)
 
-  const clearedDocument = getValueByRefAndUpdate(ref, sourceDocument, (pathItemObject: OpenAPIV3.PathItemObject) => ({
+  const cleanedDocument = getValueByRefAndUpdate(ref, sourceDocument, (pathItemObject: OpenAPIV3.PathItemObject) => ({
     ...operationsFormResult,
     ...extractCommonPathItemProperties(pathItemObject),
     [method]: { ...pathItemObject[method] },
   }))
 
   resultDocument.paths[path] = pathData
 
-  if (clearedDocument.components) {
+  if (cleanedDocument.components) {
     resultDocument.components = {
       ...resultDocument.components,
-      ...clearedDocument.components,
+      ...cleanedDocument.components,
     }
   }
 }