@cuboapp/crdt 1.0.25 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/crdt",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "CRDT for CUBO",
   "main": "src/index.ts",
   "repository": {

package/src/client/index.ts

@@ -1,6 +1,6 @@
 import { keyBy, pick, uuid } from '@cuboapp/utils'
 import { WsClientEvent } from '@cuboapp/ws'
-import { computed, reactive } from 'vue'
+import { computed, reactive, shallowReactive } from 'vue'
 import { applyAwarenessUpdate, Awareness, encodeAwarenessUpdate, removeAwarenessStates } from 'y-protocols/awareness'
 import { applyUpdate, Doc } from 'yjs'
 
@@ -27,7 +27,7 @@ export class CuboCrdtClient<M> {
   public store: CuboCrdtClientStore<M> = {}
   // Реактивен только реестр: Vue отслеживает set/delete и повторно вычисляет
   // computed(useDoc). Сами Y.Doc/Awareness остаются исходными объектами без proxy.
-  public docs = new Map<string, CuboCrdtClientDoc>()
+  public docs = shallowReactive(new Map<string, CuboCrdtClientDoc>())
 
   private listeners: Map<string, Map<string, (ctx: CuboCrdtClientSubscribeEvent) => void | Promise<void>>> = new Map()
 
@@ -351,7 +351,7 @@ export class CuboCrdtClient<M> {
 
       const item = this.store[storeKey]
       item?.state.rows.forEach((row) => {
-        this.detachDocument(`${entity}`, (row as any).id, subscribe_id, storeKey)
+        this.detachDocument(`${entity}`, (row as any).id, subscribe_id)
       })
 
       // очищаем стор
@@ -425,15 +425,13 @@ export class CuboCrdtClient<M> {
     }
   }
 
-  public update<K extends string>(
+  public update<K extends Extract<keyof M, string>>(
     entity: K,
     entity_id: number,
     dto: K extends Extract<keyof M, string> ? Partial<M[K]> : object,
     opts?: CuboCrdtClientDocOrigin
   ) {
-    const storeKey = `${entity}:${entity_id}`
-
-    const document = this.docs.get(storeKey)
+    const document = this.docs.get(`${entity}:${entity_id}`)
 
     if (document) {
       const map = document.doc.getMap()
@@ -549,7 +547,7 @@ export class CuboCrdtClient<M> {
     }
   }
 
-  private detachDocument(entity: string, entity_id: number, subscribe_id: string, storeKey: string) {
+  private detachDocument(entity: string, entity_id: number, subscribe_id: string) {
     const key = `${entity}:${entity_id}`
     const document = this.docs.get(key)
     if (!document) {
@@ -622,11 +620,11 @@ export class CuboCrdtClient<M> {
 
     applyUpdate(yjsDoc, update, { react: false })
 
-    const document: CuboCrdtClientDoc = {
+    const document = shallowReactive<CuboCrdtClientDoc>({
       doc: yjsDoc,
       subscribes: new Set(),
       awarenessSubscribes: new Set()
-    }
+    })
     this.attachDocument(ctx.entity, entity_id, document, opts)
     // Публикуем контейнер реактивному реестру только после полной инициализации.
     // Тогда первый computed(useDoc) не увидит промежуточный doc без Awareness.
@@ -787,7 +785,7 @@ export class CuboCrdtClient<M> {
         continue
       }
 
-      this.detachDocument(ctx.entity, entity_id, opts.subscribe_id, opts.storeKey)
+      this.detachDocument(ctx.entity, entity_id, opts.subscribe_id)
     }
 
     const rowsById = new Map(item.state.rows.map((row: any) => [Number(row.id), row]))

package/src/client/types/index.ts

@@ -1,6 +1,5 @@
 import { type WsClient } from '@cuboapp/ws'
 import { ComputedRef } from 'vue'
-import { Awareness } from 'y-protocols/awareness'
 
 import { CuboCrdtAction, CuboCrdtListSyncData, CuboCrdtListTotals, CuboCrdtSubscriptionStatus } from '../../types'
 
@@ -39,7 +38,6 @@ export type CuboCrdtClientSubscribeEvent = {
 export type CuboCrdtClientList<T> = {
   subscribe_id: string
   storeKey: string
-  awarenesses?: ComputedRef<Map<number, Awareness> | undefined>
   subscribe: (filters?: any) => void
   upgrade: (filters?: any) => void
   unsubscribe: (clear?: boolean) => void