Merge branch 'release'

Author: b41ex

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-api-processor",
-  "version": "3.0.6",
+  "version": "3.1.0-next.0",
   "description": "",
   "license": "Apache-2.0",
   "module": "dist/esm/src/index.js",
@@ -34,7 +34,7 @@
     "release-finish": "release-finish"
   },
   "dependencies": {
-    "@netcracker/qubership-apihub-api-diff": "1.0.4",
+    "@netcracker/qubership-apihub-api-diff": "1.1.0",
     "@netcracker/qubership-apihub-api-unifier": "1.0.4",
     "@netcracker/qubership-apihub-json-crawl": "1.0.4",
     "@netcracker/qubership-apihub-graphapi": "1.0.8",

package.json

@@ -20,10 +20,9 @@ import { convertObj } from 'swagger2openapi'
 import { REST_DOCUMENT_TYPE, REST_KIND_KEY } from './rest.consts'
 import type { RestDocumentInfo } from './rest.types'
 
-import type { DocumentBuilder, DocumentDumper } from '../../types'
-import { YAML_EXPORT_GROUP_FORMAT } from '../../types'
+import { DocumentBuilder, DocumentDumper, YAML_EXPORT_GROUP_FORMAT } from '../../types'
 import { FILE_FORMAT } from '../../consts'
-import { getBundledFileDataWithDependencies, getDocumentTitle } from '../../utils'
+import { createBundlingErrorHandler, getBundledFileDataWithDependencies, getDocumentTitle } from '../../utils'
 import YAML from 'js-yaml'
 
 const openApiDocumentMeta = (data: OpenAPIV3.Document): RestDocumentInfo => {
@@ -53,7 +52,10 @@ const openApiDocumentMeta = (data: OpenAPIV3.Document): RestDocumentInfo => {
 export const buildRestDocument: DocumentBuilder<OpenAPIV3.Document> = async (parsedFile, file, ctx) => {
   const { fileId, slug = '', publish = true, apiKind, ...fileMetadata } = file
 
-  const { data, dependencies } = await getBundledFileDataWithDependencies(fileId, ctx.parsedFileResolver)
+  const {
+    data,
+    dependencies,
+  } = await getBundledFileDataWithDependencies(fileId, ctx.parsedFileResolver, createBundlingErrorHandler(ctx, fileId))
 
   let bundledFileData = data
 

src/apitypes/rest/rest.document.ts

@@ -17,8 +17,8 @@
 import { OpenAPIV3 } from 'openapi-types'
 
 import { buildRestOperation } from './rest.operation'
-import type { OperationsBuilder } from '../../types'
-import { removeComponents, removeFirstSlash, slugify } from '../../utils'
+import { OperationsBuilder } from '../../types'
+import { createBundlingErrorHandler, removeComponents, removeFirstSlash, slugify } 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'
@@ -28,6 +28,7 @@ import { normalize } from '@netcracker/qubership-apihub-api-unifier'
 
 export const buildRestOperations: OperationsBuilder<OpenAPIV3.Document> = async (document, ctx, debugCtx) => {
   const documentWithoutComponents = removeComponents(document.data)
+  const bundlingErrorHandler = createBundlingErrorHandler(ctx, document.fileId)
 
   const { effectiveDocument, refsOnlyDocument } = syncDebugPerformance('[NormalizeDocument]', () => {
     const effectiveDocument = normalize(
@@ -37,6 +38,8 @@ export const buildRestOperations: OperationsBuilder<OpenAPIV3.Document> = async
         originsFlag: ORIGINS_SYMBOL,
         hashFlag: HASH_FLAG,
         source: document.data,
+        onRefResolveError: (_: string, __: PropertyKey[], ref: string) =>
+          bundlingErrorHandler([`The $ref "${ref}" references an invalid location in the document.`]),
       },
     ) as OpenAPIV3.Document
     const refsOnlyDocument = normalize(

src/apitypes/rest/rest.operations.ts

@@ -15,7 +15,7 @@
  */
 
 import { BuildConfigFile, DocumentBuilder, DocumentDumper, File, VersionDocument } from '../../types'
-import { getBundledFileDataWithDependencies, getDocumentTitle } from '../../utils'
+import { createBundlingErrorHandler, getBundledFileDataWithDependencies, getDocumentTitle } from '../../utils'
 import { FILE_FORMAT } from '../../consts'
 
 export const buildUnknownDocument: DocumentBuilder<string> = async (parsedFile, file, ctx) => {
@@ -33,7 +33,7 @@ export const buildUnknownDocument: DocumentBuilder<string> = async (parsedFile,
       const {
         data,
         dependencies: fileDependencies,
-      } = await getBundledFileDataWithDependencies(fileId, ctx.parsedFileResolver)
+      } = await getBundledFileDataWithDependencies(fileId, ctx.parsedFileResolver, createBundlingErrorHandler(ctx, fileId))
       bundledFileData = data
       dependencies = fileDependencies
     }

src/apitypes/unknown/unknown.document.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type {
+import {
   BuildConfig,
   BuildConfigFile,
   BuildConfigRef,
@@ -28,6 +28,7 @@ import type {
   ResolvedDocuments,
   ResolvedOperations,
   ResolvedVersionOperationsHashMap,
+  VALIDATION_RULES_SEVERITY_LEVEL_WARNING,
   VersionId,
 } from './types'
 import {
@@ -50,7 +51,14 @@ import {
 import type { NotificationMessage, PackageConfig } from './types/package'
 import { graphqlApiBuilder, REST_API_TYPE, restApiBuilder, textApiBuilder, unknownApiBuilder } from './apitypes'
 import { filesDiff, findSharedPath, getCompositeKey, getFileExtension, getOperationsList } from './utils'
-import { BUILD_TYPE, DEFAULT_BATCH_SIZE, MESSAGE_SEVERITY, SUPPORTED_FILE_FORMATS, VERSION_STATUS } from './consts'
+import {
+  BUILD_TYPE,
+  DEFAULT_BATCH_SIZE,
+  DEFAULT_VALIDATION_RULES_SEVERITY_CONFIG,
+  MESSAGE_SEVERITY,
+  SUPPORTED_FILE_FORMATS,
+  VERSION_STATUS,
+} from './consts'
 import { unknownParsedFile } from './apitypes/unknown/unknown.parser'
 import { createVersionPackage } from './components/package'
 import { compareVersions } from './components/compare'
@@ -90,7 +98,15 @@ export class PackageVersionBuilder implements IPackageVersionBuilder {
 
   constructor(config: BuildConfig, public params: BuilderParams, fileSources?: FileSourceMap) {
     this.apiBuilders.push(restApiBuilder, graphqlApiBuilder, textApiBuilder, unknownApiBuilder)
-    this.config = { previousVersion: '', previousVersionPackageId: '', ...config }
+    this.config = {
+      previousVersion: '',
+      previousVersionPackageId: '',
+      ...config,
+      validationRulesSeverity: {
+        ...DEFAULT_VALIDATION_RULES_SEVERITY_CONFIG,
+        ...config.validationRulesSeverity,
+      },
+    }
 
     this.params.configuration = {
       batchSize: DEFAULT_BATCH_SIZE,
@@ -232,11 +248,6 @@ export class PackageVersionBuilder implements IPackageVersionBuilder {
 
     const source = await this.params.resolvers.fileResolver(fileId)
     if (!source) {
-      this.notifications.push({
-        severity: MESSAGE_SEVERITY.Error,
-        message: 'Cannot resolve file',
-        fileId: fileId,
-      })
       return null
     }
 

src/builder.ts

@@ -55,7 +55,7 @@ export const buildDocument = async (parsedFile: File, file: BuildConfigFile, ctx
 
     return await apiBuilder.buildDocument(parsedFile, file, ctx)
   } catch (error) {
-    throw new Error(`Cannot build file ${file.fileId}. ${error instanceof Error ? error.message : 'Unknown error'}`)
+    throw new Error(`Cannot process the "${file.fileId}" document. ${error instanceof Error ? error.message : 'Unknown error'}`)
   }
 }
 

src/components/document.ts

@@ -24,7 +24,7 @@ export const buildOperations = async (document: VersionDocument, ctx: BuilderCon
     try {
       return await builder.buildOperations?.(document, ctx, debugCtx) ?? []
     } catch (error) {
-      throw new Error(`Cannot build document "${document.slug}" operations. ${error instanceof Error ? error.message : 'Unknown error'}`)
+      throw new Error(`Cannot process the "${document.fileId}" document. ${error instanceof Error ? error.message : 'Unknown error'}`)
     }
   }
 

src/components/operations.ts

@@ -23,10 +23,16 @@ import {
   NON_BREAKING_CHANGE_TYPE,
   SEMI_BREAKING_CHANGE_TYPE,
   UNCLASSIFIED_CHANGE_TYPE,
+  VALIDATION_RULES_SEVERITY_LEVEL_WARNING,
+  ValidationRulesSeverity,
 } from './types'
 
 export const DEFAULT_BATCH_SIZE = 32
 
+export const DEFAULT_VALIDATION_RULES_SEVERITY_CONFIG: ValidationRulesSeverity = {
+  brokenRefs: VALIDATION_RULES_SEVERITY_LEVEL_WARNING,
+}
+
 export const REVISION_DELIMITER = '@'
 
 export const VERSION_DIFFERENCE_ACTION = {

src/consts.ts

@@ -29,6 +29,17 @@ export type OperationsGroupExportFormat =
   | typeof JSON_EXPORT_GROUP_FORMAT
   | typeof HTML_EXPORT_GROUP_FORMAT
 
+export const VALIDATION_RULES_SEVERITY_LEVEL_ERROR = 'error'
+export const VALIDATION_RULES_SEVERITY_LEVEL_WARNING = 'warning'
+
+export type ValidationRulesSeverityLevel =
+  | typeof VALIDATION_RULES_SEVERITY_LEVEL_ERROR
+  | typeof VALIDATION_RULES_SEVERITY_LEVEL_WARNING
+
+export interface ValidationRulesSeverity {
+  brokenRefs: ValidationRulesSeverityLevel
+}
+
 export interface BuildConfig {
   packageId: PackageId
   version: VersionId // @revision for rebuild
@@ -48,6 +59,8 @@ export interface BuildConfig {
 
   metadata?: Record<string, unknown>
   format?: OperationsGroupExportFormat
+
+  validationRulesSeverity?: ValidationRulesSeverity
 }
 
 export interface BuildConfigFile {