perf(schema): improve performance

alibaba · Sep 17, 2021 · 184884c · 184884c
1 parent 0b81fa9
commit 184884c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/packages/json-schema/src/compiler.ts b/packages/json-schema/src/compiler.ts
@@ -62,18 +62,20 @@ export const compile = <Source = any, Scope = any>(
   source: Source,
   scope?: Scope
 ): any => {
-  const seenObjects = new WeakSet()
+  const seenObjects = []
   const compile = (source: any) => {
     if (isStr(source)) {
       return shallowCompile(source, scope)
     } else if (isArr(source)) {
       return source.map((value: any) => compile(value))
     } else if (isPlainObj(source)) {
       if (isNoNeedCompileObject(source)) return source
-      if (seenObjects.has(source)) {
+      const seenIndex = seenObjects.indexOf(source)
+      if (seenIndex > -1) {
         return source
       }
-      seenObjects.add(source)
+      const addIndex = seenObjects.length
+      seenObjects.push(source)
       const results = reduce(
         source,
         (buf, value, key) => {
@@ -82,7 +84,7 @@ export const compile = <Source = any, Scope = any>(
         },
         {}
       )
-      seenObjects.delete(source)
+      seenObjects.splice(addIndex, 1)
       return results
     }
     return source

diff --git a/packages/json-schema/src/traverse.ts b/packages/json-schema/src/traverse.ts
@@ -7,24 +7,26 @@ export const traverse = (
   visitor: (value: any, path: Array<string | number>, address: string) => void,
   filter?: (value: any, path: Array<string | number>) => boolean
 ) => {
-  const seenObjects = new WeakSet()
+  const seenObjects = []
   const root = target
   const traverse = (target: any, path = [], address = '') => {
     if (filter?.(target, path) === false) return
 
     if (isPlainObj(target)) {
-      if (seenObjects.has(target)) {
+      const seenIndex = seenObjects.indexOf(target)
+      if (seenIndex > -1) {
         return
       }
-      seenObjects.add(target)
+      const addIndex = seenObjects.length
+      seenObjects.push(target)
       if (isNoNeedCompileObject(target) && root !== target) {
         visitor(target, path, address)
         return
       }
       each(target, (value, key) => {
         traverse(value, path.concat(key), address + '.' + key)
       })
-      seenObjects.delete(target)
+      seenObjects.splice(addIndex, 1)
     } else {
       visitor(target, path, address)
     }

diff --git a/packages/reactive/src/__tests__/test.spec.ts → ...active/src/__tests__/hasCollected.spec.ts b/packages/reactive/src/__tests__/test.spec.ts → ...active/src/__tests__/hasCollected.spec.ts
diff --git a/packages/reactive/src/__tests__/observable.spec.ts b/packages/reactive/src/__tests__/observable.spec.ts
@@ -0,0 +1,7 @@
+import { observable } from '../'
+
+test('array mutation', () => {
+  const arr = observable([1, 2, 3, 4])
+  arr.splice(2, 1)
+  expect(arr).toEqual([1, 2, 4])
+})
diff --git a/packages/reactive/src/handlers.ts b/packages/reactive/src/handlers.ts
@@ -221,14 +221,14 @@ export const baseHandlers: ProxyHandler<any> = {
     return true
   },
   deleteProperty(target, key) {
-    const res = Reflect.deleteProperty(target, key)
     const oldValue = target[key]
+    delete target[key]
     runReactionsFromTargetKey({
       target,
       key,
       oldValue,
       type: 'delete',
     })
-    return res
+    return true
   },
 }