Speedup isDerived and fix auto join channels doc state

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>

.vscode/launch.json

@@ -77,7 +77,7 @@
         "ACCOUNT_PORT": "3000",
         "FRONT_URL": "http://localhost:8080",
         "outputCapture": "std",
-        "SES_URL": "http://localhost:8091",
+        "SES_URL": "",
         "MINIO_ACCESS_KEY": "minioadmin",
         "MINIO_SECRET_KEY": "minioadmin",
         "MINIO_ENDPOINT": "localhost"

dev/docker-compose.yaml

@@ -62,8 +62,8 @@ services:
       - LAST_NAME_FIRST=true
       - ACCOUNTS_URL=http://localhost:3000
       - BRANDING_PATH=/var/cfg/branding.json
-      - INIT_SCRIPT_URL=https://raw.githubusercontent.com/hcengineering/init/main/script.yaml
-      - INIT_WORKSPACE=onboarding      
+      # - INIT_SCRIPT_URL=https://raw.githubusercontent.com/hcengineering/init/main/script.yaml
+      # - INIT_WORKSPACE=onboarding      
     restart: unless-stopped
   collaborator:
     image: hardcoreeng/collaborator

packages/core/src/hierarchy.ts

@@ -30,7 +30,7 @@ export class Hierarchy {
   private readonly attributes = new Map<Ref<Classifier>, Map<string, AnyAttribute>>()
   private readonly attributesById = new Map<Ref<AnyAttribute>, AnyAttribute>()
   private readonly descendants = new Map<Ref<Classifier>, Ref<Classifier>[]>()
-  private readonly ancestors = new Map<Ref<Classifier>, Ref<Classifier>[]>()
+  private readonly ancestors = new Map<Ref<Classifier>, { ordered: Ref<Classifier>[], set: Set<Ref<Classifier>> }>()
   private readonly proxies = new Map<Ref<Mixin<Doc>>, ProxyHandler<Doc>>()
 
   private readonly classifierProperties = new Map<Ref<Classifier>, Record<string, any>>()
@@ -166,7 +166,7 @@ export class Hierarchy {
     if (result === undefined) {
       throw new Error('ancestors not found: ' + _class)
     }
-    return result
+    return result.ordered
   }
 
   getClass<T extends Obj = Obj>(_class: Ref<Class<T>>): Class<T> {
@@ -301,17 +301,7 @@ export class Hierarchy {
    * It will iterate over parents.
    */
   isDerived<T extends Obj>(_class: Ref<Class<T>>, from: Ref<Class<T>>): boolean {
-    let cl: Ref<Class<T>> | undefined = _class
-    while (cl !== undefined) {
-      if (cl === from) return true
-
-      const cll = this.classifiers.get(cl)
-      if (cll === undefined || this.isInterface(cll)) {
-        return false
-      }
-      cl = (cll as Class<T>).extends
-    }
-    return false
+    return this.ancestors.get(_class)?.set?.has(from) ?? false
   }
 
   /**
@@ -398,15 +388,19 @@ export class Hierarchy {
         const list = this.ancestors.get(_class)
         if (list === undefined) {
           if (add) {
-            this.ancestors.set(_class, [classifier])
+            this.ancestors.set(_class, { ordered: [classifier], set: new Set([classifier]) })
           }
         } else {
           if (add) {
-            addIf(list, classifier)
+            if (!list.set.has(classifier)) {
+              list.ordered.push(classifier)
+              list.set.add(classifier)
+            }
           } else {
-            const pos = list.indexOf(classifier)
+            const pos = list.ordered.indexOf(classifier)
             if (pos !== -1) {
-              list.splice(pos, 1)
+              list.ordered.splice(pos, 1)
+              list.set.delete(classifier)
             }
           }
         }

packages/text/src/markup/utils.ts

@@ -18,10 +18,10 @@ import { Editor, Extensions, getSchema } from '@tiptap/core'
 import { generateHTML, generateJSON } from '@tiptap/html'
 import { Node as ProseMirrorNode, Schema } from '@tiptap/pm/model'
 
+import { deepEqual } from 'fast-equals'
 import { defaultExtensions } from '../extensions'
-import { MarkupMark, MarkupNode, MarkupNodeType, emptyMarkupNode } from './model'
 import { nodeDoc, nodeParagraph, nodeText } from './dsl'
-import { deepEqual } from 'fast-equals'
+import { MarkupMark, MarkupNode, MarkupNodeType, emptyMarkupNode } from './model'
 
 /** @public */
 export const EmptyMarkup: Markup = jsonToMarkup(emptyMarkupNode())
@@ -226,9 +226,11 @@ export function pmNodeToHTML (node: ProseMirrorNode, extensions?: Extensions): s
 const ELLIPSIS_CHAR = '…'
 const WHITESPACE = ' '
 
+const defaultSchema = getSchema(defaultExtensions)
+
 /** @public */
 export function stripTags (markup: Markup, textLimit = 0, extensions: Extensions | undefined = undefined): string {
-  const schema = getSchema(extensions ?? defaultExtensions)
+  const schema = extensions === undefined ? defaultSchema : getSchema(extensions)
   const parsed = markupToPmNode(markup, schema)
 
   const textParts: string[] = []

packages/text/src/ydoc.ts

@@ -56,13 +56,15 @@ export function yDocContentToNode (
   return yDocToNode(ydoc, field, schema, extensions)
 }
 
+const defaultSchema = getSchema(defaultExtensions)
+
 /**
  * Get ProseMirror node from Y.Doc
  *
  * @public
  */
 export function yDocToNode (ydoc: YDoc, field?: string, schema?: Schema, extensions?: Extensions): Node {
-  schema ??= getSchema(extensions ?? defaultExtensions)
+  schema ??= extensions === undefined ? defaultSchema : getSchema(extensions ?? defaultExtensions)
 
   try {
     const body = yDocToProsemirrorJSON(ydoc, field)
@@ -79,7 +81,7 @@ export function yDocToNode (ydoc: YDoc, field?: string, schema?: Schema, extensi
  * @public
  */
 export function yDocContentToNodes (content: ArrayBuffer, schema?: Schema, extensions?: Extensions): Node[] {
-  schema ??= getSchema(extensions ?? defaultExtensions)
+  schema ??= extensions === undefined ? defaultSchema : getSchema(extensions ?? defaultExtensions)
 
   const nodes: Node[] = []
 
@@ -112,7 +114,7 @@ export function updateYDocContent (
   schema?: Schema,
   extensions?: Extensions
 ): YDoc | undefined {
-  schema ??= getSchema(extensions ?? defaultExtensions)
+  schema ??= extensions === undefined ? defaultSchema : getSchema(extensions ?? defaultExtensions)
 
   try {
     const ydoc = new YDoc()
@@ -140,7 +142,7 @@ export function updateYDocContent (
  * @public
  */
 export function YDocFromContent (content: MarkupNode, field: string, schema?: Schema, extensions?: Extensions): YDoc {
-  schema ??= getSchema(extensions ?? defaultExtensions)
+  schema ??= extensions === undefined ? defaultSchema : getSchema(extensions ?? defaultExtensions)
 
   const res = new YDoc({ gc: false })
 

server/account/src/operations.ts

@@ -1983,7 +1983,7 @@ async function createPersonAccount (
     client ??
     (await connect(getEndpoint(ctx, workspaceInfo, EndpointKind.Internal), getWorkspaceId(workspace, productId)))
   try {
-    const ops = new TxOperations(connection, core.account.System)
+    const ops = new TxOperations(connection, core.account.System).apply('create-person' + generateId())
 
     const name = combineName(account.first, account.last)
     // Check if PersonAccount is not exists
@@ -2033,6 +2033,7 @@ async function createPersonAccount (
         }
       }
     }
+    await ops.commit()
   } finally {
     if (client === undefined) {
       await connection.close()

server/core/src/server/storage.ts

@@ -769,8 +769,8 @@ export class TServerStorage implements ServerStorage {
           findAll(mctx, clazz, query, options)
 
     const removed = await ctx.with('process-remove', {}, (ctx) => this.processRemove(ctx, txes, findAll))
-    const collections = ctx.with('process-collection', {}, (ctx) => this.processCollection(ctx, txes, findAll))
-    const moves = ctx.with('process-move', {}, (ctx) => this.processMove(ctx.ctx, txes, findAll))
+    const collections = await ctx.with('process-collection', {}, (ctx) => this.processCollection(ctx, txes, findAll))
+    const moves = await ctx.with('process-move', {}, (ctx) => this.processMove(ctx.ctx, txes, findAll))
 
     const applyTxes: Tx[] = []
 
@@ -869,7 +869,7 @@ export class TServerStorage implements ServerStorage {
       { count: txes.length }
     )
 
-    const derived = [...removed, ...(await collections), ...(await moves), ...triggers]
+    const derived = [...removed, ...collections, ...moves, ...triggers]
 
     return await this.processDerivedTxes(derived, ctx, findAll)
   }
@@ -879,15 +879,12 @@ export class TServerStorage implements ServerStorage {
     ctx: SessionOperationContext,
     findAll: ServerStorage['findAll']
   ): Promise<Tx[]> {
-    derived.sort((a, b) => a.modifiedOn - b.modifiedOn)
-
-    const routePromise = ctx.with('derived-route-tx', {}, (ctx) => this.routeTx(ctx, ...derived))
-
     const nestedTxes: Tx[] = []
     if (derived.length > 0) {
+      derived.sort((a, b) => a.modifiedOn - b.modifiedOn)
+      await ctx.with('derived-route-tx', {}, (ctx) => this.routeTx(ctx, ...derived))
       nestedTxes.push(...(await this.processDerived(ctx, derived, findAll)))
     }
-    await routePromise
 
     const res = [...derived, ...nestedTxes]