[Not For Merge] Keyed collections 2

src/vanilla/utils/proxyMap-rawMap1.ts

@@ -5,12 +5,13 @@ import {
   unstable_getInternalStates,
 } from '../../vanilla.ts'
 
-const { proxyStateMap } = unstable_getInternalStates()
+const { proxyStateMap, snapCache } = unstable_getInternalStates()
 const maybeProxify = (x: any) => (typeof x === 'object' ? proxy({ x }).x : x)
 const isProxy = (x: any) => proxyStateMap.has(x)
 
 type InternalProxyObject<K, V> = Map<K, V> & {
   epoch: number
+  _registerSnap: boolean
   toJSON: () => Map<K, V>
 }
 
@@ -19,21 +20,45 @@ export function proxyMap<K, V>() {
   const unsubKeyMap = new WeakMap<object, () => void>()
   const unsubValMap = new WeakMap<object, () => void>()
 
+  const snapMapCache = new WeakMap<object, Map<K, V>>()
+  const registerSnapMap = () => {
+    const cache = snapCache.get(vObject)
+    const latestSnap = cache?.[1]
+    if (latestSnap && !snapMapCache.has(latestSnap)) {
+      const snapMap = new Map<K, V>()
+      for (const [k, v] of rawMap) {
+        snapMap.set(
+          isProxy(k) ? (snapshot(k as object) as K) : k,
+          isProxy(v) ? (snapshot(v as object) as V) : v,
+        )
+      }
+      snapMapCache.set(latestSnap, snapMap)
+      return true
+    }
+    return false
+  }
+  const getSnapMap = (x: any) => snapMapCache.get(x)
+
   const vObject: InternalProxyObject<K, V> = {
     epoch: 0,
+    get _registerSnap() {
+      return registerSnapMap()
+    },
     get size() {
-      return rawMap.size
+      const map = getSnapMap(this) || rawMap
+      return map.size
     },
     get(key: K) {
+      const map = getSnapMap(this) || rawMap
       const k = maybeProxify(key)
-      if (!rawMap.has(k)) {
+      if (!map.has(k)) {
         if (!isProxy(this)) {
           // eslint-disable-next-line @typescript-eslint/no-unused-expressions
           this.epoch
         }
         return undefined
       }
-      const val = rawMap.get(k) as V
+      const val = map.get(k) as V
       if (isProxy(this)) {
         return val
       }
@@ -43,8 +68,9 @@ export function proxyMap<K, V>() {
       return val
     },
     has(key: K) {
+      const map = getSnapMap(this) || rawMap
       const k = maybeProxify(key)
-      const exists = rawMap.has(k)
+      const exists = map.has(k)
       if (!exists && !isProxy(this)) {
         // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         this.epoch
@@ -89,31 +115,33 @@ export function proxyMap<K, V>() {
       rawMap.set(k, v)
       return this
     },
-    delete(key: K) {
+    delete(_key: K) {
       throw new Error('Not implemented')
     },
     clear() {
       throw new Error('Not implemented')
     },
     forEach(cb: (value: V, key: K, map: Map<K, V>) => void) {
-      //indexMap.forEach((index) => {
-      //  cb(this.data[index + 1] as V, this.data[index] as K, this)
-      //})
+      const map = getSnapMap(this) || rawMap
+      map.forEach(cb)
     },
     *entries(): MapIterator<[K, V]> {
-      //for (const index of indexMap.values()) {
-      //  yield [this.data[index], this.data[index + 1]] as [K, V]
-      //}
+      const map = getSnapMap(this) || rawMap
+      for (const [k, v] of map) {
+        yield [k, v]
+      }
     },
     *keys(): IterableIterator<K> {
-      //for (const key of indexMap.keys()) {
-      //  yield key
-      //}
+      const map = getSnapMap(this) || rawMap
+      for (const k of map.keys()) {
+        yield k
+      }
     },
     *values(): IterableIterator<V> {
-      //for (const index of indexMap.values()) {
-      //  yield this.data[index + 1] as V
-      //}
+      const map = getSnapMap(this) || rawMap
+      for (const v of map.values()) {
+        yield v
+      }
     },
     [Symbol.iterator]() {
       return this.entries()
@@ -122,8 +150,8 @@ export function proxyMap<K, V>() {
       return 'Map'
     },
     toJSON(): Map<K, V> {
-      throw new Error('Not implemented')
-      // return new Map([...indexMap].map(([k, i]) => [k, this.data[i + 1] as V]))
+      const map = getSnapMap(this) || rawMap
+      return map
     },
   }
 

src/vanilla/utils/proxyMap-tree1.ts

@@ -84,9 +84,9 @@ const searchFromTreeNode = (node: TreeNode, key: number, key2 = key) => {
 }
 
 const deleteFromTreeNode = (
-  node: TreeNode,
+  _node: TreeNode,
   key: number,
-  key2 = key,
+  _key2 = key,
 ): boolean => {
   throw new Error('Not implemented')
 }
@@ -163,7 +163,7 @@ export function proxyMap<K, V>(entries?: Iterable<[K, V]> | undefined | null) {
       }
       this.root = createNewTreeNode()
     },
-    forEach(cb: (value: V, key: K, map: Map<K, V>) => void) {
+    forEach(_cb: (value: V, key: K, map: Map<K, V>) => void) {
       // indexMap.forEach((index) => {
       //   cb(this.data[index + 1] as V, this.data[index] as K, this)
       // })