From ea65948c6cdeadd87be1c4bba67c36a98c19bc85 Mon Sep 17 00:00:00 2001 From: Bowen Tan Date: Thu, 23 Jun 2022 17:36:13 +0800 Subject: [PATCH] chore(shared): move shallowCompare to object.ts --- packages/shared/__tests__/shallowCompare.spec.ts | 2 +- packages/shared/src/utils/index.ts | 1 - packages/shared/src/utils/object.ts | 15 +++++++++++++++ packages/shared/src/utils/shallowCompare.ts | 14 -------------- 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 packages/shared/src/utils/shallowCompare.ts diff --git a/packages/shared/__tests__/shallowCompare.spec.ts b/packages/shared/__tests__/shallowCompare.spec.ts index a25e76fc..1e27e16c 100644 --- a/packages/shared/__tests__/shallowCompare.spec.ts +++ b/packages/shared/__tests__/shallowCompare.spec.ts @@ -1,4 +1,4 @@ -import { shallowCompare } from '../src/utils/shallowCompare'; +import { shallowCompare } from '../src/utils'; describe('shallowCompare function', () => { it('compare values', () => { diff --git a/packages/shared/src/utils/index.ts b/packages/shared/src/utils/index.ts index a81f45af..9fe6d56d 100644 --- a/packages/shared/src/utils/index.ts +++ b/packages/shared/src/utils/index.ts @@ -1,4 +1,3 @@ -export * from './shallowCompare'; export * from './number'; export * from './spec'; export * from './expression'; diff --git a/packages/shared/src/utils/object.ts b/packages/shared/src/utils/object.ts index 0b62c760..119051ec 100644 --- a/packages/shared/src/utils/object.ts +++ b/packages/shared/src/utils/object.ts @@ -27,3 +27,18 @@ export function traverse(value: unknown, seen: Set = new Set()) { export function isPromise(value: object): value is Promise { return value instanceof Promise; } + +export function shallowCompare(obj1: any, obj2: any) { + if (typeof obj1 === 'object' && typeof obj2 === 'object') { + if (Object.keys(obj1).length !== Object.keys(obj2).length) return false; + for (const key in obj1) { + if (key in obj2 && obj1[key] === obj2[key]) { + continue; + } else { + return false; + } + } + return true; + } + return obj1 === obj2; +} diff --git a/packages/shared/src/utils/shallowCompare.ts b/packages/shared/src/utils/shallowCompare.ts deleted file mode 100644 index 3d030fd4..00000000 --- a/packages/shared/src/utils/shallowCompare.ts +++ /dev/null @@ -1,14 +0,0 @@ -export function shallowCompare(obj1: any, obj2: any) { - if (typeof obj1 === 'object' && typeof obj2 === 'object') { - if (Object.keys(obj1).length !== Object.keys(obj2).length) return false; - for (const key in obj1) { - if (key in obj2 && obj1[key] === obj2[key]) { - continue; - } else { - return false; - } - } - return true; - } - return obj1 === obj2; -}