Merge branch 'release'

Author: JayLim2

.github/workflows/frontend-ci.yaml

@@ -4,14 +4,13 @@ on:
   push:
     branches:
       - release
+      - hotfix
       - develop
       - feature/*
+      - bugfix/*      
     tags:
       - '**'
   delete:
-    branches:
-      - release
-      - feature/*
 
 jobs:
   call-frontend-ci-workflow:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-api-unifier",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "description": "Tools for JsonSchema/Openapi/GraphQL spec for unified processing",
   "module": "./dist/index.es.js",
   "main": "./dist/index.cjs.js",
@@ -25,10 +25,7 @@
     "development:unlink": "npm unlink && npm unlink @netcracker/qubership-apihub-json-crawl && npm unlink @netcracker/qubership-apihub-graphapi",
     "test": "jest --verbose --maxWorkers 3",
     "test:coverage": "jest --verbose --coverage",
-    "feature-start": "feature-start --featureName",
-    "feature-finish": "feature-finish",
-    "release-start": "release-start",
-    "release-finish": "release-finish"
+    "update-lock-file": "update-lock-file @netcracker"
   },
   "keywords": [
     "json",
@@ -49,7 +46,7 @@
   },
   "devDependencies": {
     "@netcracker/qubership-apihub-graphapi": "1.0.8",
-    "@netcracker/qubership-apihub-npm-gitflow": "2.2.2",
+    "@netcracker/qubership-apihub-npm-gitflow": "3.0.1",
     "@types/object-hash": "3.0.6",
     "@types/jest": "29.5.2",
     "@types/js-yaml": "4.0.5",
@@ -73,4 +70,4 @@
     "vite-plugin-singlefile": "2.0.1",
     "vite-plugin-target": "0.1.1"
   }
-}
+}

package.json

@@ -18,6 +18,7 @@ import {
   NormalizationRule,
   OriginCache,
   OriginsMetaRecord,
+  RefErrorTypes,
   ResolveOptions,
   RichReference,
 } from './types'
@@ -164,15 +165,15 @@ const createDefineOriginsAndResolveRefHook: (rootJso: unknown, options: Internal
           value: JSON_SCHEMA_PROPERTY_REF,
         }, state.originCache) //abuse cache. Keys should be a real node value only!!!
         if (typeof $ref !== 'string') {
-          options.onRefResolveError?.(ErrorMessage.refNotValidFormat($ref), path, $ref)
+          options.onRefResolveError?.(ErrorMessage.refNotValidFormat($ref), path, $ref, RefErrorTypes.REF_NOT_VALID_FORMAT)
           const brokenValueClone = { [JSON_SCHEMA_PROPERTY_REF]: $ref }
           state.node[safeKey] = brokenValueClone
           setOrigins(state.node, safeKey, options.originsFlag, [originForObj])
           setOrigins(brokenValueClone, JSON_SCHEMA_PROPERTY_REF, options.originsFlag, [originForRef])
           return { done: true }
         }
         if (!options.richRefAllowed && Reflect.ownKeys(sibling).length !== 0) {
-          options.onRefResolveError?.(ErrorMessage.richRefObjectNotAllowed(), path, $ref)
+          options.onRefResolveError?.(ErrorMessage.richRefObjectNotAllowed($ref), path, $ref, RefErrorTypes.RICH_REF_NOT_ALLOWED)
           sibling = {}
         }
         const reference = parseRef($ref)
@@ -342,7 +343,7 @@ const createDefineOriginsAndResolveRefHook: (rootJso: unknown, options: Internal
             const { refValue, origin } = refInSourceJso
             return wrapRefWithAllOfIfNeed(refValue, sibling, origin)
           }
-          options.onRefResolveError?.(ErrorMessage.refNotFound($ref), path, $ref)
+          options.onRefResolveError?.(ErrorMessage.refNotFound($ref), path, $ref, RefErrorTypes.REF_NOT_FOUND)
           const brokenValueClone = { [JSON_SCHEMA_PROPERTY_REF]: $ref }
           state.node[safeKey] = brokenValueClone
           setOrigins(state.node, safeKey, options.originsFlag, [originForObj])

src/define-origins-and-resolve-ref.ts

@@ -4,7 +4,7 @@ export const ErrorMessage = {
   mergeError: () => 'Could not merge values, they are probably incompatible',
   mergeWithBrokenRef: () => 'Could not merge values with unresolved ref',
   ruleNotFound: (key: any) => `Merge rule not found for key: ${key}`,
-  richRefObjectNotAllowed: () => `${JSON_SCHEMA_PROPERTY_REF} can't have siblings in this specification version`,
+  richRefObjectNotAllowed: (ref: string) => `${JSON_SCHEMA_PROPERTY_REF} can't have siblings in this specification version: ${ref}`,
   refNotFound: (ref: string) => `${JSON_SCHEMA_PROPERTY_REF} can't be resolved: ${ref}`,
   refNotValidFormat: (ref: string) => `${JSON_SCHEMA_PROPERTY_REF} can't be parsed: ${ref}`,
 } as const

src/errors.ts

@@ -7,6 +7,14 @@ export type JsonSchema = Record<PropertyKey, unknown>
 
 export type NormalizationRules = CrawlRules<NormalizationRule>
 
+export const RefErrorTypes = {
+  RICH_REF_NOT_ALLOWED: 'richRefObjectNotAllowed' as const,
+  REF_NOT_FOUND: 'refNotFound' as const,
+  REF_NOT_VALID_FORMAT: 'refNotValidFormat' as const,
+} as const
+
+export type RefErrorType = typeof RefErrorTypes[keyof typeof RefErrorTypes]
+
 //todo ugly API. Some Flag activate transformation (like syntheticTitleFlag) some flags just mark result for transfomration
 export interface ResolveOptions {
   resolveRef?: boolean            // execute resolve ref phase (inline usages that can produce cycled JSO)
@@ -17,7 +25,7 @@ export interface ResolveOptions {
   originsFlag?: symbol            // used in JSO as anchor to chained declaration path (contains link to parent in declarationPath)
   originsAlreadyDefined?: boolean // are there already origins in the spec
   ignoreSymbols?: symbol[],       // symbols to ignore scan
-  onRefResolveError?: (message: string, path: JsonPath, ref: string) => void
+  onRefResolveError?: (message: string, path: JsonPath, ref: string, errorType: RefErrorType) => void
 }
 
 export interface MergeOptions {

src/types.ts

@@ -1,12 +1,13 @@
 import { JsonPath } from '@netcracker/qubership-apihub-json-crawl'
-import { normalize } from '../../src'
+import { normalize, RefErrorType, RefErrorTypes } from '../../src'
 
 describe("merge errors handling", function () {
   it('should trigger onRefResolveError when merging broken $ref', (done) => {
 
-    const onRefResolveError = (message: string, path: JsonPath, ref: string) => {
+    const onRefResolveError = (message: string, path: JsonPath, ref: string, errorType: RefErrorType) => {
 
-      expect(ref).toBe ("#/foo")
+      expect(ref).toBe("#/foo")
+      expect(errorType).toBe(RefErrorTypes.REF_NOT_FOUND)
       done()
     }
 

test/oas/merge.errors.test.ts

@@ -1,4 +1,4 @@
-import { normalize } from '../../src'
+import { normalize, RefErrorType, RefErrorTypes } from '../../src'
 import source31x from '../resources/openapi31x.json'
 import source30x from '../resources/openapi30x.json'
 import { JsonPath } from '@netcracker/qubership-apihub-json-crawl'
@@ -7,7 +7,8 @@ import { ErrorMessage } from '../../src/errors'
 interface Error {
   readonly message: string,
   readonly path: JsonPath,
-  readonly ref: unknown
+  readonly ref: unknown,
+  readonly errorType: RefErrorType
 }
 
 describe('merge allof in openapi schema', function () {
@@ -128,7 +129,7 @@ describe('merge allof in openapi schema', function () {
     const errors: Error[] = []
     const result = normalize({ ...documentFragment, openapi: '3.0.0' }, {
       source: documentSource,
-      onRefResolveError: (message, path, ref) => errors.push({ message, path, ref: ref }),
+      onRefResolveError: (message, path, ref, errorType) => errors.push({ message, path, ref: ref, errorType }),
     })
     const expected = {
       openapi: '3.0.0',
@@ -170,19 +171,22 @@ describe('merge allof in openapi schema', function () {
     expect(result).toEqual(expected)
     expect(errors).toEqual([
       {
-        message: ErrorMessage.richRefObjectNotAllowed(),
+        message: ErrorMessage.richRefObjectNotAllowed('#/components/schemas/Human'),
         path: ['paths', 'humans', 'get', 'responses', '200', 'content', 'application/json', 'schema', 'items'],
         ref: '#/components/schemas/Human',
+        errorType: RefErrorTypes.RICH_REF_NOT_ALLOWED
       },
       {
-        message: ErrorMessage.richRefObjectNotAllowed(),
+        message: ErrorMessage.richRefObjectNotAllowed('#/components/schemas/Location'),
         path: ['paths', 'humans', 'get', 'responses', '200', 'content', 'application/json', 'schema', 'items', 'properties', 'location'],
         ref: '#/components/schemas/Location',
+        errorType: RefErrorTypes.RICH_REF_NOT_ALLOWED
       },
       {
-        message: ErrorMessage.richRefObjectNotAllowed(),
+        message: ErrorMessage.richRefObjectNotAllowed('#/components/schemas/Human'),
         path: ['paths', 'humans', 'get', 'responses', '200', 'content', 'application/json', 'schema', 'items', 'properties', 'location', 'allOf', 0, 'properties', 'ownedBy'],
         ref: '#/components/schemas/Human',
+        errorType: RefErrorTypes.RICH_REF_NOT_ALLOWED
       },
     ] as Error[])
   })