From 04b2f531c7ddcc730e7a1d387bf2b6c1d79feff9 Mon Sep 17 00:00:00 2001
From: Vladimir Gorej <vladimir.gorej@gmail.com>
Date: Thu, 22 Feb 2024 15:48:53 +0100
Subject: [PATCH] refactor(core): consolidate merge algorithms

Refs #3845
---
 packages/apidom-core/src/index.ts                  | 4 ++--
 packages/apidom-core/src/{ => merge}/deepmerge.ts  | 6 +++---
 packages/apidom-core/src/merge/merge-right.ts      | 4 ++--
 packages/apidom-core/test/{ => merge}/deepmerge.ts | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename packages/apidom-core/src/{ => merge}/deepmerge.ts (96%)
 rename packages/apidom-core/test/{ => merge}/deepmerge.ts (99%)

diff --git a/packages/apidom-core/src/index.ts b/packages/apidom-core/src/index.ts
index 58ed8fcc14..35cbffb094 100644
--- a/packages/apidom-core/src/index.ts
+++ b/packages/apidom-core/src/index.ts
@@ -103,8 +103,8 @@ export { default as toString } from './transformers/to-string';
 
 export { default as sexprs } from './transformers/sexprs';
 
-export { default as deepmerge } from './deepmerge';
-export type { DeepMergeUserOptions, ObjectOrArrayElement } from './deepmerge';
+export { default as deepmerge } from './merge/deepmerge';
+export type { DeepMergeUserOptions, ObjectOrArrayElement } from './merge/deepmerge';
 export { default as mergeRight } from './merge/merge-right';
 export type { MergeRightOptions } from './merge/merge-right';
 export { default as mergeLeft } from './merge/merge-left';
diff --git a/packages/apidom-core/src/deepmerge.ts b/packages/apidom-core/src/merge/deepmerge.ts
similarity index 96%
rename from packages/apidom-core/src/deepmerge.ts
rename to packages/apidom-core/src/merge/deepmerge.ts
index b5df0eb257..24a5f90914 100644
--- a/packages/apidom-core/src/deepmerge.ts
+++ b/packages/apidom-core/src/merge/deepmerge.ts
@@ -1,8 +1,8 @@
 import { ObjectElement, ArrayElement, MemberElement, Element } from 'minim';
 
-import { isObjectElement, isArrayElement } from './predicates';
-import { cloneDeep, cloneShallow } from './clone';
-import toValue from './transformers/serializers/value';
+import { isObjectElement, isArrayElement } from '../predicates';
+import { cloneDeep, cloneShallow } from '../clone';
+import toValue from '../transformers/serializers/value';
 
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
diff --git a/packages/apidom-core/src/merge/merge-right.ts b/packages/apidom-core/src/merge/merge-right.ts
index f758453a54..49f780bef7 100644
--- a/packages/apidom-core/src/merge/merge-right.ts
+++ b/packages/apidom-core/src/merge/merge-right.ts
@@ -1,7 +1,7 @@
 import { ObjectElement } from 'minim';
 
-import deepmerge, { defaultOptions as defaultDeepmergeOptions, emptyElement } from '../deepmerge';
-import type { ObjectOrArrayElement, DeepMergeUserOptions } from '../deepmerge';
+import deepmerge, { defaultOptions as defaultDeepmergeOptions, emptyElement } from './deepmerge';
+import type { ObjectOrArrayElement, DeepMergeUserOptions } from './deepmerge';
 
 export type MergeRightOptions = Omit<DeepMergeUserOptions, 'customMerge' | 'clone'>;
 
diff --git a/packages/apidom-core/test/deepmerge.ts b/packages/apidom-core/test/merge/deepmerge.ts
similarity index 99%
rename from packages/apidom-core/test/deepmerge.ts
rename to packages/apidom-core/test/merge/deepmerge.ts
index 9381c20070..54b4286b26 100644
--- a/packages/apidom-core/test/deepmerge.ts
+++ b/packages/apidom-core/test/merge/deepmerge.ts
@@ -8,7 +8,7 @@ import {
   ArrayElement,
   StringElement,
   isObjectElement,
-} from '../src';
+} from '../../src';
 
 describe('deepmerge', function () {
   it('should add keys in target that do not exist at the root', function () {