refactor(core): consolidate merge algorithms

Refs #3845
swagger-api · Feb 22, 2024 · 04b2f53 · 04b2f53
1 parent 1f0a39c
commit 04b2f53
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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 → packages/apidom-core/src/merge/deepmerge.ts b/packages/apidom-core/src/deepmerge.ts → 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
@@ -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 → packages/apidom-core/test/merge/deepmerge.ts b/packages/apidom-core/test/deepmerge.ts → 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 () {