Merge branch 'hotfix'

Author: b41ex

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-api-unifier",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "Tools for JsonSchema/Openapi/GraphQL spec for unified processing",
   "module": "./dist/index.es.js",
   "main": "./dist/index.cjs.js",

package.json

@@ -47,7 +47,16 @@ export const and: MergeResolver<boolean> = args => mergeResultWithSameValueOrigi
 export const or: MergeResolver<boolean> = args => mergeResultWithSameValueOrigins(args, args => args.reduce((r, v) => r || v, false))
 export const minValue: MergeResolver<number> = args => mergeResultWithSameValueOrigins(args, args => Math.min(...args))
 export const maxValue: MergeResolver<number> = args => mergeResultWithSameValueOrigins(args, args => Math.max(...args))
-export const mergePattern: MergeResolver<string> = args => mergeResultWithAllOrigins(args, (args) => args.reduce((r, v) => `${r}(?=${v})`, ''))
+export const mergePattern: MergeResolver<string> = args => mergeResultWithAllOrigins(args, (args) => {
+  // Collect unique patterns and sort them for deterministic results
+  const uniquePatterns = uniqueItems(args).sort()
+  // If there's only one unique pattern, return it as-is
+  if (uniquePatterns.length === 1) {
+    return uniquePatterns[0]
+  }
+  // Otherwise, merge unique patterns using lookahead assertions
+  return uniquePatterns.reduce((r, v) => `${r}(?=${v})`, '')
+})
 export const equal: MergeResolver<unknown> = args => mergeResultWithAllOrigins(args, ([one, ...others]) => others.find((v) => !deepEqual(v, one)) ? undefined : one)
 export const mergeObjects: MergeResolver<Jso> = args => mergeResultWithAllOrigins(args, ([one, ...others]) => others.reduce((r, v) => mergeValues(r, v), isArray(one) ? [...one] : { ...one }))
 export const mergeCombination: MergeResolver<unknown[]> = (args, ctx) => {

src/resolvers/basic.ts

@@ -554,8 +554,8 @@ describe('basic allOf merge cases', function () {
         ],
       }, { allowNotValidSyntheticChanges: true })
       expect(result).toEqual({
-          type: JSON_SCHEMA_NODE_SYNTHETIC_TYPE_NOTHING,
-        },
+        type: JSON_SCHEMA_NODE_SYNTHETIC_TYPE_NOTHING,
+      },
       )
     })
 
@@ -1268,7 +1268,7 @@ describe('basic allOf merge cases', function () {
       })
 
       expect(result).toEqual({
-        pattern: '(?=fdsaf)(?=abba)',
+        pattern: '(?=abba)(?=fdsaf)',
       })
 
       const result2 = normalize({
@@ -1284,6 +1284,35 @@ describe('basic allOf merge cases', function () {
       })
     })
 
+    it('merges schemas with all identical patterns in allOf to exactly the same pattern', function () {
+      const result = normalize({
+        allOf: [
+          { pattern: 'abc' },
+          { pattern: 'abc' },
+          { pattern: 'abc' },
+        ],
+      })
+
+      expect(result).toEqual({
+        pattern: 'abc',
+      })
+    })
+
+    it('merges schemas with several identical patterns in allOf to lookahead assertions for unique patterns', function () {
+      const result = normalize({
+        allOf: [
+          { pattern: 'abc' },
+          { pattern: 'abc' },
+          { pattern: 'def' },
+          { pattern: 'def' },
+        ],
+      })
+
+      expect(result).toEqual({
+        pattern: '(?=abc)(?=def)',
+      })
+    })
+
     it('merges multipleOf using allOf or direct assignment', function () {
       const result = normalize({
         allOf: [