Merge branch 'release'

Author: b41ex

.github/super-linter.env

@@ -36,3 +36,10 @@ VALIDATE_TSX=false
 VALIDATE_TYPESCRIPT_ES=false
 VALIDATE_TYPESCRIPT_PRETTIER=false
 VALIDATE_TYPESCRIPT_STANDARD=false
+
+# Skip OPENAPI check by CHECKOV for this repo as it contains invalid OAS 3.0 specs for testing purposes
+VALIDATE_CHECKOV=false
+VALIDATE_OPENAPI=false
+
+# Skip checking of specially broken specifications
+FILTER_REGEX_EXCLUDE=test/projects/broken/.*

.github/workflows/delete-dist-tag.yaml

@@ -5,4 +5,4 @@ on:
 
 jobs:
   delete-dist-tag:
-    uses: netcracker/qubership-apihub-ci/.github/workflows/delete-dist-tag.yaml@main
+    uses: netcracker/qubership-apihub-ci/.github/workflows/delete-dist-tag.yaml@main

.qubership/grand-report.json

@@ -0,0 +1,54 @@
+{
+  "exclusions" : [ {
+    "t-hash" : "795f701a5a477424919b8f2f6dbd915815e3aeaba2f01c5585b62088f0ea72f1",
+    "f-hash" : "04da8a5d28577b892f965d7204a504ce7be0094cd46ab1fd31aaec5fdeac0052"
+  }, {
+    "t-hash" : "5efb34e1c2b422d1baa6e973c23a553c704b3f27ae23078f63fdd5aca517f2d5",
+    "f-hash" : "0a84bd29d04961f0377f9ab44575048ad562ef15b31d6bf3b60150b8d9f21237"
+  }, {
+    "t-hash" : "5efb34e1c2b422d1baa6e973c23a553c704b3f27ae23078f63fdd5aca517f2d5",
+    "f-hash" : "2d6dcc685bb4214db7bffbb0347351fe9a0ae105880cfc68323898dec7da8700"
+  }, {
+    "t-hash" : "795f701a5a477424919b8f2f6dbd915815e3aeaba2f01c5585b62088f0ea72f1",
+    "f-hash" : "320fde79a56686a2b4ef150ebcb9ac86dbfe10defbd26b3bca53893a1158c214"
+  }, {
+    "t-hash" : "795f701a5a477424919b8f2f6dbd915815e3aeaba2f01c5585b62088f0ea72f1",
+    "f-hash" : "35e1276fdf521ea0b800f523e10aa66fdd7ba45afff03a54320c2c78331662a1"
+  }, {
+    "t-hash" : "5efb34e1c2b422d1baa6e973c23a553c704b3f27ae23078f63fdd5aca517f2d5",
+    "f-hash" : "57e985b5c4aa0d868764daa9a15b842020d3763ae5198b53ed0d9adf0653cdd1"
+  }, {
+    "t-hash" : "5efb34e1c2b422d1baa6e973c23a553c704b3f27ae23078f63fdd5aca517f2d5",
+    "f-hash" : "5bc453e937cfe34a51d86403f19f1cc0c8326d1597ab1fc60bc5ce9cc6fc1c5e"
+  }, {
+    "t-hash" : "795f701a5a477424919b8f2f6dbd915815e3aeaba2f01c5585b62088f0ea72f1",
+    "f-hash" : "5e0da273e11b29963bfa8dcc457505581dee1afea7c8c780f35e9a4114966b4b"
+  }, {
+    "t-hash" : "fab1e2e699b3b927cbf875046a64f2225df02d5cb306f3857424c2bbb87be61f",
+    "f-hash" : "80218ffcd5d234a073e144cf6b0d1034d6fc354be74f13c80321eb68e62f2f4d"
+  }, {
+    "t-hash" : "fab1e2e699b3b927cbf875046a64f2225df02d5cb306f3857424c2bbb87be61f",
+    "f-hash" : "ae2ae8e5980953fe6629af044dcb907d6725f9c9981e502809f87589fabd05db"
+  }, {
+    "t-hash" : "fab1e2e699b3b927cbf875046a64f2225df02d5cb306f3857424c2bbb87be61f",
+    "f-hash" : "b145f0361ca381ae9878f62070575fa69461cd3883e57a8406fc87cec5cf5863"
+  }, {
+    "t-hash" : "fab1e2e699b3b927cbf875046a64f2225df02d5cb306f3857424c2bbb87be61f",
+    "f-hash" : "bdf1ed998a5de05b64c9f6430cfd0b9445ee8450a29a8e2497533d1733592446"
+  }, {
+    "t-hash" : "fab1e2e699b3b927cbf875046a64f2225df02d5cb306f3857424c2bbb87be61f",
+    "f-hash" : "caefe5cd42d4a2ee6ad4528381dd278ac78afd6bf91d2c642d3333b1992eb2c4"
+  }, {
+    "t-hash" : "fab1e2e699b3b927cbf875046a64f2225df02d5cb306f3857424c2bbb87be61f",
+    "f-hash" : "d27f64389a9e6ea237157a200d5a50e3afdda16a382fd3d1b2b6d7714b72464e"
+  }, {
+    "t-hash" : "795f701a5a477424919b8f2f6dbd915815e3aeaba2f01c5585b62088f0ea72f1",
+    "f-hash" : "d86f71972fd6048a9c92e445b2720a0e0c2c13c90046c79333ca8d3407cdc9ab"
+  }, {
+    "t-hash" : "00000000",
+    "f-hash" : "deb9159a542d4bdb7426160a9722ed78d9a8582e0522fa8c581e06d5a79def2f"
+  }, {
+    "t-hash" : "fab1e2e699b3b927cbf875046a64f2225df02d5cb306f3857424c2bbb87be61f",
+    "f-hash" : "e1566fd9f129a29f3c48553081d9ca3f5cc853f3a4dc746b0024c0d78671e574"
+  } ]
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-api-processor",
-  "version": "4.1.2",
+  "version": "4.2.0",
   "description": "",
   "license": "Apache-2.0",
   "module": "dist/esm/src/index.js",
@@ -31,8 +31,8 @@
     "update-lock-file": "update-lock-file @netcracker"
   },
   "dependencies": {
-    "@netcracker/qubership-apihub-api-diff": "2.2.0",
-    "@netcracker/qubership-apihub-api-unifier": "2.3.0",
+    "@netcracker/qubership-apihub-api-diff": "2.3.0",
+    "@netcracker/qubership-apihub-api-unifier": "2.4.0",
     "@netcracker/qubership-apihub-graphapi": "1.0.8",
     "@netcracker/qubership-apihub-json-crawl": "1.0.4",
     "adm-zip": "0.5.10",

package.json

@@ -19,10 +19,10 @@ import { OpenAPIV3 } from 'openapi-types'
 import { buildRestDocument, createRestExportDocument, dumpRestDocument } from './rest.document'
 import { REST_API_TYPE, REST_DOCUMENT_TYPE } from './rest.consts'
 import { compareRestOperationsData } from './rest.changes'
-import { buildRestOperations, createNormalizedOperationId } from './rest.operations'
+import { buildRestOperations } from './rest.operations'
 import { parseRestFile } from './rest.parser'
-
 import { ApiBuilder } from '../../types'
+import { calculateNormalizedOperationId } from '../../utils'
 
 export * from './rest.consts'
 
@@ -34,6 +34,6 @@ export const restApiBuilder: ApiBuilder<OpenAPIV3.Document> = {
   buildOperations: buildRestOperations,
   dumpDocument: dumpRestDocument,
   compareOperationsData: compareRestOperationsData,
-  createNormalizedOperationId: createNormalizedOperationId,
+  createNormalizedOperationId: calculateNormalizedOperationId,
   createExportDocument: createRestExportDocument,
 }

src/apitypes/rest/index.ts

@@ -19,29 +19,35 @@ import { OpenAPIV3 } from 'openapi-types'
 import { REST_API_TYPE, REST_KIND_KEY } from './rest.consts'
 import { operationRules } from './rest.rules'
 import type * as TYPE from './rest.types'
-import type {
+import { RestOperationData } from './rest.types'
+import {
   BuildConfig,
   CrawlRule,
   DeprecateItem,
   NotificationMessage,
   OperationCrawlState,
+  OperationId,
   SearchScopes,
 } from '../../types'
 import {
   buildSearchScope,
+  calculateOperationId,
   capitalize,
+  extractSymbolProperty,
   getKeyValue,
   getSplittedVersionKey,
+  getSymbolValueIfDefined,
   isDeprecatedOperationItem,
   isOperationDeprecated,
+  isValidHttpMethod,
   normalizePath,
   rawToApiKind,
   setValueByPath,
   takeIf,
   takeIfDefined,
 } from '../../utils'
 import { API_KIND, INLINE_REFS_FLAG, ORIGINS_SYMBOL, VERSION_STATUS } from '../../consts'
-import { getCustomTags, resolveApiAudience } from './rest.utils'
+import { getCustomTags, getOperationBasePath, resolveApiAudience } from './rest.utils'
 import { DebugPerformanceContext, syncDebugPerformance } from '../../utils/logs'
 import {
   calculateDeprecatedItems,
@@ -59,6 +65,7 @@ import {
 } from '@netcracker/qubership-apihub-api-unifier'
 import { calculateObjectHash } from '../../utils/hashes'
 import { calculateTolerantHash } from '../../components/deprecated'
+import { getValueByPath } from '../../utils/path'
 
 export const buildRestOperation = (
   operationId: string,
@@ -143,7 +150,7 @@ export const buildRestOperation = (
       security,
       components?.securitySchemes,
     )
-    calculateSpecRefs(document.data, refsOnlySingleOperationSpec, specWithSingleOperation, models, componentsHashMap)
+    calculateSpecRefs(document.data, refsOnlySingleOperationSpec, specWithSingleOperation, [operationId], models, componentsHashMap)
     const dataHash = calculateObjectHash(specWithSingleOperation)
     return [specWithSingleOperation, dataHash]
   }, debugCtx)
@@ -180,7 +187,14 @@ export const buildRestOperation = (
   }
 }
 
-export const calculateSpecRefs = (sourceDocument: unknown, normalizedSpec: unknown, resultSpec: unknown, models?: Record<string, string>, componentsHashMap?: Map<string, string>): void => {
+export const calculateSpecRefs = (
+  sourceDocument: TYPE.RestOperationData,
+  normalizedSpec: TYPE.RestOperationData,
+  resultSpec: TYPE.RestOperationData,
+  operations: OperationId[],
+  models?: Record<string, string>,
+  componentsHashMap?: Map<string, string>,
+): void => {
   const handledObjects = new Set<unknown>()
   const inlineRefs = new Set<string>()
   syncCrawl(
@@ -212,10 +226,11 @@ export const calculateSpecRefs = (sourceDocument: unknown, normalizedSpec: unkno
       return
     }
     const componentName = matchResult.grepValues[grepKey].toString()
-    const component = getKeyValue(sourceDocument, ...matchResult.path)
+    const component = getKeyValue(sourceDocument, ...matchResult.path) as Record<string, unknown>
     if (!component) {
       return
     }
+
     if (models && !models[componentName] && isComponentsSchemaRef(matchResult.path)) {
       let componentHash = componentsHashMap?.get(componentName)
       if (componentHash) {
@@ -226,8 +241,68 @@ export const calculateSpecRefs = (sourceDocument: unknown, normalizedSpec: unkno
         models[componentName] = componentHash
       }
     }
+
     setValueByPath(resultSpec, matchResult.path, component)
   })
+
+  if (operations?.length) {
+    reduceComponentPathItemsToOperations(resultSpec, normalizedSpec, operations)
+  }
+}
+
+function reduceComponentPathItemsToOperations(
+  resultSpec: RestOperationData,
+  normalizedDocument: RestOperationData,
+  operations: OperationId[],
+): void {
+  const { paths } = normalizedDocument
+
+  for (const path of Object.keys(paths)) {
+    const sourcePathItem = paths[path] as OpenAPIV3.PathItemObject
+    const pathItemComponentJsonPath = getPathItemComponentJsonPath(sourcePathItem)
+    if (!pathItemComponentJsonPath) {
+      continue
+    }
+
+    const pathItemComponent = getValueByPath(resultSpec, pathItemComponentJsonPath) as OpenAPIV3.PathItemObject
+
+    const operationIds: OpenAPIV3.HttpMethods[] = (Object.keys(pathItemComponent) as OpenAPIV3.HttpMethods[])
+      .filter((httpMethod) => isValidHttpMethod(httpMethod))
+      .filter(httpMethod => {
+        const methodData = sourcePathItem[httpMethod as OpenAPIV3.HttpMethods]
+        if (!methodData) return false
+        const basePath = getOperationBasePath(
+          methodData?.servers ||
+          sourcePathItem?.servers ||
+          [],
+        )
+        const operationId = calculateOperationId(basePath, httpMethod, path)
+        return operations.includes(operationId)
+      })
+
+    if (operationIds?.length) {
+      const pathItemObject = {
+        ...extractCommonPathItemProperties(pathItemComponent),
+        ...operationIds.reduce<OpenAPIV3.PathItemObject>((pathItemObject: OpenAPIV3.PathItemObject, operationId: OpenAPIV3.HttpMethods) => {
+          const operationData = pathItemComponent[operationId]
+          if (operationData) {
+            pathItemObject[operationId] = { ...operationData }
+          }
+          return pathItemObject
+        }, {}),
+      }
+      setValueByPath(resultSpec, pathItemComponentJsonPath, pathItemObject)
+    }
+  }
+}
+
+const getPathItemComponentJsonPath = (sourcePathItem: OpenAPIV3.PathItemObject): JsonPath | undefined => {
+  const refs = getSymbolValueIfDefined(sourcePathItem, INLINE_REFS_FLAG) as string[] | undefined
+  if (!refs || refs.length === 0) {
+    return undefined
+  }
+
+  return parseRef(refs[0])?.jsonPath
 }
 
 export const isComponentsSchemaRef = (path: JsonPath): boolean => {
@@ -236,6 +311,7 @@ export const isComponentsSchemaRef = (path: JsonPath): boolean => {
     [[OPEN_API_PROPERTY_COMPONENTS, OPEN_API_PROPERTY_SCHEMAS, PREDICATE_UNCLOSED_END]],
   )
 }
+
 const isOperationPaths = (paths: JsonPath[]): boolean => {
   return !!matchPaths(
     paths,
@@ -257,15 +333,19 @@ const createSingleOperationSpec = (
 ): TYPE.RestOperationData => {
   const pathData = document.paths[path] as OpenAPIV3.PathItemObject
 
+  const isRefPathData = !!pathData.$ref
   return {
     openapi: openapi ?? '3.0.0',
     ...takeIfDefined({ servers }),
     ...takeIfDefined({ security }), // TODO: remove duplicates in security
     paths: {
-      [path]: {
-        ...extractCommonPathItemProperties(pathData),
-        [method]: { ...pathData[method] },
-      },
+      [path]: isRefPathData
+        ? pathData
+        : {
+          ...extractCommonPathItemProperties(pathData),
+          [method]: { ...pathData[method] },
+          ...extractSymbolProperty(pathData, INLINE_REFS_FLAG),
+        },
     },
     components: {
       ...takeIfDefined({ securitySchemes }),

src/apitypes/rest/rest.operation.ts

@@ -17,14 +17,8 @@
 import { OpenAPIV3 } from 'openapi-types'
 
 import { buildRestOperation } from './rest.operation'
-import { OperationIdNormalizer, OperationsBuilder } from '../../types'
-import {
-  createBundlingErrorHandler,
-  IGNORE_PATH_PARAM_UNIFIED_PLACEHOLDER,
-  removeComponents,
-  removeFirstSlash,
-  slugify,
-} from '../../utils'
+import { OperationsBuilder } from '../../types'
+import { calculateOperationId, createBundlingErrorHandler, removeComponents } from '../../utils'
 import { getOperationBasePath } from './rest.utils'
 import type * as TYPE from './rest.types'
 import { HASH_FLAG, INLINE_REFS_FLAG, MESSAGE_SEVERITY, NORMALIZE_OPTIONS, ORIGINS_SYMBOL } from '../../consts'
@@ -61,7 +55,7 @@ export const buildRestOperations: OperationsBuilder<OpenAPIV3.Document> = async
     debugCtx,
   )
 
-  const { paths, servers } = document.data
+  const { paths, servers } = effectiveDocument
 
   const operations: TYPE.VersionRestOperation[] = []
   if (!paths) { return [] }
@@ -77,9 +71,8 @@ export const buildRestOperations: OperationsBuilder<OpenAPIV3.Document> = async
       await asyncFunction(() => {
         const methodData = pathData[key as OpenAPIV3.HttpMethods]
         const basePath = getOperationBasePath(methodData?.servers || pathData?.servers || servers || [])
-        const operationPath = basePath + path
 
-        const operationId = slugify(`${removeFirstSlash(operationPath)}-${key}`)
+        const operationId = calculateOperationId(basePath, key, path)
 
         if (ctx.operationResolver(operationId)) {
           ctx.notifications.push({
@@ -112,8 +105,3 @@ export const buildRestOperations: OperationsBuilder<OpenAPIV3.Document> = async
   }
   return operations
 }
-
-export const createNormalizedOperationId: OperationIdNormalizer = (operation) => {
-  const { metadata: { path, method } } = operation
-  return slugify(`${path}-${method}`, [], IGNORE_PATH_PARAM_UNIFIED_PLACEHOLDER)
-}