bump dependency, add rules parameter

Author: udamir

package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-diff-viewer",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "description": "React component to view the difference between two Json based API documents",
   "author": "Damir Yusipov",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "api"
   ],
   "dependencies": {
-    "api-smart-diff": "0.6.8",
+    "api-smart-diff": "^0.7.0",
     "diff": "^5.0.0"
   },
   "peerDependencies": {

src/components/ApiDiffViewer.tsx

@@ -1,5 +1,5 @@
 import React, { CSSProperties, useEffect, useRef, useState } from "react"
-import { apiMerge, DiffType } from "api-smart-diff"
+import { apiMerge, DiffType, Rules } from "api-smart-diff"
 
 import { DiffContext, DiffContextProps } from "../helpers/diff.context"
 import { DiffBlockData, metaKey } from "../diff-builder/common"
@@ -19,6 +19,10 @@ export interface ApiDiffViewerProps {
    * object after
    */
   after: object | string
+  /**
+   * Custom merge rules
+   */
+  rules?: Rules
   /**
    * Display document diff in inline or side-by-side mode
    */
@@ -61,6 +65,7 @@ export const ApiDiffViewer = ({
   display = "side-by-side",
   format = "yaml",
   filters = [],
+  rules,
   navigation = false,
   useWorker = true,
   height = "100vh",
@@ -96,9 +101,9 @@ export const ApiDiffViewer = ({
 
 
       if (useWorker) {
-        merge(_before, _after, { metaKey, arrayMeta: true })
+        merge(_before, _after, { metaKey, arrayMeta: true, rules })
       } else {
-        setData(apiMerge(_before, _after, { metaKey, arrayMeta: true }))
+        setData(apiMerge(_before, _after, { metaKey, arrayMeta: true, rules }))
       }
     } catch (error) {
       onError && onError("Unexpected data")

yarn.lock

@@ -3340,12 +3340,10 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-api-smart-diff@0.6.8, api-smart-diff@^0.6.7:
-  version "0.6.8"
-  resolved "https://registry.yarnpkg.com/api-smart-diff/-/api-smart-diff-0.6.8.tgz#eaced2d6e1a08048293896566ad8aba405e49833"
-  integrity sha512-o8riIi6PGiPY9YOzWD6S7YDryUpHHNMxs1ygQdmjTxDBDoeAa5UQZlcyQELHSgU/Lxc5+RjBUUIG1BVqR59Kog==
-  dependencies:
-    api-smart-diff "^0.6.7"
+api-smart-diff@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/api-smart-diff/-/api-smart-diff-0.7.0.tgz#3d8e31daff7962d5f13984fa64deabacc0f3c814"
+  integrity sha512-Kw35XuM9tjZ+DIpmbr0NnvUzlP5P6BB9Qyejs4pK+fYJOWaHZiv1WAn+snZeYkGjJGiMi0o0YTGFj+4QUpfhhw==
 
 app-root-dir@^1.0.2:
   version "1.0.2"