fix(deps): bump @stoplight/json-schema-merge-allof to ^0.7.1

Author: P0lip

package.json

@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@stoplight/json": "^3.5.1",
-    "@stoplight/json-schema-merge-allof": "^0.7.0",
+    "@stoplight/json-schema-merge-allof": "^0.7.1",
     "@stoplight/react-error-boundary": "^1.0.0",
     "@stoplight/tree-list": "^5.0.0",
     "classnames": "^2.2.6",

src/tree/utils/__tests__/mergeAllOf.spec.ts

@@ -27,7 +27,7 @@ describe('mergeAllOf util', () => {
         ],
       };
 
-      expect(mergeAllOf(schema, [], jest.fn())).toEqual({
+      expect(mergeAllOf(schema, [], {} as any)).toEqual({
         properties: {
           bar: {
             example: null,
@@ -62,7 +62,7 @@ describe('mergeAllOf util', () => {
         ],
       };
 
-      expect(mergeAllOf(schema, [], jest.fn())).toEqual({
+      expect(mergeAllOf(schema, [], {} as any)).toEqual({
         properties: {
           bar: {
             example: 'hello',
@@ -99,7 +99,7 @@ describe('mergeAllOf util', () => {
         ],
       };
 
-      expect(mergeAllOf(schema, [], jest.fn())).toEqual({
+      expect(mergeAllOf(schema, [], {} as any)).toEqual({
         properties: {
           bar: {
             enum: [],
@@ -134,7 +134,7 @@ describe('mergeAllOf util', () => {
         ],
       };
 
-      expect(mergeAllOf(schema, [], jest.fn())).toEqual({
+      expect(mergeAllOf(schema, [], {} as any)).toEqual({
         properties: {
           bar: {
             enum: ['jonas', 'frederik'],

src/tree/utils/mergeAllOf.ts

@@ -1,7 +1,7 @@
 import { pathToPointer } from '@stoplight/json';
 import { JsonPath } from '@stoplight/types';
 import { JSONSchema4 } from 'json-schema';
-import { cloneDeep, compact } from 'lodash';
+import { cloneDeep } from 'lodash';
 import { ResolvingError } from '../../errors';
 import { WalkingOptions } from './populateTree';
 
@@ -12,24 +12,7 @@ const store = new WeakMap<WalkingOptions, WeakMap<JSONSchema4, string[]>>();
 function _mergeAllOf(schema: JSONSchema4, path: JsonPath, opts: WalkingOptions) {
   return resolveAllOf(cloneDeep(schema), {
     deep: false,
-    resolvers: {
-      defaultResolver(values: unknown) {
-        if (Array.isArray(values)) {
-          return values;
-        }
-
-        return Object.assign({}, ...Object(values));
-      },
-      example(values: unknown[]) {
-        return resolveAllOf.options.resolvers.enum(values) || null;
-      },
-      enum(values: unknown[]) {
-        return resolveAllOf.options.resolvers.enum(compact(values)) || [];
-      },
-      $ref(values: unknown) {
-        return {};
-      },
-    },
+    resolvers: resolveAllOf.stoplightResolvers,
     $refResolver($ref: unknown) {
       if (typeof $ref !== 'string') {
         return {};

yarn.lock

@@ -1570,10 +1570,10 @@
     lodash "^4.17.4"
     read-pkg-up "^7.0.0"
 
-"@stoplight/json-schema-merge-allof@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@stoplight/json-schema-merge-allof/-/json-schema-merge-allof-0.7.0.tgz#c3bad916c813d41a1ad385182a465cce2a14abbd"
-  integrity sha512-tMeLC52x+46t5NJ8nrNiZcFVK/V9XKRM/89WG7VT6zmKP+QS/Q6iORUTja6Am6YeBUT9rjP/W9gC4FBiiutUXA==
+"@stoplight/json-schema-merge-allof@^0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@stoplight/json-schema-merge-allof/-/json-schema-merge-allof-0.7.1.tgz#7a2c99da9448c5b6b5cbd9afd9f1fb4957d5cbeb"
+  integrity sha512-S+pemVEAhqZPb88WstIbRg8yCMoYr6/+MjPS3/ngXPZ/y+hgG/ax26lTr0E8gmFc9kByIIixjF18ZqmC0DlGHg==
   dependencies:
     compute-lcm "^1.1.0"
     json-schema-compare "^0.2.2"