swagger-client 3.35.3 → 3.35.5

package/dist/swagger-client.browser.js

@@ -9393,7 +9393,19 @@ function applyPatch(obj, patch, opts) {
     fast_json_patch__WEBPACK_IMPORTED_MODULE_0__.applyPatch(obj, [replace(patch.path, newValue)]);
   } else if (patch.op === 'mergeDeep') {
     const currentValue = getInByJsonPath(obj, patch.path);
-    const newValue = deepmerge__WEBPACK_IMPORTED_MODULE_1___default()(currentValue, patch.value);
+    const newValue = deepmerge__WEBPACK_IMPORTED_MODULE_1___default()(currentValue, patch.value, {
+      customMerge: key => {
+        if (key === 'enum') {
+          return (targetElement, sourceElement) => {
+            if (Array.isArray(targetElement) && Array.isArray(sourceElement)) {
+              return [...new Set([...targetElement, ...sourceElement])];
+            }
+            return deepmerge__WEBPACK_IMPORTED_MODULE_1___default()(targetElement, sourceElement);
+          };
+        }
+        return undefined;
+      }
+    });
     obj = fast_json_patch__WEBPACK_IMPORTED_MODULE_0__.applyPatch(obj, [replace(patch.path, newValue)]).newDocument;
   } else if (patch.op === 'add' && patch.path === '' && isObject(patch.value)) {
     // { op: 'add', path: '', value: { a: 1, b: 2 }}
@@ -21289,13 +21301,17 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
+/* harmony import */ var ramda__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(59307);
 /* harmony import */ var _swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27121);
 /* harmony import */ var _swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(95233);
+/* harmony import */ var _swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(77259);
+/* harmony import */ var _swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(95532);
 /* harmony import */ var _swagger_api_apidom_ns_openapi_3_1__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(45259);
 /* harmony import */ var _utils_to_path_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12201);
 
 
 
+
 class AllOfVisitor {
   options;
   SchemaElement = {
@@ -21330,7 +21346,27 @@ class AllOfVisitor {
           allOf
         } = schemaElement;
         schemaElement.remove('allOf');
-        const allOfMerged = _swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_3__["default"].all([...allOf.content, schemaElement]);
+        const allOfMerged = _swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_3__["default"].all([...allOf.content, schemaElement], {
+          customMerge: keyElement => {
+            if ((0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_4__["default"])(keyElement) === 'enum') {
+              return (targetElement, sourceElement) => {
+                if ((0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_0__.includesClasses)(['json-schema-enum'], targetElement) && (0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_0__.includesClasses)(['json-schema-enum'], sourceElement)) {
+                  const areElementsEqual = (a, b) => {
+                    if ((0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_0__.isArrayElement)(a) || (0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_0__.isArrayElement)(b) || (0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_0__.isObjectElement)(a) || (0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_0__.isObjectElement)(b)) {
+                      return false;
+                    }
+                    return a.equals((0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_4__["default"])(b));
+                  };
+                  const clone = (0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_5__.cloneShallow)(targetElement);
+                  clone.content = (0,ramda__WEBPACK_IMPORTED_MODULE_6__["default"])(areElementsEqual)([...targetElement.content, ...sourceElement.content]);
+                  return clone;
+                }
+                return (0,_swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_3__["default"])(targetElement, sourceElement);
+              };
+            }
+            return _swagger_api_apidom_core__WEBPACK_IMPORTED_MODULE_3__["default"];
+          }
+        });
 
         /**
          * If there was not an original $$ref value, make sure to remove
@@ -55269,7 +55305,7 @@ const mergeObjectElement = (targetElement, sourceElement, options) => {
     if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_2__.isObjectElement)(targetElement) && targetElement.hasKey(keyValue) && options.isMergeableElement(value)) {
       const targetValue = targetElement.get(keyValue);
       clonedMember = (0,_clone_index_mjs__WEBPACK_IMPORTED_MODULE_1__.cloneShallow)(member);
-      clonedMember.value = getMergeFunction(key, options)(targetValue, value);
+      clonedMember.value = getMergeFunction(key, options)(targetValue, value, options);
     } else {
       clonedMember = (0,_clone_index_mjs__WEBPACK_IMPORTED_MODULE_1__.cloneShallow)(member);
       clonedMember.value = cloneUnlessOtherwiseSpecified(value, options);