@itwin/tree-widget-react 4.0.0-alpha.5 → 4.0.0-alpha.7

package/lib/esm/tree-widget-react/components/trees/models-tree/internal/FilteredTree.d.ts

@@ -1,24 +1,22 @@
 import { HierarchyFilteringPath } from "@itwin/presentation-hierarchies";
-import type { Id64String } from "@itwin/core-bentley";
+import type { Id64Set } from "@itwin/core-bentley";
 import type { HierarchyNode } from "@itwin/presentation-hierarchies";
 import type { ECClassHierarchyInspector } from "@itwin/presentation-shared";
+import type { CategoryId, ElementId, ModelId } from "../../common/internal/Types.js";
 export interface FilteredTree {
     getVisibilityChangeTargets(node: HierarchyNode): VisibilityChangeTargets;
 }
-export declare const SUBJECT_CLASS_NAME: "BisCore.Subject";
-export declare const MODEL_CLASS_NAME: "BisCore.GeometricModel3d";
-export declare const CATEGORY_CLASS_NAME: "BisCore.SpatialCategory";
-export declare const ELEMENT_CLASS_NAME: "BisCore.GeometricElement3d";
-type CategoryKey = `${Id64String}-${Id64String}`;
+type CategoryKey = `${ModelId}-${CategoryId}`;
+/** @internal */
 export declare function parseCategoryKey(key: CategoryKey): {
     modelId: string;
     categoryId: string;
 };
 interface VisibilityChangeTargets {
-    subjects?: Set<Id64String>;
-    models?: Set<Id64String>;
+    subjectIds?: Id64Set;
+    modelIds?: Id64Set;
     categories?: Set<CategoryKey>;
-    elements?: Map<CategoryKey, Set<Id64String>>;
+    elements?: Map<CategoryKey, Set<ElementId>>;
 }
 export declare function createFilteredTree(imodelAccess: ECClassHierarchyInspector, filteringPaths: HierarchyFilteringPath[]): Promise<FilteredTree>;
 export {};

package/lib/esm/tree-widget-react/components/trees/models-tree/internal/FilteredTree.js

@@ -4,13 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 import { assert } from "@itwin/core-bentley";
 import { HierarchyFilteringPath, HierarchyNodeIdentifier, HierarchyNodeKey } from "@itwin/presentation-hierarchies";
-export const SUBJECT_CLASS_NAME = "BisCore.Subject";
-export const MODEL_CLASS_NAME = "BisCore.GeometricModel3d";
-export const CATEGORY_CLASS_NAME = "BisCore.SpatialCategory";
-export const ELEMENT_CLASS_NAME = "BisCore.GeometricElement3d";
+import { CATEGORY_CLASS_NAME, MODEL_CLASS_NAME, SUBJECT_CLASS_NAME } from "../../common/internal/ClassNameDefinitions.js";
 function createCategoryKey(modelId, categoryId) {
     return `${modelId}-${categoryId}`;
 }
+/** @internal */
 export function parseCategoryKey(key) {
     const [modelId, categoryId] = key.split("-");
     return { modelId, categoryId };
@@ -102,10 +100,10 @@ function collectVisibilityChangeTargets(changeTargets, node) {
 function addTarget(filterTargets, node) {
     switch (node.type) {
         case "subject":
-            (filterTargets.subjects ??= new Set()).add(node.id);
+            (filterTargets.subjectIds ??= new Set()).add(node.id);
             return;
         case "model":
-            (filterTargets.models ??= new Set()).add(node.id);
+            (filterTargets.modelIds ??= new Set()).add(node.id);
             return;
         case "category":
             (filterTargets.categories ??= new Set()).add(createCategoryKey(node.modelId, node.id));

package/lib/esm/tree-widget-react/components/trees/models-tree/internal/FilteredTree.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilteredTree.js","sourceRoot":"","sources":["../../../../../../../src/tree-widget-react/components/trees/models-tree/internal/FilteredTree.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { assert } from \"@itwin/core-bentley\";\nimport { HierarchyFilteringPath, HierarchyNodeIdentifier, HierarchyNodeKey } from \"@itwin/presentation-hierarchies\";\n\nimport type { Id64String } from \"@itwin/core-bentley\";\nimport type { HierarchyNode } from \"@itwin/presentation-hierarchies\";\nimport type { ECClassHierarchyInspector, InstanceKey } from \"@itwin/presentation-shared\";\n\ninterface FilteredTreeRootNode {\n  children: Map<Id64String, FilteredTreeNode>;\n}\n\ninterface BaseFilteredTreeNode {\n  id: string;\n  children?: Map<Id64String, FilteredTreeNode>;\n  isFilterTarget: boolean;\n}\n\ninterface GenericFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"subject\" | \"model\";\n}\n\ninterface CategoryFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"category\";\n  modelId: Id64String;\n}\n\ninterface ElementFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"element\";\n  modelId: Id64String;\n  categoryId: Id64String;\n}\n\ntype FilteredTreeNode = GenericFilteredTreeNode | CategoryFilteredTreeNode | ElementFilteredTreeNode;\n\nexport interface FilteredTree {\n  getVisibilityChangeTargets(node: HierarchyNode): VisibilityChangeTargets;\n}\n\nexport const SUBJECT_CLASS_NAME = \"BisCore.Subject\" as const;\nexport const MODEL_CLASS_NAME = \"BisCore.GeometricModel3d\" as const;\nexport const CATEGORY_CLASS_NAME = \"BisCore.SpatialCategory\" as const;\nexport const ELEMENT_CLASS_NAME = \"BisCore.GeometricElement3d\" as const;\n\ntype CategoryKey = `${Id64String}-${Id64String}`;\n\nfunction createCategoryKey(modelId: string, categoryId: string): CategoryKey {\n  return `${modelId}-${categoryId}`;\n}\n\nexport function parseCategoryKey(key: CategoryKey) {\n  const [modelId, categoryId] = key.split(\"-\");\n  return { modelId, categoryId };\n}\n\ninterface VisibilityChangeTargets {\n  subjects?: Set<Id64String>;\n  models?: Set<Id64String>;\n  categories?: Set<CategoryKey>;\n  elements?: Map<CategoryKey, Set<Id64String>>;\n}\n\nexport async function createFilteredTree(imodelAccess: ECClassHierarchyInspector, filteringPaths: HierarchyFilteringPath[]): Promise<FilteredTree> {\n  const root: FilteredTreeRootNode = {\n    children: new Map(),\n  };\n\n  for (const filteringPath of filteringPaths) {\n    const normalizedPath = HierarchyFilteringPath.normalize(filteringPath).path;\n\n    let parentNode: FilteredTreeRootNode | FilteredTreeNode = root;\n    for (let i = 0; i < normalizedPath.length; i++) {\n      if (\"type\" in parentNode && parentNode.isFilterTarget) {\n        break;\n      }\n\n      const identifier = normalizedPath[i];\n      if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {\n        break;\n      }\n\n      const currentNode: FilteredTreeNode | undefined = parentNode.children?.get(identifier.id);\n      if (currentNode !== undefined) {\n        parentNode = currentNode;\n        continue;\n      }\n\n      const type = await getType(imodelAccess, identifier.className);\n      const newNode: FilteredTreeNode = createFilteredTreeNode({\n        type,\n        id: identifier.id,\n        isFilterTarget: i === normalizedPath.length - 1,\n        parent: parentNode as FilteredTreeNode,\n      });\n      (parentNode.children ??= new Map()).set(identifier.id, newNode);\n      parentNode = newNode;\n    }\n  }\n\n  return {\n    getVisibilityChangeTargets: (node: HierarchyNode) => getVisibilityChangeTargets(root, node),\n  };\n}\n\nfunction getVisibilityChangeTargets(root: FilteredTreeRootNode, node: HierarchyNode) {\n  let lookupParents: Array<{ children?: Map<Id64String, FilteredTreeNode> }> = [root];\n  const changeTargets: VisibilityChangeTargets = {};\n\n  const nodeKey = node.key;\n  if (!HierarchyNodeKey.isInstances(nodeKey)) {\n    return changeTargets;\n  }\n\n  // find the filtered parent nodes of the `node`\n  for (const parentKey of node.parentKeys) {\n    if (!HierarchyNodeKey.isInstances(parentKey)) {\n      continue;\n    }\n\n    // tree node might be merged from multiple instances. As filtered tree stores only one instance per node, we need to find all matching nodes\n    // and use them when checking for matching node in one level deeper.\n    const parentNodes = findMatchingFilteredNodes(lookupParents, parentKey.instanceKeys);\n    if (parentNodes.length === 0) {\n      return changeTargets;\n    }\n    lookupParents = parentNodes;\n  }\n\n  // find filtered nodes that match the `node`\n  const filteredNodes = findMatchingFilteredNodes(lookupParents, nodeKey.instanceKeys);\n  if (filteredNodes.length === 0) {\n    return changeTargets;\n  }\n\n  filteredNodes.forEach((filteredNode) => collectVisibilityChangeTargets(changeTargets, filteredNode));\n  return changeTargets;\n}\n\nfunction findMatchingFilteredNodes(lookupParents: Array<{ children?: Map<Id64String, FilteredTreeNode> }>, keys: InstanceKey[]) {\n  return lookupParents\n    .flatMap((lookup) => keys.map((key) => lookup.children?.get(key.id)))\n    .filter((lookupNode): lookupNode is FilteredTreeNode => lookupNode !== undefined);\n}\n\nfunction collectVisibilityChangeTargets(changeTargets: VisibilityChangeTargets, node: FilteredTreeNode) {\n  if (node.isFilterTarget) {\n    addTarget(changeTargets, node);\n    return;\n  }\n\n  if (node.type === \"element\") {\n    // need to add parent ids as filter target will be an element\n    addTarget(changeTargets, node);\n  }\n\n  if (!node.children) {\n    return;\n  }\n\n  for (const child of node.children.values()) {\n    collectVisibilityChangeTargets(changeTargets, child);\n  }\n}\n\nfunction addTarget(filterTargets: VisibilityChangeTargets, node: FilteredTreeNode) {\n  switch (node.type) {\n    case \"subject\":\n      (filterTargets.subjects ??= new Set()).add(node.id);\n      return;\n    case \"model\":\n      (filterTargets.models ??= new Set()).add(node.id);\n      return;\n    case \"category\":\n      (filterTargets.categories ??= new Set()).add(createCategoryKey(node.modelId, node.id));\n      return;\n    case \"element\":\n      const categoryKey = createCategoryKey(node.modelId, node.categoryId);\n      const elements = (filterTargets.elements ??= new Map()).get(categoryKey);\n      if (elements) {\n        elements.add(node.id);\n        return;\n      }\n      filterTargets.elements.set(categoryKey, new Set([node.id]));\n      return;\n  }\n}\n\nfunction createFilteredTreeNode({\n  type,\n  id,\n  isFilterTarget,\n  parent,\n}: {\n  type: FilteredTreeNode[\"type\"];\n  id: string;\n  isFilterTarget: boolean;\n  parent: FilteredTreeNode | FilteredTreeRootNode;\n}): FilteredTreeNode {\n  if (type === \"subject\" || type === \"model\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n    };\n  }\n\n  if (type === \"category\") {\n    assert(\"type\" in parent && parent.type === \"model\");\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.id,\n    };\n  }\n\n  if (\"type\" in parent && parent.type === \"category\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.modelId,\n      categoryId: parent.id,\n    };\n  }\n\n  if (\"type\" in parent && parent.type === \"element\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.modelId,\n      categoryId: parent.categoryId,\n    };\n  }\n\n  throw new Error(\"Invalid parent node type\");\n}\n\nasync function getType(hierarchyChecker: ECClassHierarchyInspector, className: string) {\n  if (await hierarchyChecker.classDerivesFrom(className, SUBJECT_CLASS_NAME)) {\n    return \"subject\";\n  }\n  if (await hierarchyChecker.classDerivesFrom(className, MODEL_CLASS_NAME)) {\n    return \"model\";\n  }\n  if (await hierarchyChecker.classDerivesFrom(className, CATEGORY_CLASS_NAME)) {\n    return \"category\";\n  }\n  return \"element\";\n}\n"]}
+{"version":3,"file":"FilteredTree.js","sourceRoot":"","sources":["../../../../../../../src/tree-widget-react/components/trees/models-tree/internal/FilteredTree.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { assert } from \"@itwin/core-bentley\";\nimport { HierarchyFilteringPath, HierarchyNodeIdentifier, HierarchyNodeKey } from \"@itwin/presentation-hierarchies\";\nimport { CATEGORY_CLASS_NAME, MODEL_CLASS_NAME, SUBJECT_CLASS_NAME } from \"../../common/internal/ClassNameDefinitions.js\";\n\nimport type { Id64Set, Id64String } from \"@itwin/core-bentley\";\nimport type { HierarchyNode } from \"@itwin/presentation-hierarchies\";\nimport type { ECClassHierarchyInspector, InstanceKey } from \"@itwin/presentation-shared\";\nimport type { CategoryId, ElementId, ModelId } from \"../../common/internal/Types.js\";\n\ninterface FilteredTreeRootNode {\n  children: Map<Id64String, FilteredTreeNode>;\n}\n\ninterface BaseFilteredTreeNode {\n  id: Id64String;\n  children?: Map<Id64String, FilteredTreeNode>;\n  isFilterTarget: boolean;\n}\n\ninterface GenericFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"subject\" | \"model\";\n}\n\ninterface CategoryFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"category\";\n  modelId: Id64String;\n}\n\ninterface ElementFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"element\";\n  modelId: Id64String;\n  categoryId: Id64String;\n}\n\ntype FilteredTreeNode = GenericFilteredTreeNode | CategoryFilteredTreeNode | ElementFilteredTreeNode;\n\nexport interface FilteredTree {\n  getVisibilityChangeTargets(node: HierarchyNode): VisibilityChangeTargets;\n}\n\ntype CategoryKey = `${ModelId}-${CategoryId}`;\n\nfunction createCategoryKey(modelId: Id64String, categoryId: Id64String): CategoryKey {\n  return `${modelId}-${categoryId}`;\n}\n\n/** @internal */\nexport function parseCategoryKey(key: CategoryKey) {\n  const [modelId, categoryId] = key.split(\"-\");\n  return { modelId, categoryId };\n}\n\ninterface VisibilityChangeTargets {\n  subjectIds?: Id64Set;\n  modelIds?: Id64Set;\n  categories?: Set<CategoryKey>;\n  elements?: Map<CategoryKey, Set<ElementId>>;\n}\n\nexport async function createFilteredTree(imodelAccess: ECClassHierarchyInspector, filteringPaths: HierarchyFilteringPath[]): Promise<FilteredTree> {\n  const root: FilteredTreeRootNode = {\n    children: new Map(),\n  };\n\n  for (const filteringPath of filteringPaths) {\n    const normalizedPath = HierarchyFilteringPath.normalize(filteringPath).path;\n\n    let parentNode: FilteredTreeRootNode | FilteredTreeNode = root;\n    for (let i = 0; i < normalizedPath.length; i++) {\n      if (\"type\" in parentNode && parentNode.isFilterTarget) {\n        break;\n      }\n\n      const identifier = normalizedPath[i];\n      if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {\n        break;\n      }\n\n      const currentNode: FilteredTreeNode | undefined = parentNode.children?.get(identifier.id);\n      if (currentNode !== undefined) {\n        parentNode = currentNode;\n        continue;\n      }\n\n      const type = await getType(imodelAccess, identifier.className);\n      const newNode: FilteredTreeNode = createFilteredTreeNode({\n        type,\n        id: identifier.id,\n        isFilterTarget: i === normalizedPath.length - 1,\n        parent: parentNode,\n      });\n      (parentNode.children ??= new Map()).set(identifier.id, newNode);\n      parentNode = newNode;\n    }\n  }\n\n  return {\n    getVisibilityChangeTargets: (node: HierarchyNode) => getVisibilityChangeTargets(root, node),\n  };\n}\n\nfunction getVisibilityChangeTargets(root: FilteredTreeRootNode, node: HierarchyNode) {\n  let lookupParents: Array<{ children?: Map<Id64String, FilteredTreeNode> }> = [root];\n  const changeTargets: VisibilityChangeTargets = {};\n\n  const nodeKey = node.key;\n  if (!HierarchyNodeKey.isInstances(nodeKey)) {\n    return changeTargets;\n  }\n\n  // find the filtered parent nodes of the `node`\n  for (const parentKey of node.parentKeys) {\n    if (!HierarchyNodeKey.isInstances(parentKey)) {\n      continue;\n    }\n\n    // tree node might be merged from multiple instances. As filtered tree stores only one instance per node, we need to find all matching nodes\n    // and use them when checking for matching node in one level deeper.\n    const parentNodes = findMatchingFilteredNodes(lookupParents, parentKey.instanceKeys);\n    if (parentNodes.length === 0) {\n      return changeTargets;\n    }\n    lookupParents = parentNodes;\n  }\n\n  // find filtered nodes that match the `node`\n  const filteredNodes = findMatchingFilteredNodes(lookupParents, nodeKey.instanceKeys);\n  if (filteredNodes.length === 0) {\n    return changeTargets;\n  }\n\n  filteredNodes.forEach((filteredNode) => collectVisibilityChangeTargets(changeTargets, filteredNode));\n  return changeTargets;\n}\n\nfunction findMatchingFilteredNodes(lookupParents: Array<{ children?: Map<Id64String, FilteredTreeNode> }>, keys: InstanceKey[]) {\n  return lookupParents\n    .flatMap((lookup) => keys.map((key) => lookup.children?.get(key.id)))\n    .filter((lookupNode): lookupNode is FilteredTreeNode => lookupNode !== undefined);\n}\n\nfunction collectVisibilityChangeTargets(changeTargets: VisibilityChangeTargets, node: FilteredTreeNode) {\n  if (node.isFilterTarget) {\n    addTarget(changeTargets, node);\n    return;\n  }\n\n  if (node.type === \"element\") {\n    // need to add parent ids as filter target will be an element\n    addTarget(changeTargets, node);\n  }\n\n  if (!node.children) {\n    return;\n  }\n\n  for (const child of node.children.values()) {\n    collectVisibilityChangeTargets(changeTargets, child);\n  }\n}\n\nfunction addTarget(filterTargets: VisibilityChangeTargets, node: FilteredTreeNode) {\n  switch (node.type) {\n    case \"subject\":\n      (filterTargets.subjectIds ??= new Set()).add(node.id);\n      return;\n    case \"model\":\n      (filterTargets.modelIds ??= new Set()).add(node.id);\n      return;\n    case \"category\":\n      (filterTargets.categories ??= new Set()).add(createCategoryKey(node.modelId, node.id));\n      return;\n    case \"element\":\n      const categoryKey = createCategoryKey(node.modelId, node.categoryId);\n      const elements = (filterTargets.elements ??= new Map()).get(categoryKey);\n      if (elements) {\n        elements.add(node.id);\n        return;\n      }\n      filterTargets.elements.set(categoryKey, new Set([node.id]));\n      return;\n  }\n}\n\nfunction createFilteredTreeNode({\n  type,\n  id,\n  isFilterTarget,\n  parent,\n}: {\n  type: FilteredTreeNode[\"type\"];\n  id: string;\n  isFilterTarget: boolean;\n  parent: FilteredTreeNode | FilteredTreeRootNode;\n}): FilteredTreeNode {\n  if (type === \"subject\" || type === \"model\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n    };\n  }\n\n  if (type === \"category\") {\n    assert(\"type\" in parent && parent.type === \"model\");\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.id,\n    };\n  }\n\n  if (\"type\" in parent && parent.type === \"category\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.modelId,\n      categoryId: parent.id,\n    };\n  }\n\n  if (\"type\" in parent && parent.type === \"element\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.modelId,\n      categoryId: parent.categoryId,\n    };\n  }\n\n  throw new Error(\"Invalid parent node type\");\n}\n\nasync function getType(hierarchyChecker: ECClassHierarchyInspector, className: string) {\n  if (await hierarchyChecker.classDerivesFrom(className, SUBJECT_CLASS_NAME)) {\n    return \"subject\";\n  }\n  if (await hierarchyChecker.classDerivesFrom(className, MODEL_CLASS_NAME)) {\n    return \"model\";\n  }\n  if (await hierarchyChecker.classDerivesFrom(className, CATEGORY_CLASS_NAME)) {\n    return \"category\";\n  }\n  return \"element\";\n}\n"]}

package/lib/esm/tree-widget-react/components/trees/models-tree/internal/ModelsTreeIdsCache.d.ts

@@ -20,28 +20,27 @@ export declare class ModelsTreeIdsCache {
     private queryModels;
     private getSubjectInfos;
     /** Returns ECInstanceIDs of Subjects that either have direct Model or at least one child Subject with a Model. */
-    getParentSubjectIds(): Promise<Id64String[]>;
+    getParentSubjectIds(): Promise<Id64Array>;
     /**
      * Returns child subjects of the specified parent subjects as they're displayed in the hierarchy - taking into
      * account `hideInHierarchy` flag.
      */
-    getChildSubjectIds(parentSubjectIds: Id64String[]): Promise<Id64String[]>;
+    getChildSubjectIds(parentSubjectIds: Id64Array): Promise<Id64Array>;
     /** Returns ECInstanceIDs of all Models under specific parent Subjects, including their child Subjects, etc. */
     getSubjectModelIds(subjectIds: Id64Array): Promise<Id64Array>;
     /** Returns ECInstanceIDs of Models under specific parent Subjects as they are displayed in the hierarchy. */
-    getChildSubjectModelIds(parentSubjectIds: Id64String[]): Promise<Id64String[]>;
+    getChildSubjectModelIds(parentSubjectIds: Id64Array): Promise<Id64Array>;
     createSubjectInstanceKeysPath(targetSubjectId: Id64String): Promise<HierarchyNodeIdentifiersPath>;
     private queryModelElementCounts;
     private queryModelCategories;
     private queryModeledElements;
     private getModelWithCategoryModeledElements;
     private getModelInfos;
-    getModelCategories(modelId: Id64String): Promise<Id64Array>;
+    getModelCategoryIds(modelId: Id64String): Promise<Id64Array>;
     getModelElementCount(modelId: Id64String): Promise<number>;
     hasSubModel(elementId: Id64String): Promise<boolean>;
     getCategoriesModeledElements(modelId: Id64String, categoryIds: Id64Array): Promise<Id64Array>;
     createModelInstanceKeyPaths(modelId: Id64String): Promise<HierarchyNodeIdentifiersPath[]>;
-    private queryCategoryElementCounts;
     getCategoryElementsCount(modelId: Id64String, categoryId: Id64String): Promise<number>;
     createCategoryInstanceKeyPaths(categoryId: Id64String): Promise<HierarchyNodeIdentifiersPath[]>;
 }

package/lib/esm/tree-widget-react/components/trees/models-tree/internal/ModelsTreeIdsCache.js

@@ -2,16 +2,17 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-import { bufferTime, filter, firstValueFrom, mergeAll, mergeMap, ReplaySubject, Subject } from "rxjs";
 import { assert } from "@itwin/core-bentley";
 import { IModel } from "@itwin/core-common";
-import { pushToMap } from "../../common/Utils.js";
+import { GEOMETRIC_MODEL_3D_CLASS_NAME, INFORMATION_PARTITION_ELEMENT_CLASS_NAME, MODEL_CLASS_NAME, SPATIAL_CATEGORY_CLASS_NAME, SUBJECT_CLASS_NAME, } from "../../common/internal/ClassNameDefinitions.js";
+import { ModelCategoryElementsCountCache } from "../../common/internal/ModelCategoryElementsCountCache.js";
+import { pushToMap } from "../../common/internal/Utils.js";
 /** @internal */
 export class ModelsTreeIdsCache {
     constructor(_queryExecutor, _hierarchyConfig) {
         this._queryExecutor = _queryExecutor;
         this._hierarchyConfig = _hierarchyConfig;
-        this._categoryElementCounts = new ModelCategoryElementsCountCache(async (input) => this.queryCategoryElementCounts(input));
+        this._categoryElementCounts = new ModelCategoryElementsCountCache(_queryExecutor, this._hierarchyConfig.elementClassSpecification);
         this._modelKeyPaths = new Map();
         this._subjectKeyPaths = new Map();
         this._categoryKeyPaths = new Map();
@@ -26,7 +27,7 @@ export class ModelsTreeIdsCache {
         s.Parent.Id parentId,
         (
           SELECT m.ECInstanceId
-          FROM bis.GeometricModel3d m
+          FROM ${GEOMETRIC_MODEL_3D_CLASS_NAME} m
           WHERE m.ECInstanceId = HexToId(json_extract(s.JsonProperties, '$.Subject.Model.TargetPartition'))
             AND NOT m.IsPrivate
             AND EXISTS (SELECT 1 FROM ${this._hierarchyConfig.elementClassSpecification} WHERE Model.Id = m.ECInstanceId)
@@ -47,8 +48,8 @@ export class ModelsTreeIdsCache {
     async *queryModels() {
         const modelsQuery = `
       SELECT p.ECInstanceId id, p.Parent.Id parentId
-      FROM bis.InformationPartitionElement p
-      INNER JOIN bis.GeometricModel3d m ON m.ModeledElement.Id = p.ECInstanceId
+      FROM ${INFORMATION_PARTITION_ELEMENT_CLASS_NAME} p
+      INNER JOIN ${GEOMETRIC_MODEL_3D_CLASS_NAME} m ON m.ModeledElement.Id = p.ECInstanceId
       WHERE
         NOT m.IsPrivate
         ${this._hierarchyConfig.showEmptyModels ? "" : `AND EXISTS (SELECT 1 FROM ${this._hierarchyConfig.elementClassSpecification} WHERE Model.Id = m.ECInstanceId)`}
@@ -64,13 +65,13 @@ export class ModelsTreeIdsCache {
                     const result = new Map();
                     for await (const subject of this.querySubjects()) {
                         const subjectInfo = {
-                            parentSubject: subject.parentId,
+                            parentSubjectId: subject.parentId,
                             hideInHierarchy: subject.hideInHierarchy,
-                            childSubjects: new Set(),
-                            childModels: new Set(),
+                            childSubjectIds: new Set(),
+                            childModelIds: new Set(),
                         };
                         if (subject.targetPartitionId) {
-                            subjectInfo.childModels.add(subject.targetPartitionId);
+                            subjectInfo.childModelIds.add(subject.targetPartitionId);
                         }
                         result.set(subject.id, subjectInfo);
                     }
@@ -84,18 +85,18 @@ export class ModelsTreeIdsCache {
                     return result;
                 })(),
             ]);
-            for (const [subjectId, { parentSubject: parentSubjectId }] of subjectInfos.entries()) {
+            for (const [subjectId, { parentSubjectId }] of subjectInfos.entries()) {
                 if (parentSubjectId) {
                     const parentSubjectInfo = subjectInfos.get(parentSubjectId);
                     assert(!!parentSubjectInfo);
-                    parentSubjectInfo.childSubjects.add(subjectId);
+                    parentSubjectInfo.childSubjectIds.add(subjectId);
                 }
             }
             for (const [partitionId, subjectIds] of targetPartitionSubjects) {
                 subjectIds.forEach((subjectId) => {
                     const subjectInfo = subjectInfos.get(subjectId);
                     assert(!!subjectInfo);
-                    subjectInfo.childModels.add(partitionId);
+                    subjectInfo.childModelIds.add(partitionId);
                 });
             }
             return subjectInfos;
@@ -108,12 +109,12 @@ export class ModelsTreeIdsCache {
             const subjectInfos = await this.getSubjectInfos();
             const parentSubjectIds = new Set();
             subjectInfos.forEach((subjectInfo, subjectId) => {
-                if (subjectInfo.childModels.size > 0) {
+                if (subjectInfo.childModelIds.size > 0) {
                     parentSubjectIds.add(subjectId);
-                    let currParentId = subjectInfo.parentSubject;
+                    let currParentId = subjectInfo.parentSubjectId;
                     while (currParentId) {
                         parentSubjectIds.add(currParentId);
-                        currParentId = subjectInfos.get(currParentId)?.parentSubject;
+                        currParentId = subjectInfos.get(currParentId)?.parentSubjectId;
                     }
                 }
             });
@@ -153,8 +154,8 @@ export class ModelsTreeIdsCache {
             if (!subjectInfo) {
                 continue;
             }
-            result.push(...subjectInfo.childModels);
-            subjectStack.push(...subjectInfo.childSubjects);
+            result.push(...subjectInfo.childModelIds);
+            subjectStack.push(...subjectInfo.childSubjectIds);
         }
         return result;
     }
@@ -174,7 +175,7 @@ export class ModelsTreeIdsCache {
         const modelIds = new Array();
         [...parentSubjectIds, ...hiddenSubjectIds].forEach((subjectId) => {
             const subjectInfo = subjectInfos.get(subjectId);
-            subjectInfo && modelIds.push(...subjectInfo.childModels);
+            subjectInfo && modelIds.push(...subjectInfo.childModelIds);
         });
         return modelIds;
     }
@@ -185,12 +186,15 @@ export class ModelsTreeIdsCache {
                 const subjectInfos = await this.getSubjectInfos();
                 const result = new Array();
                 let currParentId = targetSubjectId;
-                while (currParentId && currParentId !== IModel.rootSubjectId) {
+                while (currParentId) {
+                    if (this._hierarchyConfig.hideRootSubject && currParentId === IModel.rootSubjectId) {
+                        break;
+                    }
                     const parentInfo = subjectInfos.get(currParentId);
                     if (!parentInfo?.hideInHierarchy) {
-                        result.push({ className: "BisCore.Subject", id: currParentId });
+                        result.push({ className: SUBJECT_CLASS_NAME, id: currParentId });
                     }
-                    currParentId = parentInfo?.parentSubject;
+                    currParentId = parentInfo?.parentSubjectId;
                 }
                 return result.reverse();
             })();
@@ -199,7 +203,7 @@ export class ModelsTreeIdsCache {
         return entry;
     }
     async *queryModelElementCounts() {
-        const query = /* sql */ `
+        const query = `
       SELECT Model.Id modelId, COUNT(*) elementCount
       FROM ${this._hierarchyConfig.elementClassSpecification}
       GROUP BY Model.Id
@@ -209,14 +213,15 @@ export class ModelsTreeIdsCache {
         }
     }
     async *queryModelCategories() {
-        const query = /* sql */ `
-      SELECT Model.Id modelId, Category.Id categoryId
-      FROM ${this._hierarchyConfig.elementClassSpecification}
-      WHERE Parent.Id IS NULL
-      GROUP BY modelId, categoryId
+        const query = `
+      SELECT this.Model.Id modelId, this.Category.Id categoryId, m.IsPrivate isModelPrivate
+      FROM ${MODEL_CLASS_NAME} m
+      JOIN ${this._hierarchyConfig.elementClassSpecification} this ON m.ECInstanceId = this.Model.Id
+      WHERE this.Parent.Id IS NULL
+      GROUP BY modelId, categoryId, isModelPrivate
     `;
         for await (const row of this._queryExecutor.createQueryReader({ ecsql: query }, { rowFormat: "ECSqlPropertyNames", limit: "unbounded" })) {
-            yield { modelId: row.modelId, categoryId: row.categoryId };
+            yield { modelId: row.modelId, categoryId: row.categoryId, isModelPrivate: !!row.isModelPrivate };
         }
     }
     async *queryModeledElements() {
@@ -225,8 +230,11 @@ export class ModelsTreeIdsCache {
         pe.ECInstanceId modeledElementId,
         pe.Category.Id categoryId,
         pe.Model.Id modelId
-      FROM BisCore.Model m
+      FROM ${MODEL_CLASS_NAME} m
       JOIN ${this._hierarchyConfig.elementClassSpecification} pe ON pe.ECInstanceId = m.ModeledElement.Id
+      WHERE
+        m.IsPrivate = false
+        AND m.ECInstanceId IN (SELECT Model.Id FROM ${this._hierarchyConfig.elementClassSpecification})
     `;
         for await (const row of this._queryExecutor.createQueryReader({ ecsql: query }, { rowFormat: "ECSqlPropertyNames", limit: "unbounded" })) {
             yield { modelId: row.modelId, categoryId: row.categoryId, modeledElementId: row.modeledElementId };
@@ -254,13 +262,14 @@ export class ModelsTreeIdsCache {
             const modelInfos = new Map();
             await Promise.all([
                 (async () => {
-                    for await (const { modelId, categoryId } of this.queryModelCategories()) {
+                    for await (const { modelId, categoryId, isModelPrivate } of this.queryModelCategories()) {
                         const entry = modelInfos.get(modelId);
                         if (entry) {
-                            entry.categories.add(categoryId);
+                            entry.categoryIds.add(categoryId);
+                            entry.isModelPrivate = isModelPrivate;
                         }
                         else {
-                            modelInfos.set(modelId, { categories: new Set([categoryId]), elementCount: 0 });
+                            modelInfos.set(modelId, { categoryIds: new Set([categoryId]), elementCount: 0, isModelPrivate });
                         }
                     }
                 })(),
@@ -271,7 +280,7 @@ export class ModelsTreeIdsCache {
                             entry.elementCount = elementCount;
                         }
                         else {
-                            modelInfos.set(modelId, { categories: new Set(), elementCount });
+                            modelInfos.set(modelId, { categoryIds: new Set(), elementCount, isModelPrivate: false });
                         }
                     }
                 })(),
@@ -280,9 +289,9 @@ export class ModelsTreeIdsCache {
         })();
         return this._modelInfos;
     }
-    async getModelCategories(modelId) {
+    async getModelCategoryIds(modelId) {
         const modelInfos = await this.getModelInfos();
-        const categories = modelInfos.get(modelId)?.categories;
+        const categories = modelInfos.get(modelId)?.categoryIds;
         return categories ? [...categories] : [];
     }
     async getModelElementCount(modelId) {
@@ -291,7 +300,11 @@ export class ModelsTreeIdsCache {
     }
     async hasSubModel(elementId) {
         const modelInfos = await this.getModelInfos();
-        return modelInfos.has(elementId);
+        const modeledElementInfo = modelInfos.get(elementId);
+        if (!modeledElementInfo) {
+            return false;
+        }
+        return !modeledElementInfo.isModelPrivate;
     }
     async getCategoriesModeledElements(modelId, categoryIds) {
         const modelWithCategoryModeledElements = await this.getModelWithCategoryModeledElements();
@@ -311,7 +324,7 @@ export class ModelsTreeIdsCache {
                 const result = new Array();
                 const subjectInfos = (await this.getSubjectInfos()).entries();
                 for (const [modelSubjectId, subjectInfo] of subjectInfos) {
-                    if (subjectInfo.childModels.has(modelId)) {
+                    if (subjectInfo.childModelIds.has(modelId)) {
                         const subjectPath = await this.createSubjectInstanceKeysPath(modelSubjectId);
                         result.push([...subjectPath, { className: "BisCore.GeometricModel3d", id: modelId }]);
                     }
@@ -322,39 +335,6 @@ export class ModelsTreeIdsCache {
         }
         return entry;
     }
-    async queryCategoryElementCounts(input) {
-        const reader = this._queryExecutor.createQueryReader({
-            ctes: [
-                /* sql */ `
-            CategoryElements(id, modelId, categoryId) AS (
-              SELECT ECInstanceId, Model.Id, Category.Id
-              FROM ${this._hierarchyConfig.elementClassSpecification}
-              WHERE
-                Parent.Id IS NULL
-                AND (
-                  ${input.map(({ modelId, categoryId }) => `Model.Id = ${modelId} AND Category.Id = ${categoryId}`).join(" OR ")}
-                )
-
-              UNION ALL
-
-              SELECT c.ECInstanceId, p.modelId, p.categoryId
-              FROM ${this._hierarchyConfig.elementClassSpecification} c
-              JOIN CategoryElements p ON c.Parent.Id = p.id
-            )
-          `,
-            ],
-            ecsql: `
-          SELECT modelId, categoryId, COUNT(id) elementsCount
-          FROM CategoryElements
-          GROUP BY modelId, categoryId
-        `,
-        }, { rowFormat: "ECSqlPropertyNames", limit: "unbounded" });
-        const result = new Array();
-        for await (const row of reader) {
-            result.push({ modelId: row.modelId, categoryId: row.categoryId, elementsCount: row.elementsCount });
-        }
-        return result;
-    }
     async getCategoryElementsCount(modelId, categoryId) {
         return this._categoryElementCounts.getCategoryElementsCount(modelId, categoryId);
     }
@@ -365,7 +345,7 @@ export class ModelsTreeIdsCache {
                 const result = new Set();
                 const modelInfos = await this.getModelInfos();
                 modelInfos?.forEach((modelInfo, modelId) => {
-                    if (modelInfo.categories.has(categoryId)) {
+                    if (modelInfo.categoryIds.has(categoryId)) {
                         result.add(modelId);
                     }
                 });
@@ -373,7 +353,7 @@ export class ModelsTreeIdsCache {
                 for (const categoryModelId of [...result]) {
                     const modelPaths = await this.createModelInstanceKeyPaths(categoryModelId);
                     for (const modelPath of modelPaths) {
-                        categoryPaths.push([...modelPath, { className: "BisCore.SpatialCategory", id: categoryId }]);
+                        categoryPaths.push([...modelPath, { className: SPATIAL_CATEGORY_CLASS_NAME, id: categoryId }]);
                     }
                 }
                 return categoryPaths;
@@ -386,7 +366,7 @@ export class ModelsTreeIdsCache {
 function forEachChildSubject(subjectInfos, parentSubject, cb) {
     const parentSubjectInfo = typeof parentSubject === "string" ? subjectInfos.get(parentSubject) : parentSubject;
     parentSubjectInfo &&
-        parentSubjectInfo.childSubjects.forEach((childSubjectId) => {
+        parentSubjectInfo.childSubjectIds.forEach((childSubjectId) => {
             const childSubjectInfo = subjectInfos.get(childSubjectId);
             if (cb(childSubjectId, childSubjectInfo) === "break") {
                 return;
@@ -394,34 +374,4 @@ function forEachChildSubject(subjectInfos, parentSubject, cb) {
             forEachChildSubject(subjectInfos, childSubjectInfo, cb);
         });
 }
-class ModelCategoryElementsCountCache {
-    constructor(_loader) {
-        this._loader = _loader;
-        this._cache = new Map();
-        this._requestsStream = new Subject();
-        this._subscription = this._requestsStream
-            .pipe(bufferTime(20), filter((requests) => requests.length > 0), mergeMap(async (requests) => this._loader(requests)), mergeAll())
-            .subscribe({
-            next: ({ modelId, categoryId, elementsCount }) => {
-                const subject = this._cache.get(`${modelId}${categoryId}`);
-                assert(!!subject);
-                subject.next(elementsCount);
-            },
-        });
-    }
-    [Symbol.dispose]() {
-        this._subscription.unsubscribe();
-    }
-    async getCategoryElementsCount(modelId, categoryId) {
-        const cacheKey = `${modelId}${categoryId}`;
-        let result = this._cache.get(cacheKey);
-        if (result !== undefined) {
-            return firstValueFrom(result);
-        }
-        result = new ReplaySubject(1);
-        this._cache.set(cacheKey, result);
-        this._requestsStream.next({ modelId, categoryId });
-        return firstValueFrom(result);
-    }
-}
 //# sourceMappingURL=ModelsTreeIdsCache.js.map